From f82ba77f4554fc9cc49538dde9832be5ca90eb02 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 18 Feb 2013 13:45:51 -0500 Subject: [PATCH] Add drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch --- ...Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch diff --git a/drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch b/drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch new file mode 100644 index 000000000..bd232a5ad --- /dev/null +++ b/drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch @@ -0,0 +1,28 @@ +From 3566b9ac5b4004af0e2b1c62c5ded1116b39d490 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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 +--- + 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 +