summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2019-07-04 03:13:49 +0000
committerjsg <jsg@openbsd.org>2019-07-04 03:13:49 +0000
commit1a7f73dd8ddc068ffc3b6615e7a9545960cbe0c4 (patch)
treec6920f0cb30720404ba5866ba5580db60fa07eb7
parentdrm/amdgpu: Add support of powerplay for picasso (diff)
downloadwireguard-openbsd-1a7f73dd8ddc068ffc3b6615e7a9545960cbe0c4.tar.xz
wireguard-openbsd-1a7f73dd8ddc068ffc3b6615e7a9545960cbe0c4.zip
drm/amdgpu: initilize picasso psp firmwares support
From Likun Gao 227f3dc5f615eb31e007f5db4da7297c66a36e24 in mainline linux
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c1
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/psp_v10_0.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c
index 9f7f3dde57c..3d5f37598a7 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c
@@ -48,6 +48,7 @@ static int psp_early_init(void *handle)
psp_v3_1_set_psp_funcs(psp);
break;
case CHIP_RAVEN:
+ case CHIP_PICASSO:
psp_v10_0_set_psp_funcs(psp);
break;
default:
diff --git a/sys/dev/pci/drm/amd/amdgpu/psp_v10_0.c b/sys/dev/pci/drm/amd/amdgpu/psp_v10_0.c
index 02be34e72ed..73a1ca83329 100644
--- a/sys/dev/pci/drm/amd/amdgpu/psp_v10_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/psp_v10_0.c
@@ -35,6 +35,7 @@
#include "sdma0/sdma0_4_1_offset.h"
MODULE_FIRMWARE("amdgpu/raven_asd.bin");
+MODULE_FIRMWARE("amdgpu/picasso_asd.bin");
static int
psp_v10_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *type)
@@ -113,6 +114,9 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
case CHIP_RAVEN:
chip_name = "raven";
break;
+ case CHIP_PICASSO:
+ chip_name = "picasso";
+ break;
default: BUG();
}