bring over fix from i865-agp branch, it now probes the driver, X hangs

    box..

diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index af69029..256be44 100644 (file)
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -280,8 +280,12 @@ static device_method_t DRM(methods)[] = {
        { 0, 0 }
 };
 
+#ifndef DRM_DEV_NAME
+#define DRM_DEV_NAME "drm"
+#endif
+
 static driver_t DRM(driver) = {
-       "drm",
+       DRM_DEV_NAME,
        DRM(methods),
        sizeof(drm_device_t),
 };

diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index 5fbbfb2..8fd7e37 100644 (file)
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -28,6 +28,8 @@
  *
  */
 
+#define DRM_DEV_NAME "drmsub"
+
 #include "i915.h"
 #include "drmP.h"
 #include "drm.h"

diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h
index af69029..256be44 100644 (file)
--- a/bsd/drm_drv.h
+++ b/bsd/drm_drv.h
@@ -280,8 +280,12 @@ static device_method_t DRM(methods)[] = {
        { 0, 0 }
 };
 
+#ifndef DRM_DEV_NAME
+#define DRM_DEV_NAME "drm"
+#endif
+
 static driver_t DRM(driver) = {
-       "drm",
+       DRM_DEV_NAME,
        DRM(methods),
        sizeof(drm_device_t),
 };

diff --git a/bsd/i915_drv.c b/bsd/i915_drv.c
index 5fbbfb2..8fd7e37 100644 (file)
--- a/bsd/i915_drv.c
+++ b/bsd/i915_drv.c
@@ -28,6 +28,8 @@
  *
  */
 
+#define DRM_DEV_NAME "drmsub"
+
 #include "i915.h"
 #include "drmP.h"
 #include "drm.h"