diff options
| author | David Miller <davem@davemloft.net> | 2010-04-26 02:55:42 -0700 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-27 09:40:57 +1000 |
| commit | 88b045077a1462a47503137fd4ca0c31772819ca (patch) | |
| tree | f697b8b9459621e70c53ac303ef81aa25b408b36 /drivers/gpu | |
| parent | e32ee7fa54e3172e6413cefaaee9222a3f521617 (diff) | |
| download | blackbird-op-linux-88b045077a1462a47503137fd4ca0c31772819ca.tar.gz blackbird-op-linux-88b045077a1462a47503137fd4ca0c31772819ca.zip | |
drm/radeon: Fix sparc regression in r300_scratch()
Commit b4fe945405e477cded91772b4fec854705443dd5 ("drm/radeon: Fix
memory allocation failures in the preKMS command stream checking.")
added a regression in that it completely tossed the get_unaligned()
done by r300_scratch() which we added in commit
958a6f8ccb1964adc3eec84cf401c5baeb4fbca0 ("drm: radeon: Fix unaligned
access in r300_scratch().").
Put it back.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index ea46d558e8f3..c5c2742e4140 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c @@ -921,7 +921,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, ptr_addr = drm_buffer_read_object(cmdbuf->buffer, sizeof(stack_ptr_addr), &stack_ptr_addr); - ref_age_base = (u32 *)(unsigned long)*ptr_addr; + ref_age_base = (u32 *)(unsigned long)get_unaligned(ptr_addr); for (i=0; i < header.scratch.n_bufs; i++) { buf_idx = drm_buffer_pointer_to_dword(cmdbuf->buffer, 0); |
