diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-01-22 14:32:45 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-02-04 05:45:01 -0500 |
commit | 94825369fe046696c7b472e14f4f76a63956b2d3 (patch) | |
tree | 77043756682817afab52dafb14c17edb13d54474 /drivers/gpu/drm | |
parent | 412236c2c1bdc7cc471ca8d190b90549a509b638 (diff) |
drm/i915: Drop WaDisablePSDDualDispatchEnable:ivb for IVB GT2
Both Bspec and the W/A database state that WaDisablePSDDualDispatchEnable
is only needed for IVB GT1.
The only real confusion here is that the the W/A database also says to
write to the GT2 only register as well, which is strange if the W/A is
only for GT1.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 987e8312641e..df18bb6ffb6f 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -4825,13 +4825,6 @@ static void ivybridge_init_clock_gating(struct drm_device *dev) | |||
4825 | if (IS_IVB_GT1(dev)) | 4825 | if (IS_IVB_GT1(dev)) |
4826 | I915_WRITE(GEN7_HALF_SLICE_CHICKEN1, | 4826 | I915_WRITE(GEN7_HALF_SLICE_CHICKEN1, |
4827 | _MASKED_BIT_ENABLE(GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); | 4827 | _MASKED_BIT_ENABLE(GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); |
4828 | else { | ||
4829 | /* must write both registers */ | ||
4830 | I915_WRITE(GEN7_HALF_SLICE_CHICKEN1, | ||
4831 | _MASKED_BIT_ENABLE(GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); | ||
4832 | I915_WRITE(GEN7_HALF_SLICE_CHICKEN1_GT2, | ||
4833 | _MASKED_BIT_ENABLE(GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); | ||
4834 | } | ||
4835 | 4828 | ||
4836 | /* Apply the WaDisableRHWOOptimizationForRenderHang:ivb workaround. */ | 4829 | /* Apply the WaDisableRHWOOptimizationForRenderHang:ivb workaround. */ |
4837 | I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1, | 4830 | I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1, |