]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerAK <andi@firstfloor.org>
Sun, 6 Feb 2011 19:03:50 +0000 (11:03 -0800)
commit2f33a030c672eff1af2a5414c497a10d66b80982
tree909476ede7255920f099400eb0306c7b1de6c4b9
parentee8aa621efcdd5dd76a91f0085e1f2dc940cb3b8
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/gpu/drm/radeon/atombios_crtc.c
drivers/gpu/drm/radeon/radeon_device.c