aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.19.8/1332-drm-amd-powerplay-add-firmware-loading-interface.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1332-drm-amd-powerplay-add-firmware-loading-interface.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.19.8/1332-drm-amd-powerplay-add-firmware-loading-interface.patch72
1 files changed, 72 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1332-drm-amd-powerplay-add-firmware-loading-interface.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1332-drm-amd-powerplay-add-firmware-loading-interface.patch
new file mode 100644
index 00000000..aea4857e
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1332-drm-amd-powerplay-add-firmware-loading-interface.patch
@@ -0,0 +1,72 @@
+From 753792a4cc504f754d6706951fd4f91d92c861d9 Mon Sep 17 00:00:00 2001
+From: Huang Rui <ray.huang@amd.com>
+Date: Sun, 2 Dec 2018 18:12:10 +0800
+Subject: [PATCH 1332/2940] drm/amd/powerplay: add firmware loading interface
+
+This patch adds firmware loading interface for smu.
+
+Signed-off-by: Huang Rui <ray.huang@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 ++++++
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +++
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+index 247cd63c4435..afdef545fbed 100644
+--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+@@ -96,6 +96,12 @@ static int smu_hw_init(void *handle)
+ if (adev->asic_type < CHIP_VEGA20)
+ return -EINVAL;
+
++ if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
++ ret = smu_load_microcode(smu);
++ if (ret)
++ return ret;
++ }
++
+ mutex_lock(&smu->mutex);
+
+ /* TODO */
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+index f655224537b0..ab1deb52932c 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+@@ -35,10 +35,13 @@ struct smu_context
+ struct smu_funcs
+ {
+ int (*init_microcode)(struct smu_context *smu);
++ int (*load_microcode)(struct smu_context *smu);
+ };
+
+ #define smu_init_microcode(smu) \
+ ((smu)->funcs->init_microcode ? (smu)->funcs->init_microcode((smu)) : 0)
++#define smu_load_microcode(smu) \
++ ((smu)->funcs->load_microcode ? (smu)->funcs->load_microcode((smu)) : 0)
+
+ extern const struct amd_ip_funcs smu_ip_funcs;
+
+diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+index 7fafc6719005..c50c8cb233b0 100644
+--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+@@ -32,8 +32,14 @@ static int smu_v11_0_init_microcode(struct smu_context *smu)
+ return 0;
+ }
+
++static int smu_v11_0_load_microcode(struct smu_context *smu)
++{
++ return 0;
++}
++
+ static const struct smu_funcs smu_v11_0_funcs = {
+ .init_microcode = smu_v11_0_init_microcode,
++ .load_microcode = smu_v11_0_load_microcode,
+ };
+
+ void smu_v11_0_set_smu_funcs(struct smu_context *smu)
+--
+2.17.1
+