Merge tag 'drm-misc-next-2022-10-20' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Tue, 25 Oct 2022 01:42:01 +0000 (11:42 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 25 Oct 2022 01:42:18 +0000 (11:42 +1000)
drm-misc-next for 6.2:

UAPI Changes:
  - Documentation for page-flip flags

Cross-subsystem Changes:
  - dma-buf: Add unlocked variant of vmapping and attachment-mapping
    functions

Core Changes:
  - atomic-helpers: CRTC primary plane test fixes
  - connector: TV API consistency improvements, cmdline parsing
    improvements
  - crtc-helpers: Introduce drm_crtc_helper_atomic_check() helper
  - edid: Fixes for HFVSDB parsing,
  - fourcc: Addition of the Vivante tiled modifier
  - makefile: Sort and reorganize the objects files
  - mode_config: Remove fb_base from drm_mode_config_funcs
  - sched: Add a module parameter to change the scheduling policy,
    refcounting fix for fences
  - tests: Sort the Kunit tests in the Makefile, improvements to the
    DP-MST tests
  - ttm: Remove unnecessary drm_mm_clean() call

Driver Changes:
  - New driver: ofdrm
  - Move all drivers to a common dma-buf locking convention
  - bridge:
    - adv7533: Remove dynamic lane switching
    - it6505: Runtime PM support
    - ps8640: Handle AUX defer messages
    - tc358775: Drop soft-reset over I2C
  - ast: Atomic Gamma LUT Support, Convert to SHMEM, various
    improvements
  - lcdif: Support for YUV planes
  - mgag200: Fix PLL Setup on some revisions
  - udl: Modesetting improvements, hot-unplug support
  - vc4: Fix support for PAL-M

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221020072405.g3o4hxuk75gmeumw@houat
1  2 
MAINTAINERS
drivers/gpu/drm/panfrost/panfrost_dump.c
drivers/gpu/drm/scheduler/sched_entity.c
drivers/gpu/drm/vc4/vc4_hdmi.c
include/drm/gpu_scheduler.h

diff --cc MAINTAINERS
Simple merge
@@@ -236,9 -236,9 +236,9 @@@ void panfrost_core_dump(struct panfrost
                vaddr = map.vaddr;
                memcpy(iter.data, vaddr, bo->base.base.size);
  
-               drm_gem_shmem_vunmap(&bo->base, &map);
+               drm_gem_vunmap_unlocked(&bo->base.base, &map);
  
 -              iter.hdr->bomap.valid = cpu_to_le32(1);
 +              iter.hdr->bomap.valid = 1;
  
  dump_header:  panfrost_core_dump_header(&iter, PANFROSTDUMP_BUF_BO, iter.data +
                                          bo->base.base.size);
Simple merge
Simple merge