aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-10-22 08:08:07 -0700
committerGitHub <noreply@github.com>2019-10-22 08:08:07 -0700
commit8e0cf9ee43840bd7ee004412129ba4aa055f5fc8 (patch)
treeb13804093e413307097cd6788ccdc8b062084013 /common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch
parent9e1e1da00d8ef569d83a7a742a734dbbf5e0bd13 (diff)
parent3f8062a03dc1d1d5fa386e1f1ca59d56b86a85d1 (diff)
downloadmeta-amd-master.tar.gz
meta-amd-master.tar.bz2
meta-amd-master.zip
Merge pull request #661 from ArsalanHAwan/master-merge-warriorHEADmaster
master: merge warrior
Diffstat (limited to 'common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch')
-rw-r--r--common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch b/common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch
deleted file mode 100644
index 8056f349..00000000
--- a/common/recipes-kernel/linux/files/0022-drm-amdgpu-update-rev-id-register-for-VI.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 05158425917db24bd4310339d1433895135c5ae8 Mon Sep 17 00:00:00 2001
-From: Flora Cui <Flora.Cui@amd.com>
-Date: Fri, 20 Nov 2015 11:40:53 +0800
-Subject: [PATCH 0022/1110] drm/amdgpu: update rev id register for VI
-
-Change-Id: I2ae9bb4a929f7c0c8783e0be563ae04be77596e2
-Signed-off-by: Flora Cui <Flora.Cui@amd.com>
-Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/vi.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
-index 0cb6f31..2f1c118 100644
---- a/drivers/gpu/drm/amd/amdgpu/vi.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
-@@ -1387,15 +1387,12 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
-
- static uint32_t vi_get_rev_id(struct amdgpu_device *adev)
- {
-- if (adev->asic_type == CHIP_TOPAZ)
-- return (RREG32(mmPCIE_EFUSE4) & PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID_MASK)
-- >> PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID__SHIFT;
-- else if (adev->flags & AMD_IS_APU)
-+ if (adev->flags & AMD_IS_APU)
- return (RREG32_SMC(ATI_REV_ID_FUSE_MACRO__ADDRESS) & ATI_REV_ID_FUSE_MACRO__MASK)
- >> ATI_REV_ID_FUSE_MACRO__SHIFT;
- else
-- return (RREG32(mmCC_DRM_ID_STRAPS) & CC_DRM_ID_STRAPS__ATI_REV_ID_MASK)
-- >> CC_DRM_ID_STRAPS__ATI_REV_ID__SHIFT;
-+ return (RREG32(mmPCIE_EFUSE4) & PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID_MASK)
-+ >> PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID__SHIFT;
- }
-
- static const struct amdgpu_asic_funcs vi_asic_funcs =
---
-2.7.4
-