redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/amd/display: Fix cleanup in amdgpu_dm_initialize_drm_device 

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
hifive-unleashed-5.1
Harry Wentland 2017-04-03 13:36:26 -04:00 committed by Alex Deucher
parent d4e13b0db1
commit f2a0f5e6b2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -1071,15 +1071,15 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
{
struct amdgpu_display_manager *dm = &adev->dm;
uint32_t i;
struct amdgpu_connector *aconnector;
struct amdgpu_encoder *aencoder;
struct amdgpu_connector *aconnector = NULL;
struct amdgpu_encoder *aencoder = NULL;
struct amdgpu_mode_info *mode_info = &adev->mode_info;
uint32_t link_cnt;
link_cnt = dm->dc->caps.max_links;
if (amdgpu_dm_mode_config_init(dm->adev)) {
DRM_ERROR("DM: Failed to initialize mode config\n");
goto fail;
return -1;
}
for (i = 0; i < dm->dc->caps.max_surfaces; i++) {
@ -1116,7 +1116,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);
if (!aconnector)
goto fail;
goto fail_free_planes;
aencoder = kzalloc(sizeof(*aencoder), GFP_KERNEL);
if (!aencoder) {
@ -1130,7 +1130,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
if (amdgpu_dm_connector_init(dm, aconnector, i, aencoder)) {
DRM_ERROR("KMS: Failed to initialize connector\n");
goto fail_free_connector;
goto fail_free_encoder;
}
if (dc_link_detect(dc_get_link_at_index(dm->dc, i), true))
@ -1169,7 +1169,6 @@ fail_free_connector:
fail_free_planes:
for (i = 0; i < dm->dc->caps.max_surfaces; i++)
kfree(mode_info->planes[i]);
fail:
return -1;
}