Merge drm/drm-next into drm-misc-next

Backmerging from drm/drm-next for v5.16-rc1.

Signed-off-by: Thomas Zimmermann <[email protected]>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/dma-buf.c
index 385cd037325ef34749149e85f95f090647780b39,6437b2e978fb9fa376aaaf2d802dae79e8f01b09..602b12d7470d2d6cca23e7aca1356110cbdea917
--- 1/drivers/dma-buf/dma-buf.c
--- 2/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@@ -1347,8 -1368,16 +1355,9 @@@ static int dma_buf_debug_show(struct se
                                buf_obj->exp_name,
                                file_inode(buf_obj->file)->i_ino,
                                buf_obj->name ?: "");
+               spin_unlock(&buf_obj->name_lock);
  
 -              dma_resv_for_each_fence(&cursor, buf_obj->resv, true, fence) {
 -                      seq_printf(s, "\t%s fence: %s %s %ssignalled\n",
 -                                 dma_resv_iter_is_exclusive(&cursor) ?
 -                                      "Exclusive" : "Shared",
 -                                 fence->ops->get_driver_name(fence),
 -                                 fence->ops->get_timeline_name(fence),
 -                                 dma_fence_is_signaled(fence) ? "" : "un");
 -              }
 +              dma_resv_describe(buf_obj->resv, s);
  
                seq_puts(s, "\tAttached Devices:\n");
                attach_count = 0;

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.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_debugfs.c
Simple merge

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

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

diff --cc drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
Simple merge

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

diff --cc drivers/gpu/drm/kmb/kmb_drv.c
index 7e1fda9f9a3d45e0fa712825f529d1bc2ef1d97c,961ac6fb5fcf746e658e6f3fc4a839fe6b15f4e6..ed242435077314fb03d891b582fdd1aa16f85245
--- 1/drivers/gpu/drm/kmb/kmb_drv.c
--- 2/drivers/gpu/drm/kmb/kmb_drv.c
+++ b/drivers/gpu/drm/kmb/kmb_drv.c
@@@ -173,11 -172,10 +173,11 @@@ static int kmb_setup_mode_config(struc
        ret = drmm_mode_config_init(drm);
        if (ret)
                return ret;
-       drm->mode_config.min_width = KMB_MIN_WIDTH;
-       drm->mode_config.min_height = KMB_MIN_HEIGHT;
-       drm->mode_config.max_width = KMB_MAX_WIDTH;
-       drm->mode_config.max_height = KMB_MAX_HEIGHT;
+       drm->mode_config.min_width = KMB_FB_MIN_WIDTH;
+       drm->mode_config.min_height = KMB_FB_MIN_HEIGHT;
+       drm->mode_config.max_width = KMB_FB_MAX_WIDTH;
+       drm->mode_config.max_height = KMB_FB_MAX_HEIGHT;
 +      drm->mode_config.preferred_depth = 24;
        drm->mode_config.funcs = &kmb_mode_config_funcs;
  
        ret = kmb_setup_crtc(drm);

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

diff --cc drivers/gpu/drm/msm/dsi/dsi.h
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_host.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_manager.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.h
Simple merge

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

diff --cc drivers/gpu/drm/nouveau/dispnv50/crc.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
index 23fa9ecc22967b250203a8a0c273fbe09b3faf49,8e28403ea9b14283c64eae0c15e8058cd7aaad34..ae1f4120552091c9c1f0645cef9d964494c06b4b
--- 1/drivers/gpu/drm/nouveau/dispnv50/disp.c
--- 2/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@@ -1413,9 -1411,10 +1413,9 @@@ nv50_mstm_prepare(struct nv50_mstm *mst
  {
        struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev);
        struct drm_encoder *encoder;
 -      int ret;
  
        NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name);
-       drm_dp_update_payload_part1(&mstm->mgr);
 -      ret = drm_dp_update_payload_part1(&mstm->mgr, 1);
++      drm_dp_update_payload_part1(&mstm->mgr, 1);
  
        drm_for_each_encoder(encoder, mstm->outp->base.base.dev) {
                if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {

diff --cc drivers/gpu/drm/nouveau/dispnv50/head.c
Simple merge

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

diff --cc drivers/gpu/drm/panel/panel-abt-y030xx067a.c
Simple merge

diff --cc drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge

diff --cc drivers/platform/x86/Kconfig
Simple merge

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

diff --cc drivers/pwm/core.c
Simple merge

diff --cc include/linux/dma-buf.h
Simple merge

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