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

[Maximilian Attems]

Author: maks
Date: Sat Jun 25 08:45:35 2011
New Revision: 17724

Log:
add patch from 2.6.32.41+drm33.18

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-bad-shift-atom-iio-parser.patch
   dists/squeeze/linux-2.6/debian/patches/series/36
Modified:
   dists/squeeze/linux-2.6/debian/changelog

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Jun 25 08:04:21 2011	(r17723)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Jun 25 08:45:35 2011	(r17724)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.32-36) UNRELEASED; urgency=high
+
+  [ maximilian attems ]
+  * Add drm change from 2.6.32.41+drm33.18:
+    - drm/radeon/kms: fix bad shift in atom iio table parser
+
+ -- maximilian attems <maks at debian.org>  Sat, 25 Jun 2011 10:22:27 +0200
+
 linux-2.6 (2.6.32-35) stable; urgency=high
 
   [ Ben Hutchings ]

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-bad-shift-atom-iio-parser.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-bad-shift-atom-iio-parser.patch	Sat Jun 25 08:45:35 2011	(r17724)
@@ -0,0 +1,51 @@
+From 0eef43558179bd918796d7008ff905b1b142cd5b Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Thu, 14 Apr 2011 11:19:50 -0400
+Subject: [PATCH] drm/radeon/kms: fix bad shift in atom iio table parser
+
+commit 8e461123f28e6b17456225e70eb834b3b30d28bb upstream.
+
+Noticed by Patrick Lowry.
+
+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: Stefan Bader <stefan.bader at canonical.com>
+---
+ drivers/gpu/drm/radeon/atom.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
+index b1f929d..052312f 100644
+--- a/drivers/gpu/drm/radeon/atom.c
++++ b/drivers/gpu/drm/radeon/atom.c
+@@ -128,7 +128,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
+ 		case ATOM_IIO_MOVE_INDEX:
+ 			temp &=
+ 			    ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
+-			      CU8(base + 2));
++			      CU8(base + 3));
+ 			temp |=
+ 			    ((index >> CU8(base + 2)) &
+ 			     (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base +
+@@ -138,7 +138,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
+ 		case ATOM_IIO_MOVE_DATA:
+ 			temp &=
+ 			    ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
+-			      CU8(base + 2));
++			      CU8(base + 3));
+ 			temp |=
+ 			    ((data >> CU8(base + 2)) &
+ 			     (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base +
+@@ -148,7 +148,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
+ 		case ATOM_IIO_MOVE_ATTR:
+ 			temp &=
+ 			    ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
+-			      CU8(base + 2));
++			      CU8(base + 3));
+ 			temp |=
+ 			    ((ctx->
+ 			      io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 -
+-- 
+1.7.4.4
+

Added: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sat Jun 25 08:45:35 2011	(r17724)
@@ -0,0 +1 @@
++ bugfix/all/drm-radeon-kms-fix-bad-shift-atom-iio-parser.patch