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

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

drm-misc-next for 6.2:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
- atomic-helper: Add begin_fb_access and end_fb_access hooks
- fb-helper: Rework to move fb emulation into helpers
- scheduler: rework entity flush, kill and fini
- ttm: Optimize pool allocations

Driver Changes:
- amdgpu: scheduler rework
- hdlcd: Switch to DRM-managed resources
- ingenic: Fix registration error path
- lcdif: FIFO threshold tuning
- meson: Fix return type of cvbs' mode_valid
- ofdrm: multiple fixes (kconfig, types, endianness)
- sun4i: A100 and D1 support
- panel:
  - New Panel: Jadard JD9365DA-H3

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221110083612.g63eaocoaa554soh@houat
---

4e291f2f585313efa5200cce655e17c94906e50a
diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
index a19f18b251f3,fd99ec0f4257..80f154b6adab
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@@ -33,7 -33,6 +33,8 @@@
  #include <drm/drm_aperture.h>
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_drv.h>
 +#include <drm/drm_fb_helper.h>
++#include <drm/drm_fbdev_generic.h>
  #include <drm/drm_gem_ttm_helper.h>
  #include <drm/drm_ioctl.h>
  #include <drm/drm_vblank.h>