4.9-stable patches

added patches:
	drm-radeon-fix-backlight-control-on-imac-12-1.patch

diff --git a/queue-4.9/drm-radeon-fix-backlight-control-on-imac-12-1.patch b/queue-4.9/drm-radeon-fix-backlight-control-on-imac-12-1.patch
new file mode 100644 (file)
index 0000000..944442d
--- /dev/null
+++ b/queue-4.9/drm-radeon-fix-backlight-control-on-imac-12-1.patch
@@ -0,0 +1,33 @@
+From 364438fd629f7611a84c8e6d7de91659300f1502 Mon Sep 17 00:00:00 2001
+From: Nicholas Bishop <nicholasbishop@google.com>
+Date: Fri, 11 Feb 2022 14:57:39 -0500
+Subject: drm/radeon: Fix backlight control on iMac 12,1
+
+From: Nicholas Bishop <nicholasbishop@google.com>
+
+commit 364438fd629f7611a84c8e6d7de91659300f1502 upstream.
+
+The iMac 12,1 does not use the gmux driver for backlight, so the radeon
+backlight device is needed to set the brightness.
+
+Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1838
+Signed-off-by: Nicholas Bishop <nicholasbishop@google.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/radeon/atombios_encoders.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/atombios_encoders.c
++++ b/drivers/gpu/drm/radeon/atombios_encoders.c
+@@ -192,7 +192,8 @@ void radeon_atom_backlight_init(struct r
+        * so don't register a backlight device
+        */
+       if ((rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) &&
+-          (rdev->pdev->device == 0x6741))
++          (rdev->pdev->device == 0x6741) &&
++          !dmi_match(DMI_PRODUCT_NAME, "iMac12,1"))
+               return;
+ 
+       if (!radeon_encoder->enc_priv)

diff --git a/queue-4.9/quota-make-dquot_quota_sync-return-errors-from-sync_.patch b/queue-4.9/quota-make-dquot_quota_sync-return-errors-from-sync_.patch
index 462bb173f50e1ef72ef227014c57ac3c356c3829..6bfaf51cccf2534865cd243be278759c8b0f483a 100644 (file)
--- a/queue-4.9/quota-make-dquot_quota_sync-return-errors-from-sync_.patch
+++ b/queue-4.9/quota-make-dquot_quota_sync-return-errors-from-sync_.patch
@@ -17,14 +17,12 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
 Acked-by: Christian Brauner <brauner@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/quota/dquot.c | 11 ++++++++---
+ fs/quota/dquot.c |   11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
-diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
-index 82a5ecbe2da96..022b237c6a134 100644
 --- a/fs/quota/dquot.c
 +++ b/fs/quota/dquot.c
-@@ -676,9 +676,14 @@ int dquot_quota_sync(struct super_block *sb, int type)
+@@ -676,9 +676,14 @@ int dquot_quota_sync(struct super_block
        /* This is not very clever (and fast) but currently I don't know about
         * any other simple way of getting quota data to disk and we must get
         * them there for userspace to be visible... */
@@ -42,6 +40,3 @@ index 82a5ecbe2da96..022b237c6a134 100644
  
        /*
         * Now when everything is written we can discard the pagecache so
--- 
-2.34.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 9a94d6c44dd98f9d367211043f8e6d4cba311c98..b5cdab0d85506e986305df94635a447b4ba1f674 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -11,3 +11,4 @@ selftests-zram-adapt-the-situation-that-dev-zram0-is.patch
 ax25-improve-the-incomplete-fix-to-avoid-uaf-and-npd.patch
 vfs-make-freeze_super-abort-when-sync_filesystem-ret.patch
 quota-make-dquot_quota_sync-return-errors-from-sync_.patch
+drm-radeon-fix-backlight-control-on-imac-12-1.patch