2.6.38-rc3-git1: Reported regressions 2.6.36 -> 2.6.37

Commit Message

Linus Torvalds Feb. 3, 2011, 10:10 p.m. UTC

None

Patch

 drivers/gpu/drm/drm_crtc_helper.c |    6 +++---
 include/drm/drm_mode.h            |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 952b3d4..7f585ed 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -681,11 +681,11 @@  int drm_crtc_helper_set_config(struct drm_mode_set *set)
 			goto fail;
 		}
 	}
-	DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
+	DRM_DEBUG_KMS("Setting connector DPMS state to 'unknown'\n");
 	for (i = 0; i < set->num_connectors; i++) {
-		DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
+		DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS 'unknown'\n", set->connectors[i]->base.id,
 			      drm_get_connector_name(set->connectors[i]));
-		set->connectors[i]->dpms = DRM_MODE_DPMS_ON;
+		set->connectors[i]->dpms = DRM_MODE_DPMS_UNKNOWN;
 	}
 
 	kfree(save_connectors);
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 0fc7397..4b5144c 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -59,6 +59,7 @@ 
 
 /* DPMS flags */
 /* bit compatible with the xorg definitions. */
+#define DRM_MODE_DPMS_UNKNOWN	(-1)
 #define DRM_MODE_DPMS_ON	0
 #define DRM_MODE_DPMS_STANDBY	1
 #define DRM_MODE_DPMS_SUSPEND	2