vmwgfx: Add screen object support
authorJakob Bornecrantz <jakob@vmware.com>
Tue, 4 Oct 2011 18:13:22 +0000 (20:13 +0200)
committerDave Airlie <airlied@redhat.com>
Wed, 5 Oct 2011 09:17:14 +0000 (10:17 +0100)
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/vmwgfx/Makefile
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c [new file with mode: 0644]

index e13a118..586869c 100644 (file)
@@ -5,6 +5,6 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
            vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \
            vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
            vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \
-           vmwgfx_fence.o vmwgfx_dmabuf.o
+           vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o
 
 obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o
index d4829cb..d1e1325 100644 (file)
@@ -451,22 +451,28 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        dev_priv->fman = vmw_fence_manager_init(dev_priv);
        if (unlikely(dev_priv->fman == NULL))
                goto out_no_fman;
+
+       /* Need to start the fifo to check if we can do screen objects */
+       ret = vmw_3d_resource_inc(dev_priv, true);
+       if (unlikely(ret != 0))
+               goto out_no_fifo;
+       vmw_kms_save_vga(dev_priv);
+       DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ?
+                "Detected device 3D availability.\n" :
+                "Detected no device 3D availability.\n");
+
+       /* Start kms and overlay systems, needs fifo. */
        ret = vmw_kms_init(dev_priv);
        if (unlikely(ret != 0))
                goto out_no_kms;
        vmw_overlay_init(dev_priv);
