Commit 68a32ba1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm 

Pull drm updates from Dave Airlie:
 "The usual lots of work all over the place.

  i915 has gotten some Alderlake work and prelim DG1 code, along with a
  major locking rework over the GEM code, and brings back the property
  of timing out long running jobs using a watchdog. amdgpu has some
  Alderbran support (new GPU), freesync HDMI support along with a lot
  other fixes.

  Outside of the drm, there is a new printf specifier added which should
  have all the correct acks/sobs:

   - printk fourcc modifier support added %p4cc

  Summary:

  core:
   - drm_crtc_commit_wait
   - atomic plane state helpers reworked for full state
   - dma-buf heaps API rework
   - edid: rework and improvements for displayid

  dp-mst:
   - better topology logging

  bridge:
   - Chipone ICN6211
   - Lontium LT8912B
   - anx7625 regulator support

  panel:
   - fix lt9611 4k panels handling

  simple-kms:
   - add plane state helpers

  ttm:
   - debugfs support
   - removal of unused sysfs
   - ignore signaled moved fences
   - ioremap buffer according to mem caching

  i915:
   - Alderlake S enablement
   - Conversion to dma_resv_locking
   - Bring back watchdog timeout support
   - legacy ioctl cleanups
   - add GEM TDDO and RFC process
   - DG1 LMEM preparation work
   - intel_display.c refactoring
   - Gen9/TGL PCH combination support
   - eDP MSO Support
   - multiple PSR instance support
   - Link training debug updates
   - Disable PSR2 support on JSL/EHL
   - DDR5/LPDDR5 support for bw calcs
   - LSPCON limited to gen9/10 platforms
   - HSW/BDW async flip/VTd corruption workaround
   - SAGV watermark fixes
   - SNB hard hang on ring resume fix
   - Limit imported dma-buf size
   - move to use new tasklet API
   - refactor KBL/TGL/ADL-S display/gt steppings
   - refactoring legacy DP/HDMI, FB plane code out

  amdgpu:
   - uapi: add ioctl to query video capabilities
   - Iniital AMD Freesync HDMI support
   - Initial Adebaran support
   - 10bpc dithering improvements
   - DCN secure display support
   - Drop legacy IO BAR requirements
   - PCIE/S0ix/RAS/Prime/Reset fixes
   - Display ASSR support
   - SMU gfx busy queues for RV/PCO
   - Initial LTTPR display work

  amdkfd:
   - MMU notifier fixes
   - APU fixes

  radeon:
   - debugfs cleanps
   - fw error handling ifix
   - Flexible array cleanups

  msm:
   - big DSI phy/pll cleanup
   - sc7280 initial support
   - commong bandwidth scaling path
   - shrinker locking contention fixes
   - unpin/swap support for GEM objcets

  ast:
   - cursor plane handling reworked

  tegra:
   - don't register DP AUX channels before connectors

  zynqmp:
   - fix OOB struct padding memset

  gma500:
   - drop ttm and medfield support

  exynos:
   - request_irq cleanup function

  mediatek:
   - fine tune line time for EOTp
   - MT8192 dpi support
   - atomic crtc config updates
   - don't support HDMI connector creation

  mxsdb:
   - imx8mm support

  panfrost:
   - MMU IRQ handling rework

  qxl:
   - locking fixes
   - resource deallocation changes

  sun4i:
   - add alpha properties to UI/VI layers

  vc4:
   - RPi4 CEC support

  vmwgfx:
   - doc cleanups

  arc:
   - moved to drm/tiny"

* tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm: (1390 commits)
  drm/ttm: Don't count pages in SG BOs against pages_limit
  drm/ttm: fix return value check
  drm/bridge: lt8912b: fix incorrect handling of of_* return values
  drm: bridge: fix LONTIUM use of mipi_dsi_() functions
  drm: bridge: fix ANX7625 use of mipi_dsi_() functions
  drm/amdgpu: page retire over debugfs mechanism
  drm/radeon: Fix a missing check bug in radeon_dp_mst_detect()
  drm/amd/display: Fix the Wunused-function warning
  drm/radeon/r600: Fix variables that are not used after assignment
  drm/amdgpu/smu7: fix CAC setting on TOPAZ
  drm/amd/display: Update DCN302 SR Exit Latency
  drm/amdgpu: enable ras eeprom on aldebaran
  drm/amdgpu: RAS harvest on driver load
  drm/amdgpu: add ras aldebaran ras eeprom driver
  drm/amd/pm: increase time out value when sending msg to SMU
  drm/amdgpu: add DMUB outbox event IRQ source define/complete/debug flag
  drm/amd/pm: add the callback to get vbios bootup values for vangogh
  drm/radeon: Fix size overflow
  drm/amdgpu: Fix size overflow
  drm/amdgpu: move mmhub ras_func init to ip specific file
  ...
