drm/qxl: properly handle device init failures

Specifically do not try release resources which where
not allocated in the first place.

Cc: Tong Zhang <ztong0001@gmail.com>
Tested-by: Tong Zhang <ztong0001@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20210217123213.2199186-2-kraxel@redhat.com

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index c326412136c56290b8a1f652baefbbe37a97fa90..ec50d2cfd4e1c893ceb4707b390d4e741d8085c6 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -1183,6 +1183,9 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev)
 {
        int ret;
 
+       if (!qdev->monitors_config_bo)
+               return 0;
+
        qdev->monitors_config = NULL;
        qdev->ram_header->monitors_config = 0;
 

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index 66d74aaaee06717b669e5c89b5d6e0959e3fefab..4dc5ad13f12c8638778da4fb913fe8baec4194be 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -288,6 +288,10 @@ void qxl_device_fini(struct qxl_device *qdev)
 {
        int cur_idx;
 
+       /* check if qxl_device_init() was successful (gc_work is initialized last) */
+       if (!qdev->gc_work.func)
+               return;
+
        for (cur_idx = 0; cur_idx < 3; cur_idx++) {
                if (!qdev->current_release_bo[cur_idx])
                        continue;