| Message ID | 20250227-xe3lpd-wa-14020863754-v2-1-92b35de1c563@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/audio: Extend Wa_14020863754 to Xe3_LPD | expand |
On Thu, Feb 27, 2025 at 05:28:17PM -0300, Gustavo Sousa wrote: > Wa_14020863754 applies to the display IP, so we should be checking on > display IP version instead of platform. So, let's replace > display->platform.battlemage with the proper IP version check (14.01 for > Xe2_HPD). > > Furthermore, for workarounds, we should be checking on full IP versions > to avoid applying the workaround to some variant of the IP that could > theoretically appear in the future (which is likely to have a different > minor release number), since the issue addressed by the workaround could > be fixed in such new release. > > Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_audio.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c > index aaba438ab41e3c1c06d609593dc40dff33785d3a..115c30a5ff70063850e45ab40527d1c17d0173b4 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio.c > +++ b/drivers/gpu/drm/i915/display/intel_audio.c > @@ -190,7 +190,8 @@ static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = { > */ > static bool needs_wa_14020863754(struct intel_display *display) > { > - return DISPLAY_VER(display) == 20 || display->platform.battlemage; > + return DISPLAY_VERx100(display) == 2000 || > + DISPLAY_VERx100(display) == 1401; > } > > /* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ > > -- > 2.48.1 >
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index aaba438ab41e3c1c06d609593dc40dff33785d3a..115c30a5ff70063850e45ab40527d1c17d0173b4 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -190,7 +190,8 @@ static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = { */ static bool needs_wa_14020863754(struct intel_display *display) { - return DISPLAY_VER(display) == 20 || display->platform.battlemage; + return DISPLAY_VERx100(display) == 2000 || + DISPLAY_VERx100(display) == 1401; } /* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */
Wa_14020863754 applies to the display IP, so we should be checking on display IP version instead of platform. So, let's replace display->platform.battlemage with the proper IP version check (14.01 for Xe2_HPD). Furthermore, for workarounds, we should be checking on full IP versions to avoid applying the workaround to some variant of the IP that could theoretically appear in the future (which is likely to have a different minor release number), since the issue addressed by the workaround could be fixed in such new release. Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> --- drivers/gpu/drm/i915/display/intel_audio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)