Commit 25b63770 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm 

Pull more drm updates from Dave Airlie:
 "Geert pointed out I missed the renesas reworks in my main pull, so
  this pull contains the renesas next work for atomic conversion and DT
  support.

  It also contains a bunch of amdgpu and some small ssd13xx fixes.

  renesas:
   - atomic conversion
   - DT support

  ssd13xx:
   - dt binding fix for ssd132x
   - Initialize ssd130x crtc_state to NULL.

  amdgpu:
   - Fix RAS support check
   - RAS fixes
   - MES fixes
   - SMU13 fixes
   - Contiguous memory allocation fix
   - BACO fixes
   - GPU reset fixes
   - Min power limit fixes
   - GFX11 fixes
   - USB4/TB hotplug fixes
   - ARM regression fix
   - GFX9.4.3 fixes
   - KASAN/KCSAN stack size check fixes
   - SR-IOV fixes
   - SMU14 fixes
   - PSP13 fixes
   - Display blend fixes
   - Flexible array size fixes

  amdkfd:
   - GPUVM fix

  radeon:
   - Flexible array size fixes"

* tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm: (83 commits)
  drm/amd/display: Enable fast update on blendTF change
  drm/amd/display: Fix blend LUT programming
  drm/amd/display: Program plane color setting correctly
  drm/amdgpu: Query and report boot status
  drm/amdgpu: Add psp v13 function to query boot status
  drm/amd/swsmu: remove fw version check in sw_init.
  drm/amd/swsmu: update smu v14_0_0 driver if and metrics table
  drm/amdgpu: Add C2PMSG_109/126 reg field shift/masks
  drm/amdgpu: Optimize the asic type fix code
  drm/amdgpu: fix GRBM read timeout when do mes_self_test
  drm/amdgpu: check recovery status of xgmi hive in ras_reset_error_count
  drm/amd/pm: only check sriov vf flag once when creating hwmon sysfs
  drm/amdgpu: Attach eviction fence on alloc
  drm/amdkfd: Improve amdgpu_vm_handle_moved
  drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml2
  drm/amd/display: Avoid NULL dereference of timing generator
  drm/amdkfd: Update cache info for GFX 9.4.3
  drm/amdkfd: Populate cache info for GFX 9.4.3
  drm/amdgpu: don't put MQDs in VRAM on ARM | ARM64
  drm/amdgpu/smu13: drop compute workload workaround
  ...
parents eaec7c98 9ccde17d

Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml

0 → 100644
+130 −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/renesas,shmobile-lcdc.yaml#

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



title: Renesas SH-Mobile LCD Controller (LCDC)



maintainers:

  - Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

  - Geert Uytterhoeven <geert+renesas@glider.be>



properties:

  compatible:

    enum:

      - renesas,r8a7740-lcdc # R-Mobile A1

      - renesas,sh73a0-lcdc  # SH-Mobile AG5



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    minItems: 1

    maxItems: 5

    description:

      Only the functional clock is mandatory.

      Some of the optional clocks are model-dependent (e.g. "video" (a.k.a.

      "vou" or "dv_clk") is available on R-Mobile A1 only).



  clock-names:

    minItems: 1

    items:

      - const: fck

      - enum: [ media, lclk, hdmi, video ]

      - enum: [ media, lclk, hdmi, video ]

      - enum: [ media, lclk, hdmi, video ]

      - enum: [ media, lclk, hdmi, video ]



  power-domains:

    maxItems: 1



  ports:

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



    properties:

      port@0:

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

        description: LCD port (R-Mobile A1 and SH-Mobile AG5)

        unevaluatedProperties: false



      port@1:

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

        description: HDMI port (R-Mobile A1 LCDC1 and SH-Mobile AG5)

        unevaluatedProperties: false



      port@2:

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

        description: MIPI-DSI port (SH-Mobile AG5)

        unevaluatedProperties: false



    required:

      - port@0



    unevaluatedProperties: false



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - power-domains

  - ports



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: renesas,r8a7740-lcdc

    then:

      properties:

        ports:

          properties:

            port@2: false



  - if:

      properties:

        compatible:

          contains:

            const: renesas,sh73a0-lcdc

    then:

      properties:

        ports:

          required:

            - port@1

            - port@2



