From patchwork Tue Jul 18 16:54:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 122167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1902856vqt; Tue, 18 Jul 2023 10:33:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlEwJTWmHw7JmpfKcqgmoPaahxGXnsF5nCSTtq6klJ4N9LrgBv6a0yD+nW7kQFRFcE3KlFiw X-Received: by 2002:aa7:d787:0:b0:521:9d92:5863 with SMTP id s7-20020aa7d787000000b005219d925863mr282142edq.42.1689701587564; Tue, 18 Jul 2023 10:33:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689701587; cv=none; d=google.com; s=arc-20160816; b=Jgd06nB8BWcTX0cE/2qGxG0ydah5tMCh3LbSp+Hj8RWpoRC/ASRRt7pk+oTS8a6PHE iA9AC1TDUQyPyrCoRwyP52rACPyjdJr1RBKbaadZ2iF3F8RDLNzDqyHnnV8T0oeXwOU8 PfEPqZ344xh1rkeAp7r6NC54cB3HnaFwVpAdiqo2och9VlBn6lwSxBReIpCEgvonBM/Q c75o4BbN6Et+UcUEOSQZrx9+Covmt/pOOMkCeIsiQd1DgWq49TWnOVS0UcNuzApRf0GN zf/LVpu8UVQDojFguENVrGqtyPw3acEEWqUyUMS7pU6W9XM7ryloJjJ2ZFNrLBdrC7QP kiWA== 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=hrH/pup6L3gjRHd5vi3iSyXyrk9FKwvJJBVW1QKv/VA=; fh=Ople2ijcDVdvBJwvAg2RvyZp0qNZK7It46SN0LxlrVk=; b=Tp+bsySH2cjIrHNXyhUi1cldTZJgWxPcT/woxwo7Ixsf3+x2bkt/CUGhYH3Lzb0yVe mluxXs5CtiF/2sg6BQNNF4ErVQBBot/BP5XU537wQZSnHjtmvYqYwj9esFo+l3xjEXmZ iCoHsnt7+BBOp74nnC3TrZNqPZAuQnoDTQ+GYakJfEI5awwNpUYD+X5onEVeQdlNWQN0 uCU9Gzt700rhTNWH4s6SFg13GpSUnPNHegC4J9K90yNL/e+IZ3cHE9GfrcxDWE4pqh87 q774/NPTAsUi7w9q4ejkgyabDVXrZmFr+wHvl6nAO6rClnitRjeWb2GW/iQCMgZLFSPE ByaA== 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 c16-20020aa7c990000000b0051fee9567c1si1408590edt.625.2023.07.18.10.32.44; Tue, 18 Jul 2023 10:33:07 -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 S233434AbjGRQ4I (ORCPT + 99 others); Tue, 18 Jul 2023 12:56:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232800AbjGRQzD (ORCPT ); Tue, 18 Jul 2023 12:55:03 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A45519B9 for ; Tue, 18 Jul 2023 09:54:54 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id Ngur2A0121C8whw01gurDZ; Tue, 18 Jul 2023 18:54:53 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001nZY-Lj; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000gdk-Mx; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v2 33/41] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Date: Tue, 18 Jul 2023 18:54:38 +0200 Message-Id: <86dadc27e76e1f1fe66d3cee1f50553e303f4063.1689698048.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=unavailable 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: INBOX X-GMAIL-THRID: 1771780532166344016 X-GMAIL-MSGID: 1771780532166344016 The DRM core vblank handling mechanism requires drivers to forcefully turn vblank reporting off when disabling the CRTC, and to restore the vblank reporting status when enabling the CRTC. Implement this using the drm_crtc_vblank_{on,off}() helpers. Note that drm_crtc_vblank_off() must be called at startup to synchronize the state of the vblank core code with the hardware, which is initially disabled. This is performed at CRTC creation time, requiring vertical blank initialization to be moved before creating CRTCs. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- v2: - Add Reviewed-by. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 10 +++++++++- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index 20adb9d2fa178250..ab42a4999a55c475 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -271,6 +271,9 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) shmob_drm_crtc_start_stop(scrtc, true); + /* Turn vertical blank interrupt reporting back on. */ + drm_crtc_vblank_on(crtc); + scrtc->started = true; } @@ -283,10 +286,12 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) return; /* - * Wait for page flip completion before stopping the CRTC as userspace + * Disable vertical blank interrupt reporting. We first need to wait + * for page flip completion before stopping the CRTC as userspace * expects page flips to eventually complete. */ shmob_drm_crtc_wait_page_flip(scrtc); + drm_crtc_vblank_off(crtc); /* Stop the LCDC. */ shmob_drm_crtc_start_stop(scrtc, false); @@ -519,6 +524,9 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) drm_crtc_helper_add(crtc, &crtc_helper_funcs); + /* Start with vertical blank interrupt reporting disabled. */ + drm_crtc_vblank_off(crtc); + return 0; } diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 44f12bfcb3ce575d..78f9650e3a61365f 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -216,17 +216,17 @@ static int shmob_drm_probe(struct platform_device *pdev) if (ret) return ret; - ret = shmob_drm_modeset_init(sdev); - if (ret < 0) - return dev_err_probe(&pdev->dev, ret, - "failed to initialize mode setting\n"); - ret = drm_vblank_init(ddev, 1); if (ret < 0) { dev_err(&pdev->dev, "failed to initialize vblank\n"); - goto err_modeset_cleanup; + return ret; } + ret = shmob_drm_modeset_init(sdev); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "failed to initialize mode setting\n"); + ret = platform_get_irq(pdev, 0); if (ret < 0) goto err_modeset_cleanup;