| Message ID | 20240510094313.3422982-2-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] drm/xe/display: remove unused xe->enabled_irq_mask | expand |
On 10-05-2024 15:13, Jani Nikula wrote: > Nothing in xe needs xe->sb_lock. None of the i915 display code using > ->sb_lock gets built with xe, and in any case that would be wrong as xe > uses gt->pcode.lock for this. > > Signed-off-by: Jani Nikula<jani.nikula@intel.com> > --- > drivers/gpu/drm/xe/display/xe_display.c | 2 -- > drivers/gpu/drm/xe/xe_device_types.h | 3 --- > 2 files changed, 5 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c > index fbe2c2eddea9..a2c39bcc7677 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -96,8 +96,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); > - > return drmm_add_action_or_reset(&xe->drm, display_destroy, NULL); > } > > diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h > index b78223e3baab..5c5e36de452a 100644 > --- a/drivers/gpu/drm/xe/xe_device_types.h > +++ b/drivers/gpu/drm/xe/xe_device_types.h > @@ -511,9 +511,6 @@ struct xe_device { > /* To shut up runtime pm macros.. */ > struct xe_runtime_pm {} runtime_pm; > > - /* For pcode */ > - struct mutex sb_lock; > - LGTM Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com> A patch [https://lore.kernel.org/all/buobxdew2jnbfblawfvnzwntexvhxkslqstsgp3xsxpexdtdem@gwnlli47tdkc/ ] was introduced that added handling for the return value of |drmm_mutex_init|for various display locks. As part of further cleanup's, other locks initialization apart from |sb->lock|were relocated to the display code. The current patch ensures we don't need to address it anymore. > /* only to allow build, not used functionally */ > u32 irq_mask; >
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index fbe2c2eddea9..a2c39bcc7677 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -96,8 +96,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); - return drmm_add_action_or_reset(&xe->drm, display_destroy, NULL); } diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index b78223e3baab..5c5e36de452a 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -511,9 +511,6 @@ struct xe_device { /* To shut up runtime pm macros.. */ struct xe_runtime_pm {} runtime_pm; - /* For pcode */ - struct mutex sb_lock; - /* only to allow build, not used functionally */ u32 irq_mask;
Nothing in xe needs xe->sb_lock. None of the i915 display code using ->sb_lock gets built with xe, and in any case that would be wrong as xe uses gt->pcode.lock for this. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/xe/display/xe_display.c | 2 -- drivers/gpu/drm/xe/xe_device_types.h | 3 --- 2 files changed, 5 deletions(-)