diff --git a/kernel.spec b/kernel.spec index b8f071c22..a4c0b0b12 100644 --- a/kernel.spec +++ b/kernel.spec @@ -740,6 +740,8 @@ Patch21385: libata-disable-runtime-pm-for-hotpluggable-port.patch Patch21400: unhandled-irqs-switch-to-polling.patch +Patch21620: vgaarb-vga_default_device.patch + Patch22000: weird-root-dentry-name-debug.patch #selinux ptrace child permissions @@ -1435,6 +1437,9 @@ ApplyPatch highbank-export-clock-functions.patch #rhbz 806676 807632 ApplyPatch libata-disable-runtime-pm-for-hotpluggable-port.patch +#vgaarb patches. blame mjg59 +ApplyPatch vgaarb-vga_default_device.patch + # END OF PATCH APPLICATIONS %endif @@ -2296,6 +2301,7 @@ fi # || || %changelog * Mon Apr 16 2012 Josh Boyer +- Add and use vga_default_device patches (requested by Matthew Garrett) - Enable Apple gmux driver * Mon Apr 16 2012 Justin M. Forbes - 3.4.0-0.rc3.git0.2 diff --git a/vgaarb-vga_default_device.patch b/vgaarb-vga_default_device.patch new file mode 100644 index 000000000..c67c6c861 --- /dev/null +++ b/vgaarb-vga_default_device.patch @@ -0,0 +1,552 @@ + +Delivered-To: jwboyer@gmail.com +Received: by 10.229.187.201 with SMTP id cx9csp141480qcb; + Mon, 16 Apr 2012 13:27:50 -0700 (PDT) +Received: by 10.60.0.201 with SMTP id 9mr17463209oeg.59.1334608065659; + Mon, 16 Apr 2012 13:27:45 -0700 (PDT) +Return-Path: +Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) + by mx.google.com with ESMTP id 4si12245496oei.14.2012.04.16.13.27.44; + Mon, 16 Apr 2012 13:27:45 -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; 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.mail=linux-kernel-owner@vger.kernel.org +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755065Ab2DPU02 (ORCPT + + 99 others); Mon, 16 Apr 2012 16:26:28 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:1184 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754698Ab2DPU01 (ORCPT ); + Mon, 16 Apr 2012 16:26:27 -0400 +Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) + by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3GKQPYb007336 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Mon, 16 Apr 2012 16:26:25 -0400 +Received: from cavan.codon.org.uk (ovpn-113-122.phx2.redhat.com [10.3.113.122]) + by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3GKQNG5011412 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); + Mon, 16 Apr 2012 16:26:24 -0400 +Received: from nat-pool-rdu.redhat.com ([66.187.233.202] helo=x220.boston.devel.redhat.com) + by cavan.codon.org.uk with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) + (Exim 4.72) + (envelope-from ) + id 1SJsVA-0003T4-U8; Mon, 16 Apr 2012 21:26:21 +0100 +From: Matthew Garrett +To: linux-kernel@vger.kernel.org +Cc: Matthew Garrett , benh@kernel.crashing.org, + airlied@redhat.com +Subject: [PATCH V2 1/4] vgaarb: Add support for setting the default video device +Date: Mon, 16 Apr 2012 16:26:02 -0400 +Message-Id: <1334607965-9582-1-git-send-email-mjg@redhat.com> +X-SA-Do-Not-Run: Yes +X-SA-Exim-Connect-IP: 66.187.233.202 +X-SA-Exim-Mail-From: mjg@redhat.com +X-SA-Exim-Scanned: No (on cavan.codon.org.uk); SAEximRunCond expanded to false +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +The default VGA device is a somewhat fluid concept on platforms with +multiple GPUs. Add support for setting it so switching code can update +things appropriately, and make sure that the sysfs code returns the right +device if it's changed. + +Signed-off-by: Matthew Garrett +Cc: benh@kernel.crashing.org +Cc: airlied@redhat.com +--- +Updated to fix builds when __ARCH_HAS_VGA_DEFAULT_DEVICE is false. + + drivers/gpu/vga/vgaarb.c | 7 +++++++ + drivers/pci/pci-sysfs.c | 5 +++++ + include/linux/vgaarb.h | 2 ++ + 3 files changed, 14 insertions(+) + +diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c +index 111d956..e223b96 100644 +--- a/drivers/gpu/vga/vgaarb.c ++++ b/drivers/gpu/vga/vgaarb.c +@@ -136,6 +136,11 @@ struct pci_dev *vga_default_device(void) + { + return vga_default; + } ++ ++void vga_set_default_device(struct pci_dev *pdev) ++{ ++ vga_default = pdev; ++} + #endif + + static inline void vga_irq_set_state(struct vga_device *vgadev, bool state) +@@ -605,10 +610,12 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev) + goto bail; + } + ++#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE + if (vga_default == pdev) { + pci_dev_put(vga_default); + vga_default = NULL; + } ++#endif + + if (vgadev->decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM)) + vga_decode_count--; +diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c +index a3cd8ca..7dd9f2b 100644 +--- a/drivers/pci/pci-sysfs.c ++++ b/drivers/pci/pci-sysfs.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include "pci.h" + + static int sysfs_initialized; /* = 0 */ +@@ -414,6 +415,10 @@ static ssize_t + boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf) + { + struct pci_dev *pdev = to_pci_dev(dev); ++ struct pci_dev *vga_dev = vga_default_device(); ++ ++ if (vga_dev) ++ return sprintf(buf, "%u\n", (pdev == vga_dev)); + + return sprintf(buf, "%u\n", + !!(pdev->resource[PCI_ROM_RESOURCE].flags & +diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h +index 9c3120d..759a25b 100644 +--- a/include/linux/vgaarb.h ++++ b/include/linux/vgaarb.h +@@ -31,6 +31,7 @@ + #ifndef LINUX_VGA_H + #define LINUX_VGA_H + ++#include