[Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile

[Rodrigo Vivi]

On Thu, May 11, 2023 at 12:28:28PM +0300, Jani Nikula wrote:
> The dsparb_lock may be coming back with [1] later, but adding it here is
> probably just a rebase leftover. Drop it.
> 
> [1] https://patchwork.freedesktop.org/patch/msgid/20230327161223.406573-1-rodrigo.vivi@intel.com

ouch...

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>


> 
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  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 437f623337e3..e36f88a39b86 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -264,9 +264,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 5d302602793c..12ba7cf78b1e 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -215,7 +215,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.39.2
>