leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/amdgpu: Make afmt_init() cleanup if alloc fails (DCEv11)

Browse Source 
Updated DCEv11 afmt_init to cleanup if any kzalloc
fails and then return an error code.  Don't continue initializing
the audio stack in that case.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis
2016-03-02 09:19:57 -05:00
committed by Alex Deucher
parent c437b9d6c0
commit 041ab0a494
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
View File

@@ -1966,7 +1966,7 @@ static void dce_v11_0_afmt_enable(struct drm_encoder *encoder, bool enable)
enable ? "En" : "Dis", dig->afmt->offset, amdgpu_encoder->encoder_id); enable ? "En" : "Dis", dig->afmt->offset, amdgpu_encoder->encoder_id);
} }
static void dce_v11_0_afmt_init(struct amdgpu_device *adev) static int dce_v11_0_afmt_init(struct amdgpu_device *adev)
{ {
int i; int i;
@@ -1979,8 +1979,16 @@ static void dce_v11_0_afmt_init(struct amdgpu_device *adev)
if (adev->mode_info.afmt[i]) { if (adev->mode_info.afmt[i]) {
adev->mode_info.afmt[i]->offset = dig_offsets[i]; adev->mode_info.afmt[i]->offset = dig_offsets[i];
adev->mode_info.afmt[i]->id = i; adev->mode_info.afmt[i]->id = i;
} else {
int j;
for (j = 0; j < i; j++) {
kfree(adev->mode_info.afmt[j]);
adev->mode_info.afmt[j] = NULL;
}
return -ENOMEM;
} }
} }
return 0;
} }
static void dce_v11_0_afmt_fini(struct amdgpu_device *adev) static void dce_v11_0_afmt_fini(struct amdgpu_device *adev)
@@ -3009,7 +3017,9 @@ static int dce_v11_0_sw_init(void *handle)
return -EINVAL; return -EINVAL;
/* setup afmt */ /* setup afmt */
dce_v11_0_afmt_init(adev); r = dce_v11_0_afmt_init(adev);
if (r)
return r;
r = dce_v11_0_audio_init(adev); r = dce_v11_0_audio_init(adev);
if (r) if (r)