Add drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch
This commit is contained in:
parent
65a226a1b6
commit
f82ba77f45
|
@ -0,0 +1,28 @@
|
|||
From 3566b9ac5b4004af0e2b1c62c5ded1116b39d490 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon, 18 Feb 2013 13:40:16 -0500
|
||||
Subject: [PATCH] drm/i915: Fix up mismerge of 3490ea5d in 3.7.y
|
||||
|
||||
The 3.7.y version of this seems to have missed a hunk in i9xx_update_wm.
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_pm.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
|
||||
index 4e6a2b2..313088f 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_pm.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_pm.c
|
||||
@@ -1474,7 +1474,7 @@ static void i9xx_update_wm(struct drm_device *dev)
|
||||
|
||||
fifo_size = dev_priv->display.get_fifo_size(dev, 0);
|
||||
crtc = intel_get_crtc_for_plane(dev, 0);
|
||||
- if (crtc->enabled && crtc->fb) {
|
||||
+ if (intel_crtc_active(crtc)) {
|
||||
planea_wm = intel_calculate_wm(crtc->mode.clock,
|
||||
wm_info, fifo_size,
|
||||
crtc->fb->bits_per_pixel / 8,
|
||||
--
|
||||
1.8.1.2
|
||||
|
Loading…
Reference in New Issue