Gerd Hoffmann
2021-Feb-16 11:37 UTC
[PATCH 01/10] 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 at gmail.com>
Tested-by: Tong Zhang <ztong0001 at gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
drivers/gpu/drm/qxl/qxl_display.c | 3 +++
drivers/gpu/drm/qxl/qxl_kms.c | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c
b/drivers/gpu/drm/qxl/qxl_display.c
index c326412136c5..ec50d2cfd4e1 100644
--- 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 66d74aaaee06..4dc5ad13f12c 100644
--- 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;
--
2.29.2
Thomas Zimmermann
2021-Feb-16 13:08 UTC
[PATCH 01/10] drm/qxl: properly handle device init failures
Am 16.02.21 um 12:37 schrieb Gerd Hoffmann:> Specifically do not try release resources which where > not allocated in the first place.I still think this should eventually be resolved by using managed code. But for now Acked-by: Thomas Zimmermann <tzimmermann at suse.de>> > Cc: Tong Zhang <ztong0001 at gmail.com> > Tested-by: Tong Zhang <ztong0001 at gmail.com> > Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> > --- > drivers/gpu/drm/qxl/qxl_display.c | 3 +++ > drivers/gpu/drm/qxl/qxl_kms.c | 4 ++++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c > index c326412136c5..ec50d2cfd4e1 100644 > --- 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 66d74aaaee06..4dc5ad13f12c 100644 > --- 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; >-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_signature Type: application/pgp-signature Size: 840 bytes Desc: OpenPGP digital signature URL: <http://lists.linuxfoundation.org/pipermail/virtualization/attachments/20210216/1e236f50/attachment.sig>