BackMerge v5.1-rc5 into drm-next

Need rc5 for udl fix to add udl cleanups on top.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device.c
Simple merge

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

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link.c
Simple merge

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

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

diff --cc drivers/gpu/drm/drm_atomic_helper.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/i915/gvt/cmd_parser.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/dmabuf.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/udl/udl_drv.c
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

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

diff --cc sound/hda/hdac_component.c
index 13915fdc6a54c0335bc2ad6af283f6be97cb9f39,1ea51e3b942a034a1b487bb2ad7dc054893a4d39..dfe7e755f594df25ee4547ece4f6ee72d28f761a
--- 1/sound/hda/hdac_component.c
--- 2/sound/hda/hdac_component.c
+++ b/sound/hda/hdac_component.c
@@@ -90,14 -89,13 +92,16 @@@ void snd_hdac_display_power(struct hdac
                }
        } else {
                if (bus->display_power_active) {
 +                      unsigned long cookie = bus->display_power_active;
 +
                        if (acomp->ops->put_power)
 -                              acomp->ops->put_power(acomp->dev);
 -                      bus->display_power_active = false;
 +                              acomp->ops->put_power(acomp->dev, cookie);
 +
 +                      bus->display_power_active = 0;
                }
        }
+  unlock:
+       mutex_unlock(&bus->lock);
  }
  EXPORT_SYMBOL_GPL(snd_hdac_display_power);