From patchwork Wed Apr 6 10:14:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8760431 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A5359F36E for ; Wed, 6 Apr 2016 10:15:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8F01201D3 for ; Wed, 6 Apr 2016 10:15:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B002B201BB for ; Wed, 6 Apr 2016 10:15:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E5F86E3CD; Wed, 6 Apr 2016 10:15:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9E6286E3CD for ; Wed, 6 Apr 2016 10:15:25 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id n3so11780820wmn.1 for ; Wed, 06 Apr 2016 03:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=AbWc0PaQbYw1et4qH1dI41CBk4LNEZL7PcFPSHMWfD0=; b=w9zdSNZHIhklo5fygqo0FySwWhU782mL7kDduSsqLeegSlp/BEvZf9S3SvfzOEZyIT C5+Z7ruHqByZCM/DlmabvikpAgsp5ZSxBE2T+2nOE5ttYuw4Evtn7MwxnDfNkHdsGDtQ CgfYVSQpi12NgvJs5ROg1uLJ0YF0584k6miop2wD6YAXH6mQNIOkTSE979SJD9hLpzPW DsNsls/ONdecGk5TBMkrkEUDAMfbbRhCfN9Gcw4V8uyeiRffL6F2hW02uRTzMR7ykGYv W0hcKyVySNYsZ1yna88jVubDyGU7o/FNpj1aLsxwErIRpiq2A+zVYn0aov+pd9dYsJyD Vb1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=AbWc0PaQbYw1et4qH1dI41CBk4LNEZL7PcFPSHMWfD0=; b=CF8it5Cv3hGLJOA6aoLRt/0FsdEK6skvjVZBqfBLH946HtuV3l+m3IiqX5coDQSxGP 9qfsF7z8oc/8Oz25/BIcgYELy7bFlqx5dTmqqh+RyQa+nky1oBiossAjCa4RPXq7+aXO iCQbNZNDLMZZfoHMl5C84MKOsv9HYf0zS3adL3LVz+gIcTQhnn/J/r0fINVgnYCcr2WF uimDxEFc+aG5lW437ReBpp2kZpVVYgEQi0I6tOGcoxwWRGxP/AcvVSYwIfaJYQmYRR1S LlSSYqOjig041qDwK0BB5xWlm3aLjQ9K4k7DVOUNUT31++GBqB+2QQuXqqA1IRBnemXt 8CaQ== X-Gm-Message-State: AD7BkJL0vn1wr7xLc9ZJKk9ON7NRQOZpuhusPA+6qn7VmcyQR00vV68sJGcIA/vIFNoisw== X-Received: by 10.194.77.15 with SMTP id o15mr36356947wjw.41.1459937724418; Wed, 06 Apr 2016 03:15:24 -0700 (PDT) Received: from cizrna.lan ([109.72.12.179]) by smtp.gmail.com with ESMTPSA id jk1sm2449545wjb.27.2016.04.06.03.15.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 03:15:23 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm/rockchip: vop: Do check if an update is pending during disable Date: Wed, 6 Apr 2016 12:14:45 +0200 Message-Id: <1459937686-9142-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.5 Cc: Tomeu Vizoso , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When a plane is being disabled but it's still enabled, do check if the previous update has been completed by reading yrgb_mst back. Otherwise, pending pageflips would remain pending after a CRTC is disabled. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index a9b1e8b5ac85..f46b1fd1887b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1064,8 +1064,9 @@ static bool vop_win_pending_is_complete(struct vop_win *vop_win) struct vop_plane_state *state = to_vop_plane_state(plane->state); dma_addr_t yrgb_mst; - if (!state->enable) - return VOP_WIN_GET(vop_win->vop, vop_win->data, enable) == 0; + if (!state->enable && + VOP_WIN_GET(vop_win->vop, vop_win->data, enable) == 0) + return true; yrgb_mst = VOP_WIN_GET_YRGBADDR(vop_win->vop, vop_win->data);