Commit 607a2c64 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move display spinlock init to display code 



The gem code has no business accessing i915->display directly.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231102155223.2298316-2-jani.nikula@intel.com
parent 3fef3e6f

drivers/gpu/drm/i915/display/intel_display_driver.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_gem.c

+0 −2
Original line number Diff line number Diff line
@@ -1301,8 +1301,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)