From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jun 2014 18:32:30 +0000 (-0700)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v4.14-rc1~7391
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=682b7c1c8ea8885aa681ddf530d6cf2ad4f2dc15;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is the main drm merge window pull request, changes all over the
  place, mostly normal levels of churn.

  Highlights:

  Core drm:
     More cleanups, fix race on connector/encoder naming, docs updates,
     object locking rework in prep for atomic modeset

  i915:
     mipi DSI support, valleyview power fixes, cursor size fixes,
     execlist refactoring, vblank improvements, userptr support, OOM
     handling improvements

  radeon:
     GPUVM tuning and large page size support, gart fixes, deep color
     HDMI support, HDMI audio cleanups

  nouveau:
     - displayport rework should fix lots of issues
     - initial gk20a support
     - gk110b support
     - gk208 fixes

  exynos:
     probe order fixes, HDMI changes, IPP consolidation

  msm:
     debugfs updates, misc fixes

  ast:
     ast2400 support, sync with UMS driver

  tegra:
     cleanups, hdmi + hw cursor for Tegra 124.

  panel:
     fixes existing panels add some new ones.

  ipuv3:
     moved from staging to drivers/gpu"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (761 commits)
  drm/nouveau/disp/dp: fix tmds passthrough on dp connector
  drm/nouveau/dp: probe dpcd to determine connectedness
  drm/nv50-: trigger update after all connectors disabled
  drm/nv50-: prepare for attaching a SOR to multiple heads
  drm/gf119-/disp: fix debug output on update failure
  drm/nouveau/disp/dp: make use of postcursor when its available
  drm/g94-/disp/dp: take max pullup value across all lanes
  drm/nouveau/bios/dp: parse lane postcursor data
  drm/nouveau/dp: fix support for dpms
  drm/nouveau: register a drm_dp_aux channel for each dp connector
  drm/g94-/disp: add method to power-off dp lanes
  drm/nouveau/disp/dp: maintain link in response to hpd signal
  drm/g94-/disp: bash and wait for something after changing lane power regs
  drm/nouveau/disp/dp: split link config/power into two steps
  drm/nv50/disp: train PIOR-attached DP from second supervisor
  drm/nouveau/disp/dp: make use of existing output data for link training
  drm/gf119/disp: start removing direct vbios parsing from supervisor
  drm/nv50/disp: start removing direct vbios parsing from supervisor
  drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal
  drm/nouveau/disp/dp: create subclass for dp outputs
  ...
---

682b7c1c8ea8885aa681ddf530d6cf2ad4f2dc15
diff --cc drivers/gpu/ipu-v3/ipu-dc.c
index 784a4a1,9f1e5ef..2326c752
--- a/drivers/gpu/ipu-v3/ipu-dc.c
+++ b/drivers/gpu/ipu-v3/ipu-dc.c
@@@ -18,11 -18,9 +18,10 @@@
  #include <linux/types.h>
  #include <linux/errno.h>
  #include <linux/delay.h>
 +#include <linux/interrupt.h>
  #include <linux/io.h>
  
- #include "../imx-drm.h"
- #include "imx-ipu-v3.h"
+ #include <video/imx-ipu-v3.h>
  #include "ipu-prv.h"
  
  #define DC_MAP_CONF_PTR(n)	(0x108 + ((n) & ~0x1) * 2)