From 5a8003842a44ae05f680310e97a7e9412fb1a8ea Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sat, 19 Mar 2022 08:29:04 -0500 Subject: kernel-5.16.16-0 * Sat Mar 19 2022 Justin M. Forbes [5.16.16-0] - drm/mgag200: Fix PLL setup for g200wb and g200ew (Jocelyn Falempe) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 +++ kernel.spec | 17 ++++++++++------- patch-5.16-redhat.patch | 22 ++++++++++++++++++++-- sources | 6 +++--- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index a3e9c2e38..8e6ba0821 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 1 +RHEL_RELEASE = 0 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index f8229093f..9dd29dbcd 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/dfe21b33039e0c863a4e41a8e8508fa6af46bad8 + dfe21b33039e0c863a4e41a8e8508fa6af46bad8 drm/mgag200: Fix PLL setup for g200wb and g200ew + https://gitlab.com/cki-project/kernel-ark/-/commit/dd24222299c0cc5a6a118f2265fcf3f769a7cfb4 dd24222299c0cc5a6a118f2265fcf3f769a7cfb4 Back out the nfs workaround and just revert the query for fs_location diff --git a/kernel.spec b/kernel.spec index e073f6d01..c7416d0e5 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 101 +%global distro_build 100 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,15 +130,15 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.15 +%define rpmversion 5.16.16 %define patchversion 5.16 -%define pkgrelease 101 +%define pkgrelease 100 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 101%{?buildid}%{?dist} +%define specrelease 100%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16.15.tar.xz +Source0: linux-5.16.16.tar.xz Source1: Makefile.rhelver @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16.15 -c -mv linux-5.16.15 linux-%{KVERREL} +%setup -q -n kernel-5.16.16 -c +mv linux-5.16.16 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2985,6 +2985,9 @@ fi # # %changelog +* Sat Mar 19 2022 Justin M. Forbes [5.16.16-0] +- drm/mgag200: Fix PLL setup for g200wb and g200ew (Jocelyn Falempe) + * Thu Mar 17 2022 Justin M. Forbes [5.16.15-1] - Back out the nfs workaround and just revert the query for fs_location (Justin M. Forbes) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index e1959a191..721733a71 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -16,6 +16,7 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++++++------ drivers/firmware/efi/secureboot.c | 38 +++++++ + drivers/gpu/drm/mgag200/mgag200_pll.c | 6 +- drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +- drivers/hid/hid-rmi.c | 64 ----------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ @@ -53,10 +54,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/testing/selftests/netfilter/nft_nat.sh | 5 +- - 55 files changed, 821 insertions(+), 284 deletions(-) + 56 files changed, 824 insertions(+), 287 deletions(-) diff --git a/Makefile b/Makefile -index 8675dd2a9cc8..fae0fa3f7ed5 100644 +index d625d3aeab2e..6e8bdceb7395 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -854,6 +855,23 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/gpu/drm/mgag200/mgag200_pll.c b/drivers/gpu/drm/mgag200/mgag200_pll.c +index e9ae22b4f813..52be08b744ad 100644 +--- a/drivers/gpu/drm/mgag200/mgag200_pll.c ++++ b/drivers/gpu/drm/mgag200/mgag200_pll.c +@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl + udelay(50); + + /* program pixel pll register */ +- WREG_DAC(MGA1064_PIX_PLLC_N, xpixpllcn); +- WREG_DAC(MGA1064_PIX_PLLC_M, xpixpllcm); +- WREG_DAC(MGA1064_PIX_PLLC_P, xpixpllcp); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_N, xpixpllcn); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_M, xpixpllcm); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_P, xpixpllcp); + + udelay(50); + diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index 1cbd71abc80a..9d2513de959b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c diff --git a/sources b/sources index b4879283b..88f630ed6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16.15.tar.xz) = 2bb60417bfcff772de12419a4279eb21139871cad5cd800e295832b646f75b2e751115dda1ceb8344465a1f263a782f7e6dc45362433caf7bab3c164b7f78d7f -SHA512 (kernel-abi-stablelists-5.16.15-101.tar.bz2) = 513bf7c6ec77863741e9747776fcc21c358849f2fcf1ace5f87a8fb8c710c2811a01e49e697b6ed6a16fc9fc99518eeb9d1f5a4dd6698447733dfc8718cd30b8 -SHA512 (kernel-kabi-dw-5.16.15-101.tar.bz2) = 7a07aa18af068537bd31ed63bdd796d3bc7510ad29bb5428546bbaa93a866aea193ba127058904f9fc257c01b2fb072b8d27f2ac8b845e483d7e92b0e4f4deca +SHA512 (linux-5.16.16.tar.xz) = 554cc9dabce0d9b351b6c2b854fe6175a3a55662578a3129ebba8d9a856fdd1baaf2c6203d5aa674346f20674279958db59c8a7acb9797640505beae5745490c +SHA512 (kernel-abi-stablelists-5.16.16-100.tar.bz2) = c9f341321ff45169ecde2f7f8a42cc1cd598b19749445433fa3b0ef0292f78806d32e16146a9d13308347a38abed16b241ab1d3d393894572ad99f6d64eca957 +SHA512 (kernel-kabi-dw-5.16.16-100.tar.bz2) = 30fd65ebceadf8f23051a8b4514e6bda8b66f69d3f9ddd686549a6b9c8e1bb8f874de45a2112fdae5b7bde6580d284ead858455e7a78a693ddec36b8050bfdf4 -- cgit