aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0858-drm-amdgpu-enable-raven-to-load-firmwares-by-psp-at-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0858-drm-amdgpu-enable-raven-to-load-firmwares-by-psp-at-.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0858-drm-amdgpu-enable-raven-to-load-firmwares-by-psp-at-.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0858-drm-amdgpu-enable-raven-to-load-firmwares-by-psp-at-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0858-drm-amdgpu-enable-raven-to-load-firmwares-by-psp-at-.patch
new file mode 100644
index 00000000..77318e3a
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0858-drm-amdgpu-enable-raven-to-load-firmwares-by-psp-at-.patch
@@ -0,0 +1,56 @@
+From c3b06ebf6814e26aaec59940519e604eb168950b Mon Sep 17 00:00:00 2001
+From: Evan Quan <evan.quan@amd.com>
+Date: Mon, 4 Sep 2017 17:48:27 +0800
+Subject: [PATCH 0858/4131] drm/amdgpu: enable raven to load firmwares by psp
+ at default (v2)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- v2: share code with CHIP_VEGA10 case
+
+Change-Id: I7a0427555b34111e4e7600aa1e8b9cae31b44af7
+Signed-off-by: Evan Quan <evan.quan@amd.com>
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Acked-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Huang Rui <ray.huang@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 --
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +-----
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+index aaada87..2893238 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+@@ -64,9 +64,7 @@ static int psp_sw_init(void *handle)
+ psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;
+ break;
+ case CHIP_RAVEN:
+-#if 0
+ psp->init_microcode = psp_v10_0_init_microcode;
+-#endif
+ psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf;
+ psp->ring_init = psp_v10_0_ring_init;
+ psp->ring_create = psp_v10_0_ring_create;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+index 36c7633..f306374 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+@@ -270,12 +270,8 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
+ else
+ return AMDGPU_FW_LOAD_SMU;
+ case CHIP_VEGA10:
+- if (!load_type)
+- return AMDGPU_FW_LOAD_DIRECT;
+- else
+- return AMDGPU_FW_LOAD_PSP;
+ case CHIP_RAVEN:
+- if (load_type != 2)
++ if (!load_type)
+ return AMDGPU_FW_LOAD_DIRECT;
+ else
+ return AMDGPU_FW_LOAD_PSP;
+--
+2.7.4
+