+
+       /* We might be done with the fifo now */
        if (dev_priv->enable_fb) {
-               ret = vmw_3d_resource_inc(dev_priv, false);
-               if (unlikely(ret != 0))
-                       goto out_no_fifo;
-               vmw_kms_save_vga(dev_priv);
                vmw_fb_init(dev_priv);
-               DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ?
-                        "Detected device 3D availability.\n" :
-                        "Detected no device 3D availability.\n");
        } else {
-               DRM_INFO("Delayed 3D detection since we're not "
-                        "running the device in SVGA mode yet.\n");
+               vmw_kms_restore_vga(dev_priv);
+               vmw_3d_resource_dec(dev_priv, true);
        }
 
        if (dev_priv->capabilities & SVGA_CAP_IRQMASK) {
@@ -483,15 +489,17 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        return 0;
 
 out_no_irq:
-       if (dev_priv->enable_fb) {
+       if (dev_priv->enable_fb)
                vmw_fb_close(dev_priv);
+       vmw_overlay_close(dev_priv);
+       vmw_kms_close(dev_priv);
+out_no_kms:
+       /* We still have a 3D resource reference held */
+       if (dev_priv->enable_fb) {
                vmw_kms_restore_vga(dev_priv);
                vmw_3d_resource_dec(dev_priv, false);
        }
 out_no_fifo:
-       vmw_overlay_close(dev_priv);
-       vmw_kms_close(dev_priv);
-out_no_kms:
        vmw_fence_manager_takedown(dev_priv->fman);
 out_no_fman:
        if (dev_priv->stealth)
index 5acf1f2..2124fbc 100644 (file)
@@ -217,6 +217,7 @@ struct vmw_private {
 
        void *fb_info;
        struct vmw_legacy_display *ldu_priv;
+       struct vmw_screen_object_display *sou_priv;
        struct vmw_overlay *overlay_priv;
 
        /*
index b3d5120..346e232 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "vmwgfx_kms.h"
 
+
 /* Might need a hrtimer here? */
 #define VMWGFX_PRESENT_RATE ((HZ / 60 > 0) ? HZ / 60 : 1)
 
@@ -474,6 +475,62 @@ static int do_surface_dirty_ldu(struct vmw_private *dev_priv,
 
        vmw_fifo_commit(dev_priv, sizeof(*cmd) + (num_clips - 1) *
                        sizeof(cmd->cr));
+
+       return 0;
+}
+
+static int do_surface_dirty_sou(struct vmw_private *dev_priv,
+                               struct vmw_framebuffer *framebuffer,
+                               struct vmw_surface *surf,
+                               unsigned flags, unsigned color,
+                               struct drm_clip_rect *clips,
+                               unsigned num_clips, int inc)
+{
+       int left = clips->x2, right = clips->x1;
+       int top = clips->y2, bottom = clips->y1;
+       size_t fifo_size;
+       int i;
+
+       struct {
+               SVGA3dCmdHeader header;
+               SVGA3dCmdBlitSurfaceToScreen body;
+       } *cmd;
+
+
+       fifo_size = sizeof(*cmd);
+       cmd = vmw_fifo_reserve(dev_priv, fifo_size);
+       if (unlikely(cmd == NULL)) {
+               DRM_ERROR("Fifo reserve failed.\n");
+               return -ENOMEM;
+       }
+
+       memset(cmd, 0, fifo_size);
+
+       cmd->header.id = cpu_to_le32(SVGA_3D_CMD_BLIT_SURFACE_TO_SCREEN);
+       cmd->header.size = cpu_to_le32(sizeof(cmd->body));
+
+       cmd->body.srcImage.sid = cpu_to_le32(surf->res.id);
+       cmd->body.destScreenId = SVGA_ID_INVALID; /* virtual coords */
+
+       for (i = 0; i < num_clips; i++, clips += inc) {
+               left = min_t(int, left, (int)clips->x1);
+               right = max_t(int, right, (int)clips->x2);
+               top = min_t(int, top, (int)clips->y1);
+               bottom = max_t(int, bottom, (int)clips->y2);
+       }
+
+       cmd->body.srcRect.left = left;
+       cmd->body.srcRect.right = right;
+       cmd->body.srcRect.top = top;
+       cmd->body.srcRect.bottom = bottom;
+
+       cmd->body.destRect.left = left;
+       cmd->body.destRect.right = right;
+       cmd->body.destRect.top = top;
+       cmd->body.destRect.bottom = bottom;
+
+       vmw_fifo_commit(dev_priv, fifo_size);
+
        return 0;
 }
 
@@ -498,9 +555,8 @@ int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer,
        if (unlikely(ret != 0))
                return ret;
 
-       if (!num_clips ||
-           !(dev_priv->fifo.capabilities &
-             SVGA_FIFO_CAP_SCREEN_OBJECT)) {
+       /* Are we using screen objects? */
+       if (!dev_priv->sou_priv) {
                int ret;
 
                mutex_lock(&vfbs->work_lock);
@@ -528,9 +584,14 @@ int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer,
                inc = 2; /* skip source rects */
        }
 
-       ret = do_surface_dirty_ldu(dev_priv, &vfbs->base, surf,
-                                  flags, color,
-                                  clips, num_clips, inc);
+       if (!dev_priv->sou_priv)
+               ret = do_surface_dirty_ldu(dev_priv, &vfbs->base, surf,
+                                          flags, color,
+                                          clips, num_clips, inc);
+       else
+               ret = do_surface_dirty_sou(dev_priv, &vfbs->base, surf,
+                                          flags, color,
+                                          clips, num_clips, inc);
 
        ttm_read_unlock(&vmaster->lock);
        return 0;
@@ -618,8 +679,13 @@ static int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv,
        vfbs->base.base.depth = mode_cmd->depth;
        vfbs->base.base.width = mode_cmd->width;
        vfbs->base.base.height = mode_cmd->height;
-       vfbs->base.pin = &vmw_surface_dmabuf_pin;
-       vfbs->base.unpin = &vmw_surface_dmabuf_unpin;
+       /* Don't need to fill start of vram with empty
+        * buffer if we have screen objects support.
+        */
+       if (!dev_priv->sou_priv) {
+               vfbs->base.pin = &vmw_surface_dmabuf_pin;
+               vfbs->base.unpin = &vmw_surface_dmabuf_unpin;
+       }
        vfbs->surface = surface;
        vfbs->master = drm_master_get(file_priv->master);
        mutex_init(&vfbs->work_lock);
@@ -651,6 +717,7 @@ out_err1:
 struct vmw_framebuffer_dmabuf {
        struct vmw_framebuffer base;
        struct vmw_dma_buffer *buffer;
+       uint32_t handle;
 };
 
 void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer)
@@ -699,6 +766,63 @@ static int do_dmabuf_dirty_ldu(struct vmw_private *dev_priv,
        return 0;
 }
 
+static int do_dmabuf_dirty_sou(struct drm_file *file_priv,
+                              struct vmw_private *dev_priv,
+                              struct vmw_framebuffer *framebuffer,
+                              struct vmw_dma_buffer *buffer,
+                              unsigned flags, unsigned color,
+                              struct drm_clip_rect *clips,
+                              unsigned num_clips, int increment)
+{
+       struct vmw_framebuffer_dmabuf *vfbd =
+               vmw_framebuffer_to_vfbd(&framebuffer->base);
+       size_t fifo_size;
+       int i, ret;
+
+       struct {
+               uint32_t header;
+               SVGAFifoCmdDefineGMRFB body;
+       } *cmd;
+       struct {
+               uint32_t header;
+               SVGAFifoCmdBlitGMRFBToScreen body;
+       } *blits;
+
+       fifo_size = sizeof(*cmd) + sizeof(*blits) * num_clips;
+       cmd = kmalloc(fifo_size, GFP_KERNEL);
+       if (unlikely(cmd == NULL)) {
+               DRM_ERROR("Failed to allocate temporary cmd buffer.\n");
+               return -ENOMEM;
+       }
+
+       memset(cmd, 0, fifo_size);
+       cmd->header = SVGA_CMD_DEFINE_GMRFB;
+       cmd->body.format.bitsPerPixel = framebuffer->base.bits_per_pixel;
+       cmd->body.format.colorDepth = framebuffer->base.depth;
+       cmd->body.format.reserved = 0;
+       cmd->body.bytesPerLine = framebuffer->base.pitch;
+       cmd->body.ptr.gmrId = vfbd->handle;
+       cmd->body.ptr.offset = 0;
+
+       blits = (void *)&cmd[1];
+       for (i = 0; i < num_clips; i++, clips += increment) {
+               blits[i].header = SVGA_CMD_BLIT_GMRFB_TO_SCREEN;
+               blits[i].body.srcOrigin.x = clips->x1;
+               blits[i].body.srcOrigin.y = clips->y1;
+               blits[i].body.destRect.left = clips->x1;
+               blits[i].body.destRect.top = clips->y1;
+               blits[i].body.destRect.right = clips->x2;
+               blits[i].body.destRect.bottom = clips->y2;
+       }
+
+       ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd,
+                                 fifo_size, 0, NULL);
+
+       kfree(cmd);
+
+       return ret;
+}
+
 int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
                                 struct drm_file *file_priv,
                                 unsigned flags, unsigned color,
@@ -728,9 +852,15 @@ int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
                increment = 2;
        }
 
-       ret = do_dmabuf_dirty_ldu(dev_priv, &vfbd->base, dmabuf,
-                                 flags, color,
-                                 clips, num_clips, increment);
+       if (dev_priv->ldu_priv) {
+               ret = do_dmabuf_dirty_ldu(dev_priv, &vfbd->base, dmabuf,
+                                         flags, color,
+                                         clips, num_clips, increment);
+       } else {
+               ret = do_dmabuf_dirty_sou(file_priv, dev_priv, &vfbd->base,
+                                         dmabuf, flags, color,
+                                         clips, num_clips, increment);
+       }
 
        ttm_read_unlock(&vmaster->lock);
        return ret;
@@ -801,6 +931,8 @@ static int vmw_framebuffer_dmabuf_pin(struct vmw_framebuffer *vfb)
                vmw_framebuffer_to_vfbd(&vfb->base);
        int ret;
 
+       /* This code should not be used with screen objects */
+       BUG_ON(dev_priv->sou_priv);
 
        vmw_overlay_pause_all(dev_priv);
 
@@ -867,9 +999,12 @@ static int vmw_kms_new_framebuffer_dmabuf(struct vmw_private *dev_priv,
        vfbd->base.base.depth = mode_cmd->depth;
        vfbd->base.base.width = mode_cmd->width;
        vfbd->base.base.height = mode_cmd->height;
-       vfbd->base.pin = vmw_framebuffer_dmabuf_pin;
-       vfbd->base.unpin = vmw_framebuffer_dmabuf_unpin;
+       if (!dev_priv->sou_priv) {
+               vfbd->base.pin = vmw_framebuffer_dmabuf_pin;
+               vfbd->base.unpin = vmw_framebuffer_dmabuf_unpin;
+       }
        vfbd->buffer = dmabuf;
+       vfbd->handle = mode_cmd->handle;
        *out = &vfbd->base;
 
        return 0;
@@ -981,7 +1116,9 @@ int vmw_kms_init(struct vmw_private *dev_priv)
        dev->mode_config.max_width = 8192;
        dev->mode_config.max_height = 8192;
 
-       ret = vmw_kms_init_legacy_display_system(dev_priv);
+       ret = vmw_kms_init_screen_object_display(dev_priv);
+       if (ret) /* Fallback */
+               (void)vmw_kms_init_legacy_display_system(dev_priv);
 
        return 0;
 }
index 4e4313f..ee16a06 100644 (file)
@@ -31,6 +31,8 @@
 #include "drmP.h"
 #include "vmwgfx_drv.h"
 
+#define VMWGFX_NUM_DISPLAY_UNITS 8
+
 
 #define vmw_framebuffer_to_vfb(x) \
        container_of(x, struct vmw_framebuffer, base)
@@ -128,4 +130,12 @@ int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
 int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv);
 int vmw_kms_close_legacy_display_system(struct vmw_private *dev_priv);
 
