Merge remote-tracking branch 'up/f36' into f36-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2022-06-27 14:43:46 +03:00
commit 69e57e33c8
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
4 changed files with 41 additions and 50 deletions

View File

@ -1,3 +1,6 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/8c91f362b5c06f3ff01ca58ea67266da928f55b1
8c91f362b5c06f3ff01ca58ea67266da928f55b1 drm/i915: Temporarily disable selective fetch for PSR2 on ADL-P
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a7c0a52660e5b4c851d966b5aa634ffdd22650a2 "https://gitlab.com/cki-project/kernel-ark/-/commit"/a7c0a52660e5b4c851d966b5aa634ffdd22650a2
a7c0a52660e5b4c851d966b5aa634ffdd22650a2 drm/amd/display: Cap OLED brightness per max frame-average luminance a7c0a52660e5b4c851d966b5aa634ffdd22650a2 drm/amd/display: Cap OLED brightness per max frame-average luminance

View File

@ -122,15 +122,15 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 1 %define debugbuildsenabled 1
# define buildid .local # define buildid .local
%define specversion 5.18.4 %define specversion 5.18.7
%define patchversion 5.18 %define patchversion 5.18
%define pkgrelease 201 %define pkgrelease 200
%define kversion 5 %define kversion 5
%define tarfile_release 5.18.4 %define tarfile_release 5.18.7
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 18 %define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 201%{?buildid}.1.riscv64%{?dist} %define specrelease 200%{?buildid}.0.riscv64%{?dist}
# #
# End of genspec.sh variables # End of genspec.sh variables
@ -3047,13 +3047,14 @@ fi
# #
# #
%changelog %changelog
* Wed Jun 22 2022 David Abdurachmanov <davidlt@rivosinc.com> [5.18.4-201.1.riscv64] * Mon Jun 27 2022 David Abdurachmanov <davidlt@rivosinc.com> [5.18.7-200.0.riscv64]
- Enable SiFive I2C driver - Enable riscv64
* Wed Jun 15 2022 David Abdurachmanov <davidlt@rivosinc.com> [5.18.4-201.0.riscv64] * Sat Jun 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.7-200]
- Add riscv64 support - v5.18.7 rebase
* Wed Jun 22 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.6-0]
* Wed Jun 15 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.4-201] - drm/i915: Temporarily disable selective fetch for PSR2 on ADL-P (Mark Pearson) [2065794]
- Turn E1000 back on correctly (Justin M. Forbes)
- Turn E1000 back on (Justin M. Forbes) - Turn E1000 back on (Justin M. Forbes)
- Changelog update for rebase (Justin M. Forbes) - Changelog update for rebase (Justin M. Forbes)

View File

