diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0146-amdgpu-vce3-Simplify-vce_v3_0_soft_reset.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0146-amdgpu-vce3-Simplify-vce_v3_0_soft_reset.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0146-amdgpu-vce3-Simplify-vce_v3_0_soft_reset.patch b/common/recipes-kernel/linux/files/0146-amdgpu-vce3-Simplify-vce_v3_0_soft_reset.patch new file mode 100644 index 00000000..2c884546 --- /dev/null +++ b/common/recipes-kernel/linux/files/0146-amdgpu-vce3-Simplify-vce_v3_0_soft_reset.patch @@ -0,0 +1,43 @@ +From d9782da56ad40bdc7754395c90dbac618ad58bba Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Tue, 15 Dec 2015 10:40:16 -0500 +Subject: [PATCH 0146/1110] amdgpu/vce3: Simplify vce_v3_0_soft_reset() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LOC reduction and simplification. + +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 | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +index f20529d..d50db76 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +@@ -558,17 +558,10 @@ static int vce_v3_0_soft_reset(void *handle) + { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + u32 mask = 0; +- int idx; + +- for (idx = 0; idx < 2; ++idx) { +- if (adev->vce.harvest_config & (1 << idx)) +- continue; ++ mask |= (adev->vce.harvest_config & (1<<0)) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK; ++ mask |= (adev->vce.harvest_config & (1<<1)) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK; + +- if (idx == 0) +- mask |= SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK; +- else +- mask |= SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK; +- } + WREG32_P(mmSRBM_SOFT_RESET, mask, + ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK | + SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK)); +-- +2.7.4 + |