Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index 2d64aea83df2..f59433b7610c 100644
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -308,6 +308,9 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc,
 
         WREG_HDR(hdr);
         cirrus_crtc_do_set_base(crtc, old_fb, x, y, 0);
+
+        /* Unblank (needed on S3 resume, vgabios doesn't do it then) */
+        outb(0x20, 0x3c0);
         return 0;
 }