drm/qxl: fix monitors object vmap

Use the correct vmap variant.  We don't hold a reservation here,
so we can't use the _locked variant.  We can drop the pin because
qxl_bo_vmap will do that for us.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20210217123213.2199186-9-kraxel@redhat.com

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index bfcc93089a94c4a79c5bed1596961092af23b18a..f106da9178635246bef65104eded48f7fa261933 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -1159,12 +1159,10 @@ int qxl_create_monitors_object(struct qxl_device *qdev)
        }
        qdev->monitors_config_bo = gem_to_qxl_bo(gobj);
 
-       ret = qxl_bo_pin(qdev->monitors_config_bo);
+       ret = qxl_bo_vmap(qdev->monitors_config_bo, &map);
        if (ret)
                return ret;
 
-       qxl_bo_vmap_locked(qdev->monitors_config_bo, &map);
-
        qdev->monitors_config = qdev->monitors_config_bo->kptr;
        qdev->ram_header->monitors_config =
                qxl_bo_physical_address(qdev, qdev->monitors_config_bo, 0);
@@ -1189,8 +1187,7 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev)
        qdev->monitors_config = NULL;
        qdev->ram_header->monitors_config = 0;
 
-       qxl_bo_vunmap_locked(qdev->monitors_config_bo);
-       ret = qxl_bo_unpin(qdev->monitors_config_bo);
+       ret = qxl_bo_vunmap(qdev->monitors_config_bo);
        if (ret)
                return ret;