This is a note to let you know that I've just added the patch titled
drm/i915: Fix up mismerge of 3490ea5d in 3.7.y
to the 3.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-fix-up-mismerge-of-3490ea5d-in-3.7.y.patch
and it can be found in the queue-3.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Tue Feb 26 10:02:26 2013
From: Adam Jackson <[email protected]>
Date: Wed, 20 Feb 2013 11:54:17 -0500
Subject: drm/i915: Fix up mismerge of 3490ea5d in 3.7.y
To: [email protected]
Message-ID: <[email protected]>
From: Adam Jackson <[email protected]>
The 3.7.y version of this seems to have missed a hunk in i9xx_update_wm.
Tested-by: Glen Gray <[email protected]>
Signed-off-by: Adam Jackson <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/intel_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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_de
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,
Patches currently in stable-queue which might be from [email protected] are
queue-3.7/drm-i915-fix-up-mismerge-of-3490ea5d-in-3.7.y.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
