From e36cabd698143e4e1cd447f4309519a38e947e14 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 26 Jun 2012 14:53:07 +0100
Subject: [PATCH] --- yaml --- r: 318719 b: refs/heads/master c:
 5bd42f69fbedfc12cd8161323a9ffab0b2586a2a h: refs/heads/master i:   318717:
 6ee2992da56c4e3b2fee281b99c111f2df3f4be4   318715:
 8348014e1b4aafee7dfdaff4c92c93a4cbdad9c6   318711:
 ac5d823be656e00b401ab9e09210b4921e463a8a   318703:
 3805fedd0a74008f1cbea745fcc568e60195ef44   318687:
 d905ecbf9407ed24b2c8915aaa087da9326a4ee5   318655:
 c5fa79e8d870298fb5c1319f578f537dc06e2dce   318591:
 d85e516b7629620eb5971c266bc8e290c7cedd2c   318463:
 ce95fe4fdbe961a8938394a092ad5303fac990b5 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/gpu/drm/udl/udl_modeset.c | 44 +++++++++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c35c8142c961..1bbd298b3905 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 197bbb3d464f33eac1b458e83c1929d2f268d4c9
+refs/heads/master: 5bd42f69fbedfc12cd8161323a9ffab0b2586a2a
diff --git a/trunk/drivers/gpu/drm/udl/udl_modeset.c b/trunk/drivers/gpu/drm/udl/udl_modeset.c
index ac2d717714ce..f5dd89e891de 100644
--- a/trunk/drivers/gpu/drm/udl/udl_modeset.c
+++ b/trunk/drivers/gpu/drm/udl/udl_modeset.c
@@ -45,12 +45,25 @@ static char *udl_vidreg_unlock(char *buf)
  *  0x01 H and V sync off (screen blank but powered)
  *  0x07 DPMS powerdown (requires modeset to come back)
  */
-static char *udl_enable_hvsync(char *buf, bool enable)
+static char *udl_set_blank(char *buf, int dpms_mode)
 {
-	if (enable)
-		return udl_set_register(buf, 0x1F, 0x00);
-	else
-		return udl_set_register(buf, 0x1F, 0x07);
+	u8 reg;
+	switch (dpms_mode) {
+	case DRM_MODE_DPMS_OFF:
+		reg = 0x07;
+		break;
+	case DRM_MODE_DPMS_STANDBY:
+		reg = 0x05;
+		break;
+	case DRM_MODE_DPMS_SUSPEND:
+		reg = 0x01;
+		break;
+	case DRM_MODE_DPMS_ON:
+		reg = 0x00;
+		break;
+	}
+
+	return udl_set_register(buf, 0x1f, reg);
 }
 
 static char *udl_set_color_depth(char *buf, u8 selection)
@@ -199,6 +212,20 @@ static char *udl_set_vid_cmds(char *wrptr, struct drm_display_mode *mode)
 	return wrptr;
 }
 
+static char *udl_dummy_render(char *wrptr)
+{
+	*wrptr++ = 0xAF;
+	*wrptr++ = 0x6A; /* copy */
+	*wrptr++ = 0x00; /* from addr */
+	*wrptr++ = 0x00;
+	*wrptr++ = 0x00;
+	*wrptr++ = 0x01; /* one pixel */
+	*wrptr++ = 0x00; /* to address */
+	*wrptr++ = 0x00;
+	*wrptr++ = 0x00;
+	return wrptr;
+}
+
 static int udl_crtc_write_mode_to_hw(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
@@ -235,9 +262,10 @@ static void udl_crtc_dpms(struct drm_crtc *crtc, int mode)
 
 		buf = (char *)urb->transfer_buffer;
 		buf = udl_vidreg_lock(buf);
-		buf = udl_enable_hvsync(buf, false);
+		buf = udl_set_blank(buf, mode);
 		buf = udl_vidreg_unlock(buf);
 
+		buf = udl_dummy_render(buf);
 		retval = udl_submit_urb(dev, urb, buf - (char *)
 					urb->transfer_buffer);
 	} else {
@@ -306,9 +334,11 @@ static int udl_crtc_mode_set(struct drm_crtc *crtc,
 	wrptr = udl_set_base8bpp(wrptr, 2 * mode->vdisplay * mode->hdisplay);
 
 	wrptr = udl_set_vid_cmds(wrptr, adjusted_mode);
-	wrptr = udl_enable_hvsync(wrptr, true);
+	wrptr = udl_set_blank(wrptr, DRM_MODE_DPMS_ON);
 	wrptr = udl_vidreg_unlock(wrptr);
 
+	wrptr = udl_dummy_render(wrptr);
+
 	ufb->active_16 = true;
 	if (old_fb) {
 		struct udl_framebuffer *uold_fb = to_udl_fb(old_fb);