diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-26 09:36:40 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-26 09:36:40 +0100 |
| commit | 4551f610ef4a9636bb9a24c68f3299d01cf973df (patch) | |
| tree | f7809696d3e00ddba28f135fb177eeba252319d9 | |
| parent | b888a922860286e7a0ec9f2c5afe8a01a649db33 (diff) | |
| parent | 5d8e7bfbb8177c10b27879c5346526ff33a7edd3 (diff) | |
| download | kernel-4551f610ef4a9636bb9a24c68f3299d01cf973df.tar.gz kernel-4551f610ef4a9636bb9a24c68f3299d01cf973df.tar.xz kernel-4551f610ef4a9636bb9a24c68f3299d01cf973df.zip | |
Merge remote-tracking branch 'origin/f28' into f28-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch | 26 | ||||
| -rw-r--r-- | kernel.spec | 11 |
2 files changed, 35 insertions, 2 deletions
diff --git a/0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch b/0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch new file mode 100644 index 000000000..6fa486952 --- /dev/null +++ b/0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch @@ -0,0 +1,26 @@ +From 15f77c4ade3364106a3a397f0a8d6fce9d6a6326 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bskeggs@redhat.com> +Date: Fri, 11 Jan 2019 16:08:20 +1000 +Subject: [PATCH] drm/nouveau: register backlight on pascal and newer + +Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +--- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c +index 5f5be6368aed..c7a94c94dbf3 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c ++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c +@@ -253,6 +253,8 @@ nouveau_backlight_init(struct drm_connector *connector) + case NV_DEVICE_INFO_V0_FERMI: + case NV_DEVICE_INFO_V0_KEPLER: + case NV_DEVICE_INFO_V0_MAXWELL: ++ case NV_DEVICE_INFO_V0_PASCAL: ++ case NV_DEVICE_INFO_V0_VOLTA: + ret = nv50_backlight_init(nv_encoder, &props, &ops); + break; + default: +-- +2.20.1 + diff --git a/kernel.spec b/kernel.spec index cf5559e1d..337699be4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -646,15 +646,18 @@ Patch501: Fix-for-module-sig-verification.patch # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# rhbz 1526312 (accelerometer part of the bug), patches pending upstream +# rhbz 1526312 patch merged into 5.0-rc# Patch504: iio-accel-kxcjk1013-Add-more-hardware-ids.patch -# rhbz 1645070 patch queued upstream for merging into 4.21 +# rhbz 1645070 patch merged into 5.0-rc# Patch505: asus-fx503-keyb.patch # CVE-2019-3459 and CVE-2019-3460 rhbz 1663176 1663179 1665925 Patch507: CVE-2019-3459-and-CVE-2019-3460.patch +# rhbz 1663613 patch merged into 5.0-rc# +Patch508: 0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch + # END OF PATCH DEFINITIONS %endif @@ -1943,6 +1946,10 @@ fi # # %changelog +* Wed Jan 23 2019 Hans de Goede <hdegoede@redhat.com> +- Add upstream patch fixing backlight control not working on some laptops + with a Nvidia GPU (rhbz#1663613, rhbz#1665505) + * Wed Jan 23 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.4-100 - Linux v4.20.4 rebase |