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

[Jani Nikula]

On Wed, 27 Sep 2023, "Shankar, Uma" <uma.shankar at intel.com> wrote:
>> -----Original Message-----
>> From: Borah, Chaitanya Kumar <chaitanya.kumar.borah at intel.com>
>> Sent: Monday, September 18, 2023 12:43 PM
>> To: intel-xe at lists.freedesktop.org
>> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah at intel.com>; Nikula, Jani
>> <jani.nikula at intel.com>; Shankar, Uma <uma.shankar at intel.com>
>> Subject: [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings"
>>
>> This reverts commit 004360063d3b8a29cdf599ed18dc6a23c6e61513.
>>
>> There seems to be no effect of this patch i.e. removing this patch yields no
>> compiler warnings. Hence, revert.
>
> Hi Jani,
> Reverting the change is not resulting in any warnings. Do we really need it or
> are we missing something.

It may have been fixed by earlier changes. If it builds, it's good.

BR,
Jani.

>
> Regards,
> Uma Shankar
>
>> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>
>>
>> Cc: Jani Nikula <jani.nikula at intel.com>
>> Cc: Uma Shankar <uma.shankar 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 9df8081f78d9..d0ec09621fe4 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -4195,8 +4195,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;
>> @@ -4239,7 +4239,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
>

-- 
Jani Nikula, Intel