Merge branch 'qxl-next' of git://people.freedesktop.org/~airlied/linux into drm-next

Adds 3 features that UMS had to the KMS driver.
dynamic resizing - resizing remote-viewer makes guest resize
multiple crtcs - remote-viewer can access > 1 crtc.
suspend/resume/hibernate: guests can do suspend/resume/hibernate now.

* 'qxl-next' of git://people.freedesktop.org/~airlied/linux:
  qxl: use drm helper hotplug support
  qxl: add suspend/resume/hibernate support.
  qxl: add fb and ttm entry points for use by suspend/resume.
  qxl: add ring prep code for s/r
  qxl: prepare memslot code for suspend/resume
  qxl: split monitors_config object creation out.
  drm/qxl: set time on drawables from userspace
  drm/qxl: add support for > 1 output
  drm/qxl: make dynamic resizing work properly.

8 files changed, 326 insertions, 128 deletions

diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index f86771481317..93c2f2cceb51 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -49,6 +49,11 @@ void qxl_ring_free(struct qxl_ring *ring)
         kfree(ring);
 }
 
+void qxl_ring_init_hdr(struct qxl_ring *ring)
+{
+        ring->ring->header.notify_on_prod = ring->n_elements;
+}
+
 struct qxl_ring *
 qxl_ring_create(struct qxl_ring_header *header,
                 int element_size,
@@ -69,7 +74,7 @@ qxl_ring_create(struct qxl_ring_header *header,
         ring->prod_notify = prod_notify;
         ring->push_event = push_event;
         if (set_prod_notify)
-                header->notify_on_prod = ring->n_elements;
+                qxl_ring_init_hdr(ring);
         spin_lock_init(&ring->lock);
         return ring;
 }
@@ -87,7 +92,7 @@ static int qxl_check_header(struct qxl_ring *ring)
         return ret;
 }
 
-static int qxl_check_idle(struct qxl_ring *ring)
+int qxl_check_idle(struct qxl_ring *ring)
 {
         int ret;
         struct qxl_ring_header *header = &(ring->ring->header);
@@ -375,8 +380,8 @@ void qxl_io_destroy_primary(struct qxl_device *qdev)
         wait_for_io_cmd(qdev, 0, QXL_IO_DESTROY_PRIMARY_ASYNC);
 }
 
-void qxl_io_create_primary(struct qxl_device *qdev, unsigned width,
-                           unsigned height, unsigned offset, struct qxl_bo *bo)
+void qxl_io_create_primary(struct qxl_device *qdev,
+                           unsigned offset, struct qxl_bo *bo)
 {
         struct qxl_surface_create *create;
 
@@ -384,8 +389,8 @@ void qxl_io_create_primary(struct qxl_device *qdev, unsigned width,
                  qdev->ram_header);
         create = &qdev->ram_header->create_surface;
         create->format = bo->surf.format;
-        create->width = width;
-        create->height = height;
+        create->width = bo->surf.width;
+        create->height = bo->surf.height;
         create->stride = bo->surf.stride;
         create->mem = qxl_bo_physical_address(qdev, bo, offset);
 
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 686a937675cb..f76f5dd7bfc4 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -30,53 +30,9 @@
 #include "qxl_object.h"
 #include "drm_crtc_helper.h"
 
-static void qxl_crtc_set_to_mode(struct qxl_device *qdev,
-                                 struct drm_connector *connector,
-                                 struct qxl_head *head)
+static bool qxl_head_enabled(struct qxl_head *head)
 {
-        struct drm_device *dev = connector->dev;
-        struct drm_display_mode *mode, *t;
-        int width = head->width;
-        int height = head->height;
-
-        if (width < 320 || height < 240) {
-                qxl_io_log(qdev, "%s: bad head: %dx%d", width, height);
-                width = 1024;
-                height = 768;
-        }
-        if (width * height * 4 > 16*1024*1024) {
-                width = 1024;
-                height = 768;
-        }
-        /* TODO: go over regular modes and removed preferred? */
-        list_for_each_entry_safe(mode, t, &connector->probed_modes, head)
-                drm_mode_remove(connector, mode);
-        mode = drm_cvt_mode(dev, width, height, 60, false, false, false);
-        mode->type |= DRM_MODE_TYPE_PREFERRED;
-        mode->status = MODE_OK;
-        drm_mode_probed_add(connector, mode);
-        qxl_io_log(qdev, "%s: %d x %d\n", __func__, width, height);
-}
-
-void qxl_crtc_set_from_monitors_config(struct qxl_device *qdev)
-{
-        struct drm_connector *connector;
-        int i;
-        struct drm_device *dev = qdev->ddev;
-
-        i = 0;
-        qxl_io_log(qdev, "%s: %d, %d\n", __func__,
-                   dev->mode_config.num_connector,
-                   qdev->monitors_config->count);
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                if (i > qdev->monitors_config->count) {
-                        /* crtc will be reported as disabled */
-                        continue;
-                }
-                qxl_crtc_set_to_mode(qdev, connector,
-                                     &qdev->monitors_config->heads[i]);
-                ++i;
-        }
+        return head->width && head->height;
 }
 
 void qxl_alloc_client_monitors_config(struct qxl_device *qdev, unsigned count)
