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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index ad95de6399af7f5b33b613361d64d09257499fc4..e8c23e37c83cbb97553b22645e8eb395e85fc3c3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2516,10 +2516,8 @@ static int __init amdgpu_init(void)
 {
        int r;
 
-       if (vgacon_text_force()) {
-               DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
+       if (vgacon_text_force())
                return -EINVAL;
-       }
 
        r = amdgpu_sync_init();
        if (r)

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index b74cebca1f89e1889accebece0d67afeb927a4ea..380adc61e71c7a4b98ea1d8ceeca08ae774a511c 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -637,15 +637,11 @@ static struct pci_driver radeon_kms_pci_driver = {
 
 static int __init radeon_module_init(void)
 {
-       if (vgacon_text_force() && radeon_modeset == -1) {
-               DRM_INFO("VGACON disable radeon kernel modesetting.\n");
+       if (vgacon_text_force() && radeon_modeset == -1)
                radeon_modeset = 0;
-       }
 
-       if (radeon_modeset == 0) {
-               DRM_ERROR("No UMS support in radeon module!\n");
+       if (radeon_modeset == 0)
                return -EINVAL;
-       }
 
        DRM_INFO("radeon kernel modesetting enabled.\n");
        radeon_register_atpx_handler();