diff options
| author | rnoland <rnoland@FreeBSD.org> | 2010-04-22 18:21:25 +0000 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2010-04-22 18:21:25 +0000 |
| commit | b733ebaa1ccc608f662359519c4712cf384b1360 (patch) | |
| tree | 4cbae1e0936ed160e9fca32b44038b3450bb6072 /sys/dev/drm/r128_state.c | |
| parent | c0d6a78ddcc9bdcf4f9ee2858efab1abf0db5bdf (diff) | |
| download | FreeBSD-src-b733ebaa1ccc608f662359519c4712cf384b1360.zip FreeBSD-src-b733ebaa1ccc608f662359519c4712cf384b1360.tar.gz | |
Rework how drm maps are handled.
* On 32 bit platforms we steal the upper 4 bits of the map handle
to store a unique map id.
* On 64 bit platforms we steal the upper 24 bits.
Resolves issues where the offsets that are handed to mmap may overlap the VRAM on some cards.
Tested on: radeon, intel, mga, and via.
This will break nouveau. I will spin new patches shortly.
Diffstat (limited to 'sys/dev/drm/r128_state.c')
| -rw-r--r-- | sys/dev/drm/r128_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c index 6aef11c..9632dec 100644 --- a/sys/dev/drm/r128_state.c +++ b/sys/dev/drm/r128_state.c @@ -657,7 +657,7 @@ static void r128_cce_dispatch_indirect(struct drm_device * dev, */ if (dwords & 1) { u32 *data = (u32 *) - ((char *)dev->agp_buffer_map->handle + ((char *)dev->agp_buffer_map->virtual + buf->offset + start); data[dwords++] = cpu_to_le32(R128_CCE_PACKET2); } @@ -722,7 +722,7 @@ static void r128_cce_dispatch_indices(struct drm_device * dev, dwords = (end - start + 3) / sizeof(u32); - data = (u32 *) ((char *)dev->agp_buffer_map->handle + data = (u32 *) ((char *)dev->agp_buffer_map->virtual + buf->offset + start); data[0] = cpu_to_le32(CCE_PACKET3(R128_3D_RNDR_GEN_INDX_PRIM, |
