[patch] x11-drm patch for 'drmAddMap(backbuffer) failed'

drm_bufs.c.patch (text/plain), 1.42 KB, created by Lutz Lehmann on 2005-12-07 13:39:22 UTC

? mem
Index: drm_bufs.c
===================================================================
RCS file: /cvs/dri/drm/linux-core/drm_bufs.c,v
retrieving revision 1.72
diff -u -r1.72 drm_bufs.c
--- drm_bufs.c	30 Sep 2005 03:39:02 -0000	1.72
+++ drm_bufs.c	4 Nov 2005 11:38:04 -0000
@@ -235,9 +235,19 @@
 #ifdef __alpha__
 		map->offset += dev->hose->mem_space->start;
 #endif
+		/* Note: dev->agp->base may actually be 0 when the DRM
+		 * is not in control of AGP space. But if user space is
+		 * it should already have added the AGP base itself.
+		 */
 		map->offset += dev->agp->base;
 		map->mtrr = dev->agp->agp_mtrr;	/* for getmap */
 
+		/* This assumes the DRM is in total control of AGP space.
+		 * It's not always the case as AGP can be in the control
+		 * of user space (i.e. i810 driver). So this loop will get
+		 * skipped and we double check that dev->agp->memory is
+		 * actually set as well as being invalid before EPERM'ing
+		 */
 		for (entry = dev->agp->memory; entry; entry = entry->next) {
 			if ((map->offset >= entry->bound) &&
 			    (map->offset + map->size <= entry->bound + entry->pages * PAGE_SIZE)) {
@@ -245,7 +255,7 @@
 				break;
 			}
 		}
-		if (!valid) {
+		if (dev->agp->memory && !valid) {
 			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
 			return -EPERM;
 		}
@@ -599,7 +609,7 @@
 			break;
 		}
 	}
-	if (!valid) {
+	if (dev->agp->memory && !valid) {
 		DRM_DEBUG("zone invalid\n");
 		return -EINVAL;
 	}