Commit cb981987 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20210217123213.2199186-9-kraxel@redhat.com
parent 61cc6d95

drivers/gpu/drm/qxl/qxl_display.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -1159,12 +1159,10 @@ int qxl_create_monitors_object(struct qxl_device *qdev) 
	}

	}

	qdev->monitors_config_bo = gem_to_qxl_bo(gobj);

	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)

	if (ret)

		return ret;

		return ret;





	qxl_bo_vmap_locked(qdev->monitors_config_bo, &map);



	qdev->monitors_config = qdev->monitors_config_bo->kptr;

	qdev->monitors_config = qdev->monitors_config_bo->kptr;

	qdev->ram_header->monitors_config =

	qdev->ram_header->monitors_config =

		qxl_bo_physical_address(qdev, qdev->monitors_config_bo, 0);

		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->monitors_config = NULL;

	qdev->ram_header->monitors_config = 0;

	qdev->ram_header->monitors_config = 0;





	qxl_bo_vunmap_locked(qdev->monitors_config_bo);

	ret = qxl_bo_vunmap(qdev->monitors_config_bo);

	ret = qxl_bo_unpin(qdev->monitors_config_bo);

	if (ret)

	if (ret)

		return ret;

		return ret;