Re: [Intel-xe] [PATCH v2 rebased 1/6] drm/i915: Nuke unused dsparb_lock

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Mon, Apr 10, 2023 at 11:26:57AM -0400, Rodrigo Vivi wrote:
> On Mon, Apr 10, 2023 at 10:43:12AM -0400, Souza, Jose wrote:
> > On Thu, 2023-04-06 at 16:38 -0400, Rodrigo Vivi wrote:
> > > On Thu, Apr 06, 2023 at 07:31:28AM -0700, José Roberto de Souza wrote:
> > > > dsparb_lock it not used anymore, nuke it.
> > > 
> > > Well, this doesn't exist in our drm-tip baseline, so it would be good
> > > if this patch is a fixup! to whatever patch is adding this back here.
> > > 
> > > Take a look to the Jani series I just pushed:
> > > 
> > > https://lists.freedesktop.org/archives/intel-xe/2023-April/002000.html
> > > 
> > > I believe you should make this series on something more like that.
> > > so on a next step I run a rebase --autosquash and we get cleaner patches.
> > > 
> > > Also, I believe this series here might conflict with that, so I'm
> > > afraid you will have to rebase it anyway. Sorry about that...
> > 
> > Will skip this patch then, it will probably be gone in next rebase.
> 
> no. we do need to remove it. But the right way is with a
> fixup! drm/i915/display: Remaining changes to make xe compile
> 
> A patch that removes this dsparb_lock from the patch that is now incorrectly
> addding it in our xe tree.
> 
> > 
> > Can you please take a look at the other 5 patches before I send a new version?
> 
> I will take a look one by one...

done, but the i915 patches should first land in drm-intel-next and then
we backport them here or get on a rebase.

> 
> > 
> > > 
> > > > 
> > > > Cc: intel-gfx@lists.freedesktop.org
> > > > Signed-off-by: José Roberto de Souza <jose.souza@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 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
> > > > 
> >