drm: move to kref per-master structures.

This is step one towards having multiple masters sharing a drm
device in order to get fast-user-switching to work.

It splits out the information associated with the drm master
into a separate kref counted structure, and allocates this when
a master opens the device node. It also allows the current master
to abdicate (say while VT switched), and a new master to take over
the hardware.

It moves the Intel and radeon drivers to using the sarea from
within the new master structures.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 69b9a42da95e..9b673d2f912b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -168,6 +168,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *) arg;
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        struct drm_i915_master_private *master_priv;
         u32 iir, new_iir;
         u32 pipea_stats, pipeb_stats;
         u32 vblank_status;
@@ -222,9 +223,12 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                 I915_WRITE(IIR, iir);
                 new_iir = I915_READ(IIR); /* Flush posted writes */
 
-                if (dev_priv->sarea_priv)
-                        dev_priv->sarea_priv->last_dispatch =
-                                READ_BREADCRUMB(dev_priv);
+                if (dev->primary->master) {
+                        master_priv = dev->primary->master->driver_priv;
+                        if (master_priv->sarea_priv)
+                                master_priv->sarea_priv->last_dispatch =
+                                        READ_BREADCRUMB(dev_priv);
+                }
 
                 if (iir & I915_USER_INTERRUPT) {
                         dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
@@ -269,6 +273,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 static int i915_emit_irq(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;
 
         i915_kernel_lost_context(dev);
@@ -278,8 +283,8 @@ static int i915_emit_irq(struct drm_device * dev)
         dev_priv->counter++;
         if (dev_priv->counter > 0x7FFFFFFFUL)
                 dev_priv->counter = 1;
-        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);
@@ -317,21 +322,20 @@ void i915_user_irq_put(struct drm_device *dev)
 static int i915_wait_irq(struct drm_device * dev, int irq_nr)
 {
         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;
         int ret = 0;
 
         DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
                   READ_BREADCRUMB(dev_priv));
 
         if (READ_BREADCRUMB(dev_priv) >= irq_nr) {
-                if (dev_priv->sarea_priv) {
-                        dev_priv->sarea_priv->last_dispatch =
-                                READ_BREADCRUMB(dev_priv);
-                }
+                if (master_priv->sarea_priv)
+                        master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
                 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;
 
         i915_user_irq_get(dev);
         DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
@@ -343,10 +347,6 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
                           READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
         }
 
-        if (dev_priv->sarea_priv)
-                dev_priv->sarea_priv->last_dispatch =
-                        READ_BREADCRUMB(dev_priv);
-
         return ret;
 }