| From 8e461123f28e6b17456225e70eb834b3b30d28bb Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexdeucher@gmail.com> |
| Date: Thu, 14 Apr 2011 11:19:50 -0400 |
| Subject: drm/radeon/kms: fix bad shift in atom iio table parser |
| |
| From: Alex Deucher <alexdeucher@gmail.com> |
| |
| commit 8e461123f28e6b17456225e70eb834b3b30d28bb upstream. |
| |
| Noticed by Patrick Lowry. |
| |
| Signed-off-by: Alex Deucher <alexdeucher@gmail.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/radeon/atom.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- 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 |
| 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 |
| 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 |
| 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 - |
