From 3a1683af775d012993eee5b096e6efc2ccc88506 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sun, 14 Mar 2010 09:29:47 +0000 Subject: [PATCH] add lonely 2.6.33.1 stable drm patch applies to 2.6.33 drm svn path=/dists/sid/linux-2.6/; revision=15372 --- debian/changelog | 1 + .../drm-radeon-kms-atom-fix-shr-shl-ops.patch | 42 +++++++++++++++++++ debian/patches/series/10 | 1 + 3 files changed, 44 insertions(+) create mode 100644 debian/patches/bugfix/all/drm-radeon-kms-atom-fix-shr-shl-ops.patch diff --git a/debian/changelog b/debian/changelog index c11f2081b..0c428f857 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low - net/via-rhine: Fix scheduling while atomic bugs (closes: #549606) - drm/i915: Fix DDC on some systems by clearing BIOS GMBUS (closes: #567747) + * drm/radeon/kms/atom: fix shr/shl ops. [ Moritz Muehlenhoff ] * Enable CONFIG_KEYS_DEBUG_PROC_KEYS (Closes: #400932) diff --git a/debian/patches/bugfix/all/drm-radeon-kms-atom-fix-shr-shl-ops.patch b/debian/patches/bugfix/all/drm-radeon-kms-atom-fix-shr-shl-ops.patch new file mode 100644 index 000000000..4d9bcec38 --- /dev/null +++ b/debian/patches/bugfix/all/drm-radeon-kms-atom-fix-shr-shl-ops.patch @@ -0,0 +1,42 @@ +From 6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 23 Feb 2010 21:56:12 -0500 +Subject: drm/radeon/kms/atom: fix shr/shl ops + +From: Alex Deucher + +commit 6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca upstream. + +The whole attribute table is valid for +shr/shl ops. + +Fixes fdo bug 26668 + +Signed-off-by: Alex Deucher +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/atom.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/drivers/gpu/drm/radeon/atom.c ++++ b/drivers/gpu/drm/radeon/atom.c +@@ -881,8 +881,6 @@ static void atom_op_shl(atom_exec_contex + uint8_t attr = U8((*ptr)++), shift; + uint32_t saved, dst; + int dptr = *ptr; +- attr &= 0x38; +- attr |= atom_def_dst[attr >> 3] << 6; + SDEBUG(" dst: "); + dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); + shift = atom_get_src(ctx, attr, ptr); +@@ -897,8 +895,6 @@ static void atom_op_shr(atom_exec_contex + uint8_t attr = U8((*ptr)++), shift; + uint32_t saved, dst; + int dptr = *ptr; +- attr &= 0x38; +- attr |= atom_def_dst[attr >> 3] << 6; + SDEBUG(" dst: "); + dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); + shift = atom_get_src(ctx, attr, ptr); diff --git a/debian/patches/series/10 b/debian/patches/series/10 index aef9c6414..a3b74e961 100644 --- a/debian/patches/series/10 +++ b/debian/patches/series/10 @@ -35,3 +35,4 @@ + bugfix/all/net-Fix-first-line-of-kernel-doc.patch + bugfix/all/video-fix-first-line-of-kernel-doc.patch + bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch ++ bugfix/all/drm-radeon-kms-atom-fix-shr-shl-ops.patch