[Intel-xe] [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings"

[Shankar, Uma]

> > -----Original Message-----
> > From: Borah, Chaitanya Kumar <chaitanya.kumar.borah at intel.com>
> > Sent: Tuesday, October 10, 2023 5:49 PM
> > To: intel-xe at lists.freedesktop.org
> > Cc: Shankar, Uma <uma.shankar at intel.com>; jani.nikula at linux.intel.com;
> > Borah, Chaitanya Kumar <chaitanya.kumar.borah at intel.com>
> > Subject: [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings"
> >
> > This reverts commit efdb834bbd7c6cd80e018dd0c0935070f2f27169.
> 
> Reviewed-by: Uma Shankar <uma.shankar at intel.com>

Pushed to drm-xe-next. Thanks for the patch.

Regards,
Uma Shankar

> > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index b28b4b718a2b..4b73db93d23d 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -4199,8 +4199,8 @@ static u16 hsw_linetime_wm(const struct
> > intel_crtc_state *crtc_state)
> >  	return min(linetime_wm, 0x1ff);
> >  }
> >
> > -static inline u16 hsw_ips_linetime_wm(const struct intel_crtc_state
> *crtc_state,
> > -				      const struct intel_cdclk_state *cdclk_state)
> > +static u16 hsw_ips_linetime_wm(const struct intel_crtc_state *crtc_state,
> > +			       const struct intel_cdclk_state *cdclk_state)
> >  {
> >  	const struct drm_display_mode *pipe_mode =
> >  		&crtc_state->hw.pipe_mode;
> > @@ -4243,7 +4243,7 @@ static int hsw_compute_linetime_wm(struct
> > intel_atomic_state *state,
> >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> >  	struct intel_crtc_state *crtc_state =
> >  		intel_atomic_get_new_crtc_state(state, crtc);
> > -	__maybe_unused const struct intel_cdclk_state *cdclk_state;
> > +	const struct intel_cdclk_state *cdclk_state;
> >
> >  	if (DISPLAY_VER(dev_priv) >= 9)
> >  		crtc_state->linetime = skl_linetime_wm(crtc_state);
> > --
> > 2.25.1