diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-21 16:21:22 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-21 16:21:22 +0100 |
| commit | a25539e8f585531efe964096cea8d4aa614b204f (patch) | |
| tree | 71d2c61334822af013296d7e731b0a4a1bc28ee6 /patch-5.16-redhat.patch | |
| parent | d9382a7d0c1cd98a6b17f0de5c3f29b85cdafbf9 (diff) | |
| parent | 95484c155424c62930acc1c61803f608af3f1cbc (diff) | |
| download | kernel-a25539e8f585531efe964096cea8d4aa614b204f.tar.gz kernel-a25539e8f585531efe964096cea8d4aa614b204f.tar.xz kernel-a25539e8f585531efe964096cea8d4aa614b204f.zip | |
merge origin
Diffstat (limited to 'patch-5.16-redhat.patch')
| -rw-r--r-- | patch-5.16-redhat.patch | 22 |
1 files changed, 20 insertions, 2 deletions
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 |