From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 Nov 2025 02:40:51 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2025-11-05-1' of https://gitlab.freedesktop.org/drm/misc... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e237dfe70867f02de223e36340fe5f8b0fe0eada;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'drm-misc-next-2025-11-05-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next

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
---

e237dfe70867f02de223e36340fe5f8b0fe0eada
diff --cc drivers/gpu/drm/i915/display/intel_fb.c
index 705fcd42d3587,1628b5d98bba8..064c0d3e8177f
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@@ -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"
diff --cc drivers/gpu/drm/i915/display/intel_fbdev_fb.c
index 0838fdd372546,9a3b12849c568..c3202ba141c58
--- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
@@@ -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"
diff --cc drivers/gpu/drm/i915/display/intel_plane.c
index 78329deb395ad,4faae6a2ae11b..505c776c0585d
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@@ -43,8 -43,10 +43,9 @@@
  #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"
diff --cc drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index d119e54e5be18,f7455c9c34d8f..f65fe86c02b5b
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@@ -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"
diff --cc drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
index dcd3a3047aa49,c042b20315778..b279878dca293
--- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
@@@ -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"
diff --cc drivers/gpu/drm/i915/gt/intel_rc6.c
index 932f9f1b06b27,13721c9081b63..286d49ecc4494
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@@ -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"
diff --cc drivers/gpu/drm/i915/i915_irq.c
index e0a0bd687f1b1,f57a981ecc9aa..1898be4ddc8bc
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -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"