From bc92356cf589ce8ffa7c463c66df4c63b87e996d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 10 Feb 2021 07:42:25 -0600 Subject: Linux v5.10.15 Signed-off-by: Justin M. Forbes --- kernel.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 1319155c2..fac3eb7a7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -94,7 +94,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 14 +%define stable_update 15 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2971,6 +2971,9 @@ fi # # %changelog +* Wed Feb 10 2021 Justin M. Forbes - 5.10.15-200 +- Linux v5.10.15 + * Sun Feb 07 2021 Justin M. Forbes - 5.10.14-200 - Linux v5.10.14 diff --git a/sources b/sources index d102ad79d..c7be82e35 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452 -SHA512 (patch-5.10.14.xz) = 3b4113a96114c04e87c83d1d0e036eba47ed4d5d0e70b593933b95e7da3fb9af0d5a5756d75f2708bb5eb959aa98864fba1f4c8989c6e6ce40d948ff65308870 +SHA512 (patch-5.10.15.xz) = 624123b4333783633d6fa417ab5fa8cbf85e56dda122487c8314b7ec37da74eb3dadded9a3d3dbda80d3c4cc734e516316f43222c85a820df1c549df8d70baad -- cgit From e69613c2192825659bc8a34627a6cd2a8e9b37a4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 10 Feb 2021 09:53:36 -0600 Subject: Revery commit causing blank screens for some amd users Signed-off-by: Justin M. Forbes --- ...amd-display-Update-NV1x-SR-latency-values.patch | 38 ++++++++++++++++++++++ kernel.spec | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch 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 +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 +Cc: Jun Lei +Cc: Rodrigo Siqueira +Reviewed-by: Rodrigo Siqueira +Signed-off-by: Alex Deucher +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 fac3eb7a7..f4609b298 100644 --- a/kernel.spec +++ b/kernel.spec @@ -858,6 +858,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 -- cgit From 33f97eddc35b48690d4124d01a21f636f1dfe443 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 10 Feb 2021 11:24:35 -0600 Subject: Notate some bugs fixed by 5.10.15 Signed-off-by: Justin M. Forbes --- kernel.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel.spec b/kernel.spec index f4609b298..9f0efbfb7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2975,6 +2975,8 @@ fi %changelog * Wed Feb 10 2021 Justin M. Forbes - 5.10.15-200 - Linux v5.10.15 +- Fixes CVE-2021-20194 (rhbz 1912683 1926781) +- Fixes rhbz 1916674 * Sun Feb 07 2021 Justin M. Forbes - 5.10.14-200 - Linux v5.10.14 -- cgit