Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2255993ybg; Sun, 27 Oct 2019 14:31:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVcU15NVOr+T9tFlQHWlqjYFdDaM0TYfhpzwvICuCVV91OLbPJ5qD4wGzHMfpzhy2OgoO2 X-Received: by 2002:a50:b558:: with SMTP id z24mr16271032edd.67.1572211875238; Sun, 27 Oct 2019 14:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211875; cv=none; d=google.com; s=arc-20160816; b=u6kFpEzRI/G7zieJD+/rg7fM+wFmSDHzh9BRWJksqu4q8VpmO8KVHlembnExtVGq0C BbeXsUfEwHqW1Oyf9N3aJDHJjipLtkepLKEcFG2RGLTtTVsM4dUv7eNSnYStpwTsO81F tz4E+ccIuuIPSac0LmLcqIV8ZhGzjksbCNCJiyWqG0lKKV+UOm0hqE6FWyQQo56ApaJO WegaJhyYCHo3Q57zpG0BYCfFqcM9LK4p8+vK+nG8Bfa7L7rp5mddYQpcg9pbSRLZlA2P hSJFeZr+IgynbtUQ8PvFYmzbjesu8AKJtvd3s9oudLO+TCRmgk4OVxgkc6iGaZI4vI1b zXNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/D+myWTSaukl+gQNHCIFcLh29XQ7PVj6D1ynmjkdcQ8=; b=bA+u4LSFFwLMusIRzWeM6GttRRhvPFu3mwpqNxPgLR1bpcivrILTbvuCwREP3YoZ8g C/Z5v215vNq5vM9k2H3uULFzEyEAGSytmXGnrgmPy0Vpl39S5TypLUVwtmoQSRNMDPoh 0J/NxnUtaYe8llaybFqAks0yLB7IwwI64oMfwyJ1eX4TQMB8ACMLl4Mzu72vune4OdUl FnH5Io5gMzi2tU5RFCsGJ2exV4YB9zjrp2Npzs7g5E31AMqFM52eMykv84alUhoNXR1w /srEBnhodTffRcsydtQZoQ8MB7MWarQOBUqNVbmSzY1u8QiKRGYvry0RaP7qSeE4ji1e PdTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Six2DzsN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k18si6450228ede.144.2019.10.27.14.30.51; Sun, 27 Oct 2019 14:31:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Six2DzsN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732257AbfJ0VW6 (ORCPT + 99 others); Sun, 27 Oct 2019 17:22:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:44012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728802AbfJ0VW4 (ORCPT ); Sun, 27 Oct 2019 17:22:56 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 742772070B; Sun, 27 Oct 2019 21:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211375; bh=TYgk3jFPZOvKToNOdidpupw5qei3AAmg3k+MAjGFO4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Six2DzsNAboUL8wQCFMJJjMduc5GcYa+Vz7GJf3GJ3KzqM+JsuuPoj5TErzliUppg rZmSWT6/jhpiGYvt/5pSpOZiI1CoufCaCu3LGLNbcsONZ3lgulF+/AZnTRQ+I/Ly/R KusNuWvo4hqKE22Dren+s/7jsgySz/jmcQFqflOQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Vetter , Hans de Goede , Alex Deucher Subject: [PATCH 5.3 127/197] drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1 Date: Sun, 27 Oct 2019 22:00:45 +0100 Message-Id: <20191027203358.587004930@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede commit 984d7a929ad68b7be9990fc9c5cfa5d5c9fc7942 upstream. Bail from the pci_driver probe function instead of from the drm_driver load function. This avoid /dev/dri/card0 temporarily getting registered and then unregistered again, sending unwanted add / remove udev events to userspace. Specifically this avoids triggering the (userspace) bug fixed by this plymouth merge-request: https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/59 Note that despite that being a userspace bug, not sending unnecessary udev events is a good idea in general. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1490490 Reviewed-by: Daniel Vetter Signed-off-by: Hans de Goede Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 -------------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1030,6 +1030,41 @@ static int amdgpu_pci_probe(struct pci_d return -ENODEV; } +#ifdef CONFIG_DRM_AMDGPU_SI + if (!amdgpu_si_support) { + switch (flags & AMD_ASIC_MASK) { + case CHIP_TAHITI: + case CHIP_PITCAIRN: + case CHIP_VERDE: + case CHIP_OLAND: + case CHIP_HAINAN: + dev_info(&pdev->dev, + "SI support provided by radeon.\n"); + dev_info(&pdev->dev, + "Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" + ); + return -ENODEV; + } + } +#endif +#ifdef CONFIG_DRM_AMDGPU_CIK + if (!amdgpu_cik_support) { + switch (flags & AMD_ASIC_MASK) { + case CHIP_KAVERI: + case CHIP_BONAIRE: + case CHIP_HAWAII: + case CHIP_KABINI: + case CHIP_MULLINS: + dev_info(&pdev->dev, + "CIK support provided by radeon.\n"); + dev_info(&pdev->dev, + "Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" + ); + return -ENODEV; + } + } +#endif + /* Get rid of things like offb */ ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "amdgpudrmfb"); if (ret) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -144,41 +144,6 @@ int amdgpu_driver_load_kms(struct drm_de struct amdgpu_device *adev; int r, acpi_status; -#ifdef CONFIG_DRM_AMDGPU_SI - if (!amdgpu_si_support) { - switch (flags & AMD_ASIC_MASK) { - case CHIP_TAHITI: - case CHIP_PITCAIRN: - case CHIP_VERDE: - case CHIP_OLAND: - case CHIP_HAINAN: - dev_info(dev->dev, - "SI support provided by radeon.\n"); - dev_info(dev->dev, - "Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" - ); - return -ENODEV; - } - } -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK - if (!amdgpu_cik_support) { - switch (flags & AMD_ASIC_MASK) { - case CHIP_KAVERI: - case CHIP_BONAIRE: - case CHIP_HAWAII: - case CHIP_KABINI: - case CHIP_MULLINS: - dev_info(dev->dev, - "CIK support provided by radeon.\n"); - dev_info(dev->dev, - "Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" - ); - return -ENODEV; - } - } -#endif - adev = kzalloc(sizeof(struct amdgpu_device), GFP_KERNEL); if (adev == NULL) { return -ENOMEM;