Commit 7f6f26d7 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next 



Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents 116b1c5a afa351a1

Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts. 


		The power controller will throttle the operating frequency

		if the power averaged over a window (typically seconds)

		exceeds this limit.

		exceeds this limit. A read value of 0 means that the PL1

		power limit is disabled, writing 0 disables the

		limit. Writing values > 0 will enable the power limit.



		Only supported for particular Intel i915 graphics platforms.

Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml

+1 −4
Original line number Diff line number Diff line
@@ -27,13 +27,10 @@ properties: 
          - const: mediatek,mt8192-disp-ccorr

      - items:

          - enum:

              - mediatek,mt8186-disp-ccorr

              - mediatek,mt8188-disp-ccorr

              - mediatek,mt8195-disp-ccorr

          - const: mediatek,mt8192-disp-ccorr

      - items:

          - enum:

              - mediatek,mt8186-disp-ccorr

          - const: mediatek,mt8192-disp-ccorr



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml

0 → 100644
+182 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/mediatek/mediatek,ethdr.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MediaTek Ethdr Device



maintainers:

  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>



description:

  ETHDR (ET High Dynamic Range) is a MediaTek internal HDR engine and is

  designed for HDR video and graphics conversion in the external display path.

  It handles multiple HDR input types and performs tone mapping, color

  space/color format conversion, and then combine different layers,

  output the required HDR or SDR signal to the subsequent display path.

  This engine is composed of two video frontends, two graphic frontends,

  one video backend and a mixer. ETHDR has two DMA function blocks, DS and ADL.

  These two function blocks read the pre-programmed registers from DRAM and

  set them to HW in the v-blanking period.



properties:

  compatible:

    const: mediatek,mt8195-disp-ethdr



  reg:

    maxItems: 7



  reg-names:

    items:

      - const: mixer

      - const: vdo_fe0

      - const: vdo_fe1

      - const: gfx_fe0

      - const: gfx_fe1

      - const: vdo_be

      - const: adl_ds



  interrupts:

    maxItems: 1



  iommus:

    minItems: 1

    maxItems: 2



  clocks:

    items:

      - description: mixer clock

      - description: video frontend 0 clock

      - description: video frontend 1 clock

      - description: graphic frontend 0 clock

      - description: graphic frontend 1 clock

      - description: video backend clock

      - description: autodownload and menuload clock

      - description: video frontend 0 async clock

      - description: video frontend 1 async clock

      - description: graphic frontend 0 async clock

      - description: graphic frontend 1 async clock

      - description: video backend async clock

      - description: ethdr top clock



  clock-names:

    items:

      - const: mixer

      - const: vdo_fe0

      - const: vdo_fe1

      - const: gfx_fe0

      - const: gfx_fe1

      - const: vdo_be

      - const: adl_ds

      - const: vdo_fe0_async

      - const: vdo_fe1_async

      - const: gfx_fe0_async

      - const: gfx_fe1_async

      - const: vdo_be_async

      - const: ethdr_top



  power-domains:

    maxItems: 1



  resets:

    items:

      - description: video frontend 0 async reset

      - description: video frontend 1 async reset

      - description: graphic frontend 0 async reset

      - description: graphic frontend 1 async reset

      - description: video backend async reset



  reset-names:

    items:

      - const: vdo_fe0_async

      - const: vdo_fe1_async

      - const: gfx_fe0_async

      - const: gfx_fe1_async

      - const: vdo_be_async



  mediatek,gce-client-reg:

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

    minItems: 1

    maxItems: 7

    description: The register of display function block to be set by gce.

      There are 4 arguments in this property, gce node, subsys id, offset and

      register size. The subsys id is defined in the gce header of each chips

      include/dt-bindings/gce/<chip>-gce.h, mapping to the register of display

      function block.



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - interrupts

  - power-domains

  - resets

  - mediatek,gce-client-reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/mt8195-clk.h>

    #include <dt-bindings/gce/mt8195-gce.h>

    #include <dt-bindings/memory/mt8195-memory-port.h>

    #include <dt-bindings/power/mt8195-power.h>

    #include <dt-bindings/reset/mt8195-resets.h>



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        hdr-engine@1c114000 {

                compatible = "mediatek,mt8195-disp-ethdr";

                reg = <0 0x1c114000 0 0x1000>,

                      <0 0x1c115000 0 0x1000>,

                      <0 0x1c117000 0 0x1000>,

                      <0 0x1c119000 0 0x1000>,

                      <0 0x1c11a000 0 0x1000>,

                      <0 0x1c11b000 0 0x1000>,

                      <0 0x1c11c000 0 0x1000>;

                reg-names = "mixer", "vdo_fe0", "vdo_fe1", "gfx_fe0", "gfx_fe1",

                            "vdo_be", "adl_ds";

                mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0x4000 0x1000>,

                                          <&gce0 SUBSYS_1c11XXXX 0x5000 0x1000>,

                                          <&gce0 SUBSYS_1c11XXXX 0x7000 0x1000>,

                                          <&gce0 SUBSYS_1c11XXXX 0x9000 0x1000>,

                                          <&gce0 SUBSYS_1c11XXXX 0xa000 0x1000>,

                                          <&gce0 SUBSYS_1c11XXXX 0xb000 0x1000>,

                                          <&gce0 SUBSYS_1c11XXXX 0xc000 0x1000>;

                clocks = <&vdosys1 CLK_VDO1_DISP_MIXER>,

                         <&vdosys1 CLK_VDO1_HDR_VDO_FE0>,

                         <&vdosys1 CLK_VDO1_HDR_VDO_FE1>,

                         <&vdosys1 CLK_VDO1_HDR_GFX_FE0>,

                         <&vdosys1 CLK_VDO1_HDR_GFX_FE1>,

                         <&vdosys1 CLK_VDO1_HDR_VDO_BE>,

                         <&vdosys1 CLK_VDO1_26M_SLOW>,

                         <&vdosys1 CLK_VDO1_HDR_VDO_FE0_DL_ASYNC>,

                         <&vdosys1 CLK_VDO1_HDR_VDO_FE1_DL_ASYNC>,

                         <&vdosys1 CLK_VDO1_HDR_GFX_FE0_DL_ASYNC>,

                         <&vdosys1 CLK_VDO1_HDR_GFX_FE1_DL_ASYNC>,

                         <&vdosys1 CLK_VDO1_HDR_VDO_BE_DL_ASYNC>,

                         <&topckgen CLK_TOP_ETHDR>;

                clock-names = "mixer", "vdo_fe0", "vdo_fe1", "gfx_fe0", "gfx_fe1",

                              "vdo_be", "adl_ds", "vdo_fe0_async", "vdo_fe1_async",

                              "gfx_fe0_async", "gfx_fe1_async","vdo_be_async",

                              "ethdr_top";

                power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;

                iommus = <&iommu_vpp M4U_PORT_L3_HDR_DS>,

                         <&iommu_vpp M4U_PORT_L3_HDR_ADL>;

                interrupts = <GIC_SPI 517 IRQ_TYPE_LEVEL_HIGH 0>; /* disp mixer */

                resets = <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE0_DL_ASYNC>,

                         <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE1_DL_ASYNC>,

                         <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE0_DL_ASYNC>,

                         <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE1_DL_ASYNC>,

                         <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_BE_DL_ASYNC>;

                reset-names = "vdo_fe0_async", "vdo_fe1_async", "gfx_fe0_async",

                              "gfx_fe1_async", "vdo_be_async";

        };

    };

...

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: