Commit 588b3eee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2021-07-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.15:

UAPI Changes:

Cross-subsystem Changes:
- udmabuf: Add support for mapping hugepages
- Add dma-buf stats to sysfs.
- Assorted fixes to fbdev/omap2.
- dma-buf: Document DMA_BUF_IOCTL_SYNC
- Improve dma-buf non-dynamic exporter expectations better.
- Add module parameters for dma-buf size and list limit.
- Add HDMI codec support to vc4, to replace vc4's own codec.
- Document dma-buf implicit fencing rules.
- dma_resv_test_signaled test_all handling.

Core Changes:
- Extract i915's eDP backlight code into DRM helpers.
- Assorted docbook updates.
- Rework drm_dp_aux documentation.
- Add support for the DP aux bus.
- Shrink dma-fence-chain slightly.
- Add alloc/free helpers for dma-fence-chain.
- Assorted fixes to TTM., drm/of, bridge
- drm_gem_plane_helper_prepare/cleanup_fb is now the default for gem drivers.
- Small fix for scheduler completion.
- Remove use of drm_device.irq_enabled.
- Print the driver name to dmesg when registering framebuffer.
- Export drm/gem's shadow plane handling, and use it in vkms.
- Assorted small fixes.

Driver Changes:
- Add eDP backlight to nouveau.
- Assorted fixes and cleanups to nouveau, panfrost, vmwgfx, anx7625,
  amdgpu, gma500, radeon, mgag200, vgem, vc4, vkms, omapdrm.
- Add support for Samsung DB7430, Samsung ATNA33XC20, EDT ETMV570G2DHU,
  EDT ETM0350G0DH6, Innolux EJ030NA panels.
- Fix some simple pannels missing bus_format and connector types.
- Add mks-guest-stats instrumentation support to vmwgfx.
- Merge i915-ttm topic branch.
- Make s6e63m0 panel use Mipi-DBI helpers.
- Add detect() supoprt for AST.
- Use interrupts for hotplug on vc4.
- vmwgfx is now moved to drm-misc-next, as sroland is no longer a maintainer for now.
- vmwgfx now uses copies of vmware's internal device headers.
- Slowly convert ti-sn65dsi83 over to atomic.
- Rework amdgpu dma-resv handling.
- Fix virtio fencing for planes.
- Ensure amdgpu can always evict to SYSTEM.
- Many drivers fixed for implicit fencing rules.
- Set default prepare/cleanup fb for tiny, vram and simple helpers too.
- Rework panfrost gpu reset and related serialization.
- Update VKMS todo list.
- Make bochs a tiny gpu driver, and use vram helper.
- Use linux irq interfaces instead of drm_irq in some drivers.
- Add support for Raspberry Pi Pico to GUD.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# gpg: Signature made Fri 16 Jul 2021 21:06:04 AEST
# gpg:                using RSA key B97BD6A80CAC4981091AE547FE558C72A67013C3
# gpg: Good signature from "Maarten Lankhorst <maarten.lankhorst@linux.intel.com>" [expired]
# gpg:                 aka "Maarten Lankhorst <maarten@debian.org>" [expired]
# gpg:                 aka "Maarten Lankhorst <maarten.lankhorst@canonical.com>" [expired]
# gpg: Note: This key has expired!
# Primary key fingerprint: B97B D6A8 0CAC 4981 091A  E547 FE55 8C72 A670 13C3
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/444811c3-cbec-e9d5-9a6b-9632eda7962a@linux.intel.com
parents b4d7049a 17a1837d

Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers

0 → 100644
+52 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/dmabuf/buffers

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	The /sys/kernel/dmabuf/buffers directory contains a

		snapshot of the internal state of every DMA-BUF.

		/sys/kernel/dmabuf/buffers/<inode_number> will contain the

		statistics for the DMA-BUF with the unique inode number

		<inode_number>

Users:		kernel memory tuning/debugging tools



What:		/sys/kernel/dmabuf/buffers/<inode_number>/exporter_name

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This file is read-only and contains the name of the exporter of

		the DMA-BUF.



What:		/sys/kernel/dmabuf/buffers/<inode_number>/size

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This file is read-only and specifies the size of the DMA-BUF in

		bytes.



What:		/sys/kernel/dmabuf/buffers/<inode_number>/attachments

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This directory will contain subdirectories representing every

		attachment of the DMA-BUF.



What:		/sys/kernel/dmabuf/buffers/<inode_number>/attachments/<attachment_uid>

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This directory will contain information on the attached device

		and the number of current distinct device mappings.



What:		/sys/kernel/dmabuf/buffers/<inode_number>/attachments/<attachment_uid>/device

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This file is read-only and is a symlink to the attached device's

		sysfs entry.



