From 8007a35396adfdf46f6e13a187f8fcabb861cdf3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Aug 2023 12:05:07 +0200 Subject: [PATCH] drop queue-5.15/drm-fsl-dcu-use-drm_plane_helper_destroy.patch --- ...fsl-dcu-use-drm_plane_helper_destroy.patch | 46 ------------------- queue-5.15/series | 1 - 2 files changed, 47 deletions(-) delete mode 100644 queue-5.15/drm-fsl-dcu-use-drm_plane_helper_destroy.patch diff --git a/queue-5.15/drm-fsl-dcu-use-drm_plane_helper_destroy.patch b/queue-5.15/drm-fsl-dcu-use-drm_plane_helper_destroy.patch deleted file mode 100644 index 0b5f11bb300..00000000000 --- a/queue-5.15/drm-fsl-dcu-use-drm_plane_helper_destroy.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4ce2adea8fbf96444a6665d026114193ffb26e46 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Jul 2022 10:30:58 +0200 -Subject: drm/fsl-dcu: Use drm_plane_helper_destroy() - -From: Thomas Zimmermann - -[ Upstream commit a4d847df8b440cc667c18f99abe84ccaa83afac4 ] - -Replace the driver's own function with drm_plane_helper_destroy(). No -functional changes. - -Signed-off-by: Thomas Zimmermann -Reviewed-by: Sam Ravnborg -Link: https://patchwork.freedesktop.org/patch/msgid/20220720083058.15371-8-tzimmermann@suse.de -Stable-dep-of: ee31742bf176 ("drm/imx/ipuv3: Fix front porch adjustment upon hactive aligning") -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c -index 8fe953d6e0a94..8a9e6db71e46b 100644 ---- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c -+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c -@@ -170,16 +170,10 @@ static const struct drm_plane_helper_funcs fsl_dcu_drm_plane_helper_funcs = { - .atomic_update = fsl_dcu_drm_plane_atomic_update, - }; - --static void fsl_dcu_drm_plane_destroy(struct drm_plane *plane) --{ -- drm_plane_cleanup(plane); -- kfree(plane); --} -- - static const struct drm_plane_funcs fsl_dcu_drm_plane_funcs = { - .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, -- .destroy = fsl_dcu_drm_plane_destroy, -+ .destroy = drm_plane_helper_destroy, - .disable_plane = drm_atomic_helper_disable_plane, - .reset = drm_atomic_helper_plane_reset, - .update_plane = drm_atomic_helper_update_plane, --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 570b8f9fadd..3f5afb04343 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -82,7 +82,6 @@ mtd-rawnand-rockchip-fix-oobfree-offset-and-descript.patch mtd-rawnand-rockchip-align-hwecc-vs.-raw-page-helper.patch mtd-rawnand-fsl_upm-fix-an-off-by-one-test-in-fun_ex.patch powerpc-mm-altmap-fix-altmap-boundary-check.patch -drm-fsl-dcu-use-drm_plane_helper_destroy.patch drm-imx-ipuv3-fix-front-porch-adjustment-upon-hactiv.patch selftests-rseq-check-if-libc-rseq-support-is-registe.patch selftests-rseq-play-nice-with-binaries-statically-li.patch -- 2.47.3