From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Oct 2011 09:54:30 +0000 (+0100)
Subject: Merge tag 'v3.1-rc10' into drm-core-next
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~1668^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=017ed8012e74ca15748863f45d2c078453026a0a;p=mirror_ubuntu-zesty-kernel.git

Merge tag 'v3.1-rc10' into drm-core-next

There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/radeon_asic.h
---

017ed8012e74ca15748863f45d2c078453026a0a
diff --cc drivers/gpu/drm/radeon/r600.c
index e87f5662a104,720dd99163f8..12470b090ddf
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@@ -2363,14 -2362,14 +2365,14 @@@ int r600_copy_blit(struct radeon_devic
  
  	mutex_lock(&rdev->r600_blit.mutex);
  	rdev->r600_blit.vb_ib = NULL;
- 	r = r600_blit_prepare_copy(rdev, num_pages);
 -	r = r600_blit_prepare_copy(rdev, num_gpu_pages * RADEON_GPU_PAGE_SIZE);
++	r = r600_blit_prepare_copy(rdev, num_gpu_pages);
  	if (r) {
  		if (rdev->r600_blit.vb_ib)
  			radeon_ib_free(rdev, &rdev->r600_blit.vb_ib);
  		mutex_unlock(&rdev->r600_blit.mutex);
  		return r;
  	}
- 	r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages);
 -	r600_kms_blit_copy(rdev, src_offset, dst_offset, num_gpu_pages * RADEON_GPU_PAGE_SIZE);
++	r600_kms_blit_copy(rdev, src_offset, dst_offset, num_gpu_pages);
  	r600_blit_done_copy(rdev, fence);
  	mutex_unlock(&rdev->r600_blit.mutex);
  	return 0;