From patchwork Thu Jun 22 09:21:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 111564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4937637vqr; Thu, 22 Jun 2023 02:33:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Lt2MEyDErcmucKEMVwf9X+v8dLGpzZyC5E7tf2CFEyAaR3Rd7ToC5MJgNr9h7Gy9lLPiV X-Received: by 2002:a17:90a:31a:b0:25c:571:44bc with SMTP id 26-20020a17090a031a00b0025c057144bcmr12331539pje.28.1687426429041; Thu, 22 Jun 2023 02:33:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687426429; cv=none; d=google.com; s=arc-20160816; b=Jd8KjzOaNddEOwzRQycWscy7QYI/2g3wUwi91kQsasV4yNxF7X074p9DcWChejhOd/ Bb3kFNYaFDfgvF9Luej7S9iTdzbrJU3VBTwpUhB2kL7BTdDho/V56BxO6ZkiaXt5NKef U6rlBe/UcDDsgaeYSSfz24TjcOCT/7mBFF5X1efceSRgraxiGYR+nI3GPzAtt0+7IMqw 1a51ZiXjsM3yMKl+jJqy1Cq744FCwiEYU7VKJ2jvjwwswPHmKWRPrkC2vvDHRFgzCXkc ZQf6j6vkraO60TOfxOTAIEjdRcpCC0MsgIMpYxQoQyf9ydBqKvAgVEA1FcLVamC+IC/F +VrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7cHtzsPZdAjGSh6dXEGFbzzrmqMQazmOZnuQups8Uhg=; b=VIzTPv6dcf6cd6n0sVmxiLYttXM7PKvcd9EQcIV3ull+7wO9/PEfTr/vM4X9WxUYdM iL3Eok2ynb/vK8tWSKIDion2Rb5UXE2CxRaBbOzZP+fmmNoiSkTlh8xyyFxAhi24DY0T WwJ5xnTrQW0XwwZe+Unm4z91JAFsoDAM11+sRgOWit+nJ/LqYbmeEHKxBNVDxb9HqCh8 kvD1kZ4KV+O1wOXPid7UAjIWH9qNL5t5RWSMbzrr553AuxPHLYo6oYJR5PW8t2Jh9BFq IlkfqxHdqzVQ3oU/V961ED1OOrz/5S1hIpwqYE6PPZeVb1f1M3tjp70fml68RJ6rj7tV I5uQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d10-20020a17090a498a00b00250365255b9si3128807pjh.116.2023.06.22.02.33.30; Thu, 22 Jun 2023 02:33:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232369AbjFVJbo (ORCPT + 99 others); Thu, 22 Jun 2023 05:31:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232371AbjFVJ3z (ORCPT ); Thu, 22 Jun 2023 05:29:55 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 255874EC9 for ; Thu, 22 Jun 2023 02:22:47 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed20:991a:a831:ea4b:6058]) by albert.telenet-ops.be with bizsmtp id C9Nj2A00R1yfRTD069NjkD; Thu, 22 Jun 2023 11:22:44 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qCGWY-000BxE-4W; Thu, 22 Jun 2023 11:22:43 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qCGWZ-003Vxw-Mx; Thu, 22 Jun 2023 11:22:43 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 30/39] drm: renesas: shmobile: Wait for page flip when turning CRTC off Date: Thu, 22 Jun 2023 11:21:42 +0200 Message-Id: <0b0cc2971b2abc8fe0fc55a9ae652a7b8a7235cd.1687423204.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769394855658655516?= X-GMAIL-MSGID: =?utf-8?q?1769394855658655516?= Turning a CRTC off will prevent a queued page flip from ever completing, potentially confusing userspace. Wait for queued page flips to complete before turning the CRTC off to avoid this. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 37 +++++++++++++++++++ .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 3 ++ 2 files changed, 40 insertions(+) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index 1d7fcf64bf2aab80..d2a0ac5f9368c11c 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -285,11 +285,40 @@ void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) scrtc->event = NULL; if (event) { drm_crtc_send_vblank_event(&scrtc->base, event); + wake_up(&scrtc->flip_wait); drm_crtc_vblank_put(&scrtc->base); } spin_unlock_irqrestore(&dev->event_lock, flags); } +static bool shmob_drm_crtc_page_flip_pending(struct shmob_drm_crtc *scrtc) +{ + struct drm_device *dev = scrtc->base.dev; + unsigned long flags; + bool pending; + + spin_lock_irqsave(&dev->event_lock, flags); + pending = scrtc->event != NULL; + spin_unlock_irqrestore(&dev->event_lock, flags); + + return pending; +} + +static void shmob_drm_crtc_wait_page_flip(struct shmob_drm_crtc *scrtc) +{ + struct drm_crtc *crtc = &scrtc->base; + struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); + + if (wait_event_timeout(scrtc->flip_wait, + !shmob_drm_crtc_page_flip_pending(scrtc), + msecs_to_jiffies(50))) + return; + + dev_warn(sdev->dev, "page flip timeout\n"); + + shmob_drm_crtc_finish_page_flip(scrtc); +} + /* ----------------------------------------------------------------------------- * CRTC Functions */ @@ -302,6 +331,12 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) if (!scrtc->started) return; + /* + * Wait for page flip completion before stopping the CRTC as userspace + * expects page flips to eventually complete. + */ + shmob_drm_crtc_wait_page_flip(scrtc); + /* Stop the LCDC. */ shmob_drm_crtc_start_stop(scrtc, false); @@ -515,6 +550,8 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) unsigned int i; int ret; + init_waitqueue_head(&sdev->crtc.flip_wait); + sdev->crtc.dpms = DRM_MODE_DPMS_OFF; primary = shmob_drm_plane_create(sdev, 0); diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h index 2c6d7541427581a6..b9863e026e8a9b83 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -14,6 +14,8 @@ #include #include +#include + #include