kernel 5.13.12

1 files changed, 0 insertions, 66 deletions

diff --git a/SOURCES/amd-gpu-handle-vnc-instances.patch b/SOURCES/amd-gpu-handle-vnc-instances.patch
deleted file mode 100644
index 3d9bf08..0000000
--- a/SOURCES/amd-gpu-handle-vnc-instances.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7cbe08a930a132d84b4cf79953b00b074ec7a2a7 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Mon, 9 Aug 2021 11:22:20 -0400
-Subject: [PATCH] drm/amdgpu: handle VCN instances when harvesting (v2)
-
-There may be multiple instances and only one is harvested.
-
-v2: fix typo in commit message
-
-Fixes: 83a0b8639185 ("drm/amdgpu: add judgement when add ip blocks (v2)")
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1673
-Reviewed-by: Guchun Chen <guchun.chen@amd.com>
-Reviewed-by: James Zhu <James.Zhu@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
-index 43e7b61d1c5c..ada7bc19118a 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
-@@ -299,6 +299,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
- 				  ip->major, ip->minor,
- 				  ip->revision);
- 
-+			if (le16_to_cpu(ip->hw_id) == VCN_HWID)
-+				adev->vcn.num_vcn_inst++;
-+
- 			for (k = 0; k < num_base_address; k++) {
- 				/*
- 				 * convert the endianness of base addresses in place,
-@@ -385,7 +388,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
- {
- 	struct binary_header *bhdr;
- 	struct harvest_table *harvest_info;
--	int i;
-+	int i, vcn_harvest_count = 0;
- 
- 	bhdr = (struct binary_header *)adev->mman.discovery_bin;
- 	harvest_info = (struct harvest_table *)(adev->mman.discovery_bin +
-@@ -397,8 +400,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
- 
- 		switch (le32_to_cpu(harvest_info->list[i].hw_id)) {
- 		case VCN_HWID:
--			adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;
--			adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;
-+			vcn_harvest_count++;
- 			break;
- 		case DMU_HWID:
- 			adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK;
-@@ -407,6 +409,10 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
- 			break;
- 		}
- 	}
-+	if (vcn_harvest_count == adev->vcn.num_vcn_inst) {
-+		adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;
-+		adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;
-+	}
- }
- 
- int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)
--- 
-GitLab
-