1 files changed, 50 insertions, 31 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index afa8a12cd009..dacdf3c577cb 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -39,6 +39,7 @@
 int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
+        struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
         drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
         u32 acthd_reg = IS_I965G(dev) ? ACTHD_I965 : ACTHD;
         u32 last_acthd = I915_READ(acthd_reg);
@@ -55,8 +56,8 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
                 if (ring->space >= n)
                         return 0;
 
-                if (dev_priv->sarea_priv)
-                        dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
+                if (master_priv->sarea_priv)
+                        master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
 
                 if (ring->head != last_head)
                         i = 0;
@@ -121,6 +122,7 @@ static void i915_free_hws(struct drm_device *dev)
 void i915_kernel_lost_context(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
+        struct drm_i915_master_private *master_priv;
         drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
 
         ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
@@ -129,8 +131,12 @@ void i915_kernel_lost_context(struct drm_device * dev)
         if (ring->space < 0)
                 ring->space += ring->Size;
 
-        if (ring->head == ring->tail && dev_priv->sarea_priv)
-                dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY;
+        if (!dev->primary->master)
+                return;
+
+        master_priv = dev->primary->master->driver_priv;
+        if (ring->head == ring->tail && master_priv->sarea_priv)
+                master_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY;
 }
 
 static int i915_dma_cleanup(struct drm_device * dev)
@@ -154,25 +160,13 @@ static int i915_dma_cleanup(struct drm_device * dev)
         if (I915_NEED_GFX_HWS(dev))
                 i915_free_hws(dev);
 
-        dev_priv->sarea = NULL;
-        dev_priv->sarea_priv = NULL;
-
         return 0;
 }
 
 static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-
-        dev_priv->sarea = drm_getsarea(dev);
-        if (!dev_priv->sarea) {
-                DRM_ERROR("can not find sarea!\n");
-                i915_dma_cleanup(dev);
-                return -EINVAL;
-        }
-
-        dev_priv->sarea_priv = (drm_i915_sarea_t *)
-            ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset);
+        struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
 
         if (init->ring_size != 0) {
                 if (dev_priv->ring.ring_obj != NULL) {
@@ -207,7 +201,8 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
         dev_priv->back_offset = init->back_offset;
         dev_priv->front_offset = init->front_offset;
         dev_priv->current_page = 0;
-        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
+        if (master_priv->sarea_priv)
+                master_priv->sarea_priv->pf_current_page = 0;
 
         /* Allow hardware batchbuffers unless told otherwise.
          */
@@ -222,11 +217,6 @@ static int i915_dma_resume(struct drm_device * dev)
 
         DRM_DEBUG("%s\n", __func__);
 
-        if (!dev_priv->sarea) {
-                DRM_ERROR("can not find sarea!\n");
-                return -EINVAL;
-        }
-
         if (dev_priv->ring.map.handle == NULL) {
                 DRM_ERROR("can not ioremap virtual address for"
                           " ring buffer\n");
@@ -435,13 +425,14 @@ i915_emit_box(struct drm_device *dev,
 static void i915_emit_breadcrumb(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
+        struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
         RING_LOCALS;
 
         dev_priv->counter++;
         if (dev_priv->counter > 0x7FFFFFFFUL)
                 dev_priv->counter = 0;
-        if (dev_priv->sarea_priv)
-                dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
+        if (master_priv->sarea_priv)
+                master_priv->sarea_priv->last_enqueue = dev_priv->counter;
 
         BEGIN_LP_RING(4);
         OUT_RING(MI_STORE_DWORD_INDEX);
@@ -537,15 +528,17 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
 static int i915_dispatch_flip(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
+        struct drm_i915_master_private *master_priv =
+                dev->primary->master->driver_priv;
         RING_LOCALS;
 
-        if (!dev_priv->sarea_priv)
+        if (!master_priv->sarea_priv)
                 return -EINVAL;
 
         DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
                   __func__,
                   dev_priv->current_page,
-                  dev_priv->sarea_priv->pf_current_page);
+                  master_priv->sarea_priv->pf_current_page);
 
         i915_kernel_lost_context(dev);
 
@@ -572,7 +565,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
         OUT_RING(0);
         ADVANCE_LP_RING();
 
-        dev_priv->sarea_priv->last_enqueue = dev_priv->counter++;
+        master_priv->sarea_priv->last_enqueue = dev_priv->counter++;
 
         BEGIN_LP_RING(4);
         OUT_RING(MI_STORE_DWORD_INDEX);
@@ -581,7 +574,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
         OUT_RING(0);
         ADVANCE_LP_RING();
 
-        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
+        master_priv->sarea_priv->pf_current_page = dev_priv->current_page;
         return 0;
 }
 
@@ -611,8 +604,9 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                             struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
-            dev_priv->sarea_priv;
+            master_priv->sarea_priv;
         drm_i915_batchbuffer_t *batch = data;
         int ret;
 
@@ -644,8 +638,9 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                           struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
-            dev_priv->sarea_priv;
+            master_priv->sarea_priv;
         drm_i915_cmdbuffer_t *cmdbuf = data;
         int ret;
 
@@ -802,6 +797,30 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
         return 0;
 }
 
+int i915_master_create(struct drm_device *dev, struct drm_master *master)
+{
+        struct drm_i915_master_private *master_priv;
+
+        master_priv = drm_calloc(1, sizeof(*master_priv), DRM_MEM_DRIVER);
+        if (!master_priv)
+                return -ENOMEM;
+
+        master->driver_priv = master_priv;
+        return 0;
+}
+
+void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
+{
+        struct drm_i915_master_private *master_priv = master->driver_priv;
+
+        if (!master_priv)
+                return;
+
+        drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
+
+        master->driver_priv = NULL;
+}
+
 int i915_driver_load(struct drm_device *dev, unsigned long flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;