On Fri, 05 Apr 2024, Lucas De Marchi <[email protected]> wrote: > All of these mutexes are already initialized by the display side since > commit 3fef3e6ff86a ("drm/i915: move display mutex inits to display > code"), so the xe shouldn´t initialize them. > > Fixes: 44e694958b95 ("drm/xe/display: Implement display support") > Cc: Jani Nikula <[email protected]> > Cc: Arun R Murthy <[email protected]> > Signed-off-by: Lucas De Marchi <[email protected]>
Yeah, whether they should be initialized with drmm_* is another matter. Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/xe/display/xe_display.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_display.c > b/drivers/gpu/drm/xe/display/xe_display.c > index e4db069f0db3..6ec375c1c4b6 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -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); -- Jani Nikula, Intel
