aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0926-drm-amdgpu-add-VCE-support-to-ELM-BAF.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0926-drm-amdgpu-add-VCE-support-to-ELM-BAF.patch')
-rw-r--r--common/recipes-kernel/linux/files/0926-drm-amdgpu-add-VCE-support-to-ELM-BAF.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/common/recipes-kernel/linux/files/0926-drm-amdgpu-add-VCE-support-to-ELM-BAF.patch b/common/recipes-kernel/linux/files/0926-drm-amdgpu-add-VCE-support-to-ELM-BAF.patch
deleted file mode 100644
index 8734b97d..00000000
--- a/common/recipes-kernel/linux/files/0926-drm-amdgpu-add-VCE-support-to-ELM-BAF.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f0a4448a8d4bd1ce2931b6949b9a4156f3fbf1a8 Mon Sep 17 00:00:00 2001
-From: Sonny Jiang <sonny.jiang@amd.com>
-Date: Fri, 11 Mar 2016 14:33:40 -0500
-Subject: [PATCH 0926/1110] drm/amdgpu: add VCE support to ELM/BAF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ellesmere and Baffin are VCE 3.4
-
-Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Christian K├Ânig <christian.koenig@amd.com>
-Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++++++++++
- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 6 ++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-index 923ee5a..2904842 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-@@ -50,6 +50,8 @@
- #define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin"
- #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin"
- #define FIRMWARE_STONEY "amdgpu/stoney_vce.bin"
-+#define FIRMWARE_ELLESMERE "amdgpu/ellesmere_vce.bin"
-+#define FIRMWARE_BAFFIN "amdgpu/baffin_vce.bin"
-
- #ifdef CONFIG_DRM_AMDGPU_CIK
- MODULE_FIRMWARE(FIRMWARE_BONAIRE);
-@@ -62,6 +64,8 @@ MODULE_FIRMWARE(FIRMWARE_TONGA);
- MODULE_FIRMWARE(FIRMWARE_CARRIZO);
- MODULE_FIRMWARE(FIRMWARE_FIJI);
- MODULE_FIRMWARE(FIRMWARE_STONEY);
-+MODULE_FIRMWARE(FIRMWARE_ELLESMERE);
-+MODULE_FIRMWARE(FIRMWARE_BAFFIN);
-
- static void amdgpu_vce_idle_work_handler(struct work_struct *work);
-
-@@ -113,6 +117,12 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
- case CHIP_STONEY:
- fw_name = FIRMWARE_STONEY;
- break;
-+ case CHIP_ELLESMERE:
-+ fw_name = FIRMWARE_ELLESMERE;
-+ break;
-+ case CHIP_BAFFIN:
-+ fw_name = FIRMWARE_BAFFIN;
-+ break;
-
- default:
- return -EINVAL;
-diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-index bf7bc84..c12fd83 100644
---- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-@@ -315,9 +315,11 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
- {
- u32 tmp;
-
-- /* Fiji, Stoney are single pipe */
-+ /* Fiji, Stoney, Ellesmere, Baffin are single pipe */
- if ((adev->asic_type == CHIP_FIJI) ||
-- (adev->asic_type == CHIP_STONEY))
-+ (adev->asic_type == CHIP_STONEY) ||
-+ (adev->asic_type == CHIP_ELLESMERE) ||
-+ (adev->asic_type == CHIP_BAFFIN))
- return AMDGPU_VCE_HARVEST_VCE1;
-
- /* Tonga and CZ are dual or single pipe */
---
-2.7.4
-