From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Feb 2019 04:42:25 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2019-02-01' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v5.1-rc1~117^2~17
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=37fdaa3390cf3e0fde96941799543e85ea58f6ae;p=linux.git

Merge tag 'drm-misc-next-2019-02-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 5.1:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - Split out some part of drm_crtc_helper.h into drm_probe_helper.h
  - DRIVER_* flags improvements
  - New tasks on the TODO-list
  - Improvements to the documentation

Driver Changes:
  - Continual of drmP.h removal in multiple drivers
  - Removal of FBINFO_(FLAG_)DEFAULT in multiple drivers
  - sun4i: Addition of the A23 support, multiple fixes for the tiled
    formats
  - atmel-hlcdc: Fix of clipping and rotation properties
  - qxl: various BO-related improvements, prime and generic fbdev emulation
    support
  - dw-hdmi: Support for HDMI2.0 2160p modes and YUV420 output
  - New Sitronix ST7701 panel driver
  - New Kingdisplay KD097D04 panel driver
  - New LeMaker BL035-RGB-002 panel driver
  - New PDA 91-00156-A0 panel driver

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

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190201144749.t3abxvguhstu6bcl@flea
---

37fdaa3390cf3e0fde96941799543e85ea58f6ae
diff --cc drivers/gpu/drm/i915/i915_gem.c
index b359390ba22c,04aef3f64c45..44c82a6b9934
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -26,7 -26,17 +26,8 @@@
   */
  
  #include <drm/drm_vma_manager.h>
+ #include <drm/drm_pci.h>
  #include <drm/i915_drm.h>
 -#include "i915_drv.h"
 -#include "i915_gem_clflush.h"
 -#include "i915_vgpu.h"
 -#include "i915_trace.h"
 -#include "intel_drv.h"
 -#include "intel_frontbuffer.h"
 -#include "intel_mocs.h"
 -#include "intel_workarounds.h"
 -#include "i915_gemfs.h"
  #include <linux/dma-fence-array.h>
  #include <linux/kthread.h>
  #include <linux/reservation.h>
@@@ -36,19 -46,8 +37,20 @@@
  #include <linux/swap.h>
  #include <linux/pci.h>
  #include <linux/dma-buf.h>
+ #include <linux/mman.h>
  
 +#include "i915_drv.h"
 +#include "i915_gem_clflush.h"
 +#include "i915_gemfs.h"
 +#include "i915_reset.h"
 +#include "i915_trace.h"
 +#include "i915_vgpu.h"
 +
 +#include "intel_drv.h"
 +#include "intel_frontbuffer.h"
 +#include "intel_mocs.h"
 +#include "intel_workarounds.h"
 +
  static void i915_gem_flush_free_objects(struct drm_i915_private *i915);
  
  static bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)