From 8bf8cd63bb4631b57ceb27058f81d767a94edc74 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 14 Feb 2008 07:37:34 +1000 Subject: missing bits --- shared-core/i915_drv.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'shared-core/i915_drv.h') 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); -- cgit v1.2.3