aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0241-drm-amdgpu-add-me-ce-pfp_feature_version-interface-q.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0241-drm-amdgpu-add-me-ce-pfp_feature_version-interface-q.patch')
-rw-r--r--common/recipes-kernel/linux/files/0241-drm-amdgpu-add-me-ce-pfp_feature_version-interface-q.patch86
1 files changed, 0 insertions, 86 deletions
diff --git a/common/recipes-kernel/linux/files/0241-drm-amdgpu-add-me-ce-pfp_feature_version-interface-q.patch b/common/recipes-kernel/linux/files/0241-drm-amdgpu-add-me-ce-pfp_feature_version-interface-q.patch
deleted file mode 100644
index e7aea658..00000000
--- a/common/recipes-kernel/linux/files/0241-drm-amdgpu-add-me-ce-pfp_feature_version-interface-q.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 02558a006c0cf92e612c9d6d1c6058ca1a6dbe6a Mon Sep 17 00:00:00 2001
-From: Ken Wang <Qingqing.Wang@amd.com>
-Date: Wed, 3 Jun 2015 19:52:06 +0800
-Subject: [PATCH 0241/1050] drm/amdgpu: add me/ce/pfp_feature_version interface
- query
-
-Provide this information to usermode drivers. We were previously
-missing this info.
-
-Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
-Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++
- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +++---
- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +++
- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +++
- 4 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 6c99b75..4bdc326 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -1125,6 +1125,9 @@ struct amdgpu_gfx {
- uint32_t mec_fw_version;
- const struct firmware *mec2_fw; /* MEC2 firmware */
- uint32_t mec2_fw_version;
-+ uint32_t me_feature_version;
-+ uint32_t ce_feature_version;
-+ uint32_t pfp_feature_version;
- struct amdgpu_ring gfx_ring[AMDGPU_MAX_GFX_RINGS];
- unsigned num_gfx_rings;
- struct amdgpu_ring compute_ring[AMDGPU_MAX_COMPUTE_RINGS];
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-index 9ede244..12b756e 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-@@ -291,15 +291,15 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
- break;
- case AMDGPU_INFO_FW_GFX_ME:
- fw_info.ver = adev->gfx.me_fw_version;
-- fw_info.feature = 0;
-+ fw_info.feature = adev->gfx.me_feature_version;
- break;
- case AMDGPU_INFO_FW_GFX_PFP:
- fw_info.ver = adev->gfx.pfp_fw_version;
-- fw_info.feature = 0;
-+ fw_info.feature = adev->gfx.pfp_feature_version;
- break;
- case AMDGPU_INFO_FW_GFX_CE:
- fw_info.ver = adev->gfx.ce_fw_version;
-- fw_info.feature = 0;
-+ fw_info.feature = adev->gfx.ce_feature_version;
- break;
- case AMDGPU_INFO_FW_GFX_RLC:
- fw_info.ver = adev->gfx.rlc_fw_version;
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-index faa39b38..5fefe40 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-@@ -2705,6 +2705,9 @@ static int gfx_v7_0_cp_gfx_load_microcode(struct amdgpu_device *adev)
- adev->gfx.pfp_fw_version = le32_to_cpu(pfp_hdr->header.ucode_version);
- adev->gfx.ce_fw_version = le32_to_cpu(ce_hdr->header.ucode_version);
- adev->gfx.me_fw_version = le32_to_cpu(me_hdr->header.ucode_version);
-+ adev->gfx.me_feature_version = le32_to_cpu(me_hdr->ucode_feature_version);
-+ adev->gfx.ce_feature_version = le32_to_cpu(ce_hdr->ucode_feature_version);
-+ adev->gfx.pfp_feature_version = le32_to_cpu(pfp_hdr->ucode_feature_version);
-
- gfx_v7_0_cp_gfx_enable(adev, false);
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-index 1895de4..04b9152 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-@@ -2279,6 +2279,9 @@ static int gfx_v8_0_cp_gfx_load_microcode(struct amdgpu_device *adev)
- adev->gfx.pfp_fw_version = le32_to_cpu(pfp_hdr->header.ucode_version);
- adev->gfx.ce_fw_version = le32_to_cpu(ce_hdr->header.ucode_version);
- adev->gfx.me_fw_version = le32_to_cpu(me_hdr->header.ucode_version);
-+ adev->gfx.me_feature_version = le32_to_cpu(me_hdr->ucode_feature_version);
-+ adev->gfx.ce_feature_version = le32_to_cpu(ce_hdr->ucode_feature_version);
-+ adev->gfx.pfp_feature_version = le32_to_cpu(pfp_hdr->ucode_feature_version);
-
- gfx_v8_0_cp_gfx_enable(adev, false);
-
---
-1.9.1
-