Commit b26ca735 authored by Simona Vetter's avatar Simona Vetter
Browse files

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



drm-misc-next for 6.8:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - Drop deprecated drm_kms_helper.edid_firmware module parameter

Driver Changes:
  - Convert platform drivers remove callback to return void
  - imagination: Introduction of the Imagination GPU Support
  - rockchip:
    - rk3066_hdmi: Convert to atomic
    - vop2: Support NV20 and NV30
  - panel:
    - elida-kd35t133: PM reworks
    - New panels: Powkiddy RK2023

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/drzvrbsej2txf6a6npc4ukkpadj3wio7edkjbgsfdm4l33szpe@fgwtdy5z5ev7
parents c79b972e 815d8b04

Documentation/devicetree/bindings/display/panel/newvision,nv3051d.yaml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ properties: 
      - enum:

          - anbernic,rg351v-panel

          - anbernic,rg353p-panel

          - anbernic,rg353v-panel

          - powkiddy,rk2023-panel

      - const: newvision,nv3051d



  reg: true

Documentation/devicetree/bindings/gpu/img,powervr.yaml

0 → 100644
+73 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (c) 2023 Imagination Technologies Ltd.

%YAML 1.2

---

$id: http://devicetree.org/schemas/gpu/img,powervr.yaml#

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



title: Imagination Technologies PowerVR and IMG GPU



maintainers:

  - Frank Binns <frank.binns@imgtec.com>



properties:

  compatible:

    items:

      - enum:

          - ti,am62-gpu

      - const: img,img-axe # IMG AXE GPU model/revision is fully discoverable



  reg:

    maxItems: 1



  clocks:

    minItems: 1

    maxItems: 3



  clock-names:

    items:

      - const: core

      - const: mem

      - const: sys

    minItems: 1



  interrupts:

    maxItems: 1



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - interrupts



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: ti,am62-gpu

    then:

      properties:

        clocks:

          maxItems: 1



examples:

  - |

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

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

    #include <dt-bindings/soc/ti,sci_pm_domain.h>



    gpu@fd00000 {

        compatible = "ti,am62-gpu", "img,img-axe";

        reg = <0x0fd00000 0x20000>;

        clocks = <&k3_clks 187 0>;

        clock-names = "core";

        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

        power-domains = <&k3_pds 187 TI_SCI_PD_EXCLUSIVE>;

    };

Documentation/gpu/drivers.rst

+2 −0
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ GPU Driver Documentation 
========================



.. toctree::

   :maxdepth: 3



   amdgpu/index

   i915

   imagination/index

   mcde

   meson

   pl111

Documentation/gpu/imagination/index.rst

0 → 100644
+13 −0
Original line number Diff line number Diff line 
=======================================

drm/imagination PowerVR Graphics Driver

=======================================



.. kernel-doc:: drivers/gpu/drm/imagination/pvr_drv.c

   :doc: PowerVR Graphics Driver



Contents

========

.. toctree::

   :maxdepth: 2



   uapi

Documentation/gpu/imagination/uapi.rst

0 → 100644
+174 −0
Original line number Diff line number Diff line 
====

UAPI

====

The sources associated with this section can be found in ``pvr_drm.h``.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR UAPI



OBJECT ARRAYS

=============

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_obj_array



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: DRM_PVR_OBJ_ARRAY



IOCTLS

======

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL interface



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: PVR_IOCTL



DEV_QUERY

---------

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL DEV_QUERY interface



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_dev_query



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_dev_query_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_dev_query_gpu_info

                 drm_pvr_dev_query_runtime_info

                 drm_pvr_dev_query_hwrt_info

                 drm_pvr_dev_query_quirks

                 drm_pvr_dev_query_enhancements



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_heap_id

                 drm_pvr_heap

                 drm_pvr_dev_query_heap_info



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for DRM_PVR_DEV_QUERY_HEAP_INFO_GET.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_static_data_area_usage

                 drm_pvr_static_data_area

                 drm_pvr_dev_query_static_data_areas



CREATE_BO

---------

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL CREATE_BO interface



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_create_bo_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for CREATE_BO



GET_BO_MMAP_OFFSET

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

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL GET_BO_MMAP_OFFSET interface



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_get_bo_mmap_offset_args



CREATE_VM_CONTEXT and DESTROY_VM_CONTEXT

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

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL CREATE_VM_CONTEXT and DESTROY_VM_CONTEXT interfaces



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_create_vm_context_args

                 drm_pvr_ioctl_destroy_vm_context_args



VM_MAP and VM_UNMAP

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

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL VM_MAP and VM_UNMAP interfaces



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_vm_map_args

                 drm_pvr_ioctl_vm_unmap_args



CREATE_CONTEXT and DESTROY_CONTEXT

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

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL CREATE_CONTEXT and DESTROY_CONTEXT interfaces



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_create_context_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ctx_priority

                 drm_pvr_ctx_type

                 drm_pvr_static_render_context_state

                 drm_pvr_static_render_context_state_format

                 drm_pvr_reset_framework

                 drm_pvr_reset_framework_format



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_destroy_context_args



CREATE_FREE_LIST and DESTROY_FREE_LIST

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

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL CREATE_FREE_LIST and DESTROY_FREE_LIST interfaces



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_create_free_list_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_destroy_free_list_args



CREATE_HWRT_DATASET and DESTROY_HWRT_DATASET

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

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL CREATE_HWRT_DATASET and DESTROY_HWRT_DATASET interfaces



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_create_hwrt_dataset_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_create_hwrt_geom_data_args

                 drm_pvr_create_hwrt_rt_data_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_destroy_hwrt_dataset_args



SUBMIT_JOBS

-----------

.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: PowerVR IOCTL SUBMIT_JOBS interface



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for the drm_pvr_sync_op object.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_ioctl_submit_jobs_args



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for SUBMIT_JOB ioctl geometry command.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for SUBMIT_JOB ioctl fragment command.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for SUBMIT_JOB ioctl compute command.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :doc: Flags for SUBMIT_JOB ioctl transfer command.



.. kernel-doc:: include/uapi/drm/pvr_drm.h

   :identifiers: drm_pvr_sync_op

                 drm_pvr_job_type

                 drm_pvr_hwrt_data_ref

                 drm_pvr_job



Internal notes

==============

.. kernel-doc:: drivers/gpu/drm/imagination/pvr_device.h

   :doc: IOCTL validation helpers



.. kernel-doc:: drivers/gpu/drm/imagination/pvr_device.h

   :identifiers: PVR_STATIC_ASSERT_64BIT_ALIGNED PVR_IOCTL_UNION_PADDING_CHECK

                 pvr_ioctl_union_padding_check