From 9ddab4471e59b4e1babae2748bfb65e60c0b302d Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Mon, 15 Apr 2013 22:02:07 +0200 Subject: [PATCH] --- yaml --- r: 371434 b: refs/heads/master c: 4dd6a897959aca968c59f0b2bc08c2d855cd553c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index deed5499b747..a02f5c37a728 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c1a14c2c17f13c1869e82783bd49774bba67254 +refs/heads/master: 4dd6a897959aca968c59f0b2bc08c2d855cd553c diff --git a/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c index cd1b40722edd..19e36603b23b 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c +++ b/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c @@ -1854,12 +1854,11 @@ static void psb_intel_sdvo_restore(struct drm_connector *connector) REG_WRITE(sdvo->sdvo_reg, sdvo->saveSDVO); - /* Force dpms on upon resume */ - psb_intel_sdvo_dpms(encoder, DRM_MODE_DPMS_ON); - /* Force a full mode set on the crtc. We're supposed to have the mode_config lock already. */ - drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, NULL); + if (connector->status == connector_status_connected) + drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, + NULL); } static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {