Merge branch 'drm-intel-next' of git://git.freedesktop.org/git/drm-intel into drm-next

- fine-grained display power domains for byt (Imre)
- runtime pm prep patches for !hsw from Paulo
- WiZ hashing flag updates from Ville
- ppgtt setup cleanup and enabling of full 4G range on bdw (Ben)
- fixes from Jesse for the inherited intial config code
- gpu reset code improvements from Mika
- per-pipe num_planes refactoring from Damien
- stability fixes around bdw forcewake handling and other bdw w/a from Mika
  Ken
- and as usual a pile of smaller fixes all over

* 'drm-intel-next' of git://git.freedesktop.org/git/drm-intel: (107 commits)
  drm/i915: Go OCD on the Makefile
  drm/i915: Implement command buffer parsing logic
  drm/i915: Refactor shmem pread setup
  drm/i915: Avoid div by zero when pixel clock is large
  drm/i915: power domains: add vlv power wells
  drm/i915: factor out intel_set_cpu_fifo_underrun_reporting_nolock
  drm/i915: vlv: factor out valleyview_display_irq_install
  drm/i915: sanity check power well sw state against hw state
  drm/i915: factor out reset_vblank_counter
  drm/i915: sanitize PUNIT register macro definitions
  drm/i915: vlv: keep first level vblank IRQs masked
  drm/i915: check pipe power domain when reading its hw state
  drm/i915: check port power domain when reading the encoder hw state
  drm/i915: get port power domain in connector detect handlers
  drm/i915: add port power domains
  drm/i915: add noop power well handlers instead of NULL checking them
  drm/i915: split power well 'set' handler to separate enable/disable/sync_hw
  drm/i915: add init power domain to always-on power wells
  drm/i915: move power domain macros to intel_pm.c
  drm/i915: Disable full ppgtt by default
  ...

29 files changed, 2896 insertions, 1019 deletions

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index f33902ff2c22..b1445b73465b 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -3,58 +3,69 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ccflags-y := -Iinclude/drm
-i915-y := i915_drv.o i915_dma.o i915_irq.o \
-          i915_gpu_error.o \
+
+# Please keep these build lists sorted!
+
+# core driver code
+i915-y := i915_drv.o \
+          i915_params.o \
           i915_suspend.o \
-          i915_gem.o \
+          i915_sysfs.o \
+          intel_pm.o
+i915-$(CONFIG_COMPAT)   += i915_ioc32.o
+i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+
+# GEM code
+i915-y += i915_cmd_parser.o \
           i915_gem_context.o \
           i915_gem_debug.o \
+          i915_gem_dmabuf.o \
           i915_gem_evict.o \
           i915_gem_execbuffer.o \
           i915_gem_gtt.o \
+          i915_gem.o \
           i915_gem_stolen.o \
           i915_gem_tiling.o \
-          i915_params.o \
-          i915_sysfs.o \
+          i915_gpu_error.o \
+          i915_irq.o \
           i915_trace_points.o \
-          i915_ums.o \
+          intel_ringbuffer.o \
+          intel_uncore.o
+
+# modesetting core code
+i915-y += intel_bios.o \
           intel_display.o \
-          intel_crt.o \
-          intel_lvds.o \
-          intel_dsi.o \
-          intel_dsi_cmd.o \
-          intel_dsi_pll.o \
-          intel_bios.o \
-          intel_ddi.o \
-          intel_dp.o \
-          intel_hdmi.o \
-          intel_sdvo.o \
           intel_modes.o \
-          intel_panel.o \
-          intel_pm.o \
-          intel_i2c.o \
-          intel_tv.o \
-          intel_dvo.o \
-          intel_ringbuffer.o \
           intel_overlay.o \
-          intel_sprite.o \
           intel_sideband.o \
-          intel_uncore.o \
+          intel_sprite.o
+i915-$(CONFIG_ACPI)             += intel_acpi.o intel_opregion.o
+i915-$(CONFIG_DRM_I915_FBDEV)   += intel_fbdev.o
+
+# modesetting output/encoder code
+i915-y += dvo_ch7017.o \
           dvo_ch7xxx.o \
-          dvo_ch7017.o \
           dvo_ivch.o \
-          dvo_tfp410.o \
-          dvo_sil164.o \
           dvo_ns2501.o \
-          i915_gem_dmabuf.o
-
-i915-$(CONFIG_COMPAT)   += i915_ioc32.o
-
-i915-$(CONFIG_ACPI)     += intel_acpi.o intel_opregion.o
-
-i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
+          dvo_sil164.o \
+          dvo_tfp410.o \
+          intel_crt.o \
+          intel_ddi.o \
+          intel_dp.o \
+          intel_dsi_cmd.o \
+          intel_dsi.o \
+          intel_dsi_pll.o \
+          intel_dvo.o \
+          intel_hdmi.o \
+          intel_i2c.o \
+          intel_lvds.o \
+          intel_panel.o \
+          intel_sdvo.o \
+          intel_tv.o
 
-i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+# legacy horrors
+i915-y += i915_dma.o \
+          i915_ums.o
 
 obj-$(CONFIG_DRM_I915)  += i915.o
 
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
new file mode 100644
index 000000000000..7a5756e9bb86
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -0,0 +1,485 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brad Volkin <bradley.d.volkin@intel.com>
+ *
+ */
+
+#include "i915_drv.h"
+