@ -20,7 +20,7 @@
drivers/firmware/efi/libstub/x86-stub.c | 119 +++++++++++++++++++- drivers/firmware/efi/libstub/x86-stub.c | 119 +++++++++++++++++++-
drivers/firmware/efi/secureboot.c | 38 +++++++ drivers/firmware/efi/secureboot.c | 38 +++++++
drivers/firmware/sysfb.c | 18 ++- drivers/firmware/sysfb.c | 18 ++-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- drivers/gpu/drm/i915/display/intel_psr.c | 9 ++
drivers/hid/hid-rmi.c | 64 ----------- drivers/hid/hid-rmi.c | 64 -----------
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++
drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++---------
@ -42,10 +42,10 @@
security/lockdown/Kconfig | 13 +++ security/lockdown/Kconfig | 13 +++
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 6 + security/security.c | 6 +
44 files changed, 716 insertions(+), 195 deletions(-) 44 files changed, 721 insertions(+), 191 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 6cbf7bb15edd..fcb7fc7a5e81 100644 index 61d63068553c..cd3197d5397e 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -924,39 +924,26 @@ index 2bfbb05f7d89..a504f7234f35 100644
ret = sysfb_create_simplefb(si, &mode); ret = sysfb_create_simplefb(si, &mode);
if (!ret) if (!ret)
return 0; return 0;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 8dd03de7c277..78a38c3b7d66 100644 index 6c9e6e7f0afd..f0ff2f1f5fcb 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2835,7 +2835,7 @@ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = { @@ -744,6 +744,15 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp,
return false;
}
static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) + /* Temporary workaround for Lenovo's issues with the X1 Carbon 10th Gen
{ + * See: https://bugzilla.redhat.com/show_bug.cgi?id=2065794
- u32 max_cll, min_cll, max, min, q, r; + */
+ u32 max_avg, min_cll, max, min, q, r; + if (IS_ALDERLAKE_P(dev_priv)) {
struct amdgpu_dm_backlight_caps *caps; + drm_dbg_kms(&dev_priv->drm,
struct amdgpu_display_manager *dm; + "PSR2 sel fetch disabled on ADL-P, see rhbz2065794\n");
struct drm_connector *conn_base; + return false;
@@ -2865,7 +2865,7 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) + }
caps = &dm->backlight_caps[i]; +
caps->ext_caps = &aconnector->dc_link->dpcd_sink_ext_caps; return crtc_state->enable_psr2_sel_fetch = true;
caps->aux_support = false; }
- max_cll = conn_base->hdr_sink_metadata.hdmi_type1.max_cll;
+ max_avg = conn_base->hdr_sink_metadata.hdmi_type1.max_fall;
min_cll = conn_base->hdr_sink_metadata.hdmi_type1.min_cll;
if (caps->ext_caps->bits.oled == 1 /*||
@@ -2893,8 +2893,8 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)
* The results of the above expressions can be verified at
* pre_computed_values.
*/
- q = max_cll >> 5;
- r = max_cll % 32;
+ q = max_avg >> 5;
+ r = max_avg % 32;
max = (1 << q) * pre_computed_values[r];
// min luminance: maxLum * (CV/255)^2 / 100
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 311eee599ce9..2460c6bd46f8 100644 index 311eee599ce9..2460c6bd46f8 100644
--- a/drivers/hid/hid-rmi.c --- a/drivers/hid/hid-rmi.c
@ -1341,7 +1328,7 @@ index 857d4c2fd1a2..9353941f3a97 100644
* Changes the default domain of an iommu group that has *only* one device * Changes the default domain of an iommu group that has *only* one device
* *
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 2d6a01853109..f22cd4b9c118 100644 index 1ea85c88d795..d30563dabd95 100644
--- a/drivers/nvme/host/core.c --- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c
@@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -1679,10 +1666,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig diff --git a/init/Kconfig b/init/Kconfig
index b19e2eeaae80..7d12d49b9024 100644 index fa63cc019ebf..8643b5cef9f1 100644
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -1654,7 +1654,7 @@ config AIO @@ -1663,7 +1663,7 @@ config AIO
this option saves about 7k. this option saves about 7k.
config IO_URING config IO_URING

View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18.4.tar.xz) = 7dc737b3860331e30dbcddfe8d403d02e00852aa3a70d194947f493035b64390140320f7e98e3148d11fd17535ca2a805209f3aa9eb41de4cbabb1f8f25c0cc3 SHA512 (linux-5.18.7.tar.xz) = a943d7842e757b1386ff9ef0c319bbea74bd9ff7a43db7e1be2dea8d8ca0bb16d0bfb3d7f735652a2351095d4a47dc7a42b9459b133d00dc0d73dbf26fc0911d
SHA512 (kernel-abi-stablelists-5.18.4-201.tar.bz2) = c30d7a4076e4f7f75bbef749f0f2a9fa10e12e031b6cb158cf4c4f9602d3f9119e835bd5ffa21c5286684225d4aaf3c363c080693ce05af58fb952c9dff6eb1e SHA512 (kernel-abi-stablelists-5.18.7-200.tar.bz2) = 9c30296ec4d0909bbc3c24aa19515876f3a11a82cb07af415ee1a0c1f951c8f0011621e4dc9b91d5a7caf7a63fd41790548977373d490c42d794421237ab69c2
SHA512 (kernel-kabi-dw-5.18.4-201.tar.bz2) = 5ae0e2b1d33b15ee51798ca965492d5113c1d6906f062424afe1c3aabc9ce784ebfa216a30d246e696cbed60e8358b2ad46dad0080c3eb9d70c3bcb9c0d1d2e3 SHA512 (kernel-kabi-dw-5.18.7-200.tar.bz2) = 70fd6a26797716eb6a4d80c7bd2529663d9f271b67f79be61d9d27ff85a0af55e9fd1bad443894307910d78b627c840cda68abc0c051bd0f8834954bd5db1102