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/radeon_cs.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/radeon_cs.c')
| -rw-r--r-- | sys/dev/drm/radeon_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/drm/radeon_cs.c b/sys/dev/drm/radeon_cs.c index b523126..14fe2fc 100644 --- a/sys/dev/drm/radeon_cs.c +++ b/sys/dev/drm/radeon_cs.c @@ -821,7 +821,7 @@ static int r600_ib_get(struct drm_radeon_cs_parser *parser) } buf->file_priv = parser->file_priv; dev_priv->cs_buf = buf; - parser->ib = (void *)((vm_offset_t)dev->agp_buffer_map->handle + + parser->ib = (void *)((vm_offset_t)dev->agp_buffer_map->virtual + buf->offset); return 0; |
