diff options
| author | Mika Kuoppala | 2018-11-09 15:53:32 +0100 |
|---|---|---|
| committer | Mika Kuoppala | 2018-11-14 10:37:40 +0100 |
| commit | 85f04aa569addbd66a8688dbce5e5f2a54bbb437 (patch) | |
| tree | 624329577d500a44b9d793746f837cec7b293e47 /drivers/gpu/drm/i915/intel_workarounds.c | |
| parent | drm/i915/icl: Drop spurious register read from icl_dbuf_slices_update (diff) | |
| download | kernel-qcow2-linux-85f04aa569addbd66a8688dbce5e5f2a54bbb437.tar.gz kernel-qcow2-linux-85f04aa569addbd66a8688dbce5e5f2a54bbb437.tar.xz kernel-qcow2-linux-85f04aa569addbd66a8688dbce5e5f2a54bbb437.zip | |
drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA
This got duplicated on introducing icl workarounds.
Fix by using the older definition and moving the wa bit
definition there. No functional changes.
v3: avoid fixes tag, whitespace (Chris)
References: 908ae0517363 ("drm/i915/icl: WaDisCtxReload")
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181109145333.10570-1-mika.kuoppala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_workarounds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_workarounds.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index d7176213e3ce..406ba5bab063 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -867,8 +867,9 @@ static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv) /* Wa_220166154:icl * Formerly known as WaDisCtxReload */ - I915_WRITE(GAMW_ECO_DEV_RW_IA_REG, I915_READ(GAMW_ECO_DEV_RW_IA_REG) | - GAMW_ECO_DEV_CTX_RELOAD_DISABLE); + I915_WRITE(GEN8_GAMW_ECO_DEV_RW_IA, + I915_READ(GEN8_GAMW_ECO_DEV_RW_IA) | + GAMW_ECO_DEV_CTX_RELOAD_DISABLE); /* Wa_1405779004:icl (pre-prod) */ if (IS_ICL_REVID(dev_priv, ICL_REVID_A0, ICL_REVID_A0)) |