Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d92802c8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '7b2ef2bf' into msm-4.14"

parents 4eec16d7 65c214b9

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-fhd-plus-cmd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
		qcom,mdss-dsi-panel-name =

		  "sw43404 amoled boe fhd+ panel with DSC";

		qcom,mdss-dsi-panel-type = "dsi_cmd_mode";

		qcom,mdss-dsi-panel-physical-type = "oled";

		qcom,mdss-dsi-virtual-channel-id = <0>;

		qcom,mdss-dsi-stream = <0>;

		qcom,mdss-dsi-bpp = <24>;

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
		qcom,mdss-dsi-panel-name =

			"sw43404 amoled cmd mode dsi boe panel with DSC";

		qcom,mdss-dsi-panel-type = "dsi_cmd_mode";

		qcom,mdss-dsi-panel-physical-type = "oled";

		qcom,mdss-dsi-virtual-channel-id = <0>;

		qcom,mdss-dsi-stream = <0>;

		qcom,mdss-dsi-bpp = <24>;

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-wqhd-video.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
	qcom,mdss-dsi-panel-name =

		"sw43404 amoled video mode dsi boe panel with DSC";

	qcom,mdss-dsi-panel-type = "dsi_video_mode";

	qcom,mdss-dsi-panel-physical-type = "oled";

	qcom,mdss-dsi-virtual-channel-id = <0>;

	qcom,mdss-dsi-stream = <0>;

	qcom,mdss-dsi-bpp = <24>;

arch/arm64/boot/dts/qcom/sm6150-sde.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -474,17 +474,17 @@ 
			<0x88e9000 0x17c>,

			<0x88e9400 0x10c>,

			<0x88e9800 0x10c>,

			<0xaf02000 0x1a0>,

			<0xaf02130 0x8>,

			<0x780000 0x621c>,

			<0x88e9c30 0x10>,

			<0xaee1000 0x34>,

			<0x1fcb200 0x50>,

			<0x1fcb24c 0x4>,

			<0xae91000 0x098>;



		/* dp_ctrl: dp_ahb, dp_aux, dp_link, dp_p0 */

		reg-names = "dp_ahb", "dp_aux", "dp_link",

			"dp_p0", "dp_phy", "dp_ln_tx0", "dp_ln_tx1",

			"dp_mmss_cc", "qfprom_physical", "dp_pll",

			"dp_pixel_mn", "qfprom_physical", "dp_pll",

			"hdcp_physical", "dp_tcsr","dp_p1";



		interrupt-parent = <&mdss_mdp>;

drivers/gpu/drm/msm/dp/dp_catalog.c

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct dp_catalog_io { 
	struct dp_io_data *hdcp_physical;

	struct dp_io_data *dp_p1;

	struct dp_io_data *dp_tcsr;

	struct dp_io_data *dp_pixel_mn;

};



/* audio related catalog functions */
@@ -2386,6 +2387,7 @@ static void dp_catalog_get_io_buf(struct dp_catalog_private *catalog) 
	dp_catalog_fill_io_buf(hdcp_physical);

	dp_catalog_fill_io_buf(dp_p1);

	dp_catalog_fill_io_buf(dp_tcsr);

	dp_catalog_fill_io_buf(dp_pixel_mn);

}



static void dp_catalog_get_io(struct dp_catalog_private *catalog)
@@ -2405,6 +2407,7 @@ static void dp_catalog_get_io(struct dp_catalog_private *catalog) 
	dp_catalog_fill_io(hdcp_physical);

	dp_catalog_fill_io(dp_p1);

	dp_catalog_fill_io(dp_tcsr);

	dp_catalog_fill_io(dp_pixel_mn);

}



static void dp_catalog_set_exe_mode(struct dp_catalog *dp_catalog, char *mode)