drm/i915: move display spinlock init to display code

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231102155223.2298316-2-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 0a5b922f2ad6f239354fcc6e565afc18e7da24a2..62f7b10484bec69f283a78d89926cf8253b95b0d 100644 (file)
--- 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 147d5b95b9ac2a7b6b01746e73d81bf1e1ec00cb..c9caa86387898b171d67701edeca4f6221b5d8ac 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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)