+/*
+ * Screen Objects display functions - vmwgfx_scrn.c
+ */
+int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv);
+int vmw_kms_close_screen_object_display(struct vmw_private *dev_priv);
+int vmw_kms_sou_update_layout(struct vmw_private *dev_priv, unsigned num,
+                             struct drm_vmw_rect *rects);
+
 #endif
index 4a4e5cc..7fc8e7d 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "vmwgfx_kms.h"
 
-#define VMWGFX_LDU_NUM_DU 8
 
 #define vmw_crtc_to_ldu(x) \
        container_of(x, struct vmw_legacy_display_unit, base.crtc)
@@ -384,9 +383,9 @@ int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv)
        drm_mode_create_dirty_info_property(dev_priv->dev);
 
        if (dev_priv->capabilities & SVGA_CAP_MULTIMON) {
-               for (i = 0; i < VMWGFX_LDU_NUM_DU; ++i)
+               for (i = 0; i < VMWGFX_NUM_DISPLAY_UNITS; ++i)
                        vmw_ldu_init(dev_priv, i);
-               ret = drm_vblank_init(dev, VMWGFX_LDU_NUM_DU);
+               ret = drm_vblank_init(dev, VMWGFX_NUM_DISPLAY_UNITS);
        } else {
                /* for old hardware without multimon only enable one display */
                vmw_ldu_init(dev_priv, 0);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
new file mode 100644 (file)
index 0000000..e74b8e3
--- /dev/null
@@ -0,0 +1,566 @@
+/**************************************************************************
+ *
+ * Copyright © 2011 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#include "vmwgfx_kms.h"
+
+
+#define vmw_crtc_to_sou(x) \
+       container_of(x, struct vmw_screen_object_unit, base.crtc)
+#define vmw_encoder_to_sou(x) \
+       container_of(x, struct vmw_screen_object_unit, base.encoder)
+#define vmw_connector_to_sou(x) \
+       container_of(x, struct vmw_screen_object_unit, base.connector)
+
+struct vmw_screen_object_display {
+       struct list_head active;
+
+       unsigned num_active;
+       unsigned last_num_active;
+
+       struct vmw_framebuffer *fb;
+};
+
+/**
+ * Display unit using screen objects.
+ */
+struct vmw_screen_object_unit {
+       struct vmw_display_unit base;
+
+       unsigned long buffer_size; /**< Size of allocated buffer */
+       struct vmw_dma_buffer *buffer; /**< Backing store buffer */
+
+       bool defined;
+
+       struct list_head active;
+};
+
+static void vmw_sou_destroy(struct vmw_screen_object_unit *sou)
+{
+       list_del_init(&sou->active);
+       vmw_display_unit_cleanup(&sou->base);
+       kfree(sou);
+}
+
+
+/*
+ * Screen Object Display Unit CRTC functions
+ */
+
+static void vmw_sou_crtc_destroy(struct drm_crtc *crtc)
+{
+       vmw_sou_destroy(vmw_crtc_to_sou(crtc));
+}
+
+static int vmw_sou_del_active(struct vmw_private *vmw_priv,
+                             struct vmw_screen_object_unit *sou)
+{
+       struct vmw_screen_object_display *ld = vmw_priv->sou_priv;
+       if (list_empty(&sou->active))
+               return 0;
+
+       /* Must init otherwise list_empty(&sou->active) will not work. */
+       list_del_init(&sou->active);
+       if (--(ld->num_active) == 0) {
+               BUG_ON(!ld->fb);
+               if (ld->fb->unpin)
+                       ld->fb->unpin(ld->fb);
+               ld->fb = NULL;
+       }
+
+       return 0;
+}
+
+static int vmw_sou_add_active(struct vmw_private *vmw_priv,
+                             struct vmw_screen_object_unit *sou,
+                             struct vmw_framebuffer *vfb)
+{
+       struct vmw_screen_object_display *ld = vmw_priv->sou_priv;
+       struct vmw_screen_object_unit *entry;
+       struct list_head *at;
+
+       BUG_ON(!ld->num_active && ld->fb);
+       if (vfb != ld->fb) {
+               if (ld->fb && ld->fb->unpin)
+                       ld->fb->unpin(ld->fb);
+               if (vfb->pin)
+                       vfb->pin(vfb);
+               ld->fb = vfb;
+       }
+
+       if (!list_empty(&sou->active))
+               return 0;
+
+       at = &ld->active;
+       list_for_each_entry(entry, &ld->active, active) {
+               if (entry->base.unit > sou->base.unit)
+                       break;
+
+               at = &entry->active;
+       }
+
+       list_add(&sou->active, at);
+
+       ld->num_active++;
+
+       return 0;
+}
+
+/**
+ * Send the fifo command to create a screen.
+ */
+static int vmw_sou_fifo_create(struct vmw_private *dev_priv,
+                              struct vmw_screen_object_unit *sou,
+                              uint32_t x, uint32_t y,
+                              struct drm_display_mode *mode)
+{
+       size_t fifo_size;
+
+       struct {
+               struct {
+                       uint32_t cmdType;
+               } header;
+               SVGAScreenObject obj;
+       } *cmd;
+
+       BUG_ON(!sou->buffer);
+
+       fifo_size = sizeof(*cmd);
+       cmd = vmw_fifo_reserve(dev_priv, fifo_size);
+       /* The hardware has hung, nothing we can do about it here. */
+       if (unlikely(cmd == NULL)) {
+               DRM_ERROR("Fifo reserve failed.\n");
+               return -ENOMEM;
+       }
+
+       memset(cmd, 0, fifo_size);
+       cmd->header.cmdType = SVGA_CMD_DEFINE_SCREEN;
+       cmd->obj.structSize = sizeof(SVGAScreenObject);
+       cmd->obj.id = sou->base.unit;
+       cmd->obj.flags = SVGA_SCREEN_HAS_ROOT |
+               (sou->base.unit == 0 ? SVGA_SCREEN_IS_PRIMARY : 0);
+       cmd->obj.size.width = mode->hdisplay;
+       cmd->obj.size.height = mode->vdisplay;
+       cmd->obj.root.x = x;
+       cmd->obj.root.y = y;
+
+       /* Ok to assume that buffer is pinned in vram */
+       vmw_dmabuf_get_guest_ptr(sou->buffer, &cmd->obj.backingStore.ptr);
+       cmd->obj.backingStore.pitch = mode->hdisplay * 4;
+
+       vmw_fifo_commit(dev_priv, fifo_size);
+
+       sou->defined = true;
+
+       return 0;
+}
+
+/**
+ * Send the fifo command to destroy a screen.
+ */
+static int vmw_sou_fifo_destroy(struct vmw_private *dev_priv,
+                               struct vmw_screen_object_unit *sou)
+{
+       size_t fifo_size;
+       int ret;
+
+       struct {
+               struct {
+                       uint32_t cmdType;
+               } header;
+               SVGAFifoCmdDestroyScreen body;
+       } *cmd;
+
+       /* no need to do anything */
+       if (unlikely(!sou->defined))
+               return 0;
+
+       fifo_size = sizeof(*cmd);
+       cmd = vmw_fifo_reserve(dev_priv, fifo_size);
+       /* the hardware has hung, nothing we can do about it here */
+       if (unlikely(cmd == NULL)) {
+               DRM_ERROR("Fifo reserve failed.\n");
+               return -ENOMEM;
+       }
+
+       memset(cmd, 0, fifo_size);
+       cmd->header.cmdType = SVGA_CMD_DESTROY_SCREEN;
+       cmd->body.screenId = sou->base.unit;
+
+       vmw_fifo_commit(dev_priv, fifo_size);
+
+       /* Force sync */
+       ret = vmw_fallback_wait(dev_priv, false, true, 0, false, 3*HZ);
+       if (unlikely(ret != 0))
+               DRM_ERROR("Failed to sync with HW");
+       else
+               sou->defined = false;
+
+       return ret;
+}
+
+/**
+ * Free the backing store.
+ */
+static void vmw_sou_backing_free(struct vmw_private *dev_priv,
+                                struct vmw_screen_object_unit *sou)
+{
+       struct ttm_buffer_object *bo;
+
+       if (unlikely(sou->buffer == NULL))
+               return;
+
+       bo = &sou->buffer->base;
+       ttm_bo_unref(&bo);
+       sou->buffer = NULL;
+       sou->buffer_size = 0;
+}
+
+/**
+ * Allocate the backing store for the buffer.
+ */
+static int vmw_sou_backing_alloc(struct vmw_private *dev_priv,
+                                struct vmw_screen_object_unit *sou,
+                                unsigned long size)
+{
+       int ret;
+
+       if (sou->buffer_size == size)
+               return 0;
+
+       if (sou->buffer)
+               vmw_sou_backing_free(dev_priv, sou);
+
+       sou->buffer = kzalloc(sizeof(*sou->buffer), GFP_KERNEL);
+       if (unlikely(sou->buffer == NULL))
+               return -ENOMEM;
+
+       /* After we have alloced the backing store might not be able to
+        * resume the overlays, this is preferred to failing to alloc.
+        */
+       vmw_overlay_pause_all(dev_priv);
+       ret = vmw_dmabuf_init(dev_priv, sou->buffer, size,
+                             &vmw_vram_ne_placement,
+                             false, &vmw_dmabuf_bo_free);
+       vmw_overlay_resume_all(dev_priv);
+
+       if (unlikely(ret != 0))
+               sou->buffer = NULL; /* vmw_dmabuf_init frees on error */
+       else
+               sou->buffer_size = size;
+
+       return ret;
+}
+
+static int vmw_sou_crtc_set_config(struct drm_mode_set *set)
+{
+       struct vmw_private *dev_priv;
+       struct vmw_screen_object_unit *sou;
+       struct drm_connector *connector;
+       struct drm_display_mode *mode;
+       struct drm_encoder *encoder;
+       struct vmw_framebuffer *vfb;
+       struct drm_framebuffer *fb;
+       struct drm_crtc *crtc;
+       int ret = 0;
+
+       if (!set)
+               return -EINVAL;
+
+       if (!set->crtc)
+               return -EINVAL;
+
+       /* get the sou */
+       crtc = set->crtc;
+       sou = vmw_crtc_to_sou(crtc);
+       vfb = set->fb ? vmw_framebuffer_to_vfb(set->fb) : NULL;
+       dev_priv = vmw_priv(crtc->dev);
+
+       if (set->num_connectors > 1) {
+               DRM_ERROR("to many connectors\n");
+               return -EINVAL;
+       }
+
+       if (set->num_connectors == 1 &&
+           set->connectors[0] != &sou->base.connector) {
+               DRM_ERROR("connector doesn't match %p %p\n",
+                       set->connectors[0], &sou->base.connector);
+               return -EINVAL;
+       }
+
+       /* sou only supports one fb active at the time */
+       if (dev_priv->sou_priv->fb && vfb &&
+           !(dev_priv->sou_priv->num_active == 1 &&
+             !list_empty(&sou->active)) &&
+           dev_priv->sou_priv->fb != vfb) {
+               DRM_ERROR("Multiple framebuffers not supported\n");
+               return -EINVAL;
+       }
+
+       /* since they always map one to one these are safe */
+       connector = &sou->base.connector;
+       encoder = &sou->base.encoder;
+
+       /* should we turn the crtc off */
+       if (set->num_connectors == 0 || !set->mode || !set->fb) {
+               ret = vmw_sou_fifo_destroy(dev_priv, sou);
+               /* the hardware has hung don't do anything more */
+               if (unlikely(ret != 0))
+                       return ret;
+
+               connector->encoder = NULL;
+               encoder->crtc = NULL;
+               crtc->fb = NULL;
+               crtc->x = 0;
+               crtc->y = 0;
+
+               vmw_sou_del_active(dev_priv, sou);
+
+               vmw_sou_backing_free(dev_priv, sou);
+
+               return 0;
+       }
+
+
+       /* we now know we want to set a mode */
+       mode = set->mode;
+       fb = set->fb;
+
+       if (set->x + mode->hdisplay > fb->width ||
+           set->y + mode->vdisplay > fb->height) {
+               DRM_ERROR("set outside of framebuffer\n");
+               return -EINVAL;
+       }
+
+       vmw_fb_off(dev_priv);
+
+       if (mode->hdisplay != crtc->mode.hdisplay ||
+           mode->vdisplay != crtc->mode.vdisplay) {
+               /* no need to check if depth is different, because backing
+                * store depth is forced to 4 by the device.
+                */
+
+               ret = vmw_sou_fifo_destroy(dev_priv, sou);
+               /* the hardware has hung don't do anything more */
+               if (unlikely(ret != 0))
+                       return ret;
+
+               vmw_sou_backing_free(dev_priv, sou);
+       }
+
+       if (!sou->buffer) {
+               /* forced to depth 4 by the device */
+               size_t size = mode->hdisplay * mode->vdisplay * 4;
+               ret = vmw_sou_backing_alloc(dev_priv, sou, size);
+               if (unlikely(ret != 0))
+                       return ret;
+       }
+
+       ret = vmw_sou_fifo_create(dev_priv, sou, set->x, set->y, mode);
+       if (unlikely(ret != 0)) {
+               /*
+                * We are in a bit of a situation here, the hardware has
+                * hung and we may or may not have a buffer hanging of
+                * the screen object, best thing to do is not do anything
+                * if we where defined, if not just turn the crtc of.
+                * Not what userspace wants but it needs to htfu.
+                */
+               if (sou->defined)
+                       return ret;
+
+               connector->encoder = NULL;
+               encoder->crtc = NULL;
+               crtc->fb = NULL;
+               crtc->x = 0;
+               crtc->y = 0;
+
+               return ret;
+       }
+
+       vmw_sou_add_active(dev_priv, sou, vfb);
+
+       connector->encoder = encoder;
+       encoder->crtc = crtc;
+       crtc->mode = *mode;
+       crtc->fb = fb;
+       crtc->x = set->x;
+       crtc->y = set->y;
+
+       return 0;
+}
+
+static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
+       .save = vmw_du_crtc_save,
+       .restore = vmw_du_crtc_restore,
+       .cursor_set = vmw_du_crtc_cursor_set,
+       .cursor_move = vmw_du_crtc_cursor_move,
+       .gamma_set = vmw_du_crtc_gamma_set,
+       .destroy = vmw_sou_crtc_destroy,
+       .set_config = vmw_sou_crtc_set_config,
+};
+
+/*
+ * Screen Object Display Unit encoder functions
+ */
+
+static void vmw_sou_encoder_destroy(struct drm_encoder *encoder)
+{
+       vmw_sou_destroy(vmw_encoder_to_sou(encoder));
+}
+
+static struct drm_encoder_funcs vmw_screen_object_encoder_funcs = {
+       .destroy = vmw_sou_encoder_destroy,
+};
+
+/*
+ * Screen Object Display Unit connector functions
+ */
+
+static void vmw_sou_connector_destroy(struct drm_connector *connector)
+{
+       vmw_sou_destroy(vmw_connector_to_sou(connector));
+}
+
+static struct drm_connector_funcs vmw_legacy_connector_funcs = {
+       .dpms = vmw_du_connector_dpms,
+       .save = vmw_du_connector_save,
+       .restore = vmw_du_connector_restore,
+       .detect = vmw_du_connector_detect,
+       .fill_modes = vmw_du_connector_fill_modes,
+       .set_property = vmw_du_connector_set_property,
+       .destroy = vmw_sou_connector_destroy,
+};
+
+static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
+{
+       struct vmw_screen_object_unit *sou;
+       struct drm_device *dev = dev_priv->dev;
+       struct drm_connector *connector;
+       struct drm_encoder *encoder;
+       struct drm_crtc *crtc;
+
+       sou = kzalloc(sizeof(*sou), GFP_KERNEL);
+       if (!sou)
+               return -ENOMEM;
+
+       sou->base.unit = unit;
+       crtc = &sou->base.crtc;
+       encoder = &sou->base.encoder;
+       connector = &sou->base.connector;
+
+       INIT_LIST_HEAD(&sou->active);
+
+       sou->base.pref_active = (unit == 0);
+       sou->base.pref_width = 800;
+       sou->base.pref_height = 600;
+       sou->base.pref_mode = NULL;
+
+       drm_connector_init(dev, connector, &vmw_legacy_connector_funcs,
+                          DRM_MODE_CONNECTOR_LVDS);
+       connector->status = vmw_du_connector_detect(connector, true);
+
+       drm_encoder_init(dev, encoder, &vmw_screen_object_encoder_funcs,
+                        DRM_MODE_ENCODER_LVDS);
+       drm_mode_connector_attach_encoder(connector, encoder);
+       encoder->possible_crtcs = (1 << unit);
+       encoder->possible_clones = 0;
+
+       drm_crtc_init(dev, crtc, &vmw_screen_object_crtc_funcs);
+
+       drm_mode_crtc_set_gamma_size(crtc, 256);
+
+       drm_connector_attach_property(connector,
+                                     dev->mode_config.dirty_info_property,
+                                     1);
+
+       return 0;
+}
+
+int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv)
+{
+       struct drm_device *dev = dev_priv->dev;
+       int i;
+       int ret;
+
+       if (dev_priv->sou_priv) {
+               DRM_INFO("sou system already on\n");
+               return -EINVAL;
+       }
+
+       if (!(dev_priv->fifo.capabilities & SVGA_FIFO_CAP_SCREEN_OBJECT_2)) {
+               DRM_INFO("Not using screen objects,"
+                        " missing cap SCREEN_OBJECT_2\n");
+               return -ENOSYS;
+       }
+
+       ret = -ENOMEM;
+       dev_priv->sou_priv = kmalloc(sizeof(*dev_priv->sou_priv), GFP_KERNEL);
+       if (unlikely(!dev_priv->sou_priv))
+               goto err_no_mem;
+
+       INIT_LIST_HEAD(&dev_priv->sou_priv->active);
+       dev_priv->sou_priv->num_active = 0;
+       dev_priv->sou_priv->last_num_active = 0;
+       dev_priv->sou_priv->fb = NULL;
+
+       ret = drm_vblank_init(dev, VMWGFX_NUM_DISPLAY_UNITS);
+       if (unlikely(ret != 0))
+               goto err_free;
+
+       ret = drm_mode_create_dirty_info_property(dev_priv->dev);
+       if (unlikely(ret != 0))
+               goto err_vblank_cleanup;
+
+       for (i = 0; i < VMWGFX_NUM_DISPLAY_UNITS; ++i)
+               vmw_sou_init(dev_priv, i);
+
+       DRM_INFO("Screen objects system initialized\n");
+
+       return 0;
+
+err_vblank_cleanup:
+       drm_vblank_cleanup(dev);
+err_free:
+       kfree(dev_priv->sou_priv);
+err_no_mem:
+       return ret;
+}
+
+int vmw_kms_close_screen_object_display(struct vmw_private *dev_priv)
+{
+       struct drm_device *dev = dev_priv->dev;
+
+       drm_vblank_cleanup(dev);
+       if (!dev_priv->sou_priv)
+               return -ENOSYS;
+
+       if (!list_empty(&dev_priv->sou_priv->active))
+               DRM_ERROR("Still have active outputs when unloading driver");
+
+       kfree(dev_priv->sou_priv);
+
+       return 0;
+}