drm/i915: drop WaMbcDriverBootEnable workaround
Subsystems (2)
PATCH 1/1 drm/i915: drop WaMbcDriverBootEnable workaround
Turns out the BIOS will do this for us as needed, and if we try to do it again we risk hangs or other bad behavior.
--- drivers/gpu/drm/i915/intel_pm.c | 17 ----------------- 1 file changed, 17 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -17
@@ -4864,10 +4864,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)ILK_DPARBUNIT_CLOCK_GATE_ENABLE | ILK_DPFDUNIT_CLOCK_GATE_ENABLE); -/* WaMbcDriverBootEnable:snb */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); -g4x_disable_trickle_feed (dev);/* The default value should be 0x200 according to docs, but the two
@@ -4963,10 +4959,6 @@ static void haswell_init_clock_gating(struct drm_device *dev)I915_WRITE (CACHE_MODE_1 ,_MASKED_BIT_ENABLE (PIXEL_SUBSPAN_COLLECT_OPT_DISABLE )); -/* WaMbcDriverBootEnable:hsw */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); -/* WaSwitchSolVfFArbitrationPriority:hsw */ I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |HSW_ECOCHK_ARB_PRIO_SOL );
@@ -5050,10 +5042,6 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)g4x_disable_trickle_feed (dev); -/* WaMbcDriverBootEnable:ivb */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); -/* WaVSRefCountFullforceMissDisable:ivb */ gen7_setup_fixed_func_scheduler (dev_priv);
@@ -5113,11 +5101,6 @@ static void valleyview_init_clock_gating(struct drm_device *dev)I915_READ (GEN7_SQ_CHICKEN_MBCUNIT_CONFIG ) | GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB); -/* WaMbcDriverBootEnable:vlv */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); - -/* According to the BSpec vol1g, bit 12 (RCPBUNIT) clock * gating disable must be set. Failure to set it results in * flickering pixels due to Z write ordering failures after
Signature · 1 line
1.7.9.5
Quoted 4 lines · Jesse Barnes
Turns out the BIOS will do this for us as needed, and if we try to do it again we risk hangs or other bad behavior.
Signed-off-by Jesse Barnes <[email protected]>
Regressing commit citation missing and also cc: stable I guess? -Daniel
Quoted 60 lines
--- drivers/gpu/drm/i915/intel_pm.c | 17 ----------------- 1 file changed, 17 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-17@@ -4864,10 +4864,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)ILK_DPARBUNIT_CLOCK_GATE_ENABLE | ILK_DPFDUNIT_CLOCK_GATE_ENABLE); -/* WaMbcDriverBootEnable:snb */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); -g4x_disable_trickle_feed (dev);/* The default value should be 0x200 according to docs, but the two @@ -4963,10 +4959,6 @@ static void haswell_init_clock_gating(struct drm_device *dev)I915_WRITE (CACHE_MODE_1 ,_MASKED_BIT_ENABLE (PIXEL_SUBSPAN_COLLECT_OPT_DISABLE )); -/* WaMbcDriverBootEnable:hsw */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); -/* WaSwitchSolVfFArbitrationPriority:hsw */ I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |HSW_ECOCHK_ARB_PRIO_SOL );@@ -5050,10 +5042,6 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)g4x_disable_trickle_feed (dev); -/* WaMbcDriverBootEnable:ivb */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); -/* WaVSRefCountFullforceMissDisable:ivb */ gen7_setup_fixed_func_scheduler (dev_priv);@@ -5113,11 +5101,6 @@ static void valleyview_init_clock_gating(struct drm_device *dev)I915_READ (GEN7_SQ_CHICKEN_MBCUNIT_CONFIG ) | GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB); -/* WaMbcDriverBootEnable:vlv */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); - -/* According to the BSpec vol1g, bit 12 (RCPBUNIT) clock * gating disable must be set. Failure to set it results in * flickering pixels due to Z write ordering failures after Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 7 lines · On Wed, 21 Aug 2013 23:23:04 +0200 Daniel Vetter <[email protected]> wrote:
Quoted 4 lines · Jesse Barnes
Turns out the BIOS will do this for us as needed, and if we try to do it again we risk hangs or other bad behavior.
Signed-off-by Jesse Barnes <[email protected]>Regressing commit citation missing and also cc: stable I guess?
If you want, I think we've only had this reported on Chrome, which probably doesn't need it in stable...
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 7 lines · Jesse Barnes
Quoted 4 lines · On Wed, 21 Aug 2013 23:23:04 +0200 Daniel Vetter <[email protected]> wrote:
Quoted 3 lines · Jesse Barnes
Turns out the BIOS will do this for us as needed, and if we try to do it again we risk hangs or other bad behavior.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Jesse Barnes <[email protected]>Regressing commit citation missing and also cc: stable I guess?
If you want, I think we've only had this reported on Chrome, which probably doesn't need it in stable...
Added plus the t-d from Stephane plus the regressing citation. I'm just not a grumpy enough maintainer it seems ;-)
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch