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

box..
main
Dave Airlie 2004-08-03 11:26:38 +00:00
parent 4f8f02a192
commit 6c9715eaf5
4 changed files with 14 additions and 2 deletions

View File

@ -280,8 +280,12 @@ static device_method_t DRM(methods)[] = {
{ 0, 0 } { 0, 0 }
}; };
#ifndef DRM_DEV_NAME
#define DRM_DEV_NAME "drm"
#endif
static driver_t DRM(driver) = { static driver_t DRM(driver) = {
"drm", DRM_DEV_NAME,
DRM(methods), DRM(methods),
sizeof(drm_device_t), sizeof(drm_device_t),
}; };

View File

@ -28,6 +28,8 @@
* *
*/ */
#define DRM_DEV_NAME "drmsub"
#include "i915.h" #include "i915.h"
#include "drmP.h" #include "drmP.h"
#include "drm.h" #include "drm.h"

View File

@ -280,8 +280,12 @@ static device_method_t DRM(methods)[] = {
{ 0, 0 } { 0, 0 }
}; };
#ifndef DRM_DEV_NAME
#define DRM_DEV_NAME "drm"
#endif
static driver_t DRM(driver) = { static driver_t DRM(driver) = {
"drm", DRM_DEV_NAME,
DRM(methods), DRM(methods),
sizeof(drm_device_t), sizeof(drm_device_t),
}; };

View File

@ -28,6 +28,8 @@
* *
*/ */
#define DRM_DEV_NAME "drmsub"
#include "i915.h" #include "i915.h"
#include "drmP.h" #include "drmP.h"
#include "drm.h" #include "drm.h"