From: Dave Airlie <airlied@redhat.com>
Date: Thu, 12 Dec 2024 22:20:53 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2024-12-05' of https://gitlab.freedesktop.org/drm/misc/kerne... 
X-Git-Tag: v6.14-rc1~174^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d6cb4c43a6baf940f4ae42541dcc1a1a74b2a3;p=thirdparty%2Flinux.git

Merge tag 'drm-misc-next-2024-12-05' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next

[airlied: handle module ns conflict]

drm-misc-next for 6.14:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - Remove driver date from drm_driver

Driver Changes:
  - amdxdna: New driver!
  - ivpu: Fix qemu crash when using passthrough
  - nouveau: expose GSP-RM logging buffers via debugfs
  - panfrost: Add MT8188 Mali-G57 MC3 support
  - panthor: misc improvements,
  - rockchip: Gamma LUT support
  - tidss: Misc improvements
  - virtio: convert to helpers, add prime support for scanout buffers
  - v3d: Add DRM_IOCTL_V3D_PERFMON_SET_GLOBAL
  - vc4: Add support for BCM2712
  - vkms: Improvements all across the board

  - panels:
    - Introduce backlight quirks infrastructure
    - New panels: KDB KD116N2130B12

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241205-agile-straight-pegasus-aca7f4@houat
---

c7d6cb4c43a6baf940f4ae42541dcc1a1a74b2a3
diff --cc drivers/gpu/drm/virtio/virtgpu_prime.c
index 44425f20d91aa,688810d1b6112..b3664c12843d8
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@@ -27,6 -27,8 +27,8 @@@
  
  #include "virtgpu_drv.h"
  
 -MODULE_IMPORT_NS(DMA_BUF);
++MODULE_IMPORT_NS("DMA_BUF");
+ 
  static int virtgpu_virtio_get_uuid(struct dma_buf *buf,
  				   uuid_t *uuid)
  {