Merge tag 'v5.8' into drm-next

I need to backmerge 5.8 as I've got a bunch of fixes sitting
on an rc7 base that I want to land.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/gpu/drm/bochs/bochs_kms.c
Simple merge

diff --cc drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index f45cdca,648eb23..a0d392c
--- 1/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
--- 2/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@@ -1280,9 -1223,8 +1280,10 @@@ static int adv7511_probe(struct i2c_cli
                goto err_unregister_cec;
  
        adv7511->bridge.funcs = &adv7511_bridge_funcs;
 +      adv7511->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID
 +                          | DRM_BRIDGE_OP_HPD;
        adv7511->bridge.of_node = dev->of_node;
+       adv7511->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
  
        drm_bridge_add(&adv7511->bridge);
  

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

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

diff --cc drivers/gpu/drm/drm_gem.c
index a57f537,ee2058a..d4e7c83
--- 1/drivers/gpu/drm/drm_gem.c
--- 2/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@@ -913,7 -901,9 +909,9 @@@ drm_gem_open_ioctl(struct drm_device *d
        args->handle = handle;
        args->size = obj->size;
  
-       return 0;
+ err:
 -      drm_gem_object_put_unlocked(obj);
++      drm_gem_object_put(obj);
+       return ret;
  }
  
  /**

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

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

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

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

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

diff --cc drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
Simple merge

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

diff --cc include/drm/drm_mode_config.h
Simple merge