summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2019-07-10 14:44:08 +0000
committerJeremy Cline <jcline@redhat.com>2019-07-10 14:44:08 +0000
commit92bbdfd7c505b44e0cdac22618b464ae1e1aab89 (patch)
tree9f675e71b2b3f81c9ee0a5e454a92bdce1818d31
parent9a5cabeff7054c386de7f794df5b71dadd2b35a4 (diff)
downloadkernel-92bbdfd7c505b44e0cdac22618b464ae1e1aab89.tar.gz
kernel-92bbdfd7c505b44e0cdac22618b464ae1e1aab89.tar.xz
kernel-92bbdfd7c505b44e0cdac22618b464ae1e1aab89.zip
Linux v5.1.17
-rw-r--r--0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch161
-rw-r--r--drm-panel-orientation-quirks.patch113
-rw-r--r--kernel.spec8
-rw-r--r--sources2
4 files changed, 5 insertions, 279 deletions
diff --git a/0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch b/0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
deleted file mode 100644
index 84e529c1d..000000000
--- a/0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Delivered-To: hdegoede@gapps.redhat.com
-Received: by 2002:ac9:6402:0:0:0:0:0 with SMTP id r2csp1159009ock;
- Mon, 20 May 2019 23:28:40 -0700 (PDT)
-X-Google-Smtp-Source: APXvYqzEtwqq6Q1hbrBqTEFvHJuczfsldfTxiiS018/hst2dmGipO/i52QcWyXJaIxAb/ecz61yL
-X-Received: by 2002:a05:620a:1116:: with SMTP id o22mr60937067qkk.23.1558420120852;
- Mon, 20 May 2019 23:28:40 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1558420120; cv=none;
- d=google.com; s=arc-20160816;
- b=j/NtlSCAGn5q9DlinYEqsw+9oDJu7zz7hZdeHecj2hwygNbfIbK6CHEBtQws9lpBM2
- 2X/7zdY451jiHHtP8cXvYsVRkvlIyOgd7jagu+kIOpgVY+IoiEW0UzuWY/dUMwQTK6D+
- CD9FmPs0hMdTVx8++AHS3N+SNujtJcFpRngUYfPJ0YOmbQJGt4nKRKaW0kkZD1pBsK91
- +YhTSQqz4e2xZ02r0LbfWgYWyE1ppjjz53nTq6ezyvKhQ84JViMf5kFMoGUDKoLRVH5U
- sH5xsZCzzGptH0dA6oJJzk8rjDc+puOwJWIW8D5fsCz93a0rRi/ia5rfsN54P/MpPMgQ
- DsHg==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
- h=content-transfer-encoding:mime-version:message-id:date:subject:cc
- :to:from:delivered-to;
- bh=KdOwY7jBol7uA/PFFDO66V1bihnYwiif3YrjkSKRUiA=;
- b=gSM2abji2zLjywkvGpQ72oLfbsLhc8/waOBxP9JVMgMzkd6YXKAMdqeDG78UgEUkZX
- RS//NNHSAIA+CDPrZHd9IBuV/GA887Hoezn4lryvCIYVNjoWOcBuFlG5/ix32GqMUNs5
- gQDcToEn7rWl2LJpuhgMDLfvCcV8B77lRJThslE6zeeLR/M4lTklAl2epcopBQmZqXqS
- QaIJg7rndM61R469mrv9TLpaBxun3CAA8OQ+W0+j059ZoiGUMIJ4ZsuMCpvTHp4gQ5fe
- EmXXpAFxUE8a70UmSgRqIDbaqC6ik9ox9yCLhu1Aby5fvHeBW78nA83obbfix90uBmak
- QVag==
-ARC-Authentication-Results: i=1; mx.google.com;
- spf=pass (google.com: domain gapps.redhat.com configured 209.132.183.28 as internal address) smtp.mailfrom=hdegoede@redhat.com
-Return-Path: <hdegoede@redhat.com>
-Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28])
- by mx.google.com with ESMTPS id a51si948515qta.226.2019.05.20.23.28.40
- for <hdegoede@gapps.redhat.com>
- (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
- Mon, 20 May 2019 23:28:40 -0700 (PDT)
-Received-SPF: pass (google.com: domain gapps.redhat.com configured 209.132.183.28 as internal address)
-Authentication-Results: mx.google.com;
- spf=pass (google.com: domain gapps.redhat.com configured 209.132.183.28 as internal address) smtp.mailfrom=hdegoede@redhat.com
-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by mx1.redhat.com (Postfix) with ESMTPS id 1EB1285539
- for <hdegoede@gapps.redhat.com>; Tue, 21 May 2019 06:28:40 +0000 (UTC)
-Received: by smtp.corp.redhat.com (Postfix)
- id 18D0E19C67; Tue, 21 May 2019 06:28:40 +0000 (UTC)
-Delivered-To: hdegoede@redhat.com
-Received: from shalem.localdomain.com (ovpn-116-215.ams2.redhat.com [10.36.116.215])
- by smtp.corp.redhat.com (Postfix) with ESMTP id 8119F19C5B;
- Tue, 21 May 2019 06:28:38 +0000 (UTC)
-From: Hans de Goede <hdegoede@redhat.com>
-To: Darren Hart <dvhart@infradead.org>,
- Andy Shevchenko <andy@infradead.org>,
- Corentin Chary <corentin.chary@gmail.com>
-Cc: Hans de Goede <hdegoede@redhat.com>,
- acpi4asus-user@lists.sourceforge.net,
- platform-driver-x86@vger.kernel.org,
- linux-kernel@vger.kernel.org,
- =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com>
-Subject: [PATCH] platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
-Date: Tue, 21 May 2019 08:28:37 +0200
-Message-Id: <20190521062837.3887-1-hdegoede@redhat.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
-X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 21 May 2019 06:28:40 +0000 (UTC)
-
-Commit 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will
-handle the display off hotkey") causes the backlight to be permanently off
-on various EeePC laptop models using the eeepc-wmi driver (Asus EeePC
-1015BX, Asus EeePC 1025C).
-
-The asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL) call added
-by that commit is made conditional in this commit and only enabled in
-the quirk_entry structs in the asus-nb-wmi driver fixing the broken
-display / backlight on various EeePC laptop models.
-
-Cc: João Paulo Rechi Vita <jprvita@endlessm.com>
-Fixes: 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey")
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/asus-nb-wmi.c | 8 ++++++++
- drivers/platform/x86/asus-wmi.c | 2 +-
- drivers/platform/x86/asus-wmi.h | 1 +
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
-index b6f2ff95c3ed..59f3a37a44d7 100644
---- a/drivers/platform/x86/asus-nb-wmi.c
-+++ b/drivers/platform/x86/asus-nb-wmi.c
-@@ -78,10 +78,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,
-
- static struct quirk_entry quirk_asus_unknown = {
- .wapf = 0,
-+ .wmi_backlight_set_devstate = true,
- };
-
- static struct quirk_entry quirk_asus_q500a = {
- .i8042_filter = asus_q500a_i8042_filter,
-+ .wmi_backlight_set_devstate = true,
- };
-
- /*
-@@ -92,26 +94,32 @@ static struct quirk_entry quirk_asus_q500a = {
- static struct quirk_entry quirk_asus_x55u = {
- .wapf = 4,
- .wmi_backlight_power = true,
-+ .wmi_backlight_set_devstate = true,
- .no_display_toggle = true,
- };
-
- static struct quirk_entry quirk_asus_wapf4 = {
- .wapf = 4,
-+ .wmi_backlight_set_devstate = true,
- };
-
- static struct quirk_entry quirk_asus_x200ca = {
- .wapf = 2,
-+ .wmi_backlight_set_devstate = true,
- };
-
- static struct quirk_entry quirk_asus_ux303ub = {
- .wmi_backlight_native = true,
-+ .wmi_backlight_set_devstate = true,
- };
-
- static struct quirk_entry quirk_asus_x550lb = {
-+ .wmi_backlight_set_devstate = true,
- .xusb2pr = 0x01D9,
- };
-
- static struct quirk_entry quirk_asus_forceals = {
-+ .wmi_backlight_set_devstate = true,
- .wmi_force_als_set = true,
- };
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index ee1fa93708ec..a66e99500c12 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -2131,7 +2131,7 @@ static int asus_wmi_add(struct platform_device *pdev)
- err = asus_wmi_backlight_init(asus);
- if (err && err != -ENODEV)
- goto fail_backlight;
-- } else
-+ } else if (asus->driver->quirks->wmi_backlight_set_devstate)
- err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL);
-
- status = wmi_install_notify_handler(asus->driver->event_guid,
-diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
-index 6c1311f4b04d..57a79bddb286 100644
---- a/drivers/platform/x86/asus-wmi.h
-+++ b/drivers/platform/x86/asus-wmi.h
-@@ -44,6 +44,7 @@ struct quirk_entry {
- bool store_backlight_power;
- bool wmi_backlight_power;
- bool wmi_backlight_native;
-+ bool wmi_backlight_set_devstate;
- bool wmi_force_als_set;
- int wapf;
- /*
---
-2.21.0
-
diff --git a/drm-panel-orientation-quirks.patch b/drm-panel-orientation-quirks.patch
index 38bd8fca9..d5e3bf361 100644
--- a/drm-panel-orientation-quirks.patch
+++ b/drm-panel-orientation-quirks.patch
@@ -1,116 +1,3 @@
-From 0dfd69f0ef79517b722c36000b20c64a6263519d Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 21 May 2019 17:02:15 +0200
-Subject: [PATCH 1/2] drm: panel-orientation-quirks: Add quirk for GPD pocket2
-
-GPD has done it again, make a nice device (good), use way too generic
-DMI strings (bad) and use a portrait screen rotated 90 degrees (ugly).
-
-Because of the too generic DMI strings this entry is also doing bios-date
-matching, so the gpd_pocket2 data struct may very well need to be updated
-with some extra bios-dates in the future.
-
-Changes in v2:
--Add one more known BIOS date to the list of BIOS dates
-
-Cc: Jurgen Kramer <gtmkramer@xs4all.nl>
-Reported-by: Jurgen Kramer <gtmkramer@xs4all.nl>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c
-index 521aff99b08a..98679c831f66 100644
---- a/drivers/gpu/drm/drm_panel_orientation_quirks.c
-+++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c
-@@ -50,6 +50,14 @@ static const struct drm_dmi_panel_orientation_data gpd_pocket = {
- .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
- };
-
-+static const struct drm_dmi_panel_orientation_data gpd_pocket2 = {
-+ .width = 1200,
-+ .height = 1920,
-+ .bios_dates = (const char * const []){ "06/28/2018", "08/28/2018",
-+ "12/07/2018", NULL },
-+ .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
-+};
-+
- static const struct drm_dmi_panel_orientation_data gpd_win = {
- .width = 720,
- .height = 1280,
-@@ -112,6 +120,14 @@ static const struct dmi_system_id orientation_data[] = {
- DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),
- },
- .driver_data = (void *)&gpd_pocket,
-+ }, { /* GPD Pocket 2 (generic strings, also match on bios date) */
-+ .matches = {
-+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),
-+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),
-+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),
-+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),
-+ },
-+ .driver_data = (void *)&gpd_pocket2,
- }, { /* GPD Win (same note on DMI match as GPD Pocket) */
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
---
-2.21.0
-
-From de2393a0d476c441c7afb4e5df1c31e53aef2cbc Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 23 May 2019 12:09:29 +0200
-Subject: [PATCH 2/2] drm: panel-orientation-quirks: Add quirk for GPD MicroPC
-
-GPD has done it again, make a nice device (good), use way too generic
-DMI strings (bad) and use a portrait screen rotated 90 degrees (ugly).
-
-Because of the too generic DMI strings this entry is also doing bios-date
-matching, so the gpd_micropc data struct may very well need to be updated
-with some extra bios-dates in the future.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c
-index 98679c831f66..d8a0bcd02f34 100644
---- a/drivers/gpu/drm/drm_panel_orientation_quirks.c
-+++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c
-@@ -42,6 +42,14 @@ static const struct drm_dmi_panel_orientation_data asus_t100ha = {
- .orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP,
- };
-
-+static const struct drm_dmi_panel_orientation_data gpd_micropc = {
-+ .width = 720,
-+ .height = 1280,
-+ .bios_dates = (const char * const []){ "04/26/2019",
-+ NULL },
-+ .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
-+};
-+
- static const struct drm_dmi_panel_orientation_data gpd_pocket = {
- .width = 1200,
- .height = 1920,
-@@ -107,6 +115,14 @@ static const struct dmi_system_id orientation_data[] = {
- DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100HAN"),
- },
- .driver_data = (void *)&asus_t100ha,
-+ }, { /* GPD MicroPC (generic strings, also match on bios date) */
-+ .matches = {
-+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),
-+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),
-+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),
-+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),
-+ },
-+ .driver_data = (void *)&gpd_micropc,
- }, { /*
- * GPD Pocket, note that the the DMI data is less generic then
- * it seems, devices with a board-vendor of "AMI Corporation"
---
-2.21.0
-
From aab65520447cb19e3be4a301b796dfb588e85873 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 2 Jun 2019 15:20:33 +0200
diff --git a/kernel.spec b/kernel.spec
index 3c9074664..8a2ce02a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 16
+%define stable_update 17
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -624,9 +624,6 @@ Patch538: powerpc-fix-a-missing-check-in-dlpar_parse_cc_property.patch
# CVE-2019-10126 rhbz 1716992 1720122
Patch541: mwifiex-Fix-heap-overflow-in-mwifiex_uap_parse_tail_ies.patch
-# 1697069 LCD panel an Asus EeePC 1025C not lighting up, submitted upstream
-Patch542: 0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
-
# Fix the LCD panel on the GPD MicroPC not working, pending as fixes for 5.2
Patch544: drm-panel-orientation-quirks.patch
Patch545: efi-bgrt-acpi6.2-support.patch
@@ -1876,6 +1873,9 @@ fi
#
#
%changelog
+* Wed Jul 10 2019 Jeremy Cline <jcline@redhat.com> - 5.1.17-300
+- Linux v5.1.17
+
* Mon Jul 08 2019 Jeremy Cline <jcline@redhat.com>
- Fix a firmware crash in Intel 7000 and 8000 devices (rhbz 1716334)
diff --git a/sources b/sources
index 8b634147f..8169b5b95 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
-SHA512 (patch-5.1.16.xz) = 4e5a2946c4db9f5be24332eee217fddf8f0a8ce13935fad8936de02c97a0549185f931709b185cd289756011551f6876c14db751c522b0f6c4215b7d47b231be
+SHA512 (patch-5.1.17.xz) = df78bdd2e98731498ff45377dddbe8d4adf42e680ed9f0ea05b3fef43144114e4c7817c4e160d960fad666e5b7da6002a4687b1a15323908de8c6990a50215d9