Merge drm/drm-next into drm-intel-next-queued

Sync up with v5.5-rc1 to get the updated lock_release() API among other
things. Fix the conflict reported by Stephen Rothwell [1].

[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

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

diff --cc drivers/gpu/drm/i915/Kconfig.debug
Simple merge

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

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

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

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

diff --cc include/linux/lockdep.h
index 827722c21797952c2734572ff915551d7f7bff70,c50d01ef1414a505b48d68a5768530ef7784cd2e..664f52c6dd4c1471163a2104cc98e9ef5df9568c
--- 1/include/linux/lockdep.h
--- 2/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@@ -626,15 -625,8 +625,15 @@@ do {                                                                     
  do {                                                                  \
        typecheck(struct lockdep_map *, &(lock)->dep_map);              \
        lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_);    \
-       lock_release(&(lock)->dep_map, 0, _THIS_IP_);                   \
+       lock_release(&(lock)->dep_map, _THIS_IP_);                      \
  } while (0)
-       lock_release(&(lock)->dep_map, 0, _THIS_IP_);           \
 +# define might_lock_nested(lock, subclass)                            \
 +do {                                                                  \
 +      typecheck(struct lockdep_map *, &(lock)->dep_map);              \
 +      lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL,         \
 +                   _THIS_IP_);                                        \
++      lock_release(&(lock)->dep_map, _THIS_IP_);                      \
 +} while (0)
  
  #define lockdep_assert_irqs_enabled() do {                            \
                WARN_ONCE(debug_locks && !current->lockdep_recursion && \