summaryrefslogtreecommitdiff
path: root/shared-core/i915_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-02-14 07:37:34 +1000
committerDave Airlie <airlied@redhat.com>2008-02-14 07:37:34 +1000
commit8bf8cd63bb4631b57ceb27058f81d767a94edc74 (patch)
tree2d5eade3c797c26340daf2adf2042213491e8a3d /shared-core/i915_drv.h
parenta4fc1d7ac6be8d2648acda463723d56c68e4122e (diff)
missing bits
Diffstat (limited to 'shared-core/i915_drv.h')
-rw-r--r--shared-core/i915_drv.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index ea89bc4c..19fec0fc 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -97,17 +97,22 @@ struct drm_i915_vbl_swap {
unsigned int plane;
unsigned int sequence;
int flip;
+ struct drm_minor *minor;
};
+struct drm_i915_master_private {
+ drm_local_map_t *sarea;
+ struct drm_i915_sarea *sarea_priv;
+};
+
struct drm_i915_private {
struct drm_buffer_object *ring_buffer;
- drm_local_map_t *sarea;
+
drm_local_map_t *mmio_map;
unsigned long mmiobase;
unsigned long mmiolen;
- struct drm_i915_sarea *sarea_priv;
struct drm_i915_ring_buffer ring;
struct drm_dma_handle *status_page_dmah;
@@ -249,6 +254,8 @@ enum intel_chip_family {
extern struct drm_ioctl_desc i915_ioctls[];
extern int i915_max_ioctl;
+extern int i915_master_create(struct drm_device *dev, struct drm_master *master);
+extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);
/* i915_dma.c */
extern void i915_kernel_lost_context(struct drm_device * dev);
extern int i915_driver_load(struct drm_device *, unsigned long flags);