Commit 1d36dffa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2020-12-11' of git://anongit.freedesktop.org/drm/drm 

Pull drm updates from Dave Airlie:
 "Not a huge amount of big things here, AMD has support for a few new HW
  variants (vangogh, green sardine, dimgrey cavefish), Intel has some
  more DG1 enablement. We have a few big reworks of the TTM layers and
  interfaces, GEM and atomic internal API reworks cross tree. fbdev is
  marked orphaned in here as well to reflect the current reality.

  core:
   - documentation updates
   - deprecate DRM_FORMAT_MOD_NONE
   - atomic crtc enable/disable rework
   - GEM convert drivers to gem object functions
   - remove SCATTER_LIST_MAX_SEGMENT

  sched:
   - avoid infinite waits

  ttm:
   - remove AGP support
   - don't modify caching for swapout
   - ttm pinning rework
   - major TTM reworks
   - new backend allocator
   - multihop support

  vram-helper:
   - top down BO placement fix
   - TTM changes
   - GEM object support

  displayport:
   - DP 2.0 DPCD prep work
   - DP MST extended DPCD caps

  fbdev:
   - mark as orphaned

  amdgpu:
   - Initial Vangogh support
   - Green Sardine support
   - Dimgrey Cavefish support
   - SG display support for renoir
   - SMU7 improvements
   - gfx9+ modiifier support
   - CI BACO fixes

  radeon:
   - expose voltage via hwmon on SUMO

  amdkfd:
   - fix unique id handling

  i915:
   - more DG1 enablement
   - bigjoiner support
   - integer scaling filter support
   - async flip support
   - ICL+ DSI command mode
   - Improve display shutdown
   - Display refactoring
   - eLLC machine fbdev loading fix
   - dma scatterlist fixes
   - TGL hang fixes
   - eLLC display buffer caching on SKL+
   - MOCS PTE seeting for gen9+

  msm:
   - Shutdown hook
   - GPU cooling device support
   - DSI 7nm and 10nm phy/pll updates
   - sm8150/sm2850 DPU support
   - GEM locking re-work
   - LLCC system cache support

  aspeed:
   - sysfs output config support

  ast:
   - LUT fix
   - new display mode

  gma500:
   - remove 2d framebuffer accel

  panfrost:
   - move gpu reset to a worker

  exynos:
   - new HDMI mode support

  mediatek:
   - MT8167 support
   - yaml bindings
   - MIPI DSI phy code moved

  etnaviv:
   - new perf counter
   - more lockdep annotation

  hibmc:
   - i2c DDC support

  ingenic:
   - pixel clock reset fix
   - reserved memory support
   - allow both DMA channels at once
   - different pixel format support
   - 30/24/8-bit palette modes

  tilcdc:
   - don't keep vblank irq enabled

  vc4:
   - new maintainer added
   - DSI registration fix

  virtio:
   - blob resource support
   - host visible and cross-device support
   - uuid api support"

* tag 'drm-next-2020-12-11' of git://anongit.freedesktop.org/drm/drm: (1754 commits)
  drm/amdgpu: Initialise drm_gem_object_funcs for imported BOs
  drm/amdgpu: fix size calculation with stolen vga memory
  drm/amdgpu: remove amdgpu_ttm_late_init  and amdgpu_bo_late_init
  drm/amdgpu: free the pre-OS console framebuffer after the first modeset
  drm/amdgpu: enable runtime pm using BACO on CI dGPUs
  drm/amdgpu/cik: enable BACO reset on Bonaire
  drm/amd/pm: update smu10.h WORKLOAD_PPLIB setting for raven
  drm/amd/pm: remove one unsupported smu function for vangogh
  drm/amd/display: setup system context for APUs
  drm/amd/display: add S/G support for Vangogh
  drm/amdkfd: Fix leak in dmabuf import
  drm/amdgpu: use AMDGPU_NUM_VMID when possible
  drm/amdgpu: fix sdma instance fw version and feature version init
  drm/amd/pm: update driver if version for dimgrey_cavefish
  drm/amd/display: 3.2.115
  drm/amd/display: [FW Promotion] Release 0.0.45
  drm/amd/display: Revert DCN2.1 dram_clock_change_latency update
  drm/amd/display: Enable gpu_vm_support for dcn3.01
  drm/amd/display: Fixed the audio noise during mode switching with HDCP mode on
  drm/amd/display: Add wm table for Renoir
  ...
parents 2c85ebc5 b1073352

Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml

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

# Copyright 2019 Analogix Semiconductor, Inc.

%YAML 1.2

---

$id: "http://devicetree.org/schemas/display/bridge/analogix,anx7625.yaml#"

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



title: Analogix ANX7625 SlimPort (4K Mobile HD Transmitter)



maintainers:

  - Xin Ji <xji@analogixsemi.com>



description: |

  The ANX7625 is an ultra-low power 4K Mobile HD Transmitter

  designed for portable devices.



properties:

  compatible:

    items:

      - const: analogix,anx7625



  reg:

    maxItems: 1



  interrupts:

    description: used for interrupt pin B8.

    maxItems: 1



  enable-gpios:

    description: used for power on chip control, POWER_EN pin D2.

    maxItems: 1



  reset-gpios:

    description: used for reset chip control, RESET_N pin B7.

    maxItems: 1



  ports:

    type: object



    properties:

      port@0:

        type: object

        description:

          Video port for MIPI DSI input.



      port@1:

        type: object

        description:

          Video port for panel or connector.



    required:

        - port@0

        - port@1



