[kernel] r16717 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 10:28:20 2010
New Revision: 16717

Log:
drm/radeon/kms: make sure blit addr masks are 64 bit

2.6.35.10 fix without changes.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:14 2010	(r16716)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:20 2010	(r16717)
@@ -18,6 +18,7 @@
   * cifs: fix another memleak, in cifs_root_iget.
   * b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd.
   * drm/radeon/kms: MC vram map needs to be >= pci aperture size.
+  * drm/radeon/kms: make sure blit addr masks are 64 bit.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch	Mon Dec 20 10:28:20 2010	(r16717)
@@ -0,0 +1,44 @@
+From 2126d0a4a205e2d6b763434f892524cd60f74228 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed, 6 Oct 2010 00:13:04 -0400
+Subject: drm/radeon/kms: make sure blit addr masks are 64 bit
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit 2126d0a4a205e2d6b763434f892524cd60f74228 upstream.
+
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+---
+ drivers/gpu/drm/radeon/r600_blit_kms.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: linux/drivers/gpu/drm/radeon/r600_blit_kms.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/radeon/r600_blit_kms.c
++++ linux/drivers/gpu/drm/radeon/r600_blit_kms.c
+@@ -623,8 +623,8 @@ void r600_kms_blit_copy(struct radeon_de
+ 			int src_x = src_gpu_addr & 255;
+ 			int dst_x = dst_gpu_addr & 255;
+ 			int h = 1;
+-			src_gpu_addr = src_gpu_addr & ~255;
+-			dst_gpu_addr = dst_gpu_addr & ~255;
++			src_gpu_addr = src_gpu_addr & ~255ULL;
++			dst_gpu_addr = dst_gpu_addr & ~255ULL;
+ 
+ 			if (!src_x && !dst_x) {
+ 				h = (cur_size / max_bytes);
+@@ -717,8 +717,8 @@ void r600_kms_blit_copy(struct radeon_de
+ 			int src_x = (src_gpu_addr & 255);
+ 			int dst_x = (dst_gpu_addr & 255);
+ 			int h = 1;
+-			src_gpu_addr = src_gpu_addr & ~255;
+-			dst_gpu_addr = dst_gpu_addr & ~255;
++			src_gpu_addr = src_gpu_addr & ~255ULL;
++			dst_gpu_addr = dst_gpu_addr & ~255ULL;
+ 
+ 			if (!src_x && !dst_x) {
+ 				h = (cur_size / max_bytes);

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:14 2010	(r16716)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:20 2010	(r16717)
@@ -6,3 +6,5 @@
 + bugfix/all/cifs-fix-another-memleak-in-cifs_root_iget.patch
 + bugfix/all/b43-fix-warning-at-drivers-mmc-core-core.c-237-in-mmc_wait_for_cmd.patch
 + bugfix/all/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.patch
++ bugfix/all/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
+