|
@@ -37,6 +37,8 @@
|
|
#include "radeon_drv.h"
|
|
#include "radeon_drv.h"
|
|
#include "r300_reg.h"
|
|
#include "r300_reg.h"
|
|
|
|
|
|
|
|
+#include <asm/unaligned.h>
|
|
|
|
+
|
|
#define R300_SIMULTANEOUS_CLIPRECTS 4
|
|
#define R300_SIMULTANEOUS_CLIPRECTS 4
|
|
|
|
|
|
/* Values for R300_RE_CLIPRECT_CNTL depending on the number of cliprects
|
|
/* Values for R300_RE_CLIPRECT_CNTL depending on the number of cliprects
|
|
@@ -917,6 +919,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv,
|
|
{
|
|
{
|
|
u32 *ref_age_base;
|
|
u32 *ref_age_base;
|
|
u32 i, buf_idx, h_pending;
|
|
u32 i, buf_idx, h_pending;
|
|
|
|
+ u64 ptr_addr;
|
|
RING_LOCALS;
|
|
RING_LOCALS;
|
|
|
|
|
|
if (cmdbuf->bufsz <
|
|
if (cmdbuf->bufsz <
|
|
@@ -930,7 +933,8 @@ static int r300_scratch(drm_radeon_private_t *dev_priv,
|
|
|
|
|
|
dev_priv->scratch_ages[header.scratch.reg]++;
|
|
dev_priv->scratch_ages[header.scratch.reg]++;
|
|
|
|
|
|
- ref_age_base = (u32 *)(unsigned long)*((uint64_t *)cmdbuf->buf);
|
|
|
|
|
|
+ ptr_addr = get_unaligned((u64 *)cmdbuf->buf);
|
|
|
|
+ ref_age_base = (u32 *)(unsigned long)ptr_addr;
|
|
|
|
|
|
cmdbuf->buf += sizeof(u64);
|
|
cmdbuf->buf += sizeof(u64);
|
|
cmdbuf->bufsz -= sizeof(u64);
|
|
cmdbuf->bufsz -= sizeof(u64);
|