mirror of
				https://aur.archlinux.org/linux-vfio.git
				synced 2025-11-04 14:16:57 +00:00 
			
		
		
		
	Update to 4.16.13-1
This commit is contained in:
		
							
								
								
									
										18
									
								
								.SRCINFO
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								.SRCINFO
									
									
									
									
									
								
							@@ -1,5 +1,5 @@
 | 
			
		||||
pkgbase = linux-vfio
 | 
			
		||||
	pkgver = 4.16.10
 | 
			
		||||
	pkgver = 4.16.13
 | 
			
		||||
	pkgrel = 1
 | 
			
		||||
	url = https://www.kernel.org/
 | 
			
		||||
	arch = x86_64
 | 
			
		||||
@@ -12,30 +12,34 @@ pkgbase = linux-vfio
 | 
			
		||||
	options = !strip
 | 
			
		||||
	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz
 | 
			
		||||
	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign
 | 
			
		||||
	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.10.xz
 | 
			
		||||
	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.10.sign
 | 
			
		||||
	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.13.xz
 | 
			
		||||
	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.13.sign
 | 
			
		||||
	source = config
 | 
			
		||||
	source = 60-linux.hook
 | 
			
		||||
	source = 90-linux.hook
 | 
			
		||||
	source = linux.preset
 | 
			
		||||
	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 | 
			
		||||
	source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
 | 
			
		||||
	source = 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
 | 
			
		||||
	source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
 | 
			
		||||
	source = add-acs-overrides.patch
 | 
			
		||||
	source = i915-vga-arbiter.patch
 | 
			
		||||
	source = PCI-Add-Intel-7th-8th-Gen-mobile-to-ACS-quirks.patch
 | 
			
		||||
	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 | 
			
		||||
	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 | 
			
		||||
	sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9
 | 
			
		||||
	sha256sums = SKIP
 | 
			
		||||
	sha256sums = 9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6
 | 
			
		||||
	sha256sums = 9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323
 | 
			
		||||
	sha256sums = SKIP
 | 
			
		||||
	sha256sums = 8566a49997faf3f8678440c52578a7a0ee901e598d3b67d3bee3799fb92e8f86
 | 
			
		||||
	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 | 
			
		||||
	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 | 
			
		||||
	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 | 
			
		||||
	sha256sums = 7fb607fe384dd814e9e45d7fc28f7b5b23a51d80784c54bf9209486ad428be14
 | 
			
		||||
	sha256sums = ceaa19e0af3842c62eb666a4ac5c79d89b3e6d00593442f18d6508ca6d74bbaa
 | 
			
		||||
	sha256sums = 8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd
 | 
			
		||||
	sha256sums = 2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446
 | 
			
		||||
	sha256sums = 8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e
 | 
			
		||||
	sha256sums = abe269c6596b54a412bd8415472153f419026d4f367fa3ee1ebc8693ac66915d
 | 
			
		||||
	sha256sums = fe3d47fe6f54d4a82c869fd29484d3f097b5906ef4d456409961a8dd647daad0
 | 
			
		||||
	sha256sums = 429ed1161b9b178df97e53dc6439f770e5198b5544f7421d0e48a3dd77fe371f
 | 
			
		||||
 | 
			
		||||
pkgname = linux-vfio
 | 
			
		||||
	pkgdesc = The Linux-vfio kernel and modules
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
From dea1110505c920b0f7e0cdd8840448e48ef420fa Mon Sep 17 00:00:00 2001
 | 
			
		||||
Message-Id: <dea1110505c920b0f7e0cdd8840448e48ef420fa.1525295228.git.jan.steffens@gmail.com>
 | 
			
		||||
From ee91df95bf010fad44be5d2564e7d40038987f19 Mon Sep 17 00:00:00 2001
 | 
			
		||||
Message-Id: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
From: Serge Hallyn <serge.hallyn@canonical.com>
 | 
			
		||||
Date: Fri, 31 May 2013 19:12:12 +0100
 | 
			
		||||
Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										125
									
								
								0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										125
									
								
								0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,125 @@
 | 
			
		||||
From f593e0bde601ff2b4f84b7363e4dfcbbda652e6d Mon Sep 17 00:00:00 2001
 | 
			
		||||
Message-Id: <f593e0bde601ff2b4f84b7363e4dfcbbda652e6d.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
From: Mika Westerberg <mika.westerberg@linux.intel.com>
 | 
			
		||||
Date: Mon, 23 Apr 2018 14:16:03 +0300
 | 
			
		||||
Subject: [PATCH 2/3] ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
 | 
			
		||||
 | 
			
		||||
WDAT table on Lenovo Z50-70 is using RTC SRAM (ports 0x70 and 0x71) to
 | 
			
		||||
store state of the timer. This conflicts with Linux RTC driver
 | 
			
		||||
(rtc-cmos.c) who fails to reserve those ports for itself preventing RTC
 | 
			
		||||
from functioning. In addition the WDAT table seems not to be fully
 | 
			
		||||
functional because it does not reset the system when the watchdog times
 | 
			
		||||
out.
 | 
			
		||||
 | 
			
		||||
On this system iTCO_wdt works just fine so we simply prefer to use it
 | 
			
		||||
instead of WDAT. This makes RTC working again and also results working
 | 
			
		||||
watchdog via iTCO_wdt.
 | 
			
		||||
 | 
			
		||||
Reported-by: Peter Milley <pbmilley@gmail.com>
 | 
			
		||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033
 | 
			
		||||
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 | 
			
		||||
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 | 
			
		||||
---
 | 
			
		||||
 drivers/acpi/acpi_watchdog.c | 59 ++++++++++++++++++++++++++++++------
 | 
			
		||||
 1 file changed, 49 insertions(+), 10 deletions(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
 | 
			
		||||
index ebb626ffb5fa..4bde16fb97d8 100644
 | 
			
		||||
--- a/drivers/acpi/acpi_watchdog.c
 | 
			
		||||
+++ b/drivers/acpi/acpi_watchdog.c
 | 
			
		||||
@@ -12,41 +12,80 @@
 | 
			
		||||
 #define pr_fmt(fmt) "ACPI: watchdog: " fmt
 | 
			
		||||
 
 | 
			
		||||
 #include <linux/acpi.h>
 | 
			
		||||
+#include <linux/dmi.h>
 | 
			
		||||
 #include <linux/ioport.h>
 | 
			
		||||
 #include <linux/platform_device.h>
 | 
			
		||||
 
 | 
			
		||||
 #include "internal.h"
 | 
			
		||||
 
 | 
			
		||||
+static const struct dmi_system_id acpi_watchdog_skip[] = {
 | 
			
		||||
+	{
 | 
			
		||||
+		/*
 | 
			
		||||
+		 * On Lenovo Z50-70 there are two issues with the WDAT
 | 
			
		||||
+		 * table. First some of the instructions use RTC SRAM
 | 
			
		||||
+		 * to store persistent information. This does not work well
 | 
			
		||||
+		 * with Linux RTC driver. Second, more important thing is
 | 
			
		||||
+		 * that the instructions do not actually reset the system.
 | 
			
		||||
+		 *
 | 
			
		||||
+		 * On this particular system iTCO_wdt seems to work just
 | 
			
		||||
+		 * fine so we prefer that over WDAT for now.
 | 
			
		||||
+		 *
 | 
			
		||||
+		 * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033.
 | 
			
		||||
+		 */
 | 
			
		||||
+		.ident = "Lenovo Z50-70",
 | 
			
		||||
+		.matches = {
 | 
			
		||||
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 | 
			
		||||
+			DMI_MATCH(DMI_PRODUCT_NAME, "20354"),
 | 
			
		||||
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Z50-70"),
 | 
			
		||||
+		},
 | 
			
		||||
+	},
 | 
			
		||||
+	{}
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)
 | 
			
		||||
+{
 | 
			
		||||
+	const struct acpi_table_wdat *wdat = NULL;
 | 
			
		||||
+	acpi_status status;
 | 
			
		||||
+
 | 
			
		||||
+	if (acpi_disabled)
 | 
			
		||||
+		return NULL;
 | 
			
		||||
+
 | 
			
		||||
+	if (dmi_check_system(acpi_watchdog_skip))
 | 
			
		||||
+		return NULL;
 | 
			
		||||
+
 | 
			
		||||
+	status = acpi_get_table(ACPI_SIG_WDAT, 0,
 | 
			
		||||
+				(struct acpi_table_header **)&wdat);
 | 
			
		||||
+	if (ACPI_FAILURE(status)) {
 | 
			
		||||
+		/* It is fine if there is no WDAT */
 | 
			
		||||
+		return NULL;
 | 
			
		||||
+	}
 | 
			
		||||
+
 | 
			
		||||
+	return wdat;
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
 /**
 | 
			
		||||
  * Returns true if this system should prefer ACPI based watchdog instead of
 | 
			
		||||
  * the native one (which are typically the same hardware).
 | 
			
		||||
  */
 | 
			
		||||
 bool acpi_has_watchdog(void)
 | 
			
		||||
 {
 | 
			
		||||
-	struct acpi_table_header hdr;
 | 
			
		||||
-
 | 
			
		||||
-	if (acpi_disabled)
 | 
			
		||||
-		return false;
 | 
			
		||||
-
 | 
			
		||||
-	return ACPI_SUCCESS(acpi_get_table_header(ACPI_SIG_WDAT, 0, &hdr));
 | 
			
		||||
+	return !!acpi_watchdog_get_wdat();
 | 
			
		||||
 }
 | 
			
		||||
 EXPORT_SYMBOL_GPL(acpi_has_watchdog);
 | 
			
		||||
 
 | 
			
		||||
 void __init acpi_watchdog_init(void)
 | 
			
		||||
 {
 | 
			
		||||
 	const struct acpi_wdat_entry *entries;
 | 
			
		||||
 	const struct acpi_table_wdat *wdat;
 | 
			
		||||
 	struct list_head resource_list;
 | 
			
		||||
 	struct resource_entry *rentry;
 | 
			
		||||
 	struct platform_device *pdev;
 | 
			
		||||
 	struct resource *resources;
 | 
			
		||||
 	size_t nresources = 0;
 | 
			
		||||
-	acpi_status status;
 | 
			
		||||
 	int i;
 | 
			
		||||
 
 | 
			
		||||
-	status = acpi_get_table(ACPI_SIG_WDAT, 0,
 | 
			
		||||
-				(struct acpi_table_header **)&wdat);
 | 
			
		||||
-	if (ACPI_FAILURE(status)) {
 | 
			
		||||
+	wdat = acpi_watchdog_get_wdat();
 | 
			
		||||
+	if (!wdat) {
 | 
			
		||||
 		/* It is fine if there is no WDAT */
 | 
			
		||||
 		return;
 | 
			
		||||
 	}
 | 
			
		||||
-- 
 | 
			
		||||
2.17.0
 | 
			
		||||
 | 
			
		||||
@@ -1,42 +0,0 @@
 | 
			
		||||
From 800a7732e3d89f3dac3b10ca6b82868286562331 Mon Sep 17 00:00:00 2001
 | 
			
		||||
Message-Id: <800a7732e3d89f3dac3b10ca6b82868286562331.1525295228.git.jan.steffens@gmail.com>
 | 
			
		||||
In-Reply-To: <dea1110505c920b0f7e0cdd8840448e48ef420fa.1525295228.git.jan.steffens@gmail.com>
 | 
			
		||||
References: <dea1110505c920b0f7e0cdd8840448e48ef420fa.1525295228.git.jan.steffens@gmail.com>
 | 
			
		||||
From: Jim Bride <jim.bride@linux.intel.com>
 | 
			
		||||
Date: Mon, 6 Nov 2017 13:38:57 -0800
 | 
			
		||||
Subject: [PATCH 2/3] drm/i915/edp: Only use the alternate fixed mode if it's
 | 
			
		||||
 asked for
 | 
			
		||||
 | 
			
		||||
In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
 | 
			
		||||
eDP if available."), the patch allows for the use of an alternate fixed
 | 
			
		||||
mode if it is available, but the patch was not ensuring that the only
 | 
			
		||||
time the alternate mode is used is when it is specifically requested.
 | 
			
		||||
This patch adds an additional comparison to intel_edp_compare_alt_mode
 | 
			
		||||
to ensure that we only use the alternate mode if it is directly
 | 
			
		||||
requested.
 | 
			
		||||
 | 
			
		||||
Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
 | 
			
		||||
Cc: David Weinehall <david.weinehall@linux.intel.com>
 | 
			
		||||
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
 | 
			
		||||
Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
 | 
			
		||||
---
 | 
			
		||||
 drivers/gpu/drm/i915/intel_dp.c | 3 ++-
 | 
			
		||||
 1 file changed, 2 insertions(+), 1 deletion(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
 | 
			
		||||
index a29868cd30c7..b6d07b615b12 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_dp.c
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_dp.c
 | 
			
		||||
@@ -1597,7 +1597,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
 | 
			
		||||
 			m1->vdisplay == m2->vdisplay &&
 | 
			
		||||
 			m1->vsync_start == m2->vsync_start &&
 | 
			
		||||
 			m1->vsync_end == m2->vsync_end &&
 | 
			
		||||
-			m1->vtotal == m2->vtotal);
 | 
			
		||||
+			m1->vtotal == m2->vtotal &&
 | 
			
		||||
+			m1->vrefresh == m2->vrefresh);
 | 
			
		||||
 	return bres;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
-- 
 | 
			
		||||
2.17.0
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										242
									
								
								0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										242
									
								
								0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,242 @@
 | 
			
		||||
From b7438d9dd645801027ab11470850033da0521338 Mon Sep 17 00:00:00 2001
 | 
			
		||||
Message-Id: <b7438d9dd645801027ab11470850033da0521338.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
 | 
			
		||||
From: Jani Nikula <jani.nikula@intel.com>
 | 
			
		||||
Date: Wed, 16 May 2018 11:01:10 +0300
 | 
			
		||||
Subject: [PATCH 3/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP
 | 
			
		||||
 if available."
 | 
			
		||||
 | 
			
		||||
This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e.
 | 
			
		||||
 | 
			
		||||
Per the report, no matter what display mode you select with xrandr, the
 | 
			
		||||
i915 driver will always select the alternate fixed mode. For the
 | 
			
		||||
reporter this means that the display will always run at 40Hz which is
 | 
			
		||||
quite annoying. This may be due to the mode comparison.
 | 
			
		||||
 | 
			
		||||
But there are some other potential issues. The choice of alt_fixed_mode
 | 
			
		||||
seems dubious. It's the first non-preferred mode, but there are no
 | 
			
		||||
guarantees that the only difference would be refresh rate. Similarly,
 | 
			
		||||
there may be more than one preferred mode in the probed modes list, and
 | 
			
		||||
the commit changes the preferred mode selection to choose the last one
 | 
			
		||||
on the list instead of the first.
 | 
			
		||||
 | 
			
		||||
(Note that the probed modes list is the raw, unfiltered, unsorted list
 | 
			
		||||
of modes from drm_add_edid_modes(), not the pretty result after a
 | 
			
		||||
drm_helper_probe_single_connector_modes() call.)
 | 
			
		||||
 | 
			
		||||
Finally, we already have eerily similar code in place to find the
 | 
			
		||||
downclock mode for DRRS that seems like could be reused here.
 | 
			
		||||
 | 
			
		||||
Back to the drawing board.
 | 
			
		||||
 | 
			
		||||
Note: This is a hand-crafted revert due to conflicts. If it fails to
 | 
			
		||||
backport, please just try reverting the original commit directly.
 | 
			
		||||
 | 
			
		||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469
 | 
			
		||||
Reported-by: Rune Petersen <rune@megahurts.dk>
 | 
			
		||||
Reported-by: Mark Spencer <n7u4722r35@ynzlx.anonbox.net>
 | 
			
		||||
Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.")
 | 
			
		||||
Cc: Clint Taylor <clinton.a.taylor@intel.com>
 | 
			
		||||
Cc: David Weinehall <david.weinehall@linux.intel.com>
 | 
			
		||||
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
 | 
			
		||||
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
 | 
			
		||||
Cc: Jani Nikula <jani.nikula@intel.com>
 | 
			
		||||
Cc: Chris Wilson <chris@chris-wilson.co.uk>
 | 
			
		||||
Cc: Jim Bride <jim.bride@linux.intel.com>
 | 
			
		||||
Cc: Jani Nikula <jani.nikula@linux.intel.com>
 | 
			
		||||
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
 | 
			
		||||
Cc: intel-gfx@lists.freedesktop.org
 | 
			
		||||
Cc: <stable@vger.kernel.org> # v4.14+
 | 
			
		||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
 | 
			
		||||
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
 | 
			
		||||
Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani.nikula@intel.com
 | 
			
		||||
---
 | 
			
		||||
 drivers/gpu/drm/i915/intel_dp.c    | 38 ++++--------------------------
 | 
			
		||||
 drivers/gpu/drm/i915/intel_drv.h   |  2 --
 | 
			
		||||
 drivers/gpu/drm/i915/intel_dsi.c   |  2 +-
 | 
			
		||||
 drivers/gpu/drm/i915/intel_dvo.c   |  2 +-
 | 
			
		||||
 drivers/gpu/drm/i915/intel_lvds.c  |  3 +--
 | 
			
		||||
 drivers/gpu/drm/i915/intel_panel.c |  6 -----
 | 
			
		||||
 6 files changed, 8 insertions(+), 45 deletions(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
 | 
			
		||||
index 79521da5d11d..de0d0f83551e 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_dp.c
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_dp.c
 | 
			
		||||
@@ -1584,23 +1584,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,
 | 
			
		||||
 	return bpp;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
-static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
 | 
			
		||||
-				       struct drm_display_mode *m2)
 | 
			
		||||
-{
 | 
			
		||||
-	bool bres = false;
 | 
			
		||||
-
 | 
			
		||||
-	if (m1 && m2)
 | 
			
		||||
-		bres = (m1->hdisplay == m2->hdisplay &&
 | 
			
		||||
-			m1->hsync_start == m2->hsync_start &&
 | 
			
		||||
-			m1->hsync_end == m2->hsync_end &&
 | 
			
		||||
-			m1->htotal == m2->htotal &&
 | 
			
		||||
-			m1->vdisplay == m2->vdisplay &&
 | 
			
		||||
-			m1->vsync_start == m2->vsync_start &&
 | 
			
		||||
-			m1->vsync_end == m2->vsync_end &&
 | 
			
		||||
-			m1->vtotal == m2->vtotal);
 | 
			
		||||
-	return bres;
 | 
			
		||||
-}
 | 
			
		||||
-
 | 
			
		||||
 bool
 | 
			
		||||
 intel_dp_compute_config(struct intel_encoder *encoder,
 | 
			
		||||
 			struct intel_crtc_state *pipe_config,
 | 
			
		||||
@@ -1647,16 +1630,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 | 
			
		||||
 		pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;
 | 
			
		||||
 
 | 
			
		||||
 	if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
 | 
			
		||||
-		struct drm_display_mode *panel_mode =
 | 
			
		||||
-			intel_connector->panel.alt_fixed_mode;
 | 
			
		||||
-		struct drm_display_mode *req_mode = &pipe_config->base.mode;
 | 
			
		||||
-
 | 
			
		||||
-		if (!intel_edp_compare_alt_mode(req_mode, panel_mode))
 | 
			
		||||
-			panel_mode = intel_connector->panel.fixed_mode;
 | 
			
		||||
-
 | 
			
		||||
-		drm_mode_debug_printmodeline(panel_mode);
 | 
			
		||||
-
 | 
			
		||||
-		intel_fixed_panel_mode(panel_mode, adjusted_mode);
 | 
			
		||||
+		intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
 | 
			
		||||
+				       adjusted_mode);
 | 
			
		||||
 
 | 
			
		||||
 		if (INTEL_GEN(dev_priv) >= 9) {
 | 
			
		||||
 			int ret;
 | 
			
		||||
@@ -5821,7 +5796,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
 | 
			
		||||
 	struct drm_i915_private *dev_priv = to_i915(dev);
 | 
			
		||||
 	struct drm_connector *connector = &intel_connector->base;
 | 
			
		||||
 	struct drm_display_mode *fixed_mode = NULL;
 | 
			
		||||
-	struct drm_display_mode *alt_fixed_mode = NULL;
 | 
			
		||||
 	struct drm_display_mode *downclock_mode = NULL;
 | 
			
		||||
 	bool has_dpcd;
 | 
			
		||||
 	struct drm_display_mode *scan;
 | 
			
		||||
@@ -5876,14 +5850,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
 | 
			
		||||
 	}
 | 
			
		||||
 	intel_connector->edid = edid;
 | 
			
		||||
 
 | 
			
		||||
-	/* prefer fixed mode from EDID if available, save an alt mode also */
 | 
			
		||||
+	/* prefer fixed mode from EDID if available */
 | 
			
		||||
 	list_for_each_entry(scan, &connector->probed_modes, head) {
 | 
			
		||||
 		if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
 | 
			
		||||
 			fixed_mode = drm_mode_duplicate(dev, scan);
 | 
			
		||||
 			downclock_mode = intel_dp_drrs_init(
 | 
			
		||||
 						intel_connector, fixed_mode);
 | 
			
		||||
-		} else if (!alt_fixed_mode) {
 | 
			
		||||
-			alt_fixed_mode = drm_mode_duplicate(dev, scan);
 | 
			
		||||
+			break;
 | 
			
		||||
 		}
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
@@ -5920,8 +5893,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
 | 
			
		||||
 			      pipe_name(pipe));
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
-	intel_panel_init(&intel_connector->panel, fixed_mode, alt_fixed_mode,
 | 
			
		||||
-			 downclock_mode);
 | 
			
		||||
+	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
 | 
			
		||||
 	intel_connector->panel.backlight.power = intel_edp_backlight_power;
 | 
			
		||||
 	intel_panel_setup_backlight(connector, pipe);
 | 
			
		||||
 
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
 | 
			
		||||
index 30f791f89d64..9b75b82a2956 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_drv.h
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_drv.h
 | 
			
		||||
@@ -264,7 +264,6 @@ struct intel_encoder {
 | 
			
		||||
 
 | 
			
		||||
 struct intel_panel {
 | 
			
		||||
 	struct drm_display_mode *fixed_mode;
 | 
			
		||||
-	struct drm_display_mode *alt_fixed_mode;
 | 
			
		||||
 	struct drm_display_mode *downclock_mode;
 | 
			
		||||
 
 | 
			
		||||
 	/* backlight */
 | 
			
		||||
@@ -1720,7 +1719,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv);
 | 
			
		||||
 /* intel_panel.c */
 | 
			
		||||
 int intel_panel_init(struct intel_panel *panel,
 | 
			
		||||
 		     struct drm_display_mode *fixed_mode,
 | 
			
		||||
-		     struct drm_display_mode *alt_fixed_mode,
 | 
			
		||||
 		     struct drm_display_mode *downclock_mode);
 | 
			
		||||
 void intel_panel_fini(struct intel_panel *panel);
 | 
			
		||||
 void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
 | 
			
		||||
index f67d321376e4..551bf1c14093 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_dsi.c
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_dsi.c
 | 
			
		||||
@@ -1851,7 +1851,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv)
 | 
			
		||||
 	connector->display_info.width_mm = fixed_mode->width_mm;
 | 
			
		||||
 	connector->display_info.height_mm = fixed_mode->height_mm;
 | 
			
		||||
 
 | 
			
		||||
-	intel_panel_init(&intel_connector->panel, fixed_mode, NULL, NULL);
 | 
			
		||||
+	intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
 | 
			
		||||
 	intel_panel_setup_backlight(connector, INVALID_PIPE);
 | 
			
		||||
 
 | 
			
		||||
 	intel_dsi_add_properties(intel_connector);
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
 | 
			
		||||
index 754baa00bea9..05bd65e37cb5 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_dvo.c
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_dvo.c
 | 
			
		||||
@@ -537,7 +537,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
 | 
			
		||||
 			 */
 | 
			
		||||
 			intel_panel_init(&intel_connector->panel,
 | 
			
		||||
 					 intel_dvo_get_current_mode(intel_encoder),
 | 
			
		||||
-					 NULL, NULL);
 | 
			
		||||
+					 NULL);
 | 
			
		||||
 			intel_dvo->panel_wants_dither = true;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
 | 
			
		||||
index 7ed6f7b69556..ab5a63f007eb 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_lvds.c
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_lvds.c
 | 
			
		||||
@@ -1128,8 +1128,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
 | 
			
		||||
 out:
 | 
			
		||||
 	mutex_unlock(&dev->mode_config.mutex);
 | 
			
		||||
 
 | 
			
		||||
-	intel_panel_init(&intel_connector->panel, fixed_mode, NULL,
 | 
			
		||||
-			 downclock_mode);
 | 
			
		||||
+	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
 | 
			
		||||
 	intel_panel_setup_backlight(connector, INVALID_PIPE);
 | 
			
		||||
 
 | 
			
		||||
 	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
 | 
			
		||||
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
 | 
			
		||||
index fa6831f8c004..c0ac6d6bf8ef 100644
 | 
			
		||||
--- a/drivers/gpu/drm/i915/intel_panel.c
 | 
			
		||||
+++ b/drivers/gpu/drm/i915/intel_panel.c
 | 
			
		||||
@@ -1924,30 +1924,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
 | 
			
		||||
 
 | 
			
		||||
 int intel_panel_init(struct intel_panel *panel,
 | 
			
		||||
 		     struct drm_display_mode *fixed_mode,
 | 
			
		||||
-		     struct drm_display_mode *alt_fixed_mode,
 | 
			
		||||
 		     struct drm_display_mode *downclock_mode)
 | 
			
		||||
 {
 | 
			
		||||
 	intel_panel_init_backlight_funcs(panel);
 | 
			
		||||
 
 | 
			
		||||
 	panel->fixed_mode = fixed_mode;
 | 
			
		||||
-	panel->alt_fixed_mode = alt_fixed_mode;
 | 
			
		||||
 	panel->downclock_mode = downclock_mode;
 | 
			
		||||
 
 | 
			
		||||
 	return 0;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
 void intel_panel_fini(struct intel_panel *panel)
 | 
			
		||||
 {
 | 
			
		||||
 	struct intel_connector *intel_connector =
 | 
			
		||||
 		container_of(panel, struct intel_connector, panel);
 | 
			
		||||
 
 | 
			
		||||
 	if (panel->fixed_mode)
 | 
			
		||||
 		drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode);
 | 
			
		||||
 
 | 
			
		||||
-	if (panel->alt_fixed_mode)
 | 
			
		||||
-		drm_mode_destroy(intel_connector->base.dev,
 | 
			
		||||
-				panel->alt_fixed_mode);
 | 
			
		||||
-
 | 
			
		||||
 	if (panel->downclock_mode)
 | 
			
		||||
 		drm_mode_destroy(intel_connector->base.dev,
 | 
			
		||||
 				panel->downclock_mode);
 | 
			
		||||
-- 
 | 
			
		||||
2.17.0
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										57
									
								
								PCI-Add-Intel-7th-8th-Gen-mobile-to-ACS-quirks.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								PCI-Add-Intel-7th-8th-Gen-mobile-to-ACS-quirks.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,57 @@
 | 
			
		||||
From patchwork Wed Apr 25 20:27:37 2018
 | 
			
		||||
Content-Type: text/plain; charset="utf-8"
 | 
			
		||||
MIME-Version: 1.0
 | 
			
		||||
Content-Transfer-Encoding: 8bit
 | 
			
		||||
Subject: PCI: Add Intel 7th & 8th Gen mobile to ACS quirks
 | 
			
		||||
From: Alex Williamson <alex.williamson@redhat.com>
 | 
			
		||||
X-Patchwork-Id: 10364243
 | 
			
		||||
Message-Id: <152468799766.12449.11245066753252100117.stgit@w520.home>
 | 
			
		||||
To: bhelgaas@google.com
 | 
			
		||||
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
 | 
			
		||||
Date: Wed, 25 Apr 2018 14:27:37 -0600
 | 
			
		||||
 | 
			
		||||
The specification update indicates these have the same errate for
 | 
			
		||||
implementing non-standard ACS capabilities.
 | 
			
		||||
 | 
			
		||||
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
 | 
			
		||||
---
 | 
			
		||||
 drivers/pci/quirks.c |   14 ++++++++++++++
 | 
			
		||||
 1 file changed, 14 insertions(+)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 | 
			
		||||
index 2990ad1e7c99..6d0dee40dbe5 100644
 | 
			
		||||
--- a/drivers/pci/quirks.c
 | 
			
		||||
+++ b/drivers/pci/quirks.c
 | 
			
		||||
@@ -4230,11 +4230,24 @@ static int pci_quirk_qcom_rp_acs(struct pci_dev *dev, u16 acs_flags)
 | 
			
		||||
  * 0xa290-0xa29f PCI Express Root port #{0-16}
 | 
			
		||||
  * 0xa2e7-0xa2ee PCI Express Root port #{17-24}
 | 
			
		||||
  *
 | 
			
		||||
+ * Mobile chipsets are also affected, 7th & 8th Generation
 | 
			
		||||
+ * Specification update confirms ACS errata 22, status no fix: (7th Generation
 | 
			
		||||
+ * Intel Processor Family I/O for U/Y Platforms and 8th Generation Intel
 | 
			
		||||
+ * Processor Family I/O for U Quad Core Platforms Specification Update,
 | 
			
		||||
+ * August 2017, Revision 002, Document#: 334660-002)[6]
 | 
			
		||||
+ * Device IDs from I/O datasheet: (7th Generation Intel Processor Family I/O
 | 
			
		||||
+ * for U/Y Platforms and 8th Generation Intel ® Processor Family I/O for U
 | 
			
		||||
+ * Quad Core Platforms, Vol 1 of 2, August 2017, Document#: 334658-003)[7]
 | 
			
		||||
+ *
 | 
			
		||||
+ * 0x9d10-0x9d1b PCI Express Root port #{1-12}
 | 
			
		||||
+ *
 | 
			
		||||
  * [1] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-2.html
 | 
			
		||||
  * [2] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-1.html
 | 
			
		||||
  * [3] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-spec-update.html
 | 
			
		||||
  * [4] http://www.intel.com/content/www/us/en/chipsets/200-series-chipset-pch-spec-update.html
 | 
			
		||||
  * [5] http://www.intel.com/content/www/us/en/chipsets/200-series-chipset-pch-datasheet-vol-1.html
 | 
			
		||||
+ * [6] https://www.intel.com/content/www/us/en/processors/core/7th-gen-core-family-mobile-u-y-processor-lines-i-o-spec-update.html
 | 
			
		||||
+ * [7] https://www.intel.com/content/www/us/en/processors/core/7th-gen-core-family-mobile-u-y-processor-lines-i-o-datasheet-vol-1.html
 | 
			
		||||
  */
 | 
			
		||||
 static bool pci_quirk_intel_spt_pch_acs_match(struct pci_dev *dev)
 | 
			
		||||
 {
 | 
			
		||||
@@ -4244,6 +4257,7 @@ static bool pci_quirk_intel_spt_pch_acs_match(struct pci_dev *dev)
 | 
			
		||||
 	switch (dev->device) {
 | 
			
		||||
 	case 0xa110 ... 0xa11f: case 0xa167 ... 0xa16a: /* Sunrise Point */
 | 
			
		||||
 	case 0xa290 ... 0xa29f: case 0xa2e7 ... 0xa2ee: /* Union Point */
 | 
			
		||||
+	case 0x9d10 ... 0x9d1b: /* 7th & 8th Gen Mobile */
 | 
			
		||||
 		return true;
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										24
									
								
								PKGBUILD
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								PKGBUILD
									
									
									
									
									
								
							@@ -3,7 +3,7 @@
 | 
			
		||||
 | 
			
		||||
pkgbase=linux-vfio
 | 
			
		||||
_srcname=linux-4.16
 | 
			
		||||
pkgver=4.16.10
 | 
			
		||||
pkgver=4.16.13
 | 
			
		||||
pkgrel=1
 | 
			
		||||
arch=('x86_64')
 | 
			
		||||
url="https://www.kernel.org/"
 | 
			
		||||
@@ -18,10 +18,12 @@ source=(
 | 
			
		||||
  90-linux.hook  # pacman hook for initramfs regeneration
 | 
			
		||||
  linux.preset   # standard config files for mkinitcpio ramdisk
 | 
			
		||||
  0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 | 
			
		||||
  0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
 | 
			
		||||
  0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
 | 
			
		||||
  0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
 | 
			
		||||
  # patches for pci passthrough
 | 
			
		||||
  add-acs-overrides.patch
 | 
			
		||||
  i915-vga-arbiter.patch
 | 
			
		||||
  PCI-Add-Intel-7th-8th-Gen-mobile-to-ACS-quirks.patch
 | 
			
		||||
)
 | 
			
		||||
validpgpkeys=(
 | 
			
		||||
  'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
 | 
			
		||||
@@ -29,16 +31,18 @@ validpgpkeys=(
 | 
			
		||||
)
 | 
			
		||||
sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
 | 
			
		||||
            'SKIP'
 | 
			
		||||
            '9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6'
 | 
			
		||||
            '9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323'
 | 
			
		||||
            'SKIP'
 | 
			
		||||
            '8566a49997faf3f8678440c52578a7a0ee901e598d3b67d3bee3799fb92e8f86'
 | 
			
		||||
            'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
 | 
			
		||||
            '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
 | 
			
		||||
            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
 | 
			
		||||
            '7fb607fe384dd814e9e45d7fc28f7b5b23a51d80784c54bf9209486ad428be14'
 | 
			
		||||
            'ceaa19e0af3842c62eb666a4ac5c79d89b3e6d00593442f18d6508ca6d74bbaa'
 | 
			
		||||
            '8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd'
 | 
			
		||||
            '2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446'
 | 
			
		||||
            '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e'
 | 
			
		||||
            'abe269c6596b54a412bd8415472153f419026d4f367fa3ee1ebc8693ac66915d'
 | 
			
		||||
            'fe3d47fe6f54d4a82c869fd29484d3f097b5906ef4d456409961a8dd647daad0')
 | 
			
		||||
            'fe3d47fe6f54d4a82c869fd29484d3f097b5906ef4d456409961a8dd647daad0'
 | 
			
		||||
            '429ed1161b9b178df97e53dc6439f770e5198b5544f7421d0e48a3dd77fe371f')
 | 
			
		||||
 | 
			
		||||
_kernelname=${pkgbase#linux}
 | 
			
		||||
: ${_kernelname:=-ARCH}
 | 
			
		||||
@@ -55,8 +59,11 @@ prepare() {
 | 
			
		||||
  # disable USER_NS for non-root users by default
 | 
			
		||||
  patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 | 
			
		||||
 | 
			
		||||
  # https://bugs.archlinux.org/task/56780
 | 
			
		||||
  patch -Np1 -i ../0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
 | 
			
		||||
 | 
			
		||||
  # https://bugs.archlinux.org/task/56711
 | 
			
		||||
  patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
 | 
			
		||||
  patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
 | 
			
		||||
 | 
			
		||||
  # patches for vga arbiter fix in intel systems
 | 
			
		||||
  patch -p1 -i "${srcdir}/i915-vga-arbiter.patch"
 | 
			
		||||
@@ -64,6 +71,9 @@ prepare() {
 | 
			
		||||
  # Overrides for missing acs capabilities
 | 
			
		||||
  patch -p1 -i "${srcdir}/add-acs-overrides.patch"
 | 
			
		||||
 | 
			
		||||
  # patches for specific intel cpus
 | 
			
		||||
  patch -p1 -i "${srcdir}/PCI-Add-Intel-7th-8th-Gen-mobile-to-ACS-quirks.patch"
 | 
			
		||||
 | 
			
		||||
  cat ../config - >.config <<END
 | 
			
		||||
CONFIG_LOCALVERSION="${_kernelname}"
 | 
			
		||||
CONFIG_LOCALVERSION_AUTO=n
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user