Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion arch/arm64/boot/dts/qcom/sdm630.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,11 @@
};
*/
};

zap-shader {
memory-region = <&zap_shader_region>;
firmware-name = "a508_zap.mbn";
};
};

kgsl_smmu: iommu@5040000 {
Expand Down Expand Up @@ -1541,7 +1546,7 @@
};

mdss: display-subsystem@c900000 {
compatible = "qcom,mdss";
compatible = "qcom,sdm630-mdss", "qcom,mdss";
reg = <0x0c900000 0x1000>,
<0x0c9b0000 0x1040>;
reg-names = "mdss_phys", "vbif_phys";
Expand Down
3 changes: 1 addition & 2 deletions arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
/delete-node/ &qseecom_mem;
/delete-node/ &rmtfs_mem;
/delete-node/ &tz_mem;
/delete-node/ &zap_shader_region;

/ {
model = "Xiaomi Redmi Note 6 Pro";
Expand Down Expand Up @@ -510,4 +509,4 @@
vdd-3.3-ch0-supply = <&vreg_l19a_3p3>;

status = "okay";
};
};
79 changes: 78 additions & 1 deletion arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@
reset-gpios = <&tlmm 66 GPIO_ACTIVE_HIGH>;
touchscreen-size-x = <1080>;
touchscreen-size-y = <2340>;

status = "disabled";
};
};

Expand All @@ -140,6 +142,69 @@
};
};

&adreno_gpu {
status = "okay";
};

&gpucc{
status = "okay";
};

&kgsl_smmu {
status = "okay";
};

&mdp {
status = "okay";
};

&mdss {
status = "okay";
};

&mdss_dsi0 {
status = "okay";

#address-cells = <1>;
#size-cells = <0>;

vdd-supply = <&vreg_l1b_0p925>;
vdda-supply = <&vreg_l1a_1p225>;
panel@0 {
compatible = "xiaomi,lavender-td4320";
reg = <0>;

reset-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
//disp-te-gpios = <&tlmm 59 GPIO_ACTIVE_HIGH>;

backlight = <&pm660l_wled>;

pinctrl-names = "default";
pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;


port {
panel_in: endpoint {
remote-endpoint = <&mdss_dsi0_out>;
};
};
};
};

&mdss_dsi0_out {
data-lanes = <0 1 2 3>;
remote-endpoint = <&panel_in>;
};

&mdss_dsi0_phy {
vcca-supply = <&vreg_l1b_0p925>;
status = "okay";
};

&mmss_smmu {
status = "okay";
};

&lpass_smmu {
status = "okay";
};
Expand Down Expand Up @@ -487,6 +552,19 @@
&tlmm {
gpio-reserved-ranges = <8 4>;

mdss_dsi_active: mdss_dsi_active {
function = "gpio";
pins = "gpio53";
drive-strength = <8>;
bias-disable;
};
mdss_te_active: mdss_te_active {
pins = "gpio59";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};

ts_pins_active: ts-pins-active-state {
pins = "gpio66", "gpio67";
function = "gpio";
Expand Down Expand Up @@ -519,7 +597,6 @@
};

&venus {
firmware-name = "qcom/venus-4.4/venus.mdt";
status = "okay";
};

Expand Down
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/qcom/sdm660.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@
opp-supported-hw = <0xff>;
};
};

zap-shader {
firmware-name = "a512_zap.mbn";
};
};

&CPU0 {
Expand Down Expand Up @@ -155,6 +159,8 @@
};

&mdss {
compatible = "qcom,sdm660-mdss", "qcom,mdss";

mdss_dsi1: dsi@c996000 {
compatible = "qcom,sdm660-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/msm/adreno/a5xx_gpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)

check_speed_bin(&pdev->dev);

nr_rings = 4;
/* NOTE: Disable preemption until it is fixed */
nr_rings = 1;

if (config->info->revn == 510)
nr_rings = 1;
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/panel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -882,4 +882,5 @@ config DRM_PANEL_XINPENG_XPP055C272
Say Y here if you want to enable support for the Xinpeng
XPP055C272 controller for 720x1280 LCD panels with MIPI/RGB/SPI
system interfaces.
source "drivers/gpu/drm/panel/msm8916-generated/Kconfig"
endmenu
1 change: 1 addition & 0 deletions drivers/gpu/drm/panel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@ obj-$(CONFIG_DRM_PANEL_VISIONOX_VTDR6130) += panel-visionox-vtdr6130.o
obj-$(CONFIG_DRM_PANEL_VISIONOX_R66451) += panel-visionox-r66451.o
obj-$(CONFIG_DRM_PANEL_WIDECHIPS_WS2401) += panel-widechips-ws2401.o
obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o
obj-y += msm8916-generated/
12 changes: 12 additions & 0 deletions drivers/gpu/drm/panel/msm8916-generated/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
menu "MSM8916 panel drivers generated with linux-mdss-dsi-panel-driver-generator"
depends on GPIOLIB && OF && REGULATOR
depends on DRM_MIPI_DSI

config DRM_PANEL_MSM8916_GENERATED
tristate "Select all generated MSM8916 panel drivers by default"

config DRM_PANEL_XIAOMI_LAVENDER_TD4320
tristate "Xiaomi LAVENDER TD4320"
default DRM_PANEL_MSM8916_GENERATED

endmenu
1 change: 1 addition & 0 deletions drivers/gpu/drm/panel/msm8916-generated/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj-$(CONFIG_DRM_PANEL_XIAOMI_LAVENDER_TD4320) += panel-xiaomi-lavender-td4320.o
Loading