Commit 0739b8ba authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2025-01-06' of... 

Merge tag 'drm-misc-next-2025-01-06' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for 6.14:

UAPI Changes:
- Clarify drm memory stats documentation

Cross-subsystem Changes:

Core Changes:
 - sched: Documentation fixes,

Driver Changes:
 - amdgpu: Track BO memory stats at runtime
 - amdxdna: Various fixes
 - hisilicon: New HIBMC driver
 - bridges:
   - Provide default implementation of atomic_check for HDMI bridges
   - it605: HDCP improvements, MCCS Support

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250106-augmented-kakapo-of-action-0cf000@houat
parents ae7f6d59 938fbb16

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

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ properties: 
      - tianma,tm070jvhg33

        # Tianma Micro-electronics TM070RVHG71 7.0" WXGA TFT LCD panel

      - tianma,tm070rvhg71

        # Topland TIAN-G07017-01 7.0" WSVGA TFT-LCD panel with capacitive touch

      - topland,tian-g07017-01

        # Toshiba 8.9" WXGA (1280x768) TFT LCD panel

      - toshiba,lt089ac29000

        # TPK U.S.A. LLC Fusion 7" 800 x 480 (WVGA) LCD panel with capacitive touch

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,8 @@ patternProperties: 
    description: Topeet

  "^topic,.*":

    description: Topic Embedded Systems

  "^topland,.*":

    description: Topland Electronics (H.K) Co., Ltd.

  "^toppoly,.*":

    description: TPO (deprecated, use tpo)

    deprecated: true

Documentation/gpu/drm-usage-stats.rst

+27 −27
Original line number Diff line number Diff line
@@ -145,57 +145,57 @@ both. 
Memory

^^^^^^



- drm-memory-<region>: <uint> [KiB|MiB]



Each possible memory type which can be used to store buffer objects by the

GPU in question shall be given a stable and unique name to be returned as the

string here.

Each possible memory type which can be used to store buffer objects by the GPU

in question shall be given a stable and unique name to be used as the "<region>"

string.



The region name "memory" is reserved to refer to normal system memory.



Value shall reflect the amount of storage currently consumed by the buffer

The value shall reflect the amount of storage currently consumed by the buffer

objects belong to this client, in the respective memory region.



Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB'

indicating kibi- or mebi-bytes.



This key is deprecated and is an alias for drm-resident-<region>. Only one of

the two should be present in the output.



- drm-shared-<region>: <uint> [KiB|MiB]

- drm-total-<region>: <uint> [KiB|MiB]



The total size of buffers that are shared with another file (e.g., have more

than a single handle).

The total size of all requested buffers, including both shared and private

memory. The backing store for the buffers does not need to be currently

instantiated to count under this category. To avoid double-counting, if a buffer

has multiple regions where it can be allocated to, the implementation should

consistently select a single region for accounting purposes.



- drm-total-<region>: <uint> [KiB|MiB]

- drm-shared-<region>: <uint> [KiB|MiB]



The total size of all created buffers including shared and private memory. The

backing store for the buffers does not have to be currently instantiated to be

counted under this category.

The total size of buffers that are shared with another file (i.e., have more

than one handle). The same requirement to avoid double-counting that applies to

drm-total-<region> also applies here.



- drm-resident-<region>: <uint> [KiB|MiB]



The total size of buffers that are resident (have their backing store present or

instantiated) in the specified region.

The total size of buffers that are resident (i.e., have their backing store

present or instantiated) in the specified region.



- drm-memory-<region>: <uint> [KiB|MiB]



This is an alias for drm-memory-<region> and only one of the two should be

present in the output.

This key is deprecated and is only printed by amdgpu; it is an alias for

drm-resident-<region>.



- drm-purgeable-<region>: <uint> [KiB|MiB]



The total size of buffers that are purgeable.

The total size of buffers that are resident and purgeable.



For example drivers which implement a form of 'madvise' like functionality can

here count buffers which have instantiated backing store, but have been marked

with an equivalent of MADV_DONTNEED.

For example, drivers that implement functionality similar to 'madvise' can count

buffers that have instantiated backing stores but have been marked with an

equivalent of MADV_DONTNEED.



- drm-active-<region>: <uint> [KiB|MiB]



The total size of buffers that are active on one or more engines.



One practical example of this can be presence of unsignaled fences in an GEM

buffer reservation object. Therefore the active category is a subset of

resident.

One practical example of this could be the presence of unsignaled fences in a

GEM buffer reservation object. Therefore, the active category is a subset of the

resident category.



Implementation Details

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

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7081,7 +7081,8 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git 
F:	drivers/gpu/drm/sun4i/sun8i*









DRM DRIVER FOR ARM PL111 CLCD









S:	Orphan









M:	Linus Walleij <linus.walleij@linaro.org>









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	drivers/gpu/drm/pl111/








































drivers/accel/amdxdna/aie2_ctx.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -22,7 +22,7 @@







#include "amdxdna_mailbox.h"









#include "amdxdna_pci_drv.h"



















bool force_cmdlist;









static bool force_cmdlist;









module_param(force_cmdlist, bool, 0600);









MODULE_PARM_DESC(force_cmdlist, "Force use command list (Default false)");