@@ -106,7 +62,6 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
         int num_monitors;
         uint32_t crc;
 
-        BUG_ON(!qdev->monitors_config);
         num_monitors = qdev->rom->client_monitors_config.count;
         crc = crc32(0, (const uint8_t *)&qdev->rom->client_monitors_config,
                   sizeof(qdev->rom->client_monitors_config));
@@ -117,8 +72,8 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
                 return 1;
         }
         if (num_monitors > qdev->monitors_config->max_allowed) {
-                DRM_INFO("client monitors list will be truncated: %d < %d\n",
-                         qdev->monitors_config->max_allowed, num_monitors);
+                DRM_DEBUG_KMS("client monitors list will be truncated: %d < %d\n",
+                              qdev->monitors_config->max_allowed, num_monitors);
                 num_monitors = qdev->monitors_config->max_allowed;
         } else {
                 num_monitors = qdev->rom->client_monitors_config.count;
@@ -132,18 +87,15 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
                         &qdev->rom->client_monitors_config.heads[i];
                 struct qxl_head *client_head =
                         &qdev->client_monitors_config->heads[i];
-                struct qxl_head *head = &qdev->monitors_config->heads[i];
-                client_head->x = head->x = c_rect->left;
-                client_head->y = head->y = c_rect->top;
-                client_head->width = head->width =
-                                                c_rect->right - c_rect->left;
-                client_head->height = head->height =
-                                                c_rect->bottom - c_rect->top;
-                client_head->surface_id = head->surface_id = 0;
-                client_head->id = head->id = i;
-                client_head->flags = head->flags = 0;
-                QXL_DEBUG(qdev, "read %dx%d+%d+%d\n", head->width, head->height,
-                          head->x, head->y);
+                client_head->x = c_rect->left;
+                client_head->y = c_rect->top;
+                client_head->width = c_rect->right - c_rect->left;
+                client_head->height = c_rect->bottom - c_rect->top;
+                client_head->surface_id = 0;
+                client_head->id = i;
+                client_head->flags = 0;
+                DRM_DEBUG_KMS("read %dx%d+%d+%d\n", client_head->width, client_head->height,
+                          client_head->x, client_head->y);
         }
         return 0;
 }
@@ -155,10 +107,7 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev)
                 qxl_io_log(qdev, "failed crc check for client_monitors_config,"
                                  " retrying\n");
         }
-        qxl_crtc_set_from_monitors_config(qdev);
-        /* fire off a uevent and let userspace tell us what to do */
-        qxl_io_log(qdev, "calling drm_sysfs_hotplug_event\n");
-        drm_sysfs_hotplug_event(qdev->ddev);
+        drm_helper_hpd_irq_event(qdev->ddev);
 }
 
 static int qxl_add_monitors_config_modes(struct drm_connector *connector)
@@ -170,9 +119,9 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector)
         struct drm_display_mode *mode = NULL;
         struct qxl_head *head;
 
-        if (!qdev->monitors_config)
+        if (!qdev->client_monitors_config)
                 return 0;
-        head = &qdev->monitors_config->heads[h];
+        head = &qdev->client_monitors_config->heads[h];
 
         mode = drm_cvt_mode(dev, head->width, head->height, 60, false, false,
                             false);
