Commit 6bfb8b58 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

Merge branches 'msm-next-lumag-dp', 'msm-next-lumag-dsi',... 


Merge branches 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag

Core:
 - Bugfixes for error handling during probe
 - rework UBWC decoder programming
 - prepare_commit cleanup
 - bindings for SM8550 (MDSS, DPU), SM8450 (DP)
 - uapi C++ compatibility fix
 - timeout calculation fixup
 - msm_fbdev conversion to drm_client

DP:
 - interrupts cleanup

DPU:
 - DSPP sub-block flush on sc7280
 - support AR30 in addition to XR30 format
 - Allow using REC_0 and REC_1 to handle wide (4k) RGB planes

DSI:
 - rework DSI instance ID detection on obscure platforms

and misc small fixes as usual.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parents 2470e932 eef01b4e 7360fc8b 6fda1c94 db1072e1

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

+15 −10
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ description: | 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,sc7180-dp

          - qcom,sc7280-dp

          - qcom,sc7280-edp
@@ -25,6 +26,10 @@ properties: 
          - qcom,sc8280xp-edp

          - qcom,sdm845-dp

          - qcom,sm8350-dp

      - items:

          - enum:

              - qcom,sm8450-dp

          - const: qcom,sm8350-dp



  reg:

    minItems: 4

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

+5 −4
Original line number Diff line number Diff line
@@ -25,16 +25,16 @@ properties: 
              - qcom,sc7280-dsi-ctrl

              - qcom,sdm660-dsi-ctrl

              - qcom,sdm845-dsi-ctrl

              - qcom,sm6115-dsi-ctrl

              - qcom,sm8150-dsi-ctrl

              - qcom,sm8250-dsi-ctrl

              - qcom,sm8350-dsi-ctrl

              - qcom,sm8450-dsi-ctrl

              - qcom,sm8550-dsi-ctrl

          - const: qcom,mdss-dsi-ctrl

      - items:

      - enum:

              - dsi-ctrl-6g-qcm2290

          - const: qcom,mdss-dsi-ctrl

          - qcom,dsi-ctrl-6g-qcm2290

          - qcom,mdss-dsi-ctrl # This should always come with an SoC-specific compatible

        deprecated: true



  reg:
@@ -351,6 +351,7 @@ allOf: 
          contains:

            enum:

              - qcom,sdm845-dsi-ctrl

              - qcom,sm6115-dsi-ctrl

    then:

      properties:

        clocks:

Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml

+8 −2
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ patternProperties: 
    type: object

    properties:

      compatible:

        oneOf:

          - items:

              - const: qcom,sm6115-dsi-ctrl

              - const: qcom,mdss-dsi-ctrl

          - description: Old binding, please don't use

            deprecated: true

            const: qcom,dsi-ctrl-6g-qcm2290



  "^phy@[0-9a-f]+$":
@@ -114,7 +120,7 @@ examples: 
        };



        dsi@5e94000 {

            compatible = "qcom,dsi-ctrl-6g-qcm2290";

            compatible = "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl";

            reg = <0x05e94000 0x400>;

            reg-names = "dsi_ctrl";

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+0 −5
Original line number Diff line number Diff line
@@ -84,10 +84,6 @@ static void mdp4_disable_commit(struct msm_kms *kms) 
	mdp4_disable(mdp4_kms);

}



static void mdp4_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state)

{

}



static void mdp4_flush_commit(struct msm_kms *kms, unsigned crtc_mask)

{

	/* TODO */
@@ -154,7 +150,6 @@ static const struct mdp_kms_funcs kms_funcs = { 
		.disable_vblank  = mdp4_disable_vblank,

		.enable_commit   = mdp4_enable_commit,

		.disable_commit  = mdp4_disable_commit,

		.prepare_commit  = mdp4_prepare_commit,

		.flush_commit    = mdp4_flush_commit,

		.wait_flush      = mdp4_wait_flush,

		.complete_commit = mdp4_complete_commit,

drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static const struct mdp5_cfg_hw msm8x96_config = { 
	.max_clk = 412500000,

};



const struct mdp5_cfg_hw msm8x76_config = {

static const struct mdp5_cfg_hw msm8x76_config = {

	.name = "msm8x76",

	.mdp = {

		.count = 1,