Commit 7fefa1ed authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2024-09-20' of... 

Merge tag 'drm-misc-next-2024-09-20' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for v6.12:

UAPI Changes:
- Add panthor/DEV_QUERY_TIMESTAMP_INFO query.

Cross-subsystem Changes:
- Updated dt bindings.
- Add documentation explaining default errnos for fences.
- Mark dma-buf heaps creation functions as __init.

Core Changes:
- Split DSC helpers from DP helpers.
- Clang build fixes for drm/mm test.
- Remove simple pipeline support for gem-vram,
  no longer any users left after converting bochs.
- Add erno to drm_sched_start to distinguish between GPU and queue
  reset.
- Add drm_framebuffer testcases.
- Fix uninitialized spinlock acquisition with CONFIG_DRM_PANIC=n.
- Use read_trylock instead of read_lock in dma_fence_begin_signalling to
  quiesce lockdep.

Driver Changes:
- Assorted small fixes and updates for tegra, host1x, imagination,
  nouveau, panfrost, panthor, panel/ili9341, mali, exynos,
  panel/samsung-s6e3fa7, ast, bridge/ti-sn65dsi86, panel/himax-hx83112a,
  bridge/tc358767, bridge/imx8mp-hdmi-tx, panel/khadas-ts050,
  panel/nt36523, panel/sony-acx565akm, kmb, accel/qaic, omap, v3d.
- Add bridge/TI TDP158.
- Assorted documentation updates.
- Convert bochs from simple drm to gem shmem, and check modes
  against available memory.
- Many VC4 fixes, most related to scaling and YUV support.
- Convert some drivers to use SYSTEM_SLEEP_PM_OPS and RUNTIME_PM_OPS.
- Rockchip 4k@60 support.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/445713a6-2427-4c53-8ec2-3a894ec62405@linux.intel.com
parents 8cf0b939 2facdd60

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

0 → 100644
+57 −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/ti,tdp158.yaml#

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



title: TI TDP158 HDMI to TMDS Redriver



maintainers:

  - Arnaud Vrac <avrac@freebox.fr>

  - Pierre-Hugues Husson <phhusson@freebox.fr>



properties:

  compatible:

    const: ti,tdp158



# The reg property is required if and only if the device is connected

# to an I2C bus. In pin strap mode, reg must not be specified.

  reg:

    description: I2C address of the device



# Pin 36 = Operation Enable / Reset Pin

# OE = L: Power Down Mode

# OE = H: Normal Operation

# Internal weak pullup - device resets on H to L transitions

  enable-gpios:

    description: GPIO controlling bridge enable



  vcc-supply:

    description: Power supply 3.3V



  vdd-supply:

    description: Power supply 1.1V



  ports:

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



    properties:

      port@0:

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

        description: Bridge input



      port@1:

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

        description: Bridge output



    required:

      - port@0

      - port@1



required:

  - compatible

  - vcc-supply

  - vdd-supply

  - ports



additionalProperties: false

Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt

+0 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ Optional properties: 
- interface-pix-fmt: How this display is connected to the

  display interface. Currently supported types: "rgb24", "rgb565", "bgr666"

  and "lvds666".

- edid: verbatim EDID data block describing attached display.

- ddc: phandle describing the i2c bus handling the display data

  channel

- port@[0-1]: Port nodes with endpoint definitions as defined in
@@ -131,7 +130,6 @@ example: 


disp0 {

	compatible = "fsl,imx-parallel-display";

	edid = [edid-data];

	interface-pix-fmt = "rgb24";



	port@0 {

Documentation/devicetree/bindings/display/imx/ldb.txt

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ Required properties: 
   display-timings are used instead.



Optional properties (required if display-timings are used):

 - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing

 - display-timings : A node that describes the display timings as defined in

   Documentation/devicetree/bindings/display/panel/display-timing.txt.

 - fsl,data-mapping : should be "spwg" or "jeida"

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
              - renesas,r9a07g054-mali

              - rockchip,px30-mali

              - rockchip,rk3568-mali

              - rockchip,rk3576-mali

          - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable

      - items:

          - enum:

Documentation/gpu/drm-uapi.rst

+20 −7
Original line number Diff line number Diff line
@@ -305,13 +305,26 @@ Kernel Mode Driver 
------------------



The KMD is responsible for checking if the device needs a reset, and to perform

it as needed. Usually a hang is detected when a job gets stuck executing. KMD

should keep track of resets, because userspace can query any time about the

reset status for a specific context. This is needed to propagate to the rest of

the stack that a reset has happened. Currently, this is implemented by each

driver separately, with no common DRM interface. Ideally this should be properly

integrated at DRM scheduler to provide a common ground for all drivers. After a

reset, KMD should reject new command submissions for affected contexts.

it as needed. Usually a hang is detected when a job gets stuck executing.



Propagation of errors to userspace has proven to be tricky since it goes in

the opposite direction of the usual flow of commands. Because of this vendor

independent error handling was added to the &dma_fence object, this way drivers

can add an error code to their fences before signaling them. See function

dma_fence_set_error() on how to do this and for examples of error codes to use.



The DRM scheduler also allows setting error codes on all pending fences when

hardware submissions are restarted after an reset. Error codes are also

forwarded from the hardware fence to the scheduler fence to bubble up errors

to the higher levels of the stack and eventually userspace.



Fence errors can be queried by userspace through the generic SYNC_IOC_FILE_INFO

IOCTL as well as through driver specific interfaces.



Additional to setting fence errors drivers should also keep track of resets per

context, the DRM scheduler provides the drm_sched_entity_error() function as

helper for this use case. After a reset, KMD should reject new command

submissions for affected contexts.



User Mode Driver

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