tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMGIT: drm: writeback: Add missing cleanup in case of initialization failure

Browse Source 
The current implementation of drm_writeback_connector initialization does
not properly clean up all resources in case of failure (allocated
properties and possible_encoders). Add this cleaning in case of failure.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20250116-google-vkms-managed-v9-6-3e4ae1bd05a0@bootlin.com
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
(cherry picked from commit 2f3f4a73631b160e44ab13d497f7be62264d47ac
 https://anongit.freedesktop.org/git/drm/drm-misc.git drm-misc-next)
Change-Id: If65d5fa96560f2dc0f23337f0bd6f16e8de3b7f5
Signed-off-by: Paz Zcharya <pazz@google.com>
This commit is contained in:
Louis Chauvet
2025-01-16 18:47:18 +01:00
committed by Paz Zcharya
parent 0d388fbee6
commit 4de007eeba
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/drm_writeback.c
+25 -4
View File
@@ -202,6 +202,22 @@ int drm_writeback_connector_init(struct drm_device *dev,
}
EXPORT_SYMBOL(drm_writeback_connector_init);
static void delete_writeback_properties(struct drm_device *dev)
{
if (dev->mode_config.writeback_pixel_formats_property) {
drm_property_destroy(dev, dev->mode_config.writeback_pixel_formats_property);
dev->mode_config.writeback_pixel_formats_property = NULL;
}
if (dev->mode_config.writeback_out_fence_ptr_property) {
drm_property_destroy(dev, dev->mode_config.writeback_out_fence_ptr_property);
dev->mode_config.writeback_out_fence_ptr_property = NULL;
}
if (dev->mode_config.writeback_fb_id_property) {
drm_property_destroy(dev, dev->mode_config.writeback_fb_id_property);
dev->mode_config.writeback_fb_id_property = NULL;
}
}
/**
* drm_writeback_connector_init_with_encoder - Initialize a writeback connector with
* a custom encoder
@@ -237,18 +253,20 @@ static int __drm_writeback_connector_init(struct drm_device *dev,
int ret = create_writeback_properties(dev);
if (ret != 0)
return ret;
goto failed_properties;
connector->interlace_allowed = 0;
ret = drm_connector_attach_encoder(connector, enc);
if (ret)
return ret;
goto failed_properties;
blob = drm_property_create_blob(dev, n_formats * sizeof(*formats),
formats);
if (IS_ERR(blob))
return PTR_ERR(blob);
if (IS_ERR(blob)) {
ret = PTR_ERR(blob);
goto failed_properties;
}
INIT_LIST_HEAD(&wb_connector->job_queue);
spin_lock_init(&wb_connector->job_lock);
@@ -271,6 +289,9 @@ static int __drm_writeback_connector_init(struct drm_device *dev,
wb_connector->pixel_formats_blob_ptr = blob;
return 0;
failed_properties:
delete_writeback_properties(dev);
return ret;
}
/**