summaryrefslogtreecommitdiff
path: root/bsd-core
diff options
context:
space:
mode:
authorRobert Noland <rnoland@2hip.net>2009-02-24 02:00:42 -0600
committerRobert Noland <rnoland@2hip.net>2009-02-24 12:24:29 -0600
commitd45bc6667c6f10cbb3832178e4a6a8cdd036b739 (patch)
tree02031b59bdf1c6b0c2ddb34602df2e15d51a3dd7 /bsd-core
parentc3c21303e381310a0962ecc24af1797dccd9a99f (diff)
i915: This was part of a sync to the intel driver at some point
-Remove the old TTM interface -Move register definitions to i915_reg.h -Rework the irq handler
Diffstat (limited to 'bsd-core')
-rw-r--r--bsd-core/drmP.h1
-rw-r--r--bsd-core/i915_drv.c1
l---------bsd-core/i915_reg.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 73487451..fe3fc78b 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -658,6 +658,7 @@ struct drm_device {
/* Context support */
int irq; /* Interrupt used by board */
int irq_enabled; /* True if the irq handler is enabled */
+ int msi_enabled; /* MSI enabled */
int irqrid; /* Interrupt used by board */
struct resource *irqr; /* Resource for interrupt used by board */
void *irqh; /* Handle from bus_setup_intr */
diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index 0c36a6f1..70088ee3 100644
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -75,7 +75,6 @@ static void i915_configure(struct drm_device *dev)
dev->driver->buf_priv_size = sizeof(drm_i915_private_t);
dev->driver->load = i915_driver_load;
dev->driver->unload = i915_driver_unload;
- dev->driver->firstopen = i915_driver_firstopen;
dev->driver->preclose = i915_driver_preclose;
dev->driver->lastclose = i915_driver_lastclose;
dev->driver->device_is_agp = i915_driver_device_is_agp;
diff --git a/bsd-core/i915_reg.h b/bsd-core/i915_reg.h
new file mode 120000
index 00000000..d364e7f1
--- /dev/null
+++ b/bsd-core/i915_reg.h
@@ -0,0 +1 @@
+../shared-core/i915_reg.h \ No newline at end of file