drm/i915/adl_s: Wa_14011765242 is also needed on A1 display stepping

Extend the workaround bound to include A1 display.

Bspec: 54370
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210717051426.4120328-5-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index d2a514d2551da836d4ef84810280a07296431c5c..dd63dd2c45ad2445dc34413f8477caafb4a10a32 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -261,8 +261,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
        struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
        enum pipe pipe;
 
-       /* Wa_14011765242: adl-s A0 */
-       if (IS_ADLS_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0))
+       /* Wa_14011765242: adl-s A0,A1 */
+       if (IS_ADLS_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A1))
                for_each_pipe(dev_priv, pipe)
                        runtime->num_scalers[pipe] = 0;
        else if (GRAPHICS_VER(dev_priv) >= 10) {

diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h
index 88a77159703e57a3d611ce3efc6b1df1432aecc1..41567d9b7c352c1701343bb067a5b8fd25544087 100644 (file)
--- a/drivers/gpu/drm/i915/intel_step.h
+++ b/drivers/gpu/drm/i915/intel_step.h
@@ -22,6 +22,7 @@ struct intel_step_info {
 enum intel_step {
        STEP_NONE = 0,
        STEP_A0,
+       STEP_A1,
        STEP_A2,
        STEP_B0,
        STEP_B1,