From: Alex Deucher Date: Thu, 21 Jan 2010 21:50:30 +0000 (-0500) Subject: drm/radeon/kms/atom: fix crtc lock ordering X-Git-Tag: MMI-PSA29.97-13-9~25013^2~32^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a348c84d953f61c776e53cde0a63a4e407a23c18;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/radeon/kms/atom: fix crtc lock ordering This makes crtc_prepare and crtc_commit match. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index e098bd0cbd26..7af5c1f7b6de 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -782,8 +782,8 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc, static void atombios_crtc_prepare(struct drm_crtc *crtc) { - atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); atombios_lock_crtc(crtc, 1); + atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); } static void atombios_crtc_commit(struct drm_crtc *crtc)