diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2006-03-07 01:08:35 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2006-03-07 01:08:35 +0000 |
| commit | 4436ab86d8c0e1177bbec276c605d133e7c82ff0 (patch) | |
| tree | 988a892c57db143946b242a493d4b01b8645d53f /shared-core/r300_cmdbuf.c | |
| parent | b3fdf9bb7acd023060e0dba07d3b439c3b64faef (diff) | |
ia64 support for r300_scratch. (not tested)
Diffstat (limited to 'shared-core/r300_cmdbuf.c')
| -rw-r--r-- | shared-core/r300_cmdbuf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c index 988734cf..09378b2b 100644 --- a/shared-core/r300_cmdbuf.c +++ b/shared-core/r300_cmdbuf.c @@ -710,7 +710,7 @@ static __inline__ int r300_scratch(drm_radeon_private_t *dev_priv, u32 i, buf_idx, h_pending; RING_LOCALS; - if (cmdbuf->bufsz < sizeof(u32 *) + header.scratch.n_bufs * sizeof(buf_idx) ) { + if (cmdbuf->bufsz < sizeof(u64) + header.scratch.n_bufs * sizeof(buf_idx) ) { return DRM_ERR(EINVAL); } @@ -720,13 +720,13 @@ static __inline__ int r300_scratch(drm_radeon_private_t *dev_priv, dev_priv->scratch_ages[header.scratch.reg] ++; - ref_age_base = *((u32 **)cmdbuf->buf); + ref_age_base = *(u32 **)cmdbuf->buf; - cmdbuf->buf += sizeof(u32 *); - cmdbuf->bufsz -= sizeof(u32 *); + cmdbuf->buf += sizeof(u64); + cmdbuf->bufsz -= sizeof(u64); for (i=0; i < header.scratch.n_bufs; i++) { - buf_idx = *((u32 *)cmdbuf->buf); + buf_idx = *(u32 *)cmdbuf->buf; buf_idx *= 2; /* 8 bytes per buf */ if (DRM_COPY_TO_USER(ref_age_base + buf_idx, &dev_priv->scratch_ages[header.scratch.reg], sizeof(u32))) { |