aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0377-drm-amdgpu-Add-Fiji-support-to-the-UVD-6.0-IP-module.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0377-drm-amdgpu-Add-Fiji-support-to-the-UVD-6.0-IP-module.patch')
-rw-r--r--common/recipes-kernel/linux/files/0377-drm-amdgpu-Add-Fiji-support-to-the-UVD-6.0-IP-module.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0377-drm-amdgpu-Add-Fiji-support-to-the-UVD-6.0-IP-module.patch b/common/recipes-kernel/linux/files/0377-drm-amdgpu-Add-Fiji-support-to-the-UVD-6.0-IP-module.patch
new file mode 100644
index 00000000..df6d7b6f
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0377-drm-amdgpu-Add-Fiji-support-to-the-UVD-6.0-IP-module.patch
@@ -0,0 +1,69 @@
+From 974ee3db0ff88e5413b734e634119d1e8a10a77f Mon Sep 17 00:00:00 2001
+From: David Zhang <david1.zhang@amd.com>
+Date: Wed, 8 Jul 2015 17:32:15 +0800
+Subject: [PATCH 0377/1050] drm/amdgpu: Add Fiji support to the UVD 6.0 IP
+ module
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: David Zhang <david1.zhang@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 +++++
+ drivers/gpu/drm/amd/amdgpu/vi.c | 7 +++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+index 2abc661..f643535 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+@@ -52,6 +52,7 @@
+ #endif
+ #define FIRMWARE_TONGA "amdgpu/tonga_uvd.bin"
+ #define FIRMWARE_CARRIZO "amdgpu/carrizo_uvd.bin"
++#define FIRMWARE_FIJI "amdgpu/fiji_uvd.bin"
+
+ /**
+ * amdgpu_uvd_cs_ctx - Command submission parser context
+@@ -81,6 +82,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS);
+ #endif
+ MODULE_FIRMWARE(FIRMWARE_TONGA);
+ MODULE_FIRMWARE(FIRMWARE_CARRIZO);
++MODULE_FIRMWARE(FIRMWARE_FIJI);
+
+ static void amdgpu_uvd_note_usage(struct amdgpu_device *adev);
+ static void amdgpu_uvd_idle_work_handler(struct work_struct *work);
+@@ -116,6 +118,9 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
+ case CHIP_TONGA:
+ fw_name = FIRMWARE_TONGA;
+ break;
++ case CHIP_FIJI:
++ fw_name = FIRMWARE_FIJI;
++ break;
+ case CHIP_CARRIZO:
+ fw_name = FIRMWARE_CARRIZO;
+ break;
+diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
+index 8881dd8..7815ac7 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vi.c
++++ b/drivers/gpu/drm/amd/amdgpu/vi.c
+@@ -1216,6 +1216,13 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks[] =
+ .rev = 0,
+ .funcs = &sdma_v3_0_ip_funcs,
+ },
++ {
++ .type = AMD_IP_BLOCK_TYPE_UVD,
++ .major = 6,
++ .minor = 0,
++ .rev = 0,
++ .funcs = &uvd_v6_0_ip_funcs,
++ },
+ };
+
+ static const struct amdgpu_ip_block_version cz_ip_blocks[] =
+--
+1.9.1
+