72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From 800f7c332df7cd9614c416fd005a6bb53f96f13c Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Wed, 21 Jun 2023 22:33:18 +0000
|
|
Subject: [PATCH] drm/rockchip: vop: Use cleanup helper directly as destroy
|
|
funcs
|
|
|
|
vop_plane_destroy and vop_crtc_destroy are plain wrappers around
|
|
drm_plane_cleanup and drm_crtc_cleanup. Use them directly as plane and
|
|
crtc funcs to closer match VOP2 driver.
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20230621223311.2239547-3-jonas@kwiboo.se
|
|
---
|
|
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 16 +++-------------
|
|
1 file changed, 3 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
@@ -773,11 +773,6 @@ out:
|
|
}
|
|
}
|
|
|
|
-static void vop_plane_destroy(struct drm_plane *plane)
|
|
-{
|
|
- drm_plane_cleanup(plane);
|
|
-}
|
|
-
|
|
static inline bool rockchip_afbc(u64 modifier)
|
|
{
|
|
return modifier == ROCKCHIP_AFBC_MOD;
|
|
@@ -1139,7 +1134,7 @@ static const struct drm_plane_helper_fun
|
|
static const struct drm_plane_funcs vop_plane_funcs = {
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
- .destroy = vop_plane_destroy,
|
|
+ .destroy = drm_plane_cleanup,
|
|
.reset = drm_atomic_helper_plane_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
@@ -1614,11 +1609,6 @@ static const struct drm_crtc_helper_func
|
|
.atomic_disable = vop_crtc_atomic_disable,
|
|
};
|
|
|
|
-static void vop_crtc_destroy(struct drm_crtc *crtc)
|
|
-{
|
|
- drm_crtc_cleanup(crtc);
|
|
-}
|
|
-
|
|
static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc)
|
|
{
|
|
struct rockchip_crtc_state *rockchip_state;
|
|
@@ -1726,7 +1716,7 @@ vop_crtc_verify_crc_source(struct drm_cr
|
|
static const struct drm_crtc_funcs vop_crtc_funcs = {
|
|
.set_config = drm_atomic_helper_set_config,
|
|
.page_flip = drm_atomic_helper_page_flip,
|
|
- .destroy = vop_crtc_destroy,
|
|
+ .destroy = drm_crtc_cleanup,
|
|
.reset = vop_crtc_reset,
|
|
.atomic_duplicate_state = vop_crtc_duplicate_state,
|
|
.atomic_destroy_state = vop_crtc_destroy_state,
|
|
@@ -1977,7 +1967,7 @@ static void vop_destroy_crtc(struct vop
|
|
*/
|
|
list_for_each_entry_safe(plane, tmp, &drm_dev->mode_config.plane_list,
|
|
head)
|
|
- vop_plane_destroy(plane);
|
|
+ drm_plane_cleanup(plane);
|
|
|
|
/*
|
|
* Destroy CRTC after vop_plane_destroy() since vop_disable_plane()
|