diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 | ||||
| -rw-r--r-- | 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch | 125 | ||||
| -rw-r--r-- | 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 42 | ||||
| -rw-r--r-- | 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 242 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
6 files changed, 391 insertions, 59 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sat May 26 06:13:47 UTC 2018 +# Mon Jun 4 21:54:26 UTC 2018 pkgbase = linux-x205ta - pkgver = 4.16.11 + pkgver = 4.16.13 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -14,14 +14,15 @@ pkgbase = linux-x205ta 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.11.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.11.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 = https://raw.githubusercontent.com/harryharryharry/x205ta-iso2usb-files/master/brcmfmac43340-sdio.txt source = https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.16-patches/i915-pm-Be-less-agressive-with-clockfreq-changes-on-Bay-Trail.patch source = https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.16-patches/intel_idle-Disable-C6N-and-C6S-on-Bay-Trail.patch @@ -29,14 +30,15 @@ pkgbase = linux-x205ta source = https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.16-patches/brcmfmac-p2p-and-normal-ap-access-are-not-always-possible-at-the-same-time.patch sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = SKIP - sha256sums = d0d998f193c3feeab95f1378dea15aa6ba145f591661547cc00ef16d161651fe + sha256sums = 9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323 sha256sums = SKIP sha256sums = b4961bd274997ba09dc72fb1cd88df4df307fd851871c300250484e233cd1d5f sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = b01e9bd4e0f3cc2b91db1d8c043b2d85329bd0c9a9441a91d337c3c33661b658 - sha256sums = 09170daf49fe4cb720f331cd2da1c75771eb4f9f124353bf035218b1f8ca57d1 + sha256sums = 8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd + sha256sums = 2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446 + sha256sums = 8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e sha256sums = aea75c0b07673f701856e3c2a35db33c041fdaf0bd5ef2927fb25b1bce2c2b62 sha256sums = 5ad7e021452deffd387a5b81abcd0f608f8141eaab56fbdd162ca0b7966fc3b4 sha256sums = 3845aeb3744372b716c668283b23972d76e482d8c69b107e13a13669e5671d06 diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index f669b43a7b4a..3dd9a7d7039e 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From 05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8 Mon Sep 17 00:00:00 2001 -Message-Id: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.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/2] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> diff --git a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch new file mode 100644 index 000000000000..ecd2d721d1c1 --- /dev/null +++ b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch @@ -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 + diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch deleted file mode 100644 index 0fb23b73b2ab..000000000000 --- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b5f4a5ba26b365471531e328b237887bab4ab89b Mon Sep 17 00:00:00 2001 -Message-Id: <b5f4a5ba26b365471531e328b237887bab4ab89b.1527025123.git.jan.steffens@gmail.com> -In-Reply-To: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com> -References: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.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/2] 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 79521da5d11d..837cbaa55a2b 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 - diff --git a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch new file mode 100644 index 000000000000..78f97b2ddb3e --- /dev/null +++ b/0003-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: <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 + @@ -5,7 +5,7 @@ pkgbase=linux-x205ta _srcname=linux-4.16 -pkgver=4.16.11 +pkgver=4.16.13 pkgrel=1 arch=('x86_64') url="https://www.kernel.org/" @@ -20,7 +20,8 @@ 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 https://raw.githubusercontent.com/harryharryharry/x205ta-iso2usb-files/master/brcmfmac43340-sdio.txt https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.16-patches/i915-pm-Be-less-agressive-with-clockfreq-changes-on-Bay-Trail.patch @@ -43,14 +44,15 @@ validpgpkeys=( ) sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' - 'd0d998f193c3feeab95f1378dea15aa6ba145f591661547cc00ef16d161651fe' + '9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323' 'SKIP' 'b4961bd274997ba09dc72fb1cd88df4df307fd851871c300250484e233cd1d5f' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'b01e9bd4e0f3cc2b91db1d8c043b2d85329bd0c9a9441a91d337c3c33661b658' - '09170daf49fe4cb720f331cd2da1c75771eb4f9f124353bf035218b1f8ca57d1' + '8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd' + '2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446' + '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e' 'aea75c0b07673f701856e3c2a35db33c041fdaf0bd5ef2927fb25b1bce2c2b62' '5ad7e021452deffd387a5b81abcd0f608f8141eaab56fbdd162ca0b7966fc3b4' '3845aeb3744372b716c668283b23972d76e482d8c69b107e13a13669e5671d06' @@ -73,8 +75,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 # Here start x205ta patches # Refer to https://github.com/harryharryharry/x205ta-patches for harryharryharry's gathered patches |