diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0144-amdgpu-vce3-Cleanup-harvest-config-function.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0144-amdgpu-vce3-Cleanup-harvest-config-function.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0144-amdgpu-vce3-Cleanup-harvest-config-function.patch b/common/recipes-kernel/linux/files/0144-amdgpu-vce3-Cleanup-harvest-config-function.patch new file mode 100644 index 00000000..b82b3708 --- /dev/null +++ b/common/recipes-kernel/linux/files/0144-amdgpu-vce3-Cleanup-harvest-config-function.patch @@ -0,0 +1,64 @@ +From dacb4ef059137b8966f06ea457ae1bfacb45f098 Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Tue, 15 Dec 2015 10:21:46 -0500 +Subject: [PATCH 0144/1110] amdgpu/vce3: Cleanup harvest config function. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Basic LOC reduction. + +Signed-off-by: Tom St Denis <tom.stdenis@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +index 35f48ad..0de86de 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +@@ -314,14 +314,11 @@ static int vce_v3_0_start(struct amdgpu_device *adev) + static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) + { + u32 tmp; +- unsigned ret; + + /* Fiji, Stoney are single pipe */ + if ((adev->asic_type == CHIP_FIJI) || +- (adev->asic_type == CHIP_STONEY)){ +- ret = AMDGPU_VCE_HARVEST_VCE1; +- return ret; +- } ++ (adev->asic_type == CHIP_STONEY)) ++ return AMDGPU_VCE_HARVEST_VCE1; + + /* Tonga and CZ are dual or single pipe */ + if (adev->flags & AMD_IS_APU) +@@ -335,19 +332,14 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) + + switch (tmp) { + case 1: +- ret = AMDGPU_VCE_HARVEST_VCE0; +- break; ++ return AMDGPU_VCE_HARVEST_VCE0; + case 2: +- ret = AMDGPU_VCE_HARVEST_VCE1; +- break; ++ return AMDGPU_VCE_HARVEST_VCE1; + case 3: +- ret = AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1; +- break; ++ return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1; + default: +- ret = 0; ++ return 0; + } +- +- return ret; + } + + static int vce_v3_0_early_init(void *handle) +-- +2.7.4 + |