Skip to content

Commit 50a9b7f

Browse files
committed
drm/xe/display: Fix double mutex initialization
All of these mutexes are already initialized by the display side since commit 3fef3e6 ("drm/i915: move display mutex inits to display code"), so the xe shouldn´t initialize them. Fixes: 44e6949 ("drm/xe/display: Implement display support") Cc: Jani Nikula <[email protected]> Cc: Arun R Murthy <[email protected]> Reviewed-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Lucas De Marchi <[email protected]> (cherry picked from commit 117de18) Signed-off-by: Lucas De Marchi <[email protected]>
1 parent fec50db commit 50a9b7f

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

drivers/gpu/drm/xe/display/xe_display.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ int xe_display_create(struct xe_device *xe)
108108
xe->display.hotplug.dp_wq = alloc_ordered_workqueue("xe-dp", 0);
109109

110110
drmm_mutex_init(&xe->drm, &xe->sb_lock);
111-
drmm_mutex_init(&xe->drm, &xe->display.backlight.lock);
112-
drmm_mutex_init(&xe->drm, &xe->display.audio.mutex);
113-
drmm_mutex_init(&xe->drm, &xe->display.wm.wm_mutex);
114-
drmm_mutex_init(&xe->drm, &xe->display.pps.mutex);
115-
drmm_mutex_init(&xe->drm, &xe->display.hdcp.hdcp_mutex);
116111
xe->enabled_irq_mask = ~0;
117112

118113
err = drmm_add_action_or_reset(&xe->drm, display_destroy, NULL);

0 commit comments

Comments
 (0)