Fix GPU Hang on BYT
Subsystems (2)
PATCH 1/1 Fix GPU Hang on BYT
On certain OpenGL benchmark applications, setting this bit results in frequent GPU hangs. On BYT-M/I, the hangs go away by not setting this bit.
--- drivers/gpu/drm/i915/intel_pm.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -3
@@ -5004,9 +5004,6 @@ static void valleyview_init_clock_gating(struct drm_device *dev)_MASKED_BIT_ENABLE (GEN7_MAX_PS_THREAD_DEP | GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); -/* WaDisableL3CacheAging:vlv */ -I915_WRITE (GEN7_L3CNTLREG1 ,I915_READ (GEN7_L3CNTLREG1 ) |GEN7_L3AGDIS ); -/* WaForceL3Serialization:vlv */ I915_WRITE (GEN7_L3SQCREG4 ,I915_READ (GEN7_L3SQCREG4 ) & ~L3SQ_URB_READ_CAM_MATCH_DISABLE );
Signature · 1 line
1.8.1.4
PATCH 1/1 drm/i915: Revert workaround for disabling L3 cache aging on BYT
V2: edit the commit message to contain more info
The W/A spreadsheet says this is still required, but the b-spec says it's not for BYT-T. So the documentation is not clear. However, our experience with the other SKUs of BYT-I/M on Android and Linux suggests that setting this bit actually causes GPU hang for certain OGL benchmark applications.
Removing this bit completely resolves the GPU hangs.
--- drivers/gpu/drm/i915/intel_pm.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -3
@@ -5004,9 +5004,6 @@ static void valleyview_init_clock_gating(struct drm_device *dev)_MASKED_BIT_ENABLE (GEN7_MAX_PS_THREAD_DEP | GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); -/* WaDisableL3CacheAging:vlv */ -I915_WRITE (GEN7_L3CNTLREG1 ,I915_READ (GEN7_L3CNTLREG1 ) |GEN7_L3AGDIS ); -/* WaForceL3Serialization:vlv */ I915_WRITE (GEN7_L3SQCREG4 ,I915_READ (GEN7_L3SQCREG4 ) & ~L3SQ_URB_READ_CAM_MATCH_DISABLE );
Signature · 1 line
1.8.1.4
Re: [PATCH] drm/i915: Revert workaround for disabling L3 cache aging on BYT
Quoted 17 lines · On Wed, 19 Feb 2014 13:09:31 -0800 Sinclair Yeh <[email protected]> wrote:
V2: edit the commit message to contain more info
The W/A spreadsheet says this is still required, but the b-spec says it's not for BYT-T. So the documentation is not clear. However, our experience with the other SKUs of BYT-I/M on Android and Linux suggests that setting this bit actually causes GPU hang for certain OGL benchmark applications.Removing this bit completely resolves the GPU hangs.
--- drivers/gpu/drm/i915/intel_pm.c | 3 --- 1 file changed, 3 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void valleyview_init_clock_gating(struct drm_device *dev) · line 5009
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +0
-3@@ -5004,9 +5004,6 @@ static void valleyview_init_clock_gating(struct drm_device *dev)_MASKED_BIT_ENABLE (GEN7_MAX_PS_THREAD_DEP | GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); -/* WaDisableL3CacheAging:vlv */ -I915_WRITE (GEN7_L3CNTLREG1 ,I915_READ (GEN7_L3CNTLREG1 ) |GEN7_L3AGDIS ); -/* WaForceL3Serialization:vlv */ I915_WRITE (GEN7_L3SQCREG4 ,I915_READ (GEN7_L3SQCREG4 ) & ~L3SQ_URB_READ_CAM_MATCH_DISABLE );
I don't think we have good docs on this, but since it works empirically:
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Daniel Vetter
AppliedRe: [PATCH] drm/i915: Revert workaround for disabling L3 cache aging on BYT
Quoted 11 lines · Jesse Barnes
Quoted 8 lines · On Wed, 19 Feb 2014 13:09:31 -0800 Sinclair Yeh <[email protected]> wrote:
V2: edit the commit message to contain more info
The W/A spreadsheet says this is still required, but the b-spec says it's not for BYT-T. So the documentation is not clear. However, our experience with the other SKUs of BYT-I/M on Android and Linux suggests that setting this bit actually causes GPU hang for certain OGL benchmark applications.Removing this bit completely resolves the GPU hangs.
Your sob is missing. Please see the developer's certificate of origin so that you're aware of what you actually sign off on. Since you work for the same company I've snuck this in ;-)
Quoted 21 lines
Quoted 9 lines
--- drivers/gpu/drm/i915/intel_pm.c | 3 --- 1 file changed, 3 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void valleyview_init_clock_gating(struct drm_device *dev) · line 5009
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +0
-3@@ -5004,9 +5004,6 @@ static void valleyview_init_clock_gating(struct drm_device *dev)_MASKED_BIT_ENABLE (GEN7_MAX_PS_THREAD_DEP | GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); -/* WaDisableL3CacheAging:vlv */ -I915_WRITE (GEN7_L3CNTLREG1 ,I915_READ (GEN7_L3CNTLREG1 ) |GEN7_L3AGDIS ); -/* WaForceL3Serialization:vlv */ I915_WRITE (GEN7_L3SQCREG4 ,I915_READ (GEN7_L3SQCREG4 ) & ~L3SQ_URB_READ_CAM_MATCH_DISABLE );I don't think we have good docs on this, but since it works empirically:
Quoted 1 line
Acked-by Jesse Barnes <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch