From: Dave Airlie <airlied@redhat.com>
Date: Tue, 25 Oct 2022 01:42:01 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2022-10-20' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v6.2-rc1~10^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b837d3db9a37bb07c845f4e69c34640a5d05ae22;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'drm-misc-next-2022-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

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

b837d3db9a37bb07c845f4e69c34640a5d05ae22
diff --cc drivers/gpu/drm/panfrost/panfrost_dump.c
index 6bd0634e2d58,f62a019cc523..e7942ac449c6
--- a/drivers/gpu/drm/panfrost/panfrost_dump.c
+++ b/drivers/gpu/drm/panfrost/panfrost_dump.c
@@@ -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);