Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Mario Limonciello
and committed by
Alex Deucher
8ade4736
db122ece
+19
-19
+16
-16
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+16
-16
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
···
1847
1847
mutex_init(&adev->dm.audio_lock);
1848
1848
1849
1849
if (amdgpu_dm_irq_init(adev)) {
1850
-
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize DM IRQ support.\n");
1850
+
drm_err(adev_to_drm(adev), "failed to initialize DM IRQ support.\n");
1851
1851
goto error;
1852
1852
}
1853
1853
···
2037
2037
2038
2038
adev->dm.hpd_rx_offload_wq = hpd_rx_irq_create_workqueue(adev);
2039
2039
if (!adev->dm.hpd_rx_offload_wq) {
2040
-
drm_err(adev_to_drm(adev), "amdgpu: failed to create hpd rx offload workqueue.\n");
2040
+
drm_err(adev_to_drm(adev), "failed to create hpd rx offload workqueue.\n");
2041
2041
goto error;
2042
2042
}
2043
2043
···
2053
2053
adev->dm.freesync_module = mod_freesync_create(adev->dm.dc);
2054
2054
if (!adev->dm.freesync_module) {
2055
2055
drm_err(adev_to_drm(adev),
2056
-
"amdgpu: failed to initialize freesync_module.\n");
2056
+
"failed to initialize freesync_module.\n");
2057
2057
} else
2058
2058
drm_dbg_driver(adev_to_drm(adev), "amdgpu: freesync_module init done %p.\n",
2059
2059
adev->dm.freesync_module);
···
2064
2064
adev->dm.vblank_control_workqueue =
2065
2065
create_singlethread_workqueue("dm_vblank_control_workqueue");
2066
2066
if (!adev->dm.vblank_control_workqueue)
2067
-
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize vblank_workqueue.\n");
2067
+
drm_err(adev_to_drm(adev), "failed to initialize vblank_workqueue.\n");
2068
2068
}
2069
2069
2070
2070
if (adev->dm.dc->caps.ips_support &&
···
2075
2075
adev->dm.hdcp_workqueue = hdcp_create_workqueue(adev, &init_params.cp_psp, adev->dm.dc);
2076
2076
2077
2077
if (!adev->dm.hdcp_workqueue)
2078
-
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize hdcp_workqueue.\n");
2078
+
drm_err(adev_to_drm(adev), "failed to initialize hdcp_workqueue.\n");
2079
2079
else
2080
2080
drm_dbg_driver(adev_to_drm(adev), "amdgpu: hdcp_workqueue init done %p.\n", adev->dm.hdcp_workqueue);
2081
2081
···
2085
2085
init_completion(&adev->dm.dmub_aux_transfer_done);
2086
2086
adev->dm.dmub_notify = kzalloc(sizeof(struct dmub_notification), GFP_KERNEL);
2087
2087
if (!adev->dm.dmub_notify) {
2088
-
drm_info(adev_to_drm(adev), "amdgpu: fail to allocate adev->dm.dmub_notify");
2088
+
drm_info(adev_to_drm(adev), "fail to allocate adev->dm.dmub_notify");
2089
2089
goto error;
2090
2090
}
2091
2091
2092
2092
adev->dm.delayed_hpd_wq = create_singlethread_workqueue("amdgpu_dm_hpd_wq");
2093
2093
if (!adev->dm.delayed_hpd_wq) {
2094
-
drm_err(adev_to_drm(adev), "amdgpu: failed to create hpd offload workqueue.\n");
2094
+
drm_err(adev_to_drm(adev), "failed to create hpd offload workqueue.\n");
2095
2095
goto error;
2096
2096
}
2097
2097
2098
2098
amdgpu_dm_outbox_init(adev);
2099
2099
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_AUX_REPLY,
2100
2100
dmub_aux_setconfig_callback, false)) {
2101
-
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub aux callback");
2101
+
drm_err(adev_to_drm(adev), "fail to register dmub aux callback");
2102
2102
goto error;
2103
2103
}
2104
2104
···
2107
2107
2108
2108
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_FUSED_IO,
2109
2109
dmub_aux_fused_io_callback, false)) {
2110
-
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub fused io callback");
2110
+
drm_err(adev_to_drm(adev), "fail to register dmub fused io callback");
2111
2111
goto error;
2112
2112
}
2113
2113
/* Enable outbox notification only after IRQ handlers are registered and DMUB is alive.
···
2125
2125
2126
2126
if (amdgpu_dm_initialize_drm_device(adev)) {
2127
2127
drm_err(adev_to_drm(adev),
2128
-
"amdgpu: failed to initialize sw for display support.\n");
2128
+
"failed to initialize sw for display support.\n");
2129
2129
goto error;
2130
2130
}
2131
2131
···
2140
2140
2141
2141
if (drm_vblank_init(adev_to_drm(adev), adev->dm.display_indexes_num)) {
2142
2142
drm_err(adev_to_drm(adev),
2143
-
"amdgpu: failed to initialize sw for display support.\n");
2143
+
"failed to initialize sw for display support.\n");
2144
2144
goto error;
2145
2145
}
2146
2146
2147
2147
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
2148
2148
amdgpu_dm_crtc_secure_display_create_contexts(adev);
2149
2149
if (!adev->dm.secure_display_ctx.crtc_ctx)
2150
-
drm_err(adev_to_drm(adev), "amdgpu: failed to initialize secure display contexts.\n");
2150
+
drm_err(adev_to_drm(adev), "failed to initialize secure display contexts.\n");
2151
2151
2152
2152
if (amdgpu_ip_version(adev, DCE_HWIP, 0) >= IP_VERSION(4, 0, 1))
2153
2153
adev->dm.secure_display_ctx.support_mul_roi = true;
···
2571
2571
adev->dm.cgs_device = amdgpu_cgs_create_device(adev);
2572
2572
2573
2573
if (!adev->dm.cgs_device) {
2574
-
drm_err(adev_to_drm(adev), "amdgpu: failed to create cgs device.\n");
2574
+
drm_err(adev_to_drm(adev), "failed to create cgs device.\n");
2575
2575
return -EINVAL;
2576
2576
}
2577
2577
···
4002
4002
if (dc_is_dmub_outbox_supported(adev->dm.dc)) {
4003
4003
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD,
4004
4004
dmub_hpd_callback, true)) {
4005
-
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd callback");
4005
+
drm_err(adev_to_drm(adev), "fail to register dmub hpd callback");
4006
4006
return -EINVAL;
4007
4007
}
4008
4008
4009
4009
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD_IRQ,
4010
4010
dmub_hpd_callback, true)) {
4011
-
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd callback");
4011
+
drm_err(adev_to_drm(adev), "fail to register dmub hpd callback");
4012
4012
return -EINVAL;
4013
4013
}
4014
4014
4015
4015
if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD_SENSE_NOTIFY,
4016
4016
dmub_hpd_sense_callback, true)) {
4017
-
drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd sense callback");
4017
+
drm_err(adev_to_drm(adev), "fail to register dmub hpd sense callback");
4018
4018
return -EINVAL;
4019
4019
}
4020
4020
}
+3
-3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+3
-3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
···
107
107
if (payload.write && result >= 0) {
108
108
if (result) {
109
109
/*one byte indicating partially written bytes*/
110
-
drm_dbg_dp(adev_to_drm(adev), "amdgpu: AUX partially written\n");
110
+
drm_dbg_dp(adev_to_drm(adev), "AUX partially written\n");
111
111
result = payload.data[0];
112
112
} else if (!payload.reply[0])
113
113
/*I2C_ACK|AUX_ACK*/
···
133
133
break;
134
134
}
135
135
136
-
drm_dbg_dp(adev_to_drm(adev), "amdgpu: DP AUX transfer fail:%d\n", operation_result);
136
+
drm_dbg_dp(adev_to_drm(adev), "DP AUX transfer fail:%d\n", operation_result);
137
137
}
138
138
139
139
if (payload.reply[0])
140
-
drm_dbg_dp(adev_to_drm(adev), "amdgpu: AUX reply command not ACK: 0x%02x.",
140
+
drm_dbg_dp(adev_to_drm(adev), "AUX reply command not ACK: 0x%02x.",
141
141
payload.reply[0]);
142
142
143
143
return result;