diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0371-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0371-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0371-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch b/common/recipes-kernel/linux/files/0371-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch new file mode 100644 index 00000000..b084557c --- /dev/null +++ b/common/recipes-kernel/linux/files/0371-drm-amd-amdgpu-Make-afmt_init-cleanup-if-alloc-fails.patch @@ -0,0 +1,60 @@ +From 0f73ef78c9d7a9a7f138fbaf61e5073124bc8f6d Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Thu, 3 Mar 2016 09:23:48 -0500 +Subject: [PATCH 0371/1110] drm/amd/amdgpu: Make afmt_init cleanup if alloc + fails (DCEv10) + +Make the function free memory and return an error code if the allocation +fails. + +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_v10_0.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +index 7f091e2..8f2367a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +@@ -1976,7 +1976,7 @@ static void dce_v10_0_afmt_enable(struct drm_encoder *encoder, bool enable) + enable ? "En" : "Dis", dig->afmt->offset, amdgpu_encoder->encoder_id); + } + +-static void dce_v10_0_afmt_init(struct amdgpu_device *adev) ++static int dce_v10_0_afmt_init(struct amdgpu_device *adev) + { + int i; + +@@ -1989,8 +1989,16 @@ static void dce_v10_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_v10_0_afmt_fini(struct amdgpu_device *adev) +@@ -3013,7 +3021,9 @@ static int dce_v10_0_sw_init(void *handle) + return -EINVAL; + + /* setup afmt */ +- dce_v10_0_afmt_init(adev); ++ r = dce_v10_0_afmt_init(adev); ++ if (r) ++ return r; + + r = dce_v10_0_audio_init(adev); + if (r) +-- +2.7.4 + |