Commit 3f1c07fc authored by Thomas Hellström's avatar Thomas Hellström
Browse files

Merge drm/drm-next into drm-xe-next-fixes 



Backmerging to be able do to a clean PR.

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parents d72312d7 0692602d

.mailmap

+6 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk> 
Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>

Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -206,6 +207,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com> 
David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Hildenbrand <david@kernel.org> <david@redhat.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -426,7 +428,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -605,7 +607,8 @@ Oleksij Rempel <o.rempel@pengutronix.de> 
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
@@ -644,6 +647,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com> 
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rae Moar <raemoar63@gmail.com> <rmoar@google.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a 
S: 602 00 Brno

S: Czech Republic



N: Karsten Keil

E: isdn@linux-pingi.de

D: ISDN subsystem maintainer



N: Jakob Kemi

E: jakob.kemi@telia.com

D: V4L W9966 Webcam driver

Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
  compatible:

    enum:

      - ite,it66121

      - ite,it66122

      - ite,it6610



  reg:

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

+2 −0
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ properties: 
          - const: adi,adv7123

      - enum:

          - adi,adv7123

          - asl-tek,cs5263

          - dumb-vga-dac

          - parade,ps185hdm

          - radxa,ra620

          - realtek,rtd2171

          - ti,opa362

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+16 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
  compatible:

    oneOf:

      - enum:

          - qcom,glymur-dp

          - qcom,sa8775p-dp

          - qcom,sc7180-dp

          - qcom,sc7280-dp
@@ -31,6 +32,11 @@ properties: 
          - qcom,sm8650-dp

          - qcom,x1e80100-dp



      - items:

          - enum:

              - qcom,qcs8300-dp

          - const: qcom,sa8775p-dp



      - items:

          - enum:

              - qcom,sm6350-dp
@@ -53,6 +59,12 @@ properties: 
              - qcom,sm8550-dp

          - const: qcom,sm8350-dp



      - items:

          - enum:

              - qcom,sm6150-dp

          - const: qcom,sm8150-dp

          - const: qcom,sm8350-dp



      - items:

          - enum:

              - qcom,sm8750-dp
@@ -195,9 +207,11 @@ allOf: 
          compatible:

            contains:

              enum:

                - qcom,glymur-dp

                - qcom,sa8775p-dp

                - qcom,x1e80100-dp

      then:

        $ref: /schemas/sound/dai-common.yaml#

        oneOf:

          - required:

              - aux-bus
@@ -239,6 +253,7 @@ allOf: 
            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only

              - qcom,glymur-dp

              - qcom,sc8280xp-dp

              - qcom,x1e80100-dp

    then:
@@ -295,7 +310,7 @@ allOf: 
          minItems: 6

          maxItems: 8



additionalProperties: false

unevaluatedProperties: false



examples:

  - |