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

Primarily sync with the drm_print.h changes from drm-misc.

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/display/intel_frontbuffer.c
index 4761e116e442fe07e387ca0453bd87b34137e82d,c88bef22d36602eef649c8fa452718584ba91bb1..03c4978fa5ecf175bfc70de9adc210de61ecbfd4
--- 1/drivers/gpu/drm/i915/display/intel_frontbuffer.c
--- 2/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@@ -56,7 -56,10 +56,8 @@@
   */
  
  #include <drm/drm_gem.h>
+ #include <drm/drm_print.h>
  
 -#include "i915_active.h"
 -#include "i915_vma.h"
  #include "intel_bo.h"
  #include "intel_display_trace.h"
  #include "intel_display_types.h"

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

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

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

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

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

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

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