diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-02-10 14:37:51 +0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-02-11 13:45:51 +0300 |
| commit | c2874a1331591f5d55cf070da01fbeac89ac264f (patch) | |
| tree | 47b2953f6c462bd8336c0c238603d99f85297ead | |
| parent | 47340e46f34a3b1d80e40b43ae3d7a8da34a3541 (diff) | |
| download | linux-c2874a1331591f5d55cf070da01fbeac89ac264f.tar.xz | |
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: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20200210113753.5614-2-kraxel@redhat.com
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_kms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index bfc1631093e9..70b20ee4741a 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -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[1]); + qxl_gem_fini(qdev); + qxl_bo_fini(qdev); flush_work(&qdev->gc_work); qxl_ring_free(qdev->command_ring); qxl_ring_free(qdev->cursor_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->vram_mapping); iounmap(qdev->ram_header); |