Revert "drm/i915: Enable RC6 on Ironlake."
This reverts commit ce17178094
.
This commit has been independently bisected a few times as being the cause
of a s2ram failure.
Reported-and-tested-by: Kyle McMartin <kyle@mcmartin.ca>
Reported-and-tested-by: Andy Isaacson <adi@hexapodia.org>
Cc: Zou Nan hai <nanhai.zou@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
parent
8554048070
commit
bc41606aef
|
@ -5696,8 +5696,7 @@ void intel_init_clock_gating(struct drm_device *dev)
|
|||
ILK_DPFC_DIS2 |
|
||||
ILK_CLK_FBC);
|
||||
}
|
||||
if (IS_GEN6(dev))
|
||||
return;
|
||||
return;
|
||||
} else if (IS_G4X(dev)) {
|
||||
uint32_t dspclk_gate;
|
||||
I915_WRITE(RENCLK_GATE_D1, 0);
|
||||
|
@ -5758,11 +5757,9 @@ void intel_init_clock_gating(struct drm_device *dev)
|
|||
OUT_RING(MI_FLUSH);
|
||||
ADVANCE_LP_RING();
|
||||
}
|
||||
} else {
|
||||
} else
|
||||
DRM_DEBUG_KMS("Failed to allocate render context."
|
||||
"Disable RC6\n");
|
||||
return;
|
||||
}
|
||||
"Disable RC6\n");
|
||||
}
|
||||
|
||||
if (I915_HAS_RC6(dev) && drm_core_check_feature(dev, DRIVER_MODESET)) {
|
||||
|
|
Loading…
Reference in a new issue