diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-13 16:02:07 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-13 16:02:07 +0100 |
| commit | b9e6365d4536fff5e633f8f1d4f50e14b5958c16 (patch) | |
| tree | 3bc3dad007b746abeab82e4a700675802291fe65 | |
| parent | dd52303696fccdbfa1c673f4c86398c41aa878a2 (diff) | |
| parent | 43998cf7b2bdf6a31e487853ebf5259f523e2d27 (diff) | |
| download | kernel-b9e6365d4536fff5e633f8f1d4f50e14b5958c16.tar.gz kernel-b9e6365d4536fff5e633f8f1d4f50e14b5958c16.tar.xz kernel-b9e6365d4536fff5e633f8f1d4f50e14b5958c16.zip | |
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch | 38 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 45 insertions, 0 deletions
diff --git a/0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch b/0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch new file mode 100644 index 000000000..36855bd99 --- /dev/null +++ b/0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch @@ -0,0 +1,38 @@ +From 910f1601addae3e430fc7d3cd589d7622c5df693 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Wed, 3 Feb 2021 14:03:50 -0500 +Subject: [PATCH] Revert "drm/amd/display: Update NV1x SR latency values" + +This reverts commit 4a3dea8932d3b1199680d2056dd91d31d94d70b7. + +This causes blank screens for some users. + +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1388 +Cc: Alvin Lee <alvin.lee2@amd.com> +Cc: Jun Lei <Jun.Lei@amd.com> +Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> +Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Cc: stable@vger.kernel.org +--- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +index a0a4ab47a1c0..a2cbafab663c 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +@@ -297,8 +297,8 @@ static struct _vcs_dpi_soc_bounding_box_st dcn2_0_soc = { + }, + }, + .num_states = 5, +- .sr_exit_time_us = 11.6, +- .sr_enter_plus_exit_time_us = 13.9, ++ .sr_exit_time_us = 8.6, ++ .sr_enter_plus_exit_time_us = 10.9, + .urgent_latency_us = 4.0, + .urgent_latency_pixel_data_only_us = 4.0, + .urgent_latency_pixel_mixed_with_vm_data_us = 4.0, +-- +2.29.2 + diff --git a/kernel.spec b/kernel.spec index 1ecdc78f4..316045b2f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -876,6 +876,8 @@ Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch # rhbz 1918778 Patch108: media-pwc-fix-the-urb-buffer-allocation.patch +Patch109: 0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch + # END OF PATCH DEFINITIONS %endif @@ -2992,6 +2994,11 @@ fi # # %changelog +* Wed Feb 10 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.15-100 +- Linux v5.10.15 +- Fixes CVE-2021-20194 (rhbz 1912683 1926781) +- Fixes rhbz 1916674 + * Sun Feb 07 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.14-100 - Linux v5.10.14 |