aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0708-drm-amd-amdgpu-enable-powerplay-and-smc-firmware-loa.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0708-drm-amd-amdgpu-enable-powerplay-and-smc-firmware-loa.patch')
-rw-r--r--common/recipes-kernel/linux/files/0708-drm-amd-amdgpu-enable-powerplay-and-smc-firmware-loa.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0708-drm-amd-amdgpu-enable-powerplay-and-smc-firmware-loa.patch b/common/recipes-kernel/linux/files/0708-drm-amd-amdgpu-enable-powerplay-and-smc-firmware-loa.patch
new file mode 100644
index 00000000..6a20ca3b
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0708-drm-amd-amdgpu-enable-powerplay-and-smc-firmware-loa.patch
@@ -0,0 +1,60 @@
+From 4e63dd75915e7c91086cf4db755dfac2560965aa Mon Sep 17 00:00:00 2001
+From: Eric Huang <JinHuiEric.Huang@amd.com>
+Date: Tue, 29 Sep 2015 14:58:53 -0400
+Subject: [PATCH 0708/1050] drm/amd/amdgpu: enable powerplay and smc firmware
+ loading for Fiji.
+
+Switch over to handling in the powerplay module.
+
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 +++
+ drivers/gpu/drm/amd/amdgpu/vi.c | 2 +-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+index 8f758ea..a611401a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+@@ -703,6 +703,9 @@ static int amdgpu_cgs_get_firmware_info(void *cgs_device,
+ case CHIP_TONGA:
+ strcpy(fw_name, "amdgpu/tonga_smc.bin");
+ break;
++ case CHIP_FIJI:
++ strcpy(fw_name, "amdgpu/fiji_smc.bin");
++ break;
+ default:
+ DRM_ERROR("SMC firmware not supported\n");
+ return -EINVAL;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+index 5dd2a4c..1a824f0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+@@ -77,6 +77,9 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
+ case CHIP_TONGA:
+ amd_pp->ip_funcs = &tonga_dpm_ip_funcs;
+ break;
++ case CHIP_FIJI:
++ amd_pp->ip_funcs = &fiji_dpm_ip_funcs;
++ break;
+ case CHIP_CARRIZO:
+ amd_pp->ip_funcs = &cz_dpm_ip_funcs;
+ break;
+diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
+index ca3590f..24970ce 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vi.c
++++ b/drivers/gpu/drm/amd/amdgpu/vi.c
+@@ -1214,7 +1214,7 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks[] =
+ .major = 7,
+ .minor = 1,
+ .rev = 0,
+- .funcs = &fiji_dpm_ip_funcs,
++ .funcs = &amdgpu_pp_ip_funcs,
+ },
+ {
+ .type = AMD_IP_BLOCK_TYPE_DCE,
+--
+1.9.1
+