Commit 304ac803 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more drm updates from Dave Airlie:
 "I missed a drm-misc-next pull for the main pull last week. It wasn't
  that major and isn't the bulk of this at all. This has a bunch of
  fixes all over, a lot for amdgpu and i915.

  bridge:
   - HPD improvments for lt9611uxc
   - eDP aux-bus support for ps8640
   - LVDS data-mapping selection support

  ttm:
   - remove huge page functionality (needs reworking)
   - fix a race condition during BO eviction

  panels:
   - add some new panels

  fbdev:
   - fix double-free
   - remove unused scrolling acceleration
   - CONFIG_FB dep improvements

  locking:
   - improve contended locking logging
   - naming collision fix

  dma-buf:
   - add dma_resv_for_each_fence iterator
   - fix fence refcounting bug
   - name locking fixesA

  prime:
   - fix object references during mmap

  nouveau:
   - various code style changes
   - refcount fix
   - device removal fixes
   - protect client list with a mutex
   - fix CE0 address calculation

  i915:
   - DP rates related fixes
   - Revert disabling dual eDP that was causing state readout problems
   - put the cdclk vtables in const data
   - Fix DVO port type for older platforms
   - Fix blankscreen by turning DP++ TMDS output buffers on encoder->shutdown
   - CCS FBs related fixes
   - Fix recursive lock in GuC submission
   - Revert guc_id from i915_request tracepoint
   - Build fix around dmabuf

  amdgpu:
   - GPU reset fix
   - Aldebaran fix
   - Yellow Carp fixes
   - DCN2.1 DMCUB fix
   - IOMMU regression fix for Picasso
   - DSC display fixes
   - BPC display calculation fixes
   - Other misc display fixes
   - Don't allow partial copy from user for DC debugfs
   - SRIOV fixes
   - GFX9 CSB pin count fix
   - Various IP version check fixes
   - DP 2.0 fixes
   - Limit DCN1 MPO fix to DCN1

  amdkfd:
   - SVM fixes
   - Fix gfx version for renoir
   - Reset fixes

  udl:
   - timeout fix

  imx:
   - circular locking fix

  virtio:
   - NULL ptr deref fix"

* tag 'drm-next-2021-11-12' of git://anongit.freedesktop.org/drm/drm: (126 commits)
  drm/ttm: Double check mem_type of BO while eviction
  drm/amdgpu: add missed support for UVD IP_VERSION(3, 0, 64)
  drm/amdgpu: drop jpeg IP initialization in SRIOV case
  drm/amd/display: reject both non-zero src_x and src_y only for DCN1x
  drm/amd/display: Add callbacks for DMUB HPD IRQ notifications
  drm/amd/display: Don't lock connection_mutex for DMUB HPD
  drm/amd/display: Add comment where CONFIG_DRM_AMD_DC_DCN macro ends
  drm/amdkfd: Fix retry fault drain race conditions
  drm/amdkfd: lower the VAs base offset to 8KB
  drm/amd/display: fix exit from amdgpu_dm_atomic_check() abruptly
  drm/amd/amdgpu: fix the kfd pre_reset sequence in sriov
  drm/amdgpu: fix uvd crash on Polaris12 during driver unloading
  drm/i915/adlp/fb: Prevent the mapping of redundant trailing padding NULL pages
  drm/i915/fb: Fix rounding error in subsampled plane size calculation
  drm/i915/hdmi: Turn DP++ TMDS output buffers back on in encoder->shutdown()
  drm/locking: fix __stack_depot_* name conflict
  drm/virtio: Fix NULL dereference error in virtio_gpu_poll
  drm/amdgpu: fix SI handling in amdgpu_device_asic_has_dc_support()
  drm/amdgpu: Fix dangling kfd_bo pointer for shared BOs
  drm/amd/amdkfd: Don't sent command to HWS on kfd reset
  ...
parents f78e9de8 b6c24725

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

