From: Greg Kroah-Hartman Date: Sat, 11 Nov 2017 08:34:31 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v3.18.81~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=514c26e1284fafbf33ca82b4e023038105f0bea0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch input-elan_i2c-add-elan060c-to-the-acpi-table.patch mips-ar7-defer-registration-of-gpio.patch mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch --- diff --git a/queue-4.4/drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch b/queue-4.4/drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch new file mode 100644 index 00000000000..b9b8417c0a6 --- /dev/null +++ b/queue-4.4/drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch @@ -0,0 +1,38 @@ +From cef75036c40408ba3bc308bcb00a3d440da713fc Mon Sep 17 00:00:00 2001 +From: Sinclair Yeh +Date: Wed, 1 Nov 2017 10:47:05 -0700 +Subject: drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue + +From: Sinclair Yeh + +commit cef75036c40408ba3bc308bcb00a3d440da713fc upstream. + +This is an extension of Commit 7c20d213dd3c ("drm/vmwgfx: Work +around mode set failure in 2D VMs") + +With Wayland desktop and atomic mode set, during the mode setting +process there is a moment when two framebuffer sized surfaces +are being pinned. This was not an issue with Xorg. + +Since this only happens during a mode change, there should be no +performance impact by increasing allowable mem_size. + +Signed-off-by: Sinclair Yeh +Reviewed-by: Thomas Hellstrom +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +@@ -708,7 +708,7 @@ static int vmw_driver_load(struct drm_de + * allocation taken by fbdev + */ + if (!(dev_priv->capabilities & SVGA_CAP_3D)) +- mem_size *= 2; ++ mem_size *= 3; + + dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE; + dev_priv->prim_bb_mem = diff --git a/queue-4.4/input-elan_i2c-add-elan060c-to-the-acpi-table.patch b/queue-4.4/input-elan_i2c-add-elan060c-to-the-acpi-table.patch new file mode 100644 index 00000000000..0a71e27d420 --- /dev/null +++ b/queue-4.4/input-elan_i2c-add-elan060c-to-the-acpi-table.patch @@ -0,0 +1,31 @@ +From cdea6a30c2689cc33b34c6691b57cca277f0c5dc Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Tue, 7 Nov 2017 16:19:24 -0800 +Subject: Input: elan_i2c - add ELAN060C to the ACPI table + +From: Kai-Heng Feng + +commit cdea6a30c2689cc33b34c6691b57cca277f0c5dc upstream. + +ELAN060C touchpad uses elan_i2c as its driver. It can be +found on Lenovo ideapad 320-14AST. + +BugLink: https://bugs.launchpad.net/bugs/1727544 +Signed-off-by: Kai-Heng Feng +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/elan_i2c_core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/elan_i2c_core.c ++++ b/drivers/input/mouse/elan_i2c_core.c +@@ -1240,6 +1240,7 @@ static const struct acpi_device_id elan_ + { "ELAN0605", 0 }, + { "ELAN0609", 0 }, + { "ELAN060B", 0 }, ++ { "ELAN060C", 0 }, + { "ELAN0611", 0 }, + { "ELAN1000", 0 }, + { } diff --git a/queue-4.4/mips-ar7-defer-registration-of-gpio.patch b/queue-4.4/mips-ar7-defer-registration-of-gpio.patch new file mode 100644 index 00000000000..43450efdd27 --- /dev/null +++ b/queue-4.4/mips-ar7-defer-registration-of-gpio.patch @@ -0,0 +1,58 @@ +From e6b03ab63b4d270e0249f96536fde632409dc1dc Mon Sep 17 00:00:00 2001 +From: Jonas Gorski +Date: Sun, 29 Oct 2017 16:27:19 +0100 +Subject: MIPS: AR7: Defer registration of GPIO + +From: Jonas Gorski + +commit e6b03ab63b4d270e0249f96536fde632409dc1dc upstream. + +When called from prom init code, ar7_gpio_init() will fail as it will +call gpiochip_add() which relies on a working kmalloc() to alloc +the gpio_desc array and kmalloc is not useable yet at prom init time. + +Move ar7_gpio_init() to ar7_register_devices() (a device_initcall) +where kmalloc works. + +Fixes: 14e85c0e69d5 ("gpio: remove gpio_descs global array") +Signed-off-by: Jonas Gorski +Reviewed-by: Florian Fainelli +Cc: Ralf Baechle +Cc: Greg Kroah-Hartman +Cc: Yoshihiro YUNOMAE +Cc: Nicolas Schichan +Cc: linux-mips@linux-mips.org +Cc: linux-serial@vger.kernel.org +Patchwork: https://patchwork.linux-mips.org/patch/17542/ +Signed-off-by: James Hogan +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/ar7/platform.c | 4 ++++ + arch/mips/ar7/prom.c | 2 -- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/mips/ar7/platform.c ++++ b/arch/mips/ar7/platform.c +@@ -654,6 +654,10 @@ static int __init ar7_register_devices(v + u32 val; + int res; + ++ res = ar7_gpio_init(); ++ if (res) ++ pr_warn("unable to register gpios: %d\n", res); ++ + res = ar7_register_uarts(); + if (res) + pr_err("unable to setup uart(s): %d\n", res); +--- a/arch/mips/ar7/prom.c ++++ b/arch/mips/ar7/prom.c +@@ -246,8 +246,6 @@ void __init prom_init(void) + ar7_init_cmdline(fw_arg0, (char **)fw_arg1); + ar7_init_env((struct env_var *)fw_arg2); + console_config(); +- +- ar7_gpio_init(); + } + + #define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4))) diff --git a/queue-4.4/mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch b/queue-4.4/mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch new file mode 100644 index 00000000000..f467735ce68 --- /dev/null +++ b/queue-4.4/mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch @@ -0,0 +1,42 @@ +From b084116f8587b222a2c5ef6dcd846f40f24b9420 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen +Date: Sun, 29 Oct 2017 16:27:20 +0100 +Subject: MIPS: AR7: Ensure that serial ports are properly set up + +From: Oswald Buddenhagen + +commit b084116f8587b222a2c5ef6dcd846f40f24b9420 upstream. + +Without UPF_FIXED_TYPE, the data from the PORT_AR7 uart_config entry is +never copied, resulting in a dead port. + +Fixes: 154615d55459 ("MIPS: AR7: Use correct UART port type") +Signed-off-by: Oswald Buddenhagen +[jonas.gorski: add Fixes tag] +Signed-off-by: Jonas Gorski +Reviewed-by: Florian Fainelli +Cc: Ralf Baechle +Cc: Greg Kroah-Hartman +Cc: Yoshihiro YUNOMAE +Cc: Nicolas Schichan +Cc: Oswald Buddenhagen +Cc: linux-mips@linux-mips.org +Cc: linux-serial@vger.kernel.org +Patchwork: https://patchwork.linux-mips.org/patch/17543/ +Signed-off-by: James Hogan +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/ar7/platform.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/mips/ar7/platform.c ++++ b/arch/mips/ar7/platform.c +@@ -576,6 +576,7 @@ static int __init ar7_register_uarts(voi + uart_port.type = PORT_AR7; + uart_port.uartclk = clk_get_rate(bus_clk) / 2; + uart_port.iotype = UPIO_MEM32; ++ uart_port.flags = UPF_FIXED_TYPE; + uart_port.regshift = 2; + + uart_port.line = 0; diff --git a/queue-4.4/series b/queue-4.4/series index dc1c6f98f08..0d39421f449 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -45,3 +45,7 @@ test-firmware_class-report-errors-properly-on-failure.patch selftests-firmware-add-empty-string-and-async-tests.patch selftests-firmware-send-expected-errors-to-dev-null.patch tools-firmware-check-for-distro-fallback-udev-cancel-rule.patch +mips-ar7-defer-registration-of-gpio.patch +mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch +input-elan_i2c-add-elan060c-to-the-acpi-table.patch +drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch