Commit 50a9b7fc authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/xe/display: Fix double mutex initialization 



All of these mutexes are already initialized by the display side since
commit 3fef3e6f ("drm/i915: move display mutex inits to display
code"), so the xe shouldn´t initialize them.

Fixes: 44e69495 ("drm/xe/display: Implement display support")
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240405200711.2041428-1-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit 117de185)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent fec50db7

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

+0 −5
Original line number Diff line number Diff line
@@ -108,11 +108,6 @@ int xe_display_create(struct xe_device *xe) 
	xe->display.hotplug.dp_wq = alloc_ordered_workqueue("xe-dp", 0);



	drmm_mutex_init(&xe->drm, &xe->sb_lock);

	drmm_mutex_init(&xe->drm, &xe->display.backlight.lock);

	drmm_mutex_init(&xe->drm, &xe->display.audio.mutex);

	drmm_mutex_init(&xe->drm, &xe->display.wm.wm_mutex);

	drmm_mutex_init(&xe->drm, &xe->display.pps.mutex);

	drmm_mutex_init(&xe->drm, &xe->display.hdcp.hdcp_mutex);

	xe->enabled_irq_mask = ~0;



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