42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From c21a31aebb5d8f0b3ad050a8f3190b6de8210845 Mon Sep 17 00:00:00 2001
|
|
From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
|
|
Date: Tue, 7 Sep 2010 09:45:00 -0400
|
|
Subject: Revert "drm/i915: Enable RC6 on Ironlake."
|
|
|
|
This reverts commit ce17178094f368d9e3f39b2cb4303da5ed633dd4.
|
|
---
|
|
drivers/gpu/drm/i915/intel_display.c | 9 +++------
|
|
1 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
|
index 11a3394..36952e9 100644
|
|
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
+++ b/drivers/gpu/drm/i915/intel_display.c
|
|
@@ -5722,8 +5722,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);
|
|
@@ -5784,11 +5783,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)) {
|
|
--
|
|
1.7.2.2
|
|
|