drm/i915: don't implement WaDisableEarlyCull for Haswell
Subsystems (2)
PATCH 1/1 drm/i915: don't implement WaDisableEarlyCull for Haswell
From: Paulo Zanoni <[email protected]>
Introduced in commit 87f8020ec9e3069597746040a4e8655189bc0c1a:
drm/i915: implement WaDisableEarlyCull for VLV and IVB
Notice that the original patch sent to the mailing list did not include the Haswell chunk, it was added later.
The bit set by the commit does not exist on Haswell machines (at least that's what the documentation says). Also, the commit gives me a GPU hang every time we're loading the driver. So let's revert the Haswell chunk, making the patch do only what its title actually says.
--- drivers/gpu/drm/i915/intel_pm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -3470,10 +3470,6 @@ static void haswell_init_clock_gating(struct drm_device *dev)*/ I915_WRITE (GEN6_UCGCTL2 ,GEN6_RCZUNIT_CLOCK_GATE_DISABLE ); -/* WaDisableEarlyCull */ -I915_WRITE (_3D_CHICKEN3, -_MASKED_BIT_ENABLE (_3D_CHICKEN_SF_DISABLE_OBJEND_CULL)); -/* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */ I915_WRITE (GEN7_COMMON_SLICE_CHICKEN1 ,GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC );
Signature · 1 line
1.7.11.4
Quoted 8 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Introduced in commit
87f8020ec9e3069597746040a4e8655189bc0c1a:
drm/i915: implement WaDisableEarlyCull for VLV and IVBNotice that the original patch sent to the mailing list did not include the Haswell chunk, it was added later.
Quoted 6 lines
The bit set by the commit does not exist on Haswell machines (at least that's what the documentation says). Also, the commit gives me a GPU hang every time we're loading the driver. So let's revert the Haswell chunk, making the patch do only what its title actually says.
Signed-off-by Paulo Zanoni <[email protected]>
Indeed the bit definition has disappeared in the documentation, but the wa is listed in the wa database. A hang is very handy to decide who is right :)
Signature · 1 line
Damien
Daniel Vetter
AppliedQuoted 14 lines · Damien
Quoted 13 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Introduced in commit
87f8020ec9e3069597746040a4e8655189bc0c1a:
drm/i915: implement WaDisableEarlyCull for VLV and IVBNotice that the original patch sent to the mailing list did not include the Haswell chunk, it was added later.
The bit set by the commit does not exist on Haswell machines (at least that's what the documentation says). Also, the commit gives me a GPU hang every time we're loading the driver. So let's revert the Haswell chunk, making the patch do only what its title actually says.
Quoted 7 lines
Quoted 1 line
Signed-off-by Paulo Zanoni <[email protected]>Indeed the bit definition has disappeared in the documentation, but the wa is listed in the wa database. A hang is very handy to decide who is right :)
Reviewed-by Damien Lespiau <[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