Skip to content

Commit

Permalink
Revert "drm/i915: Enable RC6 on Ironlake."
Browse files Browse the repository at this point in the history
This reverts commit ce17178.

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>
  • Loading branch information
Chris Wilson committed Sep 7, 2010
1 parent 8554048 commit bc41606
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit bc41606

Please sign in to comment.