]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'drm-misc-next-2025-11-05-1' of https://gitlab.freedesktop.org/drm/misc...
authorDave Airlie <airlied@redhat.com>
Fri, 7 Nov 2025 02:40:51 +0000 (12:40 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 7 Nov 2025 02:41:26 +0000 (12:41 +1000)
drm-misc-next for v6.19-rc1:

UAPI Changes:
- Add userptr support to ivpu.
- Add IOCTL's for resource and telemetry data in amdxdna.

Core Changes:
- Improve some atomic state checking handling.
- drm/client updates.
- Use forward declarations instead of including drm_print.h
- RUse allocation flags in ttm_pool/device_init and allow specifying max
  useful pool size and propagate ENOSPC.
- Updates and fixes to scheduler and bridge code.
- Add support for quirking DisplayID checksum errors.

Driver Changes:
- Assorted cleanups and fixes in rcar-du, accel/ivpu, panel/nv3052cf,
  sti, imxm, accel/qaic, accel/amdxdna, imagination, tidss, sti,
  panthor, vkms.
- Add Samsung S6E3FC2X01 DDIC/AMS641RW, Synaptics TDDI series DSI,
  TL121BVMS07-00 (IL79900A) panels.
- Add mali MediaTek MT8196 SoC gpu support.
- Add etnaviv GC8000 Nano Ultra VIP r6205 support.
- Document powervr ge7800 support in the devicetree.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patch.msgid.link/5afae707-c9aa-4a47-b726-5e1f1aa7a106@linux.intel.com
35 files changed:
1  2 
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/i915/display/i9xx_wm.c
drivers/gpu/drm/i915/display/intel_bios.c
drivers/gpu/drm/i915/display/intel_bw.c
drivers/gpu/drm/i915/display/intel_cdclk.c
drivers/gpu/drm/i915/display/intel_connector.c
drivers/gpu/drm/i915/display/intel_crtc.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_debugfs.c
drivers/gpu/drm/i915/display/intel_display_driver.c
drivers/gpu/drm/i915/display/intel_display_irq.c
drivers/gpu/drm/i915/display/intel_display_power.c
drivers/gpu/drm/i915/display/intel_display_power_well.c
drivers/gpu/drm/i915/display/intel_fb.c
drivers/gpu/drm/i915/display/intel_fb_bo.c
drivers/gpu/drm/i915/display/intel_fbc.c
drivers/gpu/drm/i915/display/intel_fbdev_fb.c
drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
drivers/gpu/drm/i915/display/intel_hotplug.c
drivers/gpu/drm/i915/display/intel_plane.c
drivers/gpu/drm/i915/display/intel_psr.c
drivers/gpu/drm/i915/display/intel_vblank.c
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
drivers/gpu/drm/i915/gem/i915_gem_stolen.c
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
drivers/gpu/drm/i915/gt/intel_rc6.c
drivers/gpu/drm/i915/gt/selftest_execlists.c
drivers/gpu/drm/i915/gvt/kvmgt.c
drivers/gpu/drm/i915/gvt/mmio.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_pmu.c
drivers/gpu/drm/i915/intel_uncore.c
drivers/gpu/drm/i915/soc/intel_dram.c
drivers/gpu/drm/xe/xe_device.c

index 705fcd42d3587f421f4195d2161a8d78abb6c1c2,1628b5d98bba8696fc05ab0fc5f7d3c4dbdee831..064c0d3e8177f12a8dd25c9679c92fca3e17d69e
@@@ -9,7 -9,10 +9,8 @@@
  #include <drm/drm_blend.h>
  #include <drm/drm_gem.h>
  #include <drm/drm_modeset_helper.h>
+ #include <drm/drm_print.h>
  
 -#include "i915_drv.h"
 -#include "i915_utils.h"
  #include "intel_bo.h"
  #include "intel_display.h"
  #include "intel_display_core.h"
index 0838fdd3725468a736331192f929bf42a6ce6555,9a3b12849c568a03fbb1c1504cd369aedccbb06c..c3202ba141c5860cbf20df943cd7d1ebbb4c89c7
@@@ -3,8 -3,10 +3,10 @@@
   * Copyright © 2023 Intel Corporation
   */
  
 -#include <drm/drm_fb_helper.h>
 +#include <linux/fb.h>
  
+ #include <drm/drm_print.h>
  #include "gem/i915_gem_lmem.h"
  
  #include "i915_drv.h"
index 78329deb395adaf7825e22f2a562b12b4c7080c3,4faae6a2ae11b0e9fa160d9ba7c79df832fd4a95..505c776c0585d06a21af4721d70354add5a2c4a2
  #include <drm/drm_gem.h>
  #include <drm/drm_gem_atomic_helper.h>
  #include <drm/drm_panic.h>
+ #include <drm/drm_print.h>
  
  #include "gem/i915_gem_object.h"
 -#include "i915_scheduler_types.h"
  #include "i9xx_plane_regs.h"
  #include "intel_cdclk.h"
  #include "intel_cursor.h"
index d119e54e5be186fdd47ed76c50b71853ab800d03,f7455c9c34d8f5baddda102c754adaa026365dc4..f65fe86c02b5b316a24872f57f32a6fb112b7988
@@@ -5,12 -5,12 +5,13 @@@
  
  #include <linux/shmem_fs.h>
  
+ #include <drm/drm_buddy.h>
+ #include <drm/drm_print.h>
  #include <drm/ttm/ttm_placement.h>
  #include <drm/ttm/ttm_tt.h>
- #include <drm/drm_buddy.h>
  
  #include "i915_drv.h"
 +#include "i915_jiffies.h"
  #include "i915_ttm_buddy_manager.h"
  #include "intel_memory_region.h"
  #include "intel_region_ttm.h"
index dcd3a3047aa499bf9e12ad2cf25f2a76d2a2ed92,c042b2031577864a7958d3321b721b50f2eefdb8..b279878dca293250bc99577ece25d68c2b2b9bc5
@@@ -3,8 -3,9 +3,10 @@@
   * Copyright © 2019 Intel Corporation
   */
  
+ #include <drm/drm_print.h>
  #include "i915_drv.h"
 +#include "i915_jiffies.h"
  #include "i915_request.h"
  
  #include "intel_context.h"
index 932f9f1b06b27d9808f0c98a99d9119a8032f46c,13721c9081b63acede7024f7ad5a84ebe88ee053..286d49ecc449447c9edac7e7d4e1293c5becf1dc
@@@ -6,7 -6,8 +6,9 @@@
  #include <linux/pm_runtime.h>
  #include <linux/string_helpers.h>
  
+ #include <drm/drm_print.h>
 +#include "display/vlv_clock.h"
  #include "gem/i915_gem_region.h"
  #include "i915_drv.h"
  #include "i915_reg.h"
Simple merge
Simple merge
index e0a0bd687f1b153d5f961144e8a0a3dfb21ec5a3,f57a981ecc9aa909f56f0049bd87dd921f001ce2..1898be4ddc8bc889c01bc6bcc9b2c396f849f2c6
@@@ -32,7 -32,9 +32,8 @@@
  #include <linux/sysrq.h>
  
  #include <drm/drm_drv.h>
+ #include <drm/drm_print.h>
  
 -#include "display/intel_display_core.h"
  #include "display/intel_display_irq.h"
  #include "display/intel_hotplug.h"
  #include "display/intel_hotplug_irq.h"
Simple merge
Simple merge
Simple merge
Simple merge