diff options
| -rw-r--r-- | SOURCES/0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch | 38 | ||||
| -rw-r--r-- | SOURCES/kernel-aarch64-debug-fedora.config | 3 | ||||
| -rw-r--r-- | SOURCES/kernel-aarch64-fedora.config | 3 | ||||
| -rw-r--r-- | SPECS/kernel.spec | 13 |
4 files changed, 52 insertions, 5 deletions
diff --git a/SOURCES/0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch b/SOURCES/0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch new file mode 100644 index 0000000..36855bd --- /dev/null +++ b/SOURCES/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/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index 1e2178d..50bedae 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -6551,7 +6551,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_QDSP6=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m -# CONFIG_SND_SOC_RK3328 is not set +CONFIG_SND_SOC_RK3328=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -6563,6 +6563,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_RT1308_SDW=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5659=m CONFIG_SND_SOC_RT5660=m CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5677=m diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index ce9693b..8d8cf97 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -6531,7 +6531,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_QDSP6=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m -# CONFIG_SND_SOC_RK3328 is not set +CONFIG_SND_SOC_RK3328=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -6543,6 +6543,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_RT1308_SDW=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5659=m CONFIG_SND_SOC_RT5660=m CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5677=m diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 6c0e6bb..d6be68d 100644 --- a/SPECS/kernel.spec +++ b/SPECS/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} @@ -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 + # linux-fsync patches Patch200: zen.patch Patch201: futex2.patch @@ -2975,8 +2977,13 @@ fi # # %changelog -* Thu Feb 11 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.10.14-201.fsync -- Linux v5.10.14 futex2 zen +* Fri Feb 12 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.10.15-201.fsync +- Linux v5.10.15 futex2 zen + +* Wed Feb 10 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 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 <jforbes@fedoraproject.org> - 5.10.14-200 - Linux v5.10.14 |