@@ -499,7 +448,7 @@ qxl_send_monitors_config(struct qxl_device *qdev)
         for (i = 0 ; i < qdev->monitors_config->count ; ++i) {
                 struct qxl_head *head = &qdev->monitors_config->heads[i];
 
-                if (head->y > 8192 || head->y < head->x ||
+                if (head->y > 8192 || head->x > 8192 ||
                     head->width > 8192 || head->height > 8192) {
                         DRM_ERROR("head %d wrong: %dx%d+%d+%d\n",
                                   i, head->width, head->height,
@@ -510,16 +459,19 @@ qxl_send_monitors_config(struct qxl_device *qdev)
         qxl_io_monitors_config(qdev);
 }
 
-static void qxl_monitors_config_set_single(struct qxl_device *qdev,
-                                           unsigned x, unsigned y,
-                                           unsigned width, unsigned height)
+static void qxl_monitors_config_set(struct qxl_device *qdev,
+                                    int index,
+                                    unsigned x, unsigned y,
+                                    unsigned width, unsigned height,
+                                    unsigned surf_id)
 {
-        DRM_DEBUG("%dx%d+%d+%d\n", width, height, x, y);
-        qdev->monitors_config->count = 1;
-        qdev->monitors_config->heads[0].x = x;
-        qdev->monitors_config->heads[0].y = y;
-        qdev->monitors_config->heads[0].width = width;
-        qdev->monitors_config->heads[0].height = height;
+        DRM_DEBUG_KMS("%d:%dx%d+%d+%d\n", index, width, height, x, y);
+        qdev->monitors_config->heads[index].x = x;
+        qdev->monitors_config->heads[index].y = y;
+        qdev->monitors_config->heads[index].width = width;
+        qdev->monitors_config->heads[index].height = height;
+        qdev->monitors_config->heads[index].surface_id = surf_id;
+
 }
 
 static int qxl_crtc_mode_set(struct drm_crtc *crtc,
@@ -533,10 +485,11 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
         struct qxl_mode *m = (void *)mode->private;
         struct qxl_framebuffer *qfb;
         struct qxl_bo *bo, *old_bo = NULL;
+        struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
         uint32_t width, height, base_offset;
         bool recreate_primary = false;
         int ret;
-
+        int surf_id;
         if (!crtc->fb) {
                 DRM_DEBUG_KMS("No FB bound\n");
                 return 0;
@@ -560,7 +513,8 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
                   adjusted_mode->hdisplay,
                   adjusted_mode->vdisplay);
 
-        recreate_primary = true;
+        if (qcrtc->index == 0)
+                recreate_primary = true;
 
         width = mode->hdisplay;
         height = mode->vdisplay;
@@ -581,8 +535,11 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
                            "recreate primary: %dx%d (was %dx%d,%d,%d)\n",
                            width, height, bo->surf.width,
                            bo->surf.height, bo->surf.stride, bo->surf.format);
-                qxl_io_create_primary(qdev, width, height, base_offset, bo);
+                qxl_io_create_primary(qdev, base_offset, bo);
                 bo->is_primary = true;
+                surf_id = 0;
+        } else {
+                surf_id = bo->surface_id;
         }
 
         if (old_bo && old_bo != bo) {
@@ -592,11 +549,9 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
                 qxl_bo_unreserve(old_bo);
         }
 
-        if (qdev->monitors_config->count == 0) {
-                qxl_monitors_config_set_single(qdev, x, y,
-                                               mode->hdisplay,
-                                               mode->vdisplay);
-        }
+        qxl_monitors_config_set(qdev, qcrtc->index, x, y,
+                                mode->hdisplay,
+                                mode->vdisplay, surf_id);
         return 0;
 }
 
@@ -612,15 +567,36 @@ static void qxl_crtc_commit(struct drm_crtc *crtc)
         DRM_DEBUG("\n");
 }
 
+static void qxl_crtc_disable(struct drm_crtc *crtc)
+{
+        struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
+        struct drm_device *dev = crtc->dev;
+        struct qxl_device *qdev = dev->dev_private;
+        if (crtc->fb) {
+                struct qxl_framebuffer *qfb = to_qxl_framebuffer(crtc->fb);
+                struct qxl_bo *bo = gem_to_qxl_bo(qfb->obj);
+                int ret;
+                ret = qxl_bo_reserve(bo, false);
+                qxl_bo_unpin(bo);
+                qxl_bo_unreserve(bo);
+                crtc->fb = NULL;
+        }
+
+        qxl_monitors_config_set(qdev, qcrtc->index, 0, 0, 0, 0, 0);
+
+        qxl_send_monitors_config(qdev);
+}
+
 static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = {
         .dpms = qxl_crtc_dpms,
+        .disable = qxl_crtc_disable,
         .mode_fixup = qxl_crtc_mode_fixup,
         .mode_set = qxl_crtc_mode_set,
         .prepare = qxl_crtc_prepare,
         .commit = qxl_crtc_commit,
 };
 
