drm/i915: Move WaDisableDopClockGating:skl to skl_init_clock_gating()
It's silly to have if(SKL) checks in gen9_init_clock_gating() when we can just move those bits into skl_init_clock_gating(). I'm not entirely convinced we even need this w/a, or if we do then maybe we want it for kbl/cfl as well. IIRC it was only listed in the wadb, but that is now dead so can't double check anymore. Bspec doesn't seem to have any purely skl specific DOP clock gating workarounds listed. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200716190426.17047-1-ville.syrjala@linux.intel.com Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
parent
81619f4a75
commit
f1421190d0
1 changed files with 4 additions and 6 deletions
|
@ -100,12 +100,6 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
|
|||
*/
|
||||
I915_WRITE(DISP_ARB_CTL, I915_READ(DISP_ARB_CTL) |
|
||||
DISP_FBC_MEMORY_WAKE);
|
||||
|
||||
if (IS_SKYLAKE(dev_priv)) {
|
||||
/* WaDisableDopClockGating */
|
||||
I915_WRITE(GEN7_MISCCPCTL, I915_READ(GEN7_MISCCPCTL)
|
||||
& ~GEN7_DOP_CLOCK_GATE_ENABLE);
|
||||
}
|
||||
}
|
||||
|
||||
static void bxt_init_clock_gating(struct drm_i915_private *dev_priv)
|
||||
|
@ -7251,6 +7245,10 @@ static void skl_init_clock_gating(struct drm_i915_private *dev_priv)
|
|||
{
|
||||
gen9_init_clock_gating(dev_priv);
|
||||
|
||||
/* WaDisableDopClockGating:skl */
|
||||
I915_WRITE(GEN7_MISCCPCTL, I915_READ(GEN7_MISCCPCTL) &
|
||||
~GEN7_DOP_CLOCK_GATE_ENABLE);
|
||||
|
||||
/* WAC6entrylatency:skl */
|
||||
I915_WRITE(FBC_LLC_READ_CTRL, I915_READ(FBC_LLC_READ_CTRL) |
|
||||
FBC_LLC_FULLY_OPEN);
|
||||
|
|
Loading…
Add table
Reference in a new issue