mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/
synced 2026-04-18 06:33:43 -04:00
drm/amd/display: Drop unnecessary amdgpu prefix
[Why] The `drm_*()` print macros will handle including the driver in the print already. The extra print of the word `amdgpu` is unnecessary. [How] Modify all prints to drop `amdgpu: `. Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Wayne Lin <wayne.lin@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
db122ece32
commit
8ade473607
@@ -1847,7 +1847,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
mutex_init(&adev->dm.audio_lock);
|
||||
|
||||
if (amdgpu_dm_irq_init(adev)) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize DM IRQ support.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to initialize DM IRQ support.\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -2037,7 +2037,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
|
||||
adev->dm.hpd_rx_offload_wq = hpd_rx_irq_create_workqueue(adev);
|
||||
if (!adev->dm.hpd_rx_offload_wq) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to create hpd rx offload workqueue.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to create hpd rx offload workqueue.\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -2053,7 +2053,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
adev->dm.freesync_module = mod_freesync_create(adev->dm.dc);
|
||||
if (!adev->dm.freesync_module) {
|
||||
drm_err(adev_to_drm(adev),
|
||||
"amdgpu: failed to initialize freesync_module.\n");
|
||||
"failed to initialize freesync_module.\n");
|
||||
} else
|
||||
drm_dbg_driver(adev_to_drm(adev), "amdgpu: freesync_module init done %p.\n",
|
||||
adev->dm.freesync_module);
|
||||
@@ -2064,7 +2064,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
adev->dm.vblank_control_workqueue =
|
||||
create_singlethread_workqueue("dm_vblank_control_workqueue");
|
||||
if (!adev->dm.vblank_control_workqueue)
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize vblank_workqueue.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to initialize vblank_workqueue.\n");
|
||||
}
|
||||
|
||||
if (adev->dm.dc->caps.ips_support &&
|
||||
@@ -2075,7 +2075,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
adev->dm.hdcp_workqueue = hdcp_create_workqueue(adev, &init_params.cp_psp, adev->dm.dc);
|
||||
|
||||
if (!adev->dm.hdcp_workqueue)
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize hdcp_workqueue.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to initialize hdcp_workqueue.\n");
|
||||
else
|
||||
drm_dbg_driver(adev_to_drm(adev), "amdgpu: hdcp_workqueue init done %p.\n", adev->dm.hdcp_workqueue);
|
||||
|
||||
@@ -2085,20 +2085,20 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
init_completion(&adev->dm.dmub_aux_transfer_done);
|
||||
adev->dm.dmub_notify = kzalloc(sizeof(struct dmub_notification), GFP_KERNEL);
|
||||
if (!adev->dm.dmub_notify) {
|
||||
drm_info(adev_to_drm(adev), "amdgpu: fail to allocate adev->dm.dmub_notify");
|
||||
drm_info(adev_to_drm(adev), "fail to allocate adev->dm.dmub_notify");
|
||||
goto error;
|
||||
}
|
||||
|
||||
adev->dm.delayed_hpd_wq = create_singlethread_workqueue("amdgpu_dm_hpd_wq");
|
||||
if (!adev->dm.delayed_hpd_wq) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to create hpd offload workqueue.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to create hpd offload workqueue.\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
amdgpu_dm_outbox_init(adev);
|
||||
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_AUX_REPLY,
|
||||
dmub_aux_setconfig_callback, false)) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub aux callback");
|
||||
drm_err(adev_to_drm(adev), "fail to register dmub aux callback");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -2107,7 +2107,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
|
||||
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_FUSED_IO,
|
||||
dmub_aux_fused_io_callback, false)) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub fused io callback");
|
||||
drm_err(adev_to_drm(adev), "fail to register dmub fused io callback");
|
||||
goto error;
|
||||
}
|
||||
/* Enable outbox notification only after IRQ handlers are registered and DMUB is alive.
|
||||
@@ -2125,7 +2125,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
|
||||
if (amdgpu_dm_initialize_drm_device(adev)) {
|
||||
drm_err(adev_to_drm(adev),
|
||||
"amdgpu: failed to initialize sw for display support.\n");
|
||||
"failed to initialize sw for display support.\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -2140,14 +2140,14 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
|
||||
if (drm_vblank_init(adev_to_drm(adev), adev->dm.display_indexes_num)) {
|
||||
drm_err(adev_to_drm(adev),
|
||||
"amdgpu: failed to initialize sw for display support.\n");
|
||||
"failed to initialize sw for display support.\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
|
||||
amdgpu_dm_crtc_secure_display_create_contexts(adev);
|
||||
if (!adev->dm.secure_display_ctx.crtc_ctx)
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize secure display contexts.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to initialize secure display contexts.\n");
|
||||
|
||||
if (amdgpu_ip_version(adev, DCE_HWIP, 0) >= IP_VERSION(4, 0, 1))
|
||||
adev->dm.secure_display_ctx.support_mul_roi = true;
|
||||
@@ -2571,7 +2571,7 @@ static int dm_sw_init(struct amdgpu_ip_block *ip_block)
|
||||
adev->dm.cgs_device = amdgpu_cgs_create_device(adev);
|
||||
|
||||
if (!adev->dm.cgs_device) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: failed to create cgs device.\n");
|
||||
drm_err(adev_to_drm(adev), "failed to create cgs device.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -4002,19 +4002,19 @@ static int register_hpd_handlers(struct amdgpu_device *adev)
|
||||
if (dc_is_dmub_outbox_supported(adev->dm.dc)) {
|
||||
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD,
|
||||
dmub_hpd_callback, true)) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd callback");
|
||||
drm_err(adev_to_drm(adev), "fail to register dmub hpd callback");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD_IRQ,
|
||||
dmub_hpd_callback, true)) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd callback");
|
||||
drm_err(adev_to_drm(adev), "fail to register dmub hpd callback");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD_SENSE_NOTIFY,
|
||||
dmub_hpd_sense_callback, true)) {
|
||||
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd sense callback");
|
||||
drm_err(adev_to_drm(adev), "fail to register dmub hpd sense callback");
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user