mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/amd/amdgpu: make afmt_init cleanup if alloc fails (DCEv8)
If the allocation fails free memory and return error code. 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:
parent
74c1e84279
commit
ff923479ee
1 changed files with 12 additions and 2 deletions
|
@ -1913,7 +1913,7 @@ static void dce_v8_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_v8_0_afmt_init(struct amdgpu_device *adev)
|
static int dce_v8_0_afmt_init(struct amdgpu_device *adev)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -1926,8 +1926,16 @@ static void dce_v8_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_v8_0_afmt_fini(struct amdgpu_device *adev)
|
static void dce_v8_0_afmt_fini(struct amdgpu_device *adev)
|
||||||
|
@ -2923,7 +2931,9 @@ static int dce_v8_0_sw_init(void *handle)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* setup afmt */
|
/* setup afmt */
|
||||||
dce_v8_0_afmt_init(adev);
|
r = dce_v8_0_afmt_init(adev);
|
||||||
|
if (r)
|
||||||
|
return r;
|
||||||
|
|
||||||
r = dce_v8_0_audio_init(adev);
|
r = dce_v8_0_audio_init(adev);
|
||||||
if (r)
|
if (r)
|
||||||
|
|
Loading…
Reference in a new issue