Commit db22583d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

Merge branches 'msm-next-lumag-dpu' and 'msm-next-lumag-dsi' into msm-next-lumag

parents 6452cbd6 201d4174

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - qcom,sc7280-edp

      - qcom,sc8180x-dp

      - qcom,sc8180x-edp

      - qcom,sm8350-dp



  reg:

    items:

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

+3 −2
Original line number Diff line number Diff line
@@ -14,8 +14,9 @@ allOf: 


properties:

  compatible:

    items:

      - const: qcom,mdss-dsi-ctrl

    enum:

      - qcom,mdss-dsi-ctrl

      - qcom,dsi-ctrl-6g-qcm2290



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml

+36 −0
Original line number Diff line number Diff line
@@ -35,6 +35,38 @@ properties: 
      Connected to DSI0_MIPI_DSI_PLL_VDDA0P9 pin for sc7180 target and

      connected to VDDA_MIPI_DSI_0_PLL_0P9 pin for sdm845 target



  qcom,phy-rescode-offset-top:

    $ref: /schemas/types.yaml#/definitions/int8-array

    minItems: 5

    maxItems: 5

    description:

      Integer array of offset for pull-up legs rescode for all five lanes.

      To offset the drive strength from the calibrated value in an increasing

      manner, -32 is the weakest and +31 is the strongest.

    items:

      minimum: -32

      maximum: 31



  qcom,phy-rescode-offset-bot:

    $ref: /schemas/types.yaml#/definitions/int8-array

    minItems: 5

    maxItems: 5

    description:

      Integer array of offset for pull-down legs rescode for all five lanes.

      To offset the drive strength from the calibrated value in a decreasing

      manner, -32 is the weakest and +31 is the strongest.

    items:

      minimum: -32

      maximum: 31



  qcom,phy-drive-ldo-level:

    $ref: "/schemas/types.yaml#/definitions/uint32"

    description:

      The PHY LDO has an amplitude tuning feature to adjust the LDO output

      for the HSTX drive. Use supported levels (mV) to offset the drive level

      from the default value.

    enum: [ 375, 400, 425, 450, 475, 500 ]



required:

  - compatible

  - reg
@@ -64,5 +96,9 @@ examples: 
         clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,

                  <&rpmhcc RPMH_CXO_CLK>;

         clock-names = "iface", "ref";



         qcom,phy-rescode-offset-top = /bits/ 8 <0 0 0 0 0>;

         qcom,phy-rescode-offset-bot = /bits/ 8 <0 0 0 0 0>;

         qcom,phy-drive-ldo-level = <400>;

     };

...

drivers/gpu/drm/msm/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ config DRM_MSM_GPU_STATE 
	depends on DRM_MSM && (DEBUG_FS || DEV_COREDUMP)

	default y



config DRM_MSM_REGISTER_LOGGING

	bool "MSM DRM register logging"

	depends on DRM_MSM

	default n

	help

	  Compile in support for logging register reads/writes in a format

	  that can be parsed by envytools demsm tool.  If enabled, register

	  logging can be switched on via msm.reglog=y module param.



config DRM_MSM_GPU_SUDO

	bool "Enable SUDO flag on submits"

	depends on DRM_MSM && EXPERT

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ msm-y := \ 
	msm_gem_vma.o \

	msm_gpu.o \

	msm_gpu_devfreq.o \

	msm_io_utils.o \

	msm_iommu.o \

	msm_perf.o \

	msm_rd.o \