From: Greg Kroah-Hartman Date: Fri, 18 Feb 2022 09:16:49 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.9.303~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c98906f83a243962474084f0da6c590a0725d18;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..944442d4ea9 --- /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 +Date: Fri, 11 Feb 2022 14:57:39 -0500 +Subject: drm/radeon: Fix backlight control on iMac 12,1 + +From: Nicholas Bishop + +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 +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + 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 462bb173f50..6bfaf51cccf 100644 --- 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 Acked-by: Christian Brauner Signed-off-by: Sasha Levin --- - 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 9a94d6c44dd..b5cdab0d855 100644 --- 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