What:		/sys/kernel/dmabuf/buffers/<inode_number>/attachments/<attachment_uid>/map_counter

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This file is read-only and contains a map_counter indicating the

		number of distinct device mappings of the attachment.

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

+19 −2
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ properties: 
    const: 1

    description: See ../../pwm/pwm.yaml for description of the cell formats.



  aux-bus:

    $ref: /schemas/display/dp-aux-bus.yaml#



  ports:

    $ref: /schemas/graph.yaml#/properties/ports
@@ -150,7 +153,6 @@ properties: 
required:

  - compatible

  - reg

  - enable-gpios

  - vccio-supply

  - vpll-supply

  - vcca-supply
@@ -201,11 +203,26 @@ examples: 


          port@1 {

            reg = <1>;

            endpoint {

            sn65dsi86_out: endpoint {

              remote-endpoint = <&panel_in_edp>;

            };

          };

        };



        aux-bus {

          panel {

            compatible = "boe,nv133fhm-n62";

            power-supply = <&pp3300_dx_edp>;

            backlight = <&backlight>;

            hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>;



            port {

              panel_in_edp: endpoint {

                remote-endpoint = <&sn65dsi86_out>;

              };

            };

          };

        };

      };

    };

  - |

Documentation/devicetree/bindings/display/dp-aux-bus.yaml

0 → 100644
+37 −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/dp-aux-bus.yaml#

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



title: DisplayPort AUX bus



maintainers:

  - Douglas Anderson <dianders@chromium.org>



description:

  DisplayPort controllers provide a control channel to the sinks that

  are hooked up to them. This is the DP AUX bus. Over the DP AUX bus

  we can query properties about a sink and also configure it. In

  particular, DP sinks support DDC over DP AUX which allows tunneling

  a standard I2C DDC connection over the AUX channel.



  To model this relationship, DP sinks should be placed as children

  of the DP controller under the "aux-bus" node.



  At the moment, this binding only handles the eDP case. It is

  possible it will be extended in the future to handle the DP case.

  For DP, presumably a connector would be listed under the DP AUX

  bus instead of a panel.



properties:

  $nodename:

    const: "aux-bus"



  panel:

    $ref: panel/panel-common.yaml#



additionalProperties: false



required:

  - panel

Documentation/devicetree/bindings/display/panel/innolux,ej030na.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/innolux,ej030na.yaml#

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



title: Innolux EJ030NA 3.0" (320x480 pixels) 24-bit TFT LCD panel



description: |

  The panel must obey the rules for a SPI slave device as specified in

  spi/spi-controller.yaml



maintainers:

  - Paul Cercueil <paul@crapouillou.net>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: innolux,ej030na



  backlight: true

  port: true

  power-supply: true

  reg: true

  reset-gpios: true



required:

  - compatible

  - reg

  - power-supply

  - reset-gpios



unevaluatedProperties: false



examples:

  - |

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



    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "innolux,ej030na";

            reg = <0>;



            spi-max-frequency = <10000000>;



            reset-gpios = <&gpe 4 GPIO_ACTIVE_LOW>;

            power-supply = <&lcd_power>;



            backlight = <&backlight>;



            port {

                panel_input: endpoint {

                    remote-endpoint = <&panel_output>;

                };

            };

        };

    };

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+10 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ properties: 
        # Emerging Display Technology Corp. 5.7" VGA TFT LCD panel

      - edt,et057090dhu

      - edt,et070080dh6

        # Emerging Display Technology Corp. 3.5" WVGA TFT LCD panel with

        # capacitive multitouch

      - edt,etm0350g0dh6

        # Emerging Display Technology Corp. 480x272 TFT Display with capacitive touch

      - edt,etm043080dh6gp

        # Emerging Display Technology Corp. 480x272 TFT Display
@@ -128,6 +131,9 @@ properties: 
        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

      - edt,etm0700g0dh6

      - edt,etm0700g0edh6

        # Emerging Display Technology Corp. 5.7" VGA TFT LCD panel with

        # capacitive touch

      - edt,etmv570g2dhu

        # Evervision Electronics Co. Ltd. VGG804821 5.0" WVGA TFT LCD Panel

      - evervision,vgg804821

        # Foxlink Group 5" WVGA TFT LCD panel
@@ -242,6 +248,8 @@ properties: 
      - rocktech,rk101ii01d-ct

        # Rocktech Display Ltd. RK070ER9427 800(RGB)x480 TFT LCD panel

      - rocktech,rk070er9427

        # Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel

      - samsung,atna33xc20

        # Samsung 12.2" (2560x1600 pixels) TFT LCD panel

      - samsung,lsn122dl01-c01

        # Samsung Electronics 10.1" WSVGA TFT LCD panel
@@ -298,6 +306,8 @@ properties: 
  enable-gpios: true

  port: true

  power-supply: true

  no-hpd: true

  hpd-gpios: true



additionalProperties: false