From: Geert Uytterhoeven <geert+renesas@glider.be> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Thomas Zimmermann <tzimmermann@suse.de>, Magnus Damm <magnus.damm@gmail.com> Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Subject: [PATCH v4 33/41] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Date: Fri, 15 Sep 2023 10:53:48 +0200 [thread overview] Message-ID: <e5833e5706b7792bfca8e6e56fc154a7c3e0574f.1694767209.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1694767208.git.geert+renesas@glider.be> 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 <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- v4: - No changes, v3: - No changes, 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 2bd205f9ea723062..c3a1995403d6c2c9 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -215,17 +215,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; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Thomas Zimmermann <tzimmermann@suse.de>, Magnus Damm <magnus.damm@gmail.com> Cc: linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v4 33/41] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Date: Fri, 15 Sep 2023 10:53:48 +0200 [thread overview] Message-ID: <e5833e5706b7792bfca8e6e56fc154a7c3e0574f.1694767209.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1694767208.git.geert+renesas@glider.be> 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 <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- v4: - No changes, v3: - No changes, 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 2bd205f9ea723062..c3a1995403d6c2c9 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -215,17 +215,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; -- 2.34.1
next prev parent reply other threads:[~2023-09-15 8:55 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-15 8:53 [PATCH v4 00/41] drm: renesas: shmobile: Atomic conversion + DT support Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 01/41] MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 02/41] dt-bindings: display: Add Renesas SH-Mobile LCDC bindings Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 03/41] media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 04/41] drm: renesas: shmobile: Fix overlay plane disable Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 05/41] drm: renesas: shmobile: Fix ARGB32 overlay format typo Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 06/41] drm: renesas: shmobile: Correct encoder/connector types Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 07/41] drm: renesas: shmobile: Add support for Runtime PM Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 08/41] drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks() Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 09/41] drm: renesas: shmobile: Use %p4cc to print fourcc code Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 10/41] drm: renesas: shmobile: Add missing YCbCr formats Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 11/41] drm: renesas: shmobile: Improve shmob_drm_format_info table Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 12/41] drm: renesas: shmobile: Remove backlight support Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 13/41] drm: renesas: shmobile: Don't set display info width and height twice Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 14/41] drm: renesas: shmobile: Rename input clocks Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 15/41] drm: renesas: shmobile: Remove support for SYS panels Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 16/41] drm: renesas: shmobile: Improve error handling Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 17/41] drm: renesas: shmobile: Convert to use devm_request_irq() Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 19/41] drm: renesas: shmobile: Use drmm_universal_plane_alloc() Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 20/41] drm: renesas: shmobile: Embed drm_device in shmob_drm_device Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 21/41] drm: renesas: shmobile: Convert container helpers to static inline functions Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 22/41] drm: renesas: shmobile: Replace .dev_private with container_of() Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 23/41] drm: renesas: shmobile: Use struct videomode in platform data Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 24/41] drm: renesas: shmobile: Use media bus formats " Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 25/41] drm: renesas: shmobile: Move interface handling to connector setup Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 26/41] drm: renesas: shmobile: Unify plane allocation Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 27/41] drm: renesas: shmobile: Rename shmob_drm_crtc.crtc Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 28/41] drm: renesas: shmobile: Rename shmob_drm_connector.connector Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 29/41] drm: renesas: shmobile: Rename shmob_drm_plane.plane Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 30/41] drm: renesas: shmobile: Use drm_crtc_handle_vblank() Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 31/41] drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip() Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 32/41] drm: renesas: shmobile: Wait for page flip when turning CRTC off Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven [this message] 2023-09-15 8:53 ` [PATCH v4 33/41] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 34/41] drm: renesas: shmobile: Shutdown the display on remove Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 35/41] drm: renesas: shmobile: Cleanup encoder Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 36/41] drm: renesas: shmobile: Atomic conversion part 1 Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 37/41] drm: renesas: shmobile: Atomic conversion part 2 Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 38/41] drm: renesas: shmobile: Use suspend/resume helpers Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 39/41] drm: renesas: shmobile: Remove internal CRTC state tracking Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 40/41] drm: renesas: shmobile: Atomic conversion part 3 Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-15 8:53 ` [PATCH v4 41/41] drm: renesas: shmobile: Add DT support Geert Uytterhoeven 2023-09-15 8:53 ` Geert Uytterhoeven 2023-09-19 14:28 ` [GIT PULL] drm: renesas: shmobile: Atomic conversion + DT support (was: Re: [PATCH v4 00/41] drm: renesas: shmobile: Atomic conversion + DT support) Geert Uytterhoeven 2023-09-19 14:28 ` Geert Uytterhoeven 2023-09-19 15:24 ` Laurent Pinchart 2023-09-19 15:24 ` Laurent Pinchart 2023-09-26 14:51 ` Geert Uytterhoeven 2023-09-26 14:51 ` Geert Uytterhoeven 2023-10-06 6:57 ` Geert Uytterhoeven 2023-10-06 6:57 ` Geert Uytterhoeven 2023-10-16 9:59 ` [GIT PULL v2] " Geert Uytterhoeven 2023-10-16 9:59 ` Geert Uytterhoeven 2023-10-24 10:08 ` Geert Uytterhoeven 2023-10-24 10:08 ` Geert Uytterhoeven 2023-10-27 8:09 ` Geert Uytterhoeven 2023-10-27 8:09 ` Geert Uytterhoeven
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e5833e5706b7792bfca8e6e56fc154a7c3e0574f.1694767209.git.geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=airlied@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.