On Thu, Nov 02, 2023 at 05:52:23PM +0200, Jani Nikula wrote: > The gem code has no business accessing i915->display directly. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display_driver.c | 1 + > drivers/gpu/drm/i915/i915_gem.c | 2 -- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c > b/drivers/gpu/drm/i915/display/intel_display_driver.c > index 0a5b922f2ad6..62f7b10484be 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c > @@ -181,6 +181,7 @@ void intel_display_driver_early_probe(struct > drm_i915_private *i915) > if (!HAS_DISPLAY(i915)) > return; > > + spin_lock_init(&i915->display.fb_tracking.lock); > mutex_init(&i915->display.backlight.lock); > mutex_init(&i915->display.audio.mutex); > mutex_init(&i915->display.wm.wm_mutex); > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index c166ad5e187a..92758b6b41f0 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1306,8 +1306,6 @@ void i915_gem_init_early(struct drm_i915_private > *dev_priv) > { > i915_gem_init__mm(dev_priv); > i915_gem_init__contexts(dev_priv); > - > - spin_lock_init(&dev_priv->display.fb_tracking.lock); > } > > void i915_gem_cleanup_early(struct drm_i915_private *dev_priv) > -- > 2.39.2 > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
