Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora

18 files changed, 27 insertions, 20 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index af388f405..ce56ad1f8 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/1c96abf3c7126a2fb24f689b1ffcdd6eda0ffdc6
+ 1c96abf3c7126a2fb24f689b1ffcdd6eda0ffdc6 drm/nouveau/backlight: Fix LVDS backlight detection on some laptops
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/f02942b95fb601b9729da7be1ae55d2255dcc045
  f02942b95fb601b9729da7be1ae55d2255dcc045 Revert "x86/PCI: Ignore E820 reservations for bridge windows on newer systems"
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 9a57bf36d..9e5b31f71 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -7632,7 +7632,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 CONFIG_TSL4531=m
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f0312511b..86cd26154 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -7606,7 +7606,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 CONFIG_TSL4531=m
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 73ea8ba08..0f277836d 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -7838,7 +7838,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 CONFIG_TSL4531=m
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index c8301f9a4..07e6f4a27 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -7813,7 +7813,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 CONFIG_TSL4531=m
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 7fb72f5b9..93afddbf0 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -7606,7 +7606,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 CONFIG_TSL4531=m
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 7b9043dbb..558ba9e95 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -7581,7 +7581,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 CONFIG_TSL4531=m
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 0522671e0..c764adfd9 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -6855,7 +6855,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 8015432df..e09e1b544 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -6830,7 +6830,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index e0b39a57b..c6a4fda73 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -6529,7 +6529,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index b260b4039..8b30566cd 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -6503,7 +6503,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 5a1aae14c..79637d35f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -6477,7 +6477,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index bf6a9d755..16ce39e9a 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -6451,7 +6451,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index f1bdac89f..90934340c 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6905,7 +6905,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index c147d3c80..5dba26426 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6880,7 +6880,6 @@ CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2591 is not set
 CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
-# CONFIG_TSNEP_SELFTESTS is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 CONFIG_TULIP=m
diff --git a/kernel.spec b/kernel.spec
index daff52c99..a8d5cde85 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2990,6 +2990,9 @@ fi
 #
 #
 %changelog
+* Wed Mar 02 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.12-0]
+- drm/nouveau/backlight: Fix LVDS backlight detection on some laptops (Lyude Paul)
+
 * Wed Feb 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.11-0]
 - spec: don't overwrite auto.conf with .config (Ondrej Mosnacek)
 - New configs for 5.16.10 (Justin M. Forbes)
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index 1ec61ee0e..7cd2e8bac 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -17,6 +17,7 @@
  drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
  drivers/firmware/efi/secureboot.c                  |  38 +++++++
  drivers/gpu/drm/i915/display/intel_psr.c           |  10 +-
+ drivers/gpu/drm/nouveau/nouveau_backlight.c        |   3 +-
  drivers/hid/hid-rmi.c                              |  64 -----------
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
@@ -47,10 +48,10 @@
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
  tools/testing/selftests/netfilter/nft_nat.sh       |   5 +-
- 49 files changed, 805 insertions(+), 198 deletions(-)
+ 50 files changed, 807 insertions(+), 199 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 00ba75768af7..f95367fb3134 100644
+index 09a9bb824afa..02a849fa625b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -870,6 +871,20 @@ index 7a205fd5023b..42d57ebd9061 100644
  		return false;
  	}
 
+diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
+index 1cbd71abc80a..9d2513de959b 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
+@@ -294,7 +294,8 @@ nv50_backlight_init(struct nouveau_backlight *bl,
+ 	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);
+ 	struct nvif_object *device = &drm->client.device.object;
+
+-	if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)))
++	if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)) ||
++	    nv_conn->base.status != connector_status_connected)
+ 		return -ENODEV;
+
+ 	if (nv_conn->type == DCB_CONNECTOR_eDP) {
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
 index 311eee599ce9..2460c6bd46f8 100644
 --- a/drivers/hid/hid-rmi.c
@@ -1376,7 +1391,7 @@ index 4c348bacf2cb..9fe496d35b38 100644
  				soc_hw_version_major, soc_hw_version_minor);
  			ret = -EOPNOTSUPP;
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 352766aa3122..16a2c9417536 100644
+index 5785f6abf194..7fc5f15a4b78 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
diff --git a/sources b/sources
index 957ccc1c2..ff1077816 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16.11.tar.xz) = f04dfec50e8c081139d22dd7ccff927bd01eb0e7f63923c1d939fa3dcf5114408fd58859bfa42abfc812656d60f5303e18657123083bd859021bbeff3c1d025d
-SHA512 (kernel-abi-stablelists-5.16.11-200.tar.bz2) = 8543049430eff4a530b5805191affb60b1f02a539592bb00a30a8196706354101e30ec80906db59629c0d08f0f5864425ad73a163ca66b659f1ef314e4dbf516
-SHA512 (kernel-kabi-dw-5.16.11-200.tar.bz2) = 6e73d02de9003973757dc047ef83c6b204fd4669335c5ee9a2ed5d64dfd790d5f135669c6e21f5b432a75d9592f7f2f4b58eb0dc7e032d81382ecce6486aedfe
+SHA512 (linux-5.16.12.tar.xz) = 88856cd67fa447c88bf476d2f1a1aa6bb91a9329e44e0223fed6465170353782a7254e005cc95a977172312bc4d69fe3a6dfb81b05a360434f83ef32eef76785
+SHA512 (kernel-abi-stablelists-5.16.12-200.tar.bz2) = f0b4dd2f49337cb445aa3ca9b193afc1ed5a7cd6a0949284285486ab0feb5e7d7a38b94bbf46f99ec1e895a597c2eeee1dc7ab2dedf45201f69d34b4aa8dd598
+SHA512 (kernel-kabi-dw-5.16.12-200.tar.bz2) = 41641a3637003028ce711aa9b186e8f97d54676417da18197f453d2afa448c5808f53735b1ba4ca15c21c6a584731df643ccdd153a5aa0da0d89e95c7bc72127