Commit c2874a13 authored by Gerd Hoffmann's avatar Gerd Hoffmann

drm/qxl: reorder calls in qxl_device_fini().

Reorder calls in qxl_device_fini().  Cleaning up gem & ttm
might trigger qxl commands, so we should do that before
releaseing command rings.
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20200210113753.5614-2-kraxel@redhat.com
parent 47340e46
...@@ -299,12 +299,12 @@ void qxl_device_fini(struct qxl_device *qdev) ...@@ -299,12 +299,12 @@ void qxl_device_fini(struct qxl_device *qdev)
{ {
qxl_bo_unref(&qdev->current_release_bo[0]); qxl_bo_unref(&qdev->current_release_bo[0]);
qxl_bo_unref(&qdev->current_release_bo[1]); qxl_bo_unref(&qdev->current_release_bo[1]);
qxl_gem_fini(qdev);
qxl_bo_fini(qdev);
flush_work(&qdev->gc_work); flush_work(&qdev->gc_work);
qxl_ring_free(qdev->command_ring); qxl_ring_free(qdev->command_ring);
qxl_ring_free(qdev->cursor_ring); qxl_ring_free(qdev->cursor_ring);
qxl_ring_free(qdev->release_ring); qxl_ring_free(qdev->release_ring);
qxl_gem_fini(qdev);
qxl_bo_fini(qdev);
io_mapping_free(qdev->surface_mapping); io_mapping_free(qdev->surface_mapping);
io_mapping_free(qdev->vram_mapping); io_mapping_free(qdev->vram_mapping);
iounmap(qdev->ram_header); iounmap(qdev->ram_header);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment