Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a907d6 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Add name field to amd_ip_funcs (v2) 



Add name that we can print out in kernel messages
to aid in debugging.

v2: drop DAL changes for upstream

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb9e59d7

drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,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,

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

+1 −0
Original line number Diff line number Diff line
@@ -6402,6 +6402,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,

drivers/gpu/drm/amd/amdgpu/cik.c

+1 −0
Original line number Diff line number Diff line
@@ -2232,6 +2232,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,