From 42d21d3fd5d9e449cae6202bff865f1df93e3d8f Mon Sep 17 00:00:00 2001
From: Forest Bond <forest.bond@rapidrollout.com>
Date: Mon, 13 Aug 2012 16:29:04 +0000
Subject: [PATCH] --- yaml --- r: 329312 b: refs/heads/master c:
 f835bc0fcacc7f4e29890938b1c2faecd07eda9e h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/gpu/drm/gma500/cdv_intel_display.c | 2 --
 trunk/drivers/gpu/drm/gma500/psb_intel_drv.h     | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 06639fd02b41..02c6d7d3ecc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28bbda39b69af06e77801333c0c28ef9df2f256f
+refs/heads/master: f835bc0fcacc7f4e29890938b1c2faecd07eda9e
diff --git a/trunk/drivers/gpu/drm/gma500/cdv_intel_display.c b/trunk/drivers/gpu/drm/gma500/cdv_intel_display.c
index 65cb248fa1fc..3cfd0931fbfb 100644
--- a/trunk/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/trunk/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -930,7 +930,6 @@ static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
 		/* Give the overlay scaler a chance to enable
 		 * if it's on this pipe */
 		/* psb_intel_crtc_dpms_video(crtc, true); TODO */
-		psb_intel_crtc->crtc_enable = true;
 		break;
 	case DRM_MODE_DPMS_OFF:
 		if (!psb_intel_crtc->active)
@@ -981,7 +980,6 @@ static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
 
 		/* Wait for the clocks to turn off. */
 		udelay(150);
-		psb_intel_crtc->crtc_enable = false;
 		break;
 	}
 	cdv_intel_update_watermark(dev, crtc);
diff --git a/trunk/drivers/gpu/drm/gma500/psb_intel_drv.h b/trunk/drivers/gpu/drm/gma500/psb_intel_drv.h
index c53e592604c8..c9710ffa4843 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_intel_drv.h
+++ b/trunk/drivers/gpu/drm/gma500/psb_intel_drv.h
@@ -193,7 +193,6 @@ struct psb_intel_crtc {
 	u32 mode_flags;
 
 	bool active;
-	bool crtc_enable;
 
 	/* Saved Crtc HW states */
 	struct psb_intel_crtc_state *crtc_state;