Skip to content

Commit cb98198

Browse files
committed
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 <[email protected]> Acked-by: Thomas Zimmermann <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 61cc6d9 commit cb98198

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/gpu/drm/qxl/qxl_display.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,12 +1159,10 @@ int qxl_create_monitors_object(struct qxl_device *qdev)
11591159
}
11601160
qdev->monitors_config_bo = gem_to_qxl_bo(gobj);
11611161

1162-
ret = qxl_bo_pin(qdev->monitors_config_bo);
1162+
ret = qxl_bo_vmap(qdev->monitors_config_bo, &map);
11631163
if (ret)
11641164
return ret;
11651165

1166-
qxl_bo_vmap_locked(qdev->monitors_config_bo, &map);
1167-
11681166
qdev->monitors_config = qdev->monitors_config_bo->kptr;
11691167
qdev->ram_header->monitors_config =
11701168
qxl_bo_physical_address(qdev, qdev->monitors_config_bo, 0);
@@ -1189,8 +1187,7 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev)
11891187
qdev->monitors_config = NULL;
11901188
qdev->ram_header->monitors_config = 0;
11911189

1192-
qxl_bo_vunmap_locked(qdev->monitors_config_bo);
1193-
ret = qxl_bo_unpin(qdev->monitors_config_bo);
1190+
ret = qxl_bo_vunmap(qdev->monitors_config_bo);
11941191
if (ret)
11951192
return ret;
11961193

0 commit comments

Comments
 (0)