Skip to contentSkip to conversation

drm/virtio: remove drm_plane_cleanup() destroy hook

PATCH In review Danilo Krummrich 2 participants 2 messages Aug 3, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/virtio: remove drm_plane_cleanup() destroy hook

drmm_universal_plane_alloc() already registers drm_plane_cleanup() as managed release action via drmm_add_action_or_reset(). Hence, drm_plane_cleanup() should not be set as drm_plane_funcs.destroy hook.

Fixes 7847628862a8 ("drm/virtio: plane: use drm managed resources")
---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +0 -1
index c599c99f228e..4c09e313bebc 100644
@@ -69,7 +69,6 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
 static const struct drm_plane_funcs virtio_gpu_plane_funcs = {
 	.update_plane		= drm_atomic_helper_update_plane,
 	.disable_plane		= drm_atomic_helper_disable_plane,
-	.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,
Signature · 1 line
2.37.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Danilo,

Quoted 6 lines · Danilo Krummrich

drmm_universal_plane_alloc() already registers drm_plane_cleanup() as managed release action via drmm_add_action_or_reset(). Hence, drm_plane_cleanup() should not be set as drm_plane_funcs.destroy hook.

Fixes 7847628862a8 ("drm/virtio: plane: use drm managed resources")
Quoted 18 lines
---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +0 -1
index c599c99f228e..4c09e313bebc 100644
@@ -69,7 +69,6 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
 static const struct drm_plane_funcs virtio_gpu_plane_funcs = {
 	.update_plane		= drm_atomic_helper_update_plane,
 	.disable_plane		= drm_atomic_helper_disable_plane,
-	.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,
Signature · 1 line
2.37.1