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, 6 insertions, 5 deletions

diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 4b27d9abb7bc..cace3964feeb 100644
--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
@@ -860,12 +860,12 @@ static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
  * The actual age emit is done by r300_do_cp_cmdbuf, which is why you must
  * be careful about how this function is called.
  */
-static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
+static void r300_discard_buffer(struct drm_device *dev, struct drm_master *master, struct drm_buf *buf)
 {
-        drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+        struct drm_radeon_master_private *master_priv = master->driver_priv;
 
-        buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
+        buf_priv->age = ++master_priv->sarea_priv->last_dispatch;
         buf->pending = 1;
         buf->used = 0;
 }
@@ -1027,6 +1027,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                       drm_radeon_kcmd_buffer_t *cmdbuf)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
+        struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;
         struct drm_device_dma *dma = dev->dma;
         struct drm_buf *buf = NULL;
         int emit_dispatch_age = 0;
@@ -1134,7 +1135,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                         }
 
                         emit_dispatch_age = 1;
-                        r300_discard_buffer(dev, buf);
+                        r300_discard_buffer(dev, file_priv->master, buf);
                         break;
 
                 case R300_CMD_WAIT:
@@ -1189,7 +1190,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
 
                 /* Emit the vertex buffer age */
                 BEGIN_RING(2);
-                RADEON_DISPATCH_AGE(dev_priv->sarea_priv->last_dispatch);
+                RADEON_DISPATCH_AGE(master_priv->sarea_priv->last_dispatch);
                 ADVANCE_RING();
         }