Unverified Commit 35f7775f authored Nov 12, 2021 by Javier Martinez Canillas

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

parent 6e22dc35

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -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)

drivers/gpu/drm/radeon/radeon_drv.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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();