Re: [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y

["Ville Syrjälä" <ville.syrjala@linux.intel.com>]

On Mon, Mar 13, 2023 at 12:44:52PM +0200, Ville Syrjälä wrote:
> On Mon, Mar 13, 2023 at 11:39:13AM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Remove the unused i915 variable to fix the build with WERROR=y.
> 
> Argh. Turns out this is actually caused by
> commit 69ea87e1591a ("drm/i915/dg1: Drop support for pre-production steppings")
> being merged through drm-intel-next instead of drm-intel-gt-next.
> 
> So both drm-intel-next and drm-intel-gt-next still needs that i915
> pointer, and only when both are merged to drm-tip we need to get
> rid of it.
> 
> In the future it would be better to stick to the gt vs. not-gt
> split more rigorously to avoid such issues.
> 
> I guess I'll need to do a fixup patch now...

Fixup in place, drm-tip builds again.

> 
> > 
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Fixes: d1b3657fb5b6 ("drm/i915: Remove redundant check for DG1")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> > index 90af399cb0a3..e7ee24bcad89 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> > @@ -1476,8 +1476,6 @@ gen12_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> >  static void
> >  dg1_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> >  {
> > -	struct drm_i915_private *i915 = gt->i915;
> > -
> >  	gen12_gt_workarounds_init(gt, wal);
> >  
> >  	/* Wa_1409420604:dg1 */
> > -- 
> > 2.39.2
> 
> -- 
> Ville Syrjälä
> Intel

-- 
Ville Syrjälä
Intel