dsparb_lock it not used anymore, nuke it. Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_display_core.h | 3 --- drivers/gpu/drm/i915/i915_driver.c | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h index cc058eb303ee8..d2346d43d1162 100644 --- a/drivers/gpu/drm/i915/display/intel_display_core.h +++ b/drivers/gpu/drm/i915/display/intel_display_core.h @@ -266,9 +266,6 @@ struct intel_wm { */ struct mutex wm_mutex; - /* protects DSPARB registers on pre-g4x/vlv/chv */ - spinlock_t dsparb_lock; - bool ipc_enabled; }; diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 066d79c2069c4..ea2cc56d18a6e 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -214,7 +214,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) spin_lock_init(&dev_priv->irq_lock); spin_lock_init(&dev_priv->gpu_error.lock); spin_lock_init(&dev_priv->display.fb_tracking.lock); - spin_lock_init(&dev_priv->display.wm.dsparb_lock); mutex_init(&dev_priv->display.backlight.lock); mutex_init(&dev_priv->sb_lock); -- 2.40.0