diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/0367-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/files/0367-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/0367-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch b/meta-amdfalconx86/recipes-kernel/linux/files/0367-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch new file mode 100644 index 00000000..43757c66 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/files/0367-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch @@ -0,0 +1,61 @@ +From 2abc52d6d911ec52da9b7d50f7ef09ef63854a08 Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Wed, 2 Mar 2016 09:19:57 -0500 +Subject: [PATCH 0367/1110] drm/amd/amdgpu: Make afmt_init() cleanup if alloc + fails (DCEv11) + +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> +--- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +index c510226..f078171 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +@@ -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); + } + +-static void dce_v11_0_afmt_init(struct amdgpu_device *adev) ++static int dce_v11_0_afmt_init(struct amdgpu_device *adev) + { + int i; + +@@ -1979,8 +1979,16 @@ static void dce_v11_0_afmt_init(struct amdgpu_device *adev) + if (adev->mode_info.afmt[i]) { + adev->mode_info.afmt[i]->offset = dig_offsets[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) +@@ -3009,7 +3017,9 @@ static int dce_v11_0_sw_init(void *handle) + return -EINVAL; + + /* 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); + if (r) +-- +2.7.4 + |