diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-03 11:26:38 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-03 11:26:38 +0000 |
| commit | 6c9715eaf502587c58acfaea420a4fdf29bd7221 (patch) | |
| tree | ce6045e7fe6eadeadfa8ca196ef4f6ea000e3b9b | |
| parent | 4f8f02a1922653b2ce5c115c4469e927b5d826fa (diff) | |
bring over fix from i865-agp branch, it now probes the driver, X hangs
box..
| -rw-r--r-- | bsd-core/drm_drv.c | 6 | ||||
| -rw-r--r-- | bsd-core/i915_drv.c | 2 | ||||
| -rw-r--r-- | bsd/drm_drv.h | 6 | ||||
| -rw-r--r-- | bsd/i915_drv.c | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c index af69029b..256be44d 100644 --- 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 5fbbfb2b..8fd7e37d 100644 --- 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 af69029b..256be44d 100644 --- 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 5fbbfb2b..8fd7e37d 100644 --- 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" |