]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'drm-misc-next-2024-10-09' of https://gitlab.freedesktop.org/drm/misc/kerne...
authorDave Airlie <airlied@redhat.com>
Thu, 10 Oct 2024 19:39:09 +0000 (05:39 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 Oct 2024 19:39:10 +0000 (05:39 +1000)
drm-misc-next for v6.13:

UAPI Changes:
- Add drm fdinfo support to panthor, and add sysfs knob to toggle.

Cross-subsystem Changes:
- Convert fbdev drivers to use backlight power constants.
- Some small dma-fence fixes.
- Some kernel-doc fixes.

Core Changes:
- Small drm client fixes.
- Document requirements that you need to file a bug before marking a test as flaky.
- Remove swapped and pinned bo's from TTM lru list.

Driver Changes:
- Assorted small fixes to panel/elida-kd35t133, nouveau, vc4, imx.
- Fix some bridges to drop cached edids on power off.
- Add Jenson BL-JT60050-01A, Samsung s6e3ha8 & AMS639RQ08 panels.
- Make 180° rotation work on ilitek-ili9881c, even for already-rotated
  panels.
-

Signed-off-by: Dave Airlie <airlied@redhat.com>
# Conflicts:
# drivers/gpu/drm/panthor/panthor_drv.c
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8dc111ca-d20c-4e0d-856e-c12d208cbf2a@linux.intel.com
1  2 
MAINTAINERS
drivers/gpu/drm/drm_debugfs.c
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
drivers/gpu/drm/panthor/panthor_drv.c
drivers/gpu/drm/panthor/panthor_sched.c
drivers/gpu/drm/xe/xe_bo.c

diff --cc MAINTAINERS
Simple merge
Simple merge
index f32acadb77f17caae53039e3beee281520877651,f9b93f84d611a9d03c74c5a702c9bd1ec75e8bc4..ac7e53f6e3f013d3db4d41d2de30ecbfdd4881b4
@@@ -1444,7 -1476,7 +1476,8 @@@ static const struct file_operations pan
        .read = drm_read,
        .llseek = noop_llseek,
        .mmap = panthor_mmap,
+       .show_fdinfo = drm_show_fdinfo,
 +      .fop_flags = FOP_UNSIGNED_OFFSET,
  };
  
  #ifdef CONFIG_DEBUG_FS
Simple merge