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

Commit 5b7da258 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: display-port: add support for hdcp 2.2"

parents c3b776a3 5068a5df

Documentation/devicetree/bindings/fb/mdss-mdp.txt

+2 −0
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ Subnode properties: 
			 Example: Width = 1920, Height = 1080, BytesPerPixel = 4,

			 Number of frame-buffers reserved = 2.

			 Size = 1920*1080*4*2 = ROUND_1MB(15.8MB) = 16MB.

- qcom,mdss-intf:	Phandle to the kernel driver module that is mapped to the

			frame buffer virtual device.

- qcom,mdss-fb-splash-logo-enabled:    The boolean entry enables the framebuffer

					driver to display the splash logo image.

					It is independent of continuous splash

arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -268,11 +268,13 @@ 
		mdss_fb2: qcom,mdss_fb_hdmi {

			cell-index = <2>;

			compatible = "qcom,mdss-fb";

			qcom,mdss-intf = <&mdss_hdmi_tx>;

		};



		mdss_fb3: qcom,mdss_fb_dp {

			cell-index = <3>;

			compatible = "qcom,mdss-fb";

			qcom,mdss-intf = <&mdss_dp_ctrl>;

		};



	};

drivers/video/fbdev/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ obj-$(CONFIG_FB_MSM_MDSS) += mdss_dba_utils.o 
obj-$(CONFIG_FB_MSM_MDSS) += mdss_hdcp_1x.o

obj-$(CONFIG_FB_MSM_MDSS_DP_PANEL) += mdss_dp.o mdss_dp_util.o

obj-$(CONFIG_FB_MSM_MDSS_DP_PANEL) += mdss_dp_aux.o

obj-$(CONFIG_FB_MSM_MDSS_DP_PANEL) += mdss_dp_hdcp2p2.o



obj-$(CONFIG_FB_MSM_MDSS) += mdss_io_util.o

obj-$(CONFIG_FB_MSM_MDSS) += msm_ext_display.o

drivers/video/fbdev/msm/mdss_dp.c

+557 −144

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/fbdev/msm/mdss_dp.h

+96 −14

File changed.

Preview size limit exceeded, changes collapsed.