Module Name: src
Committed By: jmcneill
Date: Fri Feb 11 01:13:03 UTC 2011
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_memory.c
Log Message:
Make DRM work with genfb again.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.7 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.8
--- src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.7 Tue Jan 26 08:01:26 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c Fri Feb 11 01:13:02 2011
@@ -44,13 +44,18 @@
# else
# if defined(_KERNEL_OPT)
# include "agp_i810.h"
+# include "genfb.h"
# else
# define NAGP_I810 1
+# define NGENFB 1
# endif
# endif
# if NAGP_I810 > 0
# include <dev/pci/agpvar.h>
# endif
+# if NGENFB > 0
+# include <dev/wsfb/genfbvar.h>
+# endif
#endif
MALLOC_DEFINE(DRM_MEM_DMA, "drm_dma", "DRM DMA Data Structures");
@@ -140,6 +145,10 @@
if (agp_i810_borrow(map->offset, &map->bsh))
return bus_space_vaddr(map->bst, map->bsh);
#endif
+#if NGENFB > 0
+ if (genfb_borrow(map->offset, &map->bsh))
+ return bus_space_vaddr(map->bst, map->bsh);
+#endif
DRM_DEBUG("ioremap: failed to map (%d)\n",
reason);
return NULL;
