drm/radeon/kms: reorder display resume to avoid problems
authorAlex Deucher <alexdeucher@gmail.com>
Mon, 20 Dec 2010 16:22:29 +0000 (11:22 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 Jan 2011 21:58:45 +0000 (13:58 -0800)
commit15418c74b6a21d2f67ce6bdb56c1b07754b1b407
tree11b247a781e78d94cdd4be7244233c16da9cf2a9
parent2b8e17e8e5928b95f2ebc80f5270a084459e90a4
drm/radeon/kms: reorder display resume to avoid problems

commit a93f344d3c04e4b84490c65f2a574387c593be40 upstream.

On resume, we were attemping to unblank the displays before the
timing and plls had be reprogrammed which led to atom timeouts
waiting for things that are not yet programmed.  Re-program
the mode first, then reset the dpms state.

This fixes the infamous atombios timeouts on resume.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/radeon/atombios_crtc.c
drivers/gpu/drm/radeon/radeon_device.c