tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Jonas Karlman and committed by
Heiko Stuebner 800f7c33 13fc2880

+3 -13
+3 -13
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 765 765 } 766 766 } 767 767 768 - static void vop_plane_destroy(struct drm_plane *plane) 769 - { 770 - drm_plane_cleanup(plane); 771 - } 772 - 773 768 static inline bool rockchip_afbc(u64 modifier) 774 769 { 775 770 return modifier == ROCKCHIP_AFBC_MOD; ··· 1125 1130 static const struct drm_plane_funcs vop_plane_funcs = { 1126 1131 .update_plane = drm_atomic_helper_update_plane, 1127 1132 .disable_plane = drm_atomic_helper_disable_plane, 1128 - .destroy = vop_plane_destroy, 1133 + .destroy = drm_plane_cleanup, 1129 1134 .reset = drm_atomic_helper_plane_reset, 1130 1135 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 1131 1136 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, ··· 1596 1601 .atomic_disable = vop_crtc_atomic_disable, 1597 1602 }; 1598 1603 1599 - static void vop_crtc_destroy(struct drm_crtc *crtc) 1600 - { 1601 - drm_crtc_cleanup(crtc); 1602 - } 1603 - 1604 1604 static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) 1605 1605 { 1606 1606 struct rockchip_crtc_state *rockchip_state; ··· 1700 1710 static const struct drm_crtc_funcs vop_crtc_funcs = { 1701 1711 .set_config = drm_atomic_helper_set_config, 1702 1712 .page_flip = drm_atomic_helper_page_flip, 1703 - .destroy = vop_crtc_destroy, 1713 + .destroy = drm_crtc_cleanup, 1704 1714 .reset = vop_crtc_reset, 1705 1715 .atomic_duplicate_state = vop_crtc_duplicate_state, 1706 1716 .atomic_destroy_state = vop_crtc_destroy_state, ··· 1951 1961 */ 1952 1962 list_for_each_entry_safe(plane, tmp, &drm_dev->mode_config.plane_list, 1953 1963 head) 1954 - vop_plane_destroy(plane); 1964 + drm_plane_cleanup(plane); 1955 1965 1956 1966 /* 1957 1967 * Destroy CRTC after vop_plane_destroy() since vop_disable_plane()