diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-04-14 11:19:50 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-14 19:05:58 -0400 |
| commit | 8e461123f28e6b17456225e70eb834b3b30d28bb (patch) | |
| tree | 09160fe7c98372921cdf875b2cc59a33cd25423a /drivers/gpu | |
| parent | 2582b6efceb43dce63b4a1090d289934067a972d (diff) | |
drm/radeon/kms: fix bad shift in atom iio table parser
Noticed by Patrick Lowry.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | 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 d71d375149f8..7bd745689097 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c | |||
| @@ -135,7 +135,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, | |||
| 135 | case ATOM_IIO_MOVE_INDEX: | 135 | case ATOM_IIO_MOVE_INDEX: |
| 136 | temp &= | 136 | temp &= |
| 137 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << | 137 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << |
| 138 | CU8(base + 2)); | 138 | CU8(base + 3)); |
| 139 | temp |= | 139 | temp |= |
| 140 | ((index >> CU8(base + 2)) & | 140 | ((index >> CU8(base + 2)) & |
| 141 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + | 141 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + |
| @@ -145,7 +145,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, | |||
| 145 | case ATOM_IIO_MOVE_DATA: | 145 | case ATOM_IIO_MOVE_DATA: |
| 146 | temp &= | 146 | temp &= |
| 147 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << | 147 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << |
| 148 | CU8(base + 2)); | 148 | CU8(base + 3)); |
| 149 | temp |= | 149 | temp |= |
| 150 | ((data >> CU8(base + 2)) & | 150 | ((data >> CU8(base + 2)) & |
| 151 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + | 151 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + |
| @@ -155,7 +155,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, | |||
| 155 | case ATOM_IIO_MOVE_ATTR: | 155 | case ATOM_IIO_MOVE_ATTR: |
| 156 | temp &= | 156 | temp &= |
| 157 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << | 157 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << |
| 158 | CU8(base + 2)); | 158 | CU8(base + 3)); |
| 159 | temp |= | 159 | temp |= |
| 160 | ((ctx-> | 160 | ((ctx-> |
| 161 | io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - | 161 | io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - |