aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0148-amdgpu-vce3-Remove-magic-constants-from-harvest-regi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0148-amdgpu-vce3-Remove-magic-constants-from-harvest-regi.patch')
-rw-r--r--common/recipes-kernel/linux/files/0148-amdgpu-vce3-Remove-magic-constants-from-harvest-regi.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/common/recipes-kernel/linux/files/0148-amdgpu-vce3-Remove-magic-constants-from-harvest-regi.patch b/common/recipes-kernel/linux/files/0148-amdgpu-vce3-Remove-magic-constants-from-harvest-regi.patch
deleted file mode 100644
index c6344f28..00000000
--- a/common/recipes-kernel/linux/files/0148-amdgpu-vce3-Remove-magic-constants-from-harvest-regi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8d0a67ee2c61056f67a7118be3fd55f591c31929 Mon Sep 17 00:00:00 2001
-From: Tom St Denis <tom.stdenis@amd.com>
-Date: Mon, 4 Jan 2016 10:46:41 -0500
-Subject: [PATCH 0148/1110] amdgpu/vce3: Remove magic constants from harvest
- register masks.
-
-Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-index d3e7ba6..ad56b1f 100644
---- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-@@ -536,8 +536,8 @@ static bool vce_v3_0_is_idle(void *handle)
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- u32 mask = 0;
-
-- mask |= (adev->vce.harvest_config & (1<<0)) ? 0 : SRBM_STATUS2__VCE0_BUSY_MASK;
-- mask |= (adev->vce.harvest_config & (1<<1)) ? 0 : SRBM_STATUS2__VCE1_BUSY_MASK;
-+ mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE0) ? 0 : SRBM_STATUS2__VCE0_BUSY_MASK;
-+ mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE1) ? 0 : SRBM_STATUS2__VCE1_BUSY_MASK;
-
- return !(RREG32(mmSRBM_STATUS2) & mask);
- }
-@@ -559,8 +559,8 @@ static int vce_v3_0_soft_reset(void *handle)
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- u32 mask = 0;
-
-- 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;
-+ mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE0) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK;
-+ mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE1) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK;
-
- WREG32_P(mmSRBM_SOFT_RESET, mask,
- ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK |
---
-2.7.4
-