Merge drm/drm-next into drm-misc-next

We need to backmerge drm-next to fix the komeda build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

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

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

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

diff --cc drivers/gpu/drm/i915/intel_display.c
index e0f40be071319b8f48fab45982226dc06427def8,619f1a20cc2db9d320c7b2aa819453fb81ab20df..ccb616351bba725052ea3a752cc5263744d58af2
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -42,17 -38,21 +42,26 @@@
  #include <drm/drm_plane_helper.h>
  #include <drm/drm_probe_helper.h>
  #include <drm/drm_rect.h>
 -#include <drm/drm_atomic_uapi.h>
 -#include <linux/intel-iommu.h>
 -#include <linux/reservation.h>
 +#include <drm/i915_drm.h>
 +
 +#include "i915_drv.h"
 +#include "i915_gem_clflush.h"
 +#include "i915_trace.h"
 +#include "intel_drv.h"
 +#include "intel_dsi.h"
 +#include "intel_frontbuffer.h"
  
+ #include "intel_drv.h"
+ #include "intel_dsi.h"
+ #include "intel_frontbuffer.h"
+ 
+ #include "i915_drv.h"
+ #include "i915_gem_clflush.h"
+ #include "i915_reset.h"
+ #include "i915_trace.h"
+ 
  /* Primary plane formats for gen <= 3 */
- static const uint32_t i8xx_primary_formats[] = {
+ static const u32 i8xx_primary_formats[] = {
        DRM_FORMAT_C8,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB1555,

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

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

diff --cc drivers/gpu/drm/rcar-du/rcar_du_crtc.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_du_kms.c
Simple merge

diff --cc include/drm/ttm/ttm_bo_driver.h
Simple merge

diff --cc include/uapi/drm/drm_fourcc.h
Simple merge