From patchwork Wed Jul 19 01:28:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 9850237 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71B82601C8 for ; Wed, 19 Jul 2017 01:29:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6242C285CD for ; Wed, 19 Jul 2017 01:29:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57158285D4; Wed, 19 Jul 2017 01:29:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAF9E285CD for ; Wed, 19 Jul 2017 01:29:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752102AbdGSB3b (ORCPT ); Tue, 18 Jul 2017 21:29:31 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35440 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbdGSB3a (ORCPT ); Tue, 18 Jul 2017 21:29:30 -0400 Received: by mail-pg0-f67.google.com with SMTP id d193so4849274pgc.2 for ; Tue, 18 Jul 2017 18:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D5Gh4BL3njsbeHn5YsYxxJAwMFrOZl/kvv57GI/zamM=; b=Ocpl4PnOP61foqlc8yKYaVgRT+hvkT9ME6Kwc5kdHSH+RkzsWdz25yyRE6RsGDtErb 82Y1W7Hu6YuJNwlGRa6YKJnRHixOmxUzPC6T2vlb80aN2Ou0rQmwuVIPHYJKCGFEPmJJ e2/9glMREDdp507zYvHgRr2i1whpm0yVw9+JI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D5Gh4BL3njsbeHn5YsYxxJAwMFrOZl/kvv57GI/zamM=; b=HmWAiOuhDG7JvvbXpRshVpIFqStFOi7b8hnyrG6QzZwmFu6Qq9aliRUmIVdTFkDEhj 6WHPi0ciw0Qv95b0jlR7iwKt9gFAwaKfQeMhQbcaYDcDRAcG1WqjwIUIpOWDTKG4WDC3 QsPRzEZ1ZA6Cb6HdTFu1X6OLzw9CA96XC+laekHHbMq9T6kVC3LxqevwjtMDyonHaDSH Q76F1jaY8TFiZy3v8UPDCvRPdwwDQvdv9X0dyT7WtgF/o7WPfvyNV0eONlF+RwhpNgdE KsSrr1BHRHLBgBCvVNMjr5c5q4Wq8YrG6gI4hs1RX/NjDZ6bX+od601qTOgXxR/kmY4N qOPg== X-Gm-Message-State: AIVw112KUyC+gBJNZcg30LOXlqZ/csxFr4xbbCfwqzFtQ2wzdm8bcAdm z54WTGFo0AZKseUxqCxjdA== X-Received: by 10.84.211.2 with SMTP id b2mr483714pli.294.1500427769962; Tue, 18 Jul 2017 18:29:29 -0700 (PDT) Received: from localhost.localdomain (203-59-51-51.dyn.iinet.net.au. [203.59.51.51]) by smtp.gmail.com with ESMTPSA id n90sm7582401pfk.105.2017.07.18.18.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 18:29:29 -0700 (PDT) From: Daniel Axtens To: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Cc: benh@kernel.crashing.org, z.liuxinliang@hisilicon.com, zourongrong@gmail.com, catalin.marinas@arm.com, will.deacon@arm.com, gabriele.paoloni@huawei.com, helgass@kernel.org, airlied@linux.ie, daniel.vetter@intel.com, alex.williamson@redhat.com, Daniel Axtens Subject: [PATCH 2/4] vgaarb: allow non-legacy cards to be marked as default Date: Wed, 19 Jul 2017 11:28:35 +1000 Message-Id: <20170719012839.20124-3-dja@axtens.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170719012839.20124-1-dja@axtens.net> References: <20170719012839.20124-1-dja@axtens.net> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The VGA arbiter currently only selects a card as default if it can decode legacy I/O and memory ranges. However, on some architectures, legacy PCI resources are not used. This has lead to a powerpc quirk, and issues on arm64. Allow architectures to select ARCH_WANT_VGA_ARB_FALLBACK. When that symbol is selected, add a PCI_FIXUP_CLASS_ENABLE hook, which will mark the first card that is enabled and that can control I/O and memory as the default card. Behaviour is unchanged unless arches opt-in by selecting the Kconfig option. Signed-off-by: Daniel Axtens --- drivers/gpu/vga/Kconfig | 7 +++++++ drivers/gpu/vga/vgaarb.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index 29437eabe095..1205c6cc1ff5 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -17,6 +17,13 @@ config VGA_ARB_MAX_GPUS Reserves space in the kernel to maintain resource locking for multiple GPUS. The overhead for each GPU is very small. +config ARCH_WANT_VGA_ARB_FALLBACK + bool + help + Some architectures don't have a concept of "legacy" PCI addresses + which the VGA arbiter relies on. Instead, they can fall back to + selecting the first device that decodes memory and I/O. + config VGA_SWITCHEROO bool "Laptop Hybrid Graphics - GPU switching support" depends on X86 diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index 76875f6299b8..2135b04759c5 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c @@ -1472,3 +1472,24 @@ static int __init vga_arb_device_init(void) return rc; } subsys_initcall(vga_arb_device_init); + +#if defined(CONFIG_ARCH_WANT_VGA_ARB_FALLBACK) +static void vga_arb_fallback_fixup(struct pci_dev *pdev) +{ + u16 cmd; + + if (vga_default_device()) + return; + + pci_read_config_word(pdev, PCI_COMMAND, &cmd); + if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) { + vgaarb_info(&pdev->dev, "[fallback]" + " setting as default device\n"); + vga_set_default_device(pdev); + } + +} +DECLARE_PCI_FIXUP_CLASS_ENABLE(PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_DISPLAY_VGA, 8, + vga_arb_fallback_fixup); +#endif