qxl: split monitors_config object creation out.

This splits the creation of the monitors config object out so we can
re-use it across suspend/resume later.

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

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index d3b92618246e67372c47562efa0132ea32981b05..61714fdfc78246383a89e9318754760b79a4b120 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -872,16 +872,14 @@ static const struct drm_mode_config_funcs qxl_mode_funcs = {
        .fb_create = qxl_user_framebuffer_create,
 };
 
        .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_crtc;
        int monitors_config_size = sizeof(struct qxl_monitors_config) +
        int ret;
        struct drm_gem_object *gobj;
        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);
        ret = qxl_gem_object_create(qdev, monitors_config_size, 0,
                                    QXL_GEM_DOMAIN_VRAM,
                                    false, false, NULL, &gobj);


@@ -890,13 +888,59 @@ int qxl_modeset_init(struct qxl_device *qdev)
                return -ENOMEM;
        }
        qdev->monitors_config_bo = gem_to_qxl_bo(gobj);
                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);
        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;
        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;
 
 
        qdev->ddev->mode_config.funcs = (void *)&qxl_mode_funcs;
 


@@ -924,6 +968,8 @@ int qxl_modeset_init(struct qxl_device *qdev)
 void qxl_modeset_fini(struct qxl_device *qdev)
 {
        qxl_fbdev_fini(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;
        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.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 42ef0e2b50947bda3a3b32a9b7b553b9b60924c6..6a929258fff90e6facd2460e8a2ab2b716aa27a0 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -374,6 +374,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);
                     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);
 
 /* used by qxl_debugfs only */
 void qxl_crtc_set_from_monitors_config(struct qxl_device *qdev);