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> Subject: [PATCH v3 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Date: Wed, 16 Aug 2023 11:50:25 +0200 [thread overview] Message-ID: <4562ff5880d2d8681d62e0fcdca210bfd4778486.1692178020.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1692178020.git.geert+renesas@glider.be> There is no need to call drm_plane_force_disable() from the plane's .destroy() callback, as the plane should have been disabled already before. See also commit 3c858a33858baa8c ("drm/plane_helper: don't disable plane in destroy function") for the generic plane helper case. After removing this call, shmob_drm_plane_destroy() becomes a simple wrapper around shmob_drm_plane_destroy(), hence replace it by the latter. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v3: - No changes, v2: - New. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c index 0b2ab153e9ae76df..3a5db319bad14218 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c @@ -176,16 +176,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane, return 0; } -static void shmob_drm_plane_destroy(struct drm_plane *plane) -{ - drm_plane_force_disable(plane); - drm_plane_cleanup(plane); -} - static const struct drm_plane_funcs shmob_drm_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, - .destroy = shmob_drm_plane_destroy, + .destroy = drm_plane_cleanup, }; static const uint32_t formats[] = { -- 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>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Date: Wed, 16 Aug 2023 11:50:25 +0200 [thread overview] Message-ID: <4562ff5880d2d8681d62e0fcdca210bfd4778486.1692178020.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1692178020.git.geert+renesas@glider.be> There is no need to call drm_plane_force_disable() from the plane's .destroy() callback, as the plane should have been disabled already before. See also commit 3c858a33858baa8c ("drm/plane_helper: don't disable plane in destroy function") for the generic plane helper case. After removing this call, shmob_drm_plane_destroy() becomes a simple wrapper around shmob_drm_plane_destroy(), hence replace it by the latter. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v3: - No changes, v2: - New. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c index 0b2ab153e9ae76df..3a5db319bad14218 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c @@ -176,16 +176,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane, return 0; } -static void shmob_drm_plane_destroy(struct drm_plane *plane) -{ - drm_plane_force_disable(plane); - drm_plane_cleanup(plane); -} - static const struct drm_plane_funcs shmob_drm_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, - .destroy = shmob_drm_plane_destroy, + .destroy = drm_plane_cleanup, }; static const uint32_t formats[] = { -- 2.34.1
next prev parent reply other threads:[~2023-08-16 10:46 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-16 9:50 [PATCH v3 00/41] drm: renesas: shmobile: Atomic conversion + DT support Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 01/41] MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 02/41] dt-bindings: display: Add Renesas SH-Mobile LCDC bindings Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 03/41] media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 04/41] drm: renesas: shmobile: Fix overlay plane disable Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 05/41] drm: renesas: shmobile: Fix ARGB32 overlay format typo Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 06/41] drm: renesas: shmobile: Correct encoder/connector types Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 07/41] drm: renesas: shmobile: Add support for Runtime PM Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 08/41] drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks() Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 09/41] drm: renesas: shmobile: Use %p4cc to print fourcc code Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 10/41] drm: renesas: shmobile: Add missing YCbCr formats Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 11/41] drm: renesas: shmobile: Improve shmob_drm_format_info table Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 12/41] drm: renesas: shmobile: Remove backlight support Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 13/41] drm: renesas: shmobile: Don't set display info width and height twice Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 14/41] drm: renesas: shmobile: Rename input clocks Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 15/41] drm: renesas: shmobile: Remove support for SYS panels Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 16/41] drm: renesas: shmobile: Improve error handling Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 17/41] drm: renesas: shmobile: Convert to use devm_request_irq() Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven [this message] 2023-08-16 9:50 ` [PATCH v3 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 19/41] drm: renesas: shmobile: Use drmm_universal_plane_alloc() Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 20/41] drm: renesas: shmobile: Embed drm_device in shmob_drm_device Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 21/41] drm: renesas: shmobile: Convert container helpers to static inline functions Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 22/41] drm: renesas: shmobile: Replace .dev_private with container_of() Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 23/41] drm: renesas: shmobile: Use struct videomode in platform data Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 24/41] drm: renesas: shmobile: Use media bus formats " Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 25/41] drm: renesas: shmobile: Move interface handling to connector setup Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 26/41] drm: renesas: shmobile: Unify plane allocation Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 27/41] drm: renesas: shmobile: Rename shmob_drm_crtc.crtc Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 28/41] drm: renesas: shmobile: Rename shmob_drm_connector.connector Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 29/41] drm: renesas: shmobile: Rename shmob_drm_plane.plane Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 30/41] drm: renesas: shmobile: Use drm_crtc_handle_vblank() Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 31/41] drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip() Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 32/41] drm: renesas: shmobile: Wait for page flip when turning CRTC off Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 33/41] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 34/41] drm: renesas: shmobile: Shutdown the display on remove Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 35/41] drm: renesas: shmobile: Cleanup encoder Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 36/41] drm: renesas: shmobile: Atomic conversion part 1 Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 37/41] drm: renesas: shmobile: Atomic conversion part 2 Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 38/41] drm: renesas: shmobile: Use suspend/resume helpers Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 39/41] drm: renesas: shmobile: Remove internal CRTC state tracking Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 40/41] drm: renesas: shmobile: Atomic conversion part 3 Geert Uytterhoeven 2023-08-16 9:50 ` Geert Uytterhoeven 2023-08-16 9:50 ` [PATCH v3 41/41] drm: renesas: shmobile: Add DT support Geert Uytterhoeven 2023-08-16 9:50 ` 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=4562ff5880d2d8681d62e0fcdca210bfd4778486.1692178020.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@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.