diff options
| -rw-r--r-- | SOURCES/Makefile.rhelver | 2 | ||||
| -rw-r--r-- | SOURCES/Patchlist.changelog | 3 | ||||
| -rw-r--r-- | SOURCES/amdgpu-si-cik-default.patch | 79 | ||||
| -rw-r--r-- | SOURCES/patch-5.16-redhat.patch | 22 | ||||
| -rwxr-xr-x | SPECS/kernel.spec | 23 |
5 files changed, 117 insertions, 12 deletions
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index a3e9c2e..8e6ba08 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/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/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index f822909..9dd29db 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/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/SOURCES/amdgpu-si-cik-default.patch b/SOURCES/amdgpu-si-cik-default.patch new file mode 100644 index 0000000..d78303f --- /dev/null +++ b/SOURCES/amdgpu-si-cik-default.patch @@ -0,0 +1,79 @@ +From 9dba686dfc006716e1cea0e28a7918561cf8a664 Mon Sep 17 00:00:00 2001 +From: Jan200101 <sentrycraft123@gmail.com> +Date: Tue, 22 Mar 2022 17:52:14 +0100 +Subject: [PATCH] drm/amdgpu: enable SI and CIK support by default + +Signed-off-by: Jan200101 <sentrycraft123@gmail.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 ++------------ + drivers/gpu/drm/radeon/radeon_drv.c | 10 ++++++++++ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index 8c7637233c81..d736cc1a663a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -573,15 +573,10 @@ module_param_named(timeout_period, amdgpu_watchdog_timer.period, uint, 0644); + */ + #ifdef CONFIG_DRM_AMDGPU_SI + +-#if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE) +-int amdgpu_si_support = 0; +-MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))"); +-#else + int amdgpu_si_support = 1; + MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)"); +-#endif +- + module_param_named(si_support, amdgpu_si_support, int, 0444); ++ + #endif + + /** +@@ -592,15 +587,10 @@ module_param_named(si_support, amdgpu_si_support, int, 0444); + */ + #ifdef CONFIG_DRM_AMDGPU_CIK + +-#if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE) +-int amdgpu_cik_support = 0; +-MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))"); +-#else + int amdgpu_cik_support = 1; + MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)"); +-#endif +- + module_param_named(cik_support, amdgpu_cik_support, int, 0444); ++ + #endif + + /** +diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c +index b74cebca1f89..5208d50da643 100644 +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -273,12 +273,22 @@ module_param_named(uvd, radeon_uvd, int, 0444); + MODULE_PARM_DESC(vce, "vce enable/disable vce support (1 = enable, 0 = disable)"); + module_param_named(vce, radeon_vce, int, 0444); + ++#ifdef CONFIG_DRM_AMDGPU_SI ++int radeon_si_support = 0; ++MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))"); ++#else + int radeon_si_support = 1; + MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)"); ++#endif + module_param_named(si_support, radeon_si_support, int, 0444); + ++#ifdef CONFIG_DRM_AMDGPU_CIK ++int radeon_cik_support = 0; ++MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))"); ++#else + int radeon_cik_support = 1; + MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)"); ++#endif + module_param_named(cik_support, radeon_cik_support, int, 0444); + + static struct pci_device_id pciidlist[] = { +-- +2.35.1 + diff --git a/SOURCES/patch-5.16-redhat.patch b/SOURCES/patch-5.16-redhat.patch index e1959a1..721733a 100644 --- a/SOURCES/patch-5.16-redhat.patch +++ b/SOURCES/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/SPECS/kernel.spec b/SPECS/kernel.spec index 0b72898..614f187 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 201 +%global distro_build 200 %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 202 +%define pkgrelease 201 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 202%{?buildid}%{?dist} +%define specrelease 201%{?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 @@ -864,6 +864,7 @@ Patch202: fsync.patch Patch203: OpenRGB.patch Patch204: winesync.patch Patch205: steam-deck.patch +Patch206: amdgpu-si-cik-default.patch Patch301: AMD_CPPC.patch %endif @@ -1395,8 +1396,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} . @@ -1411,6 +1412,7 @@ ApplyOptionalPatch fsync.patch ApplyOptionalPatch OpenRGB.patch ApplyOptionalPatch winesync.patch ApplyOptionalPatch steam-deck.patch +ApplyOptionalPatch amdgpu-si-cik-default.patch ApplyOptionalPatch AMD_CPPC.patch %endif @@ -3003,8 +3005,11 @@ fi # # %changelog -* Sat Mar 19 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.16.15-202 -- Linux v5.16.15 futex2 zen openrgb +* Tue Mar 22 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.16.16-201-fsync +- Linux v5.16.16 futex2 zen openrgb + +* Sat Mar 19 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.16-0] +- drm/mgag200: Fix PLL setup for g200wb and g200ew (Jocelyn Falempe) * Thu Mar 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.15-1] - Back out the nfs workaround and just revert the query for fs_location (Justin M. Forbes) |