Skip to content

Commit bafa4fb

Browse files
ideakgregkh
authored andcommitted
drm/i915/bdw: Add missing delay during L3 SQC credit programming
commit d6a862fe8c48229ba342648bcd535b2404724603 upstream. BSpec requires us to wait ~100 clocks before re-enabling clock gating, so make sure we do this. CC: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462280061-1457-2-git-send-email-imre.deak@intel.com (cherry picked from commit 48e5d68d28f00c0cadac5a830980ff3222781abb) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent bf12e89 commit bafa4fb

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/gpu/drm/i915/intel_pm.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6620,6 +6620,12 @@ static void broadwell_init_clock_gating(struct drm_device *dev)
66206620
misccpctl = I915_READ(GEN7_MISCCPCTL);
66216621
I915_WRITE(GEN7_MISCCPCTL, misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE);
66226622
I915_WRITE(GEN8_L3SQCREG1, BDW_WA_L3SQCREG1_DEFAULT);
6623+
/*
6624+
* Wait at least 100 clocks before re-enabling clock gating. See
6625+
* the definition of L3SQCREG1 in BSpec.
6626+
*/
6627+
POSTING_READ(GEN8_L3SQCREG1);
6628+
udelay(1);
66236629
I915_WRITE(GEN7_MISCCPCTL, misccpctl);
66246630

66256631
/*

0 commit comments

Comments
 (0)