From 05b32aac855141b11d281407781576acbda4a226 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Fri, 11 Jun 2010 17:04:35 -0400
Subject: [PATCH] --- yaml --- r: 204989 b: refs/heads/master c:
 5c8d7171cc4984351af802a525675d50ae555a7b h: refs/heads/master i:   204987:
 d131bd951ca04862f29852bdd8eb651905244081 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/drm_crtc_helper.c | 5 ++++-
 trunk/include/drm/drm_crtc_helper.h     | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 63c0ef86051d..ddd752045560 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a907a2e7d287f2b89fd81bc8edf164c0008c624f
+refs/heads/master: 5c8d7171cc4984351af802a525675d50ae555a7b
diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c
index 9b2a54117c91..fa1323ff56b3 100644
--- a/trunk/drivers/gpu/drm/drm_crtc_helper.c
+++ b/trunk/drivers/gpu/drm/drm_crtc_helper.c
@@ -241,7 +241,10 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
 		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
 		crtc->enabled = drm_helper_crtc_in_use(crtc);
 		if (!crtc->enabled) {
-			crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+			if (crtc_funcs->disable)
+				(*crtc_funcs->disable)(crtc);
+			else
+				(*crtc_funcs->dpms)(crtc, DRM_MODE_DPMS_OFF);
 			crtc->fb = NULL;
 		}
 	}
diff --git a/trunk/include/drm/drm_crtc_helper.h b/trunk/include/drm/drm_crtc_helper.h
index 1121f7799c6f..7e3c9766acba 100644
--- a/trunk/include/drm/drm_crtc_helper.h
+++ b/trunk/include/drm/drm_crtc_helper.h
@@ -63,6 +63,9 @@ struct drm_crtc_helper_funcs {
 
 	/* reload the current crtc LUT */
 	void (*load_lut)(struct drm_crtc *crtc);
+
+	/* disable crtc when not in use - more explicit than dpms off */
+	void (*disable)(struct drm_crtc *crtc);
 };
 
 struct drm_encoder_helper_funcs {