From patchwork Wed Jun 8 12:18:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9164415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3796860572 for ; Wed, 8 Jun 2016 12:20:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28EA72810E for ; Wed, 8 Jun 2016 12:20:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DD8A281F9; Wed, 8 Jun 2016 12:20:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A75F02810E for ; Wed, 8 Jun 2016 12:20:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D9C886E9C8; Wed, 8 Jun 2016 12:19:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 287536E9BB for ; Wed, 8 Jun 2016 12:19:34 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id m124so2520557wme.3 for ; Wed, 08 Jun 2016 05:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KhfCyDXi4P9pNgQR42fpZxWS9ew6Knu7NnxYuK+bDJk=; b=DKxQY7jo4GZ3YQe8pGhxHKqRpeXbkRufqbtZ2XC8ExYnne8Yg1GJZM/bi+O0mG0q/y YhJjRoiVYqpn8smlFNa/IuIud4VJzUuc7HoKtF9htVecRDN453gs6jc7hzhVS4Mo38nR 4DSnKjPLTBntZ2UGOP/QlOMpAHCXUR2MyhQiM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KhfCyDXi4P9pNgQR42fpZxWS9ew6Knu7NnxYuK+bDJk=; b=JJhiHfDTwd0Rt4rQppBOlp4gvRbtTSlv/pmNjDhkfbe9IhXVPvfGJaqDhMEcAwPuMR HqphsobexRc6wmHmXmU7poiWDrWJw1CEayVi66F0UAKiU7hWmEPYe1xPJ5s3OrzgyVoN bN6qzR6fWuVX8U+7958tCK7ZgrdiTsvK3folNhmM6XfN6Cv0SPFHPKXd+GdA3mZyevN8 18zThFUqgq69GBSGFNhO54YRB8k11rsKOQ8288LfHj3OTx9c63DU2kP7Aob4Cd3W1Enc bg+vRvTbIs6VPPXyox1BukwOmwGkKpoi0OREPxj+RCQQDIsCrQC2WmssqQIjNATLzzbl 2goQ== X-Gm-Message-State: ALyK8tIp6V3MqqNYzFtvr9YFtoEMk2mlpoRkmexzU5l8CvvVLMnUtpDXB3lL0/XwnPpAZw== X-Received: by 10.28.211.137 with SMTP id k131mr4477546wmg.83.1465388372363; Wed, 08 Jun 2016 05:19:32 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id j9sm1178154wju.46.2016.06.08.05.19.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jun 2016 05:19:31 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/27] drm/sun4i: Implement some semblance of vblank event handling Date: Wed, 8 Jun 2016 14:18:58 +0200 Message-Id: <1465388359-8070-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465388359-8070-1-git-send-email-daniel.vetter@ffwll.ch> References: <1465388359-8070-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Maxime Ripard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP atomic_flush seems to be the right place, right after we commit the plane updates. Again use the fullproof version, since the pipe might be off. Cc: Boris Brezillon Cc: Maxime Ripard Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index 4182a21f5923..f628b6d8f23f 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -51,10 +51,22 @@ static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc, { struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); struct sun4i_drv *drv = scrtc->drv; + struct drm_pending_vblank_event *event = crtc->state->event; DRM_DEBUG_DRIVER("Committing plane changes\n"); sun4i_backend_commit(drv->backend); + + if (event) { + crtc->state->event = NULL; + + spin_lock_irq(&crtc->dev->event_lock); + if (drm_crtc_vblank_get(crtc) == 0) + drm_crtc_arm_vblank_event(crtc, event); + else + drm_crtc_send_vblank_event(crtc, event); + spin_unlock_irq(&crtc->dev->event_lock); + } } static void sun4i_crtc_disable(struct drm_crtc *crtc)