Merge tag 'drm-intel-next-2014-05-23' of git://anongit.freedesktop.org/drm-intel into drm-next

- prep refactoring for execlists (Oscar Mateo)
- corner-case fixes for runtime pm (Imre)
- tons of vblank improvements from Ville
- prep work for atomic plane/sprite updates (Ville)
- more chv code, now almost complete (tons of different people)
- refactoring and improvements for drm_irq.c merged through drm-intel-next
- g4x/ilk reset improvements (Ville)
- removal of encoder->mode_set
- moved audio state tracking into pipe_config
- shuffled fb pinning out of the platform crtc modeset callbacks into core code
- userptr support (Chris)
- OOM handling improvements from Chris, with now have a neat oom notifier which
  jumps additional debug information.
- topdown allocation of ppgtt PDEs (Ben)
- fixes and small improvements all over

* tag 'drm-intel-next-2014-05-23' of git://anongit.freedesktop.org/drm-intel: (187 commits)
  drm/i915: Kill private_default_ctx off
  drm/i915: s/i915_hw_context/intel_context
  drm/i915: Split the ringbuffers from the rings (3/3)
  drm/i915: Split the ringbuffers from the rings (2/3)
  drm/i915: Split the ringbuffers from the rings (1/3)
  drm/i915: s/intel_ring_buffer/intel_engine_cs
  drm/i915: disable GT power saving early during system suspend
  drm/i915: fix possible RPM ref leaking during RPS disabling
  drm/i915: remove user GTT mappings early during runtime suspend
  drm/i915: Implement WaVcpClkGateDisableForMediaReset:ctg, elk
  drm/i915: Fix gen2 and hsw+ scanline counter
  drm/i915: Draw a picture about video timings
  drm/i915: Improve gen3/4 frame counter
  drm/i915: Add a small adjustment to the pixel counter on interlaced modes
  drm/i915: Hold CRTC lock whilst freezing the planes
  drm/i915: Only discard backing storage on releasing the last ref
  drm/i915: Wait for pending page flips before enabling/disabling the primary plane
  drm/i915: grab the audio power domain when enabling audio on HSW+
  drm/i915: don't read HSW_AUD_PIN_ELD_CP_VLD when the power well is off
  drm/i915: move bsd dispatch index somewhere better
  ...

1 files changed, 100 insertions, 7 deletions

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index c1c9cf2a7b48..00f1c25e53df 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -3368,6 +3368,10 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis>
       with a call to <function>drm_vblank_cleanup</function> in the driver
       <methodname>unload</methodname> operation handler.
     </para>
+    <sect2>
+      <title>Vertical Blanking and Interrupt Handling Functions Reference</title>
+!Edrivers/gpu/drm/drm_irq.c
+    </sect2>
   </sect1>
 
   <!-- Internals: open/close, file operations and ioctls -->
@@ -3710,17 +3714,16 @@ int num_ioctls;</synopsis>
             <term>DRM_IOCTL_MODESET_CTL</term>
             <listitem>
               <para>
-                This should be called by application level drivers before and
-                after mode setting, since on many devices the vertical blank
-                counter is reset at that time.  Internally, the DRM snapshots
-                the last vblank count when the ioctl is called with the
-                _DRM_PRE_MODESET command, so that the counter won't go backwards
-                (which is dealt with when _DRM_POST_MODESET is used).
+                This was only used for user-mode-settind drivers around
+                modesetting changes to allow the kernel to update the vblank
+                interrupt after mode setting, since on many devices the vertical
+                blank counter is reset to 0 at some point during modeset. Modern
+                drivers should not call this any more since with kernel mode
+                setting it is a no-op.
               </para>
             </listitem>
           </varlistentry>
         </variablelist>
-<!--!Edrivers/char/drm/drm_irq.c-->
       </para>
     </sect1>
 
@@ -3783,6 +3786,96 @@ int num_ioctls;</synopsis>
           probing, so those sections fully apply.
         </para>
       </sect2>
+      <sect2>
+        <title>DPIO</title>
+!Pdrivers/gpu/drm/i915/i915_reg.h DPIO
+        <table id="dpiox2">
+          <title>Dual channel PHY (VLV/CHV)</title>
+          <tgroup cols="8">
+            <colspec colname="c0" />
+            <colspec colname="c1" />
+            <colspec colname="c2" />
+            <colspec colname="c3" />
+            <colspec colname="c4" />
+            <colspec colname="c5" />
+            <colspec colname="c6" />
+            <colspec colname="c7" />
+            <spanspec spanname="ch0" namest="c0" nameend="c3" />
+            <spanspec spanname="ch1" namest="c4" nameend="c7" />
+            <spanspec spanname="ch0pcs01" namest="c0" nameend="c1" />
+            <spanspec spanname="ch0pcs23" namest="c2" nameend="c3" />
+            <spanspec spanname="ch1pcs01" namest="c4" nameend="c5" />
+            <spanspec spanname="ch1pcs23" namest="c6" nameend="c7" />
+            <thead>
+              <row>
+                <entry spanname="ch0">CH0</entry>
+                <entry spanname="ch1">CH1</entry>
+              </row>
+            </thead>
+            <tbody valign="top" align="center">
+              <row>
+                <entry spanname="ch0">CMN/PLL/REF</entry>
+                <entry spanname="ch1">CMN/PLL/REF</entry>
+              </row>
+              <row>
+                <entry spanname="ch0pcs01">PCS01</entry>
+                <entry spanname="ch0pcs23">PCS23</entry>
+                <entry spanname="ch1pcs01">PCS01</entry>
+                <entry spanname="ch1pcs23">PCS23</entry>
+              </row>
+              <row>
+                <entry>TX0</entry>
+                <entry>TX1</entry>
+                <entry>TX2</entry>
+                <entry>TX3</entry>
+                <entry>TX0</entry>
+                <entry>TX1</entry>
+                <entry>TX2</entry>
+                <entry>TX3</entry>
+              </row>
+              <row>
+                <entry spanname="ch0">DDI0</entry>
+                <entry spanname="ch1">DDI1</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+        <table id="dpiox1">
+          <title>Single channel PHY (CHV)</title>
+          <tgroup cols="4">
+            <colspec colname="c0" />
+            <colspec colname="c1" />
+            <colspec colname="c2" />
+            <colspec colname="c3" />
+            <spanspec spanname="ch0" namest="c0" nameend="c3" />
+            <spanspec spanname="ch0pcs01" namest="c0" nameend="c1" />
+            <spanspec spanname="ch0pcs23" namest="c2" nameend="c3" />
+            <thead>
+              <row>
+                <entry spanname="ch0">CH0</entry>
+              </row>
+            </thead>
+            <tbody valign="top" align="center">
+              <row>
+                <entry spanname="ch0">CMN/PLL/REF</entry>
+              </row>
+              <row>
+                <entry spanname="ch0pcs01">PCS01</entry>
+                <entry spanname="ch0pcs23">PCS23</entry>
+              </row>
+              <row>
+                <entry>TX0</entry>
+                <entry>TX1</entry>
+                <entry>TX2</entry>
+                <entry>TX3</entry>
+              </row>
+              <row>
+                <entry spanname="ch0">DDI2</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+      </sect2>
     </sect1>
 
     <sect1>