Skip to content

Commit 35f7775

Browse files
drm: Don't print messages if drivers are disabled due nomodeset
The nomodeset kernel parameter handler already prints a message that the DRM drivers will be disabled, so there's no need for drivers to do that. Suggested-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211112133230.1595307-2-javierm@redhat.com
1 parent 6e22dc3 commit 35f7775

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,10 +2516,8 @@ static int __init amdgpu_init(void)
25162516
{
25172517
int r;
25182518

2519-
if (vgacon_text_force()) {
2520-
DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
2519+
if (vgacon_text_force())
25212520
return -EINVAL;
2522-
}
25232521

25242522
r = amdgpu_sync_init();
25252523
if (r)

drivers/gpu/drm/radeon/radeon_drv.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -637,15 +637,11 @@ static struct pci_driver radeon_kms_pci_driver = {
637637

638638
static int __init radeon_module_init(void)
639639
{
640-
if (vgacon_text_force() && radeon_modeset == -1) {
641-
DRM_INFO("VGACON disable radeon kernel modesetting.\n");
640+
if (vgacon_text_force() && radeon_modeset == -1)
642641
radeon_modeset = 0;
643-
}
644642

645-
if (radeon_modeset == 0) {
646-
DRM_ERROR("No UMS support in radeon module!\n");
643+
if (radeon_modeset == 0)
647644
return -EINVAL;
648-
}
649645

650646
DRM_INFO("radeon kernel modesetting enabled.\n");
651647
radeon_register_atpx_handler();

0 commit comments

Comments
 (0)