From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B990C433FE for ; Mon, 8 Nov 2021 14:07:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C98D61077 for ; Mon, 8 Nov 2021 14:07:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5C98D61077 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80E3A6E095; Mon, 8 Nov 2021 14:07:11 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 872D06E095 for ; Mon, 8 Nov 2021 14:07:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636380428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PQLIAbh+UwGTeTD7BCUD1byG8sr2htzPW9HYf/GbWOQ=; b=iB5geGdd6oscOpm0+9grzUvHL0oCyFhDrNzaN+3Jk8dKbvgR7XrOn6irbe/UktZ3NrbdPC 2Hk4DU4W6Z8GbtCqkg7NvIX+DhsZsQb8UF0EaGPeOTZsrnRBncDoeBsF5TD24rM+pxv8Yi B0OhNrNIpTow79BCXkZ4QDuTEchiVe4= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525-j76dW-lGN6unKJ37nLQxDQ-1; Mon, 08 Nov 2021 09:07:05 -0500 X-MC-Unique: j76dW-lGN6unKJ37nLQxDQ-1 Received: by mail-wr1-f70.google.com with SMTP id k8-20020a5d5248000000b001763e7c9ce5so4098632wrc.22 for ; Mon, 08 Nov 2021 06:07:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PQLIAbh+UwGTeTD7BCUD1byG8sr2htzPW9HYf/GbWOQ=; b=iSV1KvLWpQd0G/mDwgTVwrwHLfCk4PSisyuKgkrOBqDPs8vX9v3sJOSw9SqykC6dUb dbqwk0qN7334pg2jWMFgYm7yl8meup7gRt3JU4gRqIdQFOimv4Sm2JJOu+8qOFEsbilO GIm/a3UYXXEkzsatuaI1403DzgIHRbv3LiXNcucrYVzkY4eL4wtebuAWEJAK1CpJhsgK zQvfV69+rZrK6ff+UKEmwvGXQIlz5RVdcvvYArkE2U56lLPjs9XjsHyIn9sj2uCZrJIk +09vOI1dSdL/6sqrPkNFB6Dt/I3C/QKSGLCpdSAUQim+2hQxYf9bm/w73X62iL1uEqwh V+mg== X-Gm-Message-State: AOAM5331Xw+H73uy/wjgjBoiahXowhNoCc/zxMH3Py6fWlGeMRTSmm89 pXaxxJpHgyZMadYOTT6PPmlkorlzXq8W1F0w+LZr0eXzjmqW6mIScv5LD3kMXiVp8ncXjr/2fqa HJGRpIWjmkoLYLjzpg3wBJS/TQK7h X-Received: by 2002:a05:600c:3586:: with SMTP id p6mr47543278wmq.34.1636380424176; Mon, 08 Nov 2021 06:07:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvtINAP8QSTe4tTfHVmZkm28rbBCr0xKoz60mO3RAPdu9pz4/mqVyT59DP/qN1jloJAVX4uA== X-Received: by 2002:a05:600c:3586:: with SMTP id p6mr47543247wmq.34.1636380423968; Mon, 08 Nov 2021 06:07:03 -0800 (PST) Received: from minerva.home ([92.176.231.106]) by smtp.gmail.com with ESMTPSA id m14sm10081696wrp.28.2021.11.08.06.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 06:07:03 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH v4 1/6] drm: Don't print messages if drivers are disabled due nomodeset Date: Mon, 8 Nov 2021 15:06:43 +0100 Message-Id: <20211108140648.795268-2-javierm@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211108140648.795268-1-javierm@redhat.com> References: <20211108140648.795268-1-javierm@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=javierm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pekka Paalanen , Jani Nikula , Daniel Vetter , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, Peter Robinson , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Signed-off-by: Javier Martinez Canillas Acked-by: Thomas Zimmermann --- (no changes since v1) drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +--- drivers/gpu/drm/radeon/radeon_drv.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index c718fb5f3f8a..289d04999ced 100644 --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2514,10 +2514,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 drivers/gpu/drm/radeon/radeon_drv.c drivers/gpu/drm/radeon/radeon_drv.c index b74cebca1f89..380adc61e71c 100644 --- drivers/gpu/drm/radeon/radeon_drv.c +++ 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(); -- 2.33.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29575C433F5 for ; Mon, 8 Nov 2021 14:07:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12A58610E9 for ; Mon, 8 Nov 2021 14:07:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240215AbhKHOJy (ORCPT ); Mon, 8 Nov 2021 09:09:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50181 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237676AbhKHOJv (ORCPT ); Mon, 8 Nov 2021 09:09:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636380426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PQLIAbh+UwGTeTD7BCUD1byG8sr2htzPW9HYf/GbWOQ=; b=CHQAiRtmR/CHhn5DL7cBcOr7TTgVD9qhMY78jx/RKxY0d0Dbb8sgsDdPFfLpYQVZXgO7vK WADIFhClenzbV8mkVdeTZQnSRohUBS4X2MfuCIzfJyORlQveOubmIcNSKQ+SPWCSg8l1EI TzHjozgz229/U+SoZyrYNQ5H5s3FXTE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-565-qG4OnFOJOUWO5Fi1NMp7CA-1; Mon, 08 Nov 2021 09:07:05 -0500 X-MC-Unique: qG4OnFOJOUWO5Fi1NMp7CA-1 Received: by mail-wr1-f69.google.com with SMTP id z5-20020a5d6405000000b00182083d7d2aso4073109wru.13 for ; Mon, 08 Nov 2021 06:07:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PQLIAbh+UwGTeTD7BCUD1byG8sr2htzPW9HYf/GbWOQ=; b=LVRmfEaYXIfUUxRfa4+glzJJrRnKs33TjmFSMMKVcOQUj75YoiF0/vsaqOidm0EaKL WwFT0MpqaRKwHiPzhSvrzejhJEKDOEj1NB6CHv7HoU7fxUMR3zNu1Ux/G4LJj3vc6ht1 6U9TKQ/2M3kx4iGWVB6e1s2UL+EmRG7B8ySc7Dh31U6fj5Y7qy/wYc/3/O0zGDJDAhaz iXxUoLvmNyzpkNR0RBegsXcdqMySfc1Nq4r9erJzNKHerxDZtXFv2mCqEAVDmsbufEeu GAtwtG+6NtCN/PruTmS3dcyWzt/DnJc46VfyuDnpEdmbzKN18IERQRSkSrIwi3rRuy3e 224A== X-Gm-Message-State: AOAM532mVKkXW3i9Ga492nxcQwbmvqIzFBOtg+SNFUk4gAKmzIFvdmeE FltOZrUWfMw0eiUABrdkQDdGtI93mVx2WmtB1gaYLc3Yj+JCLg0NxpfUsNZkp6loqvKlKtO19zW 2hcGnalH98kcolTDCey5XezDq7jCpiHrC87G77+qCoKGN9ykIwMZJXBvM8hQsMmWHVFFdX+eUvB U= X-Received: by 2002:a05:600c:3586:: with SMTP id p6mr47543284wmq.34.1636380424214; Mon, 08 Nov 2021 06:07:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvtINAP8QSTe4tTfHVmZkm28rbBCr0xKoz60mO3RAPdu9pz4/mqVyT59DP/qN1jloJAVX4uA== X-Received: by 2002:a05:600c:3586:: with SMTP id p6mr47543247wmq.34.1636380423968; Mon, 08 Nov 2021 06:07:03 -0800 (PST) Received: from minerva.home ([92.176.231.106]) by smtp.gmail.com with ESMTPSA id m14sm10081696wrp.28.2021.11.08.06.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 06:07:03 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Pekka Paalanen , Thomas Zimmermann , Daniel Vetter , dri-devel@lists.freedesktop.org, Peter Robinson , Jani Nikula , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Javier Martinez Canillas Subject: [PATCH v4 1/6] drm: Don't print messages if drivers are disabled due nomodeset Date: Mon, 8 Nov 2021 15:06:43 +0100 Message-Id: <20211108140648.795268-2-javierm@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211108140648.795268-1-javierm@redhat.com> References: <20211108140648.795268-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Javier Martinez Canillas Acked-by: Thomas Zimmermann --- (no changes since v1) drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +--- drivers/gpu/drm/radeon/radeon_drv.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index c718fb5f3f8a..289d04999ced 100644 --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2514,10 +2514,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 drivers/gpu/drm/radeon/radeon_drv.c drivers/gpu/drm/radeon/radeon_drv.c index b74cebca1f89..380adc61e71c 100644 --- drivers/gpu/drm/radeon/radeon_drv.c +++ 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(); -- 2.33.1