forked from armbian/build
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sm8250: bump current and edge to 6.12
- Loading branch information
1 parent
55adb93
commit 9eaaaae
Showing
45 changed files
with
558 additions
and
302 deletions.
There are no files selected for viewing
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
96 changes: 0 additions & 96 deletions
96
...ernel/archive/sm8250-6.11/0019-arm64-dts-qcom-sm8250-move-lpass-codec-macros-to-use.patch
This file was deleted.
Oops, something went wrong.
43 changes: 0 additions & 43 deletions
43
patch/kernel/archive/sm8250-6.11/0025-drm-mipi-dsi-add-set-column-page-multi-helpers.patch
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
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
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 |
|---|---|---|
|
|
@@ -5,8 +5,8 @@ Subject: arm64: dts: qcom: sm8250-xiaomi-elish: enable wifi and bluetooth | |
|
|
||
| Signed-off-by: Jianhua Lu <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 113 ++++++++++ | ||
| 1 file changed, 113 insertions(+) | ||
| arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 115 ++++++++++ | ||
| 1 file changed, 115 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | ||
| index 111111111111..222222222222 100644 | ||
|
|
@@ -91,7 +91,7 @@ index 111111111111..222222222222 100644 | |
| reserved-memory { | ||
| xbl_aop_mem: xbl-aop@80600000 { | ||
| reg = <0x0 0x80600000 0x0 0x260000>; | ||
| @@ -619,6 +684,23 @@ &pcie0_phy { | ||
| @@ -619,6 +684,25 @@ &pcie0_phy { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
|
|
@@ -109,13 +109,15 @@ index 111111111111..222222222222 100644 | |
| + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>; | ||
| + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; | ||
| + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; | ||
| + | ||
| + qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro"; | ||
| + }; | ||
| +}; | ||
| + | ||
| &pm8150_gpios { | ||
| vol_up_n: vol-up-n-state { | ||
| pins = "gpio6"; | ||
| @@ -701,6 +783,37 @@ &slpi { | ||
| @@ -701,6 +785,37 @@ &slpi { | ||
|
|
||
| &tlmm { | ||
| gpio-reserved-ranges = <40 4>; | ||
|
|
||
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
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
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
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
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 |
|---|---|---|
|
|
@@ -10,37 +10,29 @@ available. | |
|
|
||
| Signed-off-by: Dmitry Baryshkov <[email protected]> | ||
| --- | ||
| drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 ++++-- | ||
| drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++- | ||
| drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + | ||
| drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 14 +++++++--- | ||
| drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 1 + | ||
| 4 files changed, 18 insertions(+), 6 deletions(-) | ||
| 4 files changed, 17 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | ||
| index 111111111111..222222222222 100644 | ||
| --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | ||
| +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | ||
| @@ -1180,14 +1180,18 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, | ||
| @@ -1198,7 +1198,11 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, | ||
| return; | ||
| } | ||
|
|
||
| - if (!hw_ctl[i]) { | ||
| - phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; | ||
| + /* Use first (and only) CTL if active CTLs are supported */ | ||
| + if (dpu_kms->catalog->caps->has_active_ctls) | ||
| + phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[0]); | ||
| + else | ||
| + phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]); | ||
| + if (!phys->hw_ctl) { | ||
| + phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; | ||
| if (!phys->hw_ctl) { | ||
| DPU_ERROR_ENC(dpu_enc, | ||
| "no ctl block assigned at idx: %d\n", i); | ||
| return; | ||
| } | ||
|
|
||
| phys->hw_pp = dpu_enc->hw_pp[i]; | ||
| - phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]); | ||
|
|
||
| phys->cached_mode = crtc_state->adjusted_mode; | ||
| if (phys->ops.atomic_mode_set) | ||
| diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | ||
| index 111111111111..222222222222 100644 | ||
| --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | ||
|
|
||
File renamed without changes.
File renamed without changes.
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
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
File renamed without changes.
File renamed without changes.
Oops, something went wrong.