+32 −1
Original line number Diff line number Diff line
@@ -49,11 +49,26 @@ properties: 


    properties:

      port@0:

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

        $ref: /schemas/graph.yaml#/$defs/port-base

        description: |

          For LVDS encoders, port 0 is the parallel input

          For LVDS decoders, port 0 is the LVDS input



        properties:

          endpoint:

            $ref: /schemas/media/video-interfaces.yaml#

            unevaluatedProperties: false



            properties:

              data-mapping:

                enum:

                  - jeida-18

                  - jeida-24

                  - vesa-24

                description: |

                  The color signals mapping order. See details in

                  Documentation/devicetree/bindings/display/panel/lvds.yaml



      port@1:

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

        description: |
@@ -71,6 +86,22 @@ properties: 


  power-supply: true



if:

  not:

    properties:

      compatible:

        contains:

          const: lvds-decoder

then:

  properties:

    ports:

      properties:

        port@0:

          properties:

            endpoint:

              properties:

                data-mapping: false



required:

  - compatible

  - ports

Documentation/devicetree/bindings/display/bridge/ps8640.yaml

+18 −1
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ properties: 
  vdd33-supply:

    description: Regulator for 3.3V digital core power.



  aux-bus:

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



  ports:

    $ref: /schemas/graph.yaml#/properties/ports
@@ -101,6 +104,20 @@ examples: 
                    };

                };

            };



            aux-bus {

                panel {

                    compatible = "boe,nv133fhm-n62";

                    power-supply = <&pp3300_dx_edp>;

                    backlight = <&backlight>;



                    port {

                        panel_in: endpoint {

                            remote-endpoint = <&ps8640_out>;

                        };

                    };

                };

            };

        };

    };

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

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ properties: 
      - innolux,at070tn92

        # Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel

      - innolux,g070y2-l01

        # Innolux G070Y2-T02 7" WVGA (800x480) TFT LCD TTL panel

      - innolux,g070y2-t02

        # Innolux Corporation 10.1" G101ICE-L01 WXGA (1280x800) LVDS panel

      - innolux,g101ice-l01

        # Innolux Corporation 12.1" WXGA (1280x800) TFT LCD panel
@@ -309,6 +311,8 @@ properties: 
      - urt,umsh-8596md-11t

      - urt,umsh-8596md-19t

      - urt,umsh-8596md-20t

        # Vivax TPC-9150 tablet 9.0" WSVGA TFT LCD panel

      - vivax,tpc9150-panel

        # VXT 800x480 color TFT LCD panel

      - vxt,vl050-8048nt-c01

        # Winstar Display Corporation 3.5" QVGA (320x240) TFT LCD panel
@@ -317,6 +321,7 @@ properties: 
      - yes-optoelectronics,ytc700tlag-05-201c



  backlight: true

  ddc-i2c-bus: true

  enable-gpios: true

  port: true

  power-supply: true

Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml

0 → 100644
+56 −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/panel/sharp,ls060t1sx01.yaml#

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



title: Sharp Microelectronics 6.0" FullHD TFT LCD panel



maintainers:

  - Dmitry Baryskov <dmitry.baryshkov@linaro.org>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: sharp,ls060t1sx01



  reg: true

  backlight: true

  reset-gpios: true

  port: true



  avdd-supply:

    description: handle of the regulator that provides the positive supply voltage

  avee-supply:

    description: handle of the regulator that provides the negative supply voltage

  vddi-supply:

    description: handle of the regulator that provides the I/O supply voltage

  vddh-supply:

    description: handle of the regulator that provides the analog supply voltage



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

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



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "sharp,ls060t1sx01";

            reg = <0>;

            avdd-supply = <&pm8941_l22>;

            backlight = <&backlight>;

            reset-gpios = <&pm8916_gpios 25 GPIO_ACTIVE_LOW>;

        };

    };



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,8 @@ patternProperties: 
    description: Vitesse Semiconductor Corporation

  "^vivante,.*":

    description: Vivante Corporation

  "^vivax,.*":

    description: Vivax brand by M SAN Grupa d.o.o.

  "^vocore,.*":

    description: VoCore Studio

  "^voipac,.*":