Merge tag 'drm-misc-next-2022-01-27' of git://anongit.freedesktop.org/drm/drm-misc...

[airlied: add two missing Kconfig]

drm-misc-next for v5.18:

UAPI Changes:
- Fix invalid IN_FORMATS blob when plane->format_mod_supported is NULL.

Cross-subsystem Changes:
- Assorted dt bindings updates.
- Fix vga16fb vga checking on x86.
- Fix extra semicolon in rwsem.h's _down_write_nest_lock.
- Assorted small fixes to agp and fbdev drivers.
- Fix oops in creating a udmabuf with 0 pages.
- Hot-unplug firmware fb devices on forced removal
- Reqquest memory region in simplefb and simpledrm, and don't make the ioresource as busy.

Core Changes:
- Mock a drm_plane in drm-plane-helper selftest.
- Assorted bug fixes to device logging, dbi.
- Use DP helper for sink count in mst.
- Assorted documentation fixes.
- Assorted small fixes.
- Move DP headers to drm/dp, and add a drm dp helper module.
- Move the buddy allocator from i915 to common drm.
- Add simple pci and platform module init macros to remove a lot of boilerplate from some drivers.
- Support microsoft extension for HMDs and specialized monitors.
- Improve edid parser's deep color handling.
- Add type 7 timing support to edid parser.
- Add a weak backpointer to the ttm_bo from ttm_resource
- Add 3 eDP panels.

Driver Changes:
- Add support for HDMI and JZ4780 to ingenic.
- Add support for higher DP/eDP bitrates to nouveau.
- Assorted driver fixes to tilcdc, vmwgfx, sn65dsi83, meson, stm, panfrost, v3d, gma500, vc4, virtio, mgag200, ast, radeon, amdgpu, nouveau, various bridge drivers.
- Convert and revert exynos dsi support to bridge driver.
- Add vcc supply regulator support for sn65dsi83.
- More conversion of bridge/chipone-icn6211 to atomic.
- Remove conflicting fb's from stm, and add support for new hw version.
- Add device link in parade-ps8640 to fix suspend/resume.
- Update Boe-tv110c9m init sequence.
- Add wide screen support to AST2600.
- Fix omapdrm implicit dma_buf fencing.
- Add support for multiple overlay planes to vkms.
- Convert bridge/anx7625 to atomic, add HDCP support,
  add eld support for audio, and fix HPD.
- Add driver for ChromeOS privacy screen.
- Handover display from firmware to vc4 more gracefully, and support nomodeset.
- Add flexible and ycbcr pixel formats to stm/ltdc.
- Convert exynos mipi dsi to atomic.
- Add initial dual core group GPUs support to panfrost.
- No longer add exclusive fence in amdgpu as shared fence.
- Add CSC and full range supoprt to vc4.
- Shutdown the display on system shutdown and unbind.
- Add Multi-Inno Technology MI0700S4T-6 simple panel.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/456a23c6-7324-7543-0c45-751f30ef83f7@linux.intel.com

diff --cc Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
Simple merge

diff --cc drivers/char/agp/via-agp.c
Simple merge

diff --cc drivers/firmware/sysfb_simplefb.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
Simple merge

diff --cc drivers/gpu/drm/ast/ast_mode.c
Simple merge

diff --cc drivers/gpu/drm/dp/drm_dp_mst_topology.c
Simple merge

diff --cc drivers/gpu/drm/drm_privacy_screen_x86.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
Simple merge

diff --cc drivers/gpu/drm/exynos/Kconfig
index 6a251e3aa779ed5a401f4f99e0b6c579c713519a,6a251e3aa779ed5a401f4f99e0b6c579c713519a..f27cfd2a97267ae50db33342c6b51fdab4d0eded
--- 1/drivers/gpu/drm/exynos/Kconfig
--- 2/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@@ -66,6 -66,6 +66,7 @@@ config DRM_EXYNOS_D
        bool "Exynos specific extensions for Analogix DP driver"
        depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
        select DRM_ANALOGIX_DP
++      select DRM_DP_HELPER
        default DRM_EXYNOS
        select DRM_PANEL
        help

diff --cc drivers/gpu/drm/exynos/exynos_drm_dsi.c
Simple merge

diff --cc drivers/gpu/drm/i915/Makefile
index 1b62b9f65196dd6f91935bf00bd1599a3b2555af,72c2e9c5e0b36835affe62318372738c19b23b53..b136234120c4dd614290cd223e64f49ad4388510
--- 1/drivers/gpu/drm/i915/Makefile
--- 2/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@@ -161,9 -161,7 +161,8 @@@ gem-y += 
  i915-y += \
          $(gem-y) \
          i915_active.o \
-         i915_buddy.o \
          i915_cmd_parser.o \
 +        i915_deps.o \
          i915_gem_evict.o \
          i915_gem_gtt.o \
          i915_gem_ww.o \

diff --cc drivers/gpu/drm/i915/display/intel_bios.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_types.h
index c9c6efadf8b42289f552f436116e39f68a280dd8,0d68dec6ac835d025dad722c3329e65e7a65f292..41e3dd25a78f2cf6431005d7418dcd1fc8ac5adc
--- 1/drivers/gpu/drm/i915/display/intel_display_types.h
--- 2/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@@ -32,11 -32,10 +32,11 @@@
  #include <linux/pwm.h>
  #include <linux/sched/clock.h>
  
+ #include <drm/dp/drm_dp_dual_mode_helper.h>
+ #include <drm/dp/drm_dp_mst_helper.h>
  #include <drm/drm_atomic.h>
  #include <drm/drm_crtc.h>
- #include <drm/drm_dp_dual_mode_helper.h>
- #include <drm/drm_dp_mst_helper.h>
 +#include <drm/drm_dsc.h>
  #include <drm/drm_encoder.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_fourcc.h>

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/selftests/intel_memory_region.c
Simple merge

diff --cc drivers/gpu/drm/msm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_ctrl.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/Kconfig
index 9f1ecefc39332f8339f4cc18fee3394b89142f44,d59dca5efb524980ed863672f5b2bb873adcccfa..fa5cfda4e90e3e3bd03fcff9b9f9cebc95885c4e
--- 1/drivers/gpu/drm/rockchip/Kconfig
--- 2/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@@ -7,6 -8,6 +8,7 @@@ config DRM_ROCKCHI
        select DRM_PANEL
        select VIDEOMODE_HELPERS
        select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
++      select DRM_DP_HELPER if ROCKCHIP_ANALOGIX_DP
        select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
        select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
        select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI

diff --cc drivers/gpu/drm/tegra/Kconfig
Simple merge

diff --cc drivers/gpu/drm/tiny/simpledrm.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/video/fbdev/core/fbmem.c
Simple merge

diff --cc drivers/video/fbdev/vga16fb.c
Simple merge

diff --cc include/drm/dp/drm_dp_helper.h
Simple merge

diff --cc include/linux/fb.h
Simple merge