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

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

Merge "drm: msm: dsi-staging: add support for dfps"

parents d40f0904 68892dee

Documentation/devicetree/bindings/display/msm/sde.txt

+19 −0
Original line number Diff line number Diff line
@@ -135,6 +135,18 @@ Optional properties: 
				power collapse feature available or not.

- qcom,sde-has-mixer-gc:	Boolean property to indicate if mixer has gamma correction

				feature available or not.

- qcom,sde-has-dest-scaler: 	Boolean property to indicate if destination scaler

				feature is available or not.

- qcom,sde-max-dest-scaler-input-linewidth: A u32 value indicates the

				maximum input line width to destination scaler.

- qcom,sde-max-dest-scaler-output-linewidth: A u32 value indicates the

				maximum output line width of destination scaler.

- qcom,sde-dest-scaler-top-off: A u32 value provides the

				offset from mdp base to destination scaler block.

- qcom,sde-dest-scaler-top-size: A u32 value indicates the address range for ds top

- qcom,sde-dest-scaler-off: 	Array of u32 offsets indicate the qseed3 scaler blocks

				offset from destination scaler top offset.

- qcom,sde-dest-scaler-size:    A u32 value indicates the address range for each scaler block

- qcom,sde-sspp-clk-ctrl:	Array of offsets describing clk control

				offsets for dynamic clock gating. 1st value

				in the array represents offset of the control
@@ -444,6 +456,8 @@ Example: 
    qcom,sde-dspp-off = <0x00055000 0x00057000>;

    qcom,sde-dspp-ad-off = <0x24000 0x22800>;

    qcom,sde-dspp-ad-version = <0x00030000>;

    qcom,sde-dest-scaler-top-off = <0x00061000>;

    qcom,sde-dest-scaler-off = <0x800 0x1000>;

    qcom,sde-wb-off = <0x00066000>;

    qcom,sde-wb-xin-id = <6>;

    qcom,sde-intf-off = <0x0006b000 0x0006b800
@@ -505,6 +519,8 @@ Example: 
    qcom,sde-cdm-size = <0x100>;

    qcom,sde-pp-size = <0x100>;

    qcom,sde-wb-size = <0x100>;

    qcom,sde-dest-scaler-top-size = <0xc>;

    qcom,sde-dest-scaler-size = <0x800>;

    qcom,sde-len = <0x100>;

    qcom,sde-wb-linewidth = <2560>;

    qcom,sde-sspp-scale-size = <0x100>;
@@ -514,6 +530,9 @@ Example: 
    qcom,sde-highest-bank-bit = <15>;

    qcom,sde-has-mixer-gc;

    qcom,sde-has-idle-pc;

    qcom,sde-has-dest-scaler;

    qcom,sde-max-dest-scaler-input-linewidth = <2048>;

    qcom,sde-max-dest-scaler-output-linewidth = <2560>;

    qcom,sde-sspp-max-rects = <1 1 1 1

				1 1 1 1

				1 1

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

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ 
		qcom,sde-dspp-off = <0x55000 0x57000 0x59000 0x5b000>;

		qcom,sde-dspp-size = <0x17e0>;



		qcom,sde-dest-scaler-top-off = <0x00061000>;

		qcom,sde-dest-scaler-top-size = <0xc>;

		qcom,sde-dest-scaler-off = <0x800 0x1000>;

		qcom,sde-dest-scaler-size = <0x800>;



		qcom,sde-wb-off = <0x66000>;

		qcom,sde-wb-size = <0x2c8>;

		qcom,sde-wb-xin-id = <6>;
@@ -129,6 +134,9 @@ 
		qcom,sde-has-src-split;

		qcom,sde-has-dim-layer;

		qcom,sde-has-idle-pc;

		qcom,sde-has-dest-scaler;

		qcom,sde-max-dest-scaler-input-linewidth = <2048>;

		qcom,sde-max-dest-scaler-output-linewidth = <2560>;

		qcom,sde-max-bw-low-kbps = <9600000>;

		qcom,sde-max-bw-high-kbps = <9600000>;

		qcom,sde-min-core-ib-kbps = <2400000>;

drivers/gpu/drm/msm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ msm_drm-$(CONFIG_DRM_MSM) += \ 
	sde/sde_hw_color_processing_v1_7.o \

	sde/sde_reg_dma.o \

	sde/sde_hw_reg_dma_v1.o \

	sde/sde_hw_dsc.o

	sde/sde_hw_dsc.o \

	sde/sde_hw_ds.o



msm_drm-$(CONFIG_DRM_SDE_WB) += sde/sde_wb.o \

	sde/sde_encoder_phys_wb.o

drivers/gpu/drm/msm/dsi-staging/dsi_catalog.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl, 
	ctrl->ops.video_engine_en        = dsi_ctrl_hw_cmn_video_engine_en;

	ctrl->ops.video_engine_setup     = dsi_ctrl_hw_cmn_video_engine_setup;

	ctrl->ops.set_video_timing       = dsi_ctrl_hw_cmn_set_video_timing;

	ctrl->ops.set_timing_db          = dsi_ctrl_hw_cmn_set_timing_db;

	ctrl->ops.cmd_engine_setup       = dsi_ctrl_hw_cmn_cmd_engine_setup;

	ctrl->ops.setup_cmd_stream       = dsi_ctrl_hw_cmn_setup_cmd_stream;

	ctrl->ops.ctrl_en                = dsi_ctrl_hw_cmn_ctrl_en;

drivers/gpu/drm/msm/dsi-staging/dsi_catalog.h

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ void dsi_ctrl_hw_cmn_video_engine_setup(struct dsi_ctrl_hw *ctrl, 
				       struct dsi_video_engine_cfg *cfg);

void dsi_ctrl_hw_cmn_set_video_timing(struct dsi_ctrl_hw *ctrl,

			 struct dsi_mode_info *mode);



void dsi_ctrl_hw_cmn_set_timing_db(struct dsi_ctrl_hw *ctrl,

				     bool enable);

void dsi_ctrl_hw_cmn_cmd_engine_setup(struct dsi_ctrl_hw *ctrl,

				     struct dsi_host_common_cfg *common_cfg,

				     struct dsi_cmd_engine_cfg *cfg);