-static int qdev_crtc_init(struct drm_device *dev, int num_crtc)
+static int qdev_crtc_init(struct drm_device *dev, int crtc_id)
 {
         struct qxl_crtc *qxl_crtc;
 
@@ -629,7 +605,7 @@ static int qdev_crtc_init(struct drm_device *dev, int num_crtc)
                 return -ENOMEM;
 
         drm_crtc_init(dev, &qxl_crtc->base, &qxl_crtc_funcs);
-
+        qxl_crtc->index = crtc_id;
         drm_mode_crtc_set_gamma_size(&qxl_crtc->base, 256);
         drm_crtc_helper_add(&qxl_crtc->base, &qxl_crtc_helper_funcs);
         return 0;
@@ -657,18 +633,13 @@ static void qxl_write_monitors_config_for_encoder(struct qxl_device *qdev,
                 struct drm_encoder *encoder)
 {
         int i;
+        struct qxl_output *output = drm_encoder_to_qxl_output(encoder);
         struct qxl_head *head;
         struct drm_display_mode *mode;
 
         BUG_ON(!encoder);
         /* TODO: ugly, do better */
-        for (i = 0 ; (encoder->possible_crtcs != (1 << i)) && i < 32; ++i)
-                ;
-        if (encoder->possible_crtcs != (1 << i)) {
-                DRM_ERROR("encoder has wrong possible_crtcs: %x\n",
-                          encoder->possible_crtcs);
-                return;
-        }
+        i = output->index;
         if (!qdev->monitors_config ||
             qdev->monitors_config->max_allowed <= i) {
                 DRM_ERROR(
@@ -686,7 +657,6 @@ static void qxl_write_monitors_config_for_encoder(struct qxl_device *qdev,
                 DRM_DEBUG("missing for multiple monitors: no head holes\n");
         head = &qdev->monitors_config->heads[i];
         head->id = i;
-        head->surface_id = 0;
         if (encoder->crtc->enabled) {
                 mode = &encoder->crtc->mode;
                 head->width = mode->hdisplay;
@@ -701,8 +671,8 @@ static void qxl_write_monitors_config_for_encoder(struct qxl_device *qdev,
                 head->x = 0;
                 head->y = 0;
         }
-        DRM_DEBUG("setting head %d to +%d+%d %dx%d\n",
-                  i, head->x, head->y, head->width, head->height);
+        DRM_DEBUG_KMS("setting head %d to +%d+%d %dx%d out of %d\n",
+                      i, head->x, head->y, head->width, head->height, qdev->monitors_config->count);
         head->flags = 0;
         /* TODO - somewhere else to call this for multiple monitors
          * (config_commit?) */
@@ -797,8 +767,9 @@ static enum drm_connector_status qxl_conn_detect(
 
         /* The first monitor is always connected */
         connected = (output->index == 0) ||
-                    (qdev->monitors_config &&
-                     qdev->monitors_config->count > output->index);
+                    (qdev->client_monitors_config &&
+                     qdev->client_monitors_config->count > output->index &&
+                     qxl_head_enabled(&qdev->client_monitors_config->heads[output->index]));
 
         DRM_DEBUG("\n");
         return connected ? connector_status_connected
@@ -862,6 +833,8 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
         drm_encoder_init(dev, &qxl_output->enc, &qxl_enc_funcs,
                          DRM_MODE_ENCODER_VIRTUAL);
 
+        /* we get HPD via client monitors config */
+        connector->polled = DRM_CONNECTOR_POLL_HPD;
         encoder->possible_crtcs = 1 << num_output;
         drm_mode_connector_attach_encoder(&qxl_output->base,
                                           &qxl_output->enc);
@@ -901,16 +874,14 @@ static const struct drm_mode_config_funcs qxl_mode_funcs = {
         .fb_create = qxl_user_framebuffer_create,
 };
 
-int qxl_modeset_init(struct qxl_device *qdev)
+int qxl_create_monitors_object(struct qxl_device *qdev)
 {
-        int i;
         int ret;
         struct drm_gem_object *gobj;
-        int max_allowed = QXL_NUM_OUTPUTS;
+        int max_allowed = qxl_num_crtc;
         int monitors_config_size = sizeof(struct qxl_monitors_config) +
-                                   max_allowed * sizeof(struct qxl_head);
+                max_allowed * sizeof(struct qxl_head);
 
-        drm_mode_config_init(qdev->ddev);
         ret = qxl_gem_object_create(qdev, monitors_config_size, 0,
                                     QXL_GEM_DOMAIN_VRAM,
                                     false, false, NULL, &gobj);
@@ -919,13 +890,59 @@ int qxl_modeset_init(struct qxl_device *qdev)
                 return -ENOMEM;
         }
         qdev->monitors_config_bo = gem_to_qxl_bo(gobj);
+
+        ret = qxl_bo_reserve(qdev->monitors_config_bo, false);
+        if (ret)
+                return ret;
+
+        ret = qxl_bo_pin(qdev->monitors_config_bo, QXL_GEM_DOMAIN_VRAM, NULL);
+        if (ret) {
+                qxl_bo_unreserve(qdev->monitors_config_bo);
+                return ret;
+        }
+
+        qxl_bo_unreserve(qdev->monitors_config_bo);
+
         qxl_bo_kmap(qdev->monitors_config_bo, NULL);
+
         qdev->monitors_config = qdev->monitors_config_bo->kptr;
         qdev->ram_header->monitors_config =
                 qxl_bo_physical_address(qdev, qdev->monitors_config_bo, 0);
 
         memset(qdev->monitors_config, 0, monitors_config_size);
         qdev->monitors_config->max_allowed = max_allowed;
+        return 0;
+}
+
+int qxl_destroy_monitors_object(struct qxl_device *qdev)
+{
+        int ret;
+
+        qdev->monitors_config = NULL;
+        qdev->ram_header->monitors_config = 0;
+
+        qxl_bo_kunmap(qdev->monitors_config_bo);
+        ret = qxl_bo_reserve(qdev->monitors_config_bo, false);
+        if (ret)
+                return ret;
+
+        qxl_bo_unpin(qdev->monitors_config_bo);
+        qxl_bo_unreserve(qdev->monitors_config_bo);
+
+        qxl_bo_unref(&qdev->monitors_config_bo);
+        return 0;
+}
+
+int qxl_modeset_init(struct qxl_device *qdev)
+{
+        int i;
+        int ret;
+
+        drm_mode_config_init(qdev->ddev);
+
+        ret = qxl_create_monitors_object(qdev);
+        if (ret)
+                return ret;
 
         qdev->ddev->mode_config.funcs = (void *)&qxl_mode_funcs;
 
@@ -936,7 +953,7 @@ int qxl_modeset_init(struct qxl_device *qdev)
         qdev->ddev->mode_config.max_height = 8192;
 
         qdev->ddev->mode_config.fb_base = qdev->vram_base;
-        for (i = 0 ; i < QXL_NUM_OUTPUTS; ++i) {
+        for (i = 0 ; i < qxl_num_crtc; ++i) {
                 qdev_crtc_init(qdev->ddev, i);
                 qdev_output_init(qdev->ddev, i);
         }
@@ -953,6 +970,8 @@ int qxl_modeset_init(struct qxl_device *qdev)
 void qxl_modeset_fini(struct qxl_device *qdev)
 {
         qxl_fbdev_fini(qdev);
+
+        qxl_destroy_monitors_object(qdev);
         if (qdev->mode_info.mode_config_initialized) {
                 drm_mode_config_cleanup(qdev->ddev);
                 qdev->mode_info.mode_config_initialized = false;
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index aa291d8a98a2..df0b577a6608 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -33,8 +33,9 @@
 
 #include "drmP.h"
 #include "drm/drm.h"
-
+#include "drm_crtc_helper.h"
 #include "qxl_drv.h"
+#include "qxl_object.h"
 
 extern int qxl_max_ioctls;
 static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
@@ -47,10 +48,14 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
 MODULE_DEVICE_TABLE(pci, pciidlist);
 
 static int qxl_modeset = -1;
+int qxl_num_crtc = 4;
 
 MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
 module_param_named(modeset, qxl_modeset, int, 0400);
 
+MODULE_PARM_DESC(num_heads, "Number of virtual crtcs to expose (default 4)");
+module_param_named(num_heads, qxl_num_crtc, int, 0400);
+
 static struct drm_driver qxl_driver;
 static struct pci_driver qxl_pci_driver;
 
@@ -73,13 +78,6 @@ qxl_pci_remove(struct pci_dev *pdev)
         drm_put_dev(dev);
 }
 
-static struct pci_driver qxl_pci_driver = {
-         .name = DRIVER_NAME,
-         .id_table = pciidlist,
-         .probe = qxl_pci_probe,
-         .remove = qxl_pci_remove,
-};
-
 static const struct file_operations qxl_fops = {
         .owner = THIS_MODULE,
         .open = drm_open,
@@ -90,6 +88,130 @@ static const struct file_operations qxl_fops = {
         .mmap = qxl_mmap,
 };
 
+static int qxl_drm_freeze(struct drm_device *dev)
+{
+        struct pci_dev *pdev = dev->pdev;
+        struct qxl_device *qdev = dev->dev_private;
+        struct drm_crtc *crtc;
+
+        drm_kms_helper_poll_disable(dev);
+
+        console_lock();
+        qxl_fbdev_set_suspend(qdev, 1);
+        console_unlock();
+
+        /* unpin the front buffers */
+        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+                struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+                if (crtc->enabled)
+                        (*crtc_funcs->disable)(crtc);
+        }
+
+        qxl_destroy_monitors_object(qdev);
+        qxl_surf_evict(qdev);
+        qxl_vram_evict(qdev);
+
+        while (!qxl_check_idle(qdev->command_ring));
+        while (!qxl_check_idle(qdev->release_ring))
+                qxl_queue_garbage_collect(qdev, 1);
+
+        pci_save_state(pdev);
+
+        return 0;
+}
+
+static int qxl_drm_resume(struct drm_device *dev, bool thaw)
+{
+        struct qxl_device *qdev = dev->dev_private;
+
+        qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
+        if (!thaw) {
+                qxl_reinit_memslots(qdev);
+                qxl_ring_init_hdr(qdev->release_ring);
+        }
+
+        qxl_create_monitors_object(qdev);
+        drm_helper_resume_force_mode(dev);
+
+        console_lock();
+        qxl_fbdev_set_suspend(qdev, 0);
+        console_unlock();
+
+        drm_kms_helper_poll_enable(dev);
+        return 0;
+}
+
+static int qxl_pm_suspend(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        int error;
+
+        error = qxl_drm_freeze(drm_dev);
+        if (error)
+                return error;
+
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3hot);
+        return 0;
+}
+
+static int qxl_pm_resume(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        if (pci_enable_device(pdev)) {
+                return -EIO;
+        }
+
+        return qxl_drm_resume(drm_dev, false);
+}
+
+static int qxl_pm_thaw(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+
+        return qxl_drm_resume(drm_dev, true);
+}
+
+static int qxl_pm_freeze(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+
+        return qxl_drm_freeze(drm_dev);
+}
+
+static int qxl_pm_restore(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        struct qxl_device *qdev = drm_dev->dev_private;
+
+        qxl_io_reset(qdev);
+        return qxl_drm_resume(drm_dev, false);
+}
+
+static const struct dev_pm_ops qxl_pm_ops = {
+        .suspend = qxl_pm_suspend,
+        .resume = qxl_pm_resume,
+        .freeze = qxl_pm_freeze,
+        .thaw = qxl_pm_thaw,
+        .poweroff = qxl_pm_freeze,
+        .restore = qxl_pm_restore,
+};
+static struct pci_driver qxl_pci_driver = {
+         .name = DRIVER_NAME,
+         .id_table = pciidlist,
+         .probe = qxl_pci_probe,
+         .remove = qxl_pci_remove,
+         .driver.pm = &qxl_pm_ops,
+};
+
 static struct drm_driver qxl_driver = {
         .driver_features = DRIVER_GEM | DRIVER_MODESET |
                            DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 43d06ab28a21..aacb791464a3 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -55,11 +55,10 @@
 #define DRIVER_MINOR 1
 #define DRIVER_PATCHLEVEL 0
 
-#define QXL_NUM_OUTPUTS 1
-
 #define QXL_DEBUGFS_MAX_COMPONENTS              32
 
 extern int qxl_log_level;
+extern int qxl_num_crtc;
 
 enum {
         QXL_INFO_LEVEL = 1,
@@ -139,6 +138,7 @@ struct qxl_reloc_list {
 
 struct qxl_crtc {
         struct drm_crtc base;
+        int index;
         int cur_x;
         int cur_y;
 };
@@ -156,7 +156,7 @@ struct qxl_framebuffer {
 
 #define to_qxl_crtc(x) container_of(x, struct qxl_crtc, base)
 #define drm_connector_to_qxl_output(x) container_of(x, struct qxl_output, base)
-#define drm_encoder_to_qxl_output(x) container_of(x, struct qxl_output, base)
+#define drm_encoder_to_qxl_output(x) container_of(x, struct qxl_output, enc)
 #define to_qxl_framebuffer(x) container_of(x, struct qxl_framebuffer, base)
 
 struct qxl_mman {
@@ -331,6 +331,10 @@ void qxl_modeset_fini(struct qxl_device *qdev);
 int qxl_bo_init(struct qxl_device *qdev);
 void qxl_bo_fini(struct qxl_device *qdev);
 
+void qxl_reinit_memslots(struct qxl_device *qdev);
+int qxl_surf_evict(struct qxl_device *qdev);
+int qxl_vram_evict(struct qxl_device *qdev);
+
 struct qxl_ring *qxl_ring_create(struct qxl_ring_header *header,
                                  int element_size,
                                  int n_elements,
@@ -338,6 +342,8 @@ struct qxl_ring *qxl_ring_create(struct qxl_ring_header *header,
                                  bool set_prod_notify,
                                  wait_queue_head_t *push_event);
 void qxl_ring_free(struct qxl_ring *ring);
+void qxl_ring_init_hdr(struct qxl_ring *ring);
+int qxl_check_idle(struct qxl_ring *ring);
 
 static inline void *
 qxl_fb_virtual_address(struct qxl_device *qdev, unsigned long physical)
@@ -365,6 +371,7 @@ void qxl_fbdev_fini(struct qxl_device *qdev);
 int qxl_get_handle_for_primary_fb(struct qxl_device *qdev,
                                   struct drm_file *file_priv,
                                   uint32_t *handle);
+void qxl_fbdev_set_suspend(struct qxl_device *qdev, int state);
 
 /* qxl_display.c */
 int
@@ -374,6 +381,8 @@ qxl_framebuffer_init(struct drm_device *dev,
                      struct drm_gem_object *obj);
 void qxl_display_read_client_monitors_config(struct qxl_device *qdev);
 void qxl_send_monitors_config(struct qxl_device *qdev);
+int qxl_create_monitors_object(struct qxl_device *qdev);
+int qxl_destroy_monitors_object(struct qxl_device *qdev);
 
 /* used by qxl_debugfs only */
 void qxl_crtc_set_from_monitors_config(struct qxl_device *qdev);
@@ -435,7 +444,7 @@ void qxl_update_screen(struct qxl_device *qxl);
 /* qxl io operations (qxl_cmd.c) */
 
 void qxl_io_create_primary(struct qxl_device *qdev,
-                           unsigned width, unsigned height, unsigned offset,
+                           unsigned offset,
                            struct qxl_bo *bo);
 void qxl_io_destroy_primary(struct qxl_device *qdev);
 void qxl_io_memslot_add(struct qxl_device *qdev, uint8_t id);
@@ -528,6 +537,7 @@ irqreturn_t qxl_irq_handler(DRM_IRQ_ARGS);
 
 /* qxl_fb.c */
 int qxl_fb_init(struct qxl_device *qdev);
+bool qxl_fbdev_qobj_is_fb(struct qxl_device *qdev, struct qxl_bo *qobj);
 
 int qxl_debugfs_add_files(struct qxl_device *qdev,
                           struct drm_info_list *files,
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 4b955b04ce1e..76f39d88d684 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -538,7 +538,7 @@ int qxl_fbdev_init(struct qxl_device *qdev)
         qfbdev->helper.funcs = &qxl_fb_helper_funcs;
 
         ret = drm_fb_helper_init(qdev->ddev, &qfbdev->helper,
-                                 1 /* num_crtc - QXL supports just 1 */,
+                                 qxl_num_crtc /* num_crtc - QXL supports just 1 */,
                                  QXLFB_CONN_LIMIT);
         if (ret) {
                 kfree(qfbdev);
@@ -560,4 +560,14 @@ void qxl_fbdev_fini(struct qxl_device *qdev)
         qdev->mode_info.qfbdev = NULL;
 }
 
+void qxl_fbdev_set_suspend(struct qxl_device *qdev, int state)
+{
+        fb_set_suspend(qdev->mode_info.qfbdev->helper.fbdev, state);
+}
 
+bool qxl_fbdev_qobj_is_fb(struct qxl_device *qdev, struct qxl_bo *qobj)
+{
+        if (qobj == gem_to_qxl_bo(qdev->mode_info.qfbdev->qfb.obj))
+                return true;
+        return false;
+}
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index a4b71b25fa53..6ba49d9922f2 100644
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -183,6 +183,12 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
                 /* TODO copy slow path code from i915 */
                 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
                 unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)user_cmd.command, user_cmd.command_size);
+
+                {
+                        struct qxl_drawable *draw = fb_cmd;
+
+                        draw->mm_time = qdev->rom->mm_clock;
+                }
                 qxl_bo_kunmap_atomic_page(qdev, cmd_bo, fb_cmd);
                 if (unwritten) {
                         DRM_ERROR("got unwritten %d\n", unwritten);
diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index e27ce2a907cf..9e8da9ee9731 100644
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -26,6 +26,7 @@
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
+#include <drm/drm_crtc_helper.h>
 #include <linux/io-mapping.h>
 
 int qxl_log_level;
@@ -72,21 +73,28 @@ static bool qxl_check_device(struct qxl_device *qdev)
         return true;
 }
 
+static void setup_hw_slot(struct qxl_device *qdev, int slot_index,
+                          struct qxl_memslot *slot)
+{
+        qdev->ram_header->mem_slot.mem_start = slot->start_phys_addr;
+        qdev->ram_header->mem_slot.mem_end = slot->end_phys_addr;
+        qxl_io_memslot_add(qdev, slot_index);
+}
+
 static uint8_t setup_slot(struct qxl_device *qdev, uint8_t slot_index_offset,
         unsigned long start_phys_addr, unsigned long end_phys_addr)
 {
         uint64_t high_bits;
         struct qxl_memslot *slot;
         uint8_t slot_index;
-        struct qxl_ram_header *ram_header = qdev->ram_header;
 
         slot_index = qdev->rom->slots_start + slot_index_offset;
         slot = &qdev->mem_slots[slot_index];
         slot->start_phys_addr = start_phys_addr;
         slot->end_phys_addr = end_phys_addr;
-        ram_header->mem_slot.mem_start = slot->start_phys_addr;
-        ram_header->mem_slot.mem_end = slot->end_phys_addr;
-        qxl_io_memslot_add(qdev, slot_index);
+
+        setup_hw_slot(qdev, slot_index, slot);
+
         slot->generation = qdev->rom->slot_generation;
         high_bits = slot_index << qdev->slot_gen_bits;
         high_bits |= slot->generation;
@@ -95,6 +103,12 @@ static uint8_t setup_slot(struct qxl_device *qdev, uint8_t slot_index_offset,
         return slot_index;
 }
 
+void qxl_reinit_memslots(struct qxl_device *qdev)
+{
+        setup_hw_slot(qdev, qdev->main_mem_slot, &qdev->mem_slots[qdev->main_mem_slot]);
+        setup_hw_slot(qdev, qdev->surfaces_mem_slot, &qdev->mem_slots[qdev->surfaces_mem_slot]);
+}
+
 static void qxl_gc_work(struct work_struct *work)
 {
         struct qxl_device *qdev = container_of(work, struct qxl_device, gc_work);
@@ -294,6 +308,8 @@ int qxl_driver_load(struct drm_device *dev, unsigned long flags)
                 goto out;
         }
 
+        drm_kms_helper_poll_init(qdev->ddev);
+
         return 0;
 out:
         kfree(qdev);
diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index d9b12e7bc6e1..1191fe7788c9 100644
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -363,3 +363,13 @@ int qxl_bo_list_add(struct qxl_reloc_list *reloc_list, struct qxl_bo *bo)
                 return ret;
         return 0;
 }
+
+int qxl_surf_evict(struct qxl_device *qdev)
+{
+        return ttm_bo_evict_mm(&qdev->mman.bdev, TTM_PL_PRIV0);
+}
+
+int qxl_vram_evict(struct qxl_device *qdev)
+{
+        return ttm_bo_evict_mm(&qdev->mman.bdev, TTM_PL_VRAM);
+}