diff options
| author | Matt Turner <mattst88@gmail.com> | 2010-02-13 20:20:19 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-14 20:19:14 -0500 |
| commit | ce36f00d599e0f988c2a1b7b276d9184ee9c5d82 (patch) | |
| tree | 01a0bdc2ad14d46059be9f34929ca05ef2a7193b | |
| parent | e22238ea37a870f70e34668a4992bde0c92bba8d (diff) | |
drm/radeon/kms/atom: use get_unaligned_le32() for ctx->ps
Noticed on a DEC Alpha.
Start up into console mode caused 15 unaligned accesses, and starting X
caused another 48.
Signed-off-by: Matt Turner <mattst88@gmail.com>
CC: Jerome Glisse <jglisse@redhat.com>
CC: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/atom.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index e3b44562d265..2a3df5599ab4 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 27 | #include <asm/unaligned.h> | ||
| 27 | 28 | ||
| 28 | #define ATOM_DEBUG | 29 | #define ATOM_DEBUG |
| 29 | 30 | ||
| @@ -212,7 +213,9 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr, | |||
| 212 | case ATOM_ARG_PS: | 213 | case ATOM_ARG_PS: |
| 213 | idx = U8(*ptr); | 214 | idx = U8(*ptr); |
| 214 | (*ptr)++; | 215 | (*ptr)++; |
| 215 | val = le32_to_cpu(ctx->ps[idx]); | 216 | /* get_unaligned_le32 avoids unaligned accesses from atombios |
| 217 | * tables, noticed on a DEC Alpha. */ | ||
| 218 | val = get_unaligned_le32((u32 *)&ctx->ps[idx]); | ||
| 216 | if (print) | 219 | if (print) |
| 217 | DEBUG("PS[0x%02X,0x%04X]", idx, val); | 220 | DEBUG("PS[0x%02X,0x%04X]", idx, val); |
| 218 | break; | 221 | break; |
