iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: Don't print messages if drivers are disabled due nomodeset

Browse Source 
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
This commit is contained in:
Javier Martinez Canillas 2021-11-12 14:32:25 +01:00
parent 6e22dc3583
commit 35f7775f81
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
View File

@ -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)

8
drivers/gpu/drm/radeon/radeon_drv.c
View File

@ -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();