]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <tzimmermann@suse.de>
Wed, 11 Sep 2024 07:48:49 +0000 (09:48 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Wed, 11 Sep 2024 07:48:49 +0000 (09:48 +0200)
Backmerging to get fixes from v6.12-rc7.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
13 files changed:
1  2 
Documentation/gpu/todo.rst
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/display/Kconfig
drivers/gpu/drm/display/Makefile
drivers/gpu/drm/imagination/pvr_vm.c
drivers/gpu/drm/msm/Kconfig
drivers/gpu/drm/panthor/panthor_drv.c
drivers/gpu/drm/panthor/panthor_mmu.c
drivers/gpu/drm/panthor/panthor_sched.c
drivers/gpu/drm/v3d/v3d_sched.c
include/uapi/drm/panthor_drm.h

Simple merge
Simple merge
index a2e42014ffe0507a0a5aaa64de5b611a95dd90a7,3b824e01c9b56678e4464cdc81d88b59c065d8df..0f07cf1483ffc553e907502d80d4a9b39b9eb72b
@@@ -59,15 -64,8 +64,14 @@@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBU
  
          If in doubt, say "N".
  
 +config DRM_DISPLAY_DSC_HELPER
 +      bool
 +      depends on DRM_DISPLAY_HELPER
 +      help
 +        DRM display helpers for VESA DSC (used by DSI and DisplayPort).
 +
  config DRM_DISPLAY_HDCP_HELPER
        bool
-       depends on DRM_DISPLAY_HELPER
        help
          DRM display helpers for HDCP.
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge