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/via_mm.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/via_mm.c')
| -rw-r--r-- | sys/dev/drm/via_mm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/dev/drm/via_mm.c b/sys/dev/drm/via_mm.c index 9aaee9f..6dc185b 100644 --- a/sys/dev/drm/via_mm.c +++ b/sys/dev/drm/via_mm.c @@ -45,7 +45,6 @@ int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv) ret = drm_sman_set_range(&dev_priv->sman, VIA_MEM_AGP, 0, agp->size >> VIA_MM_ALIGN_SHIFT); - if (ret) { DRM_ERROR("AGP memory manager initialisation error\n"); return ret; @@ -66,7 +65,6 @@ int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv) ret = drm_sman_set_range(&dev_priv->sman, VIA_MEM_VIDEO, 0, fb->size >> VIA_MM_ALIGN_SHIFT); - if (ret) { DRM_ERROR("VRAM memory manager initialisation error\n"); return ret; |
