Skip to content

Commit 9cc1973

Browse files
ribvsyrjala
authored andcommitted
drm/i915: fix for WaDisableDopClockGating:bdw
This workaround for BDW was incomplete as it also requires EUTC clock gating to be disabled via UCGCTL1. v2: read modify write UCGTL1 in broadwell_init_clock_gating (Ville) Signed-off-by: Robert Bragg <[email protected]> Cc: Ville Syrjälä <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]>
1 parent a937eaf commit 9cc1973

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

drivers/gpu/drm/i915/intel_pm.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7229,6 +7229,14 @@ static void broadwell_init_clock_gating(struct drm_i915_private *dev_priv)
72297229
| KVM_CONFIG_CHANGE_NOTIFICATION_SELECT);
72307230

72317231
lpt_init_clock_gating(dev_priv);
7232+
7233+
/* WaDisableDopClockGating:bdw
7234+
*
7235+
* Also see the CHICKEN2 write in bdw_init_workarounds() to disable DOP
7236+
* clock gating.
7237+
*/
7238+
I915_WRITE(GEN6_UCGCTL1,
7239+
I915_READ(GEN6_UCGCTL1) | GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE);
72327240
}
72337241

72347242
static void haswell_init_clock_gating(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_ringbuffer.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,11 @@ static int bdw_init_workarounds(struct intel_engine_cs *engine)
812812
/* WaDisableThreadStallDopClockGating:bdw (pre-production) */
813813
WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, STALL_DOP_GATING_DISABLE);
814814

815-
/* WaDisableDopClockGating:bdw */
815+
/* WaDisableDopClockGating:bdw
816+
*
817+
* Also see the related UCGTCL1 write in broadwell_init_clock_gating()
818+
* to disable EUTC clock gating.
819+
*/
816820
WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
817821
DOP_CLOCK_GATING_DISABLE);
818822

0 commit comments

Comments
 (0)