From: Maxime Ripard <maxime.ripard@bootlin.com>
Date: Mon, 11 Feb 2019 09:35:35 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: v5.1-rc1~117^2~8^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d588100baa28dae6a5c32d02bfe744d0792ed2ad;p=linux.git

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>
---

d588100baa28dae6a5c32d02bfe744d0792ed2ad
diff --cc drivers/gpu/drm/i915/intel_display.c
index e0f40be07131,619f1a20cc2d..ccb616351bba
--- a/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,