required:

  - compatible

  - reg

  - ports



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    i2c0 {

        #address-cells = <1>;

        #size-cells = <0>;



        encoder@58 {

            compatible = "analogix,anx7625";

            reg = <0x58>;

            enable-gpios = <&pio 45 GPIO_ACTIVE_HIGH>;

            reset-gpios = <&pio 73 GPIO_ACTIVE_HIGH>;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                mipi2dp_bridge_in: port@0 {

                    reg = <0>;

                    anx7625_in: endpoint {

                        remote-endpoint = <&mipi_dsi>;

                    };

                };



                mipi2dp_bridge_out: port@1 {

                    reg = <1>;

                    anx7625_out: endpoint {

                        remote-endpoint = <&panel_in>;

                    };

                };

            };

        };

    };

Documentation/devicetree/bindings/display/bridge/intel,keembay-dsi.yaml

0 → 100644
+101 −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/bridge/intel,keembay-dsi.yaml#

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



title: Devicetree bindings for Intel Keem Bay mipi dsi controller



maintainers:

  - Anitha Chrisanthus <anitha.chrisanthus@intel.com>

  - Edmond J Dea <edmund.j.dea@intel.com>



properties:

  compatible:

    const: intel,keembay-dsi



  reg:

    items:

      - description: MIPI registers range



  reg-names:

    items:

      - const: mipi



  clocks:

    items:

      - description: MIPI DSI clock

      - description: MIPI DSI econfig clock

      - description: MIPI DSI config clock



  clock-names:

    items:

      - const: clk_mipi

      - const: clk_mipi_ecfg

      - const: clk_mipi_cfg



  ports:

    type: object



    properties:

      '#address-cells':

       const: 1



      '#size-cells':

       const: 0



      port@0:

        type: object

        description: MIPI DSI input port.



      port@1:

        type: object

        description: DSI output port.



    required:

      - port@0

      - port@1



    additionalProperties: false



required:

  - compatible

  - reg

  - reg-names

  - clocks

  - clock-names

  - ports



additionalProperties: false



examples:

  - |

    mipi-dsi@20900000 {

        compatible = "intel,keembay-dsi";

        reg = <0x20900000 0x4000>;

        reg-names = "mipi";

        clocks = <&scmi_clk 0x86>,

                 <&scmi_clk 0x88>,

                 <&scmi_clk 0x89>;

        clock-names = "clk_mipi", "clk_mipi_ecfg",

                      "clk_mipi_cfg";



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

                dsi_in: endpoint {

                    remote-endpoint = <&disp_out>;

                };

            };



            port@1 {

                reg = <1>;

                dsi_out: endpoint {

                    remote-endpoint = <&adv7535_input>;

                };

            };

        };

    };

Documentation/devicetree/bindings/display/bridge/lontium,lt9611.yaml

+3 −2
Original line number Diff line number Diff line
@@ -4,18 +4,19 @@ 
$id: http://devicetree.org/schemas/display/bridge/lontium,lt9611.yaml#

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



title: Lontium LT9611 2 Port MIPI to HDMI Bridge

title: Lontium LT9611(UXC) 2 Port MIPI to HDMI Bridge



maintainers:

  - Vinod Koul <vkoul@kernel.org>



description: |

  The LT9611 is a bridge device which converts DSI to HDMI

  The LT9611 and LT9611UXC are bridge devices which convert DSI to HDMI



properties:

  compatible:

    enum:

      - lontium,lt9611

      - lontium,lt9611uxc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/bridge/sii902x.txt

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Optional properties: 
	- interrupts: describe the interrupt line used to inform the host

	  about hotplug events.

	- reset-gpios: OF device-tree gpio specification for RST_N pin.

	- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)

	- cvcc12-supply: Digital Core Supply Voltage (1.2V)



	HDMI audio properties:

	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example: 
		compatible = "sil,sii9022";

		reg = <0x39>;

		reset-gpios = <&pioA 1 0>;

		iovcc-supply = <&v3v3_hdmi>;

		cvcc12-supply = <&v1v2_hdmi>;



		#sound-dai-cells = <0>;

		sil,i2s-data-lanes = < 0 1 2 >;

Documentation/devicetree/bindings/display/intel,keembay-display.yaml

0 → 100644
+72 −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/intel,keembay-display.yaml#

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



title: Devicetree bindings for Intel Keem Bay display controller



maintainers:

  - Anitha Chrisanthus <anitha.chrisanthus@intel.com>

  - Edmond J Dea <edmund.j.dea@intel.com>



properties:

  compatible:

    const: intel,keembay-display



  reg:

    items:

      - description: LCD registers range



  reg-names:

    items:

      - const: lcd



  clocks:

    items:

      - description: LCD controller clock

      - description: pll0 clock



  clock-names:

    items:

      - const: clk_lcd

      - const: clk_pll0



  interrupts:

    maxItems: 1



  port:

    type: object

    description: Display output node to DSI.



required:

  - compatible

  - reg

  - reg-names

  - clocks

  - clock-names

  - interrupts

  - port



additionalProperties: false



examples:

  - |

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

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



    display@20930000 {

        compatible = "intel,keembay-display";

        reg = <0x20930000 0x3000>;

        reg-names = "lcd";

        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&scmi_clk 0x83>,

                 <&scmi_clk 0x0>;

        clock-names = "clk_lcd", "clk_pll0";



        port {

            disp_out: endpoint {

                remote-endpoint = <&dsi_in>;

            };

        };

    };

CRA Git | Maintained and supported by SUSTech CRA and CCSE