Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e910d08 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

fixes a resume regression on pre-r6xx asics.

* 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Prevent leak of scratch register on resume from suspend
parents 18d4dbd8 16c58081

drivers/gpu/drm/radeon/r100.c

+2 −1
Original line number Diff line number Diff line
@@ -1182,7 +1182,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) 
	ring->ready = true;

	radeon_ttm_set_active_vram_size(rdev, rdev->mc.real_vram_size);



	if (radeon_ring_supports_scratch_reg(rdev, ring)) {

	if (!ring->rptr_save_reg /* not resuming from suspend */

	    && radeon_ring_supports_scratch_reg(rdev, ring)) {

		r = radeon_scratch_get(rdev, &ring->rptr_save_reg);

		if (r) {

			DRM_ERROR("failed to get scratch reg for rptr save (%d).\n", r);