Merge remote-tracking branch 'drm/drm-next'

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

diff --cc Documentation/gpu/drm-uapi.rst
index f2f079e91b4cf526ff87cc5a53b357af9aa51852,4b4bf2c5eac5d8f54e0bfb5992837099740008a9..a752aa561ea4d256341274aafdeaf2ebc45c872f
--- 1/Documentation/gpu/drm-uapi.rst
--- 2/Documentation/gpu/drm-uapi.rst
+++ b/Documentation/gpu/drm-uapi.rst
@@@ -194,9 -194,12 +194,12 @@@ EPERM/EACCES
          Returned for an operation that is valid, but needs more privileges.
          E.g. root-only or much more common, DRM master-only operations return
          this when when called by unpriviledged clients. There's no clear
 -        difference between EACCESS and EPERM.
 +        difference between EACCES and EPERM.
  
  ENODEV:
+         The device is not (yet) present or fully initialized.
+ 
+ EOPNOTSUPP:
          Feature (like PRIME, modesetting, GEM) is not supported by the driver.
  
  ENXIO:

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 322e09b5b44894183d2c8aab92b1319f634a4fd5,c1a03505f956c9419967a5a07fa81f47bfa8dd81..4f8352044563415876ea80de0f00a6b02ddbb79b
--- 1/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
--- 2/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@@ -223,9 -214,9 +215,9 @@@ static int vcn_v1_0_hw_fini(void *handl
        struct amdgpu_ring *ring = &adev->vcn.ring_dec;
  
        if (RREG32_SOC15(VCN, 0, mmUVD_STATUS))
 -              vcn_v1_0_stop(adev);
 +              vcn_v1_0_set_powergating_state(adev, AMD_PG_STATE_GATE);
  
-       ring->ready = false;
+       ring->sched.ready = false;
  
        return 0;
  }

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 5a6edf65c9eaebd958104d4d0dd8216281ffaccc,32e791d9b9a8ba5290381b2685b4336b1e203031..1691864bf59b1b5762430b692b737ad446569a87
--- 1/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
--- 2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -3063,8 -3234,7 +3235,8 @@@ amdgpu_dm_connector_atomic_duplicate_st
        __drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
  
        new_state->freesync_capable = state->freesync_capable;
-       new_state->freesync_enable = state->freesync_enable;
 +      new_state->max_bpc = state->max_bpc;
+       new_state->abm_level = state->abm_level;
  
        return &new_state->base;
  }

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
Simple merge

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

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

diff --cc drivers/gpu/drm/drm_internal.h
Simple merge

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

diff --cc drivers/gpu/drm/meson/meson_crtc.c
index 191b314f9e9e5ce92284beec9f4d27f54bdcc811,d78168f979db3b46a3978eb9a7a3ff4dfb05334e..75d97f1b2e8fbf08e69b289f8a383ec4fd13291e
--- 1/drivers/gpu/drm/meson/meson_crtc.c
--- 2/drivers/gpu/drm/meson/meson_crtc.c
+++ b/drivers/gpu/drm/meson/meson_crtc.c
@@@ -126,8 -115,8 +131,10 @@@ static void meson_crtc_atomic_disable(s
        struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
        struct meson_drm *priv = meson_crtc->priv;
  
+       DRM_DEBUG_DRIVER("\n");
+ 
 +      drm_crtc_vblank_off(crtc);
 +
        priv->viu.osd1_enabled = false;
        priv->viu.osd1_commit = false;
  

diff --cc drivers/gpu/drm/meson/meson_dw_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_venc.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_viu.c
Simple merge

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

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

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

diff --cc drivers/media/i2c/adv7511.c
Simple merge

diff --cc drivers/media/i2c/adv7604.c
Simple merge

diff --cc drivers/media/i2c/adv7842.c
Simple merge

diff --cc drivers/media/i2c/tc358743.c
Simple merge

diff --cc mm/shmem.c
Simple merge