Commit faf0d83e authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v6.4-rc1:

Note: Only changes since pull request from 2023-02-23 are included here.

UAPI Changes:
- Convert rockchip bindings to YAML.
- Constify kobj_type structure in dma-buf.
- FBDEV cmdline parser fixes, and other small fbdev fixes for mode
   parsing.

Cross-subsystem Changes:
- Add Neil Armstrong as linaro maintainer.
- Actually signal the private stub dma-fence.

Core Changes:
- Add function for adding syncobj dep to sched_job and use it in panfrost, v3d.
- Improve DisplayID 2.0 topology parsing and EDID parsing in general.
- Add a gem eviction function and callback for generic GEM shrinker
  purposes.
- Prepare to convert shmem helper to use the GEM reservation lock instead of own
  locking. (Actual commit itself got reverted for now)
- Move the suballocator from radeon and amdgpu drivers to core in preparation
  for Xe.
- Assorted small fixes and documentation.
- Fixes to HPD polling.
- Assorted small fixes in simpledrm, bridge, accel, shmem-helper,
   and the selftest of format-helper.
- Remove dummy resource when ttm bo is created, and during pipelined
   gutting. Fix all drivers to accept a NULL ttm_bo->resource.
- Handle pinned BO moving prevention in ttm core.
- Set drm panel-bridge orientation before connector is registered.
- Remove dumb_destroy callback.
- Add documentation to GEM_CLOSE, PRIME_HANDLE_TO_FD, PRIME_FD_TO_HANDLE, GETFB2 ioctl's.
- Add atomic enable_plane callback, use it in ast, mgag200, tidss.

Driver Changes:
- Use drm_gem_objects_lookup in vc4.
- Assorted small fixes to virtio, ast, bridge/tc358762, meson, nouveau.
- Allow virtio KMS to be disabled and compiled out.
- Add Radxa 8/10HD, Samsung AMS495QA01 panels.
- Fix ivpu compiler errors.
- Assorted fixes to drm/panel, malidp, rockchip, ivpu, amdgpu, vgem,
   nouveau, vc4.
- Assorted cleanups, simplifications and fixes to vmwgfx.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ac1f5186-54bb-02f4-ac56-907f5b76f3de@linux.intel.com
parents eeac8ede 9228742c

Documentation/devicetree/bindings/display/bridge/analogix,dp.yaml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/bridge/analogix,dp.yaml#

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



title: Analogix Display Port bridge



maintainers:

  - Rob Herring <robh@kernel.org>



properties:

  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks: true



  clock-names: true



  phys: true



  phy-names:

    const: dp



  force-hpd:

    description:

      Indicate driver need force hpd when hpd detect failed, this

      is used for some eDP screen which don not have a hpd signal.



  hpd-gpios:

    description:

      Hotplug detect GPIO.

      Indicates which GPIO should be used for hotplug detection



  ports:

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



    properties:

      port@0:

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

        description:

          Input node to receive pixel data.



      port@1:

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

        description:

          Port node with one endpoint connected to a dp-connector node.



    required:

      - port@0

      - port@1



required:

  - reg

  - interrupts

  - clock-names

  - clocks

  - ports



additionalProperties: true

Documentation/devicetree/bindings/display/bridge/analogix_dp.txt

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
Analogix Display Port bridge bindings



Required properties for dp-controller:

	-compatible:

		platform specific such as:

		 * "samsung,exynos5-dp"

		 * "rockchip,rk3288-dp"

		 * "rockchip,rk3399-edp"

	-reg:

		physical base address of the controller and length

		of memory mapped region.

	-interrupts:

		interrupt combiner values.

	-clocks:

		from common clock binding: handle to dp clock.

	-clock-names:

		from common clock binding: Shall be "dp".

	-phys:

		from general PHY binding: the phandle for the PHY device.

	-phy-names:

		from general PHY binding: Should be "dp".



Optional properties for dp-controller:

	-force-hpd:

		Indicate driver need force hpd when hpd detect failed, this

		is used for some eDP screen which don't have hpd signal.

	-hpd-gpios:

		Hotplug detect GPIO.

		Indicates which GPIO should be used for hotplug detection

	-port@[X]: SoC specific port nodes with endpoint definitions as defined

		in Documentation/devicetree/bindings/media/video-interfaces.txt,

		please refer to the SoC specific binding document:

		* Documentation/devicetree/bindings/display/exynos/exynos_dp.txt

		* Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt



[1]: Documentation/devicetree/bindings/media/video-interfaces.txt

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



Example:



	dp-controller {

		compatible = "samsung,exynos5-dp";

		reg = <0x145b0000 0x10000>;

		interrupts = <10 3>;

		interrupt-parent = <&combiner>;

		clocks = <&clock 342>;

		clock-names = "dp";



		phys = <&dp_phy>;

		phy-names = "dp";

	};

Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml

+3 −13
Original line number Diff line number Diff line
@@ -26,19 +26,9 @@ properties: 
  reg:

    maxItems: 1



  clocks:

    items:

      - description: Module clock

      - description: DSI bus clock for either AHB and APB

      - description: Pixel clock for the DPI/RGB input

    minItems: 2



  clock-names:

    items:

      - const: ref

      - const: pclk

      - const: px_clk

    minItems: 2

  clocks: true



  clock-names: true



  resets:

    maxItems: 1

Documentation/devicetree/bindings/display/dsi-controller.yaml

+9 −9
Original line number Diff line number Diff line
@@ -30,6 +30,15 @@ properties: 
  $nodename:

    pattern: "^dsi(@.*)?$"



  clock-master:

    type: boolean

    description:

      Should be enabled if the host is being used in conjunction with

      another DSI host to drive the same peripheral. Hardware supporting

      such a configuration generally requires the data on both the busses

      to be driven by the same clock. Only the DSI host instance

      controlling this clock should contain this property.



  "#address-cells":

    const: 1
@@ -52,15 +61,6 @@ patternProperties: 
          case the reg property can take multiple entries, one for each virtual

          channel that the peripheral responds to.



      clock-master:

        type: boolean

        description:

          Should be enabled if the host is being used in conjunction with

          another DSI host to drive the same peripheral. Hardware supporting

          such a configuration generally requires the data on both the busses

          to be driven by the same clock. Only the DSI host instance

          controlling this clock should contain this property.



      enforce-video-mode:

        type: boolean

        description:

Documentation/devicetree/bindings/display/exynos/exynos_dp.txt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Optional properties for dp-controller: 
		Documentation/devicetree/bindings/display/panel/display-timing.txt



For the below properties, please refer to Analogix DP binding document:

 * Documentation/devicetree/bindings/display/bridge/analogix_dp.txt

 * Documentation/devicetree/bindings/display/bridge/analogix,dp.yaml

	-phys (required)

	-phy-names (required)

	-hpd-gpios (optional)