parents 3aa139aa a1a1ca70

Documentation/core-api/printk-formats.rst

+18 −0
Original line number Diff line number Diff line
@@ -591,6 +591,24 @@ For printing netdev_features_t. 


Passed by reference.



V4L2 and DRM FourCC code (pixel format)

---------------------------------------



::



	%p4cc



Print a FourCC code used by V4L2 or DRM, including format endianness and

its numerical value as hexadecimal.



Passed by reference.



Examples::



	%p4cc	BG12 little-endian (0x32314742)

	%p4cc	Y10  little-endian (0x20303159)

	%p4cc	NV12 big-endian (0xb231564e)



Thanks

======

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-dw-hdmi.yaml

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ description: | 
  and CEC.



  These DT bindings follow the Synopsys DWC HDMI TX bindings defined

  in Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with

  the following device-specific properties.

  in bridge/synopsys,dw-hdmi.yaml with the following device-specific

  properties.



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ required: 
  - resets

  - ddc



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+15 −0
Original line number Diff line number Diff line
@@ -34,6 +34,15 @@ properties: 
    description: used for reset chip control, RESET_N pin B7.

    maxItems: 1



  vdd10-supply:

    description: Regulator that provides the supply 1.0V power.



  vdd18-supply:

    description: Regulator that provides the supply 1.8V power.



  vdd33-supply:

    description: Regulator that provides the supply 3.3V power.



  ports:

    $ref: /schemas/graph.yaml#/properties/ports
@@ -55,6 +64,9 @@ properties: 
required:

  - compatible

  - reg

  - vdd10-supply

  - vdd18-supply

  - vdd33-supply

  - ports



additionalProperties: false
@@ -72,6 +84,9 @@ examples: 
            reg = <0x58>;

            enable-gpios = <&pio 45 GPIO_ACTIVE_HIGH>;

            reset-gpios = <&pio 73 GPIO_ACTIVE_HIGH>;

            vdd10-supply = <&pp1000_mipibrdg>;

            vdd18-supply = <&pp1800_mipibrdg>;

            vdd33-supply = <&pp3300_mipibrdg>;



            ports {

                #address-cells = <1>;

Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml

0 → 100644
+99 −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/chipone,icn6211.yaml#

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



title: Chipone ICN6211 MIPI-DSI to RGB Converter bridge



maintainers:

  - Jagan Teki <jagan@amarulasolutions.com>



description: |

  ICN6211 is MIPI-DSI to RGB Converter bridge from chipone.



  It has a flexible configuration of MIPI DSI signal input and

  produce RGB565, RGB666, RGB888 output format.



properties:

  compatible:

    enum:

      - chipone,icn6211



  reg:

    maxItems: 1

    description: virtual channel number of a DSI peripheral



  enable-gpios:

    description: Bridge EN pin, chip is reset when EN is low.



  vdd1-supply:

    description: A 1.8V/2.5V/3.3V supply that power the MIPI RX.



  vdd2-supply:

    description: A 1.8V/2.5V/3.3V supply that power the PLL.



  vdd3-supply:

    description: A 1.8V/2.5V/3.3V supply that power the RGB output.



  ports:

    $ref: /schemas/graph.yaml#/properties/ports



    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        description:

          Video port for MIPI DSI input



      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description:

          Video port for MIPI DPI output (panel or connector).



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

  - enable-gpios

  - ports



additionalProperties: false



examples:

  - |

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



    dsi {

      #address-cells = <1>;

      #size-cells = <0>;



      bridge@0 {

        compatible = "chipone,icn6211";

        reg = <0>;

        enable-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */



        ports {

          #address-cells = <1>;

          #size-cells = <0>;



          port@0 {

            reg = <0>;



            bridge_in_dsi: endpoint {

              remote-endpoint = <&dsi_out_bridge>;

            };

          };



          port@1 {

            reg = <1>;



            bridge_out_panel: endpoint {

              remote-endpoint = <&panel_out_bridge>;

            };

          };

        };

      };

    };