diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0336-drm-amdgpu-add-feature-version-for-SDMA-ucode.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0336-drm-amdgpu-add-feature-version-for-SDMA-ucode.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/common/recipes-kernel/linux/files/0336-drm-amdgpu-add-feature-version-for-SDMA-ucode.patch b/common/recipes-kernel/linux/files/0336-drm-amdgpu-add-feature-version-for-SDMA-ucode.patch deleted file mode 100644 index 0f8c4938..00000000 --- a/common/recipes-kernel/linux/files/0336-drm-amdgpu-add-feature-version-for-SDMA-ucode.patch +++ /dev/null @@ -1,82 +0,0 @@ -From cfa2104fbcb87ab0abbdaba608087df1e24fe195 Mon Sep 17 00:00:00 2001 -From: Jammy Zhou <Jammy.Zhou@amd.com> -Date: Tue, 4 Aug 2015 10:50:47 +0800 -Subject: [PATCH 0336/1050] drm/amdgpu: add feature version for SDMA ucode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> -Reviewed-by: Christian König <christian.koenig@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- - drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 1 + - drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 1 + - drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 1 + - 5 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 8db642b..f7b49d5c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1642,6 +1642,7 @@ struct amdgpu_sdma { - /* SDMA firmware */ - const struct firmware *fw; - uint32_t fw_version; -+ uint32_t feature_version; - - struct amdgpu_ring ring; - }; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -index 79eba82..3bfe67d 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -@@ -337,7 +337,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file - if (info->query_fw.index >= 2) - return -EINVAL; - fw_info.ver = adev->sdma[info->query_fw.index].fw_version; -- fw_info.feature = 0; -+ fw_info.feature = adev->sdma[info->query_fw.index].feature_version; - break; - default: - return -EINVAL; -diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c -index ab83cc1..15df46c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c -+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c -@@ -500,6 +500,7 @@ static int cik_sdma_load_microcode(struct amdgpu_device *adev) - amdgpu_ucode_print_sdma_hdr(&hdr->header); - fw_size = le32_to_cpu(hdr->header.ucode_size_bytes) / 4; - adev->sdma[i].fw_version = le32_to_cpu(hdr->header.ucode_version); -+ adev->sdma[i].feature_version = le32_to_cpu(hdr->ucode_feature_version); - fw_data = (const __le32 *) - (adev->sdma[i].fw->data + le32_to_cpu(hdr->header.ucode_array_offset_bytes)); - WREG32(mmSDMA0_UCODE_ADDR + sdma_offsets[i], 0); -diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c -index d789588..01bd5c9 100644 ---- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c -@@ -542,6 +542,7 @@ static int sdma_v2_4_load_microcode(struct amdgpu_device *adev) - amdgpu_ucode_print_sdma_hdr(&hdr->header); - fw_size = le32_to_cpu(hdr->header.ucode_size_bytes) / 4; - adev->sdma[i].fw_version = le32_to_cpu(hdr->header.ucode_version); -+ adev->sdma[i].feature_version = le32_to_cpu(hdr->ucode_feature_version); - - fw_data = (const __le32 *) - (adev->sdma[i].fw->data + -diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c -index 7bb37b9..cf9bc2e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c -@@ -631,6 +631,7 @@ static int sdma_v3_0_load_microcode(struct amdgpu_device *adev) - amdgpu_ucode_print_sdma_hdr(&hdr->header); - fw_size = le32_to_cpu(hdr->header.ucode_size_bytes) / 4; - adev->sdma[i].fw_version = le32_to_cpu(hdr->header.ucode_version); -+ adev->sdma[i].feature_version = le32_to_cpu(hdr->ucode_feature_version); - - fw_data = (const __le32 *) - (adev->sdma[i].fw->data + --- -1.9.1 - |