aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-01-21 16:50:30 -0500
committerDave Airlie <airlied@redhat.com>2010-01-24 02:23:38 -0500
commita348c84d953f61c776e53cde0a63a4e407a23c18 (patch)
tree92c2b62e05bc4bac4895eb5eb31f70d0ea25f345 /drivers
parentc8c15ff1e90bfc4a2db1ba77a01b3b2783e723fc (diff)
drm/radeon/kms/atom: fix crtc lock ordering
This makes crtc_prepare and crtc_commit match. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/atombios_crtc.c2
1 files changed, 1 insertions, 1 deletions
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,
782 782
783static void atombios_crtc_prepare(struct drm_crtc *crtc) 783static void atombios_crtc_prepare(struct drm_crtc *crtc)
784{ 784{
785 atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
786 atombios_lock_crtc(crtc, 1); 785 atombios_lock_crtc(crtc, 1);
786 atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
787} 787}
788 788
789static void atombios_crtc_commit(struct drm_crtc *crtc) 789static void atombios_crtc_commit(struct drm_crtc *crtc)