examples:

  - |

    #include <dt-bindings/clock/r8a7740-clock.h>

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



    lcd-controller@fe940000 {

        compatible = "renesas,r8a7740-lcdc";

        reg = <0xfe940000 0x4000>;

        interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&mstp1_clks R8A7740_CLK_LCDC0>,

                 <&cpg_clocks R8A7740_CLK_M3>, <&lcdlclk0_clk>,

                 <&vou_clk>;

        clock-names = "fck", "media", "lclk", "video";

        power-domains = <&pd_a4lc>;



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;



                lcdc0_rgb: endpoint {

                };

            };

        };

    };

Documentation/devicetree/bindings/display/solomon,ssd132x.yaml

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ maintainers: 


properties:

  compatible:

    - enum:

    enum:

      - solomon,ssd1322

      - solomon,ssd1325

      - solomon,ssd1327

Documentation/userspace-api/media/v4l/subdev-formats.rst

+72 −0
Original line number Diff line number Diff line
@@ -949,6 +949,78 @@ The following tables list existing packed RGB formats. 
      - b\ :sub:`2`

      - b\ :sub:`1`

      - b\ :sub:`0`

    * .. _MEDIA-BUS-FMT-RGB666-2X9-BE:



      - MEDIA_BUS_FMT_RGB666_2X9_BE

      - 0x1025

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      - r\ :sub:`5`

      - r\ :sub:`4`

      - r\ :sub:`3`

      - r\ :sub:`2`

      - r\ :sub:`1`

      - r\ :sub:`0`

      - g\ :sub:`5`

      - g\ :sub:`4`

      - g\ :sub:`3`

    * -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      -

      - g\ :sub:`2`

      - g\ :sub:`1`

      - g\ :sub:`0`

      - b\ :sub:`5`

      - b\ :sub:`4`

      - b\ :sub:`3`

      - b\ :sub:`2`

      - b\ :sub:`1`

      - b\ :sub:`0`

    * .. _MEDIA-BUS-FMT-BGR666-1X18:



      - MEDIA_BUS_FMT_BGR666_1X18

MAINTAINERS

+11 −2
Original line number Diff line number Diff line
@@ -7133,7 +7133,7 @@ F: drivers/gpu/host1x/ 
F:	include/linux/host1x.h

F:	include/uapi/drm/tegra_drm.h









DRM DRIVERS FOR RENESAS









DRM DRIVERS FOR RENESAS R-CAR









M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>









M:	Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>









L:	dri-devel@lists.freedesktop.org








@@ -7144,7 +7144,16 @@ F:	Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml







F:	Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml









F:	Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml









F:	Documentation/devicetree/bindings/display/renesas,du.yaml









F:	drivers/gpu/drm/renesas/









F:	drivers/gpu/drm/renesas/rcar-du/

















DRM DRIVERS FOR RENESAS SHMOBILE









M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>









M:	Geert Uytterhoeven <geert+renesas@glider.be>









L:	dri-devel@lists.freedesktop.org









L:	linux-renesas-soc@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml









F:	drivers/gpu/drm/renesas/shmobile/









F:	include/linux/platform_data/shmob_drm.h

















DRM DRIVERS FOR ROCKCHIP
































drivers/gpu/drm/amd/amdgpu/amdgpu.h



+0
−3






























Original line number
Diff line number
Diff line







@@ -363,9 +363,6 @@ struct amdgpu_ip_block_version {







	const struct amd_ip_funcs *funcs;









};



















#define HW_REV(_Major, _Minor, _Rev) \









	((((uint32_t) (_Major)) << 16) | ((uint32_t) (_Minor) << 8) | ((uint32_t) (_Rev)))



















struct amdgpu_ip_block {









	struct amdgpu_ip_block_status status;









	const struct amdgpu_ip_block_version *version;