From: Chris Wilson Date: Fri, 6 Aug 2010 14:03:31 +0000 (+0100) Subject: drm: Only set DPMS once on the CRTC not after every encoder. X-Git-Tag: v2.6.36-rc3~9^2~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=817e631eaff2747b1c7a8234f64c95c10cfb1f8f;p=platform%2Fkernel%2Flinux-3.10.git drm: Only set DPMS once on the CRTC not after every encoder. Signed-off-by: Chris Wilson Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 11fe9c8..7b1eb2f 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -817,12 +817,12 @@ int drm_helper_resume_force_mode(struct drm_device *dev) if (encoder_funcs->dpms) (*encoder_funcs->dpms) (encoder, drm_helper_choose_encoder_dpms(encoder)); - - crtc_funcs = crtc->helper_private; - if (crtc_funcs->dpms) - (*crtc_funcs->dpms) (crtc, - drm_helper_choose_crtc_dpms(crtc)); } + + crtc_funcs = crtc->helper_private; + if (crtc_funcs->dpms) + (*crtc_funcs->dpms) (crtc, + drm_helper_choose_crtc_dpms(crtc)); } } /* disable the unused connectors while restoring the modesetting */