diff options
| author | anholt <anholt@FreeBSD.org> | 2006-05-17 06:36:28 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2006-05-17 06:36:28 +0000 |
| commit | c0e3faf72685e6c02e8509c92408f672e27c7096 (patch) | |
| tree | 208614304ffab07c6036af66afbe1dfd0327faae /sys/dev/drm/r300_cmdbuf.c | |
| parent | 1e618fb39747a281fe2964d37909e16ae0dfff6e (diff) | |
| download | FreeBSD-src-c0e3faf72685e6c02e8509c92408f672e27c7096.zip FreeBSD-src-c0e3faf72685e6c02e8509c92408f672e27c7096.tar.gz | |
Update to current DRM CVS, bringing in a fix for a NULL pointer chase when
running 3d apps on i915.
Diffstat (limited to 'sys/dev/drm/r300_cmdbuf.c')
| -rw-r--r-- | sys/dev/drm/r300_cmdbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/drm/r300_cmdbuf.c b/sys/dev/drm/r300_cmdbuf.c index d1e0bdb..d71f8cb 100644 --- a/sys/dev/drm/r300_cmdbuf.c +++ b/sys/dev/drm/r300_cmdbuf.c @@ -725,7 +725,7 @@ static 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 *)(unsigned long)*((uint64_t *)cmdbuf->buf); cmdbuf->buf += sizeof(uint64_t); cmdbuf->bufsz -= sizeof(uint64_t); |
