diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0335-drm-amdgpu-add-feature-version-for-RLC-and-MEC-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0335-drm-amdgpu-add-feature-version-for-RLC-and-MEC-v2.patch | 127 |
1 files changed, 0 insertions, 127 deletions
diff --git a/common/recipes-kernel/linux/files/0335-drm-amdgpu-add-feature-version-for-RLC-and-MEC-v2.patch b/common/recipes-kernel/linux/files/0335-drm-amdgpu-add-feature-version-for-RLC-and-MEC-v2.patch deleted file mode 100644 index 85d7eafe..00000000 --- a/common/recipes-kernel/linux/files/0335-drm-amdgpu-add-feature-version-for-RLC-and-MEC-v2.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 351643d7dd8a48b1053aac5fe3a1aebac614c301 Mon Sep 17 00:00:00 2001 -From: Jammy Zhou <Jammy.Zhou@amd.com> -Date: Tue, 4 Aug 2015 10:43:50 +0800 -Subject: [PATCH 0335/1050] drm/amdgpu: add feature version for RLC and MEC v2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Expose feature version to user space for RLC/MEC/MEC2 ucode as well - -v2: fix coding style - -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 | 3 +++ - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 ++++++----- - drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 ++++++ - drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 ++++++ - 4 files changed, 21 insertions(+), 5 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 31b00f9..8db642b 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1130,6 +1130,9 @@ struct amdgpu_gfx { - uint32_t me_feature_version; - uint32_t ce_feature_version; - uint32_t pfp_feature_version; -+ uint32_t rlc_feature_version; -+ uint32_t mec_feature_version; -+ uint32_t mec2_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 9736892..79eba82 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -@@ -317,16 +317,17 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file - break; - case AMDGPU_INFO_FW_GFX_RLC: - fw_info.ver = adev->gfx.rlc_fw_version; -- fw_info.feature = 0; -+ fw_info.feature = adev->gfx.rlc_feature_version; - break; - case AMDGPU_INFO_FW_GFX_MEC: -- if (info->query_fw.index == 0) -+ if (info->query_fw.index == 0) { - fw_info.ver = adev->gfx.mec_fw_version; -- else if (info->query_fw.index == 1) -+ fw_info.feature = adev->gfx.mec_feature_version; -+ } else if (info->query_fw.index == 1) { - fw_info.ver = adev->gfx.mec2_fw_version; -- else -+ fw_info.feature = adev->gfx.mec2_feature_version; -+ } else - return -EINVAL; -- fw_info.feature = 0; - break; - case AMDGPU_INFO_FW_SMC: - fw_info.ver = adev->pm.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 5c03420..0d8bf2c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -@@ -3080,6 +3080,8 @@ static int gfx_v7_0_cp_compute_load_microcode(struct amdgpu_device *adev) - mec_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.mec_fw->data; - amdgpu_ucode_print_gfx_hdr(&mec_hdr->header); - adev->gfx.mec_fw_version = le32_to_cpu(mec_hdr->header.ucode_version); -+ adev->gfx.mec_feature_version = le32_to_cpu( -+ mec_hdr->ucode_feature_version); - - gfx_v7_0_cp_compute_enable(adev, false); - -@@ -3102,6 +3104,8 @@ static int gfx_v7_0_cp_compute_load_microcode(struct amdgpu_device *adev) - mec2_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.mec2_fw->data; - amdgpu_ucode_print_gfx_hdr(&mec2_hdr->header); - adev->gfx.mec2_fw_version = le32_to_cpu(mec2_hdr->header.ucode_version); -+ adev->gfx.mec2_feature_version = le32_to_cpu( -+ mec2_hdr->ucode_feature_version); - - /* MEC2 */ - fw_data = (const __le32 *) -@@ -4066,6 +4070,8 @@ static int gfx_v7_0_rlc_resume(struct amdgpu_device *adev) - hdr = (const struct rlc_firmware_header_v1_0 *)adev->gfx.rlc_fw->data; - amdgpu_ucode_print_rlc_hdr(&hdr->header); - adev->gfx.rlc_fw_version = le32_to_cpu(hdr->header.ucode_version); -+ adev->gfx.rlc_feature_version = le32_to_cpu( -+ hdr->ucode_feature_version); - - gfx_v7_0_rlc_stop(adev); - -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -index f7538dd..0ac38ee 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -@@ -2273,6 +2273,8 @@ static int gfx_v8_0_rlc_load_microcode(struct amdgpu_device *adev) - hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data; - amdgpu_ucode_print_rlc_hdr(&hdr->header); - adev->gfx.rlc_fw_version = le32_to_cpu(hdr->header.ucode_version); -+ adev->gfx.rlc_feature_version = le32_to_cpu( -+ hdr->ucode_feature_version); - - fw_data = (const __le32 *)(adev->gfx.rlc_fw->data + - le32_to_cpu(hdr->header.ucode_array_offset_bytes)); -@@ -2620,6 +2622,8 @@ static int gfx_v8_0_cp_compute_load_microcode(struct amdgpu_device *adev) - mec_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.mec_fw->data; - amdgpu_ucode_print_gfx_hdr(&mec_hdr->header); - adev->gfx.mec_fw_version = le32_to_cpu(mec_hdr->header.ucode_version); -+ adev->gfx.mec_feature_version = le32_to_cpu( -+ mec_hdr->ucode_feature_version); - - fw_data = (const __le32 *) - (adev->gfx.mec_fw->data + -@@ -2639,6 +2643,8 @@ static int gfx_v8_0_cp_compute_load_microcode(struct amdgpu_device *adev) - mec2_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.mec2_fw->data; - amdgpu_ucode_print_gfx_hdr(&mec2_hdr->header); - adev->gfx.mec2_fw_version = le32_to_cpu(mec2_hdr->header.ucode_version); -+ adev->gfx.mec2_feature_version = le32_to_cpu( -+ mec2_hdr->ucode_feature_version); - - fw_data = (const __le32 *) - (adev->gfx.mec2_fw->data + --- -1.9.1 - |