-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
6.3: Update patchset for 6.3 Release, add surface patchset
Signed-off-by: Peter Jung <[email protected]>
- Loading branch information
Showing
16 changed files
with
28,535 additions
and
10,777 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 47998571042386996a5fb55be493e9927f594f76 Mon Sep 17 00:00:00 2001 | ||
From 9b7414fdd16442c2efd67e1e34588caf4c780f1e Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Mon, 6 Mar 2023 18:43:03 +0100 | ||
Subject: [PATCH 01/12] bbr2 | ||
Subject: [PATCH 01/13] bbr2 | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From efd83b97f8daac5950de449458be133718d6a8c7 Mon Sep 17 00:00:00 2001 | ||
From 3598b17e783ddfa1ab4dbe8c1867f1be9e3a1566 Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Mon, 17 Apr 2023 18:21:50 +0200 | ||
Subject: [PATCH 02/12] bfq | ||
Subject: [PATCH 02/13] bfq | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From c10af555acefbb465dbe1834391511fb21569a68 Mon Sep 17 00:00:00 2001 | ||
From 5157ccf4ab5b2429eb11e33b006ff0110baf0625 Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Mon, 17 Apr 2023 18:24:53 +0200 | ||
Subject: [PATCH 04/12] fixes | ||
Date: Sat, 22 Apr 2023 11:43:21 +0200 | ||
Subject: [PATCH 04/13] fixes | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
@@ -17,6 +17,11 @@ Signed-off-by: Peter Jung <[email protected]> | |
arch/x86/kernel/cpu/hygon.c | 1 + | ||
arch/x86/net/bpf_jit_comp.c | 5 +- | ||
drivers/bluetooth/btusb.c | 2 +- | ||
.../drm/amd/display/dc/bios/bios_parser2.c | 7 +- | ||
.../drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- | ||
.../drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- | ||
.../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 3 +- | ||
drivers/gpu/drm/scheduler/sched_main.c | 3 +- | ||
drivers/leds/trigger/Kconfig | 9 + | ||
drivers/leds/trigger/Makefile | 1 + | ||
drivers/leds/trigger/ledtrig-blkdev.c | 1221 +++++++++++++++++ | ||
|
@@ -55,7 +60,7 @@ Signed-off-by: Peter Jung <[email protected]> | |
scripts/atomic/fallbacks/add_negative | 11 +- | ||
sound/pci/hda/cs35l41_hda.c | 2 +- | ||
.../selftests/mm/ksm_functional_tests.c | 96 +- | ||
50 files changed, 2796 insertions(+), 270 deletions(-) | ||
55 files changed, 2804 insertions(+), 279 deletions(-) | ||
create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blkdev | ||
create mode 100644 Documentation/leds/ledtrig-blkdev.rst | ||
create mode 100644 drivers/leds/trigger/ledtrig-blkdev.c | ||
|
@@ -532,6 +537,78 @@ index 5c536151ef83..5a80379253a7 100644 | |
gpiod_set_value_cansleep(reset_gpio, 1); | ||
|
||
return; | ||
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | ||
index e381de2429fa..ae3783a7d7f4 100644 | ||
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | ||
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | ||
@@ -515,11 +515,8 @@ static enum bp_result get_gpio_i2c_info( | ||
info->i2c_slave_address = record->i2c_slave_addr; | ||
|
||
/* TODO: check how to get register offset for en, Y, etc. */ | ||
- info->gpio_info.clk_a_register_index = | ||
- le16_to_cpu( | ||
- header->gpio_pin[table_index].data_a_reg_index); | ||
- info->gpio_info.clk_a_shift = | ||
- header->gpio_pin[table_index].gpio_bitshift; | ||
+ info->gpio_info.clk_a_register_index = le16_to_cpu(pin->data_a_reg_index); | ||
+ info->gpio_info.clk_a_shift = pin->gpio_bitshift; | ||
|
||
return BP_RESULT_OK; | ||
} | ||
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 3af24ef9cb2d..51838bef7fb0 100644 | ||
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | ||
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | ||
@@ -714,7 +714,7 @@ static const struct dc_debug_options debug_defaults_drv = { | ||
.timing_trace = false, | ||
.clock_trace = true, | ||
.disable_pplib_clock_request = true, | ||
- .pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP, | ||
+ .pipe_split_policy = MPC_SPLIT_DYNAMIC, | ||
.force_single_disp_pipe_split = false, | ||
.disable_dcc = DCC_ENABLE, | ||
.vsr_support = true, | ||
diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | ||
index 8f9244fe5c86..c10ff621cb1d 100644 | ||
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | ||
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | ||
@@ -642,7 +642,7 @@ static const struct dc_debug_options debug_defaults_drv = { | ||
.clock_trace = true, | ||
.disable_pplib_clock_request = true, | ||
.min_disp_clk_khz = 100000, | ||
- .pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP, | ||
+ .pipe_split_policy = MPC_SPLIT_DYNAMIC, | ||
.force_single_disp_pipe_split = false, | ||
.disable_dcc = DCC_ENABLE, | ||
.vsr_support = true, | ||
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | ||
index 95da6dd1cc65..c4000518dc56 100644 | ||
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | ||
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | ||
@@ -304,7 +304,8 @@ navi10_get_allowed_feature_mask(struct smu_context *smu, | ||
| FEATURE_MASK(FEATURE_GFX_SS_BIT) | ||
| FEATURE_MASK(FEATURE_APCC_DFLL_BIT) | ||
| FEATURE_MASK(FEATURE_FW_CTF_BIT) | ||
- | FEATURE_MASK(FEATURE_OUT_OF_BAND_MONITOR_BIT); | ||
+ | FEATURE_MASK(FEATURE_OUT_OF_BAND_MONITOR_BIT) | ||
+ | FEATURE_MASK(FEATURE_TEMP_DEPENDENT_VMIN_BIT); | ||
|
||
if (adev->pm.pp_feature & PP_SCLK_DPM_MASK) | ||
*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_GFXCLK_BIT); | ||
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c | ||
index 0e4378420271..1e08cc5a1702 100644 | ||
--- a/drivers/gpu/drm/scheduler/sched_main.c | ||
+++ b/drivers/gpu/drm/scheduler/sched_main.c | ||
@@ -308,7 +308,8 @@ static void drm_sched_start_timeout(struct drm_gpu_scheduler *sched) | ||
*/ | ||
void drm_sched_fault(struct drm_gpu_scheduler *sched) | ||
{ | ||
- mod_delayed_work(sched->timeout_wq, &sched->work_tdr, 0); | ||
+ if (sched->ready) | ||
+ mod_delayed_work(sched->timeout_wq, &sched->work_tdr, 0); | ||
} | ||
EXPORT_SYMBOL(drm_sched_fault); | ||
|
||
diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig | ||
index dc6816d36d06..bda249068182 100644 | ||
--- a/drivers/leds/trigger/Kconfig | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From cbcd9e3198b7d93339f80452d765183b6fe5f30b Mon Sep 17 00:00:00 2001 | ||
From 44c369d8ceca091040f847df8e2e9e15df9dc300 Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Mon, 17 Apr 2023 18:25:39 +0200 | ||
Subject: [PATCH 05/12] fs-patches | ||
Date: Sat, 22 Apr 2023 11:43:38 +0200 | ||
Subject: [PATCH 05/13] fs-patches | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From a22a87b1984afabbd1f3f9963647e5a4198efedc Mon Sep 17 00:00:00 2001 | ||
From f20814462752f28649096c4de6604e56ca1091dc Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Mon, 17 Apr 2023 18:32:06 +0200 | ||
Subject: [PATCH 06/12] Implement amd-pstate guided driver | ||
Subject: [PATCH 06/13] Implement amd-pstate guided driver | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 0f6a1f135f27479417b7e57a2cdd75e1d736b83a Mon Sep 17 00:00:00 2001 | ||
From a4c03062611ae066405d1ec08eed628e8d1640f2 Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Mon, 17 Apr 2023 18:28:52 +0200 | ||
Subject: [PATCH 07/12] ksm | ||
Subject: [PATCH 07/13] ksm | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
Oops, something went wrong.