]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'drm-misc-next-2024-05-30' of https://gitlab.freedesktop.org/drm/misc/kerne...
authorDave Airlie <airlied@redhat.com>
Fri, 14 Jun 2024 07:18:29 +0000 (17:18 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Jun 2024 00:30:31 +0000 (10:30 +1000)
drm-misc-next for 6.11:

UAPI Changes:
  - Deprecate DRM date and return a 0 date in DRM_IOCTL_VERSION

Core Changes:
  - connector: Create a set of helpers to help with HDMI support
  - fbdev: Create memory manager optimized fbdev emulation
  - panic: Allow to select fonts, improve drm_fb_dma_get_scanout_buffer

Driver Changes:
  - Remove driver owner assignments
  - Allow more drivers to compile with COMPILE_TEST
  - Conversions to drm_edid
  - ivpu: hardware scheduler support, profiling support, improvements
    to the platform support layer
  - mgag200: general reworks and improvements
  - nouveau: Add NVreg_RegistryDwords command line option
  - rockchip: Conversion to the hdmi helpers
  - sun4i: Conversion to the hdmi helpers
  - vc4: Conversion to the hdmi helpers
  - v3d: Perf counters improvements
  - zynqmp: IRQ and debugfs improvements
  - bridge:
    - Remove redundant checks on bridge->encoder
  - panels:
    - Switch panels from register table initialization to proper code
    - Now that the panel code tracks the panel state, remove every
      ad-hoc implementation in the panel drivers
    - New panels: Lincoln Tech Sol LCD185-101CT, Microtips Technology
      13-101HIEBCAF0-C, Microtips Technology MF-103HIEB0GA0, BOE
      nv110wum-l60, IVO t109nw41

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240530-hilarious-flat-magpie-5fa186@houat
1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/panel/Kconfig
drivers/gpu/drm/panel/panel-lg-sw43408.c
drivers/gpu/drm/radeon/atombios_encoders.c
drivers/gpu/drm/radeon/radeon_connectors.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
include/uapi/drm/amdgpu_drm.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index e44362e74fa1ec960761721ec00ad1854ba594d1,d5ebafacdd70c0fe1d8d824df85481deb870e03e..efe5de6ce208a141499dd66d45b196f33e10886b
@@@ -1281,8 -1268,16 +1281,17 @@@ struct drm_amdgpu_info_gpuvm_fault 
  #define AMDGPU_FAMILY_GC_10_3_6                       149 /* GC 10.3.6 */
  #define AMDGPU_FAMILY_GC_10_3_7                       151 /* GC 10.3.7 */
  #define AMDGPU_FAMILY_GC_11_5_0                       150 /* GC 11.5.0 */
 +#define AMDGPU_FAMILY_GC_12_0_0                       152 /* GC 12.0.0 */
  
+ /* FIXME wrong namespace! */
+ struct drm_color_ctm_3x4 {
+       /*
+        * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude
+        * (not two's complement!) format.
+        */
+       __u64 matrix[12];
+ };
  #if defined(__cplusplus)
  }
  #endif