aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amdfalconx86/recipes-kernel/linux/files/1089-drm-amd-amdgpu-Add-name-field-to-amd_ip_funcs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/1089-drm-amd-amdgpu-Add-name-field-to-amd_ip_funcs.patch')
-rw-r--r--meta-amdfalconx86/recipes-kernel/linux/files/1089-drm-amd-amdgpu-Add-name-field-to-amd_ip_funcs.patch448
1 files changed, 0 insertions, 448 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/1089-drm-amd-amdgpu-Add-name-field-to-amd_ip_funcs.patch b/meta-amdfalconx86/recipes-kernel/linux/files/1089-drm-amd-amdgpu-Add-name-field-to-amd_ip_funcs.patch
deleted file mode 100644
index bb629f36..00000000
--- a/meta-amdfalconx86/recipes-kernel/linux/files/1089-drm-amd-amdgpu-Add-name-field-to-amd_ip_funcs.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-From 96f8a4bc347648bb22819b9d2d0340c8354c5eb4 Mon Sep 17 00:00:00 2001
-From: Tom St Denis <tom.stdenis@amd.com>
-Date: Wed, 4 May 2016 14:28:35 -0400
-Subject: [PATCH 1089/1110] drm/amd/amdgpu: Add name field to amd_ip_funcs
-
-Add name that we can print out in kernel messages
-to aid in debugging.
-
-Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 1 +
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 1 +
- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 1 +
- drivers/gpu/drm/amd/amdgpu/cik.c | 1 +
- drivers/gpu/drm/amd/amdgpu/cik_ih.c | 1 +
- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 1 +
- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 1 +
- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 1 +
- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 1 +
- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 1 +
- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 1 +
- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 1 +
- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 1 +
- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 1 +
- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 1 +
- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 +
- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 1 +
- drivers/gpu/drm/amd/amdgpu/vi.c | 1 +
- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 1 +
- drivers/gpu/drm/amd/include/amd_shared.h | 2 ++
- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 1 +
- 33 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-index 49838df..252edba 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-@@ -480,6 +480,7 @@ static int acp_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs acp_ip_funcs = {
-+ .name = "acp_ip",
- .early_init = acp_early_init,
- .late_init = NULL,
- .sw_init = acp_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-index 58a4faa..f63fe24 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-@@ -1196,7 +1196,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev)
- if (r == -ENOENT) {
- adev->ip_block_status[i].valid = false;
- } else if (r) {
-- DRM_ERROR("early_init %d failed %d\n", i, r);
-+ DRM_ERROR("early_init of IP block <%s> failed %d\n", adev->ip_blocks[i].funcs->name, r);
- return r;
- } else {
- adev->ip_block_status[i].valid = true;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
-index 86cdede..1540359 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
-@@ -302,6 +302,7 @@ static int amdgpu_pp_soft_reset(void *handle)
- }
-
- const struct amd_ip_funcs amdgpu_pp_ip_funcs = {
-+ .name = "amdgpu_powerplay",
- .early_init = amdgpu_pp_early_init,
- .late_init = amdgpu_pp_late_init,
- .sw_init = amdgpu_pp_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
-index 2f24797..ca8e278 100644
---- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
-@@ -6405,6 +6405,7 @@ static int ci_dpm_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs ci_dpm_ip_funcs = {
-+ .name = "ci_dpm",
- .early_init = ci_dpm_early_init,
- .late_init = ci_dpm_late_init,
- .sw_init = ci_dpm_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
-index e86afec..cc5b943 100644
---- a/drivers/gpu/drm/amd/amdgpu/cik.c
-+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
-@@ -2394,6 +2394,7 @@ static int cik_common_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs cik_common_ip_funcs = {
-+ .name = "cik_common",
- .early_init = cik_common_early_init,
- .late_init = NULL,
- .sw_init = cik_common_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
-index 7e750a4..845c21b 100644
---- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
-+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
-@@ -415,6 +415,7 @@ static int cik_ih_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs cik_ih_ip_funcs = {
-+ .name = "cik_ih",
- .early_init = cik_ih_early_init,
- .late_init = NULL,
- .sw_init = cik_ih_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
-index 48505c9..223212f 100644
---- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
-+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
-@@ -1223,6 +1223,7 @@ static int cik_sdma_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs cik_sdma_ip_funcs = {
-+ .name = "cik_sdma",
- .early_init = cik_sdma_early_init,
- .late_init = NULL,
- .sw_init = cik_sdma_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
-index b115810..f3f2922 100644
---- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
-@@ -2231,6 +2231,7 @@ static void cz_dpm_powergate_vce(struct amdgpu_device *adev, bool gate)
- }
-
- const struct amd_ip_funcs cz_dpm_ip_funcs = {
-+ .name = "cz_dpm",
- .early_init = cz_dpm_early_init,
- .late_init = cz_dpm_late_init,
- .sw_init = cz_dpm_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
-index 874b928..863cb16 100644
---- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c
-+++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
-@@ -396,6 +396,7 @@ static int cz_ih_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs cz_ih_ip_funcs = {
-+ .name = "cz_ih",
- .early_init = cz_ih_early_init,
- .late_init = NULL,
- .sw_init = cz_ih_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
-index 8f27dd5..9454381 100644
---- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
-@@ -3490,6 +3490,7 @@ static int dce_v10_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs dce_v10_0_ip_funcs = {
-+ .name = "dce_v10_0",
- .early_init = dce_v10_0_early_init,
- .late_init = NULL,
- .sw_init = dce_v10_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
-index b95abde..c3117c4 100644
---- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
-@@ -3553,6 +3553,7 @@ static int dce_v11_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs dce_v11_0_ip_funcs = {
-+ .name = "dce_v11_0",
- .early_init = dce_v11_0_early_init,
- .late_init = NULL,
- .sw_init = dce_v11_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
-index 2626c7e..6c496ab 100644
---- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
-@@ -3420,6 +3420,7 @@ static int dce_v8_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs dce_v8_0_ip_funcs = {
-+ .name = "dce_v8_0",
- .early_init = dce_v8_0_early_init,
- .late_init = NULL,
- .sw_init = dce_v8_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
-index 6d13345..245cabf 100644
---- a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
-@@ -143,6 +143,7 @@ static int fiji_dpm_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs fiji_dpm_ip_funcs = {
-+ .name = "fiji_dpm",
- .early_init = fiji_dpm_early_init,
- .late_init = NULL,
- .sw_init = fiji_dpm_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-index ea19760..b449a40 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-@@ -4897,6 +4897,7 @@ static int gfx_v7_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs gfx_v7_0_ip_funcs = {
-+ .name = "gfx_v7_0",
- .early_init = gfx_v7_0_early_init,
- .late_init = gfx_v7_0_late_init,
- .sw_init = gfx_v7_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-index 91e98fa..3d1a5ee 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-@@ -6328,6 +6328,7 @@ static int gfx_v8_0_priv_inst_irq(struct amdgpu_device *adev,
- }
-
- const struct amd_ip_funcs gfx_v8_0_ip_funcs = {
-+ .name = "gfx_v8_0",
- .early_init = gfx_v8_0_early_init,
- .late_init = gfx_v8_0_late_init,
- .sw_init = gfx_v8_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-index b7a96db..52e1b06 100644
---- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-@@ -1260,6 +1260,7 @@ static int gmc_v7_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs gmc_v7_0_ip_funcs = {
-+ .name = "gmc_v7_0",
- .early_init = gmc_v7_0_early_init,
- .late_init = gmc_v7_0_late_init,
- .sw_init = gmc_v7_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
-index 4abcf0d..a4b01fb 100644
---- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
-@@ -1423,6 +1423,7 @@ static int gmc_v8_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs gmc_v8_0_ip_funcs = {
-+ .name = "gmc_v8_0",
- .early_init = gmc_v8_0_early_init,
- .late_init = gmc_v8_0_late_init,
- .sw_init = gmc_v8_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
-index 57a9613..460bc8a 100644
---- a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
-@@ -157,6 +157,7 @@ static int iceland_dpm_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs iceland_dpm_ip_funcs = {
-+ .name = "iceland_dpm",
- .early_init = iceland_dpm_early_init,
- .late_init = NULL,
- .sw_init = iceland_dpm_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
-index 5c4001e..39bfc52 100644
---- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
-+++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
-@@ -394,6 +394,7 @@ static int iceland_ih_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs iceland_ih_ip_funcs = {
-+ .name = "iceland_ih",
- .early_init = iceland_ih_early_init,
- .late_init = NULL,
- .sw_init = iceland_ih_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
-index 4bd1e55..25b33d9 100644
---- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
-@@ -3244,6 +3244,7 @@ static int kv_dpm_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs kv_dpm_ip_funcs = {
-+ .name = "kv_dpm",
- .early_init = kv_dpm_early_init,
- .late_init = kv_dpm_late_init,
- .sw_init = kv_dpm_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
-index 474d6f1..a25df59 100644
---- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
-+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
-@@ -1230,6 +1230,7 @@ static int sdma_v2_4_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs sdma_v2_4_ip_funcs = {
-+ .name = "sdma_v2_4",
- .early_init = sdma_v2_4_early_init,
- .late_init = NULL,
- .sw_init = sdma_v2_4_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
-index 77186f5..313d90a 100644
---- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
-@@ -1542,6 +1542,7 @@ static int sdma_v3_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs sdma_v3_0_ip_funcs = {
-+ .name = "sdma_v3_0",
- .early_init = sdma_v3_0_early_init,
- .late_init = NULL,
- .sw_init = sdma_v3_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
-index 552f0f4..b7615ce 100644
---- a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
-@@ -143,6 +143,7 @@ static int tonga_dpm_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs tonga_dpm_ip_funcs = {
-+ .name = "tonga_dpm",
- .early_init = tonga_dpm_early_init,
- .late_init = NULL,
- .sw_init = tonga_dpm_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
-index 55cdab8..f036af9 100644
---- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
-+++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
-@@ -417,6 +417,7 @@ static int tonga_ih_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs tonga_ih_ip_funcs = {
-+ .name = "tonga_ih",
- .early_init = tonga_ih_early_init,
- .late_init = NULL,
- .sw_init = tonga_ih_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-index b9c2a49..a75ffb5 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-@@ -739,6 +739,7 @@ static int uvd_v4_2_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs uvd_v4_2_ip_funcs = {
-+ .name = "uvd_v4_2",
- .early_init = uvd_v4_2_early_init,
- .late_init = NULL,
- .sw_init = uvd_v4_2_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-index 465b77c..ecb8101 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-@@ -791,6 +791,7 @@ static int uvd_v5_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
-+ .name = "uvd_v5_0",
- .early_init = uvd_v5_0_early_init,
- .late_init = NULL,
- .sw_init = uvd_v5_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-index c2f790b..a43f1a7 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-@@ -895,6 +895,7 @@ static int uvd_v6_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
-+ .name = "uvd_v6_0",
- .early_init = uvd_v6_0_early_init,
- .late_init = NULL,
- .sw_init = uvd_v6_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
-index 95f6e57..45d92ac 100644
---- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
-@@ -567,6 +567,7 @@ static int vce_v2_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs vce_v2_0_ip_funcs = {
-+ .name = "vce_v2_0",
- .early_init = vce_v2_0_early_init,
- .late_init = NULL,
- .sw_init = vce_v2_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-index 55b35da..30e8099 100644
---- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-@@ -674,6 +674,7 @@ static int vce_v3_0_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs vce_v3_0_ip_funcs = {
-+ .name = "vce_v3_0",
- .early_init = vce_v3_0_early_init,
- .late_init = NULL,
- .sw_init = vce_v3_0_sw_init,
-diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
-index 16070de..7f15c1a 100644
---- a/drivers/gpu/drm/amd/amdgpu/vi.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
-@@ -1746,6 +1746,7 @@ static int vi_common_set_powergating_state(void *handle,
- }
-
- const struct amd_ip_funcs vi_common_ip_funcs = {
-+ .name = "vi_common",
- .early_init = vi_common_early_init,
- .late_init = NULL,
- .sw_init = vi_common_sw_init,
-diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-index 6e812b6..839ec13 100644
---- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-@@ -676,6 +676,7 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev )
- }
-
- const struct amd_ip_funcs amdgpu_dm_funcs = {
-+ .name = "dm",
- .early_init = dm_early_init,
- .late_init = NULL,
- .sw_init = dm_sw_init,
-diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
-index ea9ee46..6080951 100644
---- a/drivers/gpu/drm/amd/include/amd_shared.h
-+++ b/drivers/gpu/drm/amd/include/amd_shared.h
-@@ -143,6 +143,8 @@ enum amd_pm_state_type {
- };
-
- struct amd_ip_funcs {
-+ /* Name of IP block */
-+ char *name;
- /* sets up early driver state (pre sw_init), does not configure hw - Optional */
- int (*early_init)(void *handle);
- /* sets up late driver/hw state (post hw_init) - Optional */
-diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
-index aba587c..9f2d406 100644
---- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
-+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
-@@ -340,6 +340,7 @@ static int pp_resume(void *handle)
- }
-
- const struct amd_ip_funcs pp_ip_funcs = {
-+ .name = "powerplay",
- .early_init = pp_early_init,
- .late_init = NULL,
- .sw_init = pp_sw_init,
---
-2.7.4
-