From 178dc2fc37db1b649b1477ad30bad8bfb14e6566 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 3 Jun 2018 22:12:05 -0400 Subject: upgpkg: 4.16.13_gnu-1 Signed-off-by: David P --- ...watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch | 117 ++++++++++ kernels/linux-libre-xtreme/PKGBUILD | 22 +- ...i915-edp-Allow-alternate-fixed-mode-for-e.patch | 242 +++++++++++++++++++++ ...the-alternate-fixed-mode-if-its-asked-for.patch | 39 ---- ...lly-revert-swiotlb-remove-various-exports.patch | 26 --- 5 files changed, 370 insertions(+), 76 deletions(-) create mode 100644 kernels/linux-libre-xtreme/ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch create mode 100644 kernels/linux-libre-xtreme/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch delete mode 100644 kernels/linux-libre-xtreme/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch delete mode 100644 kernels/linux-libre-xtreme/partially-revert-swiotlb-remove-various-exports.patch (limited to 'kernels/linux-libre-xtreme') diff --git a/kernels/linux-libre-xtreme/ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch b/kernels/linux-libre-xtreme/ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch new file mode 100644 index 000000000..1855da178 --- /dev/null +++ b/kernels/linux-libre-xtreme/ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch @@ -0,0 +1,117 @@ +From a0a37862a4e1844793d39aca9ccb8fecbdcb8659 Mon Sep 17 00:00:00 2001 +From: Mika Westerberg +Date: Mon, 23 Apr 2018 14:16:03 +0300 +Subject: [PATCH] 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 +Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033 +Signed-off-by: Mika Westerberg +Signed-off-by: Rafael J. Wysocki +--- + 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,23 +12,64 @@ + #define pr_fmt(fmt) "ACPI: watchdog: " fmt + + #include ++#include + #include + #include + + #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); + +@@ -41,12 +82,10 @@ void __init acpi_watchdog_init(void) + 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 + diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD index fe9ec2ca0..f57e1ef4b 100644 --- a/kernels/linux-libre-xtreme/PKGBUILD +++ b/kernels/linux-libre-xtreme/PKGBUILD @@ -11,7 +11,7 @@ pkgbase=linux-libre-xtreme _pkgbasever=4.16-gnu -_pkgver=4.16.11-gnu +_pkgver=4.16.13-gnu _hardenedver=a _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -61,8 +61,8 @@ source=( 'change-console-loglevel-motormouth.patch' '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' - 'drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch' - 'partially-revert-swiotlb-remove-various-exports.patch' + 'ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch' + 'Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch' ) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -72,9 +72,9 @@ validpgpkeys=( ) sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7610e7d4ae8a2230fa7483466636465ed9744444464a078de37b41c3db23e0' 'SKIP' - 'dd86ad8882c1e56c95e3340ccece7f0c80aa1644e3f4c3868b8e3f6db415871930f5783a9c1d0bb4bd2caa8daedbef0e16475e9f997b21fefe2b30e784ff236c' + 'd2b42f1b77c998750fea4bf705f13699379baf9321224b78f7ef6f61aa0bcfcb2d09ca927506f4d7cda3bc1061e3e2524f64c86b12b51f2b99925b90176ff821' 'SKIP' - 'c192d9819e7192ca48dc3cd4b40c43e91d6f92df87d0103b6ae8cc078d1de019f2e88cff99cb95cb1d70366e0b39a97cc7d8a565723301f19ed32dfb0babfe5b' + 'ceb324dfab3325fdc21b295eec22738c13499cf11c57209befcf6c1b359e3ebe4435ba9f7c1cc9ddfe2c19313331f019453c0152ca7542425c72e9bb7636c172' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -106,8 +106,8 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7 '0a1a18aa8a6cbf1bab406d356786d2c35fe52608c25bef8beefe440b8a015ba59375106f8b04051ae2225e158420875a82ee07d5b88a2f2087afeb102e8966c0' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '46f470d6f4df2b697db656e262d20c198e623da7332da5e35299834480a6f1ef9d3567b4827a4f3a3bd83ef4c3082d95045a437fea1f22f83a76e07bed508e2d' - '4905635c0d94dedcc098a902b731cbfb63b2cbcdf35404a769cb71f257aead0977a526887e8d55badf9fd029ed2d125c9b8c38b0980bda028a667be0ebc0821b') + '45d4cccb808811d468b33b02d9857b30125962402675e169af58fd1f93bdfaff1b32e4507424c3570f34bd2a44f1e3ec022211f2305ef7c55d5fc3b0cdc32dff' + 'cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd') _kernelname=${pkgbase#linux-libre} _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") @@ -157,11 +157,11 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # https://bugs.archlinux.org/task/56711 - patch -Np1 -i ../drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch + # https://bugs.archlinux.org/task/56780 + patch -Np1 -i ../ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - # NVIDIA driver compat - patch -Np1 -i ../partially-revert-swiotlb-remove-various-exports.patch + # https://bugs.archlinux.org/task/56711 + patch -Np1 -i ../Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug diff --git a/kernels/linux-libre-xtreme/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/kernels/linux-libre-xtreme/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch new file mode 100644 index 000000000..78f97b2dd --- /dev/null +++ b/kernels/linux-libre-xtreme/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -0,0 +1,242 @@ +From b7438d9dd645801027ab11470850033da0521338 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: +From: Jani Nikula +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 +Reported-by: Mark Spencer +Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.") +Cc: Clint Taylor +Cc: David Weinehall +Cc: Rodrigo Vivi +Cc: Paulo Zanoni +Cc: Jani Nikula +Cc: Chris Wilson +Cc: Jim Bride +Cc: Jani Nikula +Cc: Joonas Lahtinen +Cc: intel-gfx@lists.freedesktop.org +Cc: # v4.14+ +Signed-off-by: Jani Nikula +Reviewed-by: Dhinakaran Pandiyan +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 + diff --git a/kernels/linux-libre-xtreme/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch b/kernels/linux-libre-xtreme/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch deleted file mode 100644 index 64212063a..000000000 --- a/kernels/linux-libre-xtreme/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e9b8250407ae73faa7ac543f7f260b4b2f34ebd8 Mon Sep 17 00:00:00 2001 -From: Jim Bride -Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH] 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 -Cc: Rodrigo Vivi -Signed-off-by: Jim Bride ---- - 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 d27c014..8164c59 100644 ---- a/drivers/gpu/drm/i915/intel_dp.c -+++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1621,7 +1621,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.7.4 - diff --git a/kernels/linux-libre-xtreme/partially-revert-swiotlb-remove-various-exports.patch b/kernels/linux-libre-xtreme/partially-revert-swiotlb-remove-various-exports.patch deleted file mode 100644 index 3a0913527..000000000 --- a/kernels/linux-libre-xtreme/partially-revert-swiotlb-remove-various-exports.patch +++ /dev/null @@ -1,26 +0,0 @@ -From be536681bd2439bf8e95df124fa282cf4a2e7846 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Fri, 6 Apr 2018 16:19:38 +0200 -Subject: [PATCH 3/5] Partially revert "swiotlb: remove various exports" - -This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec. -The proprietary NVIDIA driver needs one of the exports. ---- - lib/swiotlb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/swiotlb.c b/lib/swiotlb.c -index 44f7eb408fdb..0bb1bb65ad6b 100644 ---- a/lib/swiotlb.c -+++ b/lib/swiotlb.c -@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, - } - return nelems; - } -+EXPORT_SYMBOL(swiotlb_map_sg_attrs); - - /* - * Unmap a set of streaming mode DMA translations. Again, cpu read rules --- -2.17.0 - -- cgit v1.2.2