[PATCH] drm/qxl: properly handle device init failures

[Tong Zhang]

Does this patch fix an issue raised previously? Or should they be used together?
https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html <https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html> 

IMHO using this patch alone won’t fix the issue --

Best,
- Tong

> On Feb 8, 2021, at 5:41 AM, Gerd Hoffmann <kraxel at redhat.com> wrote:
> 
> Specifically do not try release resources which where
> not allocated in the first place.
> 
> Cc: 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
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210208/9be99078/attachment.htm>