1414 files changed, 34606 insertions, 19992 deletions

diff --git a/.mailmap b/.mailmap
index 08b80428f583..52489f564069 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
 Andrew Morton <akpm@linux-foundation.org>
 Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andy Adamson <andros@citi.umich.edu>
+Antoine Tenart <antoine.tenart@free-electrons.com>
 Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
 Archit Taneja <archit@ti.com>
 Arnaud Patard <arnaud.patard@rtp-net.org>
@@ -30,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>
+Boris Brezillon <boris.brezillon@free-electrons.com>
+Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
+Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
 Brian Avery <b.avery@hp.com>
 Brian King <brking@us.ibm.com>
 Christoph Hellwig <hch@lst.de>
@@ -89,6 +93,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Linas Vepstas <linas@austin.ibm.com>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
+Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
@@ -122,6 +127,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
 Sascha Hauer <s.hauer@pengutronix.de>
 S.Çağlar Onur <caglar@pardus.org.tr>
 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
+Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>
diff --git a/CREDITS b/CREDITS
index 0f0bf22afe0c..2a3fbcd229e6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig
 
 N: Mauro Carvalho Chehab
 E: m.chehab@samsung.org
+E: mchehab@osg.samsung.com
 E: mchehab@infradead.org
 D: Media subsystem (V4L/DVB) drivers and core
 D: EDAC drivers and EDAC 3.0 core rework
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
new file mode 100644
index 000000000000..53752db253e3
--- /dev/null
+++ b/Documentation/.gitignore
@@ -0,0 +1 @@
+output
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc
index 2f4a0051b32d..1ba0d0fda9c0 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -1,6 +1,6 @@
 What:           /config/usb-gadget/gadget/functions/uvc.name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    UVC function directory
 
                 streaming_maxburst      - 0..15 (ss only)
@@ -9,37 +9,37 @@ Description:	UVC function directory
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Control descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class/ss
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Super speed control class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class/fs
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Full speed control class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Output terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default output terminal descriptors
 
                 All attributes read only:
@@ -53,12 +53,12 @@ Description:	Default output terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Camera terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default camera terminal descriptors
 
                 All attributes read only:
@@ -75,12 +75,12 @@ Description:	Default camera terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/processing
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Processing unit descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/processing/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default processing unit descriptors
 
                 All attributes read only:
@@ -94,49 +94,49 @@ Description:	Default processing unit descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/header
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Control header descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/header/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific control header descriptors
 
 dwClockFrequency
 bcdUVC
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Streaming descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Super speed streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    High speed streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Full speed streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Color matching descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default color matching descriptors
 
                 All attributes read only:
@@ -150,12 +150,12 @@ Description:	Default color matching descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    MJPEG format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific MJPEG format descriptors
 
                 All attributes read only,
@@ -174,7 +174,7 @@ Description:	Specific MJPEG format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific MJPEG frame descriptors
 
                 dwFrameInterval         - indicates how frame interval can be
@@ -196,12 +196,12 @@ Description:	Specific MJPEG frame descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Uncompressed format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific uncompressed format descriptors
 
                 bmaControls             - this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description:	Specific uncompressed format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific uncompressed frame descriptors
 
                 dwFrameInterval         - indicates how frame interval can be
@@ -243,12 +243,12 @@ Description:	Specific uncompressed frame descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/header
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Streaming header descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific streaming header descriptors
 
                 All attributes read only:
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
index 6708c5e264aa..33e96f740639 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
@@ -1,4 +1,4 @@
-What            /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
+What            /sys/bus/iio/devices/iio:deviceX/in_proximity_input
 Date:           March 2014
 KernelVersion:  3.15
 Contact:        Matt Ranostay <mranostay@gmail.com>
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index d70f9b68174e..f4482f9b221f 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
             genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
             80211.xml debugobjects.xml sh.xml regulator.xml \
             alsa-driver-api.xml writing-an-alsa-driver.xml \
-            tracepoint.xml gpu.xml media_api.xml w1.xml \
+            tracepoint.xml media_api.xml w1.xml \
             writing_musb_glue_layer.xml crypto-API.xml iio.xml
 
 include Documentation/DocBook/media/Makefile
@@ -33,10 +33,6 @@ PDF_METHOD	= $(prefer-db2x)
 PS_METHOD       = $(prefer-db2x)
 
 
-###
-# The targets that may be used.
-PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
-
 targets += $(DOCBOOKS)
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 xmldocs: $(BOOKS)
@@ -63,6 +59,9 @@ installmandocs: mandocs
                 sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
                 xargs install -m 644 -t /usr/local/man/man9/
 
+# no-op for the DocBook toolchain
+epubdocs:
+
 ###
 #External programs used
 KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index de79efdad46c..c3313d45f4d6 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -128,16 +128,48 @@ X!Edrivers/base/interface.c
 !Edrivers/base/platform.c
 !Edrivers/base/bus.c
      </sect1>
-     <sect1><title>Device Drivers DMA Management</title>
+     <sect1>
+       <title>Buffer Sharing and Synchronization</title>
+       <para>
+         The dma-buf subsystem provides the framework for sharing buffers
+         for hardware (DMA) access across multiple device drivers and
+         subsystems, and for synchronizing asynchronous hardware access.
+       </para>
+       <para>
+         This is used, for example, by drm "prime" multi-GPU support, but
+         is of course not limited to GPU use cases.
+       </para>
+       <para>
+         The three main components of this are: (1) dma-buf, representing
+         a sg_table and exposed to userspace as a file descriptor to allow
+         passing between devices, (2) fence, which provides a mechanism
+         to signal when one device as finished access, and (3) reservation,
+         which manages the shared or exclusive fence(s) associated with
+         the buffer.
+       </para>
+       <sect2><title>dma-buf</title>
 !Edrivers/dma-buf/dma-buf.c
+!Iinclude/linux/dma-buf.h
+       </sect2>
+       <sect2><title>reservation</title>
+!Pdrivers/dma-buf/reservation.c Reservation Object Overview
+!Edrivers/dma-buf/reservation.c
+!Iinclude/linux/reservation.h
+       </sect2>
+       <sect2><title>fence</title>
 !Edrivers/dma-buf/fence.c
-!Edrivers/dma-buf/seqno-fence.c
 !Iinclude/linux/fence.h
+!Edrivers/dma-buf/seqno-fence.c
 !Iinclude/linux/seqno-fence.h
+!Edrivers/dma-buf/fence-array.c
+!Iinclude/linux/fence-array.h
 !Edrivers/dma-buf/reservation.c
 !Iinclude/linux/reservation.h
 !Edrivers/dma-buf/sync_file.c
 !Iinclude/linux/sync_file.h
+       </sect2>
+     </sect1>
+     <sect1><title>Device Drivers DMA Management</title>
 !Edrivers/base/dma-coherent.c
 !Edrivers/base/dma-mapping.c
      </sect1>
diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
deleted file mode 100644
index 7586bf75f62e..000000000000
--- a/Documentation/DocBook/gpu.tmpl
+++ /dev/null
@@ -1,3540 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
-
-<book id="gpuDevelopersGuide">
-  <bookinfo>
-    <title>Linux GPU Driver Developer's Guide</title>
-
-    <authorgroup>
-      <author>
-        <firstname>Jesse</firstname>
-        <surname>Barnes</surname>
-        <contrib>Initial version</contrib>
-        <affiliation>
-          <orgname>Intel Corporation</orgname>
-          <address>
-            <email>jesse.barnes@intel.com</email>
-          </address>
-        </affiliation>
-      </author>
-      <author>
-        <firstname>Laurent</firstname>
-        <surname>Pinchart</surname>
-        <contrib>Driver internals</contrib>
-        <affiliation>
-          <orgname>Ideas on board SPRL</orgname>
-          <address>
-            <email>laurent.pinchart@ideasonboard.com</email>
-          </address>
-        </affiliation>
-      </author>
-      <author>
-        <firstname>Daniel</firstname>
-        <surname>Vetter</surname>
-        <contrib>Contributions all over the place</contrib>
-        <affiliation>
-          <orgname>Intel Corporation</orgname>
-          <address>
-            <email>daniel.vetter@ffwll.ch</email>
-          </address>
-        </affiliation>
-      </author>
-      <author>
-        <firstname>Lukas</firstname>
-        <surname>Wunner</surname>
-        <contrib>vga_switcheroo documentation</contrib>
-        <affiliation>
-          <address>
-            <email>lukas@wunner.de</email>
-          </address>
-        </affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2008-2009</year>
-      <year>2013-2014</year>
-      <holder>Intel Corporation</holder>
-    </copyright>
-    <copyright>
-      <year>2012</year>
-      <holder>Laurent Pinchart</holder>
-    </copyright>
-    <copyright>
-      <year>2015</year>
-      <holder>Lukas Wunner</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-        The contents of this file may be used under the terms of the GNU
-        General Public License version 2 (the "GPL") as distributed in
-        the kernel source COPYING file.
-      </para>
-    </legalnotice>
-
-    <revhistory>
-      <!-- Put document revisions here, newest first. -->
-      <revision>
-        <revnumber>1.0</revnumber>
-        <date>2012-07-13</date>
-        <authorinitials>LP</authorinitials>
-        <revremark>Added extensive documentation about driver internals.
-        </revremark>
-      </revision>
-      <revision>
-        <revnumber>1.1</revnumber>
-        <date>2015-10-11</date>
-        <authorinitials>LW</authorinitials>
-        <revremark>Added vga_switcheroo documentation.
-        </revremark>
-      </revision>
-    </revhistory>
-  </bookinfo>
-
-<toc></toc>
-
-<part id="drmCore">
-  <title>DRM Core</title>
-  <partintro>
-    <para>
-      This first part of the GPU Driver Developer's Guide documents core DRM
-      code, helper libraries for writing drivers and generic userspace
-      interfaces exposed by DRM drivers.
-    </para>
-  </partintro>
-
-  <chapter id="drmIntroduction">
-    <title>Introduction</title>
-    <para>
-      The Linux DRM layer contains code intended to support the needs
-      of complex graphics devices, usually containing programmable
-      pipelines well suited to 3D graphics acceleration.  Graphics
-      drivers in the kernel may make use of DRM functions to make
-      tasks like memory management, interrupt handling and DMA easier,
-      and provide a uniform interface to applications.
-    </para>
-    <para>
-      A note on versions: this guide covers features found in the DRM
-      tree, including the TTM memory manager, output configuration and
-      mode setting, and the new vblank internals, in addition to all
-      the regular features found in current kernels.
-    </para>
-    <para>
-      [Insert diagram of typical DRM stack here]
-    </para>
-  <sect1>
-    <title>Style Guidelines</title>
-    <para>
-      For consistency this documentation uses American English. Abbreviations
-      are written as all-uppercase, for example: DRM, KMS, IOCTL, CRTC, and so
-      on. To aid in reading, documentations make full use of the markup
-      characters kerneldoc provides: @parameter for function parameters, @member
-      for structure members, &amp;structure to reference structures and
-      function() for functions. These all get automatically hyperlinked if
-      kerneldoc for the referenced objects exists. When referencing entries in
-      function vtables please use -&gt;vfunc(). Note that kerneldoc does
-      not support referencing struct members directly, so please add a reference
-      to the vtable struct somewhere in the same paragraph or at least section.
-    </para>
-    <para>
-      Except in special situations (to separate locked from unlocked variants)
-      locking requirements for functions aren't documented in the kerneldoc.
-      Instead locking should be check at runtime using e.g.
-      <code>WARN_ON(!mutex_is_locked(...));</code>. Since it's much easier to
-      ignore documentation than runtime noise this provides more value. And on
-      top of that runtime checks do need to be updated when the locking rules
-      change, increasing the chances that they're correct. Within the
-      documentation the locking rules should be explained in the relevant
-      structures: Either in the comment for the lock explaining what it
-      protects, or data fields need a note about which lock protects them, or
-      both.
-    </para>
-    <para>
-      Functions which have a non-<code>void</code> return value should have a
-      section called "Returns" explaining the expected return values in
-      different cases and their meanings. Currently there's no consensus whether
-      that section name should be all upper-case or not, and whether it should
-      end in a colon or not. Go with the file-local style. Other common section
-      names are "Notes" with information for dangerous or tricky corner cases,
-      and "FIXME" where the interface could be cleaned up.
-    </para>
-  </sect1>
-  </chapter>
-
-  <!-- Internals -->
-
-  <chapter id="drmInternals">
-    <title>DRM Internals</title>
-    <para>
-      This chapter documents DRM internals relevant to driver authors
-      and developers working to add support for the latest features to
-      existing drivers.
-    </para>
-    <para>
-      First, we go over some typical driver initialization
-      requirements, like setting up command buffers, creating an
-      initial output configuration, and initializing core services.
-      Subsequent sections cover core internals in more detail,
-      providing implementation notes and examples.
-    </para>
-    <para>
-      The DRM layer provides several services to graphics drivers,
-      many of them driven by the application interfaces it provides
-      through libdrm, the library that wraps most of the DRM ioctls.
-      These include vblank event handling, memory
-      management, output management, framebuffer management, command
-      submission &amp; fencing, suspend/resume support, and DMA
-      services.
-    </para>
-
-  <!-- Internals: driver init -->
-
-  <sect1>
-    <title>Driver Initialization</title>
-    <para>
-      At the core of every DRM driver is a <structname>drm_driver</structname>
-      structure. Drivers typically statically initialize a drm_driver structure,
-      and then pass it to <function>drm_dev_alloc()</function> to allocate a
-      device instance. After the device instance is fully initialized it can be
-      registered (which makes it accessible from userspace) using
-      <function>drm_dev_register()</function>.
-    </para>
-    <para>
-      The <structname>drm_driver</structname> structure contains static
-      information that describes the driver and features it supports, and
-      pointers to methods that the DRM core will call to implement the DRM API.
-      We will first go through the <structname>drm_driver</structname> static
-      information fields, and will then describe individual operations in
-      details as they get used in later sections.
-    </para>
-    <sect2>
-      <title>Driver Information</title>
-      <sect3>
-        <title>Driver Features</title>
-        <para>
-          Drivers inform the DRM core about their requirements and supported
-          features by setting appropriate flags in the
-          <structfield>driver_features</structfield> field. Since those flags
-          influence the DRM core behaviour since registration time, most of them
-          must be set to registering the <structname>drm_driver</structname>
-          instance.
-        </para>
-        <synopsis>u32 driver_features;</synopsis>
-        <variablelist>
-          <title>Driver Feature Flags</title>
-          <varlistentry>
-            <term>DRIVER_USE_AGP</term>
-            <listitem><para>
-              Driver uses AGP interface, the DRM core will manage AGP resources.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_REQUIRE_AGP</term>
-            <listitem><para>
-              Driver needs AGP interface to function. AGP initialization failure
-              will become a fatal error.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_PCI_DMA</term>
-            <listitem><para>
-              Driver is capable of PCI DMA, mapping of PCI DMA buffers to
-              userspace will be enabled. Deprecated.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_SG</term>
-            <listitem><para>
-              Driver can perform scatter/gather DMA, allocation and mapping of
-              scatter/gather buffers will be enabled. Deprecated.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_HAVE_DMA</term>
-            <listitem><para>
-              Driver supports DMA, the userspace DMA API will be supported.
-              Deprecated.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_HAVE_IRQ</term><term>DRIVER_IRQ_SHARED</term>
-            <listitem><para>
-              DRIVER_HAVE_IRQ indicates whether the driver has an IRQ handler
-              managed by the DRM Core. The core will support simple IRQ handler
-              installation when the flag is set. The installation process is
-              described in <xref linkend="drm-irq-registration"/>.</para>
-              <para>DRIVER_IRQ_SHARED indicates whether the device &amp; handler
-              support shared IRQs (note that this is required of PCI  drivers).
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_GEM</term>
-            <listitem><para>
-              Driver use the GEM memory manager.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_MODESET</term>
-            <listitem><para>
-              Driver supports mode setting interfaces (KMS).
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_PRIME</term>
-            <listitem><para>
-              Driver implements DRM PRIME buffer sharing.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_RENDER</term>
-            <listitem><para>
-              Driver supports dedicated render nodes.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRIVER_ATOMIC</term>
-            <listitem><para>
-              Driver supports atomic properties.  In this case the driver
-              must implement appropriate obj->atomic_get_property() vfuncs
-              for any modeset objects with driver specific properties.
-            </para></listitem>
-          </varlistentry>
-        </variablelist>
-      </sect3>
-      <sect3>
-        <title>Major, Minor and Patchlevel</title>
-        <synopsis>int major;
-int minor;
-int patchlevel;</synopsis>
-        <para>
-          The DRM core identifies driver versions by a major, minor and patch
-          level triplet. The information is printed to the kernel log at
-          initialization time and passed to userspace through the
-          DRM_IOCTL_VERSION ioctl.
-        </para>
-        <para>
-          The major and minor numbers are also used to verify the requested driver
-          API version passed to DRM_IOCTL_SET_VERSION. When the driver API changes
-          between minor versions, applications can call DRM_IOCTL_SET_VERSION to
-          select a specific version of the API. If the requested major isn't equal
-          to the driver major, or the requested minor is larger than the driver
-          minor, the DRM_IOCTL_SET_VERSION call will return an error. Otherwise
-          the driver's set_version() method will be called with the requested
-          version.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Name, Description and Date</title>
-        <synopsis>char *name;
-char *desc;
-char *date;</synopsis>
-        <para>
-          The driver name is printed to the kernel log at initialization time,
-          used for IRQ registration and passed to userspace through
-          DRM_IOCTL_VERSION.
-        </para>
-        <para>
-          The driver description is a purely informative string passed to
-          userspace through the DRM_IOCTL_VERSION ioctl and otherwise unused by
-          the kernel.
-        </para>
-        <para>
-          The driver date, formatted as YYYYMMDD, is meant to identify the date of
-          the latest modification to the driver. However, as most drivers fail to
-          update it, its value is mostly useless. The DRM core prints it to the
-          kernel log at initialization time and passes it to userspace through the
-          DRM_IOCTL_VERSION ioctl.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Device Instance and Driver Handling</title>
-!Pdrivers/gpu/drm/drm_drv.c driver instance overview
-!Edrivers/gpu/drm/drm_drv.c
-    </sect2>
-    <sect2>
-      <title>Driver Load</title>
-      <sect3 id="drm-irq-registration">
-        <title>IRQ Registration</title>
-        <para>
-          The DRM core tries to facilitate IRQ handler registration and
-          unregistration by providing <function>drm_irq_install</function> and
-          <function>drm_irq_uninstall</function> functions. Those functions only
-          support a single interrupt per device, devices that use more than one
-          IRQs need to be handled manually.
-        </para>
-        <sect4>
-          <title>Managed IRQ Registration</title>
-          <para>
-            <function>drm_irq_install</function> starts by calling the
-            <methodname>irq_preinstall</methodname> driver operation. The operation
-            is optional and must make sure that the interrupt will not get fired by
-            clearing all pending interrupt flags or disabling the interrupt.
-          </para>
-          <para>
-            The passed-in IRQ will then be requested by a call to
-            <function>request_irq</function>. If the DRIVER_IRQ_SHARED driver
-            feature flag is set, a shared (IRQF_SHARED) IRQ handler will be
-            requested.
-          </para>
-          <para>
-            The IRQ handler function must be provided as the mandatory irq_handler
-            driver operation. It will get passed directly to
-            <function>request_irq</function> and thus has the same prototype as all
-            IRQ handlers. It will get called with a pointer to the DRM device as the
-            second argument.
-          </para>
-          <para>
-            Finally the function calls the optional
-            <methodname>irq_postinstall</methodname> driver operation. The operation
-            usually enables interrupts (excluding the vblank interrupt, which is
-            enabled separately), but drivers may choose to enable/disable interrupts
-            at a different time.
-          </para>
-          <para>
-            <function>drm_irq_uninstall</function> is similarly used to uninstall an
-            IRQ handler. It starts by waking up all processes waiting on a vblank
-            interrupt to make sure they don't hang, and then calls the optional
-            <methodname>irq_uninstall</methodname> driver operation. The operation
-            must disable all hardware interrupts. Finally the function frees the IRQ
-            by calling <function>free_irq</function>.
-          </para>
-        </sect4>
-        <sect4>
-          <title>Manual IRQ Registration</title>
-          <para>
-            Drivers that require multiple interrupt handlers can't use the managed
-            IRQ registration functions. In that case IRQs must be registered and
-            unregistered manually (usually with the <function>request_irq</function>
-            and <function>free_irq</function> functions, or their devm_* equivalent).
-          </para>
-          <para>
-            When manually registering IRQs, drivers must not set the DRIVER_HAVE_IRQ
-            driver feature flag, and must not provide the
-            <methodname>irq_handler</methodname> driver operation. They must set the
-            <structname>drm_device</structname> <structfield>irq_enabled</structfield>
-            field to 1 upon registration of the IRQs, and clear it to 0 after
-            unregistering the IRQs.
-          </para>
-        </sect4>
-      </sect3>
-      <sect3>
-        <title>Memory Manager Initialization</title>
-        <para>
-          Every DRM driver requires a memory manager which must be initialized at
-          load time. DRM currently contains two memory managers, the Translation
-          Table Manager (TTM) and the Graphics Execution Manager (GEM).
-          This document describes the use of the GEM memory manager only. See
-          <xref linkend="drm-memory-management"/> for details.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Miscellaneous Device Configuration</title>
-        <para>
-          Another task that may be necessary for PCI devices during configuration
-          is mapping the video BIOS. On many devices, the VBIOS describes device
-          configuration, LCD panel timings (if any), and contains flags indicating
-          device state. Mapping the BIOS can be done using the pci_map_rom() call,
-          a convenience function that takes care of mapping the actual ROM,
-          whether it has been shadowed into memory (typically at address 0xc0000)
-          or exists on the PCI device in the ROM BAR. Note that after the ROM has
-          been mapped and any necessary information has been extracted, it should
-          be unmapped; on many devices, the ROM address decoder is shared with
-          other BARs, so leaving it mapped could cause undesired behaviour like
-          hangs or memory corruption.
-  <!--!Fdrivers/pci/rom.c pci_map_rom-->
-        </para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Bus-specific Device Registration and PCI Support</title>
-      <para>
-        A number of functions are provided to help with device registration.
-        The functions deal with PCI and platform devices respectively and are
-        only provided for historical reasons. These are all deprecated and
-        shouldn't be used in new drivers. Besides that there's a few
-        helpers for pci drivers.
-      </para>
-!Edrivers/gpu/drm/drm_pci.c
-!Edrivers/gpu/drm/drm_platform.c
-    </sect2>
-  </sect1>
-
-  <!-- Internals: memory management -->
-
-  <sect1 id="drm-memory-management">
-    <title>Memory management</title>
-    <para>
-      Modern Linux systems require large amount of graphics memory to store
-      frame buffers, textures, vertices and other graphics-related data. Given
-      the very dynamic nature of many of that data, managing graphics memory
-      efficiently is thus crucial for the graphics stack and plays a central
-      role in the DRM infrastructure.
-    </para>
-    <para>
-      The DRM core includes two memory managers, namely Translation Table Maps
-      (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory
-      manager to be developed and tried to be a one-size-fits-them all
-      solution. It provides a single userspace API to accommodate the need of
-      all hardware, supporting both Unified Memory Architecture (UMA) devices
-      and devices with dedicated video RAM (i.e. most discrete video cards).
-      This resulted in a large, complex piece of code that turned out to be
-      hard to use for driver development.
-    </para>
-    <para>
-      GEM started as an Intel-sponsored project in reaction to TTM's
-      complexity. Its design philosophy is completely different: instead of
-      providing a solution to every graphics memory-related problems, GEM
-      identified common code between drivers and created a support library to
-      share it. GEM has simpler initialization and execution requirements than
-      TTM, but has no video RAM management capabilities and is thus limited to
-      UMA devices.
-    </para>
-    <sect2>
-      <title>The Translation Table Manager (TTM)</title>
-      <para>
-        TTM design background and information belongs here.
-      </para>
-      <sect3>
-        <title>TTM initialization</title>
-        <warning><para>This section is outdated.</para></warning>
-        <para>
-          Drivers wishing to support TTM must fill out a drm_bo_driver
-          structure. The structure contains several fields with function
-          pointers for initializing the TTM, allocating and freeing memory,
-          waiting for command completion and fence synchronization, and memory
-          migration. See the radeon_ttm.c file for an example of usage.
-        </para>
-        <para>
-          The ttm_global_reference structure is made up of several fields:
-        </para>
-        <programlisting>
-          struct ttm_global_reference {
-                  enum ttm_global_types global_type;
-                  size_t size;
-                  void *object;
-                  int (*init) (struct ttm_global_reference *);
-                  void (*release) (struct ttm_global_reference *);
-          };
-        </programlisting>
-        <para>
-          There should be one global reference structure for your memory
-          manager as a whole, and there will be others for each object
-          created by the memory manager at runtime.  Your global TTM should
-          have a type of TTM_GLOBAL_TTM_MEM.  The size field for the global
-          object should be sizeof(struct ttm_mem_global), and the init and
-          release hooks should point at your driver-specific init and
-          release routines, which probably eventually call
-          ttm_mem_global_init and ttm_mem_global_release, respectively.
-        </para>
-        <para>
-          Once your global TTM accounting structure is set up and initialized
-          by calling ttm_global_item_ref() on it,
-          you need to create a buffer object TTM to
-          provide a pool for buffer object allocation by clients and the
-          kernel itself.  The type of this object should be TTM_GLOBAL_TTM_BO,
-          and its size should be sizeof(struct ttm_bo_global).  Again,
-          driver-specific init and release functions may be provided,
-          likely eventually calling ttm_bo_global_init() and
-          ttm_bo_global_release(), respectively.  Also, like the previous
-          object, ttm_global_item_ref() is used to create an initial reference
-          count for the TTM, which will call your initialization function.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2 id="drm-gem">
-      <title>The Graphics Execution Manager (GEM)</title>
-      <para>
-        The GEM design approach has resulted in a memory manager that doesn't
-        provide full coverage of all (or even all common) use cases in its
-        userspace or kernel API. GEM exposes a set of standard memory-related
-        operations to userspace and a set of helper functions to drivers, and let
-        drivers implement hardware-specific operations with their own private API.
-      </para>
-      <para>
-        The GEM userspace API is described in the
-        <ulink url="http://lwn.net/Articles/283798/"><citetitle>GEM - the Graphics
-        Execution Manager</citetitle></ulink> article on LWN. While slightly
-        outdated, the document provides a good overview of the GEM API principles.
-        Buffer allocation and read and write operations, described as part of the
-        common GEM API, are currently implemented using driver-specific ioctls.
-      </para>
-      <para>
-        GEM is data-agnostic. It manages abstract buffer objects without knowing
-        what individual buffers contain. APIs that require knowledge of buffer
-        contents or purpose, such as buffer allocation or synchronization
-        primitives, are thus outside of the scope of GEM and must be implemented
-        using driver-specific ioctls.
-      </para>
-      <para>
-        On a fundamental level, GEM involves several operations:
-        <itemizedlist>
-          <listitem>Memory allocation and freeing</listitem>
-          <listitem>Command execution</listitem>
-          <listitem>Aperture management at command execution time</listitem>
-        </itemizedlist>
-        Buffer object allocation is relatively straightforward and largely
-        provided by Linux's shmem layer, which provides memory to back each
-        object.
-      </para>
-      <para>
-        Device-specific operations, such as command execution, pinning, buffer
-        read &amp; write, mapping, and domain ownership transfers are left to
-        driver-specific ioctls.
-      </para>
-      <sect3>
-        <title>GEM Initialization</title>
-        <para>
-          Drivers that use GEM must set the DRIVER_GEM bit in the struct
-          <structname>drm_driver</structname>
-          <structfield>driver_features</structfield> field. The DRM core will
-          then automatically initialize the GEM core before calling the
-          <methodname>load</methodname> operation. Behind the scene, this will
-          create a DRM Memory Manager object which provides an address space
-          pool for object allocation.
-        </para>
-        <para>
-          In a KMS configuration, drivers need to allocate and initialize a
-          command ring buffer following core GEM initialization if required by
-          the hardware. UMA devices usually have what is called a "stolen"
-          memory region, which provides space for the initial framebuffer and
-          large, contiguous memory regions required by the device. This space is
-          typically not managed by GEM, and must be initialized separately into
-          its own DRM MM object.
-        </para>
-      </sect3>
-      <sect3>
-        <title>GEM Objects Creation</title>
-        <para>
-          GEM splits creation of GEM objects and allocation of the memory that
-          backs them in two distinct operations.
-        </para>
-        <para>
-          GEM objects are represented by an instance of struct
-          <structname>drm_gem_object</structname>. Drivers usually need to extend
-          GEM objects with private information and thus create a driver-specific
-          GEM object structure type that embeds an instance of struct
-          <structname>drm_gem_object</structname>.
-        </para>
-        <para>
-          To create a GEM object, a driver allocates memory for an instance of its
-          specific GEM object type and initializes the embedded struct
-          <structname>drm_gem_object</structname> with a call to
-          <function>drm_gem_object_init</function>. The function takes a pointer to
-          the DRM device, a pointer to the GEM object and the buffer object size
-          in bytes.
-        </para>
-        <para>
-          GEM uses shmem to allocate anonymous pageable memory.
-          <function>drm_gem_object_init</function> will create an shmfs file of
-          the requested size and store it into the struct
-          <structname>drm_gem_object</structname> <structfield>filp</structfield>
-          field. The memory is used as either main storage for the object when the
-          graphics hardware uses system memory directly or as a backing store
-          otherwise.
-        </para>
-        <para>
-          Drivers are responsible for the actual physical pages allocation by
-          calling <function>shmem_read_mapping_page_gfp</function> for each page.
-          Note that they can decide to allocate pages when initializing the GEM
-          object, or to delay allocation until the memory is needed (for instance
-          when a page fault occurs as a result of a userspace memory access or
-          when the driver needs to start a DMA transfer involving the memory).
-        </para>
-        <para>
-          Anonymous pageable memory allocation is not always desired, for instance
-          when the hardware requires physically contiguous system memory as is
-          often the case in embedded devices. Drivers can create GEM objects with
-          no shmfs backing (called private GEM objects) by initializing them with
-          a call to <function>drm_gem_private_object_init</function> instead of
-          <function>drm_gem_object_init</function>. Storage for private GEM
-          objects must be managed by drivers.
-        </para>
-      </sect3>
-      <sect3>
-        <title>GEM Objects Lifetime</title>
-        <para>
-          All GEM objects are reference-counted by the GEM core. References can be
-          acquired and release by <function>calling drm_gem_object_reference</function>
-          and <function>drm_gem_object_unreference</function> respectively. The
-          caller must hold the <structname>drm_device</structname>
-          <structfield>struct_mutex</structfield> lock when calling
-          <function>drm_gem_object_reference</function>. As a convenience, GEM
-          provides <function>drm_gem_object_unreference_unlocked</function>
-          functions that can be called without holding the lock.
-        </para>
-        <para>
-          When the last reference to a GEM object is released the GEM core calls
-          the <structname>drm_driver</structname>
-          <methodname>gem_free_object</methodname> operation. That operation is
-          mandatory for GEM-enabled drivers and must free the GEM object and all
-          associated resources.
-        </para>
-        <para>
-          <synopsis>void (*gem_free_object) (struct drm_gem_object *obj);</synopsis>
-          Drivers are responsible for freeing all GEM object resources. This includes
-          the resources created by the GEM core, which need to be released with
-          <function>drm_gem_object_release</function>.
-        </para>
-      </sect3>
-      <sect3>
-        <title>GEM Objects Naming</title>
-        <para>
-          Communication between userspace and the kernel refers to GEM objects
-          using local handles, global names or, more recently, file descriptors.
-          All of those are 32-bit integer values; the usual Linux kernel limits
-          apply to the file descriptors.
-        </para>
-        <para>
-          GEM handles are local to a DRM file. Applications get a handle to a GEM
-          object through a driver-specific ioctl, and can use that handle to refer
-          to the GEM object in other standard or driver-specific ioctls. Closing a
-          DRM file handle frees all its GEM handles and dereferences the
-          associated GEM objects.
-        </para>
-        <para>
-          To create a handle for a GEM object drivers call
-          <function>drm_gem_handle_create</function>. The function takes a pointer
-          to the DRM file and the GEM object and returns a locally unique handle.
-          When the handle is no longer needed drivers delete it with a call to
-          <function>drm_gem_handle_delete</function>. Finally the GEM object
-          associated with a handle can be retrieved by a call to
-          <function>drm_gem_object_lookup</function>.
-        </para>
-        <para>
-          Handles don't take ownership of GEM objects, they only take a reference
-          to the object that will be dropped when the handle is destroyed. To
-          avoid leaking GEM objects, drivers must make sure they drop the
-          reference(s) they own (such as the initial reference taken at object
-          creation time) as appropriate, without any special consideration for the
-          handle. For example, in the particular case of combined GEM object and
-          handle creation in the implementation of the
-          <methodname>dumb_create</methodname> operation, drivers must drop the
-          initial reference to the GEM object before returning the handle.
-        </para>
-        <para>
-          GEM names are similar in purpose to handles but are not local to DRM
-          files. They can be passed between processes to reference a GEM object
-          globally. Names can't be used directly to refer to objects in the DRM
-          API, applications must convert handles to names and names to handles
-          using the DRM_IOCTL_GEM_FLINK and DRM_IOCTL_GEM_OPEN ioctls
-          respectively. The conversion is handled by the DRM core without any
-          driver-specific support.
-        </para>
-        <para>
-          GEM also supports buffer sharing with dma-buf file descriptors through
-          PRIME. GEM-based drivers must use the provided helpers functions to
-          implement the exporting and importing correctly. See <xref linkend="drm-prime-support" />.
-          Since sharing file descriptors is inherently more secure than the
-          easily guessable and global GEM names it is the preferred buffer
-          sharing mechanism. Sharing buffers through GEM names is only supported
-          for legacy userspace. Furthermore PRIME also allows cross-device
-          buffer sharing since it is based on dma-bufs.
-        </para>
-      </sect3>
-      <sect3 id="drm-gem-objects-mapping">
-        <title>GEM Objects Mapping</title>
-        <para>
-          Because mapping operations are fairly heavyweight GEM favours
-          read/write-like access to buffers, implemented through driver-specific
-          ioctls, over mapping buffers to userspace. However, when random access
-          to the buffer is needed (to perform software rendering for instance),
-          direct access to the object can be more efficient.
-        </para>
-        <para>
-          The mmap system call can't be used directly to map GEM objects, as they
-          don't have their own file handle. Two alternative methods currently
-          co-exist to map GEM objects to userspace. The first method uses a
-          driver-specific ioctl to perform the mapping operation, calling
-          <function>do_mmap</function> under the hood. This is often considered
-          dubious, seems to be discouraged for new GEM-enabled drivers, and will
-          thus not be described here.
-        </para>
-        <para>
-          The second method uses the mmap system call on the DRM file handle.
-          <synopsis>void *mmap(void *addr, size_t length, int prot, int flags, int fd,
-             off_t offset);</synopsis>
-          DRM identifies the GEM object to be mapped by a fake offset passed
-          through the mmap offset argument. Prior to being mapped, a GEM object
-          must thus be associated with a fake offset. To do so, drivers must call
-          <function>drm_gem_create_mmap_offset</function> on the object.
-        </para>
-        <para>
-          Once allocated, the fake offset value
-          must be passed to the application in a driver-specific way and can then
-          be used as the mmap offset argument.
-        </para>
-        <para>
-          The GEM core provides a helper method <function>drm_gem_mmap</function>
-          to handle object mapping. The method can be set directly as the mmap
-          file operation handler. It will look up the GEM object based on the
-          offset value and set the VMA operations to the
-          <structname>drm_driver</structname> <structfield>gem_vm_ops</structfield>
-          field. Note that <function>drm_gem_mmap</function> doesn't map memory to
-          userspace, but relies on the driver-provided fault handler to map pages
-          individually.
-        </para>
-        <para>
-          To use <function>drm_gem_mmap</function>, drivers must fill the struct
-          <structname>drm_driver</structname> <structfield>gem_vm_ops</structfield>
-          field with a pointer to VM operations.
-        </para>
-        <para>
-          <synopsis>struct vm_operations_struct *gem_vm_ops
-
-  struct vm_operations_struct {
-          void (*open)(struct vm_area_struct * area);
-          void (*close)(struct vm_area_struct * area);
-          int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
-  };</synopsis>
-        </para>
-        <para>
-          The <methodname>open</methodname> and <methodname>close</methodname>
-          operations must update the GEM object reference count. Drivers can use
-          the <function>drm_gem_vm_open</function> and
-          <function>drm_gem_vm_close</function> helper functions directly as open
-          and close handlers.
-        </para>
-        <para>
-          The fault operation handler is responsible for mapping individual pages
-          to userspace when a page fault occurs. Depending on the memory
-          allocation scheme, drivers can allocate pages at fault time, or can
-          decide to allocate memory for the GEM object at the time the object is
-          created.
-        </para>
-        <para>
-          Drivers that want to map the GEM object upfront instead of handling page
-          faults can implement their own mmap file operation handler.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Memory Coherency</title>
-        <para>
-          When mapped to the device or used in a command buffer, backing pages
-          for an object are flushed to memory and marked write combined so as to
-          be coherent with the GPU. Likewise, if the CPU accesses an object
-          after the GPU has finished rendering to the object, then the object
-          must be made coherent with the CPU's view of memory, usually involving
-          GPU cache flushing of various kinds. This core CPU&lt;-&gt;GPU
-          coherency management is provided by a device-specific ioctl, which
-          evaluates an object's current domain and performs any necessary
-          flushing or synchronization to put the object into the desired
-          coherency domain (note that the object may be busy, i.e. an active
-          render target; in that case, setting the domain blocks the client and
-          waits for rendering to complete before performing any necessary
-          flushing operations).
-        </para>
-      </sect3>
-      <sect3>
-        <title>Command Execution</title>
-        <para>
-          Perhaps the most important GEM function for GPU devices is providing a
-          command execution interface to clients. Client programs construct
-          command buffers containing references to previously allocated memory
-          objects, and then submit them to GEM. At that point, GEM takes care to
-          bind all the objects into the GTT, execute the buffer, and provide
-          necessary synchronization between clients accessing the same buffers.
-          This often involves evicting some objects from the GTT and re-binding
-          others (a fairly expensive operation), and providing relocation
-          support which hides fixed GTT offsets from clients. Clients must take
-          care not to submit command buffers that reference more objects than
-          can fit in the GTT; otherwise, GEM will reject them and no rendering
-          will occur. Similarly, if several objects in the buffer require fence
-          registers to be allocated for correct rendering (e.g. 2D blits on
-          pre-965 chips), care must be taken not to require more fence registers
-          than are available to the client. Such resource management should be
-          abstracted from the client in libdrm.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>GEM Function Reference</title>
-!Edrivers/gpu/drm/drm_gem.c
-!Iinclude/drm/drm_gem.h
-    </sect2>
-    <sect2>
-      <title>VMA Offset Manager</title>
-!Pdrivers/gpu/drm/drm_vma_manager.c vma offset manager
-!Edrivers/gpu/drm/drm_vma_manager.c
-!Iinclude/drm/drm_vma_manager.h
-    </sect2>
-    <sect2 id="drm-prime-support">
-      <title>PRIME Buffer Sharing</title>
-      <para>
-        PRIME is the cross device buffer sharing framework in drm, originally
-        created for the OPTIMUS range of multi-gpu platforms. To userspace
-        PRIME buffers are dma-buf based file descriptors.
-      </para>
-      <sect3>
-        <title>Overview and Driver Interface</title>
-        <para>
-          Similar to GEM global names, PRIME file descriptors are
-          also used to share buffer objects across processes. They offer
-          additional security: as file descriptors must be explicitly sent over
-          UNIX domain sockets to be shared between applications, they can't be
-          guessed like the globally unique GEM names.
-        </para>
-        <para>
-          Drivers that support the PRIME
-          API must set the DRIVER_PRIME bit in the struct
-          <structname>drm_driver</structname>
-          <structfield>driver_features</structfield> field, and implement the
-          <methodname>prime_handle_to_fd</methodname> and
-          <methodname>prime_fd_to_handle</methodname> operations.
-        </para>
-        <para>
-          <synopsis>int (*prime_handle_to_fd)(struct drm_device *dev,
-                          struct drm_file *file_priv, uint32_t handle,
-                          uint32_t flags, int *prime_fd);
-int (*prime_fd_to_handle)(struct drm_device *dev,
-                          struct drm_file *file_priv, int prime_fd,
-                          uint32_t *handle);</synopsis>
-            Those two operations convert a handle to a PRIME file descriptor and
-            vice versa. Drivers must use the kernel dma-buf buffer sharing framework
-            to manage the PRIME file descriptors. Similar to the mode setting
-            API PRIME is agnostic to the underlying buffer object manager, as
-            long as handles are 32bit unsigned integers.
-          </para>
-          <para>
-            While non-GEM drivers must implement the operations themselves, GEM
-            drivers must use the <function>drm_gem_prime_handle_to_fd</function>
-            and <function>drm_gem_prime_fd_to_handle</function> helper functions.
-            Those helpers rely on the driver
-            <methodname>gem_prime_export</methodname> and
-            <methodname>gem_prime_import</methodname> operations to create a dma-buf
-            instance from a GEM object (dma-buf exporter role) and to create a GEM
-            object from a dma-buf instance (dma-buf importer role).
-          </para>
-          <para>
-            <synopsis>struct dma_buf * (*gem_prime_export)(struct drm_device *dev,
-                             struct drm_gem_object *obj,
-                             int flags);
-struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,
-                                            struct dma_buf *dma_buf);</synopsis>
-            These two operations are mandatory for GEM drivers that support
-            PRIME.
-          </para>
-        </sect3>
-      <sect3>
-        <title>PRIME Helper Functions</title>
-!Pdrivers/gpu/drm/drm_prime.c PRIME Helpers
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>PRIME Function References</title>
-!Edrivers/gpu/drm/drm_prime.c
-    </sect2>
-    <sect2>
-      <title>DRM MM Range Allocator</title>
-      <sect3>
-        <title>Overview</title>
-!Pdrivers/gpu/drm/drm_mm.c Overview
-      </sect3>
-      <sect3>
-        <title>LRU Scan/Eviction Support</title>
-!Pdrivers/gpu/drm/drm_mm.c lru scan roaster
-      </sect3>
-      </sect2>
-    <sect2>
-      <title>DRM MM Range Allocator Function References</title>
-!Edrivers/gpu/drm/drm_mm.c
-!Iinclude/drm/drm_mm.h
-    </sect2>
-    <sect2>
-      <title>CMA Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_gem_cma_helper.c cma helpers
-!Edrivers/gpu/drm/drm_gem_cma_helper.c
-!Iinclude/drm/drm_gem_cma_helper.h
-    </sect2>
-  </sect1>
-
-  <!-- Internals: mode setting -->
-
-  <sect1 id="drm-mode-setting">
-    <title>Mode Setting</title>
-    <para>
-      Drivers must initialize the mode setting core by calling
-      <function>drm_mode_config_init</function> on the DRM device. The function
-      initializes the <structname>drm_device</structname>
-      <structfield>mode_config</structfield> field and never fails. Once done,
-      mode configuration must be setup by initializing the following fields.
-    </para>
-    <itemizedlist>
-      <listitem>
-        <synopsis>int min_width, min_height;
-int max_width, max_height;</synopsis>
-        <para>
-          Minimum and maximum width and height of the frame buffers in pixel
-          units.
-        </para>
-      </listitem>
-      <listitem>
-        <synopsis>struct drm_mode_config_funcs *funcs;</synopsis>
-        <para>Mode setting functions.</para>
-      </listitem>
-    </itemizedlist>
-    <sect2>
-      <title>Display Modes Function Reference</title>
-!Iinclude/drm/drm_modes.h
-!Edrivers/gpu/drm/drm_modes.c
-    </sect2>
-    <sect2>
-      <title>Atomic Mode Setting Function Reference</title>
-!Edrivers/gpu/drm/drm_atomic.c
-!Idrivers/gpu/drm/drm_atomic.c
-    </sect2>
-    <sect2>
-      <title>Frame Buffer Abstraction</title>
-      <para>
-        Frame buffers are abstract memory objects that provide a source of
-        pixels to scanout to a CRTC. Applications explicitly request the
-        creation of frame buffers through the DRM_IOCTL_MODE_ADDFB(2) ioctls and
-        receive an opaque handle that can be passed to the KMS CRTC control,
-        plane configuration and page flip functions.
-      </para>
-      <para>
-        Frame buffers rely on the underneath memory manager for low-level memory
-        operations. When creating a frame buffer applications pass a memory
-        handle (or a list of memory handles for multi-planar formats) through
-        the <parameter>drm_mode_fb_cmd2</parameter> argument. For drivers using
-        GEM as their userspace buffer management interface this would be a GEM
-        handle.  Drivers are however free to use their own backing storage object
-        handles, e.g. vmwgfx directly exposes special TTM handles to userspace
-        and so expects TTM handles in the create ioctl and not GEM handles.
-      </para>
-      <para>
-        The lifetime of a drm framebuffer is controlled with a reference count,
-        drivers can grab additional references with
-        <function>drm_framebuffer_reference</function>and drop them
-        again with <function>drm_framebuffer_unreference</function>. For
-        driver-private framebuffers for which the last reference is never
-        dropped (e.g. for the fbdev framebuffer when the struct
-        <structname>drm_framebuffer</structname> is embedded into the fbdev
-        helper struct) drivers can manually clean up a framebuffer at module
-        unload time with
-        <function>drm_framebuffer_unregister_private</function>.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Dumb Buffer Objects</title>
-      <para>
-        The KMS API doesn't standardize backing storage object creation and
-        leaves it to driver-specific ioctls. Furthermore actually creating a
-        buffer object even for GEM-based drivers is done through a
-        driver-specific ioctl - GEM only has a common userspace interface for
-        sharing and destroying objects. While not an issue for full-fledged
-        graphics stacks that include device-specific userspace components (in
-        libdrm for instance), this limit makes DRM-based early boot graphics
-        unnecessarily complex.
-      </para>
-      <para>
-        Dumb objects partly alleviate the problem by providing a standard
-        API to create dumb buffers suitable for scanout, which can then be used
-        to create KMS frame buffers.
-      </para>
-      <para>
-        To support dumb objects drivers must implement the
-        <methodname>dumb_create</methodname>,
-        <methodname>dumb_destroy</methodname> and
-        <methodname>dumb_map_offset</methodname> operations.
-      </para>
-      <itemizedlist>
-        <listitem>
-          <synopsis>int (*dumb_create)(struct drm_file *file_priv, struct drm_device *dev,
-                   struct drm_mode_create_dumb *args);</synopsis>
-          <para>
-            The <methodname>dumb_create</methodname> operation creates a driver
-            object (GEM or TTM handle) suitable for scanout based on the
-            width, height and depth from the struct
-            <structname>drm_mode_create_dumb</structname> argument. It fills the
-            argument's <structfield>handle</structfield>,
-            <structfield>pitch</structfield> and <structfield>size</structfield>
-            fields with a handle for the newly created object and its line
-            pitch and size in bytes.
-          </para>
-        </listitem>
-        <listitem>
-          <synopsis>int (*dumb_destroy)(struct drm_file *file_priv, struct drm_device *dev,
-                    uint32_t handle);</synopsis>
-          <para>
-            The <methodname>dumb_destroy</methodname> operation destroys a dumb
-            object created by <methodname>dumb_create</methodname>.
-          </para>
-        </listitem>
-        <listitem>
-          <synopsis>int (*dumb_map_offset)(struct drm_file *file_priv, struct drm_device *dev,
-                       uint32_t handle, uint64_t *offset);</synopsis>
-          <para>
-            The <methodname>dumb_map_offset</methodname> operation associates an
-            mmap fake offset with the object given by the handle and returns
-            it. Drivers must use the
-            <function>drm_gem_create_mmap_offset</function> function to
-            associate the fake offset as described in
-            <xref linkend="drm-gem-objects-mapping"/>.
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Note that dumb objects may not be used for gpu acceleration, as has been
-        attempted on some ARM embedded platforms. Such drivers really must have
-        a hardware-specific ioctl to allocate suitable buffer objects.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Output Polling</title>
-      <synopsis>void (*output_poll_changed)(struct drm_device *dev);</synopsis>
-      <para>
-        This operation notifies the driver that the status of one or more
-        connectors has changed. Drivers that use the fb helper can just call the
-        <function>drm_fb_helper_hotplug_event</function> function to handle this
-        operation.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Locking</title>
-      <para>
-        Beside some lookup structures with their own locking (which is hidden
-        behind the interface functions) most of the modeset state is protected
-        by the <code>dev-&lt;mode_config.lock</code> mutex and additionally
-        per-crtc locks to allow cursor updates, pageflips and similar operations
-        to occur concurrently with background tasks like output detection.
-        Operations which cross domains like a full modeset always grab all
-        locks. Drivers there need to protect resources shared between crtcs with
-        additional locking. They also need to be careful to always grab the
-        relevant crtc locks if a modset functions touches crtc state, e.g. for
-        load detection (which does only grab the <code>mode_config.lock</code>
-        to allow concurrent screen updates on live crtcs).
-      </para>
-    </sect2>
-  </sect1>
-
-  <!-- Internals: kms initialization and cleanup -->
-
-  <sect1 id="drm-kms-init">
-    <title>KMS Initialization and Cleanup</title>
-    <para>
-      A KMS device is abstracted and exposed as a set of planes, CRTCs, encoders
-      and connectors. KMS drivers must thus create and initialize all those
-      objects at load time after initializing mode setting.
-    </para>
-    <sect2>
-      <title>CRTCs (struct <structname>drm_crtc</structname>)</title>
-      <para>
-        A CRTC is an abstraction representing a part of the chip that contains a
-        pointer to a scanout buffer. Therefore, the number of CRTCs available
-        determines how many independent scanout buffers can be active at any
-        given time. The CRTC structure contains several fields to support this:
-        a pointer to some video memory (abstracted as a frame buffer object), a
-        display mode, and an (x, y) offset into the video memory to support
-        panning or configurations where one piece of video memory spans multiple
-        CRTCs.
-      </para>
-      <sect3>
-        <title>CRTC Initialization</title>
-        <para>
-          A KMS device must create and register at least one struct
-          <structname>drm_crtc</structname> instance. The instance is allocated
-          and zeroed by the driver, possibly as part of a larger structure, and
-          registered with a call to <function>drm_crtc_init</function> with a
-          pointer to CRTC functions.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Planes (struct <structname>drm_plane</structname>)</title>
-      <para>
-        A plane represents an image source that can be blended with or overlayed
-        on top of a CRTC during the scanout process. Planes are associated with
-        a frame buffer to crop a portion of the image memory (source) and
-        optionally scale it to a destination size. The result is then blended
-        with or overlayed on top of a CRTC.
-      </para>
-      <para>
-      The DRM core recognizes three types of planes:
-      <itemizedlist>
-        <listitem>
-        DRM_PLANE_TYPE_PRIMARY represents a "main" plane for a CRTC.  Primary
-        planes are the planes operated upon by CRTC modesetting and flipping
-        operations described in the page_flip hook in <structname>drm_crtc_funcs</structname>.
-        </listitem>
-        <listitem>
-        DRM_PLANE_TYPE_CURSOR represents a "cursor" plane for a CRTC.  Cursor
-        planes are the planes operated upon by the DRM_IOCTL_MODE_CURSOR and
-        DRM_IOCTL_MODE_CURSOR2 ioctls.
-        </listitem>
-        <listitem>
-        DRM_PLANE_TYPE_OVERLAY represents all non-primary, non-cursor planes.
-        Some drivers refer to these types of planes as "sprites" internally.
-        </listitem>
-      </itemizedlist>
-      For compatibility with legacy userspace, only overlay planes are made
-      available to userspace by default.  Userspace clients may set the
-      DRM_CLIENT_CAP_UNIVERSAL_PLANES client capability bit to indicate that
-      they wish to receive a universal plane list containing all plane types.
-      </para>
-      <sect3>
-        <title>Plane Initialization</title>
-        <para>
-          To create a plane, a KMS drivers allocates and
-          zeroes an instances of struct <structname>drm_plane</structname>
-          (possibly as part of a larger structure) and registers it with a call
-          to <function>drm_universal_plane_init</function>. The function takes a bitmask
-          of the CRTCs that can be associated with the plane, a pointer to the
-          plane functions, a list of format supported formats, and the type of
-          plane (primary, cursor, or overlay) being initialized.
-        </para>
-        <para>
-          Cursor and overlay planes are optional.  All drivers should provide
-          one primary plane per CRTC (although this requirement may change in
-          the future); drivers that do not wish to provide special handling for
-          primary planes may make use of the helper functions described in
-          <xref linkend="drm-kms-planehelpers"/> to create and register a
-          primary plane with standard capabilities.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Encoders (struct <structname>drm_encoder</structname>)</title>
-      <para>
-        An encoder takes pixel data from a CRTC and converts it to a format
-        suitable for any attached connectors. On some devices, it may be
-        possible to have a CRTC send data to more than one encoder. In that
-        case, both encoders would receive data from the same scanout buffer,
-        resulting in a "cloned" display configuration across the connectors
-        attached to each encoder.
-      </para>
-      <sect3>
-        <title>Encoder Initialization</title>
-        <para>
-          As for CRTCs, a KMS driver must create, initialize and register at
-          least one struct <structname>drm_encoder</structname> instance. The
-          instance is allocated and zeroed by the driver, possibly as part of a
-          larger structure.
-        </para>
-        <para>
-          Drivers must initialize the struct <structname>drm_encoder</structname>
-          <structfield>possible_crtcs</structfield> and
-          <structfield>possible_clones</structfield> fields before registering the
-          encoder. Both fields are bitmasks of respectively the CRTCs that the
-          encoder can be connected to, and sibling encoders candidate for cloning.
-        </para>
-        <para>
-          After being initialized, the encoder must be registered with a call to
-          <function>drm_encoder_init</function>. The function takes a pointer to
-          the encoder functions and an encoder type. Supported types are
-          <itemizedlist>
-            <listitem>
-              DRM_MODE_ENCODER_DAC for VGA and analog on DVI-I/DVI-A
-              </listitem>
-            <listitem>
-              DRM_MODE_ENCODER_TMDS for DVI, HDMI and (embedded) DisplayPort
-            </listitem>
-            <listitem>
-              DRM_MODE_ENCODER_LVDS for display panels
-            </listitem>
-            <listitem>
-              DRM_MODE_ENCODER_TVDAC for TV output (Composite, S-Video, Component,
-              SCART)
-            </listitem>
-            <listitem>
-              DRM_MODE_ENCODER_VIRTUAL for virtual machine displays
-            </listitem>
-          </itemizedlist>
-        </para>
-        <para>
-          Encoders must be attached to a CRTC to be used. DRM drivers leave
-          encoders unattached at initialization time. Applications (or the fbdev
-          compatibility layer when implemented) are responsible for attaching the
-          encoders they want to use to a CRTC.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Connectors (struct <structname>drm_connector</structname>)</title>
-      <para>
-        A connector is the final destination for pixel data on a device, and
-        usually connects directly to an external display device like a monitor
-        or laptop panel. A connector can only be attached to one encoder at a
-        time. The connector is also the structure where information about the
-        attached display is kept, so it contains fields for display data, EDID
-        data, DPMS &amp; connection status, and information about modes
-        supported on the attached displays.
-      </para>
-      <sect3>
-        <title>Connector Initialization</title>
-        <para>
-          Finally a KMS driver must create, initialize, register and attach at
-          least one struct <structname>drm_connector</structname> instance. The
-          instance is created as other KMS objects and initialized by setting the
-          following fields.
-        </para>
-        <variablelist>
-          <varlistentry>
-            <term><structfield>interlace_allowed</structfield></term>
-            <listitem><para>
-              Whether the connector can handle interlaced modes.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><structfield>doublescan_allowed</structfield></term>
-            <listitem><para>
-              Whether the connector can handle doublescan.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><structfield>display_info
-            </structfield></term>
-            <listitem><para>
-              Display information is filled from EDID information when a display
-              is detected. For non hot-pluggable displays such as flat panels in
-              embedded systems, the driver should initialize the
-              <structfield>display_info</structfield>.<structfield>width_mm</structfield>
-              and
-              <structfield>display_info</structfield>.<structfield>height_mm</structfield>
-              fields with the physical size of the display.
-            </para></listitem>
-          </varlistentry>
-          <varlistentry>
-            <term id="drm-kms-connector-polled"><structfield>polled</structfield></term>
-            <listitem><para>
-              Connector polling mode, a combination of
-              <variablelist>
-                <varlistentry>
-                  <term>DRM_CONNECTOR_POLL_HPD</term>
-                  <listitem><para>
-                    The connector generates hotplug events and doesn't need to be
-                    periodically polled. The CONNECT and DISCONNECT flags must not
-                    be set together with the HPD flag.
-                  </para></listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>DRM_CONNECTOR_POLL_CONNECT</term>
-                  <listitem><para>
-                    Periodically poll the connector for connection.
-                  </para></listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>DRM_CONNECTOR_POLL_DISCONNECT</term>
-                  <listitem><para>
-                    Periodically poll the connector for disconnection.
-                  </para></listitem>
-                </varlistentry>
-              </variablelist>
-              Set to 0 for connectors that don't support connection status
-              discovery.
-            </para></listitem>
-          </varlistentry>
-        </variablelist>
-        <para>
-          The connector is then registered with a call to
-          <function>drm_connector_init</function> with a pointer to the connector
-          functions and a connector type, and exposed through sysfs with a call to
-          <function>drm_connector_register</function>.
-        </para>
-        <para>
-          Supported connector types are
-          <itemizedlist>
-            <listitem>DRM_MODE_CONNECTOR_VGA</listitem>
-            <listitem>DRM_MODE_CONNECTOR_DVII</listitem>
-            <listitem>DRM_MODE_CONNECTOR_DVID</listitem>
-            <listitem>DRM_MODE_CONNECTOR_DVIA</listitem>
-            <listitem>DRM_MODE_CONNECTOR_Composite</listitem>
-            <listitem>DRM_MODE_CONNECTOR_SVIDEO</listitem>
-            <listitem>DRM_MODE_CONNECTOR_LVDS</listitem>
-            <listitem>DRM_MODE_CONNECTOR_Component</listitem>
-            <listitem>DRM_MODE_CONNECTOR_9PinDIN</listitem>
-            <listitem>DRM_MODE_CONNECTOR_DisplayPort</listitem>
-            <listitem>DRM_MODE_CONNECTOR_HDMIA</listitem>
-            <listitem>DRM_MODE_CONNECTOR_HDMIB</listitem>
-            <listitem>DRM_MODE_CONNECTOR_TV</listitem>
-            <listitem>DRM_MODE_CONNECTOR_eDP</listitem>
-            <listitem>DRM_MODE_CONNECTOR_VIRTUAL</listitem>
-          </itemizedlist>
-        </para>
-        <para>
-          Connectors must be attached to an encoder to be used. For devices that
-          map connectors to encoders 1:1, the connector should be attached at
-          initialization time with a call to
-          <function>drm_mode_connector_attach_encoder</function>. The driver must
-          also set the <structname>drm_connector</structname>
-          <structfield>encoder</structfield> field to point to the attached
-          encoder.
-        </para>
-        <para>
-          Finally, drivers must initialize the connectors state change detection
-          with a call to <function>drm_kms_helper_poll_init</function>. If at
-          least one connector is pollable but can't generate hotplug interrupts
-          (indicated by the DRM_CONNECTOR_POLL_CONNECT and
-          DRM_CONNECTOR_POLL_DISCONNECT connector flags), a delayed work will
-          automatically be queued to periodically poll for changes. Connectors
-          that can generate hotplug interrupts must be marked with the
-          DRM_CONNECTOR_POLL_HPD flag instead, and their interrupt handler must
-          call <function>drm_helper_hpd_irq_event</function>. The function will
-          queue a delayed work to check the state of all connectors, but no
-          periodic polling will be done.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Connector Operations</title>
-        <note><para>
-          Unless otherwise state, all operations are mandatory.
-        </para></note>
-        <sect4>
-          <title>DPMS</title>
-          <synopsis>void (*dpms)(struct drm_connector *connector, int mode);</synopsis>
-          <para>
-            The DPMS operation sets the power state of a connector. The mode
-            argument is one of
-            <itemizedlist>
-              <listitem><para>DRM_MODE_DPMS_ON</para></listitem>
-              <listitem><para>DRM_MODE_DPMS_STANDBY</para></listitem>
-              <listitem><para>DRM_MODE_DPMS_SUSPEND</para></listitem>
-              <listitem><para>DRM_MODE_DPMS_OFF</para></listitem>
-            </itemizedlist>
-          </para>
-          <para>
-            In all but DPMS_ON mode the encoder to which the connector is attached
-            should put the display in low-power mode by driving its signals
-            appropriately. If more than one connector is attached to the encoder
-            care should be taken not to change the power state of other displays as
-            a side effect. Low-power mode should be propagated to the encoders and
-            CRTCs when all related connectors are put in low-power mode.
-          </para>
-        </sect4>
-        <sect4>
-          <title>Modes</title>
-          <synopsis>int (*fill_modes)(struct drm_connector *connector, uint32_t max_width,
-                      uint32_t max_height);</synopsis>
-          <para>
-            Fill the mode list with all supported modes for the connector. If the
-            <parameter>max_width</parameter> and <parameter>max_height</parameter>
-            arguments are non-zero, the implementation must ignore all modes wider
-            than <parameter>max_width</parameter> or higher than
-            <parameter>max_height</parameter>.
-          </para>
-          <para>
-            The connector must also fill in this operation its
-            <structfield>display_info</structfield>
-            <structfield>width_mm</structfield> and
-            <structfield>height_mm</structfield> fields with the connected display
-            physical size in millimeters. The fields should be set to 0 if the value
-            isn't known or is not applicable (for instance for projector devices).
-          </para>
-        </sect4>
-        <sect4>
-          <title>Connection Status</title>
-          <para>
-            The connection status is updated through polling or hotplug events when
-            supported (see <xref linkend="drm-kms-connector-polled"/>). The status
-            value is reported to userspace through ioctls and must not be used
-            inside the driver, as it only gets initialized by a call to
-            <function>drm_mode_getconnector</function> from userspace.
-          </para>
-          <synopsis>enum drm_connector_status (*detect)(struct drm_connector *connector,
-                                        bool force);</synopsis>
-          <para>
-            Check to see if anything is attached to the connector. The
-            <parameter>force</parameter> parameter is set to false whilst polling or
-            to true when checking the connector due to user request.
-            <parameter>force</parameter> can be used by the driver to avoid
-            expensive, destructive operations during automated probing.
-          </para>
-          <para>
-            Return connector_status_connected if something is connected to the
-            connector, connector_status_disconnected if nothing is connected and
-            connector_status_unknown if the connection state isn't known.
-          </para>
-          <para>
-            Drivers should only return connector_status_connected if the connection
-            status has really been probed as connected. Connectors that can't detect
-            the connection status, or failed connection status probes, should return
-            connector_status_unknown.
-          </para>
-        </sect4>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Cleanup</title>
-      <para>
-        The DRM core manages its objects' lifetime. When an object is not needed
-        anymore the core calls its destroy function, which must clean up and
-        free every resource allocated for the object. Every
-        <function>drm_*_init</function> call must be matched with a
-        corresponding <function>drm_*_cleanup</function> call to cleanup CRTCs
-        (<function>drm_crtc_cleanup</function>), planes
-        (<function>drm_plane_cleanup</function>), encoders
-        (<function>drm_encoder_cleanup</function>) and connectors
-        (<function>drm_connector_cleanup</function>). Furthermore, connectors
-        that have been added to sysfs must be removed by a call to
-        <function>drm_connector_unregister</function> before calling
-        <function>drm_connector_cleanup</function>.
-      </para>
-      <para>
-        Connectors state change detection must be cleanup up with a call to
-        <function>drm_kms_helper_poll_fini</function>.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Output discovery and initialization example</title>
-      <programlisting><![CDATA[
-void intel_crt_init(struct drm_device *dev)
-{
-        struct drm_connector *connector;
-        struct intel_output *intel_output;
-
-        intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
-        if (!intel_output)
-                return;
-
-        connector = &intel_output->base;
-        drm_connector_init(dev, &intel_output->base,
-                           &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
-
-        drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,
-                         DRM_MODE_ENCODER_DAC);
-
-        drm_mode_connector_attach_encoder(&intel_output->base,
-                                          &intel_output->enc);
-
-        /* Set up the DDC bus. */
-        intel_output->ddc_bus = intel_i2c_create(dev, GPIOA, "CRTDDC_A");
-        if (!intel_output->ddc_bus) {
-                dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "
-                           "failed.\n");
-                return;
-        }
-
-        intel_output->type = INTEL_OUTPUT_ANALOG;
-        connector->interlace_allowed = 0;
-        connector->doublescan_allowed = 0;
-
-        drm_encoder_helper_add(&intel_output->enc, &intel_crt_helper_funcs);
-        drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
-
-        drm_connector_register(connector);
-}]]></programlisting>
-      <para>
-        In the example above (taken from the i915 driver), a CRTC, connector and
-        encoder combination is created. A device-specific i2c bus is also
-        created for fetching EDID data and performing monitor detection. Once
-        the process is complete, the new connector is registered with sysfs to
-        make its properties available to applications.
-      </para>
-    </sect2>
-    <sect2>
-      <title>KMS API Functions</title>
-!Edrivers/gpu/drm/drm_crtc.c
-    </sect2>
-    <sect2>
-      <title>KMS Data Structures</title>
-!Iinclude/drm/drm_crtc.h
-    </sect2>
-    <sect2>
-      <title>KMS Locking</title>
-!Pdrivers/gpu/drm/drm_modeset_lock.c kms locking
-!Iinclude/drm/drm_modeset_lock.h
-!Edrivers/gpu/drm/drm_modeset_lock.c
-    </sect2>
-  </sect1>
-
-  <!-- Internals: kms helper functions -->
-
-  <sect1>
-    <title>Mode Setting Helper Functions</title>
-    <para>
-      The plane, CRTC, encoder and connector functions provided by the drivers
-      implement the DRM API. They're called by the DRM core and ioctl handlers
-      to handle device state changes and configuration request. As implementing
-      those functions often requires logic not specific to drivers, mid-layer
-      helper functions are available to avoid duplicating boilerplate code.
-    </para>
-    <para>
-      The DRM core contains one mid-layer implementation. The mid-layer provides
-      implementations of several plane, CRTC, encoder and connector functions
-      (called from the top of the mid-layer) that pre-process requests and call
-      lower-level functions provided by the driver (at the bottom of the
-      mid-layer). For instance, the
-      <function>drm_crtc_helper_set_config</function> function can be used to
-      fill the struct <structname>drm_crtc_funcs</structname>
-      <structfield>set_config</structfield> field. When called, it will split
-      the <methodname>set_config</methodname> operation in smaller, simpler
-      operations and call the driver to handle them.
-    </para>
-    <para>
-      To use the mid-layer, drivers call <function>drm_crtc_helper_add</function>,
-      <function>drm_encoder_helper_add</function> and
-      <function>drm_connector_helper_add</function> functions to install their
-      mid-layer bottom operations handlers, and fill the
-      <structname>drm_crtc_funcs</structname>,
-      <structname>drm_encoder_funcs</structname> and
-      <structname>drm_connector_funcs</structname> structures with pointers to
-      the mid-layer top API functions. Installing the mid-layer bottom operation
-      handlers is best done right after registering the corresponding KMS object.
-    </para>
-    <para>
-      The mid-layer is not split between CRTC, encoder and connector operations.
-      To use it, a driver must provide bottom functions for all of the three KMS
-      entities.
-    </para>
-    <sect2>
-      <title>Atomic Modeset Helper Functions Reference</title>
-      <sect3>
-        <title>Overview</title>
-!Pdrivers/gpu/drm/drm_atomic_helper.c overview
-      </sect3>
-      <sect3>
-        <title>Implementing Asynchronous Atomic Commit</title>
-!Pdrivers/gpu/drm/drm_atomic_helper.c implementing async commit
-      </sect3>
-      <sect3>
-        <title>Atomic State Reset and Initialization</title>
-!Pdrivers/gpu/drm/drm_atomic_helper.c atomic state reset and initialization
-      </sect3>
-!Iinclude/drm/drm_atomic_helper.h
-!Edrivers/gpu/drm/drm_atomic_helper.c
-    </sect2>
-    <sect2>
-      <title>Modeset Helper Reference for Common Vtables</title>
-!Iinclude/drm/drm_modeset_helper_vtables.h
-!Pinclude/drm/drm_modeset_helper_vtables.h overview
-    </sect2>
-    <sect2>
-      <title>Legacy CRTC/Modeset Helper Functions Reference</title>
-!Edrivers/gpu/drm/drm_crtc_helper.c
-!Pdrivers/gpu/drm/drm_crtc_helper.c overview
-    </sect2>
-    <sect2>
-      <title>Output Probing Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_probe_helper.c output probing helper overview
-!Edrivers/gpu/drm/drm_probe_helper.c
-    </sect2>
-    <sect2>
-      <title>fbdev Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_fb_helper.c fbdev helpers
-!Edrivers/gpu/drm/drm_fb_helper.c
-!Iinclude/drm/drm_fb_helper.h
-    </sect2>
-    <sect2>
-      <title>Framebuffer CMA Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_fb_cma_helper.c framebuffer cma helper functions
-!Edrivers/gpu/drm/drm_fb_cma_helper.c
-    </sect2>
-    <sect2>
-      <title>Display Port Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_dp_helper.c dp helpers
-!Iinclude/drm/drm_dp_helper.h
-!Edrivers/gpu/drm/drm_dp_helper.c
-    </sect2>
-    <sect2>
-      <title>Display Port Dual Mode Adaptor Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_dp_dual_mode_helper.c dp dual mode helpers
-!Iinclude/drm/drm_dp_dual_mode_helper.h
-!Edrivers/gpu/drm/drm_dp_dual_mode_helper.c
-    </sect2>
-    <sect2>
-      <title>Display Port MST Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_dp_mst_topology.c dp mst helper
-!Iinclude/drm/drm_dp_mst_helper.h
-!Edrivers/gpu/drm/drm_dp_mst_topology.c
-    </sect2>
-    <sect2>
-      <title>MIPI DSI Helper Functions Reference</title>
-!Pdrivers/gpu/drm/drm_mipi_dsi.c dsi helpers
-!Iinclude/drm/drm_mipi_dsi.h
-!Edrivers/gpu/drm/drm_mipi_dsi.c
-    </sect2>
-    <sect2>
-      <title>EDID Helper Functions Reference</title>
-!Edrivers/gpu/drm/drm_edid.c
-    </sect2>
-    <sect2>
-      <title>Rectangle Utilities Reference</title>
-!Pinclude/drm/drm_rect.h rect utils
-!Iinclude/drm/drm_rect.h
-!Edrivers/gpu/drm/drm_rect.c
-    </sect2>
-    <sect2>
-      <title>Flip-work Helper Reference</title>
-!Pinclude/drm/drm_flip_work.h flip utils
-!Iinclude/drm/drm_flip_work.h
-!Edrivers/gpu/drm/drm_flip_work.c
-    </sect2>
-    <sect2>
-      <title>HDMI Infoframes Helper Reference</title>
-      <para>
-        Strictly speaking this is not a DRM helper library but generally useable
-        by any driver interfacing with HDMI outputs like v4l or alsa drivers.
-        But it nicely fits into the overall topic of mode setting helper
-        libraries and hence is also included here.
-      </para>
-!Iinclude/linux/hdmi.h
-!Edrivers/video/hdmi.c
-    </sect2>
-    <sect2>
-      <title id="drm-kms-planehelpers">Plane Helper Reference</title>
-!Edrivers/gpu/drm/drm_plane_helper.c
-!Pdrivers/gpu/drm/drm_plane_helper.c overview
-    </sect2>
-    <sect2>
-          <title>Tile group</title>
-!Pdrivers/gpu/drm/drm_crtc.c Tile group
-    </sect2>
-    <sect2>
-      <title>Bridges</title>
-      <sect3>
-        <title>Overview</title>
-!Pdrivers/gpu/drm/drm_bridge.c overview
-      </sect3>
-      <sect3>
-        <title>Default bridge callback sequence</title>
-!Pdrivers/gpu/drm/drm_bridge.c bridge callbacks
-      </sect3>
-!Edrivers/gpu/drm/drm_bridge.c
-    </sect2>
-    <sect2>
-      <title>Panel Helper Reference</title>
-!Iinclude/drm/drm_panel.h
-!Edrivers/gpu/drm/drm_panel.c
-!Pdrivers/gpu/drm/drm_panel.c drm panel
-    </sect2>
-  </sect1>
-
-  <!-- Internals: kms properties -->
-
-  <sect1 id="drm-kms-properties">
-    <title>KMS Properties</title>
-    <para>
-      Drivers may need to expose additional parameters to applications than
-      those described in the previous sections. KMS supports attaching
-      properties to CRTCs, connectors and planes and offers a userspace API to
-      list, get and set the property values.
-    </para>
-    <para>
-      Properties are identified by a name that uniquely defines the property
-      purpose, and store an associated value. For all property types except blob
-      properties the value is a 64-bit unsigned integer.
-    </para>
-    <para>
-      KMS differentiates between properties and property instances. Drivers
-      first create properties and then create and associate individual instances
-      of those properties to objects. A property can be instantiated multiple
-      times and associated with different objects. Values are stored in property
-      instances, and all other property information are stored in the property
-      and shared between all instances of the property.
-    </para>
-    <para>
-      Every property is created with a type that influences how the KMS core
-      handles the property. Supported property types are
-      <variablelist>
-        <varlistentry>
-          <term>DRM_MODE_PROP_RANGE</term>
-          <listitem><para>Range properties report their minimum and maximum
-            admissible values. The KMS core verifies that values set by
-            application fit in that range.</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>DRM_MODE_PROP_ENUM</term>
-          <listitem><para>Enumerated properties take a numerical value that
-            ranges from 0 to the number of enumerated values defined by the
-            property minus one, and associate a free-formed string name to each
-            value. Applications can retrieve the list of defined value-name pairs
-            and use the numerical value to get and set property instance values.
-            </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>DRM_MODE_PROP_BITMASK</term>
-          <listitem><para>Bitmask properties are enumeration properties that
-            additionally restrict all enumerated values to the 0..63 range.
-            Bitmask property instance values combine one or more of the
-            enumerated bits defined by the property.</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>DRM_MODE_PROP_BLOB</term>
-          <listitem><para>Blob properties store a binary blob without any format
-            restriction. The binary blobs are created as KMS standalone objects,
-            and blob property instance values store the ID of their associated
-            blob object.</para>
-            <para>Blob properties are only used for the connector EDID property
-            and cannot be created by drivers.</para></listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      To create a property drivers call one of the following functions depending
-      on the property type. All property creation functions take property flags
-      and name, as well as type-specific arguments.
-      <itemizedlist>
-        <listitem>
-          <synopsis>struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
-                                               const char *name,
-                                               uint64_t min, uint64_t max);</synopsis>
-          <para>Create a range property with the given minimum and maximum
-            values.</para>
-        </listitem>
-        <listitem>
-          <synopsis>struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags,
-                                              const char *name,
-                                              const struct drm_prop_enum_list *props,
-                                              int num_values);</synopsis>
-          <para>Create an enumerated property. The <parameter>props</parameter>
-            argument points to an array of <parameter>num_values</parameter>
-            value-name pairs.</para>
-        </listitem>
-        <listitem>
-          <synopsis>struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
-                                                 int flags, const char *name,
-                                                 const struct drm_prop_enum_list *props,
-                                                 int num_values);</synopsis>
-          <para>Create a bitmask property. The <parameter>props</parameter>
-            argument points to an array of <parameter>num_values</parameter>
-            value-name pairs.</para>
-        </listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      Properties can additionally be created as immutable, in which case they
-      will be read-only for applications but can be modified by the driver. To
-      create an immutable property drivers must set the DRM_MODE_PROP_IMMUTABLE
-      flag at property creation time.
-    </para>
-    <para>
-      When no array of value-name pairs is readily available at property
-      creation time for enumerated or range properties, drivers can create
-      the property using the <function>drm_property_create</function> function
-      and manually add enumeration value-name pairs by calling the
-      <function>drm_property_add_enum</function> function. Care must be taken to
-      properly specify the property type through the <parameter>flags</parameter>
-      argument.
-    </para>
-    <para>
-      After creating properties drivers can attach property instances to CRTC,
-      connector and plane objects by calling the
-      <function>drm_object_attach_property</function>. The function takes a
-      pointer to the target object, a pointer to the previously created property
-      and an initial instance value.
-    </para>
-    <sect2>
-        <title>Existing KMS Properties</title>
-        <para>
-        The following table gives description of drm properties exposed by various
-        modules/drivers.
-        </para>
-        <table border="1" cellpadding="0" cellspacing="0">
-        <tbody>
-        <tr style="font-weight: bold;">
-        <td valign="top" >Owner Module/Drivers</td>
-        <td valign="top" >Group</td>
-        <td valign="top" >Property Name</td>
-        <td valign="top" >Type</td>
-        <td valign="top" >Property Values</td>
-        <td valign="top" >Object attached</td>
-        <td valign="top" >Description/Restrictions</td>
-        </tr>
-        <tr>
-        <td rowspan="42" valign="top" >DRM</td>
-        <td rowspan="2" valign="top" >Generic</td>
-        <td valign="top" >“rotation�</td>
-        <td valign="top" >BITMASK</td>
-        <td valign="top" >{ 0, "rotate-0" },
-        { 1, "rotate-90" },
-        { 2, "rotate-180" },
-        { 3, "rotate-270" },
-        { 4, "reflect-x" },
-        { 5, "reflect-y" }</td>
-        <td valign="top" >CRTC, Plane</td>
-        <td valign="top" >rotate-(degrees) rotates the image by the specified amount in degrees
-        in counter clockwise direction. reflect-x and reflect-y reflects the
-        image along the specified axis prior to rotation</td>
-        </tr>
-        <tr>
-        <td valign="top" >“scaling mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >Supported by: amdgpu, gma500, i915, nouveau and radeon.</td>
-        </tr>
-        <tr>
-        <td rowspan="5" valign="top" >Connector</td>
-        <td valign="top" >“EDID�</td>
-        <td valign="top" >BLOB | IMMUTABLE</td>
-        <td valign="top" >0</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >Contains id of edid blob ptr object.</td>
-        </tr>
-        <tr>
-        <td valign="top" >“DPMS�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ “On�, “Standby�, “Suspend�, “Off� }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >Contains DPMS operation mode value.</td>
-        </tr>
-        <tr>
-        <td valign="top" >“PATH�</td>
-        <td valign="top" >BLOB | IMMUTABLE</td>
-        <td valign="top" >0</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >Contains topology path to a connector.</td>
-        </tr>
-        <tr>
-        <td valign="top" >“TILE�</td>
-        <td valign="top" >BLOB | IMMUTABLE</td>
-        <td valign="top" >0</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >Contains tiling information for a connector.</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CRTC_ID�</td>
-        <td valign="top" >OBJECT</td>
-        <td valign="top" >DRM_MODE_OBJECT_CRTC</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >CRTC that connector is attached to (atomic)</td>
-        </tr>
-        <tr>
-        <td rowspan="11" valign="top" >Plane</td>
-        <td valign="top" >“type�</td>
-        <td valign="top" >ENUM | IMMUTABLE</td>
-        <td valign="top" >{ "Overlay", "Primary", "Cursor" }</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Plane type</td>
-        </tr>
-        <tr>
-        <td valign="top" >“SRC_X�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout source x coordinate in 16.16 fixed point (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“SRC_Y�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout source y coordinate in 16.16 fixed point (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“SRC_W�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout source width in 16.16 fixed point (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“SRC_H�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout source height in 16.16 fixed point (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CRTC_X�</td>
-        <td valign="top" >SIGNED_RANGE</td>
-        <td valign="top" >Min=INT_MIN, Max=INT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout CRTC (destination) x coordinate (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CRTC_Y�</td>
-        <td valign="top" >SIGNED_RANGE</td>
-        <td valign="top" >Min=INT_MIN, Max=INT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout CRTC (destination) y coordinate (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CRTC_W�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout CRTC (destination) width (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CRTC_H�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout CRTC (destination) height (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“FB_ID�</td>
-        <td valign="top" >OBJECT</td>
-        <td valign="top" >DRM_MODE_OBJECT_FB</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >Scanout framebuffer (atomic)</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CRTC_ID�</td>
-        <td valign="top" >OBJECT</td>
-        <td valign="top" >DRM_MODE_OBJECT_CRTC</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >CRTC that plane is attached to (atomic)</td>
-        </tr>
-        <tr>
-        <td rowspan="2" valign="top" >DVI-I</td>
-        <td valign="top" >“subconnector�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ “Unknown�, “DVI-D�, “DVI-A� }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“select subconnector�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ “Automatic�, “DVI-D�, “DVI-A� }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="13" valign="top" >TV</td>
-        <td valign="top" >“subconnector�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "Unknown", "Composite", "SVIDEO", "Component", "SCART" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“select subconnector�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "Automatic", "Composite", "SVIDEO", "Component", "SCART" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "NTSC_M", "NTSC_J", "NTSC_443", "PAL_B" } etc.</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“left margin�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“right margin�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“top margin�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“bottom margin�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“brightness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“contrast�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker reduction�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“overscan�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“saturation�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“hue�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="2" valign="top" >Virtual GPU</td>
-        <td valign="top" >“suggested X�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffffff</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >property to suggest an X offset for a connector</td>
-        </tr>
-        <tr>
-        <td valign="top" >“suggested Y�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffffff</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >property to suggest an Y offset for a connector</td>
-        </tr>
-        <tr>
-        <td rowspan="7" valign="top" >Optional</td>
-        <td valign="top" >"aspect ratio"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "None", "4:3", "16:9" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TDB</td>
-        </tr>
-        <tr>
-        <td valign="top" >“dirty�</td>
-        <td valign="top" >ENUM | IMMUTABLE</td>
-        <td valign="top" >{ "Off", "On", "Annotate" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“DEGAMMA_LUT�</td>
-        <td valign="top" >BLOB</td>
-        <td valign="top" >0</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >DRM property to set the degamma lookup table
-                (LUT) mapping pixel data from the framebuffer before it is
-                given to the transformation matrix. The data is an interpreted
-                as an array of struct drm_color_lut elements. Hardware might
-                choose not to use the full precision of the LUT elements nor
-                use all the elements of the LUT (for example the hardware
-                might choose to interpolate between LUT[0] and LUT[4]). </td>
-        </tr>
-        <tr>
-        <td valign="top" >“DEGAMMA_LUT_SIZE�</td>
-        <td valign="top" >RANGE | IMMUTABLE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >DRM property to gives the size of the lookup
-                table to be set on the DEGAMMA_LUT property (the size depends
-                on the underlying hardware).</td>
-        </tr>
-        <tr>
-        <td valign="top" >“CTM�</td>
-        <td valign="top" >BLOB</td>
-        <td valign="top" >0</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >DRM property to set the current
-                transformation matrix (CTM) apply to pixel data after the
-                lookup through the degamma LUT and before the lookup through
-                the gamma LUT. The data is an interpreted as a struct
-                drm_color_ctm.</td>
-        </tr>
-        <tr>
-        <td valign="top" >“GAMMA_LUT�</td>
-        <td valign="top" >BLOB</td>
-        <td valign="top" >0</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >DRM property to set the gamma lookup table
-                (LUT) mapping pixel data after to the transformation matrix to
-                data sent to the connector. The data is an interpreted as an
-                array of struct drm_color_lut elements. Hardware might choose
-                not to use the full precision of the LUT elements nor use all
-                the elements of the LUT (for example the hardware might choose
-                to interpolate between LUT[0] and LUT[4]).</td>
-        </tr>
-        <tr>
-        <td valign="top" >“GAMMA_LUT_SIZE�</td>
-        <td valign="top" >RANGE | IMMUTABLE</td>
-        <td valign="top" >Min=0, Max=UINT_MAX</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >DRM property to gives the size of the lookup
-                table to be set on the GAMMA_LUT property (the size depends on
-                the underlying hardware).</td>
-        </tr>
-        <tr>
-        <td rowspan="20" valign="top" >i915</td>
-        <td rowspan="2" valign="top" >Generic</td>
-        <td valign="top" >"Broadcast RGB"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "Automatic", "Full", "Limited 16:235" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >When this property is set to Limited 16:235
-                and CTM is set, the hardware will be programmed with the
-                result of the multiplication of CTM by the limited range
-                matrix to ensure the pixels normaly in the range 0..1.0 are
-                remapped to the range 16/255..235/255.</td>
-        </tr>
-        <tr>
-        <td valign="top" >“audio�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "force-dvi", "off", "auto", "on" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="17" valign="top" >SDVO-TV</td>
-        <td valign="top" >“mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "NTSC_M", "NTSC_J", "NTSC_443", "PAL_B" } etc.</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"left_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"right_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"top_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"bottom_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“hpos�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“vpos�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“contrast�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“saturation�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“hue�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“sharpness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker_filter�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker_filter_adaptive�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker_filter_2d�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“tv_chroma_filter�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“tv_luma_filter�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“dot_crawl�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >SDVO-TV/LVDS</td>
-        <td valign="top" >“brightness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="2" valign="top" >CDV gma-500</td>
-        <td rowspan="2" valign="top" >Generic</td>
-        <td valign="top" >"Broadcast RGB"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ “Full�, “Limited 16:235� }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"Broadcast RGB"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ “off�, “auto�, “on� }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="19" valign="top" >Poulsbo</td>
-        <td rowspan="1" valign="top" >Generic</td>
-        <td valign="top" >“backlight�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=100</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="17" valign="top" >SDVO-TV</td>
-        <td valign="top" >“mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "NTSC_M", "NTSC_J", "NTSC_443", "PAL_B" } etc.</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"left_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"right_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"top_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"bottom_margin"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“hpos�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“vpos�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“contrast�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“saturation�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“hue�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“sharpness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker_filter�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker_filter_adaptive�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“flicker_filter_2d�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“tv_chroma_filter�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“tv_luma_filter�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“dot_crawl�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >SDVO-TV/LVDS</td>
-        <td valign="top" >“brightness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max= SDVO dependent</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="11" valign="top" >armada</td>
-        <td rowspan="2" valign="top" >CRTC</td>
-        <td valign="top" >"CSC_YUV"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "Auto" , "CCIR601", "CCIR709" }</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"CSC_RGB"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "Auto", "Computer system", "Studio" }</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="9" valign="top" >Overlay</td>
-        <td valign="top" >"colorkey"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"colorkey_min"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"colorkey_max"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"colorkey_val"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"colorkey_alpha"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0xffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"colorkey_mode"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "disabled", "Y component", "U component"
-        , "V component", "RGB", “R component", "G component", "B component" }</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"brightness"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=256 + 255</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"contrast"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0x7fff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"saturation"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0x7fff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="2" valign="top" >exynos</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >“mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "normal", "blank" }</td>
-        <td valign="top" >CRTC</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >Overlay</td>
-        <td valign="top" >“zpos�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=MAX_PLANE-1</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="2" valign="top" >i2c/ch7006_drv</td>
-        <td valign="top" >Generic</td>
-        <td valign="top" >“scale�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=2</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="1" valign="top" >TV</td>
-        <td valign="top" >“mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "PAL", "PAL-M","PAL-N"}, �PAL-Nc"
-        , "PAL-60", "NTSC-M", "NTSC-J" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="15" valign="top" >nouveau</td>
-        <td rowspan="6" valign="top" >NV10 Overlay</td>
-        <td valign="top" >"colorkey"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0x01ffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“contrast�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=8192-1</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“brightness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1024</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“hue�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=359</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“saturation�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=8192-1</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“iturbt_709�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="2" valign="top" >Nv04 Overlay</td>
-        <td valign="top" >“colorkey�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0x01ffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“brightness�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1024</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="7" valign="top" >Display</td>
-        <td valign="top" >“dithering mode�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "auto", "off", "on" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“dithering depth�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "auto", "off", "on", "static 2x2", "dynamic 2x2", "temporal" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“underscan�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "auto", "6 bpc", "8 bpc" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“underscan hborder�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=128</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“underscan vborder�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=128</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“vibrant hue�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=180</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >“color vibrance�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=200</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >omap</td>
-        <td valign="top" >Generic</td>
-        <td valign="top" >“zorder�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=3</td>
-        <td valign="top" >CRTC, Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >qxl</td>
-        <td valign="top" >Generic</td>
-        <td valign="top" >“hotplug_mode_update"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="9" valign="top" >radeon</td>
-        <td valign="top" >DVI-I</td>
-        <td valign="top" >“coherent�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >DAC enable load detect</td>
-        <td valign="top" >“load detection�</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=1</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >TV Standard</td>
-        <td valign="top" >"tv standard"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "ntsc", "pal", "pal-m", "pal-60", "ntsc-j"
-        , "scart-pal", "pal-cn", "secam" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >legacy TMDS PLL detect</td>
-        <td valign="top" >"tmds_pll"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "driver", "bios" }</td>
-        <td valign="top" >-</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="3" valign="top" >Underscan</td>
-        <td valign="top" >"underscan"</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "off", "on", "auto" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"underscan hborder"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=128</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"underscan vborder"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=128</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >Audio</td>
-        <td valign="top" >“audio�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "off", "on", "auto" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >FMT Dithering</td>
-        <td valign="top" >“dither�</td>
-        <td valign="top" >ENUM</td>
-        <td valign="top" >{ "off", "on" }</td>
-        <td valign="top" >Connector</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td rowspan="3" valign="top" >rcar-du</td>
-        <td rowspan="3" valign="top" >Generic</td>
-        <td valign="top" >"alpha"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=255</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"colorkey"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=0, Max=0x01ffffff</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        <tr>
-        <td valign="top" >"zpos"</td>
-        <td valign="top" >RANGE</td>
-        <td valign="top" >Min=1, Max=7</td>
-        <td valign="top" >Plane</td>
-        <td valign="top" >TBD</td>
-        </tr>
-        </tbody>
-        </table>
-    </sect2>
-  </sect1>
-
-  <!-- Internals: vertical blanking -->
-
-  <sect1 id="drm-vertical-blank">
-    <title>Vertical Blanking</title>
-    <para>
-      Vertical blanking plays a major role in graphics rendering. To achieve
-      tear-free display, users must synchronize page flips and/or rendering to
-      vertical blanking. The DRM API offers ioctls to perform page flips
-      synchronized to vertical blanking and wait for vertical blanking.
-    </para>
-    <para>
-      The DRM core handles most of the vertical blanking management logic, which
-      involves filtering out spurious interrupts, keeping race-free blanking
-      counters, coping with counter wrap-around and resets and keeping use
-      counts. It relies on the driver to generate vertical blanking interrupts
-      and optionally provide a hardware vertical blanking counter. Drivers must
-      implement the following operations.
-    </para>
-    <itemizedlist>
-      <listitem>
-        <synopsis>int (*enable_vblank) (struct drm_device *dev, int crtc);
-void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis>
-        <para>
-          Enable or disable vertical blanking interrupts for the given CRTC.
-        </para>
-      </listitem>
-      <listitem>
-        <synopsis>u32 (*get_vblank_counter) (struct drm_device *dev, int crtc);</synopsis>
-        <para>
-          Retrieve the value of the vertical blanking counter for the given
-          CRTC. If the hardware maintains a vertical blanking counter its value
-          should be returned. Otherwise drivers can use the
-          <function>drm_vblank_count</function> helper function to handle this
-          operation.
-        </para>
-      </listitem>
-    </itemizedlist>
-    <para>
-      Drivers must initialize the vertical blanking handling core with a call to
-      <function>drm_vblank_init</function> in their
-      <methodname>load</methodname> operation. The function will set the struct
-      <structname>drm_device</structname>
-      <structfield>vblank_disable_allowed</structfield> field to 0. This will
-      keep vertical blanking interrupts enabled permanently until the first mode
-      set operation, where <structfield>vblank_disable_allowed</structfield> is
-      set to 1. The reason behind this is not clear. Drivers can set the field
-      to 1 after <function>calling drm_vblank_init</function> to make vertical
-      blanking interrupts dynamically managed from the beginning.
-    </para>
-    <para>
-      Vertical blanking interrupts can be enabled by the DRM core or by drivers
-      themselves (for instance to handle page flipping operations). The DRM core
-      maintains a vertical blanking use count to ensure that the interrupts are
-      not disabled while a user still needs them. To increment the use count,
-      drivers call <function>drm_vblank_get</function>. Upon return vertical
-      blanking interrupts are guaranteed to be enabled.
-    </para>
-    <para>
-      To decrement the use count drivers call
-      <function>drm_vblank_put</function>. Only when the use count drops to zero
-      will the DRM core disable the vertical blanking interrupts after a delay
-      by scheduling a timer. The delay is accessible through the vblankoffdelay
-      module parameter or the <varname>drm_vblank_offdelay</varname> global
-      variable and expressed in milliseconds. Its default value is 5000 ms.
-      Zero means never disable, and a negative value means disable immediately.
-      Drivers may override the behaviour by setting the
-      <structname>drm_device</structname>
-      <structfield>vblank_disable_immediate</structfield> flag, which when set
-      causes vblank interrupts to be disabled immediately regardless of the
-      drm_vblank_offdelay value. The flag should only be set if there's a
-      properly working hardware vblank counter present.
-    </para>
-    <para>
-      When a vertical blanking interrupt occurs drivers only need to call the
-      <function>drm_handle_vblank</function> function to account for the
-      interrupt.
-    </para>
-    <para>
-      Resources allocated by <function>drm_vblank_init</function> must be freed
-      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
-!Finclude/drm/drmP.h drm_crtc_vblank_waitqueue
-    </sect2>
-  </sect1>
-
-  <!-- Internals: open/close, file operations and ioctls -->
-
-  <sect1>
-    <title>Open/Close, File Operations and IOCTLs</title>
-    <sect2>
-      <title>Open and Close</title>
-      <synopsis>int (*firstopen) (struct drm_device *);
-void (*lastclose) (struct drm_device *);
-int (*open) (struct drm_device *, struct drm_file *);
-void (*preclose) (struct drm_device *, struct drm_file *);
-void (*postclose) (struct drm_device *, struct drm_file *);</synopsis>
-      <abstract>Open and close handlers. None of those methods are mandatory.
-      </abstract>
-      <para>
-        The <methodname>firstopen</methodname> method is called by the DRM core
-        for legacy UMS (User Mode Setting) drivers only when an application
-        opens a device that has no other opened file handle. UMS drivers can
-        implement it to acquire device resources. KMS drivers can't use the
-        method and must acquire resources in the <methodname>load</methodname>
-        method instead.
-      </para>
-      <para>
-        Similarly the <methodname>lastclose</methodname> method is called when
-        the last application holding a file handle opened on the device closes
-        it, for both UMS and KMS drivers. Additionally, the method is also
-        called at module unload time or, for hot-pluggable devices, when the
-        device is unplugged. The <methodname>firstopen</methodname> and
-        <methodname>lastclose</methodname> calls can thus be unbalanced.
-      </para>
-      <para>
-        The <methodname>open</methodname> method is called every time the device
-        is opened by an application. Drivers can allocate per-file private data
-        in this method and store them in the struct
-        <structname>drm_file</structname> <structfield>driver_priv</structfield>
-        field. Note that the <methodname>open</methodname> method is called
-        before <methodname>firstopen</methodname>.
-      </para>
-      <para>
-        The close operation is split into <methodname>preclose</methodname> and
-        <methodname>postclose</methodname> methods. Drivers must stop and
-        cleanup all per-file operations in the <methodname>preclose</methodname>
-        method. For instance pending vertical blanking and page flip events must
-        be cancelled. No per-file operation is allowed on the file handle after
-        returning from the <methodname>preclose</methodname> method.
-      </para>
-      <para>
-        Finally the <methodname>postclose</methodname> method is called as the
-        last step of the close operation, right before calling the
-        <methodname>lastclose</methodname> method if no other open file handle
-        exists for the device. Drivers that have allocated per-file private data
-        in the <methodname>open</methodname> method should free it here.
-      </para>
-      <para>
-        The <methodname>lastclose</methodname> method should restore CRTC and
-        plane properties to default value, so that a subsequent open of the
-        device will not inherit state from the previous user. It can also be
-        used to execute delayed power switching state changes, e.g. in
-        conjunction with the vga_switcheroo infrastructure (see
-        <xref linkend="vga_switcheroo"/>). Beyond that KMS drivers should not
-        do any further cleanup. Only legacy UMS drivers might need to clean up
-        device state so that the vga console or an independent fbdev driver
-        could take over.
-      </para>
-    </sect2>
-    <sect2>
-      <title>File Operations</title>
-!Pdrivers/gpu/drm/drm_fops.c file operations
-!Edrivers/gpu/drm/drm_fops.c
-    </sect2>
-    <sect2>
-      <title>IOCTLs</title>
-      <synopsis>struct drm_ioctl_desc *ioctls;
-int num_ioctls;</synopsis>
-      <abstract>Driver-specific ioctls descriptors table.</abstract>
-      <para>
-        Driver-specific ioctls numbers start at DRM_COMMAND_BASE. The ioctls
-        descriptors table is indexed by the ioctl number offset from the base
-        value. Drivers can use the DRM_IOCTL_DEF_DRV() macro to initialize the
-        table entries.
-      </para>
-      <para>
-        <programlisting>DRM_IOCTL_DEF_DRV(ioctl, func, flags)</programlisting>
-        <para>
-          <parameter>ioctl</parameter> is the ioctl name. Drivers must define
-          the DRM_##ioctl and DRM_IOCTL_##ioctl macros to the ioctl number
-          offset from DRM_COMMAND_BASE and the ioctl number respectively. The
-          first macro is private to the device while the second must be exposed
-          to userspace in a public header.
-        </para>
-        <para>
-          <parameter>func</parameter> is a pointer to the ioctl handler function
-          compatible with the <type>drm_ioctl_t</type> type.
-          <programlisting>typedef int drm_ioctl_t(struct drm_device *dev, void *data,
-                struct drm_file *file_priv);</programlisting>
-        </para>
-        <para>
-          <parameter>flags</parameter> is a bitmask combination of the following
-          values. It restricts how the ioctl is allowed to be called.
-          <itemizedlist>
-            <listitem><para>
-              DRM_AUTH - Only authenticated callers allowed
-            </para></listitem>
-            <listitem><para>
-              DRM_MASTER - The ioctl can only be called on the master file
-              handle
-            </para></listitem>
-            <listitem><para>
-              DRM_ROOT_ONLY - Only callers with the SYSADMIN capability allowed
-            </para></listitem>
-            <listitem><para>
-              DRM_CONTROL_ALLOW - The ioctl can only be called on a control
-              device
-            </para></listitem>
-            <listitem><para>
-              DRM_UNLOCKED - The ioctl handler will be called without locking
-              the DRM global mutex. This is the enforced default for kms drivers
-              (i.e. using the DRIVER_MODESET flag) and hence shouldn't be used
-              any more for new drivers.
-            </para></listitem>
-          </itemizedlist>
-        </para>
-      </para>
-!Edrivers/gpu/drm/drm_ioctl.c
-    </sect2>
-  </sect1>
-  <sect1>
-    <title>Legacy Support Code</title>
-    <para>
-      The section very briefly covers some of the old legacy support code which
-      is only used by old DRM drivers which have done a so-called shadow-attach
-      to the underlying device instead of registering as a real driver. This
-      also includes some of the old generic buffer management and command
-      submission code. Do not use any of this in new and modern drivers.
-    </para>
-
-    <sect2>
-      <title>Legacy Suspend/Resume</title>
-      <para>
-        The DRM core provides some suspend/resume code, but drivers wanting full
-        suspend/resume support should provide save() and restore() functions.
-        These are called at suspend, hibernate, or resume time, and should perform
-        any state save or restore required by your device across suspend or
-        hibernate states.
-      </para>
-      <synopsis>int (*suspend) (struct drm_device *, pm_message_t state);
-  int (*resume) (struct drm_device *);</synopsis>
-      <para>
-        Those are legacy suspend and resume methods which
-        <emphasis>only</emphasis> work with the legacy shadow-attach driver
-        registration functions. New driver should use the power management
-        interface provided by their bus type (usually through
-        the struct <structname>device_driver</structname> dev_pm_ops) and set
-        these methods to NULL.
-      </para>
-    </sect2>
-
-    <sect2>
-      <title>Legacy DMA Services</title>
-      <para>
-        This should cover how DMA mapping etc. is supported by the core.
-        These functions are deprecated and should not be used.
-      </para>
-    </sect2>
-  </sect1>
-  </chapter>
-
-<!-- TODO
-
-- Add a glossary
-- Document the struct_mutex catch-all lock
-- Document connector properties
-
-- Why is the load method optional?
-- What are drivers supposed to set the initial display state to, and how?
-  Connector's DPMS states are not initialized and are thus equal to
-  DRM_MODE_DPMS_ON. The fbcon compatibility layer calls
-  drm_helper_disable_unused_functions(), which disables unused encoders and
-  CRTCs, but doesn't touch the connectors' DPMS state, and
-  drm_helper_connector_dpms() in reaction to fbdev blanking events. Do drivers
-  that don't implement (or just don't use) fbcon compatibility need to call
-  those functions themselves?
-- KMS drivers must call drm_vblank_pre_modeset() and drm_vblank_post_modeset()
-  around mode setting. Should this be done in the DRM core?
-- vblank_disable_allowed is set to 1 in the first drm_vblank_post_modeset()
-  call and never set back to 0. It seems to be safe to permanently set it to 1
-  in drm_vblank_init() for KMS driver, and it might be safe for UMS drivers as
-  well. This should be investigated.
-- crtc and connector .save and .restore operations are only used internally in
-  drivers, should they be removed from the core?
-- encoder mid-layer .save and .restore operations are only used internally in
-  drivers, should they be removed from the core?
-- encoder mid-layer .detect operation is only used internally in drivers,
-  should it be removed from the core?
--->
-
-  <!-- External interfaces -->
-
-  <chapter id="drmExternals">
-    <title>Userland interfaces</title>
-    <para>
-      The DRM core exports several interfaces to applications,
-      generally intended to be used through corresponding libdrm
-      wrapper functions.  In addition, drivers export device-specific
-      interfaces for use by userspace drivers &amp; device-aware
-      applications through ioctls and sysfs files.
-    </para>
-    <para>
-      External interfaces include: memory mapping, context management,
-      DMA operations, AGP management, vblank control, fence
-      management, memory management, and output management.
-    </para>
-    <para>
-      Cover generic ioctls and sysfs layout here.  We only need high-level
-      info, since man pages should cover the rest.
-    </para>
-
-  <!-- External: render nodes -->
-
-    <sect1>
-      <title>Render nodes</title>
-      <para>
-        DRM core provides multiple character-devices for user-space to use.
-        Depending on which device is opened, user-space can perform a different
-        set of operations (mainly ioctls). The primary node is always created
-        and called card&lt;num&gt;. Additionally, a currently
-        unused control node, called controlD&lt;num&gt; is also
-        created. The primary node provides all legacy operations and
-        historically was the only interface used by userspace. With KMS, the
-        control node was introduced. However, the planned KMS control interface
-        has never been written and so the control node stays unused to date.
-      </para>
-      <para>
-        With the increased use of offscreen renderers and GPGPU applications,
-        clients no longer require running compositors or graphics servers to
-        make use of a GPU. But the DRM API required unprivileged clients to
-        authenticate to a DRM-Master prior to getting GPU access. To avoid this
-        step and to grant clients GPU access without authenticating, render
-        nodes were introduced. Render nodes solely serve render clients, that
-        is, no modesetting or privileged ioctls can be issued on render nodes.
-        Only non-global rendering commands are allowed. If a driver supports
-        render nodes, it must advertise it via the DRIVER_RENDER
-        DRM driver capability. If not supported, the primary node must be used
-        for render clients together with the legacy drmAuth authentication
-        procedure.
-      </para>
-      <para>
-        If a driver advertises render node support, DRM core will create a
-        separate render node called renderD&lt;num&gt;. There will
-        be one render node per device. No ioctls except  PRIME-related ioctls
-        will be allowed on this node. Especially GEM_OPEN will be
-        explicitly prohibited. Render nodes are designed to avoid the
-        buffer-leaks, which occur if clients guess the flink names or mmap
-        offsets on the legacy interface. Additionally to this basic interface,
-        drivers must mark their driver-dependent render-only ioctls as
-        DRM_RENDER_ALLOW so render clients can use them. Driver
-        authors must be careful not to allow any privileged ioctls on render
-        nodes.
-      </para>
-      <para>
-        With render nodes, user-space can now control access to the render node
-        via basic file-system access-modes. A running graphics server which
-        authenticates clients on the privileged primary/legacy node is no longer
-        required. Instead, a client can open the render node and is immediately
-        granted GPU access. Communication between clients (or servers) is done
-        via PRIME. FLINK from render node to legacy node is not supported. New
-        clients must not use the insecure FLINK interface.
-      </para>
-      <para>
-        Besides dropping all modeset/global ioctls, render nodes also drop the
-        DRM-Master concept. There is no reason to associate render clients with
-        a DRM-Master as they are independent of any graphics server. Besides,
-        they must work without any running master, anyway.
-        Drivers must be able to run without a master object if they support
-        render nodes. If, on the other hand, a driver requires shared state
-        between clients which is visible to user-space and accessible beyond
-        open-file boundaries, they cannot support render nodes.
-      </para>
-    </sect1>
-
-  <!-- External: vblank handling -->
-
-    <sect1>
-      <title>VBlank event handling</title>
-      <para>
-        The DRM core exposes two vertical blank related ioctls:
-        <variablelist>
-          <varlistentry>
-            <term>DRM_IOCTL_WAIT_VBLANK</term>
-            <listitem>
-              <para>
-                This takes a struct drm_wait_vblank structure as its argument,
-                and it is used to block or request a signal when a specified
-                vblank event occurs.
-              </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>DRM_IOCTL_MODESET_CTL</term>
-            <listitem>
-              <para>
-                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>
-      </para>
-    </sect1>
-
-  </chapter>
-</part>
-<part id="drmDrivers">
-  <title>DRM Drivers</title>
-
-  <partintro>
-    <para>
-      This second part of the GPU Driver Developer's Guide documents driver
-      code, implementation details and also all the driver-specific userspace
-      interfaces. Especially since all hardware-acceleration interfaces to
-      userspace are driver specific for efficiency and other reasons these
-      interfaces can be rather substantial. Hence every driver has its own
-      chapter.
-    </para>
-  </partintro>
-
-  <chapter id="drmI915">
-    <title>drm/i915 Intel GFX Driver</title>
-    <para>
-      The drm/i915 driver supports all (with the exception of some very early
-      models) integrated GFX chipsets with both Intel display and rendering
-      blocks. This excludes a set of SoC platforms with an SGX rendering unit,
-      those have basic support through the gma500 drm driver.
-    </para>
-    <sect1>
-      <title>Core Driver Infrastructure</title>
-      <para>
-        This section covers core driver infrastructure used by both the display
-        and the GEM parts of the driver.
-      </para>
-      <sect2>
-        <title>Runtime Power Management</title>
-!Pdrivers/gpu/drm/i915/intel_runtime_pm.c runtime pm
-!Idrivers/gpu/drm/i915/intel_runtime_pm.c
-!Idrivers/gpu/drm/i915/intel_uncore.c
-      </sect2>
-      <sect2>
-        <title>Interrupt Handling</title>
-!Pdrivers/gpu/drm/i915/i915_irq.c interrupt handling
-!Fdrivers/gpu/drm/i915/i915_irq.c intel_irq_init intel_irq_init_hw intel_hpd_init
-!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_disable_interrupts
-!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_enable_interrupts
-      </sect2>
-      <sect2>
-        <title>Intel GVT-g Guest Support(vGPU)</title>
-!Pdrivers/gpu/drm/i915/i915_vgpu.c Intel GVT-g guest support
-!Idrivers/gpu/drm/i915/i915_vgpu.c
-      </sect2>
-    </sect1>
-    <sect1>
-      <title>Display Hardware Handling</title>
-      <para>
-        This section covers everything related to the display hardware including
-        the mode setting infrastructure, plane, sprite and cursor handling and
-        display, output probing and related topics.
-      </para>
-      <sect2>
-        <title>Mode Setting Infrastructure</title>
-        <para>
-          The i915 driver is thus far the only DRM driver which doesn't use the
-          common DRM helper code to implement mode setting sequences. Thus it
-          has its own tailor-made infrastructure for executing a display
-          configuration change.
-        </para>
-      </sect2>
-      <sect2>
-        <title>Frontbuffer Tracking</title>
-!Pdrivers/gpu/drm/i915/intel_frontbuffer.c frontbuffer tracking
-!Idrivers/gpu/drm/i915/intel_frontbuffer.c
-!Fdrivers/gpu/drm/i915/i915_gem.c i915_gem_track_fb
-      </sect2>
-      <sect2>
-        <title>Display FIFO Underrun Reporting</title>
-!Pdrivers/gpu/drm/i915/intel_fifo_underrun.c fifo underrun handling
-!Idrivers/gpu/drm/i915/intel_fifo_underrun.c
-      </sect2>
-      <sect2>
-        <title>Plane Configuration</title>
-        <para>
-          This section covers plane configuration and composition with the
-          primary plane, sprites, cursors and overlays. This includes the
-          infrastructure to do atomic vsync'ed updates of all this state and
-          also tightly coupled topics like watermark setup and computation,
-          framebuffer compression and panel self refresh.
-        </para>
-      </sect2>
-      <sect2>
-        <title>Atomic Plane Helpers</title>
-!Pdrivers/gpu/drm/i915/intel_atomic_plane.c atomic plane helpers
-!Idrivers/gpu/drm/i915/intel_atomic_plane.c
-      </sect2>
-      <sect2>
-        <title>Output Probing</title>
-        <para>
-          This section covers output probing and related infrastructure like the
-          hotplug interrupt storm detection and mitigation code. Note that the
-          i915 driver still uses most of the common DRM helper code for output
-          probing, so those sections fully apply.
-        </para>
-      </sect2>
-      <sect2>
-        <title>Hotplug</title>
-!Pdrivers/gpu/drm/i915/intel_hotplug.c Hotplug
-!Idrivers/gpu/drm/i915/intel_hotplug.c
-      </sect2>
-      <sect2>
-        <title>High Definition Audio</title>
-!Pdrivers/gpu/drm/i915/intel_audio.c High Definition Audio over HDMI and Display Port
-!Idrivers/gpu/drm/i915/intel_audio.c
-!Iinclude/drm/i915_component.h
-      </sect2>
-      <sect2>
-        <title>Panel Self Refresh PSR (PSR/SRD)</title>
-!Pdrivers/gpu/drm/i915/intel_psr.c Panel Self Refresh (PSR/SRD)
-!Idrivers/gpu/drm/i915/intel_psr.c
-      </sect2>
-      <sect2>
-        <title>Frame Buffer Compression (FBC)</title>
-!Pdrivers/gpu/drm/i915/intel_fbc.c Frame Buffer Compression (FBC)
-!Idrivers/gpu/drm/i915/intel_fbc.c
-      </sect2>
-      <sect2>
-        <title>Display Refresh Rate Switching (DRRS)</title>
-!Pdrivers/gpu/drm/i915/intel_dp.c Display Refresh Rate Switching (DRRS)
-!Fdrivers/gpu/drm/i915/intel_dp.c intel_dp_set_drrs_state
-!Fdrivers/gpu/drm/i915/intel_dp.c intel_edp_drrs_enable
-!Fdrivers/gpu/drm/i915/intel_dp.c intel_edp_drrs_disable
-!Fdrivers/gpu/drm/i915/intel_dp.c intel_edp_drrs_invalidate
-!Fdrivers/gpu/drm/i915/intel_dp.c intel_edp_drrs_flush
-!Fdrivers/gpu/drm/i915/intel_dp.c intel_dp_drrs_init
-
-      </sect2>
-      <sect2>
-        <title>DPIO</title>
-!Pdrivers/gpu/drm/i915/i915_reg.h DPIO
-      </sect2>
-
-      <sect2>
-       <title>CSR firmware support for DMC</title>
-!Pdrivers/gpu/drm/i915/intel_csr.c csr support for dmc
-!Idrivers/gpu/drm/i915/intel_csr.c
-      </sect2>
-      <sect2>
-        <title>Video BIOS Table (VBT)</title>
-!Pdrivers/gpu/drm/i915/intel_bios.c Video BIOS Table (VBT)
-!Idrivers/gpu/drm/i915/intel_bios.c
-!Idrivers/gpu/drm/i915/intel_vbt_defs.h
-      </sect2>
-    </sect1>
-
-    <sect1>
-      <title>Memory Management and Command Submission</title>
-      <para>
-        This sections covers all things related to the GEM implementation in the
-        i915 driver.
-      </para>
-      <sect2>
-        <title>Batchbuffer Parsing</title>
-!Pdrivers/gpu/drm/i915/i915_cmd_parser.c batch buffer command parser
-!Idrivers/gpu/drm/i915/i915_cmd_parser.c
-      </sect2>
-      <sect2>
-        <title>Batchbuffer Pools</title>
-!Pdrivers/gpu/drm/i915/i915_gem_batch_pool.c batch pool
-!Idrivers/gpu/drm/i915/i915_gem_batch_pool.c
-      </sect2>
-      <sect2>
-        <title>Logical Rings, Logical Ring Contexts and Execlists</title>
-!Pdrivers/gpu/drm/i915/intel_lrc.c Logical Rings, Logical Ring Contexts and Execlists
-!Idrivers/gpu/drm/i915/intel_lrc.c
-      </sect2>
-      <sect2>
-        <title>Global GTT views</title>
-!Pdrivers/gpu/drm/i915/i915_gem_gtt.c Global GTT views
-!Idrivers/gpu/drm/i915/i915_gem_gtt.c
-      </sect2>
-      <sect2>
-        <title>GTT Fences and Swizzling</title>
-!Idrivers/gpu/drm/i915/i915_gem_fence.c
-        <sect3>
-          <title>Global GTT Fence Handling</title>
-!Pdrivers/gpu/drm/i915/i915_gem_fence.c fence register handling
-        </sect3>
-        <sect3>
-          <title>Hardware Tiling and Swizzling Details</title>
-!Pdrivers/gpu/drm/i915/i915_gem_fence.c tiling swizzling details
-        </sect3>
-      </sect2>
-      <sect2>
-        <title>Object Tiling IOCTLs</title>
-!Idrivers/gpu/drm/i915/i915_gem_tiling.c
-!Pdrivers/gpu/drm/i915/i915_gem_tiling.c buffer object tiling
-      </sect2>
-      <sect2>
-        <title>Buffer Object Eviction</title>
-        <para>
-          This section documents the interface functions for evicting buffer
-          objects to make space available in the virtual gpu address spaces.
-          Note that this is mostly orthogonal to shrinking buffer objects
-          caches, which has the goal to make main memory (shared with the gpu
-          through the unified memory architecture) available.
-        </para>
-!Idrivers/gpu/drm/i915/i915_gem_evict.c
-      </sect2>
-      <sect2>
-        <title>Buffer Object Memory Shrinking</title>
-        <para>
-          This section documents the interface function for shrinking memory
-          usage of buffer object caches. Shrinking is used to make main memory
-          available.  Note that this is mostly orthogonal to evicting buffer
-          objects, which has the goal to make space in gpu virtual address
-          spaces.
-        </para>
-!Idrivers/gpu/drm/i915/i915_gem_shrinker.c
-      </sect2>
-    </sect1>
-    <sect1>
-      <title>GuC</title>
-      <sect2>
-        <title>GuC-specific firmware loader</title>
-!Pdrivers/gpu/drm/i915/intel_guc_loader.c GuC-specific firmware loader
-!Idrivers/gpu/drm/i915/intel_guc_loader.c
-      </sect2>
-      <sect2>
-        <title>GuC-based command submission</title>
-!Pdrivers/gpu/drm/i915/i915_guc_submission.c GuC-based command submission
-!Idrivers/gpu/drm/i915/i915_guc_submission.c
-      </sect2>
-      <sect2>
-        <title>GuC Firmware Layout</title>
-!Pdrivers/gpu/drm/i915/intel_guc_fwif.h GuC Firmware Layout
-      </sect2>
-    </sect1>
-
-    <sect1>
-      <title> Tracing </title>
-      <para>
-    This sections covers all things related to the tracepoints implemented in
-    the i915 driver.
-      </para>
-      <sect2>
-        <title> i915_ppgtt_create and i915_ppgtt_release </title>
-!Pdrivers/gpu/drm/i915/i915_trace.h i915_ppgtt_create and i915_ppgtt_release tracepoints
-      </sect2>
-      <sect2>
-        <title> i915_context_create and i915_context_free </title>
-!Pdrivers/gpu/drm/i915/i915_trace.h i915_context_create and i915_context_free tracepoints
-      </sect2>
-      <sect2>
-        <title> switch_mm </title>
-!Pdrivers/gpu/drm/i915/i915_trace.h switch_mm tracepoint
-      </sect2>
-    </sect1>
-
-  </chapter>
-!Cdrivers/gpu/drm/i915/i915_irq.c
-</part>
-
-<part id="vga_switcheroo">
-  <title>vga_switcheroo</title>
-  <partintro>
-!Pdrivers/gpu/vga/vga_switcheroo.c Overview
-  </partintro>
-
-  <chapter id="modes_of_use">
-    <title>Modes of Use</title>
-    <sect1>
-      <title>Manual switching and manual power control</title>
-!Pdrivers/gpu/vga/vga_switcheroo.c Manual switching and manual power control
-    </sect1>
-    <sect1>
-      <title>Driver power control</title>
-!Pdrivers/gpu/vga/vga_switcheroo.c Driver power control
-    </sect1>
-  </chapter>
-
-  <chapter id="api">
-    <title>API</title>
-    <sect1>
-      <title>Public functions</title>
-!Edrivers/gpu/vga/vga_switcheroo.c
-    </sect1>
-    <sect1>
-      <title>Public structures</title>
-!Finclude/linux/vga_switcheroo.h vga_switcheroo_handler
-!Finclude/linux/vga_switcheroo.h vga_switcheroo_client_ops
-    </sect1>
-    <sect1>
-      <title>Public constants</title>
-!Finclude/linux/vga_switcheroo.h vga_switcheroo_handler_flags_t
-!Finclude/linux/vga_switcheroo.h vga_switcheroo_client_id
-!Finclude/linux/vga_switcheroo.h vga_switcheroo_state
-    </sect1>
-    <sect1>
-      <title>Private structures</title>
-!Fdrivers/gpu/vga/vga_switcheroo.c vgasr_priv
-!Fdrivers/gpu/vga/vga_switcheroo.c vga_switcheroo_client
-    </sect1>
-  </chapter>
-
-  <chapter id="handlers">
-    <title>Handlers</title>
-    <sect1>
-      <title>apple-gmux Handler</title>
-!Pdrivers/platform/x86/apple-gmux.c Overview
-!Pdrivers/platform/x86/apple-gmux.c Interrupt
-      <sect2>
-        <title>Graphics mux</title>
-!Pdrivers/platform/x86/apple-gmux.c Graphics mux
-      </sect2>
-      <sect2>
-        <title>Power control</title>
-!Pdrivers/platform/x86/apple-gmux.c Power control
-      </sect2>
-      <sect2>
-        <title>Backlight control</title>
-!Pdrivers/platform/x86/apple-gmux.c Backlight control
-      </sect2>
-      <sect2>
-        <title>Public functions</title>
-!Iinclude/linux/apple-gmux.h
-      </sect2>
-    </sect1>
-  </chapter>
-
-!Cdrivers/gpu/vga/vga_switcheroo.c
-!Cinclude/linux/vga_switcheroo.h
-!Cdrivers/platform/x86/apple-gmux.c
-</part>
-
-</book>
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
new file mode 100644
index 000000000000..addf32309bc3
--- /dev/null
+++ b/Documentation/Makefile.sphinx
@@ -0,0 +1,63 @@
+# -*- makefile -*-
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXBUILD   = sphinx-build
+SPHINXOPTS    =
+PAPER         =
+BUILDDIR      = $(obj)/output
+
+# User-friendly check for sphinx-build
+HAVE_SPHINX := $(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi)
+
+ifeq ($(HAVE_SPHINX),0)
+
+.DEFAULT:
+        $(warning The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed and in PATH, or set the SPHINXBUILD make variable to point to the full path of the '$(SPHINXBUILD)' executable.)
+        @echo "  SKIP    Sphinx $@ target."
+
+else # HAVE_SPHINX
+
+# User-friendly check for rst2pdf
+HAVE_RST2PDF := $(shell if python -c "import rst2pdf" >/dev/null 2>&1; then echo 1; else echo 0; fi)
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+KERNELDOC       = $(srctree)/scripts/kernel-doc
+KERNELDOC_CONF  = -D kerneldoc_srctree=$(srctree) -D kerneldoc_bin=$(KERNELDOC)
+ALLSPHINXOPTS   = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(BUILDDIR)/.doctrees $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) -c $(srctree)/$(src) $(SPHINXOPTS) $(srctree)/$(src)
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+quiet_cmd_sphinx = SPHINX  $@
+      cmd_sphinx = $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
+
+htmldocs:
+        $(call cmd,sphinx,html)
+
+pdfdocs:
+ifeq ($(HAVE_RST2PDF),0)
+        $(warning The Python 'rst2pdf' module was not found. Make sure you have the module installed to produce PDF output.)
+        @echo "  SKIP    Sphinx $@ target."
+else # HAVE_RST2PDF
+        $(call cmd,sphinx,pdf)
+endif # HAVE_RST2PDF
+
+epubdocs:
+        $(call cmd,sphinx,epub)
+
+xmldocs:
+        $(call cmd,sphinx,xml)
+
+# no-ops for the Sphinx toolchain
+sgmldocs:
+psdocs:
+mandocs:
+installmandocs:
+
+cleandocs:
+        $(Q)rm -rf $(BUILDDIR)
+
+endif # HAVE_SPHINX
diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt
index c6938e50e71f..4da60b463995 100644
--- a/Documentation/arm64/silicon-errata.txt
+++ b/Documentation/arm64/silicon-errata.txt
@@ -56,6 +56,7 @@ stable kernels.
 | ARM            | MMU-500         | #841119,#826419 | N/A                     |
 |                |                 |                 |                         |
 | Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375    |
+| Cavium         | ThunderX ITS    | #23144          | CAVIUM_ERRATUM_23144    |
 | Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154    |
 | Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456    |
 | Cavium         | ThunderX SMMUv2 | #27704          | N/A                     |
diff --git a/Documentation/conf.py b/Documentation/conf.py
new file mode 100644
index 000000000000..6cc41a0555a3
--- /dev/null
+++ b/Documentation/conf.py
@@ -0,0 +1,414 @@
+# -*- coding: utf-8 -*-
+#
+# The Linux Kernel documentation build configuration file, created by
+# sphinx-quickstart on Fri Feb 12 13:51:46 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('sphinx'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = ['kernel-doc']
+
+# Gracefully handle missing rst2pdf.
+try:
+    import rst2pdf
+    extensions += ['rst2pdf.pdfbuilder']
+except ImportError:
+    pass
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'The Linux Kernel'
+copyright = '2016, The kernel development community'
+author = 'The kernel development community'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# In a normal build, version and release are are set to KERNELVERSION and
+# KERNELRELEASE, respectively, from the Makefile via Sphinx command line
+# arguments.
+#
+# The following code tries to extract the information by reading the Makefile,
+# when Sphinx is run directly (e.g. by Read the Docs).
+try:
+    makefile_version = None
+    makefile_patchlevel = None
+    for line in open('../Makefile'):
+        key, val = [x.strip() for x in line.split('=', 2)]
+        if key == 'VERSION':
+            makefile_version = val
+        elif key == 'PATCHLEVEL':
+            makefile_patchlevel = val
+        if makefile_version and makefile_patchlevel:
+            break
+except:
+    pass
+finally:
+    if makefile_version and makefile_patchlevel:
+        version = release = makefile_version + '.' + makefile_patchlevel
+    else:
+        sys.stderr.write('Warning: Could not extract kernel version\n')
+        version = release = "unknown version"
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['output']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+primary_domain = 'C'
+highlight_language = 'C'
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+
+# The Read the Docs theme is available from
+# - https://github.com/snide/sphinx_rtd_theme
+# - https://pypi.python.org/pypi/sphinx_rtd_theme
+# - python-sphinx-rtd-theme package (on Debian)
+try:
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+except ImportError:
+    sys.stderr.write('Warning: The Sphinx \'sphinx_rtd_theme\' HTML theme was not found. Make sure you have the theme installed to produce pretty HTML output. Falling back to the default theme.\n')
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+#html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'TheLinuxKerneldoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'TheLinuxKernel.tex', 'The Linux Kernel Documentation',
+     'The kernel development community', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'thelinuxkernel', 'The Linux Kernel Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'TheLinuxKernel', 'The Linux Kernel Documentation',
+     author, 'TheLinuxKernel', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+
+# -- Options for Epub output ----------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+epub_author = author
+epub_publisher = author
+epub_copyright = copyright
+
+# The basename for the epub file. It defaults to the project name.
+#epub_basename = project
+
+# The HTML theme for the epub output. Since the default themes are not
+# optimized for small screen space, using the same theme for HTML and epub
+# output is usually not wise. This defaults to 'epub', a theme designed to save
+# visual space.
+#epub_theme = 'epub'
+
+# The language of the text. It defaults to the language option
+# or 'en' if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+#epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#epub_identifier = ''
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# A tuple containing the cover image and cover page html template filenames.
+#epub_cover = ()
+
+# A sequence of (type, uri, title) tuples for the guide element of content.opf.
+#epub_guide = ()
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files that should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+# The depth of the table of contents in toc.ncx.
+#epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#epub_tocdup = True
+
+# Choose between 'default' and 'includehidden'.
+#epub_tocscope = 'default'
+
+# Fix unsupported image types using the Pillow.
+#epub_fix_images = False
+
+# Scale large images.
+#epub_max_image_width = 0
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#epub_show_urls = 'inline'
+
+# If false, no index is generated.
+#epub_use_index = True
+
+#=======
+# rst2pdf
+#
+# Grouping the document tree into PDF files. List of tuples
+# (source start file, target name, title, author, options).
+#
+# See the Sphinx chapter of http://ralsina.me/static/manual.pdf
+#
+# FIXME: Do not add the index file here; the result will be too big. Adding
+# multiple PDF files here actually tries to get the cross-referencing right
+# *between* PDF files.
+pdf_documents = [
+    ('index', u'Kernel', u'Kernel', u'J. Random Bozo'),
+]
+
+# kernel-doc extension configuration for running Sphinx directly (e.g. by Read
+# the Docs). In a normal build, these are supplied from the Makefile via command
+# line arguments.
+kerneldoc_bin = '../scripts/kernel-doc'
+kerneldoc_srctree = '..'
diff --git a/Documentation/devicetree/bindings/display/arm,malidp.txt b/Documentation/devicetree/bindings/display/arm,malidp.txt
new file mode 100644
index 000000000000..2f7870983ef1
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/arm,malidp.txt
@@ -0,0 +1,65 @@
+ARM Mali-DP
+
+The following bindings apply to a family of Display Processors sold as
+licensable IP by ARM Ltd. The bindings describe the Mali DP500, DP550 and
+DP650 processors that offer multiple composition layers, support for
+rotation and scaling output.
+
+Required properties:
+  - compatible: should be one of
+        "arm,mali-dp500"
+        "arm,mali-dp550"
+        "arm,mali-dp650"
+    depending on the particular implementation present in the hardware
+  - reg: Physical base address and size of the block of registers used by
+    the processor.
+  - interrupts: Interrupt list, as defined in ../interrupt-controller/interrupts.txt,
+    interrupt client nodes.
+  - interrupt-names: name of the engine inside the processor that will
+    use the corresponding interrupt. Should be one of "DE" or "SE".
+  - clocks: A list of phandle + clock-specifier pairs, one for each entry
+    in 'clock-names'
+  - clock-names: A list of clock names. It should contain:
+      - "pclk": for the APB interface clock
+      - "aclk": for the AXI interface clock
+      - "mclk": for the main processor clock
+      - "pxlclk": for the pixel clock feeding the output PLL of the processor.
+  - arm,malidp-output-port-lines: Array of u8 values describing the number
+    of output lines per channel (R, G and B).
+
+Required sub-nodes:
+  - port: The Mali DP connection to an encoder input port. The connection
+    is modelled using the OF graph bindings specified in
+    Documentation/devicetree/bindings/graph.txt
+
+Optional properties:
+  - memory-region: phandle to a node describing memory (see
+    Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt)
+    to be used for the framebuffer; if not present, the framebuffer may
+    be located anywhere in memory.
+
+
+Example:
+
+/ {
+        ...
+
+        dp0: malidp@6f200000 {
+                compatible = "arm,mali-dp650";
+                reg = <0 0x6f200000 0 0x20000>;
+                memory-region = <&display_reserved>;
+                interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 168 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "DE", "SE";
+                clocks = <&oscclk2>, <&fpgaosc0>, <&fpgaosc1>, <&fpgaosc1>;
+                clock-names = "pxlclk", "mclk", "aclk", "pclk";
+                arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;
+                port {
+                        dp0_output: endpoint {
+                                remote-endpoint = <&tda998x_2_input>;
+                        };
+                };
+        };
+
+        ...
+};
diff --git a/Documentation/devicetree/bindings/display/bridge/sii902x.txt b/Documentation/devicetree/bindings/display/bridge/sii902x.txt
new file mode 100644
index 000000000000..56a3e68ccb80
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/sii902x.txt
@@ -0,0 +1,35 @@
+sii902x HDMI bridge bindings
+
+Required properties:
+        - compatible: "sil,sii9022"
+        - reg: i2c address of the bridge
+
+Optional properties:
+        - interrupts-extended or interrupt-parent + interrupts: describe
+          the interrupt line used to inform the host about hotplug events.
+        - reset-gpios: OF device-tree gpio specification for RST_N pin.
+
+Optional subnodes:
+        - video input: this subnode can contain a video input port node
+          to connect the bridge to a display controller output (See this
+          documentation [1]).
+
+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
+
+Example:
+        hdmi-bridge@39 {
+                compatible = "sil,sii9022";
+                reg = <0x39>;
+                reset-gpios = <&pioA 1 0>;
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                bridge_in: endpoint {
+                                        remote-endpoint = <&dc_out>;
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt b/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt
index acd5668b1ce1..508aee461e0d 100644
--- a/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt
+++ b/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt
@@ -8,6 +8,7 @@ Required properties:
 Optional properties:
 - label: a symbolic name for the connector
 - hpd-gpios: HPD GPIO number
+- ddc-i2c-bus: phandle link to the I2C controller used for DDC EDID probing
 
 Required nodes:
 - Video port for HDMI input
diff --git a/Documentation/devicetree/bindings/display/imx/ldb.txt b/Documentation/devicetree/bindings/display/imx/ldb.txt
index 0a175d991b52..a407462c885e 100644
--- a/Documentation/devicetree/bindings/display/imx/ldb.txt
+++ b/Documentation/devicetree/bindings/display/imx/ldb.txt
@@ -62,6 +62,7 @@ Required properties:
    display-timings are used instead.
 
 Optional properties (required if display-timings are used):
+ - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
  - display-timings : A node that describes the display timings as defined in
    Documentation/devicetree/bindings/display/display-timing.txt.
  - fsl,data-mapping : should be "spwg" or "jeida"
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt
new file mode 100644
index 000000000000..7b124242b0c5
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt
@@ -0,0 +1,148 @@
+Mediatek HDMI Encoder
+=====================
+
+The Mediatek HDMI encoder can generate HDMI 1.4a or MHL 2.0 signals from
+its parallel input.
+
+Required properties:
+- compatible: Should be "mediatek,<chip>-hdmi".
+- reg: Physical base address and length of the controller's registers
+- interrupts: The interrupt signal from the function block.
+- clocks: device clocks
+  See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.
+- clock-names: must contain "pixel", "pll", "bclk", and "spdif".
+- phys: phandle link to the HDMI PHY node.
+  See Documentation/devicetree/bindings/phy/phy-bindings.txt for details.
+- phy-names: must contain "hdmi"
+- mediatek,syscon-hdmi: phandle link and register offset to the system
+  configuration registers. For mt8173 this must be offset 0x900 into the
+  MMSYS_CONFIG region: <&mmsys 0x900>.
+- ports: A node containing input and output port nodes with endpoint
+  definitions as documented in Documentation/devicetree/bindings/graph.txt.
+- port@0: The input port in the ports node should be connected to a DPI output
+  port.
+- port@1: The output port in the ports node should be connected to the input
+  port of a connector node that contains a ddc-i2c-bus property, or to the
+  input port of an attached bridge chip, such as a SlimPort transmitter.
+
+HDMI CEC
+========
+
+The HDMI CEC controller handles hotplug detection and CEC communication.
+
+Required properties:
+- compatible: Should be "mediatek,<chip>-cec"
+- reg: Physical base address and length of the controller's registers
+- interrupts: The interrupt signal from the function block.
+- clocks: device clock
+
+HDMI DDC
+========
+
+The HDMI DDC i2c controller is used to interface with the HDMI DDC pins.
+The Mediatek's I2C controller is used to interface with I2C devices.
+
+Required properties:
+- compatible: Should be "mediatek,<chip>-hdmi-ddc"
+- reg: Physical base address and length of the controller's registers
+- clocks: device clock
+- clock-names: Should be "ddc-i2c".
+
+HDMI PHY
+========
+
+The HDMI PHY serializes the HDMI encoder's three channel 10-bit parallel
+output and drives the HDMI pads.
+
+Required properties:
+- compatible: "mediatek,<chip>-hdmi-phy"
+- reg: Physical base address and length of the module's registers
+- clocks: PLL reference clock
+- clock-names: must contain "pll_ref"
+- clock-output-names: must be "hdmitx_dig_cts" on mt8173
+- #phy-cells: must be <0>
+- #clock-cells: must be <0>
+
+Optional properties:
+- mediatek,ibias: TX DRV bias current for <1.65Gbps, defaults to 0xa
+- mediatek,ibias_up: TX DRV bias current for >1.65Gbps, defaults to 0x1c
+
+Example:
+
+cec: cec@10013000 {
+        compatible = "mediatek,mt8173-cec";
+        reg = <0 0x10013000 0 0xbc>;
+        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_LOW>;
+        clocks = <&infracfg CLK_INFRA_CEC>;
+};
+
+hdmi_phy: hdmi-phy@10209100 {
+        compatible = "mediatek,mt8173-hdmi-phy";
+        reg = <0 0x10209100 0 0x24>;
+        clocks = <&apmixedsys CLK_APMIXED_HDMI_REF>;
+        clock-names = "pll_ref";
+        clock-output-names = "hdmitx_dig_cts";
+        mediatek,ibias = <0xa>;
+        mediatek,ibias_up = <0x1c>;
+        #clock-cells = <0>;
+        #phy-cells = <0>;
+};
+
+hdmi_ddc0: i2c@11012000 {
+        compatible = "mediatek,mt8173-hdmi-ddc";
+        reg = <0 0x11012000 0 0x1c>;
+        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_LOW>;
+        clocks = <&pericfg CLK_PERI_I2C5>;
+        clock-names = "ddc-i2c";
+};
+
+hdmi0: hdmi@14025000 {
+        compatible = "mediatek,mt8173-hdmi";
+        reg = <0 0x14025000 0 0x400>;
+        interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_LOW>;
+        clocks = <&mmsys CLK_MM_HDMI_PIXEL>,
+                 <&mmsys CLK_MM_HDMI_PLLCK>,
+                 <&mmsys CLK_MM_HDMI_AUDIO>,
+                 <&mmsys CLK_MM_HDMI_SPDIF>;
+        clock-names = "pixel", "pll", "bclk", "spdif";
+        pinctrl-names = "default";
+        pinctrl-0 = <&hdmi_pin>;
+        phys = <&hdmi_phy>;
+        phy-names = "hdmi";
+        mediatek,syscon-hdmi = <&mmsys 0x900>;
+        assigned-clocks = <&topckgen CLK_TOP_HDMI_SEL>;
+        assigned-clock-parents = <&hdmi_phy>;
+
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                        reg = <0>;
+
+                        hdmi0_in: endpoint {
+                                remote-endpoint = <&dpi0_out>;
+                        };
+                };
+
+                port@1 {
+                        reg = <1>;
+
+                        hdmi0_out: endpoint {
+                                remote-endpoint = <&hdmi_con_in>;
+                        };
+                };
+        };
+};
+
+connector {
+        compatible = "hdmi-connector";
+        type = "a";
+        ddc-i2c-bus = <&hdmiddc0>;
+
+        port {
+                hdmi_con_in: endpoint {
+                        remote-endpoint = <&hdmi0_out>;
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/display/panel/panel-dpi.txt b/Documentation/devicetree/bindings/display/panel/panel-dpi.txt
index 216c894d4f99..b52ac52757df 100644
--- a/Documentation/devicetree/bindings/display/panel/panel-dpi.txt
+++ b/Documentation/devicetree/bindings/display/panel/panel-dpi.txt
@@ -7,6 +7,8 @@ Required properties:
 Optional properties:
 - label: a symbolic name for the panel
 - enable-gpios: panel enable gpio
+- reset-gpios: GPIO to control the RESET pin
+- vcc-supply: phandle of regulator that will be used to enable power to the display
 
 Required nodes:
 - "panel-timing" containing video timings
diff --git a/Documentation/devicetree/bindings/hwmon/ina2xx.txt b/Documentation/devicetree/bindings/hwmon/ina2xx.txt
index 9bcd5e87830d..02af0d94e921 100644
--- a/Documentation/devicetree/bindings/hwmon/ina2xx.txt
+++ b/Documentation/devicetree/bindings/hwmon/ina2xx.txt
@@ -7,6 +7,7 @@ Required properties:
         - "ti,ina220" for ina220
         - "ti,ina226" for ina226
         - "ti,ina230" for ina230
+        - "ti,ina231" for ina231
 - reg: I2C address
 
 Optional properties:
diff --git a/Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt b/Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt
index bfeabb843941..71191ff0e781 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt
@@ -44,8 +44,8 @@ Required properties:
 - our-claim-gpio: The GPIO that we use to claim the bus.
 - their-claim-gpios: The GPIOs that the other sides use to claim the bus.
   Note that some implementations may only support a single other master.
-- Standard I2C mux properties. See mux.txt in this directory.
-- Single I2C child bus node at reg 0. See mux.txt in this directory.
+- Standard I2C mux properties. See i2c-mux.txt in this directory.
+- Single I2C child bus node at reg 0. See i2c-mux.txt in this directory.
 
 Optional properties:
 - slew-delay-us: microseconds to wait for a GPIO to go high. Default is 10 us.
diff --git a/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt b/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
index 6078aefe7ed4..7ce23ac61308 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
@@ -27,7 +27,8 @@ Required properties:
 - i2c-bus-name: The name of this bus. Also needed as pinctrl-name for the I2C
                 parents.
 
-Furthermore, I2C mux properties and child nodes. See mux.txt in this directory.
+Furthermore, I2C mux properties and child nodes. See i2c-mux.txt in this
+directory.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
index 66709a825541..21da3ecbb370 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
@@ -22,8 +22,8 @@ Required properties:
 - i2c-parent: The phandle of the I2C bus that this multiplexer's master-side
   port is connected to.
 - mux-gpios: list of gpios used to control the muxer
-* Standard I2C mux properties. See mux.txt in this directory.
-* I2C child bus nodes. See mux.txt in this directory.
+* Standard I2C mux properties. See i2c-mux.txt in this directory.
+* I2C child bus nodes. See i2c-mux.txt in this directory.
 
 Optional properties:
 - idle-state: value to set the muxer to when idle. When no value is
@@ -33,7 +33,7 @@ For each i2c child node, an I2C child bus will be created. They will
 be numbered based on their order in the device tree.
 
 Whenever an access is made to a device on a child bus, the value set
-in the revelant node's reg property will be output using the list of
+in the relevant node's reg property will be output using the list of
 GPIOs, the first in the list holding the least-significant value.
 
 If an idle state is defined, using the idle-state (optional) property,
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt
index ae8af1694e95..33119a98e144 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt
@@ -28,9 +28,9 @@ Also required are:
 * Standard pinctrl properties that specify the pin mux state for each child
   bus. See ../pinctrl/pinctrl-bindings.txt.
 
-* Standard I2C mux properties. See mux.txt in this directory.
+* Standard I2C mux properties. See i2c-mux.txt in this directory.
 
-* I2C child bus nodes. See mux.txt in this directory.
+* I2C child bus nodes. See i2c-mux.txt in this directory.
 
 For each named state defined in the pinctrl-names property, an I2C child bus
 will be created. I2C child bus numbers are assigned based on the index into
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
index 688783fbe696..de00d7fc450b 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
@@ -7,8 +7,8 @@ Required properties:
 - compatible: i2c-mux-reg
 - i2c-parent: The phandle of the I2C bus that this multiplexer's master-side
   port is connected to.
-* Standard I2C mux properties. See mux.txt in this directory.
-* I2C child bus nodes. See mux.txt in this directory.
+* Standard I2C mux properties. See i2c-mux.txt in this directory.
+* I2C child bus nodes. See i2c-mux.txt in this directory.
 
 Optional properties:
 - reg: this pair of <offset size> specifies the register to control the mux.
@@ -24,7 +24,7 @@ Optional properties:
   given, it defaults to the last value used.
 
 Whenever an access is made to a device on a child bus, the value set
-in the revelant node's reg property will be output to the register.
+in the relevant node's reg property will be output to the register.
 
 If an idle state is defined, using the idle-state (optional) property,
 whenever an access is not being made to a device on a child bus, the
diff --git a/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt b/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt
index 14aa6cf58201..6a9a63cb0543 100644
--- a/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt
+++ b/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt
@@ -13,10 +13,10 @@ Optional properties:
                       initialization. This is an array of 28 values(u8).
 
   - marvell,wakeup-pin: It represents wakeup pin number of the bluetooth chip.
-                        firmware will use the pin to wakeup host system.
+                        firmware will use the pin to wakeup host system (u16).
   - marvell,wakeup-gap-ms: wakeup gap represents wakeup latency of the host
                       platform. The value will be configured to firmware. This
-                      is needed to work chip's sleep feature as expected.
+                      is needed to work chip's sleep feature as expected (u16).
   - interrupt-parent: phandle of the parent interrupt controller
   - interrupts : interrupt pin number to the cpu. Driver will request an irq based
                  on this interrupt number. During system suspend, the irq will be
@@ -50,7 +50,7 @@ calibration data is also available in below example.
                         0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02
                         0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00
                         0x00 0x00 0xf0 0x00>;
-                marvell,wakeup-pin = <0x0d>;
-                marvell,wakeup-gap-ms = <0x64>;
+                marvell,wakeup-pin = /bits/ 16 <0x0d>;
+                marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
         };
 };
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index a7440bcd67ff..2c2500df0dce 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -255,6 +255,7 @@ synology	Synology, Inc.
 SUNW    Sun Microsystems, Inc
 tbs     TBS Technologies
 tcl     Toby Churchill Ltd.
+technexion      TechNexion
 technologic     Technologic Systems
 thine   THine Electronics, Inc.
 ti      Texas Instruments
@@ -269,6 +270,7 @@ tronsmart	Tronsmart
 truly   Truly Semiconductors Limited
 tyan    Tyan Computer Corporation
 upisemi uPI Semiconductor Corp.
+uniwest United Western Technologies Corp (UniWest)
 urt     United Radiant Technology Corporation
 usi     Universal Scientific Industrial Co., Ltd.
 v3      V3 Semiconductor
diff --git a/Documentation/dmaengine/provider.txt b/Documentation/dmaengine/provider.txt
index 122b7f4876bb..91ce82d5f0c4 100644
--- a/Documentation/dmaengine/provider.txt
+++ b/Documentation/dmaengine/provider.txt
@@ -323,7 +323,7 @@ supported.
    * device_resume
      - Resumes a transfer on the channel
      - This command should operate synchronously on the channel,
-       pausing right away the work of the given channel
+       resuming right away the work of the given channel
 
    * device_terminate_all
      - Aborts all the pending and ongoing transfers on the channel
diff --git a/Documentation/filesystems/devpts.txt b/Documentation/filesystems/devpts.txt
index 30d2fcb32f72..9f94fe276dea 100644
--- a/Documentation/filesystems/devpts.txt
+++ b/Documentation/filesystems/devpts.txt
@@ -1,141 +1,26 @@
+Each mount of the devpts filesystem is now distinct such that ptys
+and their indicies allocated in one mount are independent from ptys
+and their indicies in all other mounts.
 
-To support containers, we now allow multiple instances of devpts filesystem,
-such that indices of ptys allocated in one instance are independent of indices
-allocated in other instances of devpts.
+All mounts of the devpts filesystem now create a /dev/pts/ptmx node
+with permissions 0000.
 
-To preserve backward compatibility, this support for multiple instances is
-enabled only if:
+To retain backwards compatibility the a ptmx device node (aka any node
+created with "mknod name c 5 2") when opened will look for an instance
+of devpts under the name "pts" in the same directory as the ptmx device
+node.
 
-        - CONFIG_DEVPTS_MULTIPLE_INSTANCES=y, and
-        - '-o newinstance' mount option is specified while mounting devpts
-
-IOW, devpts now supports both single-instance and multi-instance semantics.
-
-If CONFIG_DEVPTS_MULTIPLE_INSTANCES=n, there is no change in behavior and
-this referred to as the "legacy" mode. In this mode, the new mount options
-(-o newinstance and -o ptmxmode) will be ignored with a 'bogus option' message
-on console.
-
-If CONFIG_DEVPTS_MULTIPLE_INSTANCES=y and devpts is mounted without the
-'newinstance' option (as in current start-up scripts) the new mount binds
-to the initial kernel mount of devpts. This mode is referred to as the
-'single-instance' mode and the current, single-instance semantics are
-preserved, i.e PTYs are common across the system.
-
-The only difference between this single-instance mode and the legacy mode
-is the presence of new, '/dev/pts/ptmx' node with permissions 0000, which
-can safely be ignored.
-
-If CONFIG_DEVPTS_MULTIPLE_INSTANCES=y and 'newinstance' option is specified,
-the mount is considered to be in the multi-instance mode and a new instance
-of the devpts fs is created. Any ptys created in this instance are independent
-of ptys in other instances of devpts. Like in the single-instance mode, the
-/dev/pts/ptmx node is present. To effectively use the multi-instance mode,
-open of /dev/ptmx must be a redirected to '/dev/pts/ptmx' using a symlink or
-bind-mount.
-
-Eg: A container startup script could do the following:
-
-        $ chmod 0666 /dev/pts/ptmx
-        $ rm /dev/ptmx
-        $ ln -s pts/ptmx /dev/ptmx
-        $ ns_exec -cm /bin/bash
-
-        # We are now in new container
-
-        $ umount /dev/pts
-        $ mount -t devpts -o newinstance lxcpts /dev/pts
-        $ sshd -p 1234
-
-where 'ns_exec -cm /bin/bash' calls clone() with CLONE_NEWNS flag and execs
-/bin/bash in the child process.  A pty created by the sshd is not visible in
-the original mount of /dev/pts.
+As an option instead of placing a /dev/ptmx device node at /dev/ptmx
+it is possible to place a symlink to /dev/pts/ptmx at /dev/ptmx or
+to bind mount /dev/ptx/ptmx to /dev/ptmx.  If you opt for using
+the devpts filesystem in this manner devpts should be mounted with
+the ptmxmode=0666, or chmod 0666 /dev/pts/ptmx should be called.
 
 Total count of pty pairs in all instances is limited by sysctls:
 kernel.pty.max = 4096           - global limit
-kernel.pty.reserve = 1024       - reserve for initial instance
+kernel.pty.reserve = 1024       - reserved for filesystems mounted from the initial mount namespace
 kernel.pty.nr                   - current count of ptys
 
 Per-instance limit could be set by adding mount option "max=<count>".
 This feature was added in kernel 3.4 together with sysctl kernel.pty.reserve.
 In kernels older than 3.4 sysctl kernel.pty.max works as per-instance limit.
-
-User-space changes
-------------------
-
-In multi-instance mode (i.e '-o newinstance' mount option is specified at least
-once), following user-space issues should be noted.
-
-1. If -o newinstance mount option is never used, /dev/pts/ptmx can be ignored
-   and no change is needed to system-startup scripts.
-
-2. To effectively use multi-instance mode (i.e -o newinstance is specified)
-   administrators or startup scripts should "redirect" open of /dev/ptmx to
-   /dev/pts/ptmx using either a bind mount or symlink.
-
-        $ mount -t devpts -o newinstance devpts /dev/pts
-
-   followed by either
-
-        $ rm /dev/ptmx
-        $ ln -s pts/ptmx /dev/ptmx
-        $ chmod 666 /dev/pts/ptmx
-   or
-        $ mount -o bind /dev/pts/ptmx /dev/ptmx
-
-3. The '/dev/ptmx -> pts/ptmx' symlink is the preferred method since it
-   enables better error-reporting and treats both single-instance and
-   multi-instance mounts similarly.
-
-   But this method requires that system-startup scripts set the mode of
-   /dev/pts/ptmx correctly (default mode is 0000). The scripts can set the
-   mode by, either
-
-        - adding ptmxmode mount option to devpts entry in /etc/fstab, or
-        - using 'chmod 0666 /dev/pts/ptmx'
-
-4. If multi-instance mode mount is needed for containers, but the system
-   startup scripts have not yet been updated, container-startup scripts
-   should bind mount /dev/ptmx to /dev/pts/ptmx to avoid breaking single-
-   instance mounts.
-
-   Or, in general, container-startup scripts should use:
-
-        mount -t devpts -o newinstance -o ptmxmode=0666 devpts /dev/pts
-        if [ ! -L /dev/ptmx ]; then
-                mount -o bind /dev/pts/ptmx /dev/ptmx
-        fi
-
-   When all devpts mounts are multi-instance, /dev/ptmx can permanently be
-   a symlink to pts/ptmx and the bind mount can be ignored.
-
-5. A multi-instance mount that is not accompanied by the /dev/ptmx to
-   /dev/pts/ptmx redirection would result in an unusable/unreachable pty.
-
-        mount -t devpts -o newinstance lxcpts /dev/pts
-
-   immediately followed by:
-
-        open("/dev/ptmx")
-
-    would create a pty, say /dev/pts/7, in the initial kernel mount.
-    But /dev/pts/7 would be invisible in the new mount.
-
-6. The permissions for /dev/pts/ptmx node should be specified when mounting
-   /dev/pts, using the '-o ptmxmode=%o' mount option (default is 0000).
-
-        mount -t devpts -o newinstance -o ptmxmode=0644 devpts /dev/pts
-
-   The permissions can be later be changed as usual with 'chmod'.
-
-        chmod 666 /dev/pts/ptmx
-
-7. A mount of devpts without the 'newinstance' option results in binding to
-   initial kernel mount.  This behavior while preserving legacy semantics,
-   does not provide strict isolation in a container environment. i.e by
-   mounting devpts without the 'newinstance' option, a container could
-   get visibility into the 'host' or root container's devpts.
-   
-   To workaround this and have strict isolation, all mounts of devpts,
-   including the mount in the root container, should use the newinstance
-   option.
diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
new file mode 100644
index 000000000000..4f7176576feb
--- /dev/null
+++ b/Documentation/gpu/drm-internals.rst
@@ -0,0 +1,378 @@
+=============
+DRM Internals
+=============
+
+This chapter documents DRM internals relevant to driver authors and
+developers working to add support for the latest features to existing
+drivers.
+
+First, we go over some typical driver initialization requirements, like
+setting up command buffers, creating an initial output configuration,
+and initializing core services. Subsequent sections cover core internals
+in more detail, providing implementation notes and examples.
+
+The DRM layer provides several services to graphics drivers, many of
+them driven by the application interfaces it provides through libdrm,
+the library that wraps most of the DRM ioctls. These include vblank
+event handling, memory management, output management, framebuffer
+management, command submission & fencing, suspend/resume support, and
+DMA services.
+
+Driver Initialization
+=====================
+
+At the core of every DRM driver is a :c:type:`struct drm_driver
+<drm_driver>` structure. Drivers typically statically initialize
+a drm_driver structure, and then pass it to
+:c:func:`drm_dev_alloc()` to allocate a device instance. After the
+device instance is fully initialized it can be registered (which makes
+it accessible from userspace) using :c:func:`drm_dev_register()`.
+
+The :c:type:`struct drm_driver <drm_driver>` structure
+contains static information that describes the driver and features it
+supports, and pointers to methods that the DRM core will call to
+implement the DRM API. We will first go through the :c:type:`struct
+drm_driver <drm_driver>` static information fields, and will
+then describe individual operations in details as they get used in later
+sections.
+
+Driver Information
+------------------
+
+Driver Features
+~~~~~~~~~~~~~~~
+
+Drivers inform the DRM core about their requirements and supported
+features by setting appropriate flags in the driver_features field.
+Since those flags influence the DRM core behaviour since registration
+time, most of them must be set to registering the :c:type:`struct
+drm_driver <drm_driver>` instance.
+
+u32 driver_features;
+
+DRIVER_USE_AGP
+    Driver uses AGP interface, the DRM core will manage AGP resources.
+
+DRIVER_REQUIRE_AGP
+    Driver needs AGP interface to function. AGP initialization failure
+    will become a fatal error.
+
+DRIVER_PCI_DMA
+    Driver is capable of PCI DMA, mapping of PCI DMA buffers to
+    userspace will be enabled. Deprecated.
+
+DRIVER_SG
+    Driver can perform scatter/gather DMA, allocation and mapping of
+    scatter/gather buffers will be enabled. Deprecated.
+
+DRIVER_HAVE_DMA
+    Driver supports DMA, the userspace DMA API will be supported.
+    Deprecated.
+
+DRIVER_HAVE_IRQ; DRIVER_IRQ_SHARED
+    DRIVER_HAVE_IRQ indicates whether the driver has an IRQ handler
+    managed by the DRM Core. The core will support simple IRQ handler
+    installation when the flag is set. The installation process is
+    described in ?.
+
+    DRIVER_IRQ_SHARED indicates whether the device & handler support
+    shared IRQs (note that this is required of PCI drivers).
+
+DRIVER_GEM
+    Driver use the GEM memory manager.
+
+DRIVER_MODESET
+    Driver supports mode setting interfaces (KMS).
+
+DRIVER_PRIME
+    Driver implements DRM PRIME buffer sharing.
+
+DRIVER_RENDER
+    Driver supports dedicated render nodes.
+
+DRIVER_ATOMIC
+    Driver supports atomic properties. In this case the driver must
+    implement appropriate obj->atomic_get_property() vfuncs for any
+    modeset objects with driver specific properties.
+
+Major, Minor and Patchlevel
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+int major; int minor; int patchlevel;
+The DRM core identifies driver versions by a major, minor and patch
+level triplet. The information is printed to the kernel log at
+initialization time and passed to userspace through the
+DRM_IOCTL_VERSION ioctl.
+
+The major and minor numbers are also used to verify the requested driver
+API version passed to DRM_IOCTL_SET_VERSION. When the driver API
+changes between minor versions, applications can call
+DRM_IOCTL_SET_VERSION to select a specific version of the API. If the
+requested major isn't equal to the driver major, or the requested minor
+is larger than the driver minor, the DRM_IOCTL_SET_VERSION call will
+return an error. Otherwise the driver's set_version() method will be
+called with the requested version.
+
+Name, Description and Date
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+char \*name; char \*desc; char \*date;
+The driver name is printed to the kernel log at initialization time,
+used for IRQ registration and passed to userspace through
+DRM_IOCTL_VERSION.
+
+The driver description is a purely informative string passed to
+userspace through the DRM_IOCTL_VERSION ioctl and otherwise unused by
+the kernel.
+
+The driver date, formatted as YYYYMMDD, is meant to identify the date of
+the latest modification to the driver. However, as most drivers fail to
+update it, its value is mostly useless. The DRM core prints it to the
+kernel log at initialization time and passes it to userspace through the
+DRM_IOCTL_VERSION ioctl.
+
+Device Instance and Driver Handling
+-----------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_drv.c
+   :doc: driver instance overview
+
+.. kernel-doc:: drivers/gpu/drm/drm_drv.c
+   :export:
+
+Driver Load
+-----------
+
+IRQ Registration
+~~~~~~~~~~~~~~~~
+
+The DRM core tries to facilitate IRQ handler registration and
+unregistration by providing :c:func:`drm_irq_install()` and
+:c:func:`drm_irq_uninstall()` functions. Those functions only
+support a single interrupt per device, devices that use more than one
+IRQs need to be handled manually.
+
+Managed IRQ Registration
+''''''''''''''''''''''''
+
+:c:func:`drm_irq_install()` starts by calling the irq_preinstall
+driver operation. The operation is optional and must make sure that the
+interrupt will not get fired by clearing all pending interrupt flags or
+disabling the interrupt.
+
+The passed-in IRQ will then be requested by a call to
+:c:func:`request_irq()`. If the DRIVER_IRQ_SHARED driver feature
+flag is set, a shared (IRQF_SHARED) IRQ handler will be requested.
+
+The IRQ handler function must be provided as the mandatory irq_handler
+driver operation. It will get passed directly to
+:c:func:`request_irq()` and thus has the same prototype as all IRQ
+handlers. It will get called with a pointer to the DRM device as the
+second argument.
+
+Finally the function calls the optional irq_postinstall driver
+operation. The operation usually enables interrupts (excluding the
+vblank interrupt, which is enabled separately), but drivers may choose
+to enable/disable interrupts at a different time.
+
+:c:func:`drm_irq_uninstall()` is similarly used to uninstall an
+IRQ handler. It starts by waking up all processes waiting on a vblank
+interrupt to make sure they don't hang, and then calls the optional
+irq_uninstall driver operation. The operation must disable all hardware
+interrupts. Finally the function frees the IRQ by calling
+:c:func:`free_irq()`.
+
+Manual IRQ Registration
+'''''''''''''''''''''''
+
+Drivers that require multiple interrupt handlers can't use the managed
+IRQ registration functions. In that case IRQs must be registered and
+unregistered manually (usually with the :c:func:`request_irq()` and
+:c:func:`free_irq()` functions, or their devm_\* equivalent).
+
+When manually registering IRQs, drivers must not set the
+DRIVER_HAVE_IRQ driver feature flag, and must not provide the
+irq_handler driver operation. They must set the :c:type:`struct
+drm_device <drm_device>` irq_enabled field to 1 upon
+registration of the IRQs, and clear it to 0 after unregistering the
+IRQs.
+
+Memory Manager Initialization
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Every DRM driver requires a memory manager which must be initialized at
+load time. DRM currently contains two memory managers, the Translation
+Table Manager (TTM) and the Graphics Execution Manager (GEM). This
+document describes the use of the GEM memory manager only. See ? for
+details.
+
+Miscellaneous Device Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Another task that may be necessary for PCI devices during configuration
+is mapping the video BIOS. On many devices, the VBIOS describes device
+configuration, LCD panel timings (if any), and contains flags indicating
+device state. Mapping the BIOS can be done using the pci_map_rom()
+call, a convenience function that takes care of mapping the actual ROM,
+whether it has been shadowed into memory (typically at address 0xc0000)
+or exists on the PCI device in the ROM BAR. Note that after the ROM has
+been mapped and any necessary information has been extracted, it should
+be unmapped; on many devices, the ROM address decoder is shared with
+other BARs, so leaving it mapped could cause undesired behaviour like
+hangs or memory corruption.
+
+Bus-specific Device Registration and PCI Support
+------------------------------------------------
+
+A number of functions are provided to help with device registration. The
+functions deal with PCI and platform devices respectively and are only
+provided for historical reasons. These are all deprecated and shouldn't
+be used in new drivers. Besides that there's a few helpers for pci
+drivers.
+
+.. kernel-doc:: drivers/gpu/drm/drm_pci.c
+   :export:
+
+.. kernel-doc:: drivers/gpu/drm/drm_platform.c
+   :export:
+
+Open/Close, File Operations and IOCTLs
+======================================
+
+Open and Close
+--------------
+
+int (\*firstopen) (struct drm_device \*); void (\*lastclose) (struct
+drm_device \*); int (\*open) (struct drm_device \*, struct drm_file
+\*); void (\*preclose) (struct drm_device \*, struct drm_file \*);
+void (\*postclose) (struct drm_device \*, struct drm_file \*);
+    Open and close handlers. None of those methods are mandatory.
+
+The firstopen method is called by the DRM core for legacy UMS (User Mode
+Setting) drivers only when an application opens a device that has no
+other opened file handle. UMS drivers can implement it to acquire device
+resources. KMS drivers can't use the method and must acquire resources
+in the load method instead.
+
+Similarly the lastclose method is called when the last application
+holding a file handle opened on the device closes it, for both UMS and
+KMS drivers. Additionally, the method is also called at module unload
+time or, for hot-pluggable devices, when the device is unplugged. The
+firstopen and lastclose calls can thus be unbalanced.
+
+The open method is called every time the device is opened by an
+application. Drivers can allocate per-file private data in this method
+and store them in the struct :c:type:`struct drm_file
+<drm_file>` driver_priv field. Note that the open method is
+called before firstopen.
+
+The close operation is split into preclose and postclose methods.
+Drivers must stop and cleanup all per-file operations in the preclose
+method. For instance pending vertical blanking and page flip events must
+be cancelled. No per-file operation is allowed on the file handle after
+returning from the preclose method.
+
+Finally the postclose method is called as the last step of the close
+operation, right before calling the lastclose method if no other open
+file handle exists for the device. Drivers that have allocated per-file
+private data in the open method should free it here.
+
+The lastclose method should restore CRTC and plane properties to default
+value, so that a subsequent open of the device will not inherit state
+from the previous user. It can also be used to execute delayed power
+switching state changes, e.g. in conjunction with the vga_switcheroo
+infrastructure (see ?). Beyond that KMS drivers should not do any
+further cleanup. Only legacy UMS drivers might need to clean up device
+state so that the vga console or an independent fbdev driver could take
+over.
+
+File Operations
+---------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_fops.c
+   :doc: file operations
+
+.. kernel-doc:: drivers/gpu/drm/drm_fops.c
+   :export:
+
+IOCTLs
+------
+
+struct drm_ioctl_desc \*ioctls; int num_ioctls;
+    Driver-specific ioctls descriptors table.
+
+Driver-specific ioctls numbers start at DRM_COMMAND_BASE. The ioctls
+descriptors table is indexed by the ioctl number offset from the base
+value. Drivers can use the DRM_IOCTL_DEF_DRV() macro to initialize
+the table entries.
+
+::
+
+    DRM_IOCTL_DEF_DRV(ioctl, func, flags)
+
+``ioctl`` is the ioctl name. Drivers must define the DRM_##ioctl and
+DRM_IOCTL_##ioctl macros to the ioctl number offset from
+DRM_COMMAND_BASE and the ioctl number respectively. The first macro is
+private to the device while the second must be exposed to userspace in a
+public header.
+
+``func`` is a pointer to the ioctl handler function compatible with the
+``drm_ioctl_t`` type.
+
+::
+
+    typedef int drm_ioctl_t(struct drm_device *dev, void *data,
+            struct drm_file *file_priv);
+
+``flags`` is a bitmask combination of the following values. It restricts
+how the ioctl is allowed to be called.
+
+-  DRM_AUTH - Only authenticated callers allowed
+
+-  DRM_MASTER - The ioctl can only be called on the master file handle
+
+-  DRM_ROOT_ONLY - Only callers with the SYSADMIN capability allowed
+
+-  DRM_CONTROL_ALLOW - The ioctl can only be called on a control
+   device
+
+-  DRM_UNLOCKED - The ioctl handler will be called without locking the
+   DRM global mutex. This is the enforced default for kms drivers (i.e.
+   using the DRIVER_MODESET flag) and hence shouldn't be used any more
+   for new drivers.
+
+.. kernel-doc:: drivers/gpu/drm/drm_ioctl.c
+   :export:
+
+Legacy Support Code
+===================
+
+The section very briefly covers some of the old legacy support code
+which is only used by old DRM drivers which have done a so-called
+shadow-attach to the underlying device instead of registering as a real
+driver. This also includes some of the old generic buffer management and
+command submission code. Do not use any of this in new and modern
+drivers.
+
+Legacy Suspend/Resume
+---------------------
+
+The DRM core provides some suspend/resume code, but drivers wanting full
+suspend/resume support should provide save() and restore() functions.
+These are called at suspend, hibernate, or resume time, and should
+perform any state save or restore required by your device across suspend
+or hibernate states.
+
+int (\*suspend) (struct drm_device \*, pm_message_t state); int
+(\*resume) (struct drm_device \*);
+Those are legacy suspend and resume methods which *only* work with the
+legacy shadow-attach driver registration functions. New driver should
+use the power management interface provided by their bus type (usually
+through the :c:type:`struct device_driver <device_driver>`
+dev_pm_ops) and set these methods to NULL.
+
+Legacy DMA Services
+-------------------
+
+This should cover how DMA mapping etc. is supported by the core. These
+functions are deprecated and should not be used.
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
new file mode 100644
index 000000000000..0b302fedf1af
--- /dev/null
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -0,0 +1,260 @@
+=============================
+Mode Setting Helper Functions
+=============================
+
+The plane, CRTC, encoder and connector functions provided by the drivers
+implement the DRM API. They're called by the DRM core and ioctl handlers
+to handle device state changes and configuration request. As
+implementing those functions often requires logic not specific to
+drivers, mid-layer helper functions are available to avoid duplicating
+boilerplate code.
+
+The DRM core contains one mid-layer implementation. The mid-layer
+provides implementations of several plane, CRTC, encoder and connector
+functions (called from the top of the mid-layer) that pre-process
+requests and call lower-level functions provided by the driver (at the
+bottom of the mid-layer). For instance, the
+:c:func:`drm_crtc_helper_set_config()` function can be used to
+fill the :c:type:`struct drm_crtc_funcs <drm_crtc_funcs>`
+set_config field. When called, it will split the set_config operation
+in smaller, simpler operations and call the driver to handle them.
+
+To use the mid-layer, drivers call
+:c:func:`drm_crtc_helper_add()`,
+:c:func:`drm_encoder_helper_add()` and
+:c:func:`drm_connector_helper_add()` functions to install their
+mid-layer bottom operations handlers, and fill the :c:type:`struct
+drm_crtc_funcs <drm_crtc_funcs>`, :c:type:`struct
+drm_encoder_funcs <drm_encoder_funcs>` and :c:type:`struct
+drm_connector_funcs <drm_connector_funcs>` structures with
+pointers to the mid-layer top API functions. Installing the mid-layer
+bottom operation handlers is best done right after registering the
+corresponding KMS object.
+
+The mid-layer is not split between CRTC, encoder and connector
+operations. To use it, a driver must provide bottom functions for all of
+the three KMS entities.
+
+Atomic Modeset Helper Functions Reference
+=========================================
+
+Overview
+--------
+
+.. kernel-doc:: drivers/gpu/drm/drm_atomic_helper.c
+   :doc: overview
+
+Implementing Asynchronous Atomic Commit
+---------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_atomic_helper.c
+   :doc: implementing nonblocking commit
+
+Atomic State Reset and Initialization
+-------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_atomic_helper.c
+   :doc: atomic state reset and initialization
+
+.. kernel-doc:: include/drm/drm_atomic_helper.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_atomic_helper.c
+   :export:
+
+Modeset Helper Reference for Common Vtables
+===========================================
+
+.. kernel-doc:: include/drm/drm_modeset_helper_vtables.h
+   :internal:
+
+.. kernel-doc:: include/drm/drm_modeset_helper_vtables.h
+   :doc: overview
+
+Legacy CRTC/Modeset Helper Functions Reference
+==============================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_crtc_helper.c
+   :export:
+
+.. kernel-doc:: drivers/gpu/drm/drm_crtc_helper.c
+   :doc: overview
+
+Output Probing Helper Functions Reference
+=========================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_probe_helper.c
+   :doc: output probing helper overview
+
+.. kernel-doc:: drivers/gpu/drm/drm_probe_helper.c
+   :export:
+
+fbdev Helper Functions Reference
+================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c
+   :doc: fbdev helpers
+
+.. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c
+   :export:
+
+.. kernel-doc:: include/drm/drm_fb_helper.h
+   :internal:
+
+Framebuffer CMA Helper Functions Reference
+==========================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c
+   :doc: framebuffer cma helper functions
+
+.. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c
+   :export:
+
+Display Port Helper Functions Reference
+=======================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_helper.c
+   :doc: dp helpers
+
+.. kernel-doc:: include/drm/drm_dp_helper.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_helper.c
+   :export:
+
+Display Port Dual Mode Adaptor Helper Functions Reference
+=========================================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_dual_mode_helper.c
+   :doc: dp dual mode helpers
+
+.. kernel-doc:: include/drm/drm_dp_dual_mode_helper.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_dual_mode_helper.c
+   :export:
+
+Display Port MST Helper Functions Reference
+===========================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_mst_topology.c
+   :doc: dp mst helper
+
+.. kernel-doc:: include/drm/drm_dp_mst_helper.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_mst_topology.c
+   :export:
+
+MIPI DSI Helper Functions Reference
+===================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_mipi_dsi.c
+   :doc: dsi helpers
+
+.. kernel-doc:: include/drm/drm_mipi_dsi.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_mipi_dsi.c
+   :export:
+
+EDID Helper Functions Reference
+===============================
+
+.. kernel-doc:: drivers/gpu/drm/drm_edid.c
+   :export:
+
+Rectangle Utilities Reference
+=============================
+
+.. kernel-doc:: include/drm/drm_rect.h
+   :doc: rect utils
+
+.. kernel-doc:: include/drm/drm_rect.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_rect.c
+   :export:
+
+Flip-work Helper Reference
+==========================
+
+.. kernel-doc:: include/drm/drm_flip_work.h
+   :doc: flip utils
+
+.. kernel-doc:: include/drm/drm_flip_work.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_flip_work.c
+   :export:
+
+HDMI Infoframes Helper Reference
+================================
+
+Strictly speaking this is not a DRM helper library but generally useable
+by any driver interfacing with HDMI outputs like v4l or alsa drivers.
+But it nicely fits into the overall topic of mode setting helper
+libraries and hence is also included here.
+
+.. kernel-doc:: include/linux/hdmi.h
+   :internal:
+
+.. kernel-doc:: drivers/video/hdmi.c
+   :export:
+
+Plane Helper Reference
+======================
+
+.. kernel-doc:: drivers/gpu/drm/drm_plane_helper.c
+   :export:
+
+.. kernel-doc:: drivers/gpu/drm/drm_plane_helper.c
+   :doc: overview
+
+Tile group
+----------
+
+.. kernel-doc:: drivers/gpu/drm/drm_crtc.c
+   :doc: Tile group
+
+Bridges
+=======
+
+Overview
+--------
+
+.. kernel-doc:: drivers/gpu/drm/drm_bridge.c
+   :doc: overview
+
+Default bridge callback sequence
+--------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_bridge.c
+   :doc: bridge callbacks
+
+.. kernel-doc:: drivers/gpu/drm/drm_bridge.c
+   :export:
+
+Panel Helper Reference
+======================
+
+.. kernel-doc:: include/drm/drm_panel.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_panel.c
+   :export:
+
+.. kernel-doc:: drivers/gpu/drm/drm_panel.c
+   :doc: drm panel
+
+Simple KMS Helper Reference
+===========================
+
+.. kernel-doc:: include/drm/drm_simple_kms_helper.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_simple_kms_helper.c
+   :export:
+
+.. kernel-doc:: drivers/gpu/drm/drm_simple_kms_helper.c
+   :doc: overview
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
new file mode 100644
index 000000000000..0e1c80436c1d
--- /dev/null
+++ b/Documentation/gpu/drm-kms.rst
@@ -0,0 +1,656 @@
+=========================
+Kernel Mode Setting (KMS)
+=========================
+
+Mode Setting
+============
+
+Drivers must initialize the mode setting core by calling
+:c:func:`drm_mode_config_init()` on the DRM device. The function
+initializes the :c:type:`struct drm_device <drm_device>`
+mode_config field and never fails. Once done, mode configuration must
+be setup by initializing the following fields.
+
+-  int min_width, min_height; int max_width, max_height;
+   Minimum and maximum width and height of the frame buffers in pixel
+   units.
+
+-  struct drm_mode_config_funcs \*funcs;
+   Mode setting functions.
+
+Display Modes Function Reference
+--------------------------------
+
+.. kernel-doc:: include/drm/drm_modes.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_modes.c
+   :export:
+
+Atomic Mode Setting Function Reference
+--------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_atomic.c
+   :export:
+
+.. kernel-doc:: drivers/gpu/drm/drm_atomic.c
+   :internal:
+
+Frame Buffer Abstraction
+------------------------
+
+Frame buffers are abstract memory objects that provide a source of
+pixels to scanout to a CRTC. Applications explicitly request the
+creation of frame buffers through the DRM_IOCTL_MODE_ADDFB(2) ioctls
+and receive an opaque handle that can be passed to the KMS CRTC control,
+plane configuration and page flip functions.
+
+Frame buffers rely on the underneath memory manager for low-level memory
+operations. When creating a frame buffer applications pass a memory
+handle (or a list of memory handles for multi-planar formats) through
+the ``drm_mode_fb_cmd2`` argument. For drivers using GEM as their
+userspace buffer management interface this would be a GEM handle.
+Drivers are however free to use their own backing storage object
+handles, e.g. vmwgfx directly exposes special TTM handles to userspace
+and so expects TTM handles in the create ioctl and not GEM handles.
+
+The lifetime of a drm framebuffer is controlled with a reference count,
+drivers can grab additional references with
+:c:func:`drm_framebuffer_reference()`and drop them again with
+:c:func:`drm_framebuffer_unreference()`. For driver-private
+framebuffers for which the last reference is never dropped (e.g. for the
+fbdev framebuffer when the struct :c:type:`struct drm_framebuffer
+<drm_framebuffer>` is embedded into the fbdev helper struct)
+drivers can manually clean up a framebuffer at module unload time with
+:c:func:`drm_framebuffer_unregister_private()`.
+
+DRM Format Handling
+-------------------
+
+.. kernel-doc:: include/drm/drm_fourcc.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_fourcc.c
+   :export:
+
+Dumb Buffer Objects
+-------------------
+
+The KMS API doesn't standardize backing storage object creation and
+leaves it to driver-specific ioctls. Furthermore actually creating a
+buffer object even for GEM-based drivers is done through a
+driver-specific ioctl - GEM only has a common userspace interface for
+sharing and destroying objects. While not an issue for full-fledged
+graphics stacks that include device-specific userspace components (in
+libdrm for instance), this limit makes DRM-based early boot graphics
+unnecessarily complex.
+
+Dumb objects partly alleviate the problem by providing a standard API to
+create dumb buffers suitable for scanout, which can then be used to
+create KMS frame buffers.
+
+To support dumb objects drivers must implement the dumb_create,
+dumb_destroy and dumb_map_offset operations.
+
+-  int (\*dumb_create)(struct drm_file \*file_priv, struct
+   drm_device \*dev, struct drm_mode_create_dumb \*args);
+   The dumb_create operation creates a driver object (GEM or TTM
+   handle) suitable for scanout based on the width, height and depth
+   from the struct :c:type:`struct drm_mode_create_dumb
+   <drm_mode_create_dumb>` argument. It fills the argument's
+   handle, pitch and size fields with a handle for the newly created
+   object and its line pitch and size in bytes.
+
+-  int (\*dumb_destroy)(struct drm_file \*file_priv, struct
+   drm_device \*dev, uint32_t handle);
+   The dumb_destroy operation destroys a dumb object created by
+   dumb_create.
+
+-  int (\*dumb_map_offset)(struct drm_file \*file_priv, struct
+   drm_device \*dev, uint32_t handle, uint64_t \*offset);
+   The dumb_map_offset operation associates an mmap fake offset with
+   the object given by the handle and returns it. Drivers must use the
+   :c:func:`drm_gem_create_mmap_offset()` function to associate
+   the fake offset as described in ?.
+
+Note that dumb objects may not be used for gpu acceleration, as has been
+attempted on some ARM embedded platforms. Such drivers really must have
+a hardware-specific ioctl to allocate suitable buffer objects.
+
+Output Polling
+--------------
+
+void (\*output_poll_changed)(struct drm_device \*dev);
+This operation notifies the driver that the status of one or more
+connectors has changed. Drivers that use the fb helper can just call the
+:c:func:`drm_fb_helper_hotplug_event()` function to handle this
+operation.
+
+KMS Initialization and Cleanup
+==============================
+
+A KMS device is abstracted and exposed as a set of planes, CRTCs,
+encoders and connectors. KMS drivers must thus create and initialize all
+those objects at load time after initializing mode setting.
+
+CRTCs (:c:type:`struct drm_crtc <drm_crtc>`)
+--------------------------------------------
+
+A CRTC is an abstraction representing a part of the chip that contains a
+pointer to a scanout buffer. Therefore, the number of CRTCs available
+determines how many independent scanout buffers can be active at any
+given time. The CRTC structure contains several fields to support this:
+a pointer to some video memory (abstracted as a frame buffer object), a
+display mode, and an (x, y) offset into the video memory to support
+panning or configurations where one piece of video memory spans multiple
+CRTCs.
+
+CRTC Initialization
+~~~~~~~~~~~~~~~~~~~
+
+A KMS device must create and register at least one struct
+:c:type:`struct drm_crtc <drm_crtc>` instance. The instance is
+allocated and zeroed by the driver, possibly as part of a larger
+structure, and registered with a call to :c:func:`drm_crtc_init()`
+with a pointer to CRTC functions.
+
+Planes (:c:type:`struct drm_plane <drm_plane>`)
+-----------------------------------------------
+
+A plane represents an image source that can be blended with or overlayed
+on top of a CRTC during the scanout process. Planes are associated with
+a frame buffer to crop a portion of the image memory (source) and
+optionally scale it to a destination size. The result is then blended
+with or overlayed on top of a CRTC.
+
+The DRM core recognizes three types of planes:
+
+-  DRM_PLANE_TYPE_PRIMARY represents a "main" plane for a CRTC.
+   Primary planes are the planes operated upon by CRTC modesetting and
+   flipping operations described in the page_flip hook in
+   :c:type:`struct drm_crtc_funcs <drm_crtc_funcs>`.
+-  DRM_PLANE_TYPE_CURSOR represents a "cursor" plane for a CRTC.
+   Cursor planes are the planes operated upon by the
+   DRM_IOCTL_MODE_CURSOR and DRM_IOCTL_MODE_CURSOR2 ioctls.
+-  DRM_PLANE_TYPE_OVERLAY represents all non-primary, non-cursor
+   planes. Some drivers refer to these types of planes as "sprites"
+   internally.
+
+For compatibility with legacy userspace, only overlay planes are made
+available to userspace by default. Userspace clients may set the
+DRM_CLIENT_CAP_UNIVERSAL_PLANES client capability bit to indicate
+that they wish to receive a universal plane list containing all plane
+types.
+
+Plane Initialization
+~~~~~~~~~~~~~~~~~~~~
+
+To create a plane, a KMS drivers allocates and zeroes an instances of
+:c:type:`struct drm_plane <drm_plane>` (possibly as part of a
+larger structure) and registers it with a call to
+:c:func:`drm_universal_plane_init()`. The function takes a
+bitmask of the CRTCs that can be associated with the plane, a pointer to
+the plane functions, a list of format supported formats, and the type of
+plane (primary, cursor, or overlay) being initialized.
+
+Cursor and overlay planes are optional. All drivers should provide one
+primary plane per CRTC (although this requirement may change in the
+future); drivers that do not wish to provide special handling for
+primary planes may make use of the helper functions described in ? to
+create and register a primary plane with standard capabilities.
+
+Encoders (:c:type:`struct drm_encoder <drm_encoder>`)
+-----------------------------------------------------
+
+An encoder takes pixel data from a CRTC and converts it to a format
+suitable for any attached connectors. On some devices, it may be
+possible to have a CRTC send data to more than one encoder. In that
+case, both encoders would receive data from the same scanout buffer,
+resulting in a "cloned" display configuration across the connectors
+attached to each encoder.
+
+Encoder Initialization
+~~~~~~~~~~~~~~~~~~~~~~
+
+As for CRTCs, a KMS driver must create, initialize and register at least
+one :c:type:`struct drm_encoder <drm_encoder>` instance. The
+instance is allocated and zeroed by the driver, possibly as part of a
+larger structure.
+
+Drivers must initialize the :c:type:`struct drm_encoder
+<drm_encoder>` possible_crtcs and possible_clones fields before
+registering the encoder. Both fields are bitmasks of respectively the
+CRTCs that the encoder can be connected to, and sibling encoders
+candidate for cloning.
+
+After being initialized, the encoder must be registered with a call to
+:c:func:`drm_encoder_init()`. The function takes a pointer to the
+encoder functions and an encoder type. Supported types are
+
+-  DRM_MODE_ENCODER_DAC for VGA and analog on DVI-I/DVI-A
+-  DRM_MODE_ENCODER_TMDS for DVI, HDMI and (embedded) DisplayPort
+-  DRM_MODE_ENCODER_LVDS for display panels
+-  DRM_MODE_ENCODER_TVDAC for TV output (Composite, S-Video,
+   Component, SCART)
+-  DRM_MODE_ENCODER_VIRTUAL for virtual machine displays
+
+Encoders must be attached to a CRTC to be used. DRM drivers leave
+encoders unattached at initialization time. Applications (or the fbdev
+compatibility layer when implemented) are responsible for attaching the
+encoders they want to use to a CRTC.
+
+Connectors (:c:type:`struct drm_connector <drm_connector>`)
+-----------------------------------------------------------
+
+A connector is the final destination for pixel data on a device, and
+usually connects directly to an external display device like a monitor
+or laptop panel. A connector can only be attached to one encoder at a
+time. The connector is also the structure where information about the
+attached display is kept, so it contains fields for display data, EDID
+data, DPMS & connection status, and information about modes supported on
+the attached displays.
+
+Connector Initialization
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Finally a KMS driver must create, initialize, register and attach at
+least one :c:type:`struct drm_connector <drm_connector>`
+instance. The instance is created as other KMS objects and initialized
+by setting the following fields.
+
+interlace_allowed
+    Whether the connector can handle interlaced modes.
+
+doublescan_allowed
+    Whether the connector can handle doublescan.
+
+display_info
+    Display information is filled from EDID information when a display
+    is detected. For non hot-pluggable displays such as flat panels in
+    embedded systems, the driver should initialize the
+    display_info.width_mm and display_info.height_mm fields with the
+    physical size of the display.
+
+polled
+    Connector polling mode, a combination of
+
+    DRM_CONNECTOR_POLL_HPD
+        The connector generates hotplug events and doesn't need to be
+        periodically polled. The CONNECT and DISCONNECT flags must not
+        be set together with the HPD flag.
+
+    DRM_CONNECTOR_POLL_CONNECT
+        Periodically poll the connector for connection.
+
+    DRM_CONNECTOR_POLL_DISCONNECT
+        Periodically poll the connector for disconnection.
+
+    Set to 0 for connectors that don't support connection status
+    discovery.
+
+The connector is then registered with a call to
+:c:func:`drm_connector_init()` with a pointer to the connector
+functions and a connector type, and exposed through sysfs with a call to
+:c:func:`drm_connector_register()`.
+
+Supported connector types are
+
+-  DRM_MODE_CONNECTOR_VGA
+-  DRM_MODE_CONNECTOR_DVII
+-  DRM_MODE_CONNECTOR_DVID
+-  DRM_MODE_CONNECTOR_DVIA
+-  DRM_MODE_CONNECTOR_Composite
+-  DRM_MODE_CONNECTOR_SVIDEO
+-  DRM_MODE_CONNECTOR_LVDS
+-  DRM_MODE_CONNECTOR_Component
+-  DRM_MODE_CONNECTOR_9PinDIN
+-  DRM_MODE_CONNECTOR_DisplayPort
+-  DRM_MODE_CONNECTOR_HDMIA
+-  DRM_MODE_CONNECTOR_HDMIB
+-  DRM_MODE_CONNECTOR_TV
+-  DRM_MODE_CONNECTOR_eDP
+-  DRM_MODE_CONNECTOR_VIRTUAL
+
+Connectors must be attached to an encoder to be used. For devices that
+map connectors to encoders 1:1, the connector should be attached at
+initialization time with a call to
+:c:func:`drm_mode_connector_attach_encoder()`. The driver must
+also set the :c:type:`struct drm_connector <drm_connector>`
+encoder field to point to the attached encoder.
+
+Finally, drivers must initialize the connectors state change detection
+with a call to :c:func:`drm_kms_helper_poll_init()`. If at least
+one connector is pollable but can't generate hotplug interrupts
+(indicated by the DRM_CONNECTOR_POLL_CONNECT and
+DRM_CONNECTOR_POLL_DISCONNECT connector flags), a delayed work will
+automatically be queued to periodically poll for changes. Connectors
+that can generate hotplug interrupts must be marked with the
+DRM_CONNECTOR_POLL_HPD flag instead, and their interrupt handler must
+call :c:func:`drm_helper_hpd_irq_event()`. The function will
+queue a delayed work to check the state of all connectors, but no
+periodic polling will be done.
+
+Connector Operations
+~~~~~~~~~~~~~~~~~~~~
+
+    **Note**
+
+    Unless otherwise state, all operations are mandatory.
+
+DPMS
+''''
+
+void (\*dpms)(struct drm_connector \*connector, int mode);
+The DPMS operation sets the power state of a connector. The mode
+argument is one of
+
+-  DRM_MODE_DPMS_ON
+
+-  DRM_MODE_DPMS_STANDBY
+
+-  DRM_MODE_DPMS_SUSPEND
+
+-  DRM_MODE_DPMS_OFF
+
+In all but DPMS_ON mode the encoder to which the connector is attached
+should put the display in low-power mode by driving its signals
+appropriately. If more than one connector is attached to the encoder
+care should be taken not to change the power state of other displays as
+a side effect. Low-power mode should be propagated to the encoders and
+CRTCs when all related connectors are put in low-power mode.
+
+Modes
+'''''
+
+int (\*fill_modes)(struct drm_connector \*connector, uint32_t
+max_width, uint32_t max_height);
+Fill the mode list with all supported modes for the connector. If the
+``max_width`` and ``max_height`` arguments are non-zero, the
+implementation must ignore all modes wider than ``max_width`` or higher
+than ``max_height``.
+
+The connector must also fill in this operation its display_info
+width_mm and height_mm fields with the connected display physical size
+in millimeters. The fields should be set to 0 if the value isn't known
+or is not applicable (for instance for projector devices).
+
+Connection Status
+'''''''''''''''''
+
+The connection status is updated through polling or hotplug events when
+supported (see ?). The status value is reported to userspace through
+ioctls and must not be used inside the driver, as it only gets
+initialized by a call to :c:func:`drm_mode_getconnector()` from
+userspace.
+
+enum drm_connector_status (\*detect)(struct drm_connector
+\*connector, bool force);
+Check to see if anything is attached to the connector. The ``force``
+parameter is set to false whilst polling or to true when checking the
+connector due to user request. ``force`` can be used by the driver to
+avoid expensive, destructive operations during automated probing.
+
+Return connector_status_connected if something is connected to the
+connector, connector_status_disconnected if nothing is connected and
+connector_status_unknown if the connection state isn't known.
+
+Drivers should only return connector_status_connected if the
+connection status has really been probed as connected. Connectors that
+can't detect the connection status, or failed connection status probes,
+should return connector_status_unknown.
+
+Cleanup
+-------
+
+The DRM core manages its objects' lifetime. When an object is not needed
+anymore the core calls its destroy function, which must clean up and
+free every resource allocated for the object. Every
+:c:func:`drm_\*_init()` call must be matched with a corresponding
+:c:func:`drm_\*_cleanup()` call to cleanup CRTCs
+(:c:func:`drm_crtc_cleanup()`), planes
+(:c:func:`drm_plane_cleanup()`), encoders
+(:c:func:`drm_encoder_cleanup()`) and connectors
+(:c:func:`drm_connector_cleanup()`). Furthermore, connectors that
+have been added to sysfs must be removed by a call to
+:c:func:`drm_connector_unregister()` before calling
+:c:func:`drm_connector_cleanup()`.
+
+Connectors state change detection must be cleanup up with a call to
+:c:func:`drm_kms_helper_poll_fini()`.
+
+Output discovery and initialization example
+-------------------------------------------
+
+::
+
+    void intel_crt_init(struct drm_device *dev)
+    {
+        struct drm_connector *connector;
+        struct intel_output *intel_output;
+
+        intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
+        if (!intel_output)
+            return;
+
+        connector = &intel_output->base;
+        drm_connector_init(dev, &intel_output->base,
+                   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
+
+        drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,
+                 DRM_MODE_ENCODER_DAC);
+
+        drm_mode_connector_attach_encoder(&intel_output->base,
+                          &intel_output->enc);
+
+        /* Set up the DDC bus. */
+        intel_output->ddc_bus = intel_i2c_create(dev, GPIOA, "CRTDDC_A");
+        if (!intel_output->ddc_bus) {
+            dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "
+                   "failed.\n");
+            return;
+        }
+
+        intel_output->type = INTEL_OUTPUT_ANALOG;
+        connector->interlace_allowed = 0;
+        connector->doublescan_allowed = 0;
+
+        drm_encoder_helper_add(&intel_output->enc, &intel_crt_helper_funcs);
+        drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
+
+        drm_connector_register(connector);
+    }
+
+In the example above (taken from the i915 driver), a CRTC, connector and
+encoder combination is created. A device-specific i2c bus is also
+created for fetching EDID data and performing monitor detection. Once
+the process is complete, the new connector is registered with sysfs to
+make its properties available to applications.
+
+KMS API Functions
+-----------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_crtc.c
+   :export:
+
+KMS Data Structures
+-------------------
+
+.. kernel-doc:: include/drm/drm_crtc.h
+   :internal:
+
+KMS Locking
+-----------
+
+.. kernel-doc:: drivers/gpu/drm/drm_modeset_lock.c
+   :doc: kms locking
+
+.. kernel-doc:: include/drm/drm_modeset_lock.h
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/drm_modeset_lock.c
+   :export:
+
+KMS Properties
+==============
+
+Drivers may need to expose additional parameters to applications than
+those described in the previous sections. KMS supports attaching
+properties to CRTCs, connectors and planes and offers a userspace API to
+list, get and set the property values.
+
+Properties are identified by a name that uniquely defines the property
+purpose, and store an associated value. For all property types except
+blob properties the value is a 64-bit unsigned integer.
+
+KMS differentiates between properties and property instances. Drivers
+first create properties and then create and associate individual
+instances of those properties to objects. A property can be instantiated
+multiple times and associated with different objects. Values are stored
+in property instances, and all other property information are stored in
+the property and shared between all instances of the property.
+
+Every property is created with a type that influences how the KMS core
+handles the property. Supported property types are
+
+DRM_MODE_PROP_RANGE
+    Range properties report their minimum and maximum admissible values.
+    The KMS core verifies that values set by application fit in that
+    range.
+
+DRM_MODE_PROP_ENUM
+    Enumerated properties take a numerical value that ranges from 0 to
+    the number of enumerated values defined by the property minus one,
+    and associate a free-formed string name to each value. Applications
+    can retrieve the list of defined value-name pairs and use the
+    numerical value to get and set property instance values.
+
+DRM_MODE_PROP_BITMASK
+    Bitmask properties are enumeration properties that additionally
+    restrict all enumerated values to the 0..63 range. Bitmask property
+    instance values combine one or more of the enumerated bits defined
+    by the property.
+
+DRM_MODE_PROP_BLOB
+    Blob properties store a binary blob without any format restriction.
+    The binary blobs are created as KMS standalone objects, and blob
+    property instance values store the ID of their associated blob
+    object.
+
+    Blob properties are only used for the connector EDID property and
+    cannot be created by drivers.
+
+To create a property drivers call one of the following functions
+depending on the property type. All property creation functions take
+property flags and name, as well as type-specific arguments.
+
+-  struct drm_property \*drm_property_create_range(struct
+   drm_device \*dev, int flags, const char \*name, uint64_t min,
+   uint64_t max);
+   Create a range property with the given minimum and maximum values.
+
+-  struct drm_property \*drm_property_create_enum(struct drm_device
+   \*dev, int flags, const char \*name, const struct
+   drm_prop_enum_list \*props, int num_values);
+   Create an enumerated property. The ``props`` argument points to an
+   array of ``num_values`` value-name pairs.
+
+-  struct drm_property \*drm_property_create_bitmask(struct
+   drm_device \*dev, int flags, const char \*name, const struct
+   drm_prop_enum_list \*props, int num_values);
+   Create a bitmask property. The ``props`` argument points to an array
+   of ``num_values`` value-name pairs.
+
+Properties can additionally be created as immutable, in which case they
+will be read-only for applications but can be modified by the driver. To
+create an immutable property drivers must set the
+DRM_MODE_PROP_IMMUTABLE flag at property creation time.
+
+When no array of value-name pairs is readily available at property
+creation time for enumerated or range properties, drivers can create the
+property using the :c:func:`drm_property_create()` function and
+manually add enumeration value-name pairs by calling the
+:c:func:`drm_property_add_enum()` function. Care must be taken to
+properly specify the property type through the ``flags`` argument.
+
+After creating properties drivers can attach property instances to CRTC,
+connector and plane objects by calling the
+:c:func:`drm_object_attach_property()`. The function takes a
+pointer to the target object, a pointer to the previously created
+property and an initial instance value.
+
+Existing KMS Properties
+-----------------------
+
+The following table gives description of drm properties exposed by
+various modules/drivers.
+
+.. csv-table::
+   :header-rows: 1
+   :file: kms-properties.csv
+
+Vertical Blanking
+=================
+
+Vertical blanking plays a major role in graphics rendering. To achieve
+tear-free display, users must synchronize page flips and/or rendering to
+vertical blanking. The DRM API offers ioctls to perform page flips
+synchronized to vertical blanking and wait for vertical blanking.
+
+The DRM core handles most of the vertical blanking management logic,
+which involves filtering out spurious interrupts, keeping race-free
+blanking counters, coping with counter wrap-around and resets and
+keeping use counts. It relies on the driver to generate vertical
+blanking interrupts and optionally provide a hardware vertical blanking
+counter. Drivers must implement the following operations.
+
+-  int (\*enable_vblank) (struct drm_device \*dev, int crtc); void
+   (\*disable_vblank) (struct drm_device \*dev, int crtc);
+   Enable or disable vertical blanking interrupts for the given CRTC.
+
+-  u32 (\*get_vblank_counter) (struct drm_device \*dev, int crtc);
+   Retrieve the value of the vertical blanking counter for the given
+   CRTC. If the hardware maintains a vertical blanking counter its value
+   should be returned. Otherwise drivers can use the
+   :c:func:`drm_vblank_count()` helper function to handle this
+   operation.
+
+Drivers must initialize the vertical blanking handling core with a call
+to :c:func:`drm_vblank_init()` in their load operation.
+
+Vertical blanking interrupts can be enabled by the DRM core or by
+drivers themselves (for instance to handle page flipping operations).
+The DRM core maintains a vertical blanking use count to ensure that the
+interrupts are not disabled while a user still needs them. To increment
+the use count, drivers call :c:func:`drm_vblank_get()`. Upon
+return vertical blanking interrupts are guaranteed to be enabled.
+
+To decrement the use count drivers call
+:c:func:`drm_vblank_put()`. Only when the use count drops to zero
+will the DRM core disable the vertical blanking interrupts after a delay
+by scheduling a timer. The delay is accessible through the
+vblankoffdelay module parameter or the ``drm_vblank_offdelay`` global
+variable and expressed in milliseconds. Its default value is 5000 ms.
+Zero means never disable, and a negative value means disable
+immediately. Drivers may override the behaviour by setting the
+:c:type:`struct drm_device <drm_device>`
+vblank_disable_immediate flag, which when set causes vblank interrupts
+to be disabled immediately regardless of the drm_vblank_offdelay
+value. The flag should only be set if there's a properly working
+hardware vblank counter present.
+
+When a vertical blanking interrupt occurs drivers only need to call the
+:c:func:`drm_handle_vblank()` function to account for the
+interrupt.
+
+Resources allocated by :c:func:`drm_vblank_init()` must be freed
+with a call to :c:func:`drm_vblank_cleanup()` in the driver unload
+operation handler.
+
+Vertical Blanking and Interrupt Handling Functions Reference
+------------------------------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_irq.c
+   :export:
+
+.. kernel-doc:: include/drm/drmP.h
+   :functions: drm_crtc_vblank_waitqueue
diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst
new file mode 100644
index 000000000000..59f9822fecd0
--- /dev/null
+++ b/Documentation/gpu/drm-mm.rst
@@ -0,0 +1,454 @@
+=====================
+DRM Memory Management
+=====================
+
+Modern Linux systems require large amount of graphics memory to store
+frame buffers, textures, vertices and other graphics-related data. Given
+the very dynamic nature of many of that data, managing graphics memory
+efficiently is thus crucial for the graphics stack and plays a central
+role in the DRM infrastructure.
+
+The DRM core includes two memory managers, namely Translation Table Maps
+(TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory
+manager to be developed and tried to be a one-size-fits-them all
+solution. It provides a single userspace API to accommodate the need of
+all hardware, supporting both Unified Memory Architecture (UMA) devices
+and devices with dedicated video RAM (i.e. most discrete video cards).
+This resulted in a large, complex piece of code that turned out to be
+hard to use for driver development.
+
+GEM started as an Intel-sponsored project in reaction to TTM's
+complexity. Its design philosophy is completely different: instead of
+providing a solution to every graphics memory-related problems, GEM
+identified common code between drivers and created a support library to
+share it. GEM has simpler initialization and execution requirements than
+TTM, but has no video RAM management capabilities and is thus limited to
+UMA devices.
+
+The Translation Table Manager (TTM)
+-----------------------------------
+
+TTM design background and information belongs here.
+
+TTM initialization
+~~~~~~~~~~~~~~~~~~
+
+    **Warning**
+
+    This section is outdated.
+
+Drivers wishing to support TTM must fill out a drm_bo_driver
+structure. The structure contains several fields with function pointers
+for initializing the TTM, allocating and freeing memory, waiting for
+command completion and fence synchronization, and memory migration. See
+the radeon_ttm.c file for an example of usage.
+
+The ttm_global_reference structure is made up of several fields:
+
+::
+
+              struct ttm_global_reference {
+                      enum ttm_global_types global_type;
+                      size_t size;
+                      void *object;
+                      int (*init) (struct ttm_global_reference *);
+                      void (*release) (struct ttm_global_reference *);
+              };
+
+
+There should be one global reference structure for your memory manager
+as a whole, and there will be others for each object created by the
+memory manager at runtime. Your global TTM should have a type of
+TTM_GLOBAL_TTM_MEM. The size field for the global object should be
+sizeof(struct ttm_mem_global), and the init and release hooks should
+point at your driver-specific init and release routines, which probably
+eventually call ttm_mem_global_init and ttm_mem_global_release,
+respectively.
+
+Once your global TTM accounting structure is set up and initialized by
+calling ttm_global_item_ref() on it, you need to create a buffer
+object TTM to provide a pool for buffer object allocation by clients and
+the kernel itself. The type of this object should be
+TTM_GLOBAL_TTM_BO, and its size should be sizeof(struct
+ttm_bo_global). Again, driver-specific init and release functions may
+be provided, likely eventually calling ttm_bo_global_init() and
+ttm_bo_global_release(), respectively. Also, like the previous
+object, ttm_global_item_ref() is used to create an initial reference
+count for the TTM, which will call your initialization function.
+
+The Graphics Execution Manager (GEM)
+------------------------------------
+
+The GEM design approach has resulted in a memory manager that doesn't
+provide full coverage of all (or even all common) use cases in its
+userspace or kernel API. GEM exposes a set of standard memory-related
+operations to userspace and a set of helper functions to drivers, and
+let drivers implement hardware-specific operations with their own
+private API.
+
+The GEM userspace API is described in the `GEM - the Graphics Execution
+Manager <http://lwn.net/Articles/283798/>`__ article on LWN. While
+slightly outdated, the document provides a good overview of the GEM API
+principles. Buffer allocation and read and write operations, described
+as part of the common GEM API, are currently implemented using
+driver-specific ioctls.
+
+GEM is data-agnostic. It manages abstract buffer objects without knowing
+what individual buffers contain. APIs that require knowledge of buffer
+contents or purpose, such as buffer allocation or synchronization
+primitives, are thus outside of the scope of GEM and must be implemented
+using driver-specific ioctls.
+
+On a fundamental level, GEM involves several operations:
+
+-  Memory allocation and freeing
+-  Command execution
+-  Aperture management at command execution time
+
+Buffer object allocation is relatively straightforward and largely
+provided by Linux's shmem layer, which provides memory to back each
+object.
+
+Device-specific operations, such as command execution, pinning, buffer
+read & write, mapping, and domain ownership transfers are left to
+driver-specific ioctls.
+
+GEM Initialization
+~~~~~~~~~~~~~~~~~~
+
+Drivers that use GEM must set the DRIVER_GEM bit in the struct
+:c:type:`struct drm_driver <drm_driver>` driver_features
+field. The DRM core will then automatically initialize the GEM core
+before calling the load operation. Behind the scene, this will create a
+DRM Memory Manager object which provides an address space pool for
+object allocation.
+
+In a KMS configuration, drivers need to allocate and initialize a
+command ring buffer following core GEM initialization if required by the
+hardware. UMA devices usually have what is called a "stolen" memory
+region, which provides space for the initial framebuffer and large,
+contiguous memory regions required by the device. This space is
+typically not managed by GEM, and must be initialized separately into
+its own DRM MM object.
+
+GEM Objects Creation
+~~~~~~~~~~~~~~~~~~~~
+
+GEM splits creation of GEM objects and allocation of the memory that
+backs them in two distinct operations.
+
+GEM objects are represented by an instance of struct :c:type:`struct
+drm_gem_object <drm_gem_object>`. Drivers usually need to
+extend GEM objects with private information and thus create a
+driver-specific GEM object structure type that embeds an instance of
+struct :c:type:`struct drm_gem_object <drm_gem_object>`.
+
+To create a GEM object, a driver allocates memory for an instance of its
+specific GEM object type and initializes the embedded struct
+:c:type:`struct drm_gem_object <drm_gem_object>` with a call
+to :c:func:`drm_gem_object_init()`. The function takes a pointer
+to the DRM device, a pointer to the GEM object and the buffer object
+size in bytes.
+
+GEM uses shmem to allocate anonymous pageable memory.
+:c:func:`drm_gem_object_init()` will create an shmfs file of the
+requested size and store it into the struct :c:type:`struct
+drm_gem_object <drm_gem_object>` filp field. The memory is
+used as either main storage for the object when the graphics hardware
+uses system memory directly or as a backing store otherwise.
+
+Drivers are responsible for the actual physical pages allocation by
+calling :c:func:`shmem_read_mapping_page_gfp()` for each page.
+Note that they can decide to allocate pages when initializing the GEM
+object, or to delay allocation until the memory is needed (for instance
+when a page fault occurs as a result of a userspace memory access or
+when the driver needs to start a DMA transfer involving the memory).
+
+Anonymous pageable memory allocation is not always desired, for instance
+when the hardware requires physically contiguous system memory as is
+often the case in embedded devices. Drivers can create GEM objects with
+no shmfs backing (called private GEM objects) by initializing them with
+a call to :c:func:`drm_gem_private_object_init()` instead of
+:c:func:`drm_gem_object_init()`. Storage for private GEM objects
+must be managed by drivers.
+
+GEM Objects Lifetime
+~~~~~~~~~~~~~~~~~~~~
+
+All GEM objects are reference-counted by the GEM core. References can be
+acquired and release by :c:func:`calling
+drm_gem_object_reference()` and
+:c:func:`drm_gem_object_unreference()` respectively. The caller
+must hold the :c:type:`struct drm_device <drm_device>`
+struct_mutex lock when calling
+:c:func:`drm_gem_object_reference()`. As a convenience, GEM
+provides :c:func:`drm_gem_object_unreference_unlocked()`
+functions that can be called without holding the lock.
+
+When the last reference to a GEM object is released the GEM core calls
+the :c:type:`struct drm_driver <drm_driver>` gem_free_object
+operation. That operation is mandatory for GEM-enabled drivers and must
+free the GEM object and all associated resources.
+
+void (\*gem_free_object) (struct drm_gem_object \*obj); Drivers are
+responsible for freeing all GEM object resources. This includes the
+resources created by the GEM core, which need to be released with
+:c:func:`drm_gem_object_release()`.
+
+GEM Objects Naming
+~~~~~~~~~~~~~~~~~~
+
+Communication between userspace and the kernel refers to GEM objects
+using local handles, global names or, more recently, file descriptors.
+All of those are 32-bit integer values; the usual Linux kernel limits
+apply to the file descriptors.
+
+GEM handles are local to a DRM file. Applications get a handle to a GEM
+object through a driver-specific ioctl, and can use that handle to refer
+to the GEM object in other standard or driver-specific ioctls. Closing a
+DRM file handle frees all its GEM handles and dereferences the
+associated GEM objects.
+
+To create a handle for a GEM object drivers call
+:c:func:`drm_gem_handle_create()`. The function takes a pointer
+to the DRM file and the GEM object and returns a locally unique handle.
+When the handle is no longer needed drivers delete it with a call to
+:c:func:`drm_gem_handle_delete()`. Finally the GEM object
+associated with a handle can be retrieved by a call to
+:c:func:`drm_gem_object_lookup()`.
+
+Handles don't take ownership of GEM objects, they only take a reference
+to the object that will be dropped when the handle is destroyed. To
+avoid leaking GEM objects, drivers must make sure they drop the
+reference(s) they own (such as the initial reference taken at object
+creation time) as appropriate, without any special consideration for the
+handle. For example, in the particular case of combined GEM object and
+handle creation in the implementation of the dumb_create operation,
+drivers must drop the initial reference to the GEM object before
+returning the handle.
+
+GEM names are similar in purpose to handles but are not local to DRM
+files. They can be passed between processes to reference a GEM object
+globally. Names can't be used directly to refer to objects in the DRM
+API, applications must convert handles to names and names to handles
+using the DRM_IOCTL_GEM_FLINK and DRM_IOCTL_GEM_OPEN ioctls
+respectively. The conversion is handled by the DRM core without any
+driver-specific support.
+
+GEM also supports buffer sharing with dma-buf file descriptors through
+PRIME. GEM-based drivers must use the provided helpers functions to
+implement the exporting and importing correctly. See ?. Since sharing
+file descriptors is inherently more secure than the easily guessable and
+global GEM names it is the preferred buffer sharing mechanism. Sharing
+buffers through GEM names is only supported for legacy userspace.
+Furthermore PRIME also allows cross-device buffer sharing since it is
+based on dma-bufs.
+
+GEM Objects Mapping
+~~~~~~~~~~~~~~~~~~~
+
+Because mapping operations are fairly heavyweight GEM favours
+read/write-like access to buffers, implemented through driver-specific
+ioctls, over mapping buffers to userspace. However, when random access
+to the buffer is needed (to perform software rendering for instance),
+direct access to the object can be more efficient.
+
+The mmap system call can't be used directly to map GEM objects, as they
+don't have their own file handle. Two alternative methods currently
+co-exist to map GEM objects to userspace. The first method uses a
+driver-specific ioctl to perform the mapping operation, calling
+:c:func:`do_mmap()` under the hood. This is often considered
+dubious, seems to be discouraged for new GEM-enabled drivers, and will
+thus not be described here.
+
+The second method uses the mmap system call on the DRM file handle. void
+\*mmap(void \*addr, size_t length, int prot, int flags, int fd, off_t
+offset); DRM identifies the GEM object to be mapped by a fake offset
+passed through the mmap offset argument. Prior to being mapped, a GEM
+object must thus be associated with a fake offset. To do so, drivers
+must call :c:func:`drm_gem_create_mmap_offset()` on the object.
+
+Once allocated, the fake offset value must be passed to the application
+in a driver-specific way and can then be used as the mmap offset
+argument.
+
+The GEM core provides a helper method :c:func:`drm_gem_mmap()` to
+handle object mapping. The method can be set directly as the mmap file
+operation handler. It will look up the GEM object based on the offset
+value and set the VMA operations to the :c:type:`struct drm_driver
+<drm_driver>` gem_vm_ops field. Note that
+:c:func:`drm_gem_mmap()` doesn't map memory to userspace, but
+relies on the driver-provided fault handler to map pages individually.
+
+To use :c:func:`drm_gem_mmap()`, drivers must fill the struct
+:c:type:`struct drm_driver <drm_driver>` gem_vm_ops field
+with a pointer to VM operations.
+
+struct vm_operations_struct \*gem_vm_ops struct
+vm_operations_struct { void (\*open)(struct vm_area_struct \* area);
+void (\*close)(struct vm_area_struct \* area); int (\*fault)(struct
+vm_area_struct \*vma, struct vm_fault \*vmf); };
+
+The open and close operations must update the GEM object reference
+count. Drivers can use the :c:func:`drm_gem_vm_open()` and
+:c:func:`drm_gem_vm_close()` helper functions directly as open
+and close handlers.
+
+The fault operation handler is responsible for mapping individual pages
+to userspace when a page fault occurs. Depending on the memory
+allocation scheme, drivers can allocate pages at fault time, or can
+decide to allocate memory for the GEM object at the time the object is
+created.
+
+Drivers that want to map the GEM object upfront instead of handling page
+faults can implement their own mmap file operation handler.
+
+Memory Coherency
+~~~~~~~~~~~~~~~~
+
+When mapped to the device or used in a command buffer, backing pages for
+an object are flushed to memory and marked write combined so as to be
+coherent with the GPU. Likewise, if the CPU accesses an object after the
+GPU has finished rendering to the object, then the object must be made
+coherent with the CPU's view of memory, usually involving GPU cache
+flushing of various kinds. This core CPU<->GPU coherency management is
+provided by a device-specific ioctl, which evaluates an object's current
+domain and performs any necessary flushing or synchronization to put the
+object into the desired coherency domain (note that the object may be
+busy, i.e. an active render target; in that case, setting the domain
+blocks the client and waits for rendering to complete before performing
+any necessary flushing operations).
+
+Command Execution
+~~~~~~~~~~~~~~~~~
+
+Perhaps the most important GEM function for GPU devices is providing a
+command execution interface to clients. Client programs construct
+command buffers containing references to previously allocated memory
+objects, and then submit them to GEM. At that point, GEM takes care to
+bind all the objects into the GTT, execute the buffer, and provide
+necessary synchronization between clients accessing the same buffers.
+This often involves evicting some objects from the GTT and re-binding
+others (a fairly expensive operation), and providing relocation support
+which hides fixed GTT offsets from clients. Clients must take care not
+to submit command buffers that reference more objects than can fit in
+the GTT; otherwise, GEM will reject them and no rendering will occur.
+Similarly, if several objects in the buffer require fence registers to
+be allocated for correct rendering (e.g. 2D blits on pre-965 chips),
+care must be taken not to require more fence registers than are
+available to the client. Such resource management should be abstracted
+from the client in libdrm.
+
+GEM Function Reference
+----------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_gem.c
+   :export:
+
+.. kernel-doc:: include/drm/drm_gem.h
+   :internal:
+
+VMA Offset Manager
+------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_vma_manager.c
+   :doc: vma offset manager
+
+.. kernel-doc:: drivers/gpu/drm/drm_vma_manager.c
+   :export:
+
+.. kernel-doc:: include/drm/drm_vma_manager.h
+   :internal:
+
+PRIME Buffer Sharing
+--------------------
+
+PRIME is the cross device buffer sharing framework in drm, originally
+created for the OPTIMUS range of multi-gpu platforms. To userspace PRIME
+buffers are dma-buf based file descriptors.
+
+Overview and Driver Interface
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Similar to GEM global names, PRIME file descriptors are also used to
+share buffer objects across processes. They offer additional security:
+as file descriptors must be explicitly sent over UNIX domain sockets to
+be shared between applications, they can't be guessed like the globally
+unique GEM names.
+
+Drivers that support the PRIME API must set the DRIVER_PRIME bit in the
+struct :c:type:`struct drm_driver <drm_driver>`
+driver_features field, and implement the prime_handle_to_fd and
+prime_fd_to_handle operations.
+
+int (\*prime_handle_to_fd)(struct drm_device \*dev, struct drm_file
+\*file_priv, uint32_t handle, uint32_t flags, int \*prime_fd); int
+(\*prime_fd_to_handle)(struct drm_device \*dev, struct drm_file
+\*file_priv, int prime_fd, uint32_t \*handle); Those two operations
+convert a handle to a PRIME file descriptor and vice versa. Drivers must
+use the kernel dma-buf buffer sharing framework to manage the PRIME file
+descriptors. Similar to the mode setting API PRIME is agnostic to the
+underlying buffer object manager, as long as handles are 32bit unsigned
+integers.
+
+While non-GEM drivers must implement the operations themselves, GEM
+drivers must use the :c:func:`drm_gem_prime_handle_to_fd()` and
+:c:func:`drm_gem_prime_fd_to_handle()` helper functions. Those
+helpers rely on the driver gem_prime_export and gem_prime_import
+operations to create a dma-buf instance from a GEM object (dma-buf
+exporter role) and to create a GEM object from a dma-buf instance
+(dma-buf importer role).
+
+struct dma_buf \* (\*gem_prime_export)(struct drm_device \*dev,
+struct drm_gem_object \*obj, int flags); struct drm_gem_object \*
+(\*gem_prime_import)(struct drm_device \*dev, struct dma_buf
+\*dma_buf); These two operations are mandatory for GEM drivers that
+support PRIME.
+
+PRIME Helper Functions
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/gpu/drm/drm_prime.c
+   :doc: PRIME Helpers
+
+PRIME Function References
+-------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_prime.c
+   :export:
+
+DRM MM Range Allocator
+----------------------
+
+Overview
+~~~~~~~~
+
+.. kernel-doc:: drivers/gpu/drm/drm_mm.c
+   :doc: Overview
+
+LRU Scan/Eviction Support
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/gpu/drm/drm_mm.c
+   :doc: lru scan roaster
+
+DRM MM Range Allocator Function References
+------------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_mm.c
+   :export:
+
+.. kernel-doc:: include/drm/drm_mm.h
+   :internal:
+
+CMA Helper Functions Reference
+------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c
+   :doc: cma helpers
+
+.. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c
+   :export:
+
+.. kernel-doc:: include/drm/drm_gem_cma_helper.h
+   :internal:
diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst
new file mode 100644
index 000000000000..536bf3eaadd4
--- /dev/null
+++ b/Documentation/gpu/drm-uapi.rst
@@ -0,0 +1,111 @@
+===================
+Userland interfaces
+===================
+
+The DRM core exports several interfaces to applications, generally
+intended to be used through corresponding libdrm wrapper functions. In
+addition, drivers export device-specific interfaces for use by userspace
+drivers & device-aware applications through ioctls and sysfs files.
+
+External interfaces include: memory mapping, context management, DMA
+operations, AGP management, vblank control, fence management, memory
+management, and output management.
+
+Cover generic ioctls and sysfs layout here. We only need high-level
+info, since man pages should cover the rest.
+
+libdrm Device Lookup
+====================
+
+.. kernel-doc:: drivers/gpu/drm/drm_ioctl.c
+   :doc: getunique and setversion story
+
+
+Primary Nodes, DRM Master and Authentication
+============================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_auth.c
+   :doc: master and authentication
+
+.. kernel-doc:: drivers/gpu/drm/drm_auth.c
+   :export:
+
+.. kernel-doc:: include/drm/drm_auth.h
+   :internal:
+
+Render nodes
+============
+
+DRM core provides multiple character-devices for user-space to use.
+Depending on which device is opened, user-space can perform a different
+set of operations (mainly ioctls). The primary node is always created
+and called card<num>. Additionally, a currently unused control node,
+called controlD<num> is also created. The primary node provides all
+legacy operations and historically was the only interface used by
+userspace. With KMS, the control node was introduced. However, the
+planned KMS control interface has never been written and so the control
+node stays unused to date.
+
+With the increased use of offscreen renderers and GPGPU applications,
+clients no longer require running compositors or graphics servers to
+make use of a GPU. But the DRM API required unprivileged clients to
+authenticate to a DRM-Master prior to getting GPU access. To avoid this
+step and to grant clients GPU access without authenticating, render
+nodes were introduced. Render nodes solely serve render clients, that
+is, no modesetting or privileged ioctls can be issued on render nodes.
+Only non-global rendering commands are allowed. If a driver supports
+render nodes, it must advertise it via the DRIVER_RENDER DRM driver
+capability. If not supported, the primary node must be used for render
+clients together with the legacy drmAuth authentication procedure.
+
+If a driver advertises render node support, DRM core will create a
+separate render node called renderD<num>. There will be one render node
+per device. No ioctls except PRIME-related ioctls will be allowed on
+this node. Especially GEM_OPEN will be explicitly prohibited. Render
+nodes are designed to avoid the buffer-leaks, which occur if clients
+guess the flink names or mmap offsets on the legacy interface.
+Additionally to this basic interface, drivers must mark their
+driver-dependent render-only ioctls as DRM_RENDER_ALLOW so render
+clients can use them. Driver authors must be careful not to allow any
+privileged ioctls on render nodes.
+
+With render nodes, user-space can now control access to the render node
+via basic file-system access-modes. A running graphics server which
+authenticates clients on the privileged primary/legacy node is no longer
+required. Instead, a client can open the render node and is immediately
+granted GPU access. Communication between clients (or servers) is done
+via PRIME. FLINK from render node to legacy node is not supported. New
+clients must not use the insecure FLINK interface.
+
+Besides dropping all modeset/global ioctls, render nodes also drop the
+DRM-Master concept. There is no reason to associate render clients with
+a DRM-Master as they are independent of any graphics server. Besides,
+they must work without any running master, anyway. Drivers must be able
+to run without a master object if they support render nodes. If, on the
+other hand, a driver requires shared state between clients which is
+visible to user-space and accessible beyond open-file boundaries, they
+cannot support render nodes.
+
+VBlank event handling
+=====================
+
+The DRM core exposes two vertical blank related ioctls:
+
+DRM_IOCTL_WAIT_VBLANK
+    This takes a struct drm_wait_vblank structure as its argument, and
+    it is used to block or request a signal when a specified vblank
+    event occurs.
+
+DRM_IOCTL_MODESET_CTL
+    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.
+
+This second part of the GPU Driver Developer's Guide documents driver
+code, implementation details and also all the driver-specific userspace
+interfaces. Especially since all hardware-acceleration interfaces to
+userspace are driver specific for efficiency and other reasons these
+interfaces can be rather substantial. Hence every driver has its own
+chapter.
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
new file mode 100644
index 000000000000..2fe5952e90f1
--- /dev/null
+++ b/Documentation/gpu/i915.rst
@@ -0,0 +1,347 @@
+===========================
+ drm/i915 Intel GFX Driver
+===========================
+
+The drm/i915 driver supports all (with the exception of some very early
+models) integrated GFX chipsets with both Intel display and rendering
+blocks. This excludes a set of SoC platforms with an SGX rendering unit,
+those have basic support through the gma500 drm driver.
+
+Core Driver Infrastructure
+==========================
+
+This section covers core driver infrastructure used by both the display
+and the GEM parts of the driver.
+
+Runtime Power Management
+------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_runtime_pm.c
+   :doc: runtime pm
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_runtime_pm.c
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_uncore.c
+   :internal:
+
+Interrupt Handling
+------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_irq.c
+   :doc: interrupt handling
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_irq.c
+   :functions: intel_irq_init intel_irq_init_hw intel_hpd_init
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_irq.c
+   :functions: intel_runtime_pm_disable_interrupts
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_irq.c
+   :functions: intel_runtime_pm_enable_interrupts
+
+Intel GVT-g Guest Support(vGPU)
+-------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_vgpu.c
+   :doc: Intel GVT-g guest support
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_vgpu.c
+   :internal:
+
+Display Hardware Handling
+=========================
+
+This section covers everything related to the display hardware including
+the mode setting infrastructure, plane, sprite and cursor handling and
+display, output probing and related topics.
+
+Mode Setting Infrastructure
+---------------------------
+
+The i915 driver is thus far the only DRM driver which doesn't use the
+common DRM helper code to implement mode setting sequences. Thus it has
+its own tailor-made infrastructure for executing a display configuration
+change.
+
+Frontbuffer Tracking
+--------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c
+   :doc: frontbuffer tracking
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem.c
+   :functions: i915_gem_track_fb
+
+Display FIFO Underrun Reporting
+-------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_fifo_underrun.c
+   :doc: fifo underrun handling
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_fifo_underrun.c
+   :internal:
+
+Plane Configuration
+-------------------
+
+This section covers plane configuration and composition with the primary
+plane, sprites, cursors and overlays. This includes the infrastructure
+to do atomic vsync'ed updates of all this state and also tightly coupled
+topics like watermark setup and computation, framebuffer compression and
+panel self refresh.
+
+Atomic Plane Helpers
+--------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_atomic_plane.c
+   :doc: atomic plane helpers
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_atomic_plane.c
+   :internal:
+
+Output Probing
+--------------
+
+This section covers output probing and related infrastructure like the
+hotplug interrupt storm detection and mitigation code. Note that the
+i915 driver still uses most of the common DRM helper code for output
+probing, so those sections fully apply.
+
+Hotplug
+-------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_hotplug.c
+   :doc: Hotplug
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_hotplug.c
+   :internal:
+
+High Definition Audio
+---------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c
+   :doc: High Definition Audio over HDMI and Display Port
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c
+   :internal:
+
+.. kernel-doc:: include/drm/i915_component.h
+   :internal:
+
+Panel Self Refresh PSR (PSR/SRD)
+--------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_psr.c
+   :doc: Panel Self Refresh (PSR/SRD)
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_psr.c
+   :internal:
+
+Frame Buffer Compression (FBC)
+------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_fbc.c
+   :doc: Frame Buffer Compression (FBC)
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_fbc.c
+   :internal:
+
+Display Refresh Rate Switching (DRRS)
+-------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :doc: Display Refresh Rate Switching (DRRS)
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :functions: intel_dp_set_drrs_state
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :functions: intel_edp_drrs_enable
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :functions: intel_edp_drrs_disable
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :functions: intel_edp_drrs_invalidate
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :functions: intel_edp_drrs_flush
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c
+   :functions: intel_dp_drrs_init
+
+DPIO
+----
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
+   :doc: DPIO
+
+CSR firmware support for DMC
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_csr.c
+   :doc: csr support for dmc
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_csr.c
+   :internal:
+
+Video BIOS Table (VBT)
+----------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_bios.c
+   :doc: Video BIOS Table (VBT)
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_bios.c
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h
+   :internal:
+
+Memory Management and Command Submission
+========================================
+
+This sections covers all things related to the GEM implementation in the
+i915 driver.
+
+Batchbuffer Parsing
+-------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_cmd_parser.c
+   :doc: batch buffer command parser
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_cmd_parser.c
+   :internal:
+
+Batchbuffer Pools
+-----------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_batch_pool.c
+   :doc: batch pool
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_batch_pool.c
+   :internal:
+
+Logical Rings, Logical Ring Contexts and Execlists
+--------------------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lrc.c
+   :doc: Logical Rings, Logical Ring Contexts and Execlists
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lrc.c
+   :internal:
+
+Global GTT views
+----------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_gtt.c
+   :doc: Global GTT views
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_gtt.c
+   :internal:
+
+GTT Fences and Swizzling
+------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence.c
+   :internal:
+
+Global GTT Fence Handling
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence.c
+   :doc: fence register handling
+
+Hardware Tiling and Swizzling Details
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence.c
+   :doc: tiling swizzling details
+
+Object Tiling IOCTLs
+--------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
+   :internal:
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
+   :doc: buffer object tiling
+
+Buffer Object Eviction
+----------------------
+
+This section documents the interface functions for evicting buffer
+objects to make space available in the virtual gpu address spaces. Note
+that this is mostly orthogonal to shrinking buffer objects caches, which
+has the goal to make main memory (shared with the gpu through the
+unified memory architecture) available.
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_evict.c
+   :internal:
+
+Buffer Object Memory Shrinking
+------------------------------
+
+This section documents the interface function for shrinking memory usage
+of buffer object caches. Shrinking is used to make main memory
+available. Note that this is mostly orthogonal to evicting buffer
+objects, which has the goal to make space in gpu virtual address spaces.
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_shrinker.c
+   :internal:
+
+GuC
+===
+
+GuC-specific firmware loader
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
+   :doc: GuC-specific firmware loader
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
+   :internal:
+
+GuC-based command submission
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c
+   :doc: GuC-based command submission
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c
+   :internal:
+
+GuC Firmware Layout
+-------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fwif.h
+   :doc: GuC Firmware Layout
+
+Tracing
+=======
+
+This sections covers all things related to the tracepoints implemented
+in the i915 driver.
+
+i915_ppgtt_create and i915_ppgtt_release
+----------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h
+   :doc: i915_ppgtt_create and i915_ppgtt_release tracepoints
+
+i915_context_create and i915_context_free
+-----------------------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h
+   :doc: i915_context_create and i915_context_free tracepoints
+
+switch_mm
+---------
+
+.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h
+   :doc: switch_mm tracepoint
+
+.. WARNING: DOCPROC directive not supported: !Cdrivers/gpu/drm/i915/i915_irq.c
diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst
new file mode 100644
index 000000000000..fcac0fa72056
--- /dev/null
+++ b/Documentation/gpu/index.rst
@@ -0,0 +1,14 @@
+==================================
+Linux GPU Driver Developer's Guide
+==================================
+
+.. toctree::
+
+   introduction
+   drm-internals
+   drm-mm
+   drm-kms
+   drm-kms-helpers
+   drm-uapi
+   i915
+   vga-switcheroo
diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
new file mode 100644
index 000000000000..1903595b5310
--- /dev/null
+++ b/Documentation/gpu/introduction.rst
@@ -0,0 +1,51 @@
+============
+Introduction
+============
+
+The Linux DRM layer contains code intended to support the needs of
+complex graphics devices, usually containing programmable pipelines well
+suited to 3D graphics acceleration. Graphics drivers in the kernel may
+make use of DRM functions to make tasks like memory management,
+interrupt handling and DMA easier, and provide a uniform interface to
+applications.
+
+A note on versions: this guide covers features found in the DRM tree,
+including the TTM memory manager, output configuration and mode setting,
+and the new vblank internals, in addition to all the regular features
+found in current kernels.
+
+[Insert diagram of typical DRM stack here]
+
+Style Guidelines
+================
+
+For consistency this documentation uses American English. Abbreviations
+are written as all-uppercase, for example: DRM, KMS, IOCTL, CRTC, and so
+on. To aid in reading, documentations make full use of the markup
+characters kerneldoc provides: @parameter for function parameters,
+@member for structure members, &structure to reference structures and
+function() for functions. These all get automatically hyperlinked if
+kerneldoc for the referenced objects exists. When referencing entries in
+function vtables please use ->vfunc(). Note that kerneldoc does not
+support referencing struct members directly, so please add a reference
+to the vtable struct somewhere in the same paragraph or at least
+section.
+
+Except in special situations (to separate locked from unlocked variants)
+locking requirements for functions aren't documented in the kerneldoc.
+Instead locking should be check at runtime using e.g.
+``WARN_ON(!mutex_is_locked(...));``. Since it's much easier to ignore
+documentation than runtime noise this provides more value. And on top of
+that runtime checks do need to be updated when the locking rules change,
+increasing the chances that they're correct. Within the documentation
+the locking rules should be explained in the relevant structures: Either
+in the comment for the lock explaining what it protects, or data fields
+need a note about which lock protects them, or both.
+
+Functions which have a non-\ ``void`` return value should have a section
+called "Returns" explaining the expected return values in different
+cases and their meanings. Currently there's no consensus whether that
+section name should be all upper-case or not, and whether it should end
+in a colon or not. Go with the file-local style. Other common section
+names are "Notes" with information for dangerous or tricky corner cases,
+and "FIXME" where the interface could be cleaned up.
diff --git a/Documentation/gpu/kms-properties.csv b/Documentation/gpu/kms-properties.csv
new file mode 100644
index 000000000000..b6fcaf639c04
--- /dev/null
+++ b/Documentation/gpu/kms-properties.csv
@@ -0,0 +1,128 @@
+Owner Module/Drivers,Group,Property Name,Type,Property Values,Object attached,Description/Restrictions
+DRM,Generic,“rotation�,BITMASK,"{ 0, ""rotate-0"" }, { 1, ""rotate-90"" }, { 2, ""rotate-180"" }, { 3, ""rotate-270"" }, { 4, ""reflect-x"" }, { 5, ""reflect-y"" }","CRTC, Plane",rotate-(degrees) rotates the image by the specified amount in degrees in counter clockwise direction. reflect-x and reflect-y reflects the image along the specified axis prior to rotation
+,,“scaling mode�,ENUM,"{ ""None"", ""Full"", ""Center"", ""Full aspect"" }",Connector,"Supported by: amdgpu, gma500, i915, nouveau and radeon."
+,Connector,“EDID�,BLOB | IMMUTABLE,0,Connector,Contains id of edid blob ptr object.
+,,“DPMS�,ENUM,"{ “On�, “Standby�, “Suspend�, “Off� }",Connector,Contains DPMS operation mode value.
+,,“PATH�,BLOB | IMMUTABLE,0,Connector,Contains topology path to a connector.
+,,“TILE�,BLOB | IMMUTABLE,0,Connector,Contains tiling information for a connector.
+,,“CRTC_ID�,OBJECT,DRM_MODE_OBJECT_CRTC,Connector,CRTC that connector is attached to (atomic)
+,Plane,“type�,ENUM | IMMUTABLE,"{ ""Overlay"", ""Primary"", ""Cursor"" }",Plane,Plane type
+,,“SRC_X�,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source x coordinate in 16.16 fixed point (atomic)
+,,“SRC_Y�,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source y coordinate in 16.16 fixed point (atomic)
+,,“SRC_W�,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source width in 16.16 fixed point (atomic)
+,,“SRC_H�,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source height in 16.16 fixed point (atomic)
+,,“CRTC_X�,SIGNED_RANGE,"Min=INT_MIN, Max=INT_MAX",Plane,Scanout CRTC (destination) x coordinate (atomic)
+,,“CRTC_Y�,SIGNED_RANGE,"Min=INT_MIN, Max=INT_MAX",Plane,Scanout CRTC (destination) y coordinate (atomic)
+,,“CRTC_W�,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout CRTC (destination) width (atomic)
+,,“CRTC_H�,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout CRTC (destination) height (atomic)
+,,“FB_ID�,OBJECT,DRM_MODE_OBJECT_FB,Plane,Scanout framebuffer (atomic)
+,,“CRTC_ID�,OBJECT,DRM_MODE_OBJECT_CRTC,Plane,CRTC that plane is attached to (atomic)
+,DVI-I,“subconnector�,ENUM,"{ “Unknown�, “DVI-D�, “DVI-A� }",Connector,TBD
+,,“select subconnector�,ENUM,"{ “Automatic�, “DVI-D�, “DVI-A� }",Connector,TBD
+,TV,“subconnector�,ENUM,"{ ""Unknown"", ""Composite"", ""SVIDEO"", ""Component"", ""SCART"" }",Connector,TBD
+,,“select subconnector�,ENUM,"{ ""Automatic"", ""Composite"", ""SVIDEO"", ""Component"", ""SCART"" }",Connector,TBD
+,,“mode�,ENUM,"{ ""NTSC_M"", ""NTSC_J"", ""NTSC_443"", ""PAL_B"" } etc.",Connector,TBD
+,,“left margin�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“right margin�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“top margin�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“bottom margin�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“brightness�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“contrast�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“flicker reduction�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“overscan�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“saturation�,RANGE,"Min=0, Max=100",Connector,TBD
+,,“hue�,RANGE,"Min=0, Max=100",Connector,TBD
+,Virtual GPU,“suggested X�,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an X offset for a connector
+,,“suggested Y�,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an Y offset for a connector
+,Optional,"""aspect ratio""",ENUM,"{ ""None"", ""4:3"", ""16:9"" }",Connector,TDB
+,,“dirty�,ENUM | IMMUTABLE,"{ ""Off"", ""On"", ""Annotate"" }",Connector,TBD
+,,“DEGAMMA_LUT�,BLOB,0,CRTC,DRM property to set the degamma lookup table (LUT) mapping pixel data from the framebuffer before it is given to the transformation matrix. The data is an interpreted as an array of struct drm_color_lut elements. Hardware might choose not to use the full precision of the LUT elements nor use all the elements of the LUT (for example the hardware might choose to interpolate between LUT[0] and LUT[4]).
+,,“DEGAMMA_LUT_SIZE�,RANGE | IMMUTABLE,"Min=0, Max=UINT_MAX",CRTC,DRM property to gives the size of the lookup table to be set on the DEGAMMA_LUT property (the size depends on the underlying hardware).
+,,“CTM�,BLOB,0,CRTC,DRM property to set the current transformation matrix (CTM) apply to pixel data after the lookup through the degamma LUT and before the lookup through the gamma LUT. The data is an interpreted as a struct drm_color_ctm.
+,,“GAMMA_LUT�,BLOB,0,CRTC,DRM property to set the gamma lookup table (LUT) mapping pixel data after to the transformation matrix to data sent to the connector. The data is an interpreted as an array of struct drm_color_lut elements. Hardware might choose not to use the full precision of the LUT elements nor use all the elements of the LUT (for example the hardware might choose to interpolate between LUT[0] and LUT[4]).
+,,“GAMMA_LUT_SIZE�,RANGE | IMMUTABLE,"Min=0, Max=UINT_MAX",CRTC,DRM property to gives the size of the lookup table to be set on the GAMMA_LUT property (the size depends on the underlying hardware).
+i915,Generic,"""Broadcast RGB""",ENUM,"{ ""Automatic"", ""Full"", ""Limited 16:235"" }",Connector,"When this property is set to Limited 16:235 and CTM is set, the hardware will be programmed with the result of the multiplication of CTM by the limited range matrix to ensure the pixels normaly in the range 0..1.0 are remapped to the range 16/255..235/255."
+,,“audio�,ENUM,"{ ""force-dvi"", ""off"", ""auto"", ""on"" }",Connector,TBD
+,SDVO-TV,“mode�,ENUM,"{ ""NTSC_M"", ""NTSC_J"", ""NTSC_443"", ""PAL_B"" } etc.",Connector,TBD
+,,"""left_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,"""right_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,"""top_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,"""bottom_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“hpos�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“vpos�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“contrast�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“saturation�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“hue�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“sharpness�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“flicker_filter�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“flicker_filter_adaptive�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“flicker_filter_2d�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“tv_chroma_filter�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“tv_luma_filter�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“dot_crawl�,RANGE,"Min=0, Max=1",Connector,TBD
+,SDVO-TV/LVDS,“brightness�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+CDV gma-500,Generic,"""Broadcast RGB""",ENUM,"{ “Full�, “Limited 16:235� }",Connector,TBD
+,,"""Broadcast RGB""",ENUM,"{ “off�, “auto�, “on� }",Connector,TBD
+Poulsbo,Generic,“backlight�,RANGE,"Min=0, Max=100",Connector,TBD
+,SDVO-TV,“mode�,ENUM,"{ ""NTSC_M"", ""NTSC_J"", ""NTSC_443"", ""PAL_B"" } etc.",Connector,TBD
+,,"""left_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,"""right_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,"""top_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,"""bottom_margin""",RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“hpos�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“vpos�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“contrast�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“saturation�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“hue�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“sharpness�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“flicker_filter�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“flicker_filter_adaptive�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“flicker_filter_2d�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“tv_chroma_filter�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“tv_luma_filter�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+,,“dot_crawl�,RANGE,"Min=0, Max=1",Connector,TBD
+,SDVO-TV/LVDS,“brightness�,RANGE,"Min=0, Max= SDVO dependent",Connector,TBD
+armada,CRTC,"""CSC_YUV""",ENUM,"{ ""Auto"" , ""CCIR601"", ""CCIR709"" }",CRTC,TBD
+,,"""CSC_RGB""",ENUM,"{ ""Auto"", ""Computer system"", ""Studio"" }",CRTC,TBD
+,Overlay,"""colorkey""",RANGE,"Min=0, Max=0xffffff",Plane,TBD
+,,"""colorkey_min""",RANGE,"Min=0, Max=0xffffff",Plane,TBD
+,,"""colorkey_max""",RANGE,"Min=0, Max=0xffffff",Plane,TBD
+,,"""colorkey_val""",RANGE,"Min=0, Max=0xffffff",Plane,TBD
+,,"""colorkey_alpha""",RANGE,"Min=0, Max=0xffffff",Plane,TBD
+,,"""colorkey_mode""",ENUM,"{ ""disabled"", ""Y component"", ""U component"" , ""V component"", ""RGB"", “R component"", ""G component"", ""B component"" }",Plane,TBD
+,,"""brightness""",RANGE,"Min=0, Max=256 + 255",Plane,TBD
+,,"""contrast""",RANGE,"Min=0, Max=0x7fff",Plane,TBD
+,,"""saturation""",RANGE,"Min=0, Max=0x7fff",Plane,TBD
+exynos,CRTC,“mode�,ENUM,"{ ""normal"", ""blank"" }",CRTC,TBD
+,Overlay,“zpos�,RANGE,"Min=0, Max=MAX_PLANE-1",Plane,TBD
+i2c/ch7006_drv,Generic,“scale�,RANGE,"Min=0, Max=2",Connector,TBD
+,TV,“mode�,ENUM,"{ ""PAL"", ""PAL-M"",""PAL-N""}, �PAL-Nc"" , ""PAL-60"", ""NTSC-M"", ""NTSC-J"" }",Connector,TBD
+nouveau,NV10 Overlay,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD
+,,“contrast�,RANGE,"Min=0, Max=8192-1",Plane,TBD
+,,“brightness�,RANGE,"Min=0, Max=1024",Plane,TBD
+,,“hue�,RANGE,"Min=0, Max=359",Plane,TBD
+,,“saturation�,RANGE,"Min=0, Max=8192-1",Plane,TBD
+,,“iturbt_709�,RANGE,"Min=0, Max=1",Plane,TBD
+,Nv04 Overlay,“colorkey�,RANGE,"Min=0, Max=0x01ffffff",Plane,TBD
+,,“brightness�,RANGE,"Min=0, Max=1024",Plane,TBD
+,Display,“dithering mode�,ENUM,"{ ""auto"", ""off"", ""on"" }",Connector,TBD
+,,“dithering depth�,ENUM,"{ ""auto"", ""off"", ""on"", ""static 2x2"", ""dynamic 2x2"", ""temporal"" }",Connector,TBD
+,,“underscan�,ENUM,"{ ""auto"", ""6 bpc"", ""8 bpc"" }",Connector,TBD
+,,“underscan hborder�,RANGE,"Min=0, Max=128",Connector,TBD
+,,“underscan vborder�,RANGE,"Min=0, Max=128",Connector,TBD
+,,“vibrant hue�,RANGE,"Min=0, Max=180",Connector,TBD
+,,“color vibrance�,RANGE,"Min=0, Max=200",Connector,TBD
+omap,Generic,“zorder�,RANGE,"Min=0, Max=3","CRTC, Plane",TBD
+qxl,Generic,"“hotplug_mode_update""",RANGE,"Min=0, Max=1",Connector,TBD
+radeon,DVI-I,“coherent�,RANGE,"Min=0, Max=1",Connector,TBD
+,DAC enable load detect,“load detection�,RANGE,"Min=0, Max=1",Connector,TBD
+,TV Standard,"""tv standard""",ENUM,"{ ""ntsc"", ""pal"", ""pal-m"", ""pal-60"", ""ntsc-j"" , ""scart-pal"", ""pal-cn"", ""secam"" }",Connector,TBD
+,legacy TMDS PLL detect,"""tmds_pll""",ENUM,"{ ""driver"", ""bios"" }",-,TBD
+,Underscan,"""underscan""",ENUM,"{ ""off"", ""on"", ""auto"" }",Connector,TBD
+,,"""underscan hborder""",RANGE,"Min=0, Max=128",Connector,TBD
+,,"""underscan vborder""",RANGE,"Min=0, Max=128",Connector,TBD
+,Audio,“audio�,ENUM,"{ ""off"", ""on"", ""auto"" }",Connector,TBD
+,FMT Dithering,“dither�,ENUM,"{ ""off"", ""on"" }",Connector,TBD
+rcar-du,Generic,"""alpha""",RANGE,"Min=0, Max=255",Plane,TBD
+,,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD
+,,"""zpos""",RANGE,"Min=1, Max=7",Plane,TBD
diff --git a/Documentation/gpu/vga-switcheroo.rst b/Documentation/gpu/vga-switcheroo.rst
new file mode 100644
index 000000000000..327d930a2229
--- /dev/null
+++ b/Documentation/gpu/vga-switcheroo.rst
@@ -0,0 +1,102 @@
+==============
+VGA Switcheroo
+==============
+
+.. kernel-doc:: drivers/gpu/vga/vga_switcheroo.c
+   :doc: Overview
+
+Modes of Use
+============
+
+Manual switching and manual power control
+-----------------------------------------
+
+.. kernel-doc:: drivers/gpu/vga/vga_switcheroo.c
+   :doc: Manual switching and manual power control
+
+Driver power control
+--------------------
+
+.. kernel-doc:: drivers/gpu/vga/vga_switcheroo.c
+   :doc: Driver power control
+
+API
+===
+
+Public functions
+----------------
+
+.. kernel-doc:: drivers/gpu/vga/vga_switcheroo.c
+   :export:
+
+Public structures
+-----------------
+
+.. kernel-doc:: include/linux/vga_switcheroo.h
+   :functions: vga_switcheroo_handler
+
+.. kernel-doc:: include/linux/vga_switcheroo.h
+   :functions: vga_switcheroo_client_ops
+
+Public constants
+----------------
+
+.. kernel-doc:: include/linux/vga_switcheroo.h
+   :functions: vga_switcheroo_handler_flags_t
+
+.. kernel-doc:: include/linux/vga_switcheroo.h
+   :functions: vga_switcheroo_client_id
+
+.. kernel-doc:: include/linux/vga_switcheroo.h
+   :functions: vga_switcheroo_state
+
+Private structures
+------------------
+
+.. kernel-doc:: drivers/gpu/vga/vga_switcheroo.c
+   :functions: vgasr_priv
+
+.. kernel-doc:: drivers/gpu/vga/vga_switcheroo.c
+   :functions: vga_switcheroo_client
+
+Handlers
+========
+
+apple-gmux Handler
+------------------
+
+.. kernel-doc:: drivers/platform/x86/apple-gmux.c
+   :doc: Overview
+
+.. kernel-doc:: drivers/platform/x86/apple-gmux.c
+   :doc: Interrupt
+
+Graphics mux
+~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/platform/x86/apple-gmux.c
+   :doc: Graphics mux
+
+Power control
+~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/platform/x86/apple-gmux.c
+   :doc: Power control
+
+Backlight control
+~~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/platform/x86/apple-gmux.c
+   :doc: Backlight control
+
+Public functions
+~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: include/linux/apple-gmux.h
+   :internal:
+
+.. WARNING: DOCPROC directive not supported: !Cdrivers/gpu/vga/vga_switcheroo.c
+
+.. WARNING: DOCPROC directive not supported: !Cinclude/linux/vga_switcheroo.h
+
+.. WARNING: DOCPROC directive not supported: !Cdrivers/platform/x86/apple-gmux.c
diff --git a/Documentation/index.rst b/Documentation/index.rst
new file mode 100644
index 000000000000..dacc77b43c29
--- /dev/null
+++ b/Documentation/index.rst
@@ -0,0 +1,24 @@
+.. The Linux Kernel documentation master file, created by
+   sphinx-quickstart on Fri Feb 12 13:51:46 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to The Linux Kernel's documentation!
+============================================
+
+Nothing for you to see here *yet*. Please move along.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   gpu/index
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/Documentation/kdump/gdbmacros.txt b/Documentation/kdump/gdbmacros.txt
index 35f6a982a0d5..220d0a80ca2c 100644
--- a/Documentation/kdump/gdbmacros.txt
+++ b/Documentation/kdump/gdbmacros.txt
@@ -170,21 +170,92 @@ document trapinfo
         address the kernel panicked.
 end
 
+define dump_log_idx
+        set $idx = $arg0
+        if ($argc > 1)
+                set $prev_flags = $arg1
+        else
+                set $prev_flags = 0
+        end
+        set $msg = ((struct printk_log *) (log_buf + $idx))
+        set $prefix = 1
+        set $newline = 1
+        set $log = log_buf + $idx + sizeof(*$msg)
 
-define dmesg
-        set $i = 0
-        set $end_idx = (log_end - 1) & (log_buf_len - 1)
+        # prev & LOG_CONT && !(msg->flags & LOG_PREIX)
+        if (($prev_flags & 8) && !($msg->flags & 4))
+                set $prefix = 0
+        end
+
+        # msg->flags & LOG_CONT
+        if ($msg->flags & 8)
+                # (prev & LOG_CONT && !(prev & LOG_NEWLINE))
+                if (($prev_flags & 8) && !($prev_flags & 2))
+                        set $prefix = 0
+                end
+                # (!(msg->flags & LOG_NEWLINE))
+                if (!($msg->flags & 2))
+                        set $newline = 0
+                end
+        end
+
+        if ($prefix)
+                printf "[%5lu.%06lu] ", $msg->ts_nsec / 1000000000, $msg->ts_nsec % 1000000000
+        end
+        if ($msg->text_len != 0)
+                eval "printf \"%%%d.%ds\", $log", $msg->text_len, $msg->text_len
+        end
+        if ($newline)
+                printf "\n"
+        end
+        if ($msg->dict_len > 0)
+                set $dict = $log + $msg->text_len
+                set $idx = 0
+                set $line = 1
+                while ($idx < $msg->dict_len)
+                        if ($line)
+                                printf " "
+                                set $line = 0
+                        end
+                        set $c = $dict[$idx]
+                        if ($c == '\0')
+                                printf "\n"
+                                set $line = 1
+                        else
+                                if ($c < ' ' || $c >= 127 || $c == '\\')
+                                        printf "\\x%02x", $c
+                                else
+                                        printf "%c", $c
+                                end
+                        end
+                        set $idx = $idx + 1
+                end
+                printf "\n"
+        end
+end
+document dump_log_idx
+        Dump a single log given its index in the log buffer.  The first
+        parameter is the index into log_buf, the second is optional and
+        specified the previous log buffer's flags, used for properly
+        formatting continued lines.
+end
 
-        while ($i < logged_chars)
-                set $idx = (log_end - 1 - logged_chars + $i) & (log_buf_len - 1)
+define dmesg
+        set $i = log_first_idx
+        set $end_idx = log_first_idx
+        set $prev_flags = 0
 
-                if ($idx + 100 <= $end_idx) || \
-                   ($end_idx <= $idx && $idx + 100 < log_buf_len)
-                        printf "%.100s", &log_buf[$idx]
-                        set $i = $i + 100
+        while (1)
+                set $msg = ((struct printk_log *) (log_buf + $i))
+                if ($msg->len == 0)
+                        set $i = 0
                 else
-                        printf "%c", log_buf[$idx]
-                        set $i = $i + 1
+                        dump_log_idx $i $prev_flags
+                        set $i = $i + $msg->len
+                        set $prev_flags = $msg->flags
+                end
+                if ($i == $end_idx)
+                        loop_break
                 end
         end
 end
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 82b42c958d1c..a2a662d4da83 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3992,8 +3992,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         trace_event=[event-list]
                         [FTRACE] Set and start specified trace events in order
-                        to facilitate early boot debugging.
-                        See also Documentation/trace/events.txt
+                        to facilitate early boot debugging. The event-list is a
+                        comma separated list of trace events to enable. See
+                        also Documentation/trace/events.txt
 
         trace_options=[option-list]
                         [FTRACE] Enable or disable tracer options at boot.
diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt
index d406d98339b2..44f5e6bccd97 100644
--- a/Documentation/leds/leds-class.txt
+++ b/Documentation/leds/leds-class.txt
@@ -74,8 +74,8 @@ blink_set() function (see <linux/leds.h>). To set an LED to blinking,
 however, it is better to use the API function led_blink_set(), as it
 will check and implement software fallback if necessary.
 
-To turn off blinking again, use the API function led_brightness_set()
-as that will not just set the LED brightness but also stop any software
+To turn off blinking, use the API function led_brightness_set()
+with brightness value LED_OFF, which should stop any software
 timers that may have been required for blinking.
 
 The blink_set() function should choose a user friendly blinking value
diff --git a/Documentation/mic/mpssd/mpssd.c b/Documentation/mic/mpssd/mpssd.c
index 30fb842a976d..49db1def1721 100644
--- a/Documentation/mic/mpssd/mpssd.c
+++ b/Documentation/mic/mpssd/mpssd.c
@@ -1538,9 +1538,9 @@ set_cmdline(struct mic_info *mic)
 
         len = snprintf(buffer, PATH_MAX,
                 "clocksource=tsc highres=off nohz=off ");
-        len += snprintf(buffer + len, PATH_MAX,
+        len += snprintf(buffer + len, PATH_MAX - len,
                 "cpufreq_on;corec6_off;pc3_off;pc6_off ");
-        len += snprintf(buffer + len, PATH_MAX,
+        len += snprintf(buffer + len, PATH_MAX - len,
                 "ifcfg=static;address,172.31.%d.1;netmask,255.255.255.0",
                 mic->id + 1);
 
diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.txt
index 631b0f7ae16f..9d05ed7f7da5 100644
--- a/Documentation/networking/dsa/dsa.txt
+++ b/Documentation/networking/dsa/dsa.txt
@@ -369,8 +369,6 @@ does not allocate any driver private context space.
 Switch configuration
 --------------------
 
-- priv_size: additional size needed by the switch driver for its private context
-
 - tag_protocol: this is to indicate what kind of tagging protocol is supported,
   should be a valid value from the dsa_tag_protocol enum
 
@@ -416,11 +414,6 @@ PHY devices and link management
   to the switch port MDIO registers. If unavailable return a negative error
   code.
 
-- poll_link: Function invoked by DSA to query the link state of the switch
-  builtin Ethernet PHYs, per port. This function is responsible for calling
-  netif_carrier_{on,off} when appropriate, and can be used to poll all ports in a
-  single call. Executes from workqueue context.
-
 - adjust_link: Function invoked by the PHY library when a slave network device
   is attached to a PHY device. This function is responsible for appropriately
   configuring the switch port link parameters: speed, duplex, pause based on
@@ -542,6 +535,16 @@ Bridge layer
 Bridge VLAN filtering
 ---------------------
 
+- port_vlan_filtering: bridge layer function invoked when the bridge gets
+  configured for turning on or off VLAN filtering. If nothing specific needs to
+  be done at the hardware level, this callback does not need to be implemented.
+  When VLAN filtering is turned on, the hardware must be programmed with
+  rejecting 802.1Q frames which have VLAN IDs outside of the programmed allowed
+  VLAN ID map/rules.  If there is no PVID programmed into the switch port,
+  untagged frames must be rejected as well. When turned off the switch must
+  accept any 802.1Q frames irrespective of their VLAN ID, and untagged frames are
+  allowed.
+
 - port_vlan_prepare: bridge layer function invoked when the bridge prepares the
   configuration of a VLAN on the given port. If the operation is not supported
   by the hardware, this function should return -EOPNOTSUPP to inform the bridge
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 6c7f365b1515..9ae929395b24 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1036,15 +1036,17 @@ proxy_arp_pvlan - BOOLEAN
 
 shared_media - BOOLEAN
         Send(router) or accept(host) RFC1620 shared media redirects.
-        Overrides ip_secure_redirects.
+        Overrides secure_redirects.
         shared_media for the interface will be enabled if at least one of
         conf/{all,interface}/shared_media is set to TRUE,
         it will be disabled otherwise
         default TRUE
 
 secure_redirects - BOOLEAN
-        Accept ICMP redirect messages only for gateways,
-        listed in default gateway list.
+        Accept ICMP redirect messages only to gateways listed in the
+        interface's current gateway list. Even if disabled, RFC1122 redirect
+        rules still apply.
+        Overridden by shared_media.
         secure_redirects for the interface will be enabled if at least one of
         conf/{all,interface}/secure_redirects is set to TRUE,
         it will be disabled otherwise
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index 8638f61c8c9d..37eca00796ee 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -263,19 +263,23 @@ scmd->allowed.
 
  3. scmd recovered
     ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd
-        - shost->host_failed--
         - clear scmd->eh_eflags
         - scsi_setup_cmd_retry()
         - move from local eh_work_q to local eh_done_q
     LOCKING: none
+    CONCURRENCY: at most one thread per separate eh_work_q to
+                 keep queue manipulation lockless
 
  4. EH completes
     ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper
-            layer of failure.
+            layer of failure. May be called concurrently but must have
+            a no more than one thread per separate eh_work_q to
+            manipulate the queue locklessly
         - scmd is removed from eh_done_q and scmd->eh_entry is cleared
         - if retry is necessary, scmd is requeued using
           scsi_queue_insert()
         - otherwise, scsi_finish_command() is invoked for scmd
+        - zero shost->host_failed
     LOCKING: queue or finish function performs appropriate locking
 
 
diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt
index 20d05719bceb..3849814bfe6d 100644
--- a/Documentation/security/keys.txt
+++ b/Documentation/security/keys.txt
@@ -826,7 +826,8 @@ The keyctl syscall functions are:
  (*) Compute a Diffie-Hellman shared secret or public key
 
        long keyctl(KEYCTL_DH_COMPUTE, struct keyctl_dh_params *params,
-                   char *buffer, size_t buflen);
+                   char *buffer, size_t buflen,
+                   void *reserved);
 
      The params struct contains serial numbers for three keys:
 
@@ -843,6 +844,8 @@ The keyctl syscall functions are:
      public key.  If the base is the remote public key, the result is
      the shared secret.
 
+     The reserved argument must be set to NULL.
+
      The buffer length must be at least the length of the prime, or zero.
 
      If the buffer length is nonzero, the length of the result is
diff --git a/Documentation/security/self-protection.txt b/Documentation/security/self-protection.txt
index babd6378ec05..3010576c9fca 100644
--- a/Documentation/security/self-protection.txt
+++ b/Documentation/security/self-protection.txt
@@ -183,8 +183,9 @@ provide meaningful defenses.
 ### Canaries, blinding, and other secrets
 
 It should be noted that things like the stack canary discussed earlier
-are technically statistical defenses, since they rely on a (leakable)
-secret value.
+are technically statistical defenses, since they rely on a secret value,
+and such values may become discoverable through an information exposure
+flaw.
 
 Blinding literal values for things like JITs, where the executable
 contents may be partially under the control of userspace, need a similar
@@ -199,8 +200,8 @@ working?) in order to maximize their success.
 Since the location of kernel memory is almost always instrumental in
 mounting a successful attack, making the location non-deterministic
 raises the difficulty of an exploit. (Note that this in turn makes
-the value of leaks higher, since they may be used to discover desired
-memory locations.)
+the value of information exposures higher, since they may be used to
+discover desired memory locations.)
 
 #### Text and module base
 
@@ -222,14 +223,21 @@ become more difficult to locate.
 Much of the kernel's dynamic memory (e.g. kmalloc, vmalloc, etc) ends up
 being relatively deterministic in layout due to the order of early-boot
 initializations. If the base address of these areas is not the same
-between boots, targeting them is frustrated, requiring a leak specific
-to the region.
+between boots, targeting them is frustrated, requiring an information
+exposure specific to the region.
+
+#### Structure layout
+
+By performing a per-build randomization of the layout of sensitive
+structures, attacks must either be tuned to known kernel builds or expose
+enough kernel memory to determine structure layouts before manipulating
+them.
 
 
-## Preventing Leaks
+## Preventing Information Exposures
 
 Since the locations of sensitive structures are the primary target for
-attacks, it is important to defend against leaks of both kernel memory
+attacks, it is important to defend against exposure of both kernel memory
 addresses and kernel memory contents (since they may contain kernel
 addresses or other sensitive things like canary values).
 
@@ -250,8 +258,8 @@ sure structure holes are cleared.
 When releasing memory, it is best to poison the contents (clear stack on
 syscall return, wipe heap memory on a free), to avoid reuse attacks that
 rely on the old contents of memory. This frustrates many uninitialized
-variable attacks, stack info leaks, heap info leaks, and use-after-free
-attacks.
+variable attacks, stack content exposures, heap content exposures, and
+use-after-free attacks.
 
 ### Destination tracking
 
diff --git a/Documentation/sphinx/convert_template.sed b/Documentation/sphinx/convert_template.sed
new file mode 100644
index 000000000000..c1503fcca4ec
--- /dev/null
+++ b/Documentation/sphinx/convert_template.sed
@@ -0,0 +1,18 @@
+#
+# Pandoc doesn't grok <function> or <structname>, so convert them
+# ahead of time.
+#
+# Use the following escapes to pass through pandoc:
+#       $bq = "`"
+#       $lt = "<"
+#       $gt = ">"
+#
+s%<function>\([^<(]\+\)()</function>%:c:func:$bq\1()$bq%g
+s%<function>\([^<(]\+\)</function>%:c:func:$bq\1()$bq%g
+s%<structname>struct *\([^<]\+\)</structname>%:c:type:$bqstruct \1 $lt\1$gt$bq%g
+s%struct <structname>\([^<]\+\)</structname>%:c:type:$bqstruct \1 $lt\1$gt$bq%g
+s%<structname>\([^<]\+\)</structname>%:c:type:$bqstruct \1 $lt\1$gt$bq%g
+#
+# Wrap docproc directives in para and code blocks.
+#
+s%^\(!.*\)$%<para><code>DOCPROC: \1</code></para>%
diff --git a/Documentation/sphinx/kernel-doc.py b/Documentation/sphinx/kernel-doc.py
new file mode 100644
index 000000000000..4adfb0e91ecc
--- /dev/null
+++ b/Documentation/sphinx/kernel-doc.py
@@ -0,0 +1,127 @@
+# coding=utf-8
+#
+# Copyright © 2016 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:
+#    Jani Nikula <jani.nikula@intel.com>
+#
+# Please make sure this works on both python2 and python3.
+#
+
+import os
+import subprocess
+import sys
+import re
+
+from docutils import nodes, statemachine
+from docutils.statemachine import ViewList
+from docutils.parsers.rst import directives
+from sphinx.util.compat import Directive
+
+class KernelDocDirective(Directive):
+    """Extract kernel-doc comments from the specified file"""
+    required_argument = 1
+    optional_arguments = 4
+    option_spec = {
+        'doc': directives.unchanged_required,
+        'functions': directives.unchanged_required,
+        'export': directives.flag,
+        'internal': directives.flag,
+    }
+    has_content = False
+
+    def run(self):
+        env = self.state.document.settings.env
+        cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno']
+
+        filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
+
+        # Tell sphinx of the dependency
+        env.note_dependency(os.path.abspath(filename))
+
+        tab_width = self.options.get('tab-width', self.state.document.settings.tab_width)
+        source = filename
+
+        # FIXME: make this nicer and more robust against errors
+        if 'export' in self.options:
+            cmd += ['-export']
+        elif 'internal' in self.options:
+            cmd += ['-internal']
+        elif 'doc' in self.options:
+            cmd += ['-function', str(self.options.get('doc'))]
+        elif 'functions' in self.options:
+            for f in str(self.options.get('functions')).split(' '):
+                cmd += ['-function', f]
+
+        cmd += [filename]
+
+        try:
+            env.app.verbose('calling kernel-doc \'%s\'' % (" ".join(cmd)))
+
+            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+            out, err = p.communicate()
+
+            # python2 needs conversion to unicode.
+            # python3 with universal_newlines=True returns strings.
+            if sys.version_info.major < 3:
+                out, err = unicode(out, 'utf-8'), unicode(err, 'utf-8')
+
+            if p.returncode != 0:
+                sys.stderr.write(err)
+
+                env.app.warn('kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
+                return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
+            elif env.config.kerneldoc_verbosity > 0:
+                sys.stderr.write(err)
+
+            lines = statemachine.string2lines(out, tab_width, convert_whitespace=True)
+            result = ViewList()
+
+            lineoffset = 0;
+            line_regex = re.compile("^#define LINENO ([0-9]+)$")
+            for line in lines:
+                match = line_regex.search(line)
+                if match:
+                    # sphinx counts lines from 0
+                    lineoffset = int(match.group(1)) - 1
+                    # we must eat our comments since the upset the markup
+                else:
+                    result.append(line, source, lineoffset)
+                    lineoffset += 1
+
+            node = nodes.section()
+            node.document = self.state.document
+            self.state.nested_parse(result, self.content_offset, node)
+
+            return node.children
+
+        except Exception as e:
+            env.app.warn('kernel-doc \'%s\' processing failed with: %s' %
+                         (" ".join(cmd), str(e)))
+            return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
+
+def setup(app):
+    app.add_config_value('kerneldoc_bin', None, 'env')
+    app.add_config_value('kerneldoc_srctree', None, 'env')
+    app.add_config_value('kerneldoc_verbosity', 1, 'env')
+
+    app.add_directive('kernel-doc', KernelDocDirective)
diff --git a/Documentation/sphinx/post_convert.sed b/Documentation/sphinx/post_convert.sed
new file mode 100644
index 000000000000..392770bac53b
--- /dev/null
+++ b/Documentation/sphinx/post_convert.sed
@@ -0,0 +1,23 @@
+#
+# Unescape.
+#
+s/$bq/`/g
+s/$lt/</g
+s/$gt/>/g
+#
+# pandoc thinks that both "_" needs to be escaped.  Remove the extra
+# backslashes.
+#
+s/\\_/_/g
+#
+# Unwrap docproc directives.
+#
+s/^``DOCPROC: !E\(.*\)``$/.. kernel-doc:: \1\n   :export:/
+s/^``DOCPROC: !I\(.*\)``$/.. kernel-doc:: \1\n   :internal:/
+s/^``DOCPROC: !F\([^ ]*\) \(.*\)``$/.. kernel-doc:: \1\n   :functions: \2/
+s/^``DOCPROC: !P\([^ ]*\) \(.*\)``$/.. kernel-doc:: \1\n   :doc: \2/
+s/^``DOCPROC: \(!.*\)``$/.. WARNING: DOCPROC directive not supported: \1/
+#
+# Trim trailing whitespace.
+#
+s/[[:space:]]*$//
diff --git a/Documentation/sphinx/tmplcvt b/Documentation/sphinx/tmplcvt
new file mode 100755
index 000000000000..909a73065e0a
--- /dev/null
+++ b/Documentation/sphinx/tmplcvt
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Convert a template file into something like RST
+#
+# fix <function>
+# feed to pandoc
+# fix \_
+# title line?
+#
+
+in=$1
+rst=$2
+tmp=$rst.tmp
+
+cp $in $tmp
+sed --in-place -f convert_template.sed $tmp
+pandoc -s -S -f docbook -t rst -o $rst $tmp
+sed --in-place -f post_convert.sed $rst
+rm $tmp
diff --git a/Documentation/sync_file.txt b/Documentation/sync_file.txt
index eaf8297dbca2..e8e2ebafe5fa 100644
--- a/Documentation/sync_file.txt
+++ b/Documentation/sync_file.txt
@@ -6,8 +6,8 @@
 
 This document serves as a guide for device drivers writers on what the
 sync_file API is, and how drivers can support it. Sync file is the carrier of
-the fences(struct fence) that needs to synchronized between drivers or across
-process boundaries.
+the fences(struct fence) that are needed to synchronize between drivers or
+across process boundaries.
 
 The sync_file API is meant to be used to send and receive fence information
 to/from userspace. It enables userspace to do explicit fencing, where instead
@@ -32,7 +32,7 @@ in-fences and out-fences
 Sync files can go either to or from userspace. When a sync_file is sent from
 the driver to userspace we call the fences it contains 'out-fences'. They are
 related to a buffer that the driver is processing or is going to process, so
-the driver an create out-fence to be able to notify, through fence_signal(),
+the driver creates an out-fence to be able to notify, through fence_signal(),
 when it has finished using (or processing) that buffer. Out-fences are fences
 that the driver creates.
 
diff --git a/Documentation/zh_CN/CodingStyle b/Documentation/zh_CN/CodingStyle
index 654afd72eb24..bbb9d6ae05ca 100644
--- a/Documentation/zh_CN/CodingStyle
+++ b/Documentation/zh_CN/CodingStyle
@@ -24,34 +24,33 @@ Documentation/CodingStyle的中文翻译
 
                 Linux内核代�风格
 
-这是一个简短的文档，�述了linux内核的首选代�风格。代�风格是因人而异的，而且我
-�愿�把我的观点强加给任何人，�过这里所讲述的是我必须�维护的代�所�守的风格，
-并且我也希望�大多数其他代�也能�守这个风格。请在写代�时至少考虑一下本文所述的
-风格。
+这是一个简短的文档，�述了 linux 内核的首选代�风格。代�风格是因人而异的，而且我
+�愿�把自己的观点强加给任何人，但这就�我去�任何事情都必须�循的原则那样，我也
+希望在�大多数事上��这�的�度。请（在写代�时）至少考虑一下这里的代�风格。
 
-首先，我建议你打�一份GNU代�规范，然���读它。烧了它，这是一个具有�大象�性
-�义的动作。
+首先，我建议你打�一份 GNU 代�规范，然���读。烧了它，这是一个具有�大象�性�义
+的动作。
 
 �管怎样，现在我们开始：
 
 
-                第一章：缩进
+                第一章：缩进
 
-制表符是8个字符，所以缩进也是8个字符。有些异端�动试图将缩进�为4（乃至2）个字符
-深，这几乎相当于�试将圆周率的值定义为3。
+制表符是 8 个字符，所以缩进也是 8 个字符。有些异端�动试图将缩进�为 4（甚至 2�）
+个字符深，这几乎相当于�试将圆周率的值定义为 3。
 
 �由：缩进的全部�义就在于清楚的定义一个控制�起止于何处。尤其是当你盯�你的�幕
-连续看了20�时之�，你将会�现大一点的缩进会使你更容易分辨缩进。
+连续看了 20 �时之�，你将会�现大一点的缩进会使你更容易分辨缩进。
 
-现在，有些人会抱怨8个字符的缩进会使代���边移动的太远，在80个字符的终端�幕上
-就很难读这样的代�。这个问题的答案是，如果你需�3级以上的缩进，�管用何�方�你
+现在，有些人会抱怨 8 个字符的缩进会使代���边移动的太远，在 80 个字符的终端�幕上
+就很难读这样的代�。这个问题的答案是，如果你需� 3 级以上的缩进，�管用何�方�你
 的代�已�有问题了，应该修正你的程�。
 
-简而言之，8个字符的缩进�以让代�更容易阅读，还有一个好处是当你的函数嵌套太深的
+简而言之，8 个字符的缩进�以让代�更容易阅读，还有一个好处是当你的函数嵌套太深的
 时候�以给你警告。留心这个警告。
 
-在switch语�中消除多级缩进的首选的方�是让“switch�和从属于它的“case�标签对�于�
-一列，而��“两次缩进�“case�标签。比如：
+在 switch 语�中消除多级缩进的首选的方�是让 “switch� 和从属于它的 “case� 标签
+对�于�一列，而�� “两次缩进� “case� 标签。比如：
 
         switch (suffix) {
         case 'G':
@@ -70,7 +69,6 @@ Documentation/CodingStyle的中文翻译
                 break;
         }
 
-
 ��把多个语�放在一行里，除�你有什么东西���：
 
         if (condition) do_this;
@@ -79,7 +77,7 @@ Documentation/CodingStyle的中文翻译
 也��在一行里放多个赋值语�。内核代�风格超级简�。就是���能导致别人误读的表
 达�。
 
-除了注释�文档和Kconfig之外，��使用空格�缩进，��的例�是例外，是有�为之。
+除了注释�文档和 Kconfig 之外，��使用空格�缩进，��的例�是例外，是有�为之。
 
 选用一个好的编辑器，��在行尾留空格。
 
@@ -88,27 +86,18 @@ Documentation/CodingStyle的中文翻译
 
 代�风格的�义就在于使用平常使用的工具�维�代�的�读性和�维护性。
 
-�一行的长度的�制是80列，我们强烈建议您�守这个惯例。
+�一行的长度的�制是 80 列，我们强烈建议您�守这个惯例。
 
-长于80列的语��打散�有�义的片段。�个片段�明显短于原�的语�，而且放置的�置
-也明显的��。�样的规则也适用于有很长�数列表的函数头。长字符串也�打散�较短的
-字符串。唯一的例外是超过80列�以大幅度�高�读性并且�会��信�的情况。
-
-void fun(int a, int b, int c)
-{
-        if (condition)
-                printk(KERN_WARNING "Warning this is a long printk with "
-                                                "3 parameters a: %u b: %u "
-                                                "c: %u \n", a, b, c);
-        else
-                next_statement;
-}
+长于 80 列的语��打散�有�义的片段。除�超过 80 列能显著增加�读性，并且�会��
+信�。�片段�明显短于�片段，并明显��。这�样适用于有�很长�数列表的函数头。
+然而，�对��打散对用户��的字符串，例如 printk 信�，因为这将导致无法 grep 这些
+信�。
 
                 第三章：大括�和空格的放置
 
 C语言风格中�外一个常�问题是大括�的放置。和缩进大���，选择或弃用��放置策
-略并没有多少技术上的原因，�过首选的方�，就�Kernighan和Ritchie展示给我们的，是
-把起始大括�放在行尾，而把结�大括�放在行首，所以：
+略并没有多少技术上的原因，�过首选的方�，就� Kernighan 和 Ritchie 展示给我们的，
+是把起始大括�放在行尾，而把结�大括�放在行首，所以：
 
         if (x is true) {
                 we do y
@@ -134,12 +123,12 @@ C语言风格中å�¦å¤–一个常è§�问题是大括å�·çš„放置。和缩进大å°�ä
                 body of function
         }
 
-全世界的异端�能会抱怨这个�一致性是……呃……�一致的，�过所有�维�全的人都知�（
-a）K&R是_正确的_，并且（b）K&R是正确的。此外，�管怎样函数都是特殊的（在C语言中
-，函数是�能嵌套的）。
+全世界的异端�能会抱怨这个�一致性是……呃……�一致的，�过所有�维�全的人都知�
+(a) K&R 是 _正确的_，并且 (b) K&R 是正确的。此外，�管怎样函数都是特殊的（C
+函数是�能嵌套的）。
 
-注�结�大括�独自��一行，除�它��跟��一个语�的剩余部分，也就是do语�中的
-“while�或者if语�中的“else�，�这样：
+注�结�大括�独自��一行，除�它��跟��一个语�的剩余部分，也就是 do 语�中的
+“while� 或者 if 语�中的 “else�，�这样：
 
         do {
                 body of do-loop
@@ -158,41 +147,50 @@ a）K&R是_正确的_，并且（b）K&R是正确的。此外，ä¸�管怎样函æ
 �由：K&R。
 
 也请注�这�大括�的放置方�也能使空（或者差�多空的）行的数�最�化，�时�失�
-读性。因此，由于你的�幕上的新行是���生资�（想想25行的终端�幕），你将会有更
+读性。因此，由于你的�幕上的新行是���生资�（想想 25 行的终端�幕），你将会有更
 多的空行�放置注释。
 
 当�有一个�独的语�的时候，�用加�必�的大括�。
 
-if (condition)
-        action();
+        if (condition)
+                action();
+
+和
+
+        if (condition)
+                do_this();
+        else
+                do_that();
 
-这点�适用于本身为�个�件语�的一个分支的�独语�。这时需�在两个分支里都使用大
-括�。
+这并�适用于�有一个�件分支是�语�的情况；这时所有分支都�使用大括�：
 
-if (condition) {
-        do_this();
-        do_that();
-} else {
-        otherwise();
-}
+        if (condition) {
+                do_this();
+                do_that();
+        } else {
+                otherwise();
+        }
 
                 3.1：空格
 
-Linux内核的空格使用方�（主�）�决于它是用于函数还是关键字。（大多数）关键字�
-�加一个空格。值得注�的例外是sizeof�typeof�alignof和__attribute__，这些关键字
-�些程度上看起�更�函数（它们在Linux里也常常伴��括�而使用，尽管在C语言里这样
-的�括��是必需的，就�“struct fileinfo info�声明过�的“sizeof info�）。
+Linux 内核的空格使用方�（主�）�决于它是用于函数还是关键字。（大多数）关键字�
+�加一个空格。值得注�的例外是 sizeof�typeof�alignof 和 __attribute__，这些
+关键字�些程度上看起�更�函数（它们在 Linux 里也常常伴��括�而使用，尽管在 C 里
+这样的�括��是必需的，就� “struct fileinfo info� 声明过�的 “sizeof info�）。
 
 所以在这些关键字之�放一个空格：
+
         if, switch, case, for, do, while
-但是��在sizeof�typeof�alignof或者__attribute__这些关键字之�放空格。例如，
+
+但是��在 sizeof�typeof�alignof 或者 __attribute__ 这些关键字之�放空格。例如，
+
         s = sizeof(struct file);
 
 ��在�括�里的表达�两侧加空格。这是一个�例：
 
         s = sizeof( struct file );
 
-当声明指针类型或者返回指针类型的函数时，“*�的首选使用方�是使之�近���或者函
+当声明指针类型或者返回指针类型的函数时，“*� 的首选使用方�是使之�近���或者函
 数�，而�是�近类型�。例�：
 
         char *linux_banner;
@@ -204,15 +202,18 @@ Linux内核的空格使用方�（主�）�决于它是用于函数还是关
         =  +  -  <  >  *  /  %  |  &  ^  <=  >=  ==  !=  ?  :
 
 但是一元�作符���加空格：
+
         &  *  +  -  ~  !  sizeof  typeof  alignof  __attribute__  defined
 
 �缀自加和自�一元�作符��加空格：
+
         ++  --
 
 �缀自加和自�一元�作符��加空格：
+
         ++  --
 
-“.�和“->�结构体�员�作符���加空格。
+‘.’ 和 “->� 结构体�员�作符���加空格。
 
 ��在行尾留空白。有些�以自动缩进的编辑器会在新行的行首加入适�的空白，然�你
 就�以直接在那一行输入代�。�过�如你最�没有在那一行输入代�，有些编辑器就�
@@ -225,23 +226,23 @@ Linux内核的空格使用方�（主�）�决于它是用于函数还是关
 
                 第四章：命�
 
-C是一个简朴的语言，你的命�也应该这样。和Modula-2和Pascal程�员��，C程�员�使
-用类似ThisVariableIsATemporaryCounter这样�丽的�字。C程�员会称那个��为“tmp�
-，这样写起�会更容易，而且至少�会令其难于�解。
+C是一个简朴的语言，你的命�也应该这样。和 Modula-2 和 Pascal 程�员��，C 程�员
+�使用类似 ThisVariableIsATemporaryCounter 这样�丽的�字。C 程�员会称那个��
+为 “tmp�，这样写起�会更容易，而且至少�会令其难于�解。
 
 �过，虽然混用大�写的�字是��倡使用的，但是全局��还是需�一个具�述性的�字
-。称一个全局函数为“foo�是一个难以饶�的错误。
+。称一个全局函数为 “foo� 是一个难以饶�的错误。
 
 全局��（�有当你真正需�它们的时候�用它）需�有一个具�述性的�字，就�全局函
-数。如果你有一个�以计算活动用户数�的函数，你应该�它“count_active_users()�或者
-类似的�字，你�应该�它“cntuser()�。
+数。如果你有一个�以计算活动用户数�的函数，你应该�它 “count_active_users()�
+或者类似的�字，你�应该�它 “cntuser()�。
 
 在函数�中包�函数类型（所谓的匈牙利命�法）是脑�出了问题——编译器知�那些类型而
 且能够检查那些类型，这样��能把程�员弄糊涂了。难怪微软总是制造出有问题的程�。
 
 本地���应该简短，而且能够表达相关的�义。如果你有一些�机的整数型的循环计数器
-，它应该被称为“i�。�它“loop_counter�并无益处，如果它没有被误解的�能的�。类似
-的，“tmp��以用�称呼任�类型的临时��。
+，它应该被称为 “i�。�它 “loop_counter� 并无益处，如果它没有被误解的�能的�。
+类似的，“tmp� �以用�称呼任�类型的临时��。
 
 如果你怕混淆了你的本地���，你就�到�一个问题了，��函数增长�尔蒙失衡综�症
 。请看第六章（函数）。
@@ -249,9 +250,9 @@ C是一个简朴的语言，你的命å��也应该这样。和Modula-2å’ŒPascalç¨
 
                 第五章：Typedef
 
-��使用类似“vps_t�之类的东西。
+��使用类似 “vps_t� 之类的东西。
 
-对结构体和指针使用typedef是一个错误。当你在代�里看到：
+对结构体和指针使用 typedef 是一个错误。当你在代�里看到：
 
         vps_t a;
 
@@ -261,91 +262,91 @@ C是一个简朴的语言，你的命å��也应该这样。和Modula-2å’ŒPascalç¨
 
         struct virtual_container *a;
 
-你就知�“a�是什么了。
+你就知� “a� 是什么了。
 
-很多人认为typedef“能�高�读性�。实际�是这样的。它们�在下列情况下有用：
+很多人认为 typedef “能�高�读性�。实际�是这样的。它们�在下列情况下有用：
 
- (a) 完全��明的对象（这�情况下�主动使用typedef���这个对象实际上是什么）。
+ (a) 完全��明的对象（这�情况下�主动使用 typedef ���这个对象实际上是什么）。
 
-     例如：“pte_t�等��明对象，你�能用�适的访问函数�访问它们。
+     例如：“pte_t� 等��明对象，你�能用�适的访问函数�访问它们。
 
-     注����明性和“访问函数�本身是�好的。我们使用pte_t等类型的原因在于真的是
+     注����明性和“访问函数�本身是�好的。我们使用 pte_t 等类型的原因在于真的是
      完全没有任何共用的�访问信�。
 
- (b) 清楚的整数类型，如此，这层抽象就�以帮助消除到底是“int�还是“long�的混淆。
+ (b) 清楚的整数类型，如此，这层抽象就�以帮助消除到底是 “int� 还是 “long� 的混淆。
 
-     u8/u16/u32是完全没有问题的typedef，�过它们更符�类别(d)而�是这里。
+     u8/u16/u32 是完全没有问题的 typedef，�过它们更符�类别 (d) 而�是这里。
 
-     �次注���这样�，必须事出有因。如果�个��是“unsigned long“，那么没有必�
+     �次注���这样�，必须事出有因。如果�个��是 “unsigned long“，那么没有必�
 
         typedef unsigned long myflags_t;
 
-     �过如果有一个明确的原因，比如它在��情况下�能会是一个“unsigned int�而在
-     其他情况下�能为“unsigned long�，那么就��犹豫，请务必使用typedef。
+     �过如果有一个明确的原因，比如它在��情况下�能会是一个 “unsigned int� 而在
+     其他情况下�能为 “unsigned long�，那么就��犹豫，请务必使用 typedef。
 
  (c) 当你使用sparse按字�的创建一个新类型��类型检查的时候。
 
  (d) 和标准C99类型相�的类型，在�些例外的情况下。
 
-     虽然让眼�和脑筋�适应新的标准类型比如“uint32_t��需�花很多时间，�是有些
+     虽然让眼�和脑筋�适应新的标准类型比如 “uint32_t� �需�花很多时间，�是有些
      人�然拒�使用它们。
 
-     因此，Linux特有的等�于标准类型的“u8/u16/u32/u64�类型和它们的有符�类型是被
+     因此，Linux 特有的等�于标准类型的 “u8/u16/u32/u64� 类型和它们的有符�类型是被
      �许的——尽管在你自己的新代�中，它们�是强制�求�使用的。
 
      当编辑已�使用了�个类型集的已有代�时，你应该�循那些代�中已��出的选择。
 
  (e) �以在用户空间安全使用的类型。
 
-     在�些用户空间��的结构体里，我们�能�求C99类型而且�能用上��到的“u32�
-     类型。因此，我们在与用户空间共享的所有结构体中使用__u32和类似的类型。
+     在�些用户空间��的结构体里，我们�能�求C99类型而且�能用上��到的 “u32�
+     类型。因此，我们在与用户空间共享的所有结构体中使用 __u32 和类似的类型。
 
-�能还有其他的情况，�过基本的规则是永远��使用typedef，除�你�以明确的应用上
+�能还有其他的情况，�过基本的规则是永远��使用 typedef，除�你�以明确的应用上
 述�个规则中的一个。
 
 总的�说，如果一个指针或者一个结构体里的元素�以��的被直接访问到，那么它们就�
-应该是一个typedef。
+应该是一个 typedef。
 
 
                 第六章：函数
 
 函数应该简短而漂亮，并且�完�一件事情。函数应该�以一�或者两�显示完（我们都知
-�ISO/ANSI�幕大�是80x24），��一件事情，而且把它�好。
+� ISO/ANSI �幕大�是 80x24），��一件事情，而且把它�好。
 
 一个函数的最大长度是和该函数的��度和缩进级数��比的。所以，如果你有一个�论上
-很简�的�有一个很长（但是简�）的case语�的函数，而且你需�在�个case里�很多很
-�的事情，这样的函数尽管很长，但也是�以的。
+很简�的�有一个很长（但是简�）的 case 语�的函数，而且你需�在�个 case 里�
+很多很�的事情，这样的函数尽管很长，但也是�以的。
 
 �过，如果你有一个��的函数，而且你怀疑一个天分�是很高的高中一年级学生�能甚至
 ��清楚这个函数的目的，你应该严格的�守���到的长度�制。使用辅助函数，并为之
 �个具�述性的�字（如果你觉得它们的性能很��的�，�以让编译器内�它们，这样的
 效果往往会比你写一个��函数的效果�好。）
 
-函数的�外一个衡�标准是本地��的数�。此数��应超过5�10个，�则你的函数就有
+函数的�外一个衡�标准是本地��的数�。此数��应超过 5�10 个，�则你的函数就有
 问题了。�新考虑一下你的函数，把它分拆�更�的函数。人的大脑一般�以轻�的�时跟
-踪7个��的事物，如果�增多的�，就会糊涂了。�便你�颖过人，你也�能会记�清你2
-个星期��过的事情。
+踪 7 个��的事物，如果�增多的�，就会糊涂了。�便你�颖过人，你也�能会记�清你
+2 个星期��过的事情。
 
-在�文件里，使用空行隔开��的函数。如果该函数需�被导出，它的EXPORT*�应该紧贴
+在�文件里，使用空行隔开��的函数。如果该函数需�被导出，它的 EXPORT* �应该紧贴
 在它的结�大括�之下。比如：
 
-int system_is_up(void)
-{
-        return system_state == SYSTEM_RUNNING;
-}
-EXPORT_SYMBOL(system_is_up);
+        int system_is_up(void)
+        {
+                return system_state == SYSTEM_RUNNING;
+        }
+        EXPORT_SYMBOL(system_is_up);
 
-在函数原型中，包�函数�和它们的数�类型。虽然C语言里没有这样的�求，在Linux里这
+在函数原型中，包�函数�和它们的数�类型。虽然C语言里没有这样的�求，在 Linux 里这
 是�倡的�法，因为这样�以很简�的给读者�供更多的有价值的信�。
 
 
                 第七章：集中的函数退出途径
 
-虽然被�些人声称已�过时，但是goto语�的等价物还是�常被编译器所使用，具体形�是
+虽然被�些人声称已�过时，但是 goto 语�的等价物还是�常被编译器所使用，具体形�是
 无�件跳转指令。
 
-当一个函数从多个�置退出并且需��一些通用的清�工作的时候，goto的好处就显现出�
-了。
+当一个函数从多个�置退出，并且需��一些类似清�的常��作时，goto 语�就很方便了。
+如果并�需�清��作，那么直接 return ��。
 
 �由是：
 
@@ -354,26 +355,37 @@ EXPORT_SYMBOL(system_is_up);
 - �以��由于修改时忘记更新�个�独的退出点而导致的错误
 - �轻了编译器的工作，无需删除冗余代�;)
 
-int fun(int a)
-{
-        int result = 0;
-        char *buffer = kmalloc(SIZE);
-
-        if (buffer == NULL)
-                return -ENOMEM;
-
-        if (condition1) {
-                while (loop1) {
-                        ...
+        int fun(int a)
+        {
+                int result = 0;
+                char *buffer;
+
+                buffer = kmalloc(SIZE, GFP_KERNEL);
+                if (!buffer)
+                        return -ENOMEM;
+
+                if (condition1) {
+                        while (loop1) {
+                                ...
+                        }
+                        result = 1;
+                        goto out_buffer;
                 }
-                result = 1;
-                goto out;
+                ...
+        out_buffer:
+                kfree(buffer);
+                return result;
         }
-        ...
-out:
-        kfree(buffer);
-        return result;
-}
+
+一个需�注�的常�错误是“一个 err 错误�，就�这样：
+
+        err:
+                kfree(foo->bar);
+                kfree(foo);
+                return ret;
+
+这段代�的错误是，在�些退出路径上 “foo� 是 NULL。通常情况下，通过把它分离�两个
+错误标签 “err_bar:� 和 “err_foo:� �修�这个错误。
 
                 第八章：注释
 
@@ -386,10 +398,10 @@ out:
 加太多。你应该�的，是把注释放在函数的头部，告诉人们它�了什么，也�以加上它�这
 些事情的原因。
 
-当注释内核API函数时，请使用kernel-doc格�。请看
-Documentation/kernel-doc-nano-HOWTO.txt和scripts/kernel-doc以获得详细信�。
+当注释内核API函数时，请使用 kernel-doc 格�。请看
+Documentation/kernel-doc-nano-HOWTO.txt和scripts/kernel-doc 以获得详细信�。
 
-Linux的注释风格是C89“/* ... */�风格。��使用C99风格“// ...�注释。
+Linux的注释风格是 C89 “/* ... */� 风格。��使用 C99 风格 “// ...� 注释。
 
 长（多行）的首选注释风格是：
 
@@ -402,6 +414,15 @@ Linux的注释风格是C89“/* ... */�风格。��使用C99风格“// ...
          * with beginning and ending almost-blank lines.
          */
 
+对于在 net/ 和 drivers/net/ 的文件，首选的长（多行）注释风格有些��。
+
+        /* The preferred comment style for files in net/ and drivers/net
+         * looks like this.
+         *
+         * It is nearly the same as the generally preferred comment style,
+         * but there is no initial almost-blank line.
+         */
+
 注释数�也是很��的，�管是基本类型还是�生类型。为了方便实现这一点，�一行应�
 声明一个数�（��使用逗��一次声明多个数�）。这样你就有空间�为�个数�写一段
 �注释�解释它们的用途了。
@@ -409,49 +430,63 @@ Linux的注释风格是C89“/* ... */�风格。��使用C99风格“// ...
 
                 第�章：你已�把事情弄糟了
 
-这没什么，我们都是这样。�能你的使用了很长时间Unix的朋�已�告诉你“GNU emacs�能
-自动帮你格�化C�代�，而且你也注�到了，确实是这样，�过它所使用的默认值和我们
-想�的相去甚远（实际上，甚至比�机打的还�差——无数个猴�在GNU emacs里打字永远�
-会创造出一个好程�）（译注：请�考Infinite Monkey Theorem）
-
-所以你�么放弃GNU emacs，�么改�它让它使用更��的设定。�采用�一个方案，你�
-以把下�这段粘贴到你的.emacs文件里。
-
-(defun linux-c-mode ()
-  "C mode with adjusted defaults for use with the Linux kernel."
-  (interactive)
-  (c-mode)
-  (c-set-style "K&R")
-  (setq tab-width 8)
-  (setq indent-tabs-mode t)
-  (setq c-basic-offset 8))
-
-这样就定义了M-x linux-c-mode命令。当你hack一个模�的时候，如果你把字符串
--*- linux-c -*-放在头两行的�个�置，这个模�将会被自动调用。如果你希望在你修改
-/usr/src/linux里的文件时魔术般自动打开linux-c-mode的�，你也�能需�添加
-
-(setq auto-mode-alist (cons '("/usr/src/linux.*/.*\\.[ch]$" . linux-c-mode)
-                        auto-mode-alist))
-
-到你的.emacs文件里。
-
-�过就算你�试让emacs正确的格�化代�失败了，也并��味�你失去了一切：还�以用“
-indent�。
-
-�过，GNU indent也有和GNU emacs一样有问题的设定，所以你需�给它一些命令选项。�
-过，这还�算太糟糕，因为就算是GNU indent的作者也认�K&R的��性（GNU的人并�是�
-人，他们�是在这个问题上被严�的误导了），所以你��给indent指定选项“-kr -i8�
-（代表“K&R，8个字符缩进�），或者使用“scripts/Lindent�，这样就�以以最时髦的方�
+这没什么，我们都是这样。�能你的使用了很长时间 Unix 的朋�已�告诉你 “GNU emacs� 能
+自动帮你格�化 C �代�，而且你也注�到了，确实是这样，�过它所使用的默认值和我们
+想�的相去甚远（实际上，甚至比�机打的还�差——无数个猴�在 GNU emacs 里打字永远�
+会创造出一个好程�）（译注：请�考 Infinite Monkey Theorem）
+
+所以你�么放弃 GNU emacs，�么改�它让它使用更��的设定。�采用�一个方案，你�
+以把下�这段粘贴到你的 .emacs 文件里。
+
+(defun c-lineup-arglist-tabs-only (ignored)
+  "Line up argument lists by tabs, not spaces"
+  (let* ((anchor (c-langelem-pos c-syntactic-element))
+         (column (c-langelem-2nd-pos c-syntactic-element))
+         (offset (- (1+ column) anchor))
+         (steps (floor offset c-basic-offset)))
+    (* (max steps 1)
+       c-basic-offset)))
+
+(add-hook 'c-mode-common-hook
+          (lambda ()
+            ;; Add kernel style
+            (c-add-style
+             "linux-tabs-only"
+             '("linux" (c-offsets-alist
+                        (arglist-cont-nonempty
+                         c-lineup-gcc-asm-reg
+                         c-lineup-arglist-tabs-only))))))
+
+(add-hook 'c-mode-hook
+          (lambda ()
+            (let ((filename (buffer-file-name)))
+              ;; Enable kernel mode for the appropriate files
+              (when (and filename
+                         (string-match (expand-file-name "~/src/linux-trees")
+                                       filename))
+                (setq indent-tabs-mode t)
+                (setq show-trailing-whitespace t)
+                (c-set-style "linux-tabs-only")))))
+
+这会让 emacs 在 ~/src/linux-trees 目录下的 C �文件获得更好的内核代�风格。
+
+�过就算你�试让 emacs 正确的格�化代�失败了，也并��味�你失去了一切：还�以用
+“indent�。
+
+�过，GNU indent 也有和 GNU emacs 一样有问题的设定，所以你需�给它一些命令选项。�
+过，这还�算太糟糕，因为就算是 GNU indent 的作者也认� K&R 的��性（GNU 的人并�是
+�人，他们�是在这个问题上被严�的误导了），所以你��给 indent 指定选项 “-kr -i8�
+（代表 “K&R，8 个字符缩进�），或者使用 “scripts/Lindent�，这样就�以以最时髦的方�
 缩进�代�。
 
-“indent�有很多选项，特别是�新格�化注释的时候，你�能需�看一下它的手册页。�过
-记�：“indent��能修正�的编程习惯。
+“indent� 有很多选项，特别是�新格�化注释的时候，你�能需�看一下它的手册页。�过
+记�：“indent� �能修正�的编程习惯。
 
 
-                第�章：Kconfig�置文件
+                第�章：Kconfig �置文件
 
-对于�布��树的所有Kconfig*�置文件�说，它们缩进方�与C代�相比有所��。紧挨
-在“config�定义下�的行缩进一个制表符，帮助信�则�多缩进2个空格。比如：
+对于�布��树的所有 Kconfig* �置文件�说，它们缩进方�与 C 代�相比有所��。紧挨
+在 “config� 定义下�的行缩进一个制表符，帮助信�则�多缩进 2 个空格。比如：
 
 config AUDIT
         bool "Auditing support"
@@ -470,7 +505,7 @@ config ADFS_FS_RW
         depends on ADFS_FS
         ...
 
-�查看�置文件的完整文档，请看Documentation/kbuild/kconfig-language.txt。
+�查看�置文件的完整文档，请看 Documentation/kbuild/kconfig-language.txt。
 
 
                 第�一章：数�结构
@@ -489,11 +524,11 @@ config ADFS_FS_RW
 很多数�结构实际上有2级引用计数，它们通常有��“类�的用户。�类计数器统计�类用
 户的数�，�当�类计数器�至零时，全局计数器�一。
 
-这�“多级引用计数�的例��以在内存管�（“struct mm_struct�：mm_users和mm_count）
+这�“多级引用计数�的例��以在内存管�（“struct mm_struct�：mm_users 和 mm_count）
 和文件系统（“struct super_block�：s_count和s_active）中找到。
 
 记�：如果�一个执行线索�以找到你的数�结构，但是这个数�结构没有引用计数器，这
-里几乎肯定是一个bug。
+里几乎肯定是一个 bug。
 
 
                 第�二章：�，枚举和RTL
@@ -508,102 +543,128 @@ config ADFS_FS_RW
 
 一般的，如果能写�内�函数就��写��函数的�。
 
-�有多个语�的�应该被包�在一个do-while代��里：
+�有多个语�的�应该被包�在一个 do-while 代��里：
 
-#define macrofun(a, b, c)                       \
-        do {                                    \
-                if (a == 5)                     \
-                        do_this(b, c);          \
-        } while (0)
+        #define macrofun(a, b, c)                       \
+                do {                                    \
+                        if (a == 5)                     \
+                                do_this(b, c);          \
+                } while (0)
 
 使用�的时候应��的事情：
 
 1) 影�控制�程的�：
 
-#define FOO(x)                                  \
-        do {                                    \
-                if (blah(x) < 0)                \
-                        return -EBUGGERED;      \
-        } while(0)
+        #define FOO(x)                                  \
+                do {                                    \
+                        if (blah(x) < 0)                \
+                                return -EBUGGERED;      \
+                } while (0)
 
 �常�好。它看起��一个函数，�过�能导致“调用�它的函数退出；��打乱读者大脑里
 的语法分�器。
 
 2) �赖于一个固定�字的本地��的�：
 
-#define FOO(val) bar(index, val)
+        #define FOO(val) bar(index, val)
 
 �能看起��是个�错的东西，�过它�常容易把读代�的人�糊涂，而且容易导致看起�
 �相关的改动带�错误。
 
-3) 作为左值的带�数的�： FOO(x) = y；如果有人把FOO��一个内�函数的�，这�用
+3) 作为左值的带�数的�： FOO(x) = y；如果有人把 FOO ��一个内�函数的�，这�用
 法就会出错了。
 
 4) 忘记了优先级：使用表达�定义常�的�必须将表达�置于一对�括�之内。带�数的
 �也�注�此类问题。
 
-#define CONSTANT 0x4000
-#define CONSTEXP (CONSTANT | 3)
+        #define CONSTANT 0x4000
+        #define CONSTEXP (CONSTANT | 3)
+
+5) 在�里定义类似函数的本地��时命�冲�：
 
-cpp手册对�的讲解很详细。Gcc internals手册也详细讲解了RTL（译注：register
+        #define FOO(x)                          \
+        ({                                      \
+                typeof(x) ret;                  \
+                ret = calc_ret(x);              \
+                (ret);                          \
+        })
+
+ret 是本地��的通用�字 - __foo_ret 更�容易与一个已存在的��冲�。
+
+cpp 手册对�的讲解很详细。gcc internals 手册也详细讲解了 RTL（译注：register
 transfer language），内核里的汇编语言�常用到它。
 
 
                 第�三章：打�内核消�
 
 内核开�者应该是�过良好教育的。请一定注�内核信�的拼写，以给人以好的�象。��
-用�规范的��比如“dont�，而�用“do not�或者“don't�。��这些信�简��明了�无
-歧义。
+用�规范的��比如 “dont�，而�用 “do not�或者 “don't�。��这些信�简��明了�
+无歧义。
 
 内核信��必以��（译注：英文��，�点）结�。
 
-在�括�里打�数字(%d)没有任何价值，应该��这样�。
+在�括�里打�数字 (%d) 没有任何价值，应该��这样�。
 
-<linux/device.h>里有一些驱动模型诊断�，你应该使用它们，以确�信�对应于正确的
-设备和驱动，并且被标记了正确的消�级别。这些�有：dev_err(), dev_warn(),
-dev_info()等等。对于那些�和�个特定设备相关连的信�，<linux/kernel.h>定义了
-pr_debug()和pr_info()。
+<linux/device.h> 里有一些驱动模型诊断�，你应该使用它们，以确�信�对应于正确的
+设备和驱动，并且被标记了正确的消�级别。这些�有：dev_err()，dev_warn()，
+dev_info() 等等。对于那些�和�个特定设备相关连的信�，<linux/printk.h> 定义了
+pr_notice()，pr_info()，pr_warn()，pr_err() 和其他。
 
-写出好的调试信��以是一个很大的挑战；当你写出�之�，这些信�在远程除错的时候
-就会�为�大的帮助。当DEBUG符�没有被定义的时候，这些信��应该被编译进内核里
-（也就是说，默认地，它们�应该被包�在内）。如果你使用dev_dbg()或者pr_debug()，
-就能自动达到这个效果。很多�系统拥有Kconfig选项��用-DDEBUG。还有一个相关的惯例
-是使用VERBOSE_DEBUG�添加dev_vdbg()消�到那些已�由DEBUG�用的消�之上。
+写出好的调试信��以是一个很大的挑战；一旦你写出�，这些信�在远程除错时能�供�大
+的帮助。然而打�调试信�的处�方��打��调试信���。其他 pr_XXX() 函数能无�件地
+打�，pr_debug() ��；默认情况下它�会被编译，除�定义了 DEBUG 或设定了
+CONFIG_DYNAMIC_DEBUG。实际这�样是为了 dev_dbg()，一个相关约定是在一个已�开�了
+DEBUG 时，使用 VERBOSE_DEBUG �添加 dev_vdbg()。
+
+许多�系统拥有 Kconfig 调试选项�开� -DDEBUG 在对应的 Makefile 里�；在其他
+情况下，特殊文件使用 #define DEBUG。当一�调试信�需�被无�件打�时，例如，如果
+已�包�一个调试相关的 #ifdef �件，printk(KERN_DEBUG ...) 就�被使用。
 
 
                 第�四章：分�内存
 
-内核�供了下�的一般用途的内存分�函数：kmalloc()，kzalloc()，kcalloc()和
-vmalloc()。请�考API文档以获�有关它们的详细信�。
+内核�供了下�的一般用途的内存分�函数：
+kmalloc()，kzalloc()，kmalloc_array()，kcalloc()，vmalloc() 和 vzalloc()。
+请�考 API 文档以获�有关它们的详细信�。
 
 传递结构体大�的首选形�是这样的：
 
         p = kmalloc(sizeof(*p), ...);
 
-�外一�传递方�中，sizeof的�作数是结构体的�字，这样会�低�读性，并且�能会引
-入bug。有�能指针��类型被改�时，而对应的传递给内存分�函数的sizeof的结果��。
+�外一�传递方�中，sizeof 的�作数是结构体的�字，这样会�低�读性，并且�能会引
+入 bug。有�能指针��类型被改�时，而对应的传递给内存分�函数的 sizeof 的结果��。
 
-强制转�一个void指针返回值是多余的。C语言本身��了从void指针到其他任何指针类型
+强制转�一个 void 指针返回值是多余的。C 语言本身��了从 void 指针到其他任何指针类型
 的转�是没有问题的。
 
+分�一个数组的首选形�是这样的：
+
+        p = kmalloc_array(n, sizeof(...), ...);
+
+分�一个零长数组的首选形�是这样的：
+
+        p = kcalloc(n, sizeof(...), ...);
+
+两�形�检查分�大� n * sizeof(...) 的溢出，如果溢出返回 NULL。
+
 
                 第�五章：内�弊病
 
-有一个常�的误解是内�函数是gcc�供的�以让代��行更快的一个选项。虽然使用内�
+有一个常�的误解是内�函数是 gcc �供的�以让代��行更快的一个选项。虽然使用内�
 函数有时候是�当的（比如作为一�替代�的方�，请看第�二章），�过很多情况下�是
-这样。inline关键字的过度使用会使内核�大，从而使整个系统�行速度�慢。因为大内核
+这样。inline 关键字的过度使用会使内核�大，从而使整个系统�行速度�慢。因为大内核
 会�用更多的指令高速缓存（译注：一级缓存通常是指令缓存和数�缓存分开的）而且会导
-致pagecache的�用内存�少。想象一下，一次pagecache未命中就会导致一次�盘寻�，将
-耗时5毫秒。5毫秒的时间内CPU能执行很多很多指令。
+致 pagecache 的�用内存�少。想象一下，一次pagecache未命中就会导致一次�盘寻�，
+将耗时 5 毫秒。5 毫秒的时间内 CPU 能执行很多很多指令。
 
-一个基本的原则是如果一个函数有3行以上，就��把它��内�函数。这个原则的一个例
+一个基本的原则是如果一个函数有 3 行以上，就��把它��内�函数。这个原则的一个例
 外是，如果你知��个�数是一个编译时常�，而且因为这个常�你确定编译器在编译时能
-优化掉你的函数的大部分代�，那�然�以给它加上inline关键字。kmalloc()内�函数就
+优化掉你的函数的大部分代�，那�然�以给它加上 inline 关键字。kmalloc() 内�函数就
 是一个很好的例�。
 
-人们�常主张给static的而且�用了一次的函数加上inline，如此�会有任何�失，因为没
-有什么好�衡的。虽然从技术上说这是正确的，但是实际上这�情况下�使�加inline gcc
-也�以自动使其内�。而且其他用户�能会�求移除inline，由此而�的争论会抵消inline
+人们�常主张给 static 的而且�用了一次的函数加上 inline，如此�会有任何�失，因为没
+有什么好�衡的。虽然从技术上说这是正确的，但是实际上这�情况下�使�加 inline gcc
+也�以自动使其内�。而且其他用户�能会�求移除 inline，由此而�的争论会抵消 inline
 自身的潜在价值，得��失。
 
 
@@ -613,37 +674,37 @@ vmalloc()。请�考API文档以获�有关它们的详细信�。
 的一个值�以表示为一个错误代�整数（-Exxx�失败，0��功）或者一个“�功�布尔值（
 0�失败，�0��功）。
 
-混�使用这两�表达方�是难于�现的bug的��。如果C语言本身严格区分整形和布尔型�
-�，那么编译器就能够帮我们�现这些错误……�过C语言�区分。为了��产生这�bug，请
+混�使用这两�表达方�是难于�现的 bug 的��。如果 C 语言本身严格区分整形和布尔型�
+�，那么编译器就能够帮我们�现这些错误……�过 C 语言�区分。为了��产生这� bug，请
 �循下�的惯例：
 
         如果函数的�字是一个动作或者强制性的命令，那么这个函数应该返回错误代�整
         数。如果是一个判断，那么函数应该返回一个“�功�布尔值。
 
-比如，“add work�是一个命令，所以add_work()函数在�功时返回0，在失败时返回-EBUSY。
-类似的，因为“PCI device present�是一个判断，所以pci_dev_present()函数在�功找到
-一个匹�的设备时应该返回1，如果找�到时应该返回0。
+比如，“add work� 是一个命令，所以 add_work() 函数在�功时返回 0，在失败时返回 -EBUSY。
+类似的，因为 “PCI device present� 是一个判断，所以 pci_dev_present() 函数在�功找到
+一个匹�的设备时应该返回 1，如果找�到时应该返回 0。
 
 所有导出（译注：EXPORT）的函数都必须�守这个惯例，所有的公共函数也都应该如此。�
 有（static）函数�需�如此，但是我们也推�这样�。
 
 返回值是实际计算结果而�是计算是��功的标志的函数��此惯例的�制。一般的，他们
 通过返回一些正常值范围之外的结果�表示出错。典型的例�是返回指针的函数，他们使用
-NULL或者ERR_PTR机制�报告错误。
+NULL 或者 ERR_PTR 机制�报告错误。
 
 
                 第�七章：���新�明内核�
 
-头文件include/linux/kernel.h包�了一些�，你应该使用它们，而��自己写一些它们的
+头文件 include/linux/kernel.h 包�了一些�，你应该使用它们，而��自己写一些它们的
 ��。比如，如果你需�计算一个数组的长度，使用这个�
 
-  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+        #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 类似的，如果你�计算�结构体�员的大�，使用
 
-  #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+        #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
 
-还有�以�严格的类型检查的min()和max()�，如果你需��以使用它们。你�以自己看看
+还有�以�严格的类型检查的 min() 和 max() �，如果你需��以使用它们。你�以自己看看
 那个头文件里还定义了什么你�以拿�用的东西，如果有定义的�，你就�应在你的代�里
 自己�新定义。
 
@@ -653,42 +714,100 @@ NULL或者ERR_PTR机制�报告错误。
 有一些编辑器�以解释嵌入在�文件里的由一些特殊标记标明的�置信�。比如，emacs
 能够解释被标记�这样的行：
 
--*- mode: c -*-
+        -*- mode: c -*-
 
 或者这样的：
 
-/*
-Local Variables:
-compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"
-End:
-*/
+        /*
+        Local Variables:
+        compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"
+        End:
+        */
 
-Vim能够解释这样的标记：
+Vim 能够解释这样的标记：
 
-/* vim:set sw=8 noet */
+        /* vim:set sw=8 noet */
 
 ��在�代�中包�任何这样的内容。�个人都有他自己的编辑器�置，你的�文件�应
 该覆盖别人的�置。这包括有关缩进和模��置的标记。人们�以使用他们自己定制的模
 �，或者使用其他�以产生正确的缩进的巧妙方法。
 
 
+                第��章：内�汇编
+
+在特定架构的代�中，你也许需�内�汇编�使用 CPU 接�和平�相关功能。在需�
+这么�时，��犹豫。然而，当 C �以完�工作时，��无端地使用内�汇编。如果
+�能，你�以并且应该用 C 和硬件交互。
+
+考虑去写通用一点的内�汇编作为简明的辅助函数，而�是��写下它们的细节。记�
+内�汇编�以使用 C �数。
+
+大而特殊的汇编函数应该放在 .S 文件中，对应 C 的原型定义在 C 头文件中。汇编
+函数的 C 原型应该使用 “asmlinkage�。
+
+你�能需�将你的汇编语�标记为 volatile，�阻止 GCC 在没�现任何副作用�就
+移除了它。你�必总是这样�，虽然，这样�以�制�必�的优化。
+
+在写一个包�多�指令的�个内�汇编语�时，把��指令用引�字符串分离，并写在
+�独一行，在�个字符串结尾，除了 \n\t 结尾之外，在汇编输出中适当地缩进下
+一�指令：
+
+        asm ("magic %reg1, #42\n\t"
+             "more_magic %reg2, %reg3"
+             : /* outputs */ : /* inputs */ : /* clobbers */);
+
+
+                第二�章：�件编译
+
+���能，就��在 .c 文件里�使用预处��件；这样�让代�更难阅读并且逻辑难以
+跟踪。替代方案是，在头文件定义函数在这些 .c 文件中使用这类的�件表达�，�供空
+�作的桩版本（译注：桩程�，是指用�替�一部分功能的程�段）在 #else 情况下，
+�从 .c 文件中无�件地调用这些函数。编译器会��生�任何桩调用的代�，产生一致
+的结果，但逻辑将更加清晰。
+
+��编译整个函数，而�是部分函数或部分表达�。而�是在一个表达�添加 ifdef，
+解�部分或全部表达�到一个�独的辅助函数，并应用�件到该函数内。
+
+如果你有一个在特定�置中�能是未使用的函数或��，编译器将警告它定义了但未使用，
+标记这个定义为 __maybe_unused 而�是将它包�在一个预处��件中。（然而，如果
+一个函数或��总是未使用的，就直接删除它。）
+
+在代�中，�能的情况下，使用 IS_ENABLED ��转化�个 Kconfig 标记为 C 的布尔
+表达�，并在正常的 C �件中使用它：
+
+        if (IS_ENABLED(CONFIG_SOMETHING)) {
+                ...
+        }
+
+编译器会无�件地�常数�并，就�使用 #ifdef 那样，包�或排除代��，所以这�会
+带�任何�行时开销。然而，这�方法�旧�许 C 编译器查看�内的代�，并检查它的正确
+性（语法，类型，符�引用，等等）。因此，如果�件�满足，代��内的引用符�将�存在，
+你必须继续使用 #ifdef。
+
+在任何有�义的 #if 或 #ifdef �的末尾（超过几行），在 #endif �一行的��写下
+注释，指出该�件表达�被使用。例如：
+
+        #ifdef CONFIG_SOMETHING
+        ...
+        #endif /* CONFIG_SOMETHING */
+
 
                 附录 I：�考
 
-The C Programming Language, 第二版, 作者Brian W. Kernighan和Denni
-M. Ritchie. Prentice Hall, Inc., 1988. ISBN 0-13-110362-8 (软皮),
-0-13-110370-9 (硬皮). URL: http://cm.bell-labs.com/cm/cs/cbook/
+The C Programming Language, 第二版
+作者：Brian W. Kernighan 和 Denni M. Ritchie.
+Prentice Hall, Inc., 1988.
+ISBN 0-13-110362-8 (软皮), 0-13-110370-9 (硬皮).
 
-The Practice of Programming 作者Brian W. Kernighan和Rob Pike.  Addison-Wesley,
-Inc., 1999.  ISBN 0-201-61586-X.  URL: http://cm.bell-labs.com/cm/cs/tpop/
+The Practice of Programming
+作者：Brian W. Kernighan 和 Rob Pike.
+Addison-Wesley, Inc., 1999.
+ISBN 0-201-61586-X.
 
-cpp，gcc，gcc internals和indent的GNU手册——和K&R�本文相符�的部分，全部�以在
-http://www.gnu.org/manual/找到
+GNU 手册 - �循 K&R 标准和此文本 - cpp, gcc, gcc internals and indent,
+都�以从 http://www.gnu.org/manual/ 找到
 
 WG14是C语言的国际标准化工作组，URL: http://www.open-std.org/JTC1/SC22/WG14/
 
-Kernel CodingStyle，作者greg@kroah.com�表于OLS 2002：
+Kernel CodingStyle，作者 greg@kroah.com �表于OLS 2002：
 http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/
-
---
-最�更新于2007年7月13日。
diff --git a/MAINTAINERS b/MAINTAINERS
index 7304d2e37a98..0c22fe584283 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -865,9 +865,17 @@ F:	Documentation/devicetree/bindings/display/snps,arcpgu.txt
 ARM HDLCD DRM DRIVER
 M:      Liviu Dudau <liviu.dudau@arm.com>
 S:      Supported
-F:      drivers/gpu/drm/arm/
+F:      drivers/gpu/drm/arm/hdlcd_*
 F:      Documentation/devicetree/bindings/display/arm,hdlcd.txt
 
+ARM MALI-DP DRM DRIVER
+M:      Liviu Dudau <liviu.dudau@arm.com>
+M:      Brian Starkey <brian.starkey@arm.com>
+M:      Mali DP Maintainers <malidp@foss.arm.com>
+S:      Supported
+F:      drivers/gpu/drm/arm/
+F:      Documentation/devicetree/bindings/display/arm,malidp.txt
+
 ARM MFM AND FLOPPY DRIVERS
 M:      Ian Molton <spyro@f2s.com>
 S:      Maintained
@@ -1159,6 +1167,7 @@ F:	arch/arm/mach-footbridge/
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:      Shawn Guo <shawnguo@kernel.org>
 M:      Sascha Hauer <kernel@pengutronix.de>
+R:      Fabio Estevam <fabio.estevam@nxp.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@ -2242,7 +2251,8 @@ F:	include/net/ax25.h
 F:      net/ax25/
 
 AZ6007 DVB DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -2709,7 +2719,8 @@ F:	Documentation/filesystems/btrfs.txt
 F:      fs/btrfs/
 
 BTTV VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -2773,9 +2784,9 @@ F:	include/net/caif/
 F:      net/caif/
 
 CALGARY x86-64 IOMMU
-M:      Muli Ben-Yehuda <muli@il.ibm.com>
-M:      "Jon D. Mason" <jdmason@kudzu.us>
-L:      discuss@x86-64.org
+M:      Muli Ben-Yehuda <mulix@mulix.org>
+M:      Jon Mason <jdmason@kudzu.us>
+L:      iommu@lists.linux-foundation.org
 S:      Maintained
 F:      arch/x86/kernel/pci-calgary_64.c
 F:      arch/x86/kernel/tce_64.c
@@ -3086,6 +3097,7 @@ M:	Stephen Boyd <sboyd@codeaurora.org>
 L:      linux-clk@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:      Maintained
+F:      Documentation/devicetree/bindings/clock/
 F:      drivers/clk/
 X:      drivers/clk/clkdev.c
 F:      include/linux/clk-pr*
@@ -3343,7 +3355,8 @@ S:	Maintained
 F:      drivers/media/dvb-frontends/cx24120*
 
 CX88 VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -3773,6 +3786,7 @@ Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:      Maintained
 F:      drivers/dma/
 F:      include/linux/dmaengine.h
+F:      Documentation/devicetree/bindings/dma/
 F:      Documentation/dmaengine/
 T:      git git://git.infradead.org/users/vkoul/slave-dma.git
 
@@ -3854,7 +3868,10 @@ T:	git git://people.freedesktop.org/~airlied/linux
 S:      Maintained
 F:      drivers/gpu/drm/
 F:      drivers/gpu/vga/
-F:      Documentation/DocBook/gpu.*
+F:      Documentation/devicetree/bindings/display/
+F:      Documentation/devicetree/bindings/gpu/
+F:      Documentation/devicetree/bindings/video/
+F:      Documentation/gpu/
 F:      include/drm/
 F:      include/uapi/drm/
 
@@ -3906,6 +3923,7 @@ S:	Supported
 F:      drivers/gpu/drm/i915/
 F:      include/drm/i915*
 F:      include/uapi/drm/i915_drm.h
+F:      Documentation/gpu/i915.rst
 
 DRM DRIVERS FOR ATMEL HLCDC
 M:      Boris Brezillon <boris.brezillon@free-electrons.com>
@@ -4101,6 +4119,21 @@ F:	drivers/gpu/drm/vc4/
 F:      include/uapi/drm/vc4_drm.h
 F:      Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
 
+DRM DRIVERS FOR TI OMAP
+M:      Tomi Valkeinen <tomi.valkeinen@ti.com>
+L:      dri-devel@lists.freedesktop.org
+S:      Maintained
+F:      drivers/gpu/drm/omapdrm/
+F:      Documentation/devicetree/bindings/display/ti/
+
+DRM DRIVERS FOR TI LCDC
+M:      Jyri Sarha <jsarha@ti.com>
+R:      Tomi Valkeinen <tomi.valkeinen@ti.com>
+L:      dri-devel@lists.freedesktop.org
+S:      Maintained
+F:      drivers/gpu/drm/tilcdc/
+F:      Documentation/devicetree/bindings/display/tilcdc/
+
 DSBR100 USB FM RADIO DRIVER
 M:      Alexey Klimov <klimov.linux@gmail.com>
 L:      linux-media@vger.kernel.org
@@ -4290,7 +4323,8 @@ F:	fs/ecryptfs/
 EDAC-CORE
 M:      Doug Thompson <dougthompson@xmission.com>
 M:      Borislav Petkov <bp@alien8.de>
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@ -4335,7 +4369,8 @@ S:	Maintained
 F:      drivers/edac/e7xxx_edac.c
 
 EDAC-GHES
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/ghes_edac.c
@@ -4359,19 +4394,22 @@ S:	Maintained
 F:      drivers/edac/i5000_edac.c
 
 EDAC-I5400
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/i5400_edac.c
 
 EDAC-I7300
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/i7300_edac.c
 
 EDAC-I7CORE
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/i7core_edac.c
@@ -4408,7 +4446,8 @@ S:	Maintained
 F:      drivers/edac/r82600_edac.c
 
 EDAC-SBRIDGE
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/sb_edac.c
@@ -4467,7 +4506,8 @@ S:	Maintained
 F:      drivers/net/ethernet/ibm/ehea/
 
 EM28XX VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -6486,6 +6526,7 @@ F:	include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:      Shuah Khan <shuahkh@osg.samsung.com>
+M:      Shuah Khan <shuah@kernel.org>
 L:      linux-kselftest@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 S:      Maintained
@@ -7357,7 +7398,8 @@ S:	Supported
 F:      drivers/media/pci/netup_unidvb/*
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 P:      LinuxTV.org Project
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
@@ -7989,6 +8031,7 @@ Q:	http://patchwork.ozlabs.org/project/netdev/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 S:      Odd Fixes
+F:      Documentation/devicetree/bindings/net/
 F:      drivers/net/
 F:      include/linux/if_*
 F:      include/linux/netdevice.h
@@ -8007,6 +8050,7 @@ Q:	http://patchwork.kernel.org/project/linux-wireless/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 S:      Maintained
+F:      Documentation/devicetree/bindings/net/wireless/
 F:      drivers/net/wireless/
 
 NETXEN (1/10) GbE SUPPORT
@@ -8404,10 +8448,9 @@ F:	drivers/i2c/busses/i2c-ocores.c
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:      Rob Herring <robh+dt@kernel.org>
 M:      Frank Rowand <frowand.list@gmail.com>
-M:      Grant Likely <grant.likely@linaro.org>
 L:      devicetree@vger.kernel.org
 W:      http://www.devicetree.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 S:      Maintained
 F:      drivers/of/
 F:      include/linux/of*.h
@@ -8415,12 +8458,10 @@ F:	scripts/dtc/
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 M:      Rob Herring <robh+dt@kernel.org>
-M:      Pawel Moll <pawel.moll@arm.com>
 M:      Mark Rutland <mark.rutland@arm.com>
-M:      Ian Campbell <ijc+devicetree@hellion.org.uk>
-M:      Kumar Gala <galak@codeaurora.org>
 L:      devicetree@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
+Q:      http://patchwork.ozlabs.org/project/devicetree-bindings/list/
 S:      Maintained
 F:      Documentation/devicetree/
 F:      arch/*/boot/dts/
@@ -8944,6 +8985,7 @@ M:	Linus Walleij <linus.walleij@linaro.org>
 L:      linux-gpio@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 S:      Maintained
+F:      Documentation/devicetree/bindings/pinctrl/
 F:      drivers/pinctrl/
 F:      include/linux/pinctrl/
 
@@ -9851,7 +9893,8 @@ S:	Odd Fixes
 F:      drivers/media/i2c/saa6588*
 
 SAA7134 VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -10370,7 +10413,8 @@ S:	Maintained
 F:      drivers/media/radio/si4713/radio-usb-si4713.c
 
 SIANO DVB DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11136,7 +11180,8 @@ S:	Maintained
 F:      drivers/media/i2c/tda9840*
 
 TEA5761 TUNER DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11144,7 +11189,8 @@ S:	Odd fixes
 F:      drivers/media/tuners/tea5761.*
 
 TEA5767 TUNER DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11531,7 +11577,8 @@ F:	include/linux/shmem_fs.h
 F:      mm/shmem.c
 
 TM6000 VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11885,7 +11932,8 @@ F:	drivers/usb/common/usb-otg-fsm.c
 
 USB OVER IP DRIVER
 M:      Valentina Manea <valentina.manea.m@gmail.com>
-M:      Shuah Khan <shuah.kh@samsung.com>
+M:      Shuah Khan <shuahkh@osg.samsung.com>
+M:      Shuah Khan <shuah@kernel.org>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      Documentation/usb/usbip_protocol.txt
@@ -11956,6 +12004,7 @@ L:	linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
 S:      Supported
+F:      Documentation/devicetree/bindings/usb/
 F:      Documentation/usb/
 F:      drivers/usb/
 F:      include/linux/usb.h
@@ -12129,6 +12178,7 @@ VIRTIO CORE, NET AND BLOCK DRIVERS
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      virtualization@lists.linux-foundation.org
 S:      Maintained
+F:      Documentation/devicetree/bindings/virtio/
 F:      drivers/virtio/
 F:      tools/virtio/
 F:      drivers/net/virtio_net.c
@@ -12517,7 +12567,8 @@ S:	Maintained
 F:      arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
diff --git a/Makefile b/Makefile
index 0f70de63cfdb..4acefc10c13a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 7
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc5
 NAME = Psychotic Stoned Sheep
 
 # *DOCUMENTATION*
@@ -1412,8 +1412,11 @@ $(help-board-dirs): help-%:
 
 # Documentation targets
 # ---------------------------------------------------------------------------
-%docs: scripts_basic FORCE
+DOC_TARGETS := xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs epubdocs cleandocs
+PHONY += $(DOC_TARGETS)
+$(DOC_TARGETS): scripts_basic FORCE
         $(Q)$(MAKE) $(build)=scripts build_docproc build_check-lc_ctype
+        $(Q)$(MAKE) $(build)=Documentation -f $(srctree)/Documentation/Makefile.sphinx $@
         $(Q)$(MAKE) $(build)=Documentation/DocBook $@
 
 else # KBUILD_EXTMOD
diff --git a/arch/Kconfig b/arch/Kconfig
index d794384a0404..15996290fed4 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -226,8 +226,8 @@ config ARCH_INIT_TASK
 config ARCH_TASK_STRUCT_ALLOCATOR
         bool
 
-# Select if arch has its private alloc_thread_info() function
-config ARCH_THREAD_INFO_ALLOCATOR
+# Select if arch has its private alloc_thread_stack() function
+config ARCH_THREAD_STACK_ALLOCATOR
         bool
 
 # Select if arch wants to size task_struct dynamically via arch_task_struct_size:
@@ -606,6 +606,9 @@ config HAVE_ARCH_HASH
           file which provides platform-specific implementations of some
           functions in <linux/hash.h> or fs/namei.c.
 
+config ISA_BUS_API
+        def_bool ISA
+
 #
 # ABI hall of shame
 #
diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
index aab14a019c20..c2ebb6f36c9d 100644
--- a/arch/alpha/include/asm/pgalloc.h
+++ b/arch/alpha/include/asm/pgalloc.h
@@ -40,7 +40,7 @@ pgd_free(struct mm_struct *mm, pgd_t *pgd)
 static inline pmd_t *
 pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        pmd_t *ret = (pmd_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pmd_t *ret = (pmd_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         return ret;
 }
 
@@ -53,7 +53,7 @@ pmd_free(struct mm_struct *mm, pmd_t *pmd)
 static inline pte_t *
 pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         return pte;
 }
 
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 0dcbacfdea4b..0d3e59f56974 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -61,7 +61,7 @@ config RWSEM_GENERIC_SPINLOCK
         def_bool y
 
 config ARCH_DISCONTIGMEM_ENABLE
-        def_bool y
+        def_bool n
 
 config ARCH_FLATMEM_ENABLE
         def_bool y
@@ -186,9 +186,6 @@ if SMP
 config ARC_HAS_COH_CACHES
         def_bool n
 
-config ARC_HAS_REENTRANT_IRQ_LV2
-        def_bool n
-
 config ARC_MCIP
         bool "ARConnect Multicore IP (MCIP) Support "
         depends on ISA_ARCV2
@@ -366,25 +363,10 @@ config NODES_SHIFT
 if ISA_ARCOMPACT
 
 config ARC_COMPACT_IRQ_LEVELS
-        bool "ARCompact IRQ Priorities: High(2)/Low(1)"
+        bool "Setup Timer IRQ as high Priority"
         default n
-        # Timer HAS to be high priority, for any other high priority config
-        select ARC_IRQ3_LV2
         # if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy
-        depends on !SMP || ARC_HAS_REENTRANT_IRQ_LV2
-
-if ARC_COMPACT_IRQ_LEVELS
-
-config ARC_IRQ3_LV2
-        bool
-
-config ARC_IRQ5_LV2
-        bool
-
-config ARC_IRQ6_LV2
-        bool
-
-endif   #ARC_COMPACT_IRQ_LEVELS
+        depends on !SMP
 
 config ARC_FPU_SAVE_RESTORE
         bool "Enable FPU state persistence across context switch"
@@ -407,11 +389,6 @@ config ARC_HAS_LLSC
         default y
         depends on !ARC_CANT_LLSC
 
-config ARC_STAR_9000923308
-        bool "Workaround for llock/scond livelock"
-        default n
-        depends on ISA_ARCV2 && SMP && ARC_HAS_LLSC
-
 config ARC_HAS_SWAPE
         bool "Insn: SWAPE (endian-swap)"
         default y
@@ -471,7 +448,7 @@ config LINUX_LINK_BASE
 
 config HIGHMEM
         bool "High Memory Support"
-        select DISCONTIGMEM
+        select ARCH_DISCONTIGMEM_ENABLE
         help
           With ARC 2G:2G address split, only upper 2G is directly addressable by
           kernel. Enable this to potentially allow access to rest of 2G and PAE
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 02fabef2891c..d4df6be66d58 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -127,7 +127,7 @@ libs-y		+= arch/arc/lib/ $(LIBGCC)
 
 boot            := arch/arc/boot
 
-#default target for make without any arguements.
+#default target for make without any arguments.
 KBUILD_IMAGE    := bootpImage
 
 all:    $(KBUILD_IMAGE)
diff --git a/arch/arc/boot/dts/abilis_tb100.dtsi b/arch/arc/boot/dts/abilis_tb100.dtsi
index 3942634f805a..02410b211433 100644
--- a/arch/arc/boot/dts/abilis_tb100.dtsi
+++ b/arch/arc/boot/dts/abilis_tb100.dtsi
@@ -23,8 +23,6 @@
 
 
 / {
-        clock-frequency         = <500000000>;  /* 500 MHZ */
-
         soc100 {
                 bus-frequency   = <166666666>;
 
diff --git a/arch/arc/boot/dts/abilis_tb101.dtsi b/arch/arc/boot/dts/abilis_tb101.dtsi
index b0467229a5c4..f9e7686044eb 100644
--- a/arch/arc/boot/dts/abilis_tb101.dtsi
+++ b/arch/arc/boot/dts/abilis_tb101.dtsi
@@ -23,8 +23,6 @@
 
 
 / {
-        clock-frequency         = <500000000>;  /* 500 MHZ */
-
         soc100 {
                 bus-frequency   = <166666666>;
 
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi
index 3e02f152edcb..6ae2c476ad82 100644
--- a/arch/arc/boot/dts/axc001.dtsi
+++ b/arch/arc/boot/dts/axc001.dtsi
@@ -15,7 +15,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <750000000>;  /* 750 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
 
diff --git a/arch/arc/boot/dts/axc003.dtsi b/arch/arc/boot/dts/axc003.dtsi
index 378e455a94c4..14df46f141bf 100644
--- a/arch/arc/boot/dts/axc003.dtsi
+++ b/arch/arc/boot/dts/axc003.dtsi
@@ -14,7 +14,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <90000000>;
         #address-cells = <1>;
         #size-cells = <1>;
 
diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi
index 64c94b2860ab..3d6cfa32bf51 100644
--- a/arch/arc/boot/dts/axc003_idu.dtsi
+++ b/arch/arc/boot/dts/axc003_idu.dtsi
@@ -14,7 +14,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <90000000>;
         #address-cells = <1>;
         #size-cells = <1>;
 
diff --git a/arch/arc/boot/dts/eznps.dts b/arch/arc/boot/dts/eznps.dts
index b89f6c3eb352..1e0d225791c1 100644
--- a/arch/arc/boot/dts/eznps.dts
+++ b/arch/arc/boot/dts/eznps.dts
@@ -18,7 +18,6 @@
 
 / {
         compatible = "ezchip,arc-nps";
-        clock-frequency = <83333333>;   /* 83.333333 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         interrupt-parent = <&intc>;
diff --git a/arch/arc/boot/dts/nsim_700.dts b/arch/arc/boot/dts/nsim_700.dts
index 5d5e373e0ebc..63970513e4ae 100644
--- a/arch/arc/boot/dts/nsim_700.dts
+++ b/arch/arc/boot/dts/nsim_700.dts
@@ -11,7 +11,6 @@
 
 / {
         compatible = "snps,nsim";
-        clock-frequency = <80000000>;   /* 80 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         interrupt-parent = <&core_intc>;
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
index b5b060adce8a..e659a340ca8a 100644
--- a/arch/arc/boot/dts/nsimosci.dts
+++ b/arch/arc/boot/dts/nsimosci.dts
@@ -11,7 +11,6 @@
 
 / {
         compatible = "snps,nsimosci";
-        clock-frequency = <20000000>;   /* 20 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         interrupt-parent = <&core_intc>;
@@ -20,7 +19,7 @@
                 /* this is for console on PGU */
                 /* bootargs = "console=tty0 consoleblank=0"; */
                 /* this is for console on serial */
-                bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug";
+                bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24";
         };
 
         aliases {
@@ -58,9 +57,17 @@
                         no-loopback-test = <1>;
                 };
 
-                pgu0: pgu@f9000000 {
-                        compatible = "snps,arcpgufb";
+                pguclk: pguclk {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <25175000>;
+                };
+
+                pgu@f9000000 {
+                        compatible = "snps,arcpgu";
                         reg = <0xf9000000 0x400>;
+                        clocks = <&pguclk>;
+                        clock-names = "pxlclk";
                 };
 
                 ps2: ps2@f9001000 {
diff --git a/arch/arc/boot/dts/nsimosci_hs.dts b/arch/arc/boot/dts/nsimosci_hs.dts
index 325e73090a18..16ce5d65cfde 100644
--- a/arch/arc/boot/dts/nsimosci_hs.dts
+++ b/arch/arc/boot/dts/nsimosci_hs.dts
@@ -11,7 +11,6 @@
 
 / {
         compatible = "snps,nsimosci_hs";
-        clock-frequency = <20000000>;   /* 20 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         interrupt-parent = <&core_intc>;
@@ -20,7 +19,7 @@
                 /* this is for console on PGU */
                 /* bootargs = "console=tty0 consoleblank=0"; */
                 /* this is for console on serial */
-                bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug";
+                bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24";
         };
 
         aliases {
@@ -58,9 +57,17 @@
                         no-loopback-test = <1>;
                 };
 
-                pgu0: pgu@f9000000 {
-                        compatible = "snps,arcpgufb";
+                pguclk: pguclk {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <25175000>;
+                };
+
+                pgu@f9000000 {
+                        compatible = "snps,arcpgu";
                         reg = <0xf9000000 0x400>;
+                        clocks = <&pguclk>;
+                        clock-names = "pxlclk";
                 };
 
                 ps2: ps2@f9001000 {
diff --git a/arch/arc/boot/dts/nsimosci_hs_idu.dts b/arch/arc/boot/dts/nsimosci_hs_idu.dts
index ee03d7126581..ce8dfbc30c4d 100644
--- a/arch/arc/boot/dts/nsimosci_hs_idu.dts
+++ b/arch/arc/boot/dts/nsimosci_hs_idu.dts
@@ -11,14 +11,13 @@
 
 / {
         compatible = "snps,nsimosci_hs";
-        clock-frequency = <5000000>;    /* 5 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         interrupt-parent = <&core_intc>;
 
         chosen {
                 /* this is for console on serial */
-                bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug";
+                bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug video=640x480-24";
         };
 
         aliases {
@@ -77,9 +76,17 @@
                         no-loopback-test = <1>;
                 };
 
-                pgu0: pgu@f9000000 {
-                        compatible = "snps,arcpgufb";
+                pguclk: pguclk {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <25175000>;
+                };
+
+                pgu@f9000000 {
+                        compatible = "snps,arcpgu";
                         reg = <0xf9000000 0x400>;
+                        clocks = <&pguclk>;
+                        clock-names = "pxlclk";
                 };
 
                 ps2: ps2@f9001000 {
diff --git a/arch/arc/boot/dts/skeleton.dtsi b/arch/arc/boot/dts/skeleton.dtsi
index 3a10cc633e2b..65808fe0a290 100644
--- a/arch/arc/boot/dts/skeleton.dtsi
+++ b/arch/arc/boot/dts/skeleton.dtsi
@@ -13,7 +13,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <80000000>;   /* 80 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         chosen { };
diff --git a/arch/arc/boot/dts/skeleton_hs.dtsi b/arch/arc/boot/dts/skeleton_hs.dtsi
index 71fd308a9298..2dfe8037dfbb 100644
--- a/arch/arc/boot/dts/skeleton_hs.dtsi
+++ b/arch/arc/boot/dts/skeleton_hs.dtsi
@@ -8,7 +8,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <80000000>;   /* 80 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         chosen { };
diff --git a/arch/arc/boot/dts/skeleton_hs_idu.dtsi b/arch/arc/boot/dts/skeleton_hs_idu.dtsi
index d1cb25a66989..4c11079f3565 100644
--- a/arch/arc/boot/dts/skeleton_hs_idu.dtsi
+++ b/arch/arc/boot/dts/skeleton_hs_idu.dtsi
@@ -8,7 +8,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <80000000>;   /* 80 MHZ */
         #address-cells = <1>;
         #size-cells = <1>;
         chosen { };
diff --git a/arch/arc/boot/dts/vdk_axc003.dtsi b/arch/arc/boot/dts/vdk_axc003.dtsi
index ad4ee43bd2ac..0fd6ba985b16 100644
--- a/arch/arc/boot/dts/vdk_axc003.dtsi
+++ b/arch/arc/boot/dts/vdk_axc003.dtsi
@@ -14,7 +14,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <50000000>;
         #address-cells = <1>;
         #size-cells = <1>;
 
diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
index a3cb6263c581..82214cd7ba0c 100644
--- a/arch/arc/boot/dts/vdk_axc003_idu.dtsi
+++ b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
@@ -15,7 +15,6 @@
 
 / {
         compatible = "snps,arc";
-        clock-frequency = <50000000>;
         #address-cells = <1>;
         #size-cells = <1>;
 
diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
index 45cd665fca23..99498a4b4216 100644
--- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
@@ -23,6 +23,11 @@
                                 #clock-cells = <0>;
                         };
 
+                        pguclk: pguclk {
+                                #clock-cells = <0>;
+                                compatible = "fixed-clock";
+                                clock-frequency = <25175000>;
+                        };
                 };
 
                 ethernet@0x18000 {
@@ -75,11 +80,11 @@
                 };
 
 /* PGU output directly sent to virtual LCD screen; hdmi controller not modelled */
-                pgu@0x17000 {
-                        compatible = "snps,arcpgufb";
+                pgu@17000 {
+                        compatible = "snps,arcpgu";
                         reg = <0x17000 0x400>;
-                        clock-frequency = <51000000>; /* PGU'clock is initated in init function */
-                        /* interrupts = <5>;   PGU interrupts not used, this vector is used for ps2 below */
+                        clocks = <&pguclk>;
+                        clock-names = "pxlclk";
                 };
 
 /* VDK has additional ps2 keyboard/mouse interface integrated in LCD screen model */
diff --git a/arch/arc/boot/dts/vdk_hs38_smp.dts b/arch/arc/boot/dts/vdk_hs38_smp.dts
index 031a5bc79b3e..2ba60c399d99 100644
--- a/arch/arc/boot/dts/vdk_hs38_smp.dts
+++ b/arch/arc/boot/dts/vdk_hs38_smp.dts
@@ -16,6 +16,6 @@
         compatible = "snps,axs103";
 
         chosen {
-                bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";
+                bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=640x480-24";
         };
 };
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 42bafa552498..98cf20933bbb 100644
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -58,7 +58,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
-CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_ARCPGU=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_HID is not set
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig
index 4bb60c1cd4a2..ddf8b96d494e 100644
--- a/arch/arc/configs/nsimosci_hs_defconfig
+++ b/arch/arc/configs/nsimosci_hs_defconfig
@@ -57,7 +57,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
-CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_ARCPGU=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_HID is not set
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig
index 7e88f4c720f8..ceb90745326e 100644
--- a/arch/arc/configs/nsimosci_hs_smp_defconfig
+++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
@@ -70,7 +70,8 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
-CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_ARCPGU=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_HID is not set
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
index 52ec315dc5c9..969b206d6c67 100644
--- a/arch/arc/configs/vdk_hs38_smp_defconfig
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
@@ -63,12 +63,9 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_ARCPGU_RGB888=y
-CONFIG_ARCPGU_DISPTYPE=0
-# CONFIG_VGA_CONSOLE is not set
+CONFIG_DRM=y
+CONFIG_DRM_ARCPGU=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 5f3dcbbc0cc9..dd683995bc9d 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -25,50 +25,17 @@
 
 #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i))
 
-#ifdef CONFIG_ARC_STAR_9000923308
-
-#define SCOND_FAIL_RETRY_VAR_DEF                                                \
-        unsigned int delay = 1, tmp;                                            \
-
-#define SCOND_FAIL_RETRY_ASM                                                    \
-        "       bz      4f                      \n"                             \
-        "   ; --- scond fail delay ---          \n"                             \
-        "       mov     %[tmp], %[delay]        \n"     /* tmp = delay */       \
-        "2:     brne.d  %[tmp], 0, 2b           \n"     /* while (tmp != 0) */  \
-        "       sub     %[tmp], %[tmp], 1       \n"     /* tmp-- */             \
-        "       rol     %[delay], %[delay]      \n"     /* delay *= 2 */        \
-        "       b       1b                      \n"     /* start over */        \
-        "4: ; --- success ---                   \n"                             \
-
-#define SCOND_FAIL_RETRY_VARS                                                   \
-          ,[delay] "+&r" (delay),[tmp] "=&r"    (tmp)                           \
-
-#else   /* !CONFIG_ARC_STAR_9000923308 */
-
-#define SCOND_FAIL_RETRY_VAR_DEF
-
-#define SCOND_FAIL_RETRY_ASM                                                    \
-        "       bnz     1b                      \n"                             \
-
-#define SCOND_FAIL_RETRY_VARS
-
-#endif
-
 #define ATOMIC_OP(op, c_op, asm_op)                                     \
 static inline void atomic_##op(int i, atomic_t *v)                      \
 {                                                                       \
-        unsigned int val;                                               \
-        SCOND_FAIL_RETRY_VAR_DEF                                        \
+        unsigned int val;                                               \
                                                                         \
         __asm__ __volatile__(                                           \
         "1:     llock   %[val], [%[ctr]]                \n"             \
         "       " #asm_op " %[val], %[val], %[i]        \n"             \
         "       scond   %[val], [%[ctr]]                \n"             \
-        "                                               \n"             \
-        SCOND_FAIL_RETRY_ASM                                            \
-                                                                        \
+        "       bnz     1b                              \n"             \
         : [val] "=&r"   (val) /* Early clobber to prevent reg reuse */  \
-          SCOND_FAIL_RETRY_VARS                                         \
         : [ctr] "r"     (&v->counter), /* Not "m": llock only supports reg direct addr mode */  \
           [i]   "ir"    (i)                                             \
         : "cc");                                                        \
@@ -77,8 +44,7 @@ static inline void atomic_##op(int i, atomic_t *v)			\
 #define ATOMIC_OP_RETURN(op, c_op, asm_op)                              \
 static inline int atomic_##op##_return(int i, atomic_t *v)              \
 {                                                                       \
-        unsigned int val;                                               \
-        SCOND_FAIL_RETRY_VAR_DEF                                        \
+        unsigned int val;                                               \
                                                                         \
         /*                                                              \
          * Explicit full memory barrier needed before/after as          \
@@ -90,11 +56,8 @@ static inline int atomic_##op##_return(int i, atomic_t *v)		\
         "1:     llock   %[val], [%[ctr]]                \n"             \
         "       " #asm_op " %[val], %[val], %[i]        \n"             \
         "       scond   %[val], [%[ctr]]                \n"             \
-        "                                               \n"             \
-        SCOND_FAIL_RETRY_ASM                                            \
-                                                                        \
+        "       bnz     1b                              \n"             \
         : [val] "=&r"   (val)                                           \
-          SCOND_FAIL_RETRY_VARS                                         \
         : [ctr] "r"     (&v->counter),                                  \
           [i]   "ir"    (i)                                             \
         : "cc");                                                        \
diff --git a/arch/arc/include/asm/entry-compact.h b/arch/arc/include/asm/entry-compact.h
index e0e1faf03c50..14c310f2e0b1 100644
--- a/arch/arc/include/asm/entry-compact.h
+++ b/arch/arc/include/asm/entry-compact.h
@@ -76,8 +76,8 @@
          * We need to be a bit more cautious here. What if a kernel bug in
          * L1 ISR, caused SP to go whaco (some small value which looks like
          * USER stk) and then we take L2 ISR.
-         * Above brlo alone would treat it as a valid L1-L2 sceanrio
-         * instead of shouting alound
+         * Above brlo alone would treat it as a valid L1-L2 scenario
+         * instead of shouting around
          * The only feasible way is to make sure this L2 happened in
          * L1 prelogue ONLY i.e. ilink2 is less than a pre-set marker in
          * L1 ISR before it switches stack
diff --git a/arch/arc/include/asm/mmu_context.h b/arch/arc/include/asm/mmu_context.h
index 1fd467ef658f..b0b87f2447f5 100644
--- a/arch/arc/include/asm/mmu_context.h
+++ b/arch/arc/include/asm/mmu_context.h
@@ -83,7 +83,7 @@ static inline void get_new_mmu_context(struct mm_struct *mm)
                 local_flush_tlb_all();
 
                 /*
-                 * Above checke for rollover of 8 bit ASID in 32 bit container.
+                 * Above check for rollover of 8 bit ASID in 32 bit container.
                  * If the container itself wrapped around, set it to a non zero
                  * "generation" to distinguish from no context
                  */
diff --git a/arch/arc/include/asm/pgalloc.h b/arch/arc/include/asm/pgalloc.h
index 86ed671286df..3749234b7419 100644
--- a/arch/arc/include/asm/pgalloc.h
+++ b/arch/arc/include/asm/pgalloc.h
@@ -95,7 +95,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 {
         pte_t *pte;
 
-        pte = (pte_t *) __get_free_pages(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO,
+        pte = (pte_t *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
                                          __get_order_pte());
 
         return pte;
@@ -107,7 +107,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long address)
         pgtable_t pte_pg;
         struct page *page;
 
-        pte_pg = (pgtable_t)__get_free_pages(GFP_KERNEL | __GFP_REPEAT, __get_order_pte());
+        pte_pg = (pgtable_t)__get_free_pages(GFP_KERNEL, __get_order_pte());
         if (!pte_pg)
                 return 0;
         memzero((void *)pte_pg, PTRS_PER_PTE * sizeof(pte_t));
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 034bbdc0ff61..858f98ef7f1b 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -47,7 +47,7 @@
  * Page Tables are purely for Linux VM's consumption and the bits below are
  * suited to that (uniqueness). Hence some are not implemented in the TLB and
  * some have different value in TLB.
- * e.g. MMU v2: K_READ bit is 8 and so is GLOBAL (possible becoz they live in
+ * e.g. MMU v2: K_READ bit is 8 and so is GLOBAL (possible because they live in
  *      seperate PD0 and PD1, which combined forms a translation entry)
  *      while for PTE perspective, they are 8 and 9 respectively
  * with MMU v3: Most bits (except SHARED) represent the exact hardware pos
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h
index f9048994b22f..16b630fbeb6a 100644
--- a/arch/arc/include/asm/processor.h
+++ b/arch/arc/include/asm/processor.h
@@ -78,7 +78,7 @@ struct task_struct;
 #define KSTK_ESP(tsk)   (task_pt_regs(tsk)->sp)
 
 /*
- * Where abouts of Task's sp, fp, blink when it was last seen in kernel mode.
+ * Where about of Task's sp, fp, blink when it was last seen in kernel mode.
  * Look in process.c for details of kernel stack layout
  */
 #define TSK_K_ESP(tsk)          (tsk->thread.ksp)
diff --git a/arch/arc/include/asm/smp.h b/arch/arc/include/asm/smp.h
index 991380438d6b..89fdd1b0a76e 100644
--- a/arch/arc/include/asm/smp.h
+++ b/arch/arc/include/asm/smp.h
@@ -86,7 +86,7 @@ static inline const char *arc_platform_smp_cpuinfo(void)
  * (1) These insn were introduced only in 4.10 release. So for older released
  *      support needed.
  *
- * (2) In a SMP setup, the LLOCK/SCOND atomiticity across CPUs needs to be
+ * (2) In a SMP setup, the LLOCK/SCOND atomicity across CPUs needs to be
  *      gaurantted by the platform (not something which core handles).
  *      Assuming a platform won't, SMP Linux needs to use spinlocks + local IRQ
  *      disabling for atomicity.
diff --git a/arch/arc/include/asm/spinlock.h b/arch/arc/include/asm/spinlock.h
index 800e7c430ca5..cded4a9b5438 100644
--- a/arch/arc/include/asm/spinlock.h
+++ b/arch/arc/include/asm/spinlock.h
@@ -20,11 +20,6 @@
 
 #ifdef CONFIG_ARC_HAS_LLSC
 
-/*
- * A normal LLOCK/SCOND based system, w/o need for livelock workaround
- */
-#ifndef CONFIG_ARC_STAR_9000923308
-
 static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         unsigned int val;
@@ -238,293 +233,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)
         smp_mb();
 }
 
-#else   /* CONFIG_ARC_STAR_9000923308 */
-
-/*
- * HS38x4 could get into a LLOCK/SCOND livelock in case of multiple overlapping
- * coherency transactions in the SCU. The exclusive line state keeps rotating
- * among contenting cores leading to a never ending cycle. So break the cycle
- * by deferring the retry of failed exclusive access (SCOND). The actual delay
- * needed is function of number of contending cores as well as the unrelated
- * coherency traffic from other cores. To keep the code simple, start off with
- * small delay of 1 which would suffice most cases and in case of contention
- * double the delay. Eventually the delay is sufficient such that the coherency
- * pipeline is drained, thus a subsequent exclusive access would succeed.
- */
-
-#define SCOND_FAIL_RETRY_VAR_DEF                                                \
-        unsigned int delay, tmp;                                                \
-
-#define SCOND_FAIL_RETRY_ASM                                                    \
-        "   ; --- scond fail delay ---          \n"                             \
-        "       mov     %[tmp], %[delay]        \n"     /* tmp = delay */       \
-        "2:     brne.d  %[tmp], 0, 2b           \n"     /* while (tmp != 0) */  \
-        "       sub     %[tmp], %[tmp], 1       \n"     /* tmp-- */             \
-        "       rol     %[delay], %[delay]      \n"     /* delay *= 2 */        \
-        "       b       1b                      \n"     /* start over */        \
-        "                                       \n"                             \
-        "4: ; --- done ---                      \n"                             \
-
-#define SCOND_FAIL_RETRY_VARS                                                   \
-          ,[delay] "=&r" (delay), [tmp] "=&r"   (tmp)                           \
-
-static inline void arch_spin_lock(arch_spinlock_t *lock)
-{
-        unsigned int val;
-        SCOND_FAIL_RETRY_VAR_DEF;
-
-        smp_mb();
-
-        __asm__ __volatile__(
-        "0:     mov     %[delay], 1             \n"
-        "1:     llock   %[val], [%[slock]]      \n"
-        "       breq    %[val], %[LOCKED], 0b   \n"     /* spin while LOCKED */
-        "       scond   %[LOCKED], [%[slock]]   \n"     /* acquire */
-        "       bz      4f                      \n"     /* done */
-        "                                       \n"
-        SCOND_FAIL_RETRY_ASM
-
-        : [val]         "=&r"   (val)
-          SCOND_FAIL_RETRY_VARS
-        : [slock]       "r"     (&(lock->slock)),
-          [LOCKED]      "r"     (__ARCH_SPIN_LOCK_LOCKED__)
-        : "memory", "cc");
-
-        smp_mb();
-}
-
-/* 1 - lock taken successfully */
-static inline int arch_spin_trylock(arch_spinlock_t *lock)
-{
-        unsigned int val, got_it = 0;
-        SCOND_FAIL_RETRY_VAR_DEF;
-
-        smp_mb();
-
-        __asm__ __volatile__(
-        "0:     mov     %[delay], 1             \n"
-        "1:     llock   %[val], [%[slock]]      \n"
-        "       breq    %[val], %[LOCKED], 4f   \n"     /* already LOCKED, just bail */
-        "       scond   %[LOCKED], [%[slock]]   \n"     /* acquire */
-        "       bz.d    4f                      \n"
-        "       mov.z   %[got_it], 1            \n"     /* got it */
-        "                                       \n"
-        SCOND_FAIL_RETRY_ASM
-
-        : [val]         "=&r"   (val),
-          [got_it]      "+&r"   (got_it)
-          SCOND_FAIL_RETRY_VARS
-        : [slock]       "r"     (&(lock->slock)),
-          [LOCKED]      "r"     (__ARCH_SPIN_LOCK_LOCKED__)
-        : "memory", "cc");
-
-        smp_mb();
-
-        return got_it;
-}
-
-static inline void arch_spin_unlock(arch_spinlock_t *lock)
-{
-        smp_mb();
-
-        lock->slock = __ARCH_SPIN_LOCK_UNLOCKED__;
-
-        smp_mb();
-}
-
-/*
- * Read-write spinlocks, allowing multiple readers but only one writer.
- * Unfair locking as Writers could be starved indefinitely by Reader(s)
- */
-
-static inline void arch_read_lock(arch_rwlock_t *rw)
-{
-        unsigned int val;
-        SCOND_FAIL_RETRY_VAR_DEF;
-
-        smp_mb();
-
-        /*
-         * zero means writer holds the lock exclusively, deny Reader.
-         * Otherwise grant lock to first/subseq reader
-         *
-         *      if (rw->counter > 0) {
-         *              rw->counter--;
-         *              ret = 1;
-         *      }
-         */
-
-        __asm__ __volatile__(
-        "0:     mov     %[delay], 1             \n"
-        "1:     llock   %[val], [%[rwlock]]     \n"
-        "       brls    %[val], %[WR_LOCKED], 0b\n"     /* <= 0: spin while write locked */
-        "       sub     %[val], %[val], 1       \n"     /* reader lock */
-        "       scond   %[val], [%[rwlock]]     \n"
-        "       bz      4f                      \n"     /* done */
-        "                                       \n"
-        SCOND_FAIL_RETRY_ASM
-
-        : [val]         "=&r"   (val)
-          SCOND_FAIL_RETRY_VARS
-        : [rwlock]      "r"     (&(rw->counter)),
-          [WR_LOCKED]   "ir"    (0)
-        : "memory", "cc");
-
-        smp_mb();
-}
-
-/* 1 - lock taken successfully */
-static inline int arch_read_trylock(arch_rwlock_t *rw)
-{
-        unsigned int val, got_it = 0;
-        SCOND_FAIL_RETRY_VAR_DEF;
-
-        smp_mb();
-
-        __asm__ __volatile__(
-        "0:     mov     %[delay], 1             \n"
-        "1:     llock   %[val], [%[rwlock]]     \n"
-        "       brls    %[val], %[WR_LOCKED], 4f\n"     /* <= 0: already write locked, bail */
-        "       sub     %[val], %[val], 1       \n"     /* counter-- */
-        "       scond   %[val], [%[rwlock]]     \n"
-        "       bz.d    4f                      \n"
-        "       mov.z   %[got_it], 1            \n"     /* got it */
-        "                                       \n"
-        SCOND_FAIL_RETRY_ASM
-
-        : [val]         "=&r"   (val),
-          [got_it]      "+&r"   (got_it)
-          SCOND_FAIL_RETRY_VARS
-        : [rwlock]      "r"     (&(rw->counter)),
-          [WR_LOCKED]   "ir"    (0)
-        : "memory", "cc");
-
-        smp_mb();
-
-        return got_it;
-}
-
-static inline void arch_write_lock(arch_rwlock_t *rw)
-{
-        unsigned int val;
-        SCOND_FAIL_RETRY_VAR_DEF;
-
-        smp_mb();
-
-        /*
-         * If reader(s) hold lock (lock < __ARCH_RW_LOCK_UNLOCKED__),
-         * deny writer. Otherwise if unlocked grant to writer
-         * Hence the claim that Linux rwlocks are unfair to writers.
-         * (can be starved for an indefinite time by readers).
-         *
-         *      if (rw->counter == __ARCH_RW_LOCK_UNLOCKED__) {
-         *              rw->counter = 0;
-         *              ret = 1;
-         *      }
-         */
-
-        __asm__ __volatile__(
-        "0:     mov     %[delay], 1             \n"
-        "1:     llock   %[val], [%[rwlock]]     \n"
-        "       brne    %[val], %[UNLOCKED], 0b \n"     /* while !UNLOCKED spin */
-        "       mov     %[val], %[WR_LOCKED]    \n"
-        "       scond   %[val], [%[rwlock]]     \n"
-        "       bz      4f                      \n"
-        "                                       \n"
-        SCOND_FAIL_RETRY_ASM
-
-        : [val]         "=&r"   (val)
-          SCOND_FAIL_RETRY_VARS
-        : [rwlock]      "r"     (&(rw->counter)),
-          [UNLOCKED]    "ir"    (__ARCH_RW_LOCK_UNLOCKED__),
-          [WR_LOCKED]   "ir"    (0)
-        : "memory", "cc");
-
-        smp_mb();
-}
-
-/* 1 - lock taken successfully */
-static inline int arch_write_trylock(arch_rwlock_t *rw)
-{
-        unsigned int val, got_it = 0;
-        SCOND_FAIL_RETRY_VAR_DEF;
-
-        smp_mb();
-
-        __asm__ __volatile__(
-        "0:     mov     %[delay], 1             \n"
-        "1:     llock   %[val], [%[rwlock]]     \n"
-        "       brne    %[val], %[UNLOCKED], 4f \n"     /* !UNLOCKED, bail */
-        "       mov     %[val], %[WR_LOCKED]    \n"
-        "       scond   %[val], [%[rwlock]]     \n"
-        "       bz.d    4f                      \n"
-        "       mov.z   %[got_it], 1            \n"     /* got it */
-        "                                       \n"
-        SCOND_FAIL_RETRY_ASM
-
-        : [val]         "=&r"   (val),
-          [got_it]      "+&r"   (got_it)
-          SCOND_FAIL_RETRY_VARS
-        : [rwlock]      "r"     (&(rw->counter)),
-          [UNLOCKED]    "ir"    (__ARCH_RW_LOCK_UNLOCKED__),
-          [WR_LOCKED]   "ir"    (0)
-        : "memory", "cc");
-
-        smp_mb();
-
-        return got_it;
-}
-
-static inline void arch_read_unlock(arch_rwlock_t *rw)
-{
-        unsigned int val;
-
-        smp_mb();
-
-        /*
-         * rw->counter++;
-         */
-        __asm__ __volatile__(
-        "1:     llock   %[val], [%[rwlock]]     \n"
-        "       add     %[val], %[val], 1       \n"
-        "       scond   %[val], [%[rwlock]]     \n"
-        "       bnz     1b                      \n"
-        "                                       \n"
-        : [val]         "=&r"   (val)
-        : [rwlock]      "r"     (&(rw->counter))
-        : "memory", "cc");
-
-        smp_mb();
-}
-
-static inline void arch_write_unlock(arch_rwlock_t *rw)
-{
-        unsigned int val;
-
-        smp_mb();
-
-        /*
-         * rw->counter = __ARCH_RW_LOCK_UNLOCKED__;
-         */
-        __asm__ __volatile__(
-        "1:     llock   %[val], [%[rwlock]]     \n"
-        "       scond   %[UNLOCKED], [%[rwlock]]\n"
-        "       bnz     1b                      \n"
-        "                                       \n"
-        : [val]         "=&r"   (val)
-        : [rwlock]      "r"     (&(rw->counter)),
-          [UNLOCKED]    "r"     (__ARCH_RW_LOCK_UNLOCKED__)
-        : "memory", "cc");
-
-        smp_mb();
-}
-
-#undef SCOND_FAIL_RETRY_VAR_DEF
-#undef SCOND_FAIL_RETRY_ASM
-#undef SCOND_FAIL_RETRY_VARS
-
-#endif  /* CONFIG_ARC_STAR_9000923308 */
-
 #else   /* !CONFIG_ARC_HAS_LLSC */
 
 static inline void arch_spin_lock(arch_spinlock_t *lock)
diff --git a/arch/arc/include/asm/thread_info.h b/arch/arc/include/asm/thread_info.h
index 3af67455659a..2d79e527fa50 100644
--- a/arch/arc/include/asm/thread_info.h
+++ b/arch/arc/include/asm/thread_info.h
@@ -103,7 +103,7 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)
 
 /*
  * _TIF_ALLWORK_MASK includes SYSCALL_TRACE, but we don't need it.
- * SYSCALL_TRACE is anways seperately/unconditionally tested right after a
+ * SYSCALL_TRACE is anyway seperately/unconditionally tested right after a
  * syscall, so all that reamins to be tested is _TIF_WORK_MASK
  */
 
diff --git a/arch/arc/include/asm/uaccess.h b/arch/arc/include/asm/uaccess.h
index d1da6032b715..a78d5670884f 100644
--- a/arch/arc/include/asm/uaccess.h
+++ b/arch/arc/include/asm/uaccess.h
@@ -32,7 +32,7 @@
 #define __kernel_ok             (segment_eq(get_fs(), KERNEL_DS))
 
 /*
- * Algorthmically, for __user_ok() we want do:
+ * Algorithmically, for __user_ok() we want do:
  *      (start < TASK_SIZE) && (start+len < TASK_SIZE)
  * where TASK_SIZE could either be retrieved from thread_info->addr_limit or
  * emitted directly in code.
diff --git a/arch/arc/include/uapi/asm/swab.h b/arch/arc/include/uapi/asm/swab.h
index 095599a73195..71f3918b0fc3 100644
--- a/arch/arc/include/uapi/asm/swab.h
+++ b/arch/arc/include/uapi/asm/swab.h
@@ -74,7 +74,7 @@
         __tmp ^ __in;                                           \
 })
 
-#elif (ARC_BSWAP_TYPE == 2)     /* Custom single cycle bwap instruction */
+#elif (ARC_BSWAP_TYPE == 2)     /* Custom single cycle bswap instruction */
 
 #define __arch_swab32(x)                                                \
 ({                                                                      \
diff --git a/arch/arc/kernel/entry-compact.S b/arch/arc/kernel/entry-compact.S
index 0cb0abaa0479..98812c1248df 100644
--- a/arch/arc/kernel/entry-compact.S
+++ b/arch/arc/kernel/entry-compact.S
@@ -91,27 +91,13 @@ VECTOR   mem_service             ; 0x8, Mem exception   (0x1)
 VECTOR   instr_service           ; 0x10, Instrn Error   (0x2)
 
 ; ******************** Device ISRs **********************
-#ifdef CONFIG_ARC_IRQ3_LV2
-VECTOR   handle_interrupt_level2
-#else
-VECTOR   handle_interrupt_level1
-#endif
-
-VECTOR   handle_interrupt_level1
-
-#ifdef CONFIG_ARC_IRQ5_LV2
-VECTOR   handle_interrupt_level2
-#else
-VECTOR   handle_interrupt_level1
-#endif
-
-#ifdef CONFIG_ARC_IRQ6_LV2
+#ifdef CONFIG_ARC_COMPACT_IRQ_LEVELS
 VECTOR   handle_interrupt_level2
 #else
 VECTOR   handle_interrupt_level1
 #endif
 
-.rept   25
+.rept   28
 VECTOR   handle_interrupt_level1 ; Other devices
 .endr
 
diff --git a/arch/arc/kernel/intc-compact.c b/arch/arc/kernel/intc-compact.c
index c5cceca36118..ce9deb953ca9 100644
--- a/arch/arc/kernel/intc-compact.c
+++ b/arch/arc/kernel/intc-compact.c
@@ -28,10 +28,8 @@ void arc_init_IRQ(void)
 {
         int level_mask = 0;
 
-       /* setup any high priority Interrupts (Level2 in ARCompact jargon) */
-        level_mask |= IS_ENABLED(CONFIG_ARC_IRQ3_LV2) << 3;
-        level_mask |= IS_ENABLED(CONFIG_ARC_IRQ5_LV2) << 5;
-        level_mask |= IS_ENABLED(CONFIG_ARC_IRQ6_LV2) << 6;
+       /* Is timer high priority Interrupt (Level2 in ARCompact jargon) */
+        level_mask |= IS_ENABLED(CONFIG_ARC_COMPACT_IRQ_LEVELS) << TIMER0_IRQ;
 
         /*
          * Write to register, even if no LV2 IRQs configured to reset it
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index 6fd48021324b..08f03d9b5b3e 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -108,7 +108,7 @@ static void arc_perf_event_update(struct perf_event *event,
         int64_t delta = new_raw_count - prev_raw_count;
 
         /*
-         * We don't afaraid of hwc->prev_count changing beneath our feet
+         * We aren't afraid of hwc->prev_count changing beneath our feet
          * because there's no way for us to re-enter this function anytime.
          */
         local64_set(&hwc->prev_count, new_raw_count);
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index f63b8bfefb0c..2ee7a4d758a8 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -392,7 +392,7 @@ void __init setup_arch(char **cmdline_p)
                 /*
                  * If we are here, it is established that @uboot_arg didn't
                  * point to DT blob. Instead if u-boot says it is cmdline,
-                 * Appent to embedded DT cmdline.
+                 * append to embedded DT cmdline.
                  * setup_machine_fdt() would have populated @boot_command_line
                  */
                 if (uboot_tag == 1) {
diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index 004b7f0bc76c..6cb3736b6b83 100644
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -34,7 +34,7 @@
  *  -ViXS were still seeing crashes when using insmod to load drivers.
  *   It turned out that the code to change Execute permssions for TLB entries
  *   of user was not guarded for interrupts (mod_tlb_permission)
- *   This was cauing TLB entries to be overwritten on unrelated indexes
+ *   This was causing TLB entries to be overwritten on unrelated indexes
  *
  * Vineetg: July 15th 2008: Bug #94183
  *  -Exception happens in Delay slot of a JMP, and before user space resumes,
diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index a6f91e88ce36..934150e7ac48 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -276,7 +276,7 @@ static int tlb_stats_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-/* called on user read(): display the couters */
+/* called on user read(): display the counters */
 static ssize_t tlb_stats_output(struct file *file,      /* file descriptor */
                                 char __user *user_buf,  /* user buffer */
                                 size_t len,             /* length of buffer */
diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c
index 9e5eddbb856f..5a294b2c3cb3 100644
--- a/arch/arc/mm/cache.c
+++ b/arch/arc/mm/cache.c
@@ -215,7 +215,7 @@ slc_chk:
  * ------------------
  * This ver of MMU supports variable page sizes (1k-16k): although Linux will
  * only support 8k (default), 16k and 4k.
- * However from hardware perspective, smaller page sizes aggrevate aliasing
+ * However from hardware perspective, smaller page sizes aggravate aliasing
  * meaning more vaddr bits needed to disambiguate the cache-line-op ;
  * the existing scheme of piggybacking won't work for certain configurations.
  * Two new registers IC_PTAG and DC_PTAG inttoduced.
@@ -302,7 +302,7 @@ void __cache_line_loop_v3(phys_addr_t paddr, unsigned long vaddr,
 
         /*
          * This is technically for MMU v4, using the MMU v3 programming model
-         * Special work for HS38 aliasing I-cache configuratino with PAE40
+         * Special work for HS38 aliasing I-cache configuration with PAE40
          *   - upper 8 bits of paddr need to be written into PTAG_HI
          *   - (and needs to be written before the lower 32 bits)
          * Note that PTAG_HI is hoisted outside the line loop
@@ -936,7 +936,7 @@ void arc_cache_init(void)
                               ic->ver, CONFIG_ARC_MMU_VER);
 
                 /*
-                 * In MMU v4 (HS38x) the alising icache config uses IVIL/PTAG
+                 * In MMU v4 (HS38x) the aliasing icache config uses IVIL/PTAG
                  * pair to provide vaddr/paddr respectively, just as in MMU v3
                  */
                 if (is_isa_arcv2() && ic->alias)
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c
index 8c8e36fa5659..73d7e4c75b7d 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -10,7 +10,7 @@
  * DMA Coherent API Notes
  *
  * I/O is inherently non-coherent on ARC. So a coherent DMA buffer is
- * implemented by accessintg it using a kernel virtual address, with
+ * implemented by accessing it using a kernel virtual address, with
  * Cache bit off in the TLB entry.
  *
  * The default DMA address == Phy address which is 0x8000_0000 based.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 06b6c2d695bf..414b42710a36 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -741,6 +741,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
         sun7i-a20-olimex-som-evb.dtb \
         sun7i-a20-olinuxino-lime.dtb \
         sun7i-a20-olinuxino-lime2.dtb \
+        sun7i-a20-olinuxino-lime2-emmc.dtb \
         sun7i-a20-olinuxino-micro.dtb \
         sun7i-a20-orangepi.dtb \
         sun7i-a20-orangepi-mini.dtb \
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index d82dd6e3f9b1..5687d6b4da60 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -418,7 +418,7 @@
         status = "okay";
         pinctrl-names = "default";
         pinctrl-0 = <&i2c0_pins>;
-        clock-frequency = <400000>;
+        clock-frequency = <100000>;
 
         tps@24 {
                 compatible = "ti,tps65218";
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index b01a5948cdd0..0e63b9dff6e7 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -60,10 +60,26 @@
 
                 tps659038_pmic {
                         compatible = "ti,tps659038-pmic";
+
+                        smps12-in-supply = <&vmain>;
+                        smps3-in-supply = <&vmain>;
+                        smps45-in-supply = <&vmain>;
+                        smps6-in-supply = <&vmain>;
+                        smps7-in-supply = <&vmain>;
+                        smps8-in-supply = <&vmain>;
+                        smps9-in-supply = <&vmain>;
+                        ldo1-in-supply = <&vmain>;
+                        ldo2-in-supply = <&vmain>;
+                        ldo3-in-supply = <&vmain>;
+                        ldo4-in-supply = <&vmain>;
+                        ldo9-in-supply = <&vmain>;
+                        ldoln-in-supply = <&vmain>;
+                        ldousb-in-supply = <&vmain>;
+                        ldortc-in-supply = <&vmain>;
+
                         regulators {
                                 smps12_reg: smps12 {
                                         /* VDD_MPU */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps12";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1250000>;
@@ -73,7 +89,6 @@
 
                                 smps3_reg: smps3 {
                                         /* VDD_DDR EMIF1 EMIF2 */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps3";
                                         regulator-min-microvolt = <1350000>;
                                         regulator-max-microvolt = <1350000>;
@@ -84,7 +99,6 @@
                                 smps45_reg: smps45 {
                                         /* VDD_DSPEVE on AM572 */
                                         /* VDD_IVA + VDD_DSP on AM571 */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps45";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1250000>;
@@ -94,7 +108,6 @@
 
                                 smps6_reg: smps6 {
                                         /* VDD_GPU */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps6";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1250000>;
@@ -104,7 +117,6 @@
 
                                 smps7_reg: smps7 {
                                         /* VDD_CORE */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps7";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1150000>;
@@ -115,13 +127,11 @@
                                 smps8_reg: smps8 {
                                         /* 5728 - VDD_IVAHD */
                                         /* 5718 - N.C. test point */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps8";
                                 };
 
                                 smps9_reg: smps9 {
                                         /* VDD_3_3D */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps9";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
@@ -132,7 +142,6 @@
                                 ldo1_reg: ldo1 {
                                         /* VDDSHV8 - VSDMMC  */
                                         /* NOTE: on rev 1.3a, data supply */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo1";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <3300000>;
@@ -142,7 +151,6 @@
 
                                 ldo2_reg: ldo2 {
                                         /* VDDSH18V */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo2";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -152,7 +160,6 @@
 
                                 ldo3_reg: ldo3 {
                                         /* R1.3a 572x V1_8PHY_LDO3: USB, SATA */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo3";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -162,7 +169,6 @@
 
                                 ldo4_reg: ldo4 {
                                         /* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo4";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -174,7 +180,6 @@
 
                                 ldo9_reg: ldo9 {
                                         /* VDD_RTC  */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo9";
                                         regulator-min-microvolt = <840000>;
                                         regulator-max-microvolt = <1160000>;
@@ -184,7 +189,6 @@
 
                                 ldoln_reg: ldoln {
                                         /* VDDA_1V8_PLL */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldoln";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -194,7 +198,6 @@
 
                                 ldousb_reg: ldousb {
                                         /* VDDA_3V_USB: VDDA_USBHS33 */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldousb";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
@@ -204,7 +207,6 @@
 
                                 ldortc_reg: ldortc {
                                         /* VDDA_RTC  */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldortc";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index cbc17b0794b1..4128fa91823c 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -93,6 +93,10 @@
         };
 };
 
+&mmc1 {
+        status = "disabled";
+};
+
 &mmc2 {
         pinctrl-names = "default";
         pinctrl-0 = <&sd1_pins>;
@@ -101,6 +105,10 @@
         cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
 };
 
+&mmc3 {
+        status = "disabled";
+};
+
 &pincntl {
         sd1_pins: pinmux_sd1_pins {
                 pinctrl-single,pins = <
diff --git a/arch/arm/boot/dts/dm8148-t410.dts b/arch/arm/boot/dts/dm8148-t410.dts
index 5d4313fd5a46..3f184863e0c5 100644
--- a/arch/arm/boot/dts/dm8148-t410.dts
+++ b/arch/arm/boot/dts/dm8148-t410.dts
@@ -45,6 +45,14 @@
         phy-mode = "rgmii";
 };
 
+&mmc1 {
+        status = "disabled";
+};
+
+&mmc2 {
+        status = "disabled";
+};
+
 &mmc3 {
         pinctrl-names = "default";
         pinctrl-0 = <&sd2_pins>;
@@ -53,6 +61,7 @@
         dmas = <&edma_xbar 8 0 1        /* use SDTXEVT1 instead of MCASP0TX */
                 &edma_xbar 9 0 2>;      /* use SDRXEVT1 instead of MCASP0RX */
         dma-names = "tx", "rx";
+        non-removable;
 };
 
 &pincntl {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index e0074014385a..3a8f3976f6f9 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1451,6 +1451,8 @@
                         ti,hwmods = "gpmc";
                         reg = <0x50000000 0x37c>;      /* device IO registers */
                         interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&edma_xbar 4 0>;
+                        dma-names = "rxtx";
                         gpmc,num-cs = <8>;
                         gpmc,num-waitpins = <2>;
                         #address-cells = <2>;
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index 4220eeffc65a..5e06020f450b 100644
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -107,8 +107,8 @@
         reg = <0x58000000 0x80>,
               <0x58004054 0x4>,
               <0x58004300 0x20>,
-              <0x58005054 0x4>,
-              <0x58005300 0x20>;
+              <0x58009054 0x4>,
+              <0x58009300 0x20>;
         reg-names = "dss", "pll1_clkctrl", "pll1",
                     "pll2_clkctrl", "pll2";
 
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index ddfe1f558c10..fa14f77df563 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -242,7 +242,7 @@
         hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
 
         ports {
-                port0 {
+                port {
                         dp_out: endpoint {
                                 remote-endpoint = <&bridge_in>;
                         };
@@ -485,13 +485,20 @@
                 edid-emulation = <5>;
 
                 ports {
-                        port0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
                                 bridge_out: endpoint {
                                         remote-endpoint = <&panel_in>;
                                 };
                         };
 
-                        port1 {
+                        port@1 {
+                                reg = <1>;
+
                                 bridge_in: endpoint {
                                         remote-endpoint = <&dp_out>;
                                 };
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f9d2e4f1a0e0..1de972d46a87 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -163,7 +163,7 @@
         hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
 
         ports {
-                port0 {
+                port {
                         dp_out: endpoint {
                                 remote-endpoint = <&bridge_in>;
                         };
@@ -631,13 +631,20 @@
                 use-external-pwm;
 
                 ports {
-                        port0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
                                 bridge_out: endpoint {
                                         remote-endpoint = <&panel_in>;
                                 };
                         };
 
-                        port1 {
+                        port@1 {
+                                reg = <1>;
+
                                 bridge_in: endpoint {
                                         remote-endpoint = <&dp_out>;
                                 };
diff --git a/arch/arm/boot/dts/omap3-evm-37xx.dts b/arch/arm/boot/dts/omap3-evm-37xx.dts
index 76056ba92ced..ed449827c3d3 100644
--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -85,7 +85,7 @@
                         OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */
                         OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */
                         OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */
-                        OMAP3_CORE1_IOPAD(0x215e, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
+                        OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
                         OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */
                         OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */
                 >;
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 41f5d386f21f..f4f2ce46d681 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -188,6 +188,7 @@
         vmmc-supply = <&vmmc1>;
         vmmc_aux-supply = <&vsim>;
         bus-width = <4>;
+        cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;
 };
 
 &mmc3 {
diff --git a/arch/arm/boot/dts/omap3-igep0020-common.dtsi b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
index d6f839cab649..b6971060648a 100644
--- a/arch/arm/boot/dts/omap3-igep0020-common.dtsi
+++ b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
@@ -194,6 +194,12 @@
                         OMAP3630_CORE2_IOPAD(0x25f8, PIN_OUTPUT | MUX_MODE4) /* etk_d14.gpio_28 */
                 >;
         };
+
+        mmc1_wp_pins: pinmux_mmc1_cd_pins {
+                pinctrl-single,pins = <
+                        OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT | MUX_MODE4)   /* etk_d15.gpio_29 */
+                >;
+        };
 };
 
 &i2c3 {
@@ -250,3 +256,8 @@
                 };
         };
 };
+
+&mmc1 {
+        pinctrl-0 = <&mmc1_pins &mmc1_wp_pins>;
+        wp-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; /* gpio_29 */
+};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index d9e2d9c6e999..2b74a81d1de2 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -288,7 +288,7 @@
                 pinctrl-single,pins = <
                         OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1) /* ssi1_rdy_tx */
                         OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1)               /* ssi1_flag_tx */
-                        OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+                        OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4)                /* ssi1_wake_tx (cawake) */
                         OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1)               /* ssi1_dat_tx */
                         OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1)                /* ssi1_dat_rx */
                         OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1)                /* ssi1_flag_rx */
@@ -300,7 +300,7 @@
         modem_pins: pinmux_modem {
                 pinctrl-single,pins = <
                         OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE4)               /* gpio 70 => cmt_apeslpx */
-                        OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio 72 => ape_rst_rq */
+                        OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT | MUX_MODE4)                /* gpio 72 => ape_rst_rq */
                         OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE4)               /* gpio 73 => cmt_rst_rq */
                         OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE4)               /* gpio 74 => cmt_en */
                         OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE4)               /* gpio 75 => cmt_rst */
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index a00ca761675d..927b17fc4ed8 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -97,7 +97,7 @@
                         OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1)            /* ssi1_dat_tx */
                         OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1)            /* ssi1_flag_tx */
                         OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1)      /* ssi1_rdy_tx */
-                        OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+                        OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4)        /* ssi1_wake_tx (cawake) */
                         OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1)             /* ssi1_dat_rx */
                         OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1)             /* ssi1_flag_rx */
                         OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE1)            /* ssi1_rdy_rx */
@@ -110,7 +110,7 @@
                         OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE7)            /* ssi1_dat_tx */
                         OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE7)            /* ssi1_flag_tx */
                         OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLDOWN | MUX_MODE7)    /* ssi1_rdy_tx */
-                        OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+                        OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4)        /* ssi1_wake_tx (cawake) */
                         OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE7)             /* ssi1_dat_rx */
                         OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE7)             /* ssi1_flag_rx */
                         OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE4)            /* ssi1_rdy_rx */
@@ -120,7 +120,7 @@
 
         modem_pins1: pinmux_modem_core1_pins {
                 pinctrl-single,pins = <
-                        OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio_34 (ape_rst_rq) */
+                        OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | MUX_MODE4)        /* gpio_34 (ape_rst_rq) */
                         OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT | MUX_MODE4)            /* gpio_88 (cmt_rst_rq) */
                         OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE4)            /* gpio_93 (cmt_apeslpx) */
                 >;
diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts
index f19170bdcc1f..c29b41dc7b95 100644
--- a/arch/arm/boot/dts/omap3-zoom3.dts
+++ b/arch/arm/boot/dts/omap3-zoom3.dts
@@ -98,7 +98,7 @@
                 pinctrl-single,pins = <
                         OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts */
                         OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0)               /* uart2_rts.uart2_rts */
-                        OMAP3_CORE1_IOPAD(0x217a, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
+                        OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)                /* uart2_rx.uart2_rx */
                         OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0)               /* uart2_tx.uart2_tx */
                 >;
         };
@@ -107,7 +107,7 @@
                 pinctrl-single,pins = <
                         OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLDOWN | MUX_MODE0)       /* uart3_cts_rctx.uart3_cts_rctx */
                         OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE0)               /* uart3_rts_sd.uart3_rts_sd */
-                        OMAP3_CORE1_IOPAD(0x219e, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+                        OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)                /* uart3_rx_irrx.uart3_rx_irrx */
                         OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)               /* uart3_tx_irtx.uart3_tx_irtx */
                 >;
         };
@@ -125,7 +125,7 @@
                 pinctrl-single,pins = <
                         OMAP3630_CORE2_IOPAD(0x25d8, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_clk.sdmmc3_clk */
                         OMAP3630_CORE2_IOPAD(0x25e4, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d4.sdmmc3_dat0 */
-                        OMAP3630_CORE2_IOPAD(0x25e6, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE2) /* etk_d5.sdmmc3_dat1 */
+                        OMAP3630_CORE2_IOPAD(0x25e6, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d5.sdmmc3_dat1 */
                         OMAP3630_CORE2_IOPAD(0x25e8, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d6.sdmmc3_dat2 */
                         OMAP3630_CORE2_IOPAD(0x25e2, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d3.sdmmc3_dat3 */
                 >;
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index dc759a3028b7..5d5b620b7d9b 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -14,6 +14,29 @@
                 display0 = &hdmi0;
         };
 
+        vmain: fixedregulator-vmain {
+                compatible = "regulator-fixed";
+                regulator-name = "vmain";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        vsys_cobra: fixedregulator-vsys_cobra {
+                compatible = "regulator-fixed";
+                regulator-name = "vsys_cobra";
+                vin-supply = <&vmain>;
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        vdds_1v8_main: fixedregulator-vdds_1v8_main {
+                compatible = "regulator-fixed";
+                regulator-name = "vdds_1v8_main";
+                vin-supply = <&smps7_reg>;
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+        };
+
         vmmcsd_fixed: fixedregulator-mmcsd {
                 compatible = "regulator-fixed";
                 regulator-name = "vmmcsd_fixed";
@@ -309,7 +332,7 @@
 
         wlcore_irq_pin: pinmux_wlcore_irq_pin {
                 pinctrl-single,pins = <
-                        OMAP5_IOPAD(0x40, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE6)     /* llia_wakereqin.gpio1_wk14 */
+                        OMAP5_IOPAD(0x40, PIN_INPUT_PULLUP | MUX_MODE6) /* llia_wakereqin.gpio1_wk14 */
                 >;
         };
 };
@@ -409,6 +432,26 @@
 
                         ti,ldo6-vibrator;
 
+                        smps123-in-supply = <&vsys_cobra>;
+                        smps45-in-supply = <&vsys_cobra>;
+                        smps6-in-supply = <&vsys_cobra>;
+                        smps7-in-supply = <&vsys_cobra>;
+                        smps8-in-supply = <&vsys_cobra>;
+                        smps9-in-supply = <&vsys_cobra>;
+                        smps10_out2-in-supply = <&vsys_cobra>;
+                        smps10_out1-in-supply = <&vsys_cobra>;
+                        ldo1-in-supply = <&vsys_cobra>;
+                        ldo2-in-supply = <&vsys_cobra>;
+                        ldo3-in-supply = <&vdds_1v8_main>;
+                        ldo4-in-supply = <&vdds_1v8_main>;
+                        ldo5-in-supply = <&vsys_cobra>;
+                        ldo6-in-supply = <&vdds_1v8_main>;
+                        ldo7-in-supply = <&vsys_cobra>;
+                        ldo8-in-supply = <&vsys_cobra>;
+                        ldo9-in-supply = <&vmmcsd_fixed>;
+                        ldoln-in-supply = <&vsys_cobra>;
+                        ldousb-in-supply = <&vsys_cobra>;
+
                         regulators {
                                 smps123_reg: smps123 {
                                         /* VDD_OPP_MPU */
@@ -600,7 +643,8 @@
                 pinctrl-0 = <&twl6040_pins>;
 
                 interrupts = <GIC_SPI 119 IRQ_TYPE_NONE>; /* IRQ_SYS_2N cascaded to gic */
-                ti,audpwron-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;  /* gpio line 141 */
+
+                /* audpwron gpio defined in the board specific dts */
 
                 vio-supply = <&smps7_reg>;
                 v2v1-supply = <&smps9_reg>;
diff --git a/arch/arm/boot/dts/omap5-igep0050.dts b/arch/arm/boot/dts/omap5-igep0050.dts
index 46ecb1dd3b5c..f75ce02fb398 100644
--- a/arch/arm/boot/dts/omap5-igep0050.dts
+++ b/arch/arm/boot/dts/omap5-igep0050.dts
@@ -35,6 +35,22 @@
         };
 };
 
+/* LDO4 is VPP1 - ball AD9 */
+&ldo4_reg {
+        regulator-min-microvolt = <2000000>;
+        regulator-max-microvolt = <2000000>;
+};
+
+/*
+ * LDO7 is used for HDMI: VDDA_DSIPORTA - ball AA33, VDDA_DSIPORTC - ball AE33,
+ * VDDA_HDMI - ball AN25
+ */
+&ldo7_reg {
+        status = "okay";
+        regulator-min-microvolt = <1800000>;
+        regulator-max-microvolt = <1800000>;
+};
+
 &omap5_pmx_core {
         i2c4_pins: pinmux_i2c4_pins {
                 pinctrl-single,pins = <
@@ -52,3 +68,13 @@
                 <&gpio7 3 0>;           /* 195, SDA */
 };
 
+&twl6040 {
+        ti,audpwron-gpio = <&gpio5 16 GPIO_ACTIVE_HIGH>;  /* gpio line 144 */
+};
+
+&twl6040_pins {
+        pinctrl-single,pins = <
+                OMAP5_IOPAD(0x1c4, PIN_OUTPUT | MUX_MODE6)      /* mcspi1_somi.gpio5_144 */
+                OMAP5_IOPAD(0x1ca, PIN_OUTPUT | MUX_MODE6)      /* perslimbus2_clock.gpio5_145 */
+        >;
+};
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 60b3fbb3bf07..a51e60518eb6 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -51,3 +51,13 @@
                 <&gpio9 1 GPIO_ACTIVE_HIGH>,    /* TCA6424A P00, LS OE */
                 <&gpio7 1 GPIO_ACTIVE_HIGH>;    /* GPIO 193, HPD */
 };
+
+&twl6040 {
+        ti,audpwron-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;  /* gpio line 141 */
+};
+
+&twl6040_pins {
+        pinctrl-single,pins = <
+                OMAP5_IOPAD(0x1be, PIN_OUTPUT | MUX_MODE6)      /* mcspi1_somi.gpio5_141 */
+        >;
+};
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
index a3601e4c0a2e..b844473601d2 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
@@ -136,6 +136,7 @@
 &gmac1 {
         status = "okay";
         phy-mode = "rgmii";
+        phy-handle = <&phy1>;
 
         snps,reset-gpio = <&porta 0 GPIO_ACTIVE_LOW>;
         snps,reset-active-low;
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index ad8ba10764a3..d294e82447a2 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -24,18 +24,21 @@
                         compatible = "shared-dma-pool";
                         reg = <0x40000000 0x01000000>;
                         no-map;
+                        status = "disabled";
                 };
 
                 gp1_reserved: rproc@41000000 {
                         compatible = "shared-dma-pool";
                         reg = <0x41000000 0x01000000>;
                         no-map;
+                        status = "disabled";
                 };
 
                 audio_reserved: rproc@42000000 {
                         compatible = "shared-dma-pool";
                         reg = <0x42000000 0x01000000>;
                         no-map;
+                        status = "disabled";
                 };
 
                 dmu_reserved: rproc@43000000 {
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 68b479b8772c..73c133f5e79c 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -176,8 +176,6 @@
 };
 
 &reg_dc1sw {
-        regulator-min-microvolt = <3000000>;
-        regulator-max-microvolt = <3000000>;
         regulator-name = "vcc-lcd";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index 360adfb1e9ca..d6ad6196a768 100644
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -135,8 +135,6 @@
 
 &reg_dc1sw {
         regulator-name = "vcc-lcd-usb2";
-        regulator-min-microvolt = <3000000>;
-        regulator-max-microvolt = <3000000>;
 };
 
 &reg_dc5ldo {
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 10f49ab5328e..47195e8690b4 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -82,6 +82,7 @@ CONFIG_TOUCHSCREEN_MMS114=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MAX77693_HAPTIC=y
 CONFIG_INPUT_MAX8997_HAPTIC=y
+CONFIG_KEYBOARD_SAMSUNG=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 8f857564657f..8a5fff1b7f6f 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -264,6 +264,7 @@ CONFIG_KEYBOARD_TEGRA=y
 CONFIG_KEYBOARD_SPEAR=y
 CONFIG_KEYBOARD_ST_KEYSCAN=y
 CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_SAMSUNG=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_CYAPA=m
 CONFIG_MOUSE_ELAN_I2C=y
diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
index 19cfab526d13..20febb368844 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
@@ -29,7 +29,7 @@
 
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return (pmd_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);
+        return (pmd_t *)get_zeroed_page(GFP_KERNEL);
 }
 
 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
index aeddd28b3595..92fd2c8a9af0 100644
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
@@ -193,6 +193,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
 
 #define pmd_large(pmd)          (pmd_val(pmd) & 2)
 #define pmd_bad(pmd)            (pmd_val(pmd) & 2)
+#define pmd_present(pmd)        (pmd_val(pmd))
 
 #define copy_pmd(pmdpd,pmdps)           \
         do {                            \
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index fa70db7c714b..2a029bceaf2f 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -211,6 +211,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
                                                 : !!(pmd_val(pmd) & (val)))
 #define pmd_isclear(pmd, val)   (!(pmd_val(pmd) & (val)))
 
+#define pmd_present(pmd)        (pmd_isset((pmd), L_PMD_SECT_VALID))
 #define pmd_young(pmd)          (pmd_isset((pmd), PMD_SECT_AF))
 #define pte_special(pte)        (pte_isset((pte), L_PTE_SPECIAL))
 static inline pte_t pte_mkspecial(pte_t pte)
@@ -249,10 +250,10 @@ PMD_BIT_FUNC(mkyoung,   |= PMD_SECT_AF);
 #define pfn_pmd(pfn,prot)       (__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))
 #define mk_pmd(page,prot)       pfn_pmd(page_to_pfn(page),prot)
 
-/* represent a notpresent pmd by zero, this is used by pmdp_invalidate */
+/* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */
 static inline pmd_t pmd_mknotpresent(pmd_t pmd)
 {
-        return __pmd(0);
+        return __pmd(pmd_val(pmd) & ~L_PMD_SECT_VALID);
 }
 
 static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 348caabb7625..d62204060cbe 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -182,7 +182,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 #define pgd_offset_k(addr)      pgd_offset(&init_mm, addr)
 
 #define pmd_none(pmd)           (!pmd_val(pmd))
-#define pmd_present(pmd)        (pmd_val(pmd))
 
 static inline pte_t *pmd_page_vaddr(pmd_t pmd)
 {
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index ef9119f7462e..4d9375814b53 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -733,8 +733,8 @@ static int vfp_set(struct task_struct *target,
         if (ret)
                 return ret;
 
-        vfp_flush_hwstate(thread);
         thread->vfpstate.hard = new_vfp;
+        vfp_flush_hwstate(thread);
 
         return 0;
 }
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index df90bc59bfce..861521606c6d 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -486,7 +486,7 @@ static const char *ipi_types[NR_IPI] __tracepoint_string = {
 
 static void smp_cross_call(const struct cpumask *target, unsigned int ipinr)
 {
-        trace_ipi_raise(target, ipi_types[ipinr]);
+        trace_ipi_raise_rcuidle(target, ipi_types[ipinr]);
         __smp_cross_call(target, ipinr);
 }
 
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e65aa7d11b20..20dcf6e904b2 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -61,7 +61,6 @@ config ARCH_EXYNOS4
         select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
         select CPU_EXYNOS4210
         select GIC_NON_BANKED
-        select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
         select MIGHT_HAVE_CACHE_L2X0
         help
           Samsung EXYNOS4 (Cortex-A9) SoC based systems
diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
index a38b16b69923..b56de4b8cdf2 100644
--- a/arch/arm/mach-imx/mach-imx6ul.c
+++ b/arch/arm/mach-imx/mach-imx6ul.c
@@ -46,7 +46,7 @@ static int ksz8081_phy_fixup(struct phy_device *dev)
 static void __init imx6ul_enet_phy_init(void)
 {
         if (IS_BUILTIN(CONFIG_PHYLIB))
-                phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff,
+                phy_register_fixup_for_uid(PHY_ID_KSZ8081, MICREL_PHY_ID_MASK,
                                            ksz8081_phy_fixup);
 }
 
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
index 5d7fb596bf4a..bf608441b357 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S
+++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
@@ -43,8 +43,8 @@
 #define OTHERS_MASK                     (MODEM_IRQ_MASK | HOOK_SWITCH_MASK)
 
 /* IRQ handler register bitmasks */
-#define DEFERRED_FIQ_MASK               (0x1 << (INT_DEFERRED_FIQ % IH2_BASE))
-#define GPIO_BANK1_MASK                 (0x1 << INT_GPIO_BANK1)
+#define DEFERRED_FIQ_MASK               OMAP_IRQ_BIT(INT_DEFERRED_FIQ)
+#define GPIO_BANK1_MASK                 OMAP_IRQ_BIT(INT_GPIO_BANK1)
 
 /* Driver buffer byte offsets */
 #define BUF_MASK                        (FIQ_MASK * 4)
@@ -110,7 +110,7 @@ ENTRY(qwerty_fiqin_start)
         mov r8, #2                              @ reset FIQ agreement
         str r8, [r12, #IRQ_CONTROL_REG_OFFSET]
 
-        cmp r10, #INT_GPIO_BANK1                @ is it GPIO bank interrupt?
+        cmp r10, #(INT_GPIO_BANK1 - NR_IRQS_LEGACY)     @ is it GPIO interrupt?
         beq gpio                                @ yes - process it
 
         mov r8, #1
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index d1f12095f315..ec760ae2f917 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -109,7 +109,8 @@ void __init ams_delta_init_fiq(void)
          * Since no set_type() method is provided by OMAP irq chip,
          * switch to edge triggered interrupt type manually.
          */
-        offset = IRQ_ILR0_REG_OFFSET + INT_DEFERRED_FIQ * 0x4;
+        offset = IRQ_ILR0_REG_OFFSET +
+                        ((INT_DEFERRED_FIQ - NR_IRQS_LEGACY) & 0x1f) * 0x4;
         val = omap_readl(DEFERRED_FIQ_IH_BASE + offset) & ~(1 << 1);
         omap_writel(val, DEFERRED_FIQ_IH_BASE + offset);
 
@@ -149,7 +150,7 @@ void __init ams_delta_init_fiq(void)
         /*
          * Redirect GPIO interrupts to FIQ
          */
-        offset = IRQ_ILR0_REG_OFFSET + INT_GPIO_BANK1 * 0x4;
+        offset = IRQ_ILR0_REG_OFFSET + (INT_GPIO_BANK1 - NR_IRQS_LEGACY) * 0x4;
         val = omap_readl(OMAP_IH1_BASE + offset) | 1;
         omap_writel(val, OMAP_IH1_BASE + offset);
 }
diff --git a/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h b/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
index adb5e7649659..6dfc3e1210a3 100644
--- a/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
+++ b/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
@@ -14,6 +14,8 @@
 #ifndef __AMS_DELTA_FIQ_H
 #define __AMS_DELTA_FIQ_H
 
+#include <mach/irqs.h>
+
 /*
  * Interrupt number used for passing control from FIQ to IRQ.
  * IRQ12, described as reserved, has been selected.
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0517f0c1581a..1a648e9dfaa0 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -17,6 +17,7 @@ config ARCH_OMAP3
         select PM_OPP if PM
         select PM if CPU_IDLE
         select SOC_HAS_OMAP2_SDRC
+        select ARM_ERRATA_430973
 
 config ARCH_OMAP4
         bool "TI OMAP4"
@@ -36,6 +37,7 @@ config ARCH_OMAP4
         select PM if CPU_IDLE
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
+        select OMAP_INTERCONNECT
 
 config SOC_OMAP5
         bool "TI OMAP5"
@@ -67,6 +69,8 @@ config SOC_AM43XX
         select HAVE_ARM_SCU
         select GENERIC_CLOCKEVENTS_BROADCAST
         select HAVE_ARM_TWD
+        select ARM_ERRATA_754322
+        select ARM_ERRATA_775420
 
 config SOC_DRA7XX
         bool "TI DRA7XX"
@@ -240,4 +244,12 @@ endmenu
 
 endif
 
+config OMAP5_ERRATA_801819
+        bool "Errata 801819: An eviction from L1 data cache might stall indefinitely"
+        depends on SOC_OMAP5 || SOC_DRA7XX
+        help
+          A livelock can occur in the L2 cache arbitration that might prevent
+          a snoop from completing. Under certain conditions this can cause the
+          system to deadlock.
+
 endmenu
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index d9c3ffc39329..390795b334c3 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -39,7 +39,7 @@
 #include "gpmc.h"
 #include "gpmc-smsc911x.h"
 
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
 #include <video/omap-panel-data.h>
 
 #include "board-flash.h"
@@ -47,6 +47,7 @@
 #include "hsmmc.h"
 #include "control.h"
 #include "common-board-devices.h"
+#include "display.h"
 
 #define LDP_SMSC911X_CS         1
 #define LDP_SMSC911X_GPIO       152
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 9cfebc5c7455..180c6aa633bd 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -15,13 +15,14 @@
 #include <linux/spi/spi.h>
 #include <linux/mm.h>
 #include <asm/mach-types.h>
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
 #include <video/omap-panel-data.h>
 
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include "soc.h"
 #include "board-rx51.h"
+#include "display.h"
 
 #include "mux.h"
 
@@ -32,7 +33,6 @@
 static struct connector_atv_platform_data rx51_tv_pdata = {
         .name = "tv",
         .source = "venc.0",
-        .connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
         .invert_polarity = false,
 };
 
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 6ab13d18c636..70b3eaf085e4 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -29,7 +29,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
 #include "omap_hwmod.h"
 #include "omap_device.h"
 #include "omap-pm.h"
diff --git a/arch/arm/mach-omap2/display.h b/arch/arm/mach-omap2/display.h
index 7375854b16c7..78f253005279 100644
--- a/arch/arm/mach-omap2/display.h
+++ b/arch/arm/mach-omap2/display.h
@@ -33,4 +33,9 @@ int omap_init_vout(void);
 
 struct device_node * __init omapdss_find_dss_of_node(void);
 
+struct omap_dss_board_info;
+
+/* Init with the board info */
+int omap_display_init(struct omap_dss_board_info *board_data);
+
 #endif
diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
index ea2be0f5953b..1d583bc0b1a9 100644
--- a/arch/arm/mach-omap2/dss-common.c
+++ b/arch/arm/mach-omap2/dss-common.c
@@ -27,7 +27,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
 #include <video/omap-panel-data.h>
 
 #include "soc.h"
diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h
index af2851fbcdf0..bae263fba640 100644
--- a/arch/arm/mach-omap2/omap-secure.h
+++ b/arch/arm/mach-omap2/omap-secure.h
@@ -46,6 +46,7 @@
 
 #define OMAP5_DRA7_MON_SET_CNTFRQ_INDEX 0x109
 #define OMAP5_MON_AMBA_IF_INDEX         0x108
+#define OMAP5_DRA7_MON_SET_ACR_INDEX    0x107
 
 /* Secure PPA(Primary Protected Application) APIs */
 #define OMAP4_PPA_L2_POR_INDEX          0x23
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index c625cc10d9f9..8cd1de914ee4 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -50,6 +50,39 @@ void __iomem *omap4_get_scu_base(void)
         return scu_base;
 }
 
+#ifdef CONFIG_OMAP5_ERRATA_801819
+void omap5_erratum_workaround_801819(void)
+{
+        u32 acr, revidr;
+        u32 acr_mask;
+
+        /* REVIDR[3] indicates erratum fix available on silicon */
+        asm volatile ("mrc p15, 0, %0, c0, c0, 6" : "=r" (revidr));
+        if (revidr & (0x1 << 3))
+                return;
+
+        asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr));
+        /*
+         * BIT(27) - Disables streaming. All write-allocate lines allocate in
+         * the L1 or L2 cache.
+         * BIT(25) - Disables streaming. All write-allocate lines allocate in
+         * the L1 cache.
+         */
+        acr_mask = (0x3 << 25) | (0x3 << 27);
+        /* do we already have it done.. if yes, skip expensive smc */
+        if ((acr & acr_mask) == acr_mask)
+                return;
+
+        acr |= acr_mask;
+        omap_smc1(OMAP5_DRA7_MON_SET_ACR_INDEX, acr);
+
+        pr_debug("%s: ARM erratum workaround 801819 applied on CPU%d\n",
+                 __func__, smp_processor_id());
+}
+#else
+static inline void omap5_erratum_workaround_801819(void) { }
+#endif
+
 static void omap4_secondary_init(unsigned int cpu)
 {
         /*
@@ -64,12 +97,15 @@ static void omap4_secondary_init(unsigned int cpu)
                 omap_secure_dispatcher(OMAP4_PPA_CPU_ACTRL_SMP_INDEX,
                                                         4, 0, 0, 0, 0, 0);
 
-        /*
-         * Configure the CNTFRQ register for the secondary cpu's which
-         * indicates the frequency of the cpu local timers.
-         */
-        if (soc_is_omap54xx() || soc_is_dra7xx())
+        if (soc_is_omap54xx() || soc_is_dra7xx()) {
+                /*
+                 * Configure the CNTFRQ register for the secondary cpu's which
+                 * indicates the frequency of the cpu local timers.
+                 */
                 set_cntfreq();
+                /* Configure ACR to disable streaming WA for 801819 */
+                omap5_erratum_workaround_801819();
+        }
 
         /*
          * Synchronise with the boot thread.
@@ -218,6 +254,8 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
 
         if (cpu_is_omap446x())
                 startup_addr = omap4460_secondary_startup;
+        if (soc_is_dra74x() || soc_is_omap54xx())
+                omap5_erratum_workaround_801819();
 
         /*
          * Write the address of secondary startup routine into the
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 78af6d8cf2e2..daf2753de7aa 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -186,8 +186,9 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
                         trace_state = (PWRDM_TRACE_STATES_FLAG |
                                        ((next & OMAP_POWERSTATE_MASK) << 8) |
                                        ((prev & OMAP_POWERSTATE_MASK) << 0));
-                        trace_power_domain_target(pwrdm->name, trace_state,
-                                                  smp_processor_id());
+                        trace_power_domain_target_rcuidle(pwrdm->name,
+                                                          trace_state,
+                                                          smp_processor_id());
                 }
                 break;
         default:
@@ -523,8 +524,8 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
 
         if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) {
                 /* Trace the pwrdm desired target state */
-                trace_power_domain_target(pwrdm->name, pwrst,
-                                          smp_processor_id());
+                trace_power_domain_target_rcuidle(pwrdm->name, pwrst,
+                                                  smp_processor_id());
                 /* Program the pwrdm desired target state */
                 ret = arch_pwrdm->pwrdm_set_next_pwrst(pwrdm, pwrst);
         }
diff --git a/arch/arm/mach-omap2/powerdomains7xx_data.c b/arch/arm/mach-omap2/powerdomains7xx_data.c
index 0ec2d00f4237..eb350a673133 100644
--- a/arch/arm/mach-omap2/powerdomains7xx_data.c
+++ b/arch/arm/mach-omap2/powerdomains7xx_data.c
@@ -36,14 +36,7 @@ static struct powerdomain iva_7xx_pwrdm = {
         .prcm_offs        = DRA7XX_PRM_IVA_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
-        .pwrsts_logic_ret = PWRSTS_OFF,
         .banks            = 4,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* hwa_mem */
-                [1] = PWRSTS_OFF_RET,   /* sl2_mem */
-                [2] = PWRSTS_OFF_RET,   /* tcm1_mem */
-                [3] = PWRSTS_OFF_RET,   /* tcm2_mem */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* hwa_mem */
                 [1] = PWRSTS_ON,        /* sl2_mem */
@@ -76,12 +69,7 @@ static struct powerdomain ipu_7xx_pwrdm = {
         .prcm_offs        = DRA7XX_PRM_IPU_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
-        .pwrsts_logic_ret = PWRSTS_OFF,
         .banks            = 2,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* aessmem */
-                [1] = PWRSTS_OFF_RET,   /* periphmem */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* aessmem */
                 [1] = PWRSTS_ON,        /* periphmem */
@@ -95,11 +83,7 @@ static struct powerdomain dss_7xx_pwrdm = {
         .prcm_offs        = DRA7XX_PRM_DSS_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
-        .pwrsts_logic_ret = PWRSTS_OFF,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* dss_mem */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* dss_mem */
         },
@@ -111,13 +95,8 @@ static struct powerdomain l4per_7xx_pwrdm = {
         .name             = "l4per_pwrdm",
         .prcm_offs        = DRA7XX_PRM_L4PER_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
-        .pwrsts           = PWRSTS_RET_ON,
-        .pwrsts_logic_ret = PWRSTS_RET,
+        .pwrsts           = PWRSTS_ON,
         .banks            = 2,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* nonretained_bank */
-                [1] = PWRSTS_OFF_RET,   /* retained_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* nonretained_bank */
                 [1] = PWRSTS_ON,        /* retained_bank */
@@ -132,9 +111,6 @@ static struct powerdomain gpu_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* gpu_mem */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* gpu_mem */
         },
@@ -148,8 +124,6 @@ static struct powerdomain wkupaon_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* wkup_bank */
         },
@@ -161,15 +135,7 @@ static struct powerdomain core_7xx_pwrdm = {
         .prcm_offs        = DRA7XX_PRM_CORE_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_ON,
-        .pwrsts_logic_ret = PWRSTS_RET,
         .banks            = 5,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* core_nret_bank */
-                [1] = PWRSTS_OFF_RET,   /* core_ocmram */
-                [2] = PWRSTS_OFF_RET,   /* core_other_bank */
-                [3] = PWRSTS_OFF_RET,   /* ipu_l2ram */
-                [4] = PWRSTS_OFF_RET,   /* ipu_unicache */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* core_nret_bank */
                 [1] = PWRSTS_ON,        /* core_ocmram */
@@ -226,11 +192,7 @@ static struct powerdomain vpe_7xx_pwrdm = {
         .prcm_offs        = DRA7XX_PRM_VPE_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
-        .pwrsts_logic_ret = PWRSTS_OFF,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* vpe_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* vpe_bank */
         },
@@ -260,14 +222,8 @@ static struct powerdomain l3init_7xx_pwrdm = {
         .name             = "l3init_pwrdm",
         .prcm_offs        = DRA7XX_PRM_L3INIT_INST,
         .prcm_partition   = DRA7XX_PRM_PARTITION,
-        .pwrsts           = PWRSTS_RET_ON,
-        .pwrsts_logic_ret = PWRSTS_RET,
+        .pwrsts           = PWRSTS_ON,
         .banks            = 3,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* gmac_bank */
-                [1] = PWRSTS_OFF_RET,   /* l3init_bank1 */
-                [2] = PWRSTS_OFF_RET,   /* l3init_bank2 */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* gmac_bank */
                 [1] = PWRSTS_ON,        /* l3init_bank1 */
@@ -283,9 +239,6 @@ static struct powerdomain eve3_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* eve3_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* eve3_bank */
         },
@@ -299,9 +252,6 @@ static struct powerdomain emu_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* emu_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* emu_bank */
         },
@@ -314,11 +264,6 @@ static struct powerdomain dsp2_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 3,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* dsp2_edma */
-                [1] = PWRSTS_OFF_RET,   /* dsp2_l1 */
-                [2] = PWRSTS_OFF_RET,   /* dsp2_l2 */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* dsp2_edma */
                 [1] = PWRSTS_ON,        /* dsp2_l1 */
@@ -334,11 +279,6 @@ static struct powerdomain dsp1_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 3,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* dsp1_edma */
-                [1] = PWRSTS_OFF_RET,   /* dsp1_l1 */
-                [2] = PWRSTS_OFF_RET,   /* dsp1_l2 */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* dsp1_edma */
                 [1] = PWRSTS_ON,        /* dsp1_l1 */
@@ -354,9 +294,6 @@ static struct powerdomain cam_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* vip_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* vip_bank */
         },
@@ -370,9 +307,6 @@ static struct powerdomain eve4_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* eve4_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* eve4_bank */
         },
@@ -386,9 +320,6 @@ static struct powerdomain eve2_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* eve2_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* eve2_bank */
         },
@@ -402,9 +333,6 @@ static struct powerdomain eve1_7xx_pwrdm = {
         .prcm_partition   = DRA7XX_PRM_PARTITION,
         .pwrsts           = PWRSTS_OFF_ON,
         .banks            = 1,
-        .pwrsts_mem_ret = {
-                [0] = PWRSTS_OFF_RET,   /* eve1_bank */
-        },
         .pwrsts_mem_on  = {
                 [0] = PWRSTS_ON,        /* eve1_bank */
         },
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 5b385bb8aff9..cb9497a20fb3 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -496,8 +496,7 @@ void __init omap_init_time(void)
         __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
                         2, "timer_sys_ck", NULL, false);
 
-        if (of_have_populated_dt())
-                clocksource_probe();
+        clocksource_probe();
 }
 
 #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
@@ -505,6 +504,8 @@ void __init omap3_secure_sync32k_timer_init(void)
 {
         __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
                         2, "timer_sys_ck", NULL, false);
+
+        clocksource_probe();
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
@@ -513,6 +514,8 @@ void __init omap3_gptimer_timer_init(void)
 {
         __omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
                         1, "timer_sys_ck", "ti,timer-alwon", true);
+
+        clocksource_probe();
 }
 #endif
 
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
index 5766ce2be32b..8409cab3f760 100644
--- a/arch/arm/mach-vexpress/spc.c
+++ b/arch/arm/mach-vexpress/spc.c
@@ -547,7 +547,7 @@ static struct clk *ve_spc_clk_register(struct device *cpu_dev)
 
         init.name = dev_name(cpu_dev);
         init.ops = &clk_spc_ops;
-        init.flags = CLK_IS_ROOT | CLK_GET_RATE_NOCACHE;
+        init.flags = CLK_GET_RATE_NOCACHE;
         init.num_parents = 0;
 
         return devm_clk_register(cpu_dev, &spc->hw);
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 84baa16f4c0b..e93aa6734147 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -68,7 +68,7 @@
 #include <linux/platform_data/asoc-s3c.h>
 #include <linux/platform_data/spi-s3c64xx.h>
 
-static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
+#define samsung_device_dma_mask (*((u64[]) { DMA_BIT_MASK(32) }))
 
 /* AC97 */
 #ifdef CONFIG_CPU_S3C2440
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 76747d92bc72..5a0a691d4220 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -113,6 +113,18 @@ config ARCH_PHYS_ADDR_T_64BIT
 config MMU
         def_bool y
 
+config ARM64_PAGE_SHIFT
+        int
+        default 16 if ARM64_64K_PAGES
+        default 14 if ARM64_16K_PAGES
+        default 12
+
+config ARM64_CONT_SHIFT
+        int
+        default 5 if ARM64_64K_PAGES
+        default 7 if ARM64_16K_PAGES
+        default 4
+
 config ARCH_MMAP_RND_BITS_MIN
        default 14 if ARM64_64K_PAGES
        default 16 if ARM64_16K_PAGES
@@ -426,6 +438,15 @@ config CAVIUM_ERRATUM_22375
 
           If unsure, say Y.
 
+config CAVIUM_ERRATUM_23144
+        bool "Cavium erratum 23144: ITS SYNC hang on dual socket system"
+        depends on NUMA
+        default y
+        help
+          ITS SYNC command hang for cross node io and collections/cpu mapping.
+
+          If unsure, say Y.
+
 config CAVIUM_ERRATUM_23154
         bool "Cavium erratum 23154: Access to ICC_IAR1_EL1 is not sync'ed"
         default y
diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
index 710fde4ad0f0..0cc758cdd0dc 100644
--- a/arch/arm64/Kconfig.debug
+++ b/arch/arm64/Kconfig.debug
@@ -12,7 +12,8 @@ config ARM64_PTDUMP
           who are working in architecture specific areas of the kernel.
           It is probably not a good idea to enable this feature in a production
           kernel.
-          If in doubt, say "N"
+
+          If in doubt, say N.
 
 config PID_IN_CONTEXTIDR
         bool "Write the current PID to the CONTEXTIDR register"
@@ -38,15 +39,15 @@ config ARM64_RANDOMIZE_TEXT_OFFSET
           value.
 
 config DEBUG_SET_MODULE_RONX
-        bool "Set loadable kernel module data as NX and text as RO"
-        depends on MODULES
-        help
-          This option helps catch unintended modifications to loadable
-          kernel module's text and read-only data. It also prevents execution
-          of module data. Such protection may interfere with run-time code
-          patching and dynamic kernel tracing - and they might also protect
-          against certain classes of kernel exploits.
-          If in doubt, say "N".
+        bool "Set loadable kernel module data as NX and text as RO"
+        depends on MODULES
+        default y
+        help
+          Is this is set, kernel module text and rodata will be made read-only.
+          This is to help catch accidental or malicious attempts to change the
+          kernel's executable code.
+
+          If in doubt, say Y.
 
 config DEBUG_RODATA
         bool "Make kernel text and rodata read-only"
@@ -56,7 +57,7 @@ config DEBUG_RODATA
           is to help catch accidental or malicious attempts to change the
           kernel's executable code.
 
-          If in doubt, say Y
+          If in doubt, say Y.
 
 config DEBUG_ALIGN_RODATA
         depends on DEBUG_RODATA
@@ -69,7 +70,7 @@ config DEBUG_ALIGN_RODATA
           alignment and potentially wasted space. Turn on this option if
           performance is more important than memory pressure.
 
-          If in doubt, say N
+          If in doubt, say N.
 
 source "drivers/hwtracing/coresight/Kconfig"
 
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 354d75402ace..648a32c89541 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -60,7 +60,9 @@ head-y		:= arch/arm64/kernel/head.o
 
 # The byte offset of the kernel image in RAM from the start of RAM.
 ifeq ($(CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET), y)
-TEXT_OFFSET := $(shell awk 'BEGIN {srand(); printf "0x%03x000\n", int(512 * rand())}')
+TEXT_OFFSET := $(shell awk "BEGIN {srand(); printf \"0x%06x\n\", \
+                 int(2 * 1024 * 1024 / (2 ^ $(CONFIG_ARM64_PAGE_SHIFT)) * \
+                 rand()) * (2 ^ $(CONFIG_ARM64_PAGE_SHIFT))}")
 else
 TEXT_OFFSET := 0x00080000
 endif
@@ -93,7 +95,7 @@ boot := arch/arm64/boot
 Image: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-Image.%: vmlinux
+Image.%: Image
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 zinstall install:
diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi b/arch/arm64/boot/dts/lg/lg1312.dtsi
index 3a4e9a2ab313..fbafa24cd533 100644
--- a/arch/arm64/boot/dts/lg/lg1312.dtsi
+++ b/arch/arm64/boot/dts/lg/lg1312.dtsi
@@ -125,7 +125,7 @@
                 #size-cells = <1>;
                 #interrupts-cells = <3>;
 
-                compatible = "arm,amba-bus";
+                compatible = "simple-bus";
                 interrupt-parent = <&gic>;
                 ranges;
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 46f325a143b0..d7f8e06910bc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -163,7 +163,7 @@
         };
 
         amba {
-                compatible = "arm,amba-bus";
+                compatible = "simple-bus";
                 #address-cells = <2>;
                 #size-cells = <2>;
                 ranges;
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 7a09c48c0475..579b6e654f2d 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -160,14 +160,14 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 #define STACK_RND_MASK                  (0x3ffff >> (PAGE_SHIFT - 12))
 #endif
 
-#ifdef CONFIG_COMPAT
-
 #ifdef __AARCH64EB__
 #define COMPAT_ELF_PLATFORM             ("v8b")
 #else
 #define COMPAT_ELF_PLATFORM             ("v8l")
 #endif
 
+#ifdef CONFIG_COMPAT
+
 #define COMPAT_ELF_ET_DYN_BASE          (2 * TASK_SIZE_32 / 3)
 
 /* AArch32 registers. */
diff --git a/arch/arm64/include/asm/kgdb.h b/arch/arm64/include/asm/kgdb.h
index f69f69c8120c..da84645525b9 100644
--- a/arch/arm64/include/asm/kgdb.h
+++ b/arch/arm64/include/asm/kgdb.h
@@ -38,25 +38,54 @@ extern int kgdb_fault_expected;
 #endif /* !__ASSEMBLY__ */
 
 /*
- * gdb is expecting the following registers layout.
+ * gdb remote procotol (well most versions of it) expects the following
+ * register layout.
  *
  * General purpose regs:
  *     r0-r30: 64 bit
  *     sp,pc : 64 bit
- *     pstate  : 64 bit
- *     Total: 34
+ *     pstate  : 32 bit
+ *     Total: 33 + 1
  * FPU regs:
  *     f0-f31: 128 bit
- *     Total: 32
- * Extra regs
  *     fpsr & fpcr: 32 bit
- *     Total: 2
+ *     Total: 32 + 2
  *
+ * To expand a little on the "most versions of it"... when the gdb remote
+ * protocol for AArch64 was developed it depended on a statement in the
+ * Architecture Reference Manual that claimed "SPSR_ELx is a 32-bit register".
+ * and, as a result, allocated only 32-bits for the PSTATE in the remote
+ * protocol. In fact this statement is still present in ARM DDI 0487A.i.
+ *
+ * Unfortunately "is a 32-bit register" has a very special meaning for
+ * system registers. It means that "the upper bits, bits[63:32], are
+ * RES0.". RES0 is heavily used in the ARM architecture documents as a
+ * way to leave space for future architecture changes. So to translate a
+ * little for people who don't spend their spare time reading ARM architecture
+ * manuals, what "is a 32-bit register" actually means in this context is
+ * "is a 64-bit register but one with no meaning allocated to any of the
+ * upper 32-bits... *yet*".
+ *
+ * Perhaps then we should not be surprised that this has led to some
+ * confusion. Specifically a patch, influenced by the above translation,
+ * that extended PSTATE to 64-bit was accepted into gdb-7.7 but the patch
+ * was reverted in gdb-7.8.1 and all later releases, when this was
+ * discovered to be an undocumented protocol change.
+ *
+ * So... it is *not* wrong for us to only allocate 32-bits to PSTATE
+ * here even though the kernel itself allocates 64-bits for the same
+ * state. That is because this bit of code tells the kernel how the gdb
+ * remote protocol (well most versions of it) describes the register state.
+ *
+ * Note that if you are using one of the versions of gdb that supports
+ * the gdb-7.7 version of the protocol you cannot use kgdb directly
+ * without providing a custom register description (gdb can load new
+ * protocol descriptions at runtime).
  */
 
-#define _GP_REGS                34
+#define _GP_REGS                33
 #define _FP_REGS                32
-#define _EXTRA_REGS             2
+#define _EXTRA_REGS             3
 /*
  * general purpose registers size in bytes.
  * pstate is only 4 bytes. subtract 4 bytes
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 72a3025bb583..31b73227b41f 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -55,8 +55,9 @@
 #define VMEMMAP_SIZE (UL(1) << (VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT))
 
 /*
- * PAGE_OFFSET - the virtual address of the start of the kernel image (top
+ * PAGE_OFFSET - the virtual address of the start of the linear map (top
  *               (VA_BITS - 1))
+ * KIMAGE_VADDR - the virtual address of the start of the kernel image
  * VA_BITS - the maximum number of bits for virtual addresses.
  * VA_START - the first kernel virtual address.
  * TASK_SIZE - the maximum size of a user space task.
diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
index 17b45f7d96d3..8472c6def5ef 100644
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@ -23,16 +23,8 @@
 
 /* PAGE_SHIFT determines the page size */
 /* CONT_SHIFT determines the number of pages which can be tracked together  */
-#ifdef CONFIG_ARM64_64K_PAGES
-#define PAGE_SHIFT              16
-#define CONT_SHIFT              5
-#elif defined(CONFIG_ARM64_16K_PAGES)
-#define PAGE_SHIFT              14
-#define CONT_SHIFT              7
-#else
-#define PAGE_SHIFT              12
-#define CONT_SHIFT              4
-#endif
+#define PAGE_SHIFT              CONFIG_ARM64_PAGE_SHIFT
+#define CONT_SHIFT              CONFIG_ARM64_CONT_SHIFT
 #define PAGE_SIZE               (_AC(1, UL) << PAGE_SHIFT)
 #define PAGE_MASK               (~(PAGE_SIZE-1))
 
diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
index ff98585d085a..d25f4f137c2a 100644
--- a/arch/arm64/include/asm/pgalloc.h
+++ b/arch/arm64/include/asm/pgalloc.h
@@ -26,7 +26,7 @@
 
 #define check_pgt_cache()               do { } while (0)
 
-#define PGALLOC_GFP     (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)
+#define PGALLOC_GFP     (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
 #define PGD_SIZE        (PTRS_PER_PGD * sizeof(pgd_t))
 
 #if CONFIG_PGTABLE_LEVELS > 2
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
index 433e50405274..022644704a93 100644
--- a/arch/arm64/include/asm/smp.h
+++ b/arch/arm64/include/asm/smp.h
@@ -124,6 +124,18 @@ static inline void cpu_panic_kernel(void)
         cpu_park_loop();
 }
 
+/*
+ * If a secondary CPU enters the kernel but fails to come online,
+ * (e.g. due to mismatched features), and cannot exit the kernel,
+ * we increment cpus_stuck_in_kernel and leave the CPU in a
+ * quiesecent loop within the kernel text. The memory containing
+ * this loop must not be re-used for anything else as the 'stuck'
+ * core is executing it.
+ *
+ * This function is used to inhibit features like kexec and hibernate.
+ */
+bool cpus_are_stuck_in_kernel(void);
+
 #endif /* ifndef __ASSEMBLY__ */
 
 #endif /* ifndef __ASM_SMP_H */
diff --git a/arch/arm64/include/asm/spinlock.h b/arch/arm64/include/asm/spinlock.h
index fc9682bfe002..e875a5a551d7 100644
--- a/arch/arm64/include/asm/spinlock.h
+++ b/arch/arm64/include/asm/spinlock.h
@@ -30,22 +30,53 @@ static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
         unsigned int tmp;
         arch_spinlock_t lockval;
+        u32 owner;
+
+        /*
+         * Ensure prior spin_lock operations to other locks have completed
+         * on this CPU before we test whether "lock" is locked.
+         */
+        smp_mb();
+        owner = READ_ONCE(lock->owner) << 16;
 
         asm volatile(
 "       sevl\n"
 "1:     wfe\n"
 "2:     ldaxr   %w0, %2\n"
+        /* Is the lock free? */
 "       eor     %w1, %w0, %w0, ror #16\n"
-"       cbnz    %w1, 1b\n"
+"       cbz     %w1, 3f\n"
+        /* Lock taken -- has there been a subsequent unlock->lock transition? */
+"       eor     %w1, %w3, %w0, lsl #16\n"
+"       cbz     %w1, 1b\n"
+        /*
+         * The owner has been updated, so there was an unlock->lock
+         * transition that we missed. That means we can rely on the
+         * store-release of the unlock operation paired with the
+         * load-acquire of the lock operation to publish any of our
+         * previous stores to the new lock owner and therefore don't
+         * need to bother with the writeback below.
+         */
+"       b       4f\n"
+"3:\n"
+        /*
+         * Serialise against any concurrent lockers by writing back the
+         * unlocked lock value
+         */
         ARM64_LSE_ATOMIC_INSN(
         /* LL/SC */
 "       stxr    %w1, %w0, %2\n"
-"       cbnz    %w1, 2b\n", /* Serialise against any concurrent lockers */
-        /* LSE atomics */
 "       nop\n"
-"       nop\n")
+"       nop\n",
+        /* LSE atomics */
+"       mov     %w1, %w0\n"
+"       cas     %w0, %w0, %2\n"
+"       eor     %w1, %w1, %w0\n")
+        /* Somebody else wrote to the lock, GOTO 10 and reload the value */
+"       cbnz    %w1, 2b\n"
+"4:"
         : "=&r" (lockval), "=&r" (tmp), "+Q" (*lock)
-        :
+        : "r" (owner)
         : "memory");
 }
 
@@ -148,6 +179,7 @@ static inline int arch_spin_value_unlocked(arch_spinlock_t lock)
 
 static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
+        smp_mb(); /* See arch_spin_unlock_wait */
         return !arch_spin_value_unlocked(READ_ONCE(*lock));
 }
 
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 0685d74572af..9e397a542756 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -81,19 +81,6 @@ static inline void set_fs(mm_segment_t fs)
 #define segment_eq(a, b)        ((a) == (b))
 
 /*
- * Return 1 if addr < current->addr_limit, 0 otherwise.
- */
-#define __addr_ok(addr)                                                 \
-({                                                                      \
-        unsigned long flag;                                             \
-        asm("cmp %1, %0; cset %0, lo"                                   \
-                : "=&r" (flag)                                          \
-                : "r" (addr), "0" (current_thread_info()->addr_limit)   \
-                : "cc");                                                \
-        flag;                                                           \
-})
-
-/*
  * Test whether a block of memory is a valid user space address.
  * Returns 1 if the range is valid, 0 otherwise.
  *
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 41e58fe3c041..e78ac26324bd 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -44,7 +44,7 @@
 #define __ARM_NR_compat_cacheflush      (__ARM_NR_COMPAT_BASE+2)
 #define __ARM_NR_compat_set_tls         (__ARM_NR_COMPAT_BASE+5)
 
-#define __NR_compat_syscalls            390
+#define __NR_compat_syscalls            394
 #endif
 
 #define __ARCH_WANT_SYS_CLONE
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 5b925b761a2a..b7e8ef16ff0d 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -801,6 +801,14 @@ __SYSCALL(__NR_execveat, compat_sys_execveat)
 __SYSCALL(__NR_userfaultfd, sys_userfaultfd)
 #define __NR_membarrier 389
 __SYSCALL(__NR_membarrier, sys_membarrier)
+#define __NR_mlock2 390
+__SYSCALL(__NR_mlock2, sys_mlock2)
+#define __NR_copy_file_range 391
+__SYSCALL(__NR_copy_file_range, sys_copy_file_range)
+#define __NR_preadv2 392
+__SYSCALL(__NR_preadv2, compat_sys_preadv2)
+#define __NR_pwritev2 393
+__SYSCALL(__NR_pwritev2, compat_sys_pwritev2)
 
 /*
  * Please add new compat syscalls above this comment and update
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 3808470486f3..c173d329397f 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -22,6 +22,8 @@
 
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/compat.h>
+#include <linux/elf.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/personality.h>
@@ -104,6 +106,7 @@ static const char *const compat_hwcap2_str[] = {
 static int c_show(struct seq_file *m, void *v)
 {
         int i, j;
+        bool compat = personality(current->personality) == PER_LINUX32;
 
         for_each_online_cpu(i) {
                 struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
@@ -115,6 +118,9 @@ static int c_show(struct seq_file *m, void *v)
                  * "processor".  Give glibc what it expects.
                  */
                 seq_printf(m, "processor\t: %d\n", i);
+                if (compat)
+                        seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
+                                   MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
 
                 seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
                            loops_per_jiffy / (500000UL/HZ),
@@ -127,7 +133,7 @@ static int c_show(struct seq_file *m, void *v)
                  * software which does already (at least for 32-bit).
                  */
                 seq_puts(m, "Features\t:");
-                if (personality(current->personality) == PER_LINUX32) {
+                if (compat) {
 #ifdef CONFIG_COMPAT
                         for (j = 0; compat_hwcap_str[j]; j++)
                                 if (compat_elf_hwcap & (1 << j))
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index f8df75d740f4..21ab5df9fa76 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -33,6 +33,7 @@
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/sections.h>
+#include <asm/smp.h>
 #include <asm/suspend.h>
 #include <asm/virt.h>
 
@@ -236,6 +237,11 @@ int swsusp_arch_suspend(void)
         unsigned long flags;
         struct sleep_stack_data state;
 
+        if (cpus_are_stuck_in_kernel()) {
+                pr_err("Can't hibernate: no mechanism to offline secondary CPUs.\n");
+                return -EBUSY;
+        }
+
         local_dbg_save(flags);
 
         if (__cpu_suspend_enter(&state)) {
diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c
index b67531a13136..b5f063e5eff7 100644
--- a/arch/arm64/kernel/kgdb.c
+++ b/arch/arm64/kernel/kgdb.c
@@ -58,7 +58,17 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = {
         { "x30", 8, offsetof(struct pt_regs, regs[30])},
         { "sp", 8, offsetof(struct pt_regs, sp)},
         { "pc", 8, offsetof(struct pt_regs, pc)},
-        { "pstate", 8, offsetof(struct pt_regs, pstate)},
+        /*
+         * struct pt_regs thinks PSTATE is 64-bits wide but gdb remote
+         * protocol disagrees. Therefore we must extract only the lower
+         * 32-bits. Look for the big comment in asm/kgdb.h for more
+         * detail.
+         */
+        { "pstate", 4, offsetof(struct pt_regs, pstate)
+#ifdef CONFIG_CPU_BIG_ENDIAN
+                                                        + 4
+#endif
+        },
         { "v0", 16, -1 },
         { "v1", 16, -1 },
         { "v2", 16, -1 },
@@ -128,6 +138,8 @@ sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task)
         memset((char *)gdb_regs, 0, NUMREGBYTES);
         thread_regs = task_pt_regs(task);
         memcpy((void *)gdb_regs, (void *)thread_regs->regs, GP_REG_BYTES);
+        /* Special case for PSTATE (check comments in asm/kgdb.h for details) */
+        dbg_get_reg(33, gdb_regs + GP_REG_BYTES, thread_regs);
 }
 
 void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 678e0842cb3b..62ff3c0622e2 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -909,3 +909,21 @@ int setup_profiling_timer(unsigned int multiplier)
 {
         return -EINVAL;
 }
+
+static bool have_cpu_die(void)
+{
+#ifdef CONFIG_HOTPLUG_CPU
+        int any_cpu = raw_smp_processor_id();
+
+        if (cpu_ops[any_cpu]->cpu_die)
+                return true;
+#endif
+        return false;
+}
+
+bool cpus_are_stuck_in_kernel(void)
+{
+        bool smp_spin_tables = (num_possible_cpus() > 1 && !have_cpu_die());
+
+        return !!cpus_stuck_in_kernel || smp_spin_tables;
+}
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index c5392081b49b..2a43012616b7 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -64,8 +64,7 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom,
 
         /*
          * We need to switch to kernel mode so that we can use __get_user
-         * to safely read from kernel space.  Note that we now dump the
-         * code first, just in case the backtrace kills us.
+         * to safely read from kernel space.
          */
         fs = get_fs();
         set_fs(KERNEL_DS);
@@ -111,21 +110,12 @@ static void dump_backtrace_entry(unsigned long where)
         print_ip_sym(where);
 }
 
-static void dump_instr(const char *lvl, struct pt_regs *regs)
+static void __dump_instr(const char *lvl, struct pt_regs *regs)
 {
         unsigned long addr = instruction_pointer(regs);
-        mm_segment_t fs;
         char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;
         int i;
 
-        /*
-         * We need to switch to kernel mode so that we can use __get_user
-         * to safely read from kernel space.  Note that we now dump the
-         * code first, just in case the backtrace kills us.
-         */
-        fs = get_fs();
-        set_fs(KERNEL_DS);
-
         for (i = -4; i < 1; i++) {
                 unsigned int val, bad;
 
@@ -139,8 +129,18 @@ static void dump_instr(const char *lvl, struct pt_regs *regs)
                 }
         }
         printk("%sCode: %s\n", lvl, str);
+}
 
-        set_fs(fs);
+static void dump_instr(const char *lvl, struct pt_regs *regs)
+{
+        if (!user_mode(regs)) {
+                mm_segment_t fs = get_fs();
+                set_fs(KERNEL_DS);
+                __dump_instr(lvl, regs);
+                set_fs(fs);
+        } else {
+                __dump_instr(lvl, regs);
+        }
 }
 
 static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
@@ -477,8 +477,9 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
         void __user *pc = (void __user *)instruction_pointer(regs);
         console_verbose();
 
-        pr_crit("Bad mode in %s handler detected, code 0x%08x -- %s\n",
-                handler[reason], esr, esr_get_class_string(esr));
+        pr_crit("Bad mode in %s handler detected on CPU%d, code 0x%08x -- %s\n",
+                handler[reason], smp_processor_id(), esr,
+                esr_get_class_string(esr));
         __show_regs(regs);
 
         info.si_signo = SIGILL;
diff --git a/arch/arm64/kvm/hyp/vgic-v3-sr.c b/arch/arm64/kvm/hyp/vgic-v3-sr.c
index fff7cd42b3a3..5f8f80b4a224 100644
--- a/arch/arm64/kvm/hyp/vgic-v3-sr.c
+++ b/arch/arm64/kvm/hyp/vgic-v3-sr.c
@@ -169,7 +169,8 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu)
          * Make sure stores to the GIC via the memory mapped interface
          * are now visible to the system register interface.
          */
-        dsb(st);
+        if (!cpu_if->vgic_sre)
+                dsb(st);
 
         cpu_if->vgic_vmcr  = read_gicreg(ICH_VMCR_EL2);
 
@@ -190,12 +191,11 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu)
                         if (!(vcpu->arch.vgic_cpu.live_lrs & (1UL << i)))
                                 continue;
 
-                        if (cpu_if->vgic_elrsr & (1 << i)) {
+                        if (cpu_if->vgic_elrsr & (1 << i))
                                 cpu_if->vgic_lr[i] &= ~ICH_LR_STATE;
-                                continue;
-                        }
+                        else
+                                cpu_if->vgic_lr[i] = __gic_v3_get_lr(i);
 
-                        cpu_if->vgic_lr[i] = __gic_v3_get_lr(i);
                         __gic_v3_set_lr(0, i);
                 }
 
@@ -236,8 +236,12 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu)
 
         val = read_gicreg(ICC_SRE_EL2);
         write_gicreg(val | ICC_SRE_EL2_ENABLE, ICC_SRE_EL2);
-        isb(); /* Make sure ENABLE is set at EL2 before setting SRE at EL1 */
-        write_gicreg(1, ICC_SRE_EL1);
+
+        if (!cpu_if->vgic_sre) {
+                /* Make sure ENABLE is set at EL2 before setting SRE at EL1 */
+                isb();
+                write_gicreg(1, ICC_SRE_EL1);
+        }
 }
 
 void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu)
@@ -256,8 +260,10 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu)
          * been actually programmed with the value we want before
          * starting to mess with the rest of the GIC.
          */
-        write_gicreg(cpu_if->vgic_sre, ICC_SRE_EL1);
-        isb();
+        if (!cpu_if->vgic_sre) {
+                write_gicreg(0, ICC_SRE_EL1);
+                isb();
+        }
 
         val = read_gicreg(ICH_VTR_EL2);
         max_lr_idx = vtr_to_max_lr_idx(val);
@@ -306,18 +312,18 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu)
          * (re)distributors. This ensure the guest will read the
          * correct values from the memory-mapped interface.
          */
-        isb();
-        dsb(sy);
+        if (!cpu_if->vgic_sre) {
+                isb();
+                dsb(sy);
+        }
         vcpu->arch.vgic_cpu.live_lrs = live_lrs;
 
         /*
          * Prevent the guest from touching the GIC system registers if
          * SRE isn't enabled for GICv3 emulation.
          */
-        if (!cpu_if->vgic_sre) {
-                write_gicreg(read_gicreg(ICC_SRE_EL2) & ~ICC_SRE_EL2_ENABLE,
-                             ICC_SRE_EL2);
-        }
+        write_gicreg(read_gicreg(ICC_SRE_EL2) & ~ICC_SRE_EL2_ENABLE,
+                     ICC_SRE_EL2);
 }
 
 void __hyp_text __vgic_v3_init_lrs(void)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 7bbe3ff02602..a57d650f552c 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -134,6 +134,17 @@ static bool access_gic_sgi(struct kvm_vcpu *vcpu,
         return true;
 }
 
+static bool access_gic_sre(struct kvm_vcpu *vcpu,
+                           struct sys_reg_params *p,
+                           const struct sys_reg_desc *r)
+{
+        if (p->is_write)
+                return ignore_write(vcpu, p);
+
+        p->regval = vcpu->arch.vgic_cpu.vgic_v3.vgic_sre;
+        return true;
+}
+
 static bool trap_raz_wi(struct kvm_vcpu *vcpu,
                         struct sys_reg_params *p,
                         const struct sys_reg_desc *r)
@@ -958,7 +969,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
           access_gic_sgi },
         /* ICC_SRE_EL1 */
         { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b1100), Op2(0b101),
-          trap_raz_wi },
+          access_gic_sre },
 
         /* CONTEXTIDR_EL1 */
         { Op0(0b11), Op1(0b000), CRn(0b1101), CRm(0b0000), Op2(0b001),
diff --git a/arch/arm64/mm/context.c b/arch/arm64/mm/context.c
index b7b397802088..efcf1f7ef1e4 100644
--- a/arch/arm64/mm/context.c
+++ b/arch/arm64/mm/context.c
@@ -179,7 +179,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
                                                  &asid_generation);
         flush_context(cpu);
 
-        /* We have at least 1 ASID per CPU, so this will always succeed */
+        /* We have more ASIDs than CPUs, so this will always succeed */
         asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
 
 set_asid:
@@ -227,8 +227,11 @@ switch_mm_fastpath:
 static int asids_init(void)
 {
         asid_bits = get_cpu_asid_bits();
-        /* If we end up with more CPUs than ASIDs, expect things to crash */
-        WARN_ON(NUM_USER_ASIDS < num_possible_cpus());
+        /*
+         * Expect allocation after rollover to fail if we don't have at least
+         * one more ASID than CPUs. ASID #0 is reserved for init_mm.
+         */
+        WARN_ON(NUM_USER_ASIDS - 1 <= num_possible_cpus());
         atomic64_set(&asid_generation, ASID_FIRST_VERSION);
         asid_map = kzalloc(BITS_TO_LONGS(NUM_USER_ASIDS) * sizeof(*asid_map),
                            GFP_KERNEL);
diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c
index 8404190fe2bd..ccfde237d6e6 100644
--- a/arch/arm64/mm/dump.c
+++ b/arch/arm64/mm/dump.c
@@ -150,6 +150,7 @@ static const struct prot_bits pte_bits[] = {
 
 struct pg_level {
         const struct prot_bits *bits;
+        const char *name;
         size_t num;
         u64 mask;
 };
@@ -157,15 +158,19 @@ struct pg_level {
 static struct pg_level pg_level[] = {
         {
         }, { /* pgd */
+                .name   = "PGD",
                 .bits   = pte_bits,
                 .num    = ARRAY_SIZE(pte_bits),
         }, { /* pud */
+                .name   = (CONFIG_PGTABLE_LEVELS > 3) ? "PUD" : "PGD",
                 .bits   = pte_bits,
                 .num    = ARRAY_SIZE(pte_bits),
         }, { /* pmd */
+                .name   = (CONFIG_PGTABLE_LEVELS > 2) ? "PMD" : "PGD",
                 .bits   = pte_bits,
                 .num    = ARRAY_SIZE(pte_bits),
         }, { /* pte */
+                .name   = "PTE",
                 .bits   = pte_bits,
                 .num    = ARRAY_SIZE(pte_bits),
         },
@@ -214,7 +219,8 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,
                                 delta >>= 10;
                                 unit++;
                         }
-                        seq_printf(st->seq, "%9lu%c", delta, *unit);
+                        seq_printf(st->seq, "%9lu%c %s", delta, *unit,
+                                   pg_level[st->level].name);
                         if (pg_level[st->level].bits)
                                 dump_prot(st, pg_level[st->level].bits,
                                           pg_level[st->level].num);
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 5954881a35ac..013e2cbe7924 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -109,7 +109,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma,
          * PTE_RDONLY is cleared by default in the asm below, so set it in
          * back if necessary (read-only or clean PTE).
          */
-        if (!pte_write(entry) || !dirty)
+        if (!pte_write(entry) || !pte_sw_dirty(entry))
                 pte_val(entry) |= PTE_RDONLY;
 
         /*
@@ -441,7 +441,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs)
         return 1;
 }
 
-static struct fault_info {
+static const struct fault_info {
         int     (*fn)(unsigned long addr, unsigned int esr, struct pt_regs *regs);
         int     sig;
         int     code;
diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c
index dbd12ea8ce68..43a76b07eb32 100644
--- a/arch/arm64/mm/flush.c
+++ b/arch/arm64/mm/flush.c
@@ -71,10 +71,6 @@ void __sync_icache_dcache(pte_t pte, unsigned long addr)
 {
         struct page *page = pte_page(pte);
 
-        /* no flushing needed for anonymous pages */
-        if (!page_mapping(page))
-                return;
-
         if (!test_and_set_bit(PG_dcache_clean, &page->flags))
                 sync_icache_aliases(page_address(page),
                                     PAGE_SIZE << compound_order(page));
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index aa8aee7d6929..2e49bd252fe7 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -306,6 +306,10 @@ static __init int setup_hugepagesz(char *opt)
                 hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT);
         } else if (ps == PUD_SIZE) {
                 hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);
+        } else if (ps == (PAGE_SIZE * CONT_PTES)) {
+                hugetlb_add_hstate(CONT_PTE_SHIFT);
+        } else if (ps == (PMD_SIZE * CONT_PMDS)) {
+                hugetlb_add_hstate((PMD_SHIFT + CONT_PMD_SHIFT) - PAGE_SHIFT);
         } else {
                 hugetlb_bad_size();
                 pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10);
@@ -314,3 +318,13 @@ static __init int setup_hugepagesz(char *opt)
         return 1;
 }
 __setup("hugepagesz=", setup_hugepagesz);
+
+#ifdef CONFIG_ARM64_64K_PAGES
+static __init int add_default_hugepagesz(void)
+{
+        if (size_to_hstate(CONT_PTES * PAGE_SIZE) == NULL)
+                hugetlb_add_hstate(CONT_PMD_SHIFT);
+        return 0;
+}
+arch_initcall(add_default_hugepagesz);
+#endif
diff --git a/arch/avr32/include/asm/pgalloc.h b/arch/avr32/include/asm/pgalloc.h
index 1aba19d68c5e..db039cb368be 100644
--- a/arch/avr32/include/asm/pgalloc.h
+++ b/arch/avr32/include/asm/pgalloc.h
@@ -43,7 +43,7 @@ static inline void pgd_ctor(void *x)
  */
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
-        return quicklist_alloc(QUICK_PGD, GFP_KERNEL | __GFP_REPEAT, pgd_ctor);
+        return quicklist_alloc(QUICK_PGD, GFP_KERNEL, pgd_ctor);
 }
 
 static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
@@ -54,7 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
+        return quicklist_alloc(QUICK_PT, GFP_KERNEL, NULL);
 }
 
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
@@ -63,7 +63,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
         struct page *page;
         void *pg;
 
-        pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
+        pg = quicklist_alloc(QUICK_PT, GFP_KERNEL, NULL);
         if (!pg)
                 return NULL;
 
diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h
index 235ece437ddd..42f1affb9c2d 100644
--- a/arch/cris/include/asm/pgalloc.h
+++ b/arch/cris/include/asm/pgalloc.h
@@ -24,14 +24,14 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         return pte;
 }
 
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
         struct page *pte;
-        pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
+        pte = alloc_pages(GFP_KERNEL|__GFP_ZERO, 0);
         if (!pte)
                 return NULL;
         if (!pgtable_page_ctor(pte)) {
diff --git a/arch/frv/mm/pgalloc.c b/arch/frv/mm/pgalloc.c
index 41907d25ed38..c9ed14f6c67d 100644
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
@@ -22,7 +22,7 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((aligned(PAGE_SIZE)));
 
 pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL);
         if (pte)
                 clear_page(pte);
         return pte;
@@ -33,9 +33,9 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
         struct page *page;
 
 #ifdef CONFIG_HIGHPTE
-        page = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM|__GFP_REPEAT, 0);
+        page = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM, 0);
 #else
-        page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
+        page = alloc_pages(GFP_KERNEL, 0);
 #endif
         if (!page)
                 return NULL;
diff --git a/arch/hexagon/include/asm/pgalloc.h b/arch/hexagon/include/asm/pgalloc.h
index 77da3b0ae3c2..eeebf862c46c 100644
--- a/arch/hexagon/include/asm/pgalloc.h
+++ b/arch/hexagon/include/asm/pgalloc.h
@@ -64,7 +64,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
 {
         struct page *pte;
 
-        pte = alloc_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
+        pte = alloc_page(GFP_KERNEL | __GFP_ZERO);
         if (!pte)
                 return NULL;
         if (!pgtable_page_ctor(pte)) {
@@ -78,7 +78,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        gfp_t flags =  GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO;
+        gfp_t flags =  GFP_KERNEL | __GFP_ZERO;
         return (pte_t *) __get_free_page(flags);
 }
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index f80758cb7157..e109ee95e919 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -45,7 +45,7 @@ config IA64
         select GENERIC_SMP_IDLE_THREAD
         select ARCH_INIT_TASK
         select ARCH_TASK_STRUCT_ALLOCATOR
-        select ARCH_THREAD_INFO_ALLOCATOR
+        select ARCH_THREAD_STACK_ALLOCATOR
         select ARCH_CLOCKSOURCE_DATA
         select GENERIC_TIME_VSYSCALL_OLD
         select SYSCTL_ARCH_UNALIGN_NO_WARN
diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h
index aa995b67c3f5..d1212b84fb83 100644
--- a/arch/ia64/include/asm/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
@@ -48,15 +48,15 @@ struct thread_info {
 #ifndef ASM_OFFSETS_C
 /* how to get the thread information struct from C */
 #define current_thread_info()   ((struct thread_info *) ((char *) current + IA64_TASK_SIZE))
-#define alloc_thread_info_node(tsk, node)       \
-                ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))
+#define alloc_thread_stack_node(tsk, node)      \
+                ((unsigned long *) ((char *) (tsk) + IA64_TASK_SIZE))
 #define task_thread_info(tsk)   ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))
 #else
 #define current_thread_info()   ((struct thread_info *) 0)
-#define alloc_thread_info_node(tsk, node)       ((struct thread_info *) 0)
+#define alloc_thread_stack_node(tsk, node)      ((unsigned long *) 0)
 #define task_thread_info(tsk)   ((struct thread_info *) 0)
 #endif
-#define free_thread_info(ti)    /* nothing */
+#define free_thread_stack(ti)   /* nothing */
 #define task_stack_page(tsk)    ((void *)(tsk))
 
 #define __HAVE_THREAD_FUNCTIONS
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c
index f9efe9739d3f..0eaa89f3defd 100644
--- a/arch/ia64/kernel/init_task.c
+++ b/arch/ia64/kernel/init_task.c
@@ -26,6 +26,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
  * handled. This is done by having a special ".data..init_task" section...
  */
 #define init_thread_info        init_task_mem.s.thread_info
+#define init_stack              init_task_mem.stack
 
 union {
         struct {
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h
index f9924fbcfe42..fb95aed5f428 100644
--- a/arch/m68k/include/asm/mcf_pgalloc.h
+++ b/arch/m68k/include/asm/mcf_pgalloc.h
@@ -14,7 +14,7 @@ extern const char bad_pmd_string[];
 extern inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
         unsigned long address)
 {
-        unsigned long page = __get_free_page(GFP_DMA|__GFP_REPEAT);
+        unsigned long page = __get_free_page(GFP_DMA);
 
         if (!page)
                 return NULL;
@@ -51,7 +51,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page,
 static inline struct page *pte_alloc_one(struct mm_struct *mm,
         unsigned long address)
 {
-        struct page *page = alloc_pages(GFP_DMA|__GFP_REPEAT, 0);
+        struct page *page = alloc_pages(GFP_DMA, 0);
         pte_t *pte;
 
         if (!page)
diff --git a/arch/m68k/include/asm/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h
index 24bcba496c75..c895b987202c 100644
--- a/arch/m68k/include/asm/motorola_pgalloc.h
+++ b/arch/m68k/include/asm/motorola_pgalloc.h
@@ -11,7 +11,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long ad
 {
         pte_t *pte;
 
-        pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         if (pte) {
                 __flush_page_to_ram(pte);
                 flush_tlb_kernel_page(pte);
@@ -32,7 +32,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres
         struct page *page;
         pte_t *pte;
 
-        page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
+        page = alloc_pages(GFP_KERNEL|__GFP_ZERO, 0);
         if(!page)
                 return NULL;
         if (!pgtable_page_ctor(page)) {
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h
index 0931388de47f..1901f61f926f 100644
--- a/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/arch/m68k/include/asm/sun3_pgalloc.h
@@ -37,7 +37,7 @@ do {							\
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        unsigned long page = __get_free_page(GFP_KERNEL|__GFP_REPEAT);
+        unsigned long page = __get_free_page(GFP_KERNEL);
 
         if (!page)
                 return NULL;
@@ -49,7 +49,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
                                         unsigned long address)
 {
-        struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
+        struct page *page = alloc_pages(GFP_KERNEL, 0);
 
         if (page == NULL)
                 return NULL;
diff --git a/arch/metag/include/asm/pgalloc.h b/arch/metag/include/asm/pgalloc.h
index 3104df0a4822..c2caa1ee4360 100644
--- a/arch/metag/include/asm/pgalloc.h
+++ b/arch/metag/include/asm/pgalloc.h
@@ -42,8 +42,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT |
-                                              __GFP_ZERO);
+        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
         return pte;
 }
 
@@ -51,7 +50,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
                                       unsigned long address)
 {
         struct page *pte;
-        pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO, 0);
+        pte = alloc_pages(GFP_KERNEL  | __GFP_ZERO, 0);
         if (!pte)
                 return NULL;
         if (!pgtable_page_ctor(pte)) {
diff --git a/arch/microblaze/include/asm/pgalloc.h b/arch/microblaze/include/asm/pgalloc.h
index 61436d69775c..7c89390c0c13 100644
--- a/arch/microblaze/include/asm/pgalloc.h
+++ b/arch/microblaze/include/asm/pgalloc.h
@@ -116,9 +116,9 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
         struct page *ptepage;
 
 #ifdef CONFIG_HIGHPTE
-        int flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT;
+        int flags = GFP_KERNEL | __GFP_HIGHMEM;
 #else
-        int flags = GFP_KERNEL | __GFP_REPEAT;
+        int flags = GFP_KERNEL;
 #endif
 
         ptepage = alloc_pages(flags, 0);
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c
index 4f4520e779a5..eb99fcc76088 100644
--- a/arch/microblaze/mm/pgtable.c
+++ b/arch/microblaze/mm/pgtable.c
@@ -239,8 +239,7 @@ __init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 {
         pte_t *pte;
         if (mem_init_done) {
-                pte = (pte_t *)__get_free_page(GFP_KERNEL |
-                                        __GFP_REPEAT | __GFP_ZERO);
+                pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
         } else {
                 pte = (pte_t *)early_get_page();
                 if (pte)
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 6733ac575da4..36a391d289aa 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -74,7 +74,7 @@
 #define KVM_GUEST_KUSEG                 0x00000000UL
 #define KVM_GUEST_KSEG0                 0x40000000UL
 #define KVM_GUEST_KSEG23                0x60000000UL
-#define KVM_GUEST_KSEGX(a)              ((_ACAST32_(a)) & 0x60000000)
+#define KVM_GUEST_KSEGX(a)              ((_ACAST32_(a)) & 0xe0000000)
 #define KVM_GUEST_CPHYSADDR(a)          ((_ACAST32_(a)) & 0x1fffffff)
 
 #define KVM_GUEST_CKSEG0ADDR(a)         (KVM_GUEST_CPHYSADDR(a) | KVM_GUEST_KSEG0)
@@ -338,6 +338,7 @@ struct kvm_mips_tlb {
 #define KVM_MIPS_GUEST_TLB_SIZE 64
 struct kvm_vcpu_arch {
         void *host_ebase, *guest_ebase;
+        int (*vcpu_run)(struct kvm_run *run, struct kvm_vcpu *vcpu);
         unsigned long host_stack;
         unsigned long host_gp;
 
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index b336037e8768..93c079a1cfc8 100644
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -69,7 +69,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 {
         pte_t *pte;
 
-        pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, PTE_ORDER);
+        pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_ZERO, PTE_ORDER);
 
         return pte;
 }
@@ -79,7 +79,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
 {
         struct page *pte;
 
-        pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
+        pte = alloc_pages(GFP_KERNEL, PTE_ORDER);
         if (!pte)
                 return NULL;
         clear_highpage(pte);
@@ -113,7 +113,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
         pmd_t *pmd;
 
-        pmd = (pmd_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT, PMD_ORDER);
+        pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
         if (pmd)
                 pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
         return pmd;
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 396df6eb0a12..645c8a1982a7 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -1636,6 +1636,7 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                 if (index < 0) {
                         vcpu->arch.host_cp0_entryhi = (va & VPN2_MASK);
                         vcpu->arch.host_cp0_badvaddr = va;
+                        vcpu->arch.pc = curr_pc;
                         er = kvm_mips_emulate_tlbmiss_ld(cause, NULL, run,
                                                          vcpu);
                         preempt_enable();
@@ -1647,6 +1648,8 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                          * invalid exception to the guest
                          */
                         if (!TLB_IS_VALID(*tlb, va)) {
+                                vcpu->arch.host_cp0_badvaddr = va;
+                                vcpu->arch.pc = curr_pc;
                                 er = kvm_mips_emulate_tlbinv_ld(cause, NULL,
                                                                 run, vcpu);
                                 preempt_enable();
@@ -1666,7 +1669,7 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                         cache, op, base, arch->gprs[base], offset);
                 er = EMULATE_FAIL;
                 preempt_enable();
-                goto dont_update_pc;
+                goto done;
 
         }
 
@@ -1694,16 +1697,20 @@ skip_fault:
                 kvm_err("NO-OP CACHE (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n",
                         cache, op, base, arch->gprs[base], offset);
                 er = EMULATE_FAIL;
-                preempt_enable();
-                goto dont_update_pc;
         }
 
         preempt_enable();
+done:
+        /* Rollback PC only if emulation was unsuccessful */
+        if (er == EMULATE_FAIL)
+                vcpu->arch.pc = curr_pc;
 
 dont_update_pc:
-        /* Rollback PC */
-        vcpu->arch.pc = curr_pc;
-done:
+        /*
+         * This is for exceptions whose emulation updates the PC, so do not
+         * overwrite the PC under any circumstances
+         */
+
         return er;
 }
 
diff --git a/arch/mips/kvm/interrupt.h b/arch/mips/kvm/interrupt.h
index 4ab4bdfad703..2143884709e4 100644
--- a/arch/mips/kvm/interrupt.h
+++ b/arch/mips/kvm/interrupt.h
@@ -28,6 +28,7 @@
 #define MIPS_EXC_MAX                12
 /* XXXSL More to follow */
 
+extern char __kvm_mips_vcpu_run_end[];
 extern char mips32_exception[], mips32_exceptionEnd[];
 extern char mips32_GuestException[], mips32_GuestExceptionEnd[];
 
diff --git a/arch/mips/kvm/locore.S b/arch/mips/kvm/locore.S
index 3ef03009de5f..828fcfc1cd7f 100644
--- a/arch/mips/kvm/locore.S
+++ b/arch/mips/kvm/locore.S
@@ -202,6 +202,7 @@ FEXPORT(__kvm_mips_load_k0k1)
 
         /* Jump to guest */
         eret
+EXPORT(__kvm_mips_vcpu_run_end)
 
 VECTOR(MIPSX(exception), unknown)
 /* Find out what mode we came from and jump to the proper handler. */
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index dc052fb5c7a2..44da5259f390 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -315,6 +315,15 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
         memcpy(gebase + offset, mips32_GuestException,
                mips32_GuestExceptionEnd - mips32_GuestException);
 
+#ifdef MODULE
+        offset += mips32_GuestExceptionEnd - mips32_GuestException;
+        memcpy(gebase + offset, (char *)__kvm_mips_vcpu_run,
+               __kvm_mips_vcpu_run_end - (char *)__kvm_mips_vcpu_run);
+        vcpu->arch.vcpu_run = gebase + offset;
+#else
+        vcpu->arch.vcpu_run = __kvm_mips_vcpu_run;
+#endif
+
         /* Invalidate the icache for these ranges */
         local_flush_icache_range((unsigned long)gebase,
                                 (unsigned long)gebase + ALIGN(size, PAGE_SIZE));
@@ -404,7 +413,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
         /* Disable hardware page table walking while in guest */
         htw_stop();
 
-        r = __kvm_mips_vcpu_run(run, vcpu);
+        r = vcpu->arch.vcpu_run(run, vcpu);
 
         /* Re-enable HTW before enabling interrupts */
         htw_start();
diff --git a/arch/mn10300/include/asm/thread_info.h b/arch/mn10300/include/asm/thread_info.h
index 4861a78c7160..f5f90bbf019d 100644
--- a/arch/mn10300/include/asm/thread_info.h
+++ b/arch/mn10300/include/asm/thread_info.h
@@ -115,7 +115,7 @@ static inline unsigned long current_stack_pointer(void)
 }
 
 #ifndef CONFIG_KGDB
-void arch_release_thread_info(struct thread_info *ti);
+void arch_release_thread_stack(unsigned long *stack);
 #endif
 #define get_thread_info(ti)     get_task_struct((ti)->task)
 #define put_thread_info(ti)     put_task_struct((ti)->task)
diff --git a/arch/mn10300/kernel/kgdb.c b/arch/mn10300/kernel/kgdb.c
index 99770823451a..2d7986c386fe 100644
--- a/arch/mn10300/kernel/kgdb.c
+++ b/arch/mn10300/kernel/kgdb.c
@@ -397,8 +397,9 @@ static bool kgdb_arch_undo_singlestep(struct pt_regs *regs)
  * single-step state is cleared.  At this point the breakpoints should have
  * been removed by __switch_to().
  */
-void arch_release_thread_info(struct thread_info *ti)
+void arch_release_thread_stack(unsigned long *stack)
 {
+        struct thread_info *ti = (void *)stack;
         if (kgdb_sstep_thread == ti) {
                 kgdb_sstep_thread = NULL;
 
diff --git a/arch/mn10300/mm/pgtable.c b/arch/mn10300/mm/pgtable.c
index e77a7c728081..9577cf768875 100644
--- a/arch/mn10300/mm/pgtable.c
+++ b/arch/mn10300/mm/pgtable.c
@@ -63,7 +63,7 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
 
 pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL);
         if (pte)
                 clear_page(pte);
         return pte;
@@ -74,9 +74,9 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
         struct page *pte;
 
 #ifdef CONFIG_HIGHPTE
-        pte = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM|__GFP_REPEAT, 0);
+        pte = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM, 0);
 #else
-        pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
+        pte = alloc_pages(GFP_KERNEL, 0);
 #endif
         if (!pte)
                 return NULL;
diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h
index 6e2985e0a7b9..bb47d08c8ef7 100644
--- a/arch/nios2/include/asm/pgalloc.h
+++ b/arch/nios2/include/asm/pgalloc.h
@@ -42,8 +42,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 {
         pte_t *pte;
 
-        pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO,
-                                        PTE_ORDER);
+        pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_ZERO, PTE_ORDER);
 
         return pte;
 }
@@ -53,7 +52,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
 {
         struct page *pte;
 
-        pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
+        pte = alloc_pages(GFP_KERNEL, PTE_ORDER);
         if (pte) {
                 if (!pgtable_page_ctor(pte)) {
                         __free_page(pte);
diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h
index 21484e5b9e9a..87eebd185089 100644
--- a/arch/openrisc/include/asm/pgalloc.h
+++ b/arch/openrisc/include/asm/pgalloc.h
@@ -77,7 +77,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
                                          unsigned long address)
 {
         struct page *pte;
-        pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
+        pte = alloc_pages(GFP_KERNEL, 0);
         if (!pte)
                 return NULL;
         clear_page(page_address(pte));
diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c
index 62b08ef392be..5b2a95116e8f 100644
--- a/arch/openrisc/mm/ioremap.c
+++ b/arch/openrisc/mm/ioremap.c
@@ -122,7 +122,7 @@ pte_t __init_refok *pte_alloc_one_kernel(struct mm_struct *mm,
         pte_t *pte;
 
         if (likely(mem_init_done)) {
-                pte = (pte_t *) __get_free_page(GFP_KERNEL | __GFP_REPEAT);
+                pte = (pte_t *) __get_free_page(GFP_KERNEL);
         } else {
                 pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
 #if 0
diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
index f2fd327dce2e..f08dda3f0995 100644
--- a/arch/parisc/include/asm/pgalloc.h
+++ b/arch/parisc/include/asm/pgalloc.h
@@ -63,8 +63,7 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
 
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
-                                               PMD_ORDER);
+        pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL, PMD_ORDER);
         if (pmd)
                 memset(pmd, 0, PAGE_SIZE<<PMD_ORDER);
         return pmd;
@@ -124,7 +123,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)
 static inline pgtable_t
 pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        struct page *page = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        struct page *page = alloc_page(GFP_KERNEL|__GFP_ZERO);
         if (!page)
                 return NULL;
         if (!pgtable_page_ctor(page)) {
@@ -137,7 +136,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long address)
 static inline pte_t *
 pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr)
 {
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         return pte;
 }
 
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h
index 4736020ba5ea..5e953ab4530d 100644
--- a/arch/parisc/include/asm/traps.h
+++ b/arch/parisc/include/asm/traps.h
@@ -8,6 +8,8 @@ struct pt_regs;
 void parisc_terminate(char *msg, struct pt_regs *regs,
                 int code, unsigned long offset) __noreturn __cold;
 
+void die_if_kernel(char *str, struct pt_regs *regs, long err);
+
 /* mm/fault.c */
 void do_page_fault(struct pt_regs *regs, unsigned long code,
                 unsigned long address);
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index e81ccf1716e9..5adc339eb7c8 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -324,8 +324,9 @@ int init_per_cpu(int cpunum)
                 per_cpu(cpu_data, cpunum).fp_rev = coproc_cfg.revision;
                 per_cpu(cpu_data, cpunum).fp_model = coproc_cfg.model;
 
-                printk(KERN_INFO  "FP[%d] enabled: Rev %ld Model %ld\n",
-                        cpunum, coproc_cfg.revision, coproc_cfg.model);
+                if (cpunum == 0)
+                        printk(KERN_INFO  "FP[%d] enabled: Rev %ld Model %ld\n",
+                                cpunum, coproc_cfg.revision, coproc_cfg.model);
 
                 /*
                 ** store status register to stack (hopefully aligned)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..31ec99a5f119 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -309,11 +309,6 @@ void __init time_init(void)
         clocks_calc_mult_shift(&cyc2ns_mul, &cyc2ns_shift, current_cr16_khz,
                                 NSEC_PER_MSEC, 0);
 
-#if defined(CONFIG_HAVE_UNSTABLE_SCHED_CLOCK) && defined(CONFIG_64BIT)
-        /* At bootup only one 64bit CPU is online and cr16 is "stable" */
-        set_sched_clock_stable();
-#endif
-
         start_cpu_itimer();     /* get CPU 0 started */
 
         /* register at clocksource framework */
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index d7c0acb35ec2..2b65c0177778 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -28,6 +28,7 @@
 #include <linux/ratelimit.h>
 #include <asm/uaccess.h>
 #include <asm/hardirq.h>
+#include <asm/traps.h>
 
 /* #define DEBUG_UNALIGNED 1 */
 
@@ -130,8 +131,6 @@
 
 int unaligned_enabled __read_mostly = 1;
 
-void die_if_kernel (char *str, struct pt_regs *regs, long err);
-
 static int emulate_ldh(struct pt_regs *regs, int toreg)
 {
         unsigned long saddr = regs->ior;
@@ -666,7 +665,7 @@ void handle_unaligned(struct pt_regs *regs)
                 break;
         }
 
-        if (modify && R1(regs->iir))
+        if (ret == 0 && modify && R1(regs->iir))
                 regs->gr[R1(regs->iir)] = newbase;
 
 
@@ -677,6 +676,14 @@ void handle_unaligned(struct pt_regs *regs)
 
         if (ret)
         {
+                /*
+                 * The unaligned handler failed.
+                 * If we were called by __get_user() or __put_user() jump
+                 * to it's exception fixup handler instead of crashing.
+                 */
+                if (!user_mode(regs) && fixup_exception(regs))
+                        return;
+
                 printk(KERN_CRIT "Unaligned handler failed, ret = %d\n", ret);
                 die_if_kernel("Unaligned data reference", regs, 28);
 
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index ddd988b267a9..e278a87f43cc 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -75,7 +75,10 @@ find_unwind_entry(unsigned long addr)
         if (addr >= kernel_unwind_table.start && 
             addr <= kernel_unwind_table.end)
                 e = find_unwind_entry_in_table(&kernel_unwind_table, addr);
-        else 
+        else {
+                unsigned long flags;
+
+                spin_lock_irqsave(&unwind_lock, flags);
                 list_for_each_entry(table, &unwind_tables, list) {
                         if (addr >= table->start && 
                             addr <= table->end)
@@ -86,6 +89,8 @@ find_unwind_entry(unsigned long addr)
                                 break;
                         }
                 }
+                spin_unlock_irqrestore(&unwind_lock, flags);
+        }
 
         return e;
 }
@@ -303,18 +308,16 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
 
                         insn = *(unsigned int *)npc;
 
-                        if ((insn & 0xffffc000) == 0x37de0000 ||
-                            (insn & 0xffe00000) == 0x6fc00000) {
+                        if ((insn & 0xffffc001) == 0x37de0000 ||
+                            (insn & 0xffe00001) == 0x6fc00000) {
                                 /* ldo X(sp), sp, or stwm X,D(sp) */
-                                frame_size += (insn & 0x1 ? -1 << 13 : 0) | 
-                                        ((insn & 0x3fff) >> 1);
+                                frame_size += (insn & 0x3fff) >> 1;
                                 dbg("analyzing func @ %lx, insn=%08x @ "
                                     "%lx, frame_size = %ld\n", info->ip,
                                     insn, npc, frame_size);
-                        } else if ((insn & 0xffe00008) == 0x73c00008) {
+                        } else if ((insn & 0xffe00009) == 0x73c00008) {
                                 /* std,ma X,D(sp) */
-                                frame_size += (insn & 0x1 ? -1 << 13 : 0) | 
-                                        (((insn >> 4) & 0x3ff) << 3);
+                                frame_size += ((insn >> 4) & 0x3ff) << 3;
                                 dbg("analyzing func @ %lx, insn=%08x @ "
                                     "%lx, frame_size = %ld\n", info->ip,
                                     insn, npc, frame_size);
@@ -333,6 +336,9 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
                         }
                 }
 
+                if (frame_size > e->Total_frame_size << 3)
+                        frame_size = e->Total_frame_size << 3;
+
                 if (!unwind_special(info, e->region_start, frame_size)) {
                         info->prev_sp = info->sp - frame_size;
                         if (e->Millicode)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 01f7464d9fea..0a9d439bcda6 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -128,7 +128,7 @@ config PPC
         select IRQ_FORCED_THREADING
         select HAVE_RCU_TABLE_FREE if SMP
         select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_CBPF_JIT
+        select HAVE_CBPF_JIT if CPU_BIG_ENDIAN
         select HAVE_ARCH_JUMP_LABEL
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select ARCH_HAS_GCOV_PROFILE_ALL
diff --git a/arch/powerpc/include/asm/book3s/32/pgalloc.h b/arch/powerpc/include/asm/book3s/32/pgalloc.h
index a2350194fc76..8e21bb492dca 100644
--- a/arch/powerpc/include/asm/book3s/32/pgalloc.h
+++ b/arch/powerpc/include/asm/book3s/32/pgalloc.h
@@ -102,7 +102,6 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb,
 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
                                   unsigned long address)
 {
-        tlb_flush_pgtable(tlb, address);
         pgtable_page_dtor(table);
         pgtable_free_tlb(tlb, page_address(table), 0);
 }
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
index 290157e8d5b2..74839f24f412 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
@@ -88,6 +88,7 @@
 #define HPTE_R_RPN_SHIFT        12
 #define HPTE_R_RPN              ASM_CONST(0x0ffffffffffff000)
 #define HPTE_R_PP               ASM_CONST(0x0000000000000003)
+#define HPTE_R_PPP              ASM_CONST(0x8000000000000003)
 #define HPTE_R_N                ASM_CONST(0x0000000000000004)
 #define HPTE_R_G                ASM_CONST(0x0000000000000008)
 #define HPTE_R_M                ASM_CONST(0x0000000000000010)
diff --git a/arch/powerpc/include/asm/book3s/64/pgalloc.h b/arch/powerpc/include/asm/book3s/64/pgalloc.h
index 488279edb1f0..cd5e7aa8cc34 100644
--- a/arch/powerpc/include/asm/book3s/64/pgalloc.h
+++ b/arch/powerpc/include/asm/book3s/64/pgalloc.h
@@ -41,7 +41,7 @@ extern struct kmem_cache *pgtable_cache[];
                         pgtable_cache[(shift) - 1];     \
                 })
 
-#define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO
+#define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO
 
 extern pte_t *pte_fragment_alloc(struct mm_struct *, unsigned long, int);
 extern void pte_fragment_free(unsigned long *, int);
@@ -56,7 +56,7 @@ static inline pgd_t *radix__pgd_alloc(struct mm_struct *mm)
         return (pgd_t *)__get_free_page(PGALLOC_GFP);
 #else
         struct page *page;
-        page = alloc_pages(PGALLOC_GFP, 4);
+        page = alloc_pages(PGALLOC_GFP | __GFP_REPEAT, 4);
         if (!page)
                 return NULL;
         return (pgd_t *) page_address(page);
@@ -93,8 +93,7 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
 
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return kmem_cache_alloc(PGT_CACHE(PUD_INDEX_SIZE),
-                                GFP_KERNEL|__GFP_REPEAT);
+        return kmem_cache_alloc(PGT_CACHE(PUD_INDEX_SIZE), GFP_KERNEL);
 }
 
 static inline void pud_free(struct mm_struct *mm, pud_t *pud)
@@ -110,13 +109,17 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
 static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,
                                   unsigned long address)
 {
+        /*
+         * By now all the pud entries should be none entries. So go
+         * ahead and flush the page walk cache
+         */
+        flush_tlb_pgtable(tlb, address);
         pgtable_free_tlb(tlb, pud, PUD_INDEX_SIZE);
 }
 
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return kmem_cache_alloc(PGT_CACHE(PMD_CACHE_INDEX),
-                                GFP_KERNEL|__GFP_REPEAT);
+        return kmem_cache_alloc(PGT_CACHE(PMD_CACHE_INDEX), GFP_KERNEL);
 }
 
 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
@@ -127,6 +130,11 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
 static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
                                   unsigned long address)
 {
+        /*
+         * By now all the pud entries should be none entries. So go
+         * ahead and flush the page walk cache
+         */
+        flush_tlb_pgtable(tlb, address);
         return pgtable_free_tlb(tlb, pmd, PMD_CACHE_INDEX);
 }
 
@@ -151,7 +159,7 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd)
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
+        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
 }
 
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
@@ -198,7 +206,11 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)
 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
                                   unsigned long address)
 {
-        tlb_flush_pgtable(tlb, address);
+        /*
+         * By now all the pud entries should be none entries. So go
+         * ahead and flush the page walk cache
+         */
+        flush_tlb_pgtable(tlb, address);
         pgtable_free_tlb(tlb, table, 0);
 }
 
diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h
index 937d4e247ac3..df294224e280 100644
--- a/arch/powerpc/include/asm/book3s/64/radix.h
+++ b/arch/powerpc/include/asm/book3s/64/radix.h
@@ -228,5 +228,20 @@ extern void radix__vmemmap_remove_mapping(unsigned long start,
 
 extern int radix__map_kernel_page(unsigned long ea, unsigned long pa,
                                  pgprot_t flags, unsigned int psz);
+
+static inline unsigned long radix__get_tree_size(void)
+{
+        unsigned long rts_field;
+        /*
+         * we support 52 bits, hence 52-31 = 21, 0b10101
+         * RTS encoding details
+         * bits 0 - 3 of rts -> bits 6 - 8 unsigned long
+         * bits 4 - 5 of rts -> bits 62 - 63 of unsigned long
+         */
+        rts_field = (0x5UL << 5); /* 6 - 8 bits */
+        rts_field |= (0x2UL << 61);
+
+        return rts_field;
+}
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
index 13ef38828dfe..3fa94fcac628 100644
--- a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
+++ b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
@@ -18,16 +18,19 @@ extern void radix__local_flush_tlb_mm(struct mm_struct *mm);
 extern void radix__local_flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
 extern void radix___local_flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr,
                                     unsigned long ap, int nid);
+extern void radix__local_flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr);
 extern void radix__tlb_flush(struct mmu_gather *tlb);
 #ifdef CONFIG_SMP
 extern void radix__flush_tlb_mm(struct mm_struct *mm);
 extern void radix__flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
 extern void radix___flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr,
                               unsigned long ap, int nid);
+extern void radix__flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr);
 #else
 #define radix__flush_tlb_mm(mm)         radix__local_flush_tlb_mm(mm)
 #define radix__flush_tlb_page(vma,addr) radix__local_flush_tlb_page(vma,addr)
 #define radix___flush_tlb_page(mm,addr,p,i)     radix___local_flush_tlb_page(mm,addr,p,i)
+#define radix__flush_tlb_pwc(tlb, addr) radix__local_flush_tlb_pwc(tlb, addr)
 #endif
 
 #endif
diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush.h b/arch/powerpc/include/asm/book3s/64/tlbflush.h
index d98424ae356c..96e5769b18b0 100644
--- a/arch/powerpc/include/asm/book3s/64/tlbflush.h
+++ b/arch/powerpc/include/asm/book3s/64/tlbflush.h
@@ -72,5 +72,19 @@ static inline void flush_tlb_page(struct vm_area_struct *vma,
 #define flush_tlb_mm(mm)                local_flush_tlb_mm(mm)
 #define flush_tlb_page(vma, addr)       local_flush_tlb_page(vma, addr)
 #endif /* CONFIG_SMP */
+/*
+ * flush the page walk cache for the address
+ */
+static inline void flush_tlb_pgtable(struct mmu_gather *tlb, unsigned long address)
+{
+        /*
+         * Flush the page table walk cache on freeing a page table. We already
+         * have marked the upper/higher level page table entry none by now.
+         * So it is safe to flush PWC here.
+         */
+        if (!radix_enabled())
+                return;
 
+        radix__flush_tlb_pwc(tlb, address);
+}
 #endif /*  _ASM_POWERPC_BOOK3S_64_TLBFLUSH_H */
diff --git a/arch/powerpc/include/asm/book3s/pgalloc.h b/arch/powerpc/include/asm/book3s/pgalloc.h
index 54f591e9572e..c0a69ae92256 100644
--- a/arch/powerpc/include/asm/book3s/pgalloc.h
+++ b/arch/powerpc/include/asm/book3s/pgalloc.h
@@ -4,11 +4,6 @@
 #include <linux/mm.h>
 
 extern void tlb_remove_table(struct mmu_gather *tlb, void *table);
-static inline void tlb_flush_pgtable(struct mmu_gather *tlb,
-                                     unsigned long address)
-{
-
-}
 
 #ifdef CONFIG_PPC64
 #include <asm/book3s/64/pgalloc.h>
diff --git a/arch/powerpc/include/asm/nohash/64/pgalloc.h b/arch/powerpc/include/asm/nohash/64/pgalloc.h
index 0c12a3bfe2ab..897d2e1c8a9b 100644
--- a/arch/powerpc/include/asm/nohash/64/pgalloc.h
+++ b/arch/powerpc/include/asm/nohash/64/pgalloc.h
@@ -57,8 +57,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return kmem_cache_alloc(PGT_CACHE(PUD_INDEX_SIZE),
-                                GFP_KERNEL|__GFP_REPEAT);
+        return kmem_cache_alloc(PGT_CACHE(PUD_INDEX_SIZE), GFP_KERNEL);
 }
 
 static inline void pud_free(struct mm_struct *mm, pud_t *pud)
@@ -88,7 +87,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
+        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
 }
 
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
@@ -172,7 +171,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
 
 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
 {
-        pte_fragment_fre((unsigned long *)pte, 1);
+        pte_fragment_free((unsigned long *)pte, 1);
 }
 
 static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)
@@ -190,8 +189,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
 
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return kmem_cache_alloc(PGT_CACHE(PMD_CACHE_INDEX),
-                                GFP_KERNEL|__GFP_REPEAT);
+        return kmem_cache_alloc(PGT_CACHE(PMD_CACHE_INDEX), GFP_KERNEL);
 }
 
 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index c1e82e968506..a0948f40bc7b 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -717,7 +717,7 @@
 #define   MMCR0_FCWAIT  0x00000002UL /* freeze counter in WAIT state */
 #define   MMCR0_FCHV    0x00000001UL /* freeze conditions in hypervisor mode */
 #define SPRN_MMCR1      798
-#define SPRN_MMCR2      769
+#define SPRN_MMCR2      785
 #define SPRN_MMCRA      0x312
 #define   MMCRA_SDSYNC  0x80000000UL /* SDAR synced with SIAR */
 #define   MMCRA_SDAR_DCACHE_MISS 0x40000000UL
@@ -754,13 +754,13 @@
 #define SPRN_PMC6       792
 #define SPRN_PMC7       793
 #define SPRN_PMC8       794
-#define SPRN_SIAR       780
-#define SPRN_SDAR       781
 #define SPRN_SIER       784
 #define   SIER_SIPR             0x2000000       /* Sampled MSR_PR */
 #define   SIER_SIHV             0x1000000       /* Sampled MSR_HV */
 #define   SIER_SIAR_VALID       0x0400000       /* SIAR contents valid */
 #define   SIER_SDAR_VALID       0x0200000       /* SDAR contents valid */
+#define SPRN_SIAR       796
+#define SPRN_SDAR       797
 #define SPRN_TACR       888
 #define SPRN_TCSCR      889
 #define SPRN_CSIGR      890
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 2714a3b81d24..b5f73cb5eeb6 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -642,7 +642,6 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
                 if (pe->type & EEH_PE_VF) {
                         eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL);
                 } else {
-                        eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
                         pci_lock_rescan_remove();
                         pci_hp_remove_devices(bus);
                         pci_unlock_rescan_remove();
@@ -692,10 +691,12 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
                  */
                 edev = list_first_entry(&pe->edevs, struct eeh_dev, list);
                 eeh_pe_traverse(pe, eeh_pe_detach_dev, NULL);
-                if (pe->type & EEH_PE_VF)
+                if (pe->type & EEH_PE_VF) {
                         eeh_add_virt_device(edev, NULL);
-                else
+                } else {
+                        eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
                         pci_hp_add_devices(bus);
+                }
         } else if (frozen_bus && rmv_data->removed) {
                 pr_info("EEH: Sleep 5s ahead of partial hotplug\n");
                 ssleep(5);
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 4c9440629128..8bcc1b457115 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1399,11 +1399,12 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_RADIX)
         lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
 
         mtlr    r10
-BEGIN_MMU_FTR_SECTION
-        b       2f
-END_MMU_FTR_SECTION_IFSET(MMU_FTR_RADIX)
         andi.   r10,r12,MSR_RI  /* check for unrecoverable exception */
+BEGIN_MMU_FTR_SECTION
         beq-    2f
+FTR_SECTION_ELSE
+        b       2f
+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_RADIX)
 
 .machine        push
 .machine        "power4"
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index da5192590c44..6ee4b72cda42 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -656,6 +656,7 @@ unsigned char ibm_architecture_vec[] = {
         W(0xffff0000), W(0x003e0000),   /* POWER6 */
         W(0xffff0000), W(0x003f0000),   /* POWER7 */
         W(0xffff0000), W(0x004b0000),   /* POWER8E */
+        W(0xffff0000), W(0x004c0000),   /* POWER8NVL */
         W(0xffff0000), W(0x004d0000),   /* POWER8 */
         W(0xffffffff), W(0x0f000004),   /* all 2.07-compliant */
         W(0xffffffff), W(0x0f000003),   /* all 2.06-compliant */
@@ -718,7 +719,7 @@ unsigned char ibm_architecture_vec[] = {
          * must match by the macro below. Update the definition if
          * the structure layout changes.
          */
-#define IBM_ARCH_VEC_NRCORES_OFFSET     125
+#define IBM_ARCH_VEC_NRCORES_OFFSET     133
         W(NR_CPUS),                     /* number of cores supported */
         0,
         0,
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 30a03c03fe73..060b140f03c6 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -377,7 +377,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
 
 #else
         BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
-                     offsetof(struct thread_fp_state, fpr[32][0]));
+                     offsetof(struct thread_fp_state, fpr[32]));
 
         return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
                                    &target->thread.fp_state, 0, -1);
@@ -405,7 +405,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,
         return 0;
 #else
         BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
-                     offsetof(struct thread_fp_state, fpr[32][0]));
+                     offsetof(struct thread_fp_state, fpr[32]));
 
         return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                   &target->thread.fp_state, 0, -1);
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index d873f6507f72..f8a871a72985 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -316,8 +316,8 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
                         DBG_LOW(" -> hit\n");
                         /* Update the HPTE */
                         hptep->r = cpu_to_be64((be64_to_cpu(hptep->r) &
-                                                ~(HPTE_R_PP | HPTE_R_N)) |
-                                               (newpp & (HPTE_R_PP | HPTE_R_N |
+                                                ~(HPTE_R_PPP | HPTE_R_N)) |
+                                               (newpp & (HPTE_R_PPP | HPTE_R_N |
                                                          HPTE_R_C)));
                 }
                 native_unlock_hpte(hptep);
@@ -385,8 +385,8 @@ static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
 
         /* Update the HPTE */
         hptep->r = cpu_to_be64((be64_to_cpu(hptep->r) &
-                        ~(HPTE_R_PP | HPTE_R_N)) |
-                (newpp & (HPTE_R_PP | HPTE_R_N)));
+                                ~(HPTE_R_PPP | HPTE_R_N)) |
+                               (newpp & (HPTE_R_PPP | HPTE_R_N)));
         /*
          * Ensure it is out of the tlb too. Bolted entries base and
          * actual page size will be same.
@@ -550,7 +550,11 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
                 }
         }
         /* This works for all page sizes, and for 256M and 1T segments */
-        *ssize = hpte_v >> HPTE_V_SSIZE_SHIFT;
+        if (cpu_has_feature(CPU_FTR_ARCH_300))
+                *ssize = hpte_r >> HPTE_R_3_0_SSIZE_SHIFT;
+        else
+                *ssize = hpte_v >> HPTE_V_SSIZE_SHIFT;
+
         shift = mmu_psize_defs[size].shift;
 
         avpn = (HPTE_V_AVPN_VAL(hpte_v) & ~mmu_psize_defs[size].avpnm);
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 59268969a0bc..5b22ba0b58bc 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -159,6 +159,19 @@ static struct mmu_psize_def mmu_psize_defaults_gp[] = {
         },
 };
 
+/*
+ * 'R' and 'C' update notes:
+ *  - Under pHyp or KVM, the updatepp path will not set C, thus it *will*
+ *     create writeable HPTEs without C set, because the hcall H_PROTECT
+ *     that we use in that case will not update C
+ *  - The above is however not a problem, because we also don't do that
+ *     fancy "no flush" variant of eviction and we use H_REMOVE which will
+ *     do the right thing and thus we don't have the race I described earlier
+ *
+ *    - Under bare metal,  we do have the race, so we need R and C set
+ *    - We make sure R is always set and never lost
+ *    - C is _PAGE_DIRTY, and *should* always be set for a writeable mapping
+ */
 unsigned long htab_convert_pte_flags(unsigned long pteflags)
 {
         unsigned long rflags = 0;
@@ -186,19 +199,28 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags)
                         rflags |= 0x1;
         }
         /*
-         * Always add "C" bit for perf. Memory coherence is always enabled
+         * We can't allow hardware to update hpte bits. Hence always
+         * set 'R' bit and set 'C' if it is a write fault
          */
-        rflags |=  HPTE_R_C | HPTE_R_M;
+        rflags |=  HPTE_R_R;
+
+        if (pteflags & _PAGE_DIRTY)
+                rflags |= HPTE_R_C;
         /*
          * Add in WIG bits
          */
 
         if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_TOLERANT)
                 rflags |= HPTE_R_I;
-        if ((pteflags & _PAGE_CACHE_CTL ) == _PAGE_NON_IDEMPOTENT)
+        else if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_NON_IDEMPOTENT)
                 rflags |= (HPTE_R_I | HPTE_R_G);
-        if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_SAO)
-                rflags |= (HPTE_R_I | HPTE_R_W);
+        else if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_SAO)
+                rflags |= (HPTE_R_W | HPTE_R_I | HPTE_R_M);
+        else
+                /*
+                 * Add memory coherence if cache inhibited is not set
+                 */
+                rflags |= HPTE_R_M;
 
         return rflags;
 }
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 5aac1a3f86cd..119d18611500 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -73,7 +73,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,
         cachep = PGT_CACHE(pdshift - pshift);
 #endif
 
-        new = kmem_cache_zalloc(cachep, GFP_KERNEL|__GFP_REPEAT);
+        new = kmem_cache_zalloc(cachep, GFP_KERNEL);
 
         BUG_ON(pshift > HUGEPD_SHIFT_MASK);
         BUG_ON((unsigned long)new & HUGEPD_SHIFT_MASK);
diff --git a/arch/powerpc/mm/mmu_context_book3s64.c b/arch/powerpc/mm/mmu_context_book3s64.c
index 227b2a6c4544..196222227e82 100644
--- a/arch/powerpc/mm/mmu_context_book3s64.c
+++ b/arch/powerpc/mm/mmu_context_book3s64.c
@@ -65,7 +65,7 @@ static int radix__init_new_context(struct mm_struct *mm, int index)
         /*
          * set the process table entry,
          */
-        rts_field = 3ull << PPC_BITLSHIFT(2);
+        rts_field = radix__get_tree_size();
         process_tb[index].prtb0 = cpu_to_be64(rts_field | __pa(mm->pgd) | RADIX_PGD_INDEX_SIZE);
         return 0;
 }
diff --git a/arch/powerpc/mm/pgtable-book3s64.c b/arch/powerpc/mm/pgtable-book3s64.c
index eb4451144746..670318766545 100644
--- a/arch/powerpc/mm/pgtable-book3s64.c
+++ b/arch/powerpc/mm/pgtable-book3s64.c
@@ -33,10 +33,7 @@ int pmdp_set_access_flags(struct vm_area_struct *vma, unsigned long address,
         changed = !pmd_same(*(pmdp), entry);
         if (changed) {
                 __ptep_set_access_flags(pmdp_ptep(pmdp), pmd_pte(entry));
-                /*
-                 * Since we are not supporting SW TLB systems, we don't
-                 * have any thing similar to flush_tlb_page_nohash()
-                 */
+                flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
         }
         return changed;
 }
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index 18b2c11604fa..e58707deef5c 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -160,9 +160,8 @@ redo:
         process_tb = early_alloc_pgtable(1UL << PRTB_SIZE_SHIFT);
         /*
          * Fill in the process table.
-         * we support 52 bits, hence 52-28 = 24, 11000
          */
-        rts_field = 3ull << PPC_BITLSHIFT(2);
+        rts_field = radix__get_tree_size();
         process_tb->prtb0 = cpu_to_be64(rts_field | __pa(init_mm.pgd) | RADIX_PGD_INDEX_SIZE);
         /*
          * Fill in the partition table. We are suppose to use effective address
@@ -176,10 +175,8 @@ redo:
 static void __init radix_init_partition_table(void)
 {
         unsigned long rts_field;
-        /*
-         * we support 52 bits, hence 52-28 = 24, 11000
-         */
-        rts_field = 3ull << PPC_BITLSHIFT(2);
+
+        rts_field = radix__get_tree_size();
 
         BUILD_BUG_ON_MSG((PATB_SIZE_SHIFT > 24), "Partition table size too large.");
         partition_tb = early_alloc_pgtable(1UL << PATB_SIZE_SHIFT);
@@ -296,11 +293,6 @@ found:
 void __init radix__early_init_mmu(void)
 {
         unsigned long lpcr;
-        /*
-         * setup LPCR UPRT based on mmu_features
-         */
-        lpcr = mfspr(SPRN_LPCR);
-        mtspr(SPRN_LPCR, lpcr | LPCR_UPRT);
 
 #ifdef CONFIG_PPC_64K_PAGES
         /* PAGE_SIZE mappings */
@@ -343,8 +335,11 @@ void __init radix__early_init_mmu(void)
         __pte_frag_size_shift = H_PTE_FRAG_SIZE_SHIFT;
 
         radix_init_page_sizes();
-        if (!firmware_has_feature(FW_FEATURE_LPAR))
+        if (!firmware_has_feature(FW_FEATURE_LPAR)) {
+                lpcr = mfspr(SPRN_LPCR);
+                mtspr(SPRN_LPCR, lpcr | LPCR_UPRT);
                 radix_init_partition_table();
+        }
 
         radix_init_pgtable();
 }
@@ -353,16 +348,15 @@ void radix__early_init_mmu_secondary(void)
 {
         unsigned long lpcr;
         /*
-         * setup LPCR UPRT based on mmu_features
-         */
-        lpcr = mfspr(SPRN_LPCR);
-        mtspr(SPRN_LPCR, lpcr | LPCR_UPRT);
-        /*
-         * update partition table control register, 64 K size.
+         * update partition table control register and UPRT
          */
-        if (!firmware_has_feature(FW_FEATURE_LPAR))
+        if (!firmware_has_feature(FW_FEATURE_LPAR)) {
+                lpcr = mfspr(SPRN_LPCR);
+                mtspr(SPRN_LPCR, lpcr | LPCR_UPRT);
+
                 mtspr(SPRN_PTCR,
                       __pa(partition_tb) | (PATB_SIZE_SHIFT - 12));
+        }
 }
 
 void radix__setup_initial_memory_limit(phys_addr_t first_memblock_base,
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index bf7bf32b54f8..7f922f557936 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -84,7 +84,7 @@ __init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long add
         pte_t *pte;
 
         if (slab_is_available()) {
-                pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+                pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         } else {
                 pte = __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));
                 if (pte)
@@ -97,7 +97,7 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
         struct page *ptepage;
 
-        gfp_t flags = GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO;
+        gfp_t flags = GFP_KERNEL | __GFP_ZERO;
 
         ptepage = alloc_pages(flags, 0);
         if (!ptepage)
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index e009e0604a8a..f5e8d4edb808 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -350,8 +350,7 @@ static pte_t *get_from_cache(struct mm_struct *mm)
 static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel)
 {
         void *ret = NULL;
-        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
-                                       __GFP_REPEAT | __GFP_ZERO);
+        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);
         if (!page)
                 return NULL;
         if (!kernel && !pgtable_page_ctor(page)) {
diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c
index 0fdaf93a3e09..ab2f60e812e2 100644
--- a/arch/powerpc/mm/tlb-radix.c
+++ b/arch/powerpc/mm/tlb-radix.c
@@ -18,16 +18,20 @@
 
 static DEFINE_RAW_SPINLOCK(native_tlbie_lock);
 
-static inline void __tlbiel_pid(unsigned long pid, int set)
+#define RIC_FLUSH_TLB 0
+#define RIC_FLUSH_PWC 1
+#define RIC_FLUSH_ALL 2
+
+static inline void __tlbiel_pid(unsigned long pid, int set,
+                                unsigned long ric)
 {
-        unsigned long rb,rs,ric,prs,r;
+        unsigned long rb,rs,prs,r;
 
         rb = PPC_BIT(53); /* IS = 1 */
         rb |= set << PPC_BITLSHIFT(51);
         rs = ((unsigned long)pid) << PPC_BITLSHIFT(31);
         prs = 1; /* process scoped */
         r = 1;   /* raidx format */
-        ric = 2;  /* invalidate all the caches */
 
         asm volatile("ptesync": : :"memory");
         asm volatile(".long 0x7c000224 | (%0 << 11) | (%1 << 16) |"
@@ -39,25 +43,24 @@ static inline void __tlbiel_pid(unsigned long pid, int set)
 /*
  * We use 128 set in radix mode and 256 set in hpt mode.
  */
-static inline void _tlbiel_pid(unsigned long pid)
+static inline void _tlbiel_pid(unsigned long pid, unsigned long ric)
 {
         int set;
 
         for (set = 0; set < POWER9_TLB_SETS_RADIX ; set++) {
-                __tlbiel_pid(pid, set);
+                __tlbiel_pid(pid, set, ric);
         }
         return;
 }
 
-static inline void _tlbie_pid(unsigned long pid)
+static inline void _tlbie_pid(unsigned long pid, unsigned long ric)
 {
-        unsigned long rb,rs,ric,prs,r;
+        unsigned long rb,rs,prs,r;
 
         rb = PPC_BIT(53); /* IS = 1 */
         rs = pid << PPC_BITLSHIFT(31);
         prs = 1; /* process scoped */
         r = 1;   /* raidx format */
-        ric = 2;  /* invalidate all the caches */
 
         asm volatile("ptesync": : :"memory");
         asm volatile(".long 0x7c000264 | (%0 << 11) | (%1 << 16) |"
@@ -67,16 +70,15 @@ static inline void _tlbie_pid(unsigned long pid)
 }
 
 static inline void _tlbiel_va(unsigned long va, unsigned long pid,
-                              unsigned long ap)
+                              unsigned long ap, unsigned long ric)
 {
-        unsigned long rb,rs,ric,prs,r;
+        unsigned long rb,rs,prs,r;
 
         rb = va & ~(PPC_BITMASK(52, 63));
         rb |= ap << PPC_BITLSHIFT(58);
         rs = pid << PPC_BITLSHIFT(31);
         prs = 1; /* process scoped */
         r = 1;   /* raidx format */
-        ric = 0;  /* no cluster flush yet */
 
         asm volatile("ptesync": : :"memory");
         asm volatile(".long 0x7c000224 | (%0 << 11) | (%1 << 16) |"
@@ -86,16 +88,15 @@ static inline void _tlbiel_va(unsigned long va, unsigned long pid,
 }
 
 static inline void _tlbie_va(unsigned long va, unsigned long pid,
-                             unsigned long ap)
+                             unsigned long ap, unsigned long ric)
 {
-        unsigned long rb,rs,ric,prs,r;
+        unsigned long rb,rs,prs,r;
 
         rb = va & ~(PPC_BITMASK(52, 63));
         rb |= ap << PPC_BITLSHIFT(58);
         rs = pid << PPC_BITLSHIFT(31);
         prs = 1; /* process scoped */
         r = 1;   /* raidx format */
-        ric = 0;  /* no cluster flush yet */
 
         asm volatile("ptesync": : :"memory");
         asm volatile(".long 0x7c000264 | (%0 << 11) | (%1 << 16) |"
@@ -117,25 +118,40 @@ static inline void _tlbie_va(unsigned long va, unsigned long pid,
  */
 void radix__local_flush_tlb_mm(struct mm_struct *mm)
 {
-        unsigned int pid;
+        unsigned long pid;
 
         preempt_disable();
         pid = mm->context.id;
         if (pid != MMU_NO_CONTEXT)
-                _tlbiel_pid(pid);
+                _tlbiel_pid(pid, RIC_FLUSH_ALL);
         preempt_enable();
 }
 EXPORT_SYMBOL(radix__local_flush_tlb_mm);
 
+void radix__local_flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr)
+{
+        unsigned long pid;
+        struct mm_struct *mm = tlb->mm;
+
+        preempt_disable();
+
+        pid = mm->context.id;
+        if (pid != MMU_NO_CONTEXT)
+                _tlbiel_pid(pid, RIC_FLUSH_PWC);
+
+        preempt_enable();
+}
+EXPORT_SYMBOL(radix__local_flush_tlb_pwc);
+
 void radix___local_flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr,
                             unsigned long ap, int nid)
 {
-        unsigned int pid;
+        unsigned long pid;
 
         preempt_disable();
         pid = mm ? mm->context.id : 0;
         if (pid != MMU_NO_CONTEXT)
-                _tlbiel_va(vmaddr, pid, ap);
+                _tlbiel_va(vmaddr, pid, ap, RIC_FLUSH_TLB);
         preempt_enable();
 }
 
@@ -160,7 +176,7 @@ static int mm_is_core_local(struct mm_struct *mm)
 
 void radix__flush_tlb_mm(struct mm_struct *mm)
 {
-        unsigned int pid;
+        unsigned long pid;
 
         preempt_disable();
         pid = mm->context.id;
@@ -172,20 +188,46 @@ void radix__flush_tlb_mm(struct mm_struct *mm)
 
                 if (lock_tlbie)
                         raw_spin_lock(&native_tlbie_lock);
-                _tlbie_pid(pid);
+                _tlbie_pid(pid, RIC_FLUSH_ALL);
                 if (lock_tlbie)
                         raw_spin_unlock(&native_tlbie_lock);
         } else
-                _tlbiel_pid(pid);
+                _tlbiel_pid(pid, RIC_FLUSH_ALL);
 no_context:
         preempt_enable();
 }
 EXPORT_SYMBOL(radix__flush_tlb_mm);
 
+void radix__flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr)
+{
+        unsigned long pid;
+        struct mm_struct *mm = tlb->mm;
+
+        preempt_disable();
+
+        pid = mm->context.id;
+        if (unlikely(pid == MMU_NO_CONTEXT))
+                goto no_context;
+
+        if (!mm_is_core_local(mm)) {
+                int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
+
+                if (lock_tlbie)
+                        raw_spin_lock(&native_tlbie_lock);
+                _tlbie_pid(pid, RIC_FLUSH_PWC);
+                if (lock_tlbie)
+                        raw_spin_unlock(&native_tlbie_lock);
+        } else
+                _tlbiel_pid(pid, RIC_FLUSH_PWC);
+no_context:
+        preempt_enable();
+}
+EXPORT_SYMBOL(radix__flush_tlb_pwc);
+
 void radix___flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr,
                        unsigned long ap, int nid)
 {
-        unsigned int pid;
+        unsigned long pid;
 
         preempt_disable();
         pid = mm ? mm->context.id : 0;
@@ -196,11 +238,11 @@ void radix___flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr,
 
                 if (lock_tlbie)
                         raw_spin_lock(&native_tlbie_lock);
-                _tlbie_va(vmaddr, pid, ap);
+                _tlbie_va(vmaddr, pid, ap, RIC_FLUSH_TLB);
                 if (lock_tlbie)
                         raw_spin_unlock(&native_tlbie_lock);
         } else
-                _tlbiel_va(vmaddr, pid, ap);
+                _tlbiel_va(vmaddr, pid, ap, RIC_FLUSH_TLB);
 bail:
         preempt_enable();
 }
@@ -224,7 +266,7 @@ void radix__flush_tlb_kernel_range(unsigned long start, unsigned long end)
 
         if (lock_tlbie)
                 raw_spin_lock(&native_tlbie_lock);
-        _tlbie_pid(0);
+        _tlbie_pid(0, RIC_FLUSH_ALL);
         if (lock_tlbie)
                 raw_spin_unlock(&native_tlbie_lock);
 }
diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c
index c50ea76ba66c..6081fbd75330 100644
--- a/arch/powerpc/platforms/512x/clock-commonclk.c
+++ b/arch/powerpc/platforms/512x/clock-commonclk.c
@@ -221,7 +221,7 @@ static bool soc_has_mclk_mux0_canin(void)
 /* convenience wrappers around the common clk API */
 static inline struct clk *mpc512x_clk_fixed(const char *name, int rate)
 {
-        return clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate);
+        return clk_register_fixed_rate(NULL, name, NULL, 0, rate);
 }
 
 static inline struct clk *mpc512x_clk_factor(
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index 84fb984f29c1..85c85eb3e245 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -172,7 +172,7 @@ static int spufs_arch_write_note(struct spu_context *ctx, int i,
         if (rc < 0)
                 goto out;
 
-        skip = roundup(cprm->file->f_pos - total + sz, 4) - cprm->file->f_pos;
+        skip = roundup(cprm->pos - total + sz, 4) - cprm->pos;
         if (!dump_skip(cprm, skip))
                 goto Eio;
 out:
diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index ac3ffd97e059..3998e0f9a03b 100644
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -53,7 +53,6 @@ static int ibm_read_slot_reset_state2;
 static int ibm_slot_error_detail;
 static int ibm_get_config_addr_info;
 static int ibm_get_config_addr_info2;
-static int ibm_configure_bridge;
 static int ibm_configure_pe;
 
 /*
@@ -81,7 +80,14 @@ static int pseries_eeh_init(void)
         ibm_get_config_addr_info2       = rtas_token("ibm,get-config-addr-info2");
         ibm_get_config_addr_info        = rtas_token("ibm,get-config-addr-info");
         ibm_configure_pe                = rtas_token("ibm,configure-pe");
-        ibm_configure_bridge            = rtas_token("ibm,configure-bridge");
+
+        /*
+         * ibm,configure-pe and ibm,configure-bridge have the same semantics,
+         * however ibm,configure-pe can be faster.  If we can't find
+         * ibm,configure-pe then fall back to using ibm,configure-bridge.
+         */
+        if (ibm_configure_pe == RTAS_UNKNOWN_SERVICE)
+                ibm_configure_pe        = rtas_token("ibm,configure-bridge");
 
         /*
          * Necessary sanity check. We needn't check "get-config-addr-info"
@@ -93,8 +99,7 @@ static int pseries_eeh_init(void)
             (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE &&
              ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) ||
             ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE       ||
-            (ibm_configure_pe == RTAS_UNKNOWN_SERVICE           &&
-             ibm_configure_bridge == RTAS_UNKNOWN_SERVICE)) {
+            ibm_configure_pe == RTAS_UNKNOWN_SERVICE) {
                 pr_info("EEH functionality not supported\n");
                 return -EINVAL;
         }
@@ -615,29 +620,41 @@ static int pseries_eeh_configure_bridge(struct eeh_pe *pe)
 {
         int config_addr;
         int ret;
+        /* Waiting 0.2s maximum before skipping configuration */
+        int max_wait = 200;
 
         /* Figure out the PE address */
         config_addr = pe->config_addr;
         if (pe->addr)
                 config_addr = pe->addr;
 
-        /* Use new configure-pe function, if supported */
-        if (ibm_configure_pe != RTAS_UNKNOWN_SERVICE) {
+        while (max_wait > 0) {
                 ret = rtas_call(ibm_configure_pe, 3, 1, NULL,
                                 config_addr, BUID_HI(pe->phb->buid),
                                 BUID_LO(pe->phb->buid));
-        } else if (ibm_configure_bridge != RTAS_UNKNOWN_SERVICE) {
-                ret = rtas_call(ibm_configure_bridge, 3, 1, NULL,
-                                config_addr, BUID_HI(pe->phb->buid),
-                                BUID_LO(pe->phb->buid));
-        } else {
-                return -EFAULT;
-        }
 
-        if (ret)
-                pr_warn("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n",
-                        __func__, pe->phb->global_number, pe->addr, ret);
+                if (!ret)
+                        return ret;
+
+                /*
+                 * If RTAS returns a delay value that's above 100ms, cut it
+                 * down to 100ms in case firmware made a mistake.  For more
+                 * on how these delay values work see rtas_busy_delay_time
+                 */
+                if (ret > RTAS_EXTENDED_DELAY_MIN+2 &&
+                    ret <= RTAS_EXTENDED_DELAY_MAX)
+                        ret = RTAS_EXTENDED_DELAY_MIN+2;
+
+                max_wait -= rtas_busy_delay_time(ret);
+
+                if (max_wait < 0)
+                        break;
+
+                rtas_busy_delay(ret);
+        }
 
+        pr_warn("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n",
+                __func__, pe->phb->global_number, pe->addr, ret);
         return ret;
 }
 
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index b7dfc1359d01..3e8865b187de 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -927,7 +927,7 @@ static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail,
         dn = pci_device_to_OF_node(dev);
         pdn = PCI_DN(dn);
         buid = pdn->phb->buid;
-        cfg_addr = (pdn->busno << 8) | pdn->devfn;
+        cfg_addr = ((pdn->busno << 16) | (pdn->devfn << 8));
 
         ret = rtas_call(ddw_avail[0], 3, 5, (u32 *)query,
                   cfg_addr, BUID_HI(buid), BUID_LO(buid));
@@ -956,7 +956,7 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,
         dn = pci_device_to_OF_node(dev);
         pdn = PCI_DN(dn);
         buid = pdn->phb->buid;
-        cfg_addr = (pdn->busno << 8) | pdn->devfn;
+        cfg_addr = ((pdn->busno << 16) | (pdn->devfn << 8));
 
         do {
                 /* extra outputs are LIOBN and dma-addr (hi, lo) */
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index 0ac42cc4f880..d5ec71b2ed02 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -1,8 +1,7 @@
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
 CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -13,19 +12,19 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_NUMA_BALANCING=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -55,7 +54,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_LIVEPATCH=y
-CONFIG_MARCH_Z196=y
 CONFIG_TUNE_ZEC12=y
 CONFIG_NR_CPUS=256
 CONFIG_NUMA=y
@@ -65,6 +63,15 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_ZPOOL=m
+CONFIG_ZBUD=m
+CONFIG_ZSMALLOC=m
+CONFIG_ZSMALLOC_STAT=y
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_PCI=y
 CONFIG_PCI_DEBUG=y
 CONFIG_HOTPLUG_PCI=y
@@ -452,6 +459,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_RAW_DRIVER=m
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TN3270_FS=y
+# CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
@@ -537,6 +545,8 @@ CONFIG_DLM=m
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_READABLE_ASM=y
 CONFIG_UNUSED_SYMBOLS=y
@@ -555,13 +565,17 @@ CONFIG_SLUB_DEBUG_ON=y
 CONFIG_SLUB_STATS=y
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_VMACACHE=y
 CONFIG_DEBUG_VM_RB=y
+CONFIG_DEBUG_VM_PGFLAGS=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_SHIRQ=y
 CONFIG_DETECT_HUNG_TASK=y
+CONFIG_WQ_WATCHDOG=y
 CONFIG_PANIC_ON_OOPS=y
+CONFIG_DEBUG_TIMEKEEPING=y
 CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
@@ -596,6 +610,8 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_UPROBE_EVENT=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_TRACE_ENUM_MAP_FILE=y
 CONFIG_LKDTM=m
 CONFIG_TEST_LIST_SORT=y
 CONFIG_KPROBES_SANITY_TEST=y
@@ -607,7 +623,6 @@ CONFIG_TEST_STRING_HELPERS=y
 CONFIG_TEST_KSTRTOX=y
 CONFIG_DMA_API_DEBUG=y
 CONFIG_TEST_BPF=m
-# CONFIG_STRICT_DEVMEM is not set
 CONFIG_S390_PTDUMP=y
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_SECURITY=y
@@ -651,7 +666,6 @@ CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_ZLIB=y
 CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
@@ -664,7 +678,7 @@ CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_GHASH_S390=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_CRC7=m
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig
index a31dcd56f7c0..f46a35115d2d 100644
--- a/arch/s390/configs/gcov_defconfig
+++ b/arch/s390/configs/gcov_defconfig
@@ -1,8 +1,7 @@
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
 CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -13,17 +12,17 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_NUMA_BALANCING=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_BLK_CGROUP=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -53,7 +52,6 @@ CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_MARCH_Z196=y
 CONFIG_TUNE_ZEC12=y
 CONFIG_NR_CPUS=256
 CONFIG_NUMA=y
@@ -62,6 +60,14 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+CONFIG_ZSWAP=y
+CONFIG_ZBUD=m
+CONFIG_ZSMALLOC=m
+CONFIG_ZSMALLOC_STAT=y
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_PCI=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_S390=y
@@ -530,6 +536,8 @@ CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_UNUSED_SYMBOLS=y
@@ -547,13 +555,13 @@ CONFIG_LATENCYTOP=y
 CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_KPROBE_EVENT is not set
+CONFIG_TRACE_ENUM_MAP_FILE=y
 CONFIG_LKDTM=m
 CONFIG_RBTREE_TEST=m
 CONFIG_INTERVAL_TREE_TEST=m
 CONFIG_PERCPU_TEST=m
 CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_TEST_BPF=m
-# CONFIG_STRICT_DEVMEM is not set
 CONFIG_S390_PTDUMP=y
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_SECURITY=y
@@ -597,8 +605,6 @@ CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_ZLIB=y
-CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_USER_API_HASH=m
@@ -610,7 +616,7 @@ CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_GHASH_S390=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_CRC7=m
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig
index 7b73bf353345..ba0f2a58b8cd 100644
--- a/arch/s390/configs/performance_defconfig
+++ b/arch/s390/configs/performance_defconfig
@@ -1,8 +1,7 @@
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
 CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -14,17 +13,17 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_NUMA_BALANCING=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_BLK_CGROUP=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -53,7 +52,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_LIVEPATCH=y
-CONFIG_MARCH_Z196=y
 CONFIG_TUNE_ZEC12=y
 CONFIG_NR_CPUS=512
 CONFIG_NUMA=y
@@ -62,6 +60,14 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+CONFIG_ZSWAP=y
+CONFIG_ZBUD=m
+CONFIG_ZSMALLOC=m
+CONFIG_ZSMALLOC_STAT=y
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_PCI=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_S390=y
@@ -447,6 +453,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_RAW_DRIVER=m
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TN3270_FS=y
+# CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
@@ -530,6 +537,8 @@ CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_UNUSED_SYMBOLS=y
@@ -546,11 +555,12 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_UPROBE_EVENT=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_TRACE_ENUM_MAP_FILE=y
 CONFIG_LKDTM=m
 CONFIG_PERCPU_TEST=m
 CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_TEST_BPF=m
-# CONFIG_STRICT_DEVMEM is not set
 CONFIG_S390_PTDUMP=y
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_SECURITY=y
@@ -594,8 +604,6 @@ CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_ZLIB=y
-CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_USER_API_HASH=m
@@ -607,7 +615,7 @@ CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_GHASH_S390=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_CRC7=m
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index 1719843a55a2..4366a3e3e754 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -1,5 +1,5 @@
 # CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -7,7 +7,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_MARCH_Z196=y
 CONFIG_TUNE_ZEC12=y
 # CONFIG_COMPAT is not set
 CONFIG_NR_CPUS=2
@@ -64,7 +63,6 @@ CONFIG_PANIC_ON_OOPS=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_FTRACE is not set
-# CONFIG_STRICT_DEVMEM is not set
 # CONFIG_PFAULT is not set
 # CONFIG_S390_HYPFS_FS is not set
 # CONFIG_VIRTUALIZATION is not set
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index e24f2af4c73b..3f571ea89509 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,8 +1,8 @@
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
+CONFIG_USELIB=y
 CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
@@ -11,19 +11,19 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
@@ -44,7 +44,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_LIVEPATCH=y
-CONFIG_MARCH_Z196=y
 CONFIG_NR_CPUS=256
 CONFIG_NUMA=y
 CONFIG_HZ_100=y
@@ -52,6 +51,14 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+CONFIG_ZSWAP=y
+CONFIG_ZBUD=m
+CONFIG_ZSMALLOC=m
+CONFIG_ZSMALLOC_STAT=y
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_CRASH_DUMP=y
 CONFIG_BINFMT_MISC=m
 CONFIG_HIBERNATION=y
@@ -61,7 +68,6 @@ CONFIG_UNIX=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-# CONFIG_INET_LRO is not set
 CONFIG_L2TP=m
 CONFIG_L2TP_DEBUGFS=m
 CONFIG_VLAN_8021Q=y
@@ -144,6 +150,9 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
@@ -158,20 +167,21 @@ CONFIG_LOCK_STAT=y
 CONFIG_DEBUG_LOCKDEP=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_PI_LIST=y
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_TRACE=y
 CONFIG_LATENCYTOP=y
 CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
-CONFIG_TRACER_SNAPSHOT=y
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_UPROBE_EVENT=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_TRACE_ENUM_MAP_FILE=y
 CONFIG_KPROBES_SANITY_TEST=y
-# CONFIG_STRICT_DEVMEM is not set
 CONFIG_S390_PTDUMP=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
@@ -212,8 +222,6 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 37b9017c6a96..ac82e8eb936d 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -245,6 +245,7 @@ struct kvm_vcpu_stat {
         u32 exit_stop_request;
         u32 exit_validity;
         u32 exit_instruction;
+        u32 exit_pei;
         u32 halt_successful_poll;
         u32 halt_attempted_poll;
         u32 halt_poll_invalid;
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 59215c518f37..7ec63b1d920d 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -649,6 +649,8 @@ static int cpumf_pmu_commit_txn(struct pmu *pmu)
 
 /* Performance monitoring unit for s390x */
 static struct pmu cpumf_pmu = {
+        .task_ctx_nr  = perf_sw_context,
+        .capabilities = PERF_PMU_CAP_NO_INTERRUPT,
         .pmu_enable   = cpumf_pmu_enable,
         .pmu_disable  = cpumf_pmu_disable,
         .event_init   = cpumf_pmu_event_init,
@@ -708,12 +710,6 @@ static int __init cpumf_pmu_init(void)
                 goto out;
         }
 
-        /* The CPU measurement counter facility does not have overflow
-         * interrupts to do sampling.  Sampling must be provided by
-         * external means, for example, by timers.
-         */
-        cpumf_pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
-
         cpumf_pmu.attr_groups = cpumf_cf_event_group();
         rc = perf_pmu_register(&cpumf_pmu, "cpum_cf", PERF_TYPE_RAW);
         if (rc) {
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 2e6b54e4d3f9..252157181302 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -341,6 +341,8 @@ static int handle_mvpg_pei(struct kvm_vcpu *vcpu)
 
 static int handle_partial_execution(struct kvm_vcpu *vcpu)
 {
+        vcpu->stat.exit_pei++;
+
         if (vcpu->arch.sie_block->ipa == 0xb254)        /* MVPG */
                 return handle_mvpg_pei(vcpu);
         if (vcpu->arch.sie_block->ipa >> 8 == 0xae)     /* SIGP */
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 6d8ec3ac9dd8..43f2a2b80490 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -61,6 +61,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "exit_external_request", VCPU_STAT(exit_external_request) },
         { "exit_external_interrupt", VCPU_STAT(exit_external_interrupt) },
         { "exit_instruction", VCPU_STAT(exit_instruction) },
+        { "exit_pei", VCPU_STAT(exit_pei) },
         { "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
         { "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
         { "halt_successful_poll", VCPU_STAT(halt_successful_poll) },
@@ -657,7 +658,7 @@ static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr)
                 kvm->arch.model.cpuid = proc->cpuid;
                 lowest_ibc = sclp.ibc >> 16 & 0xfff;
                 unblocked_ibc = sclp.ibc & 0xfff;
-                if (lowest_ibc) {
+                if (lowest_ibc && proc->ibc) {
                         if (proc->ibc > unblocked_ibc)
                                 kvm->arch.model.ibc = unblocked_ibc;
                         else if (proc->ibc < lowest_ibc)
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 7a3144017301..19288c1b36d3 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -250,6 +250,7 @@ static noinline void do_sigsegv(struct pt_regs *regs, int si_code)
 
         report_user_fault(regs, SIGSEGV, 1);
         si.si_signo = SIGSEGV;
+        si.si_errno = 0;
         si.si_code = si_code;
         si.si_addr = (void __user *)(regs->int_parm_long & __FAIL_ADDR_MASK);
         force_sig_info(SIGSEGV, &si, current);
diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index e8b5962ac12a..e2565d2d0c32 100644
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -169,7 +169,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
                         return table;
         }
         /* Allocate a fresh page */
-        page = alloc_page(GFP_KERNEL|__GFP_REPEAT);
+        page = alloc_page(GFP_KERNEL);
         if (!page)
                 return NULL;
         if (!pgtable_page_ctor(page)) {
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 4324b87f9398..9f0ce0e6eeb4 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -437,7 +437,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr,
         pgste = pgste_get_lock(ptep);
         pgstev = pgste_val(pgste);
         pte = *ptep;
-        if (pte_swap(pte) &&
+        if (!reset && pte_swap(pte) &&
             ((pgstev & _PGSTE_GPS_USAGE_MASK) == _PGSTE_GPS_USAGE_UNUSED ||
              (pgstev & _PGSTE_GPS_ZERO))) {
                 ptep_zap_swap_entry(mm, pte_to_swp_entry(pte));
diff --git a/arch/s390/net/bpf_jit.h b/arch/s390/net/bpf_jit.h
index f010c93a88b1..fda605dbc1b4 100644
--- a/arch/s390/net/bpf_jit.h
+++ b/arch/s390/net/bpf_jit.h
@@ -37,7 +37,7 @@ extern u8 sk_load_word[], sk_load_half[], sk_load_byte[];
  *            |               |     |
  *            +---------------+     |
  *            | 8 byte skbp   |     |
- * R15+170 -> +---------------+     |
+ * R15+176 -> +---------------+     |
  *            | 8 byte hlen   |     |
  * R15+168 -> +---------------+     |
  *            | 4 byte align  |     |
@@ -58,7 +58,7 @@ extern u8 sk_load_word[], sk_load_half[], sk_load_byte[];
 #define STK_OFF         (STK_SPACE - STK_160_UNUSED)
 #define STK_OFF_TMP     160     /* Offset of tmp buffer on stack */
 #define STK_OFF_HLEN    168     /* Offset of SKB header length on stack */
-#define STK_OFF_SKBP    170     /* Offset of SKB pointer on stack */
+#define STK_OFF_SKBP    176     /* Offset of SKB pointer on stack */
 
 #define STK_OFF_R6      (160 - 11 * 8)  /* Offset of r6 on stack */
 #define STK_OFF_TCCNT   (160 - 12 * 8)  /* Offset of tail_call_cnt on stack */
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 9133b0ec000b..bee281f3163d 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -45,7 +45,7 @@ struct bpf_jit {
         int labels[1];          /* Labels for local jumps */
 };
 
-#define BPF_SIZE_MAX    0x7ffff /* Max size for program (20 bit signed displ) */
+#define BPF_SIZE_MAX    0xffff  /* Max size for program (16 bit branches) */
 
 #define SEEN_SKB        1       /* skb access */
 #define SEEN_MEM        2       /* use mem[] for temporary storage */
@@ -450,7 +450,7 @@ static void bpf_jit_prologue(struct bpf_jit *jit)
                 emit_load_skb_data_hlen(jit);
         if (jit->seen & SEEN_SKB_CHANGE)
                 /* stg %b1,ST_OFF_SKBP(%r0,%r15) */
-                EMIT6_DISP_LH(0xe3000000, 0x0024, REG_W1, REG_0, REG_15,
+                EMIT6_DISP_LH(0xe3000000, 0x0024, BPF_REG_1, REG_0, REG_15,
                               STK_OFF_SKBP);
 }
 
diff --git a/arch/score/include/asm/pgalloc.h b/arch/score/include/asm/pgalloc.h
index 2e067657db98..49b012d78c1a 100644
--- a/arch/score/include/asm/pgalloc.h
+++ b/arch/score/include/asm/pgalloc.h
@@ -42,8 +42,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 {
         pte_t *pte;
 
-        pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO,
-                                        PTE_ORDER);
+        pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_ZERO, PTE_ORDER);
 
         return pte;
 }
@@ -53,7 +52,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
 {
         struct page *pte;
 
-        pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
+        pte = alloc_pages(GFP_KERNEL, PTE_ORDER);
         if (!pte)
                 return NULL;
         clear_highpage(pte);
diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index a33673b3687d..f3f42c84c40f 100644
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
@@ -34,7 +34,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                           unsigned long address)
 {
-        return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
+        return quicklist_alloc(QUICK_PT, GFP_KERNEL, NULL);
 }
 
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
@@ -43,7 +43,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
         struct page *page;
         void *pg;
 
-        pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
+        pg = quicklist_alloc(QUICK_PT, GFP_KERNEL, NULL);
         if (!pg)
                 return NULL;
         page = virt_to_page(pg);
diff --git a/arch/sh/mm/pgtable.c b/arch/sh/mm/pgtable.c
index 26e03a1f7ca4..a62bd8696779 100644
--- a/arch/sh/mm/pgtable.c
+++ b/arch/sh/mm/pgtable.c
@@ -1,7 +1,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
-#define PGALLOC_GFP GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO
+#define PGALLOC_GFP GFP_KERNEL | __GFP_ZERO
 
 static struct kmem_cache *pgd_cachep;
 #if PAGETABLE_LEVELS > 2
diff --git a/arch/sparc/include/asm/head_64.h b/arch/sparc/include/asm/head_64.h
index 10e9dabc4c41..f0700cfeedd7 100644
--- a/arch/sparc/include/asm/head_64.h
+++ b/arch/sparc/include/asm/head_64.h
@@ -15,6 +15,10 @@
 
 #define PTREGS_OFF      (STACK_BIAS + STACKFRAME_SZ)
 
+#define RTRAP_PSTATE            (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV|PSTATE_IE)
+#define RTRAP_PSTATE_IRQOFF     (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV)
+#define RTRAP_PSTATE_AG_IRQOFF  (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV|PSTATE_AG)
+
 #define __CHEETAH_ID    0x003e0014
 #define __JALAPENO_ID   0x003e0016
 #define __SERRANO_ID    0x003e0022
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
index 5e3187185b4a..3529f1378cd8 100644
--- a/arch/sparc/include/asm/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
@@ -41,8 +41,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
 
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return kmem_cache_alloc(pgtable_cache,
-                                GFP_KERNEL|__GFP_REPEAT);
+        return kmem_cache_alloc(pgtable_cache, GFP_KERNEL);
 }
 
 static inline void pud_free(struct mm_struct *mm, pud_t *pud)
@@ -52,8 +51,7 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud)
 
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return kmem_cache_alloc(pgtable_cache,
-                                GFP_KERNEL|__GFP_REPEAT);
+        return kmem_cache_alloc(pgtable_cache, GFP_KERNEL);
 }
 
 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h
index 71b5a67522ab..781b9f1dbdc2 100644
--- a/arch/sparc/include/asm/ttable.h
+++ b/arch/sparc/include/asm/ttable.h
@@ -589,8 +589,8 @@ user_rtt_fill_64bit:					\
          restored;                                      \
         nop; nop; nop; nop; nop; nop;                   \
         nop; nop; nop; nop; nop;                        \
-        ba,a,pt %xcc, user_rtt_fill_fixup;              \
-        ba,a,pt %xcc, user_rtt_fill_fixup;              \
+        ba,a,pt %xcc, user_rtt_fill_fixup_dax;          \
+        ba,a,pt %xcc, user_rtt_fill_fixup_mna;          \
         ba,a,pt %xcc, user_rtt_fill_fixup;
 
 
@@ -652,8 +652,8 @@ user_rtt_fill_32bit:					\
          restored;                                      \
         nop; nop; nop; nop; nop;                        \
         nop; nop; nop;                                  \
-        ba,a,pt %xcc, user_rtt_fill_fixup;              \
-        ba,a,pt %xcc, user_rtt_fill_fixup;              \
+        ba,a,pt %xcc, user_rtt_fill_fixup_dax;          \
+        ba,a,pt %xcc, user_rtt_fill_fixup_mna;          \
         ba,a,pt %xcc, user_rtt_fill_fixup;
 
 
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 7cf9c6ea3f1f..fdb13327fded 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -21,6 +21,7 @@ CFLAGS_REMOVE_perf_event.o := -pg
 CFLAGS_REMOVE_pcr.o := -pg
 endif
 
+obj-$(CONFIG_SPARC64)   += urtt_fill.o
 obj-$(CONFIG_SPARC32)   += entry.o wof.o wuf.o
 obj-$(CONFIG_SPARC32)   += etrap_32.o
 obj-$(CONFIG_SPARC32)   += rtrap_32.o
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index d08bdaffdbfc..216948ca4382 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -14,10 +14,6 @@
 #include <asm/visasm.h>
 #include <asm/processor.h>
 
-#define         RTRAP_PSTATE            (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV|PSTATE_IE)
-#define         RTRAP_PSTATE_IRQOFF     (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV)
-#define         RTRAP_PSTATE_AG_IRQOFF  (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV|PSTATE_AG)
-
 #ifdef CONFIG_CONTEXT_TRACKING
 # define SCHEDULE_USER schedule_user
 #else
@@ -242,52 +238,17 @@ rt_continue:	ldx			[%sp + PTREGS_OFF + PT_V9_G1], %g1
                  wrpr                   %g1, %cwp
                 ba,a,pt                 %xcc, user_rtt_fill_64bit
 
-user_rtt_fill_fixup:
-                rdpr    %cwp, %g1
-                add     %g1, 1, %g1
-                wrpr    %g1, 0x0, %cwp
-
-                rdpr    %wstate, %g2
-                sll     %g2, 3, %g2
-                wrpr    %g2, 0x0, %wstate
-
-                /* We know %canrestore and %otherwin are both zero.  */
-
-                sethi   %hi(sparc64_kern_pri_context), %g2
-                ldx     [%g2 + %lo(sparc64_kern_pri_context)], %g2
-                mov     PRIMARY_CONTEXT, %g1
-
-661:            stxa    %g2, [%g1] ASI_DMMU
-                .section .sun4v_1insn_patch, "ax"
-                .word   661b
-                stxa    %g2, [%g1] ASI_MMU
-                .previous
-
-                sethi   %hi(KERNBASE), %g1
-                flush   %g1
+user_rtt_fill_fixup_dax:
+                ba,pt   %xcc, user_rtt_fill_fixup_common
+                 mov    1, %g3
 
-                or      %g4, FAULT_CODE_WINFIXUP, %g4
-                stb     %g4, [%g6 + TI_FAULT_CODE]
-                stx     %g5, [%g6 + TI_FAULT_ADDR]
+user_rtt_fill_fixup_mna:
+                ba,pt   %xcc, user_rtt_fill_fixup_common
+                 mov    2, %g3
 
-                mov     %g6, %l1
-                wrpr    %g0, 0x0, %tl
-
-661:            nop
-                .section                .sun4v_1insn_patch, "ax"
-                .word                   661b
-                SET_GL(0)
-                .previous
-
-                wrpr    %g0, RTRAP_PSTATE, %pstate
-
-                mov     %l1, %g6
-                ldx     [%g6 + TI_TASK], %g4
-                LOAD_PER_CPU_BASE(%g5, %g6, %g1, %g2, %g3)
-                call    do_sparc64_fault
-                 add    %sp, PTREGS_OFF, %o0
-                ba,pt   %xcc, rtrap
-                 nop
+user_rtt_fill_fixup:
+                ba,pt   %xcc, user_rtt_fill_fixup_common
+                 clr    %g3
 
 user_rtt_pre_restore:
                 add                     %g1, 1, %g1
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 3c25241fa5cb..91cc2f4ae4d9 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -138,12 +138,24 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
         return 0;
 }
 
+/* Checks if the fp is valid.  We always build signal frames which are
+ * 16-byte aligned, therefore we can always enforce that the restore
+ * frame has that property as well.
+ */
+static bool invalid_frame_pointer(void __user *fp, int fplen)
+{
+        if ((((unsigned long) fp) & 15) ||
+            ((unsigned long)fp) > 0x100000000ULL - fplen)
+                return true;
+        return false;
+}
+
 void do_sigreturn32(struct pt_regs *regs)
 {
         struct signal_frame32 __user *sf;
         compat_uptr_t fpu_save;
         compat_uptr_t rwin_save;
-        unsigned int psr;
+        unsigned int psr, ufp;
         unsigned int pc, npc;
         sigset_t set;
         compat_sigset_t seta;
@@ -158,11 +170,16 @@ void do_sigreturn32(struct pt_regs *regs)
         sf = (struct signal_frame32 __user *) regs->u_regs[UREG_FP];
 
         /* 1. Make sure we are not getting garbage from the user */
-        if (!access_ok(VERIFY_READ, sf, sizeof(*sf)) ||
-            (((unsigned long) sf) & 3))
+        if (invalid_frame_pointer(sf, sizeof(*sf)))
+                goto segv;
+
+        if (get_user(ufp, &sf->info.si_regs.u_regs[UREG_FP]))
+                goto segv;
+
+        if (ufp & 0x7)
                 goto segv;
 
-        if (get_user(pc, &sf->info.si_regs.pc) ||
+        if (__get_user(pc, &sf->info.si_regs.pc) ||
             __get_user(npc, &sf->info.si_regs.npc))
                 goto segv;
 
@@ -227,7 +244,7 @@ segv:
 asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
 {
         struct rt_signal_frame32 __user *sf;
-        unsigned int psr, pc, npc;
+        unsigned int psr, pc, npc, ufp;
         compat_uptr_t fpu_save;
         compat_uptr_t rwin_save;
         sigset_t set;
@@ -242,11 +259,16 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
         sf = (struct rt_signal_frame32 __user *) regs->u_regs[UREG_FP];
 
         /* 1. Make sure we are not getting garbage from the user */
-        if (!access_ok(VERIFY_READ, sf, sizeof(*sf)) ||
-            (((unsigned long) sf) & 3))
+        if (invalid_frame_pointer(sf, sizeof(*sf)))
                 goto segv;
 
-        if (get_user(pc, &sf->regs.pc) || 
+        if (get_user(ufp, &sf->regs.u_regs[UREG_FP]))
+                goto segv;
+
+        if (ufp & 0x7)
+                goto segv;
+
+        if (__get_user(pc, &sf->regs.pc) || 
             __get_user(npc, &sf->regs.npc))
                 goto segv;
 
@@ -307,14 +329,6 @@ segv:
         force_sig(SIGSEGV, current);
 }
 
-/* Checks if the fp is valid */
-static int invalid_frame_pointer(void __user *fp, int fplen)
-{
-        if ((((unsigned long) fp) & 7) || ((unsigned long)fp) > 0x100000000ULL - fplen)
-                return 1;
-        return 0;
-}
-
 static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, unsigned long framesize)
 {
         unsigned long sp;
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 52aa5e4ce5e7..c3c12efe0bc0 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -60,10 +60,22 @@ struct rt_signal_frame {
 #define SF_ALIGNEDSZ  (((sizeof(struct signal_frame) + 7) & (~7)))
 #define RT_ALIGNEDSZ  (((sizeof(struct rt_signal_frame) + 7) & (~7)))
 
+/* Checks if the fp is valid.  We always build signal frames which are
+ * 16-byte aligned, therefore we can always enforce that the restore
+ * frame has that property as well.
+ */
+static inline bool invalid_frame_pointer(void __user *fp, int fplen)
+{
+        if ((((unsigned long) fp) & 15) || !__access_ok((unsigned long)fp, fplen))
+                return true;
+
+        return false;
+}
+
 asmlinkage void do_sigreturn(struct pt_regs *regs)
 {
+        unsigned long up_psr, pc, npc, ufp;
         struct signal_frame __user *sf;
-        unsigned long up_psr, pc, npc;
         sigset_t set;
         __siginfo_fpu_t __user *fpu_save;
         __siginfo_rwin_t __user *rwin_save;
@@ -77,10 +89,13 @@ asmlinkage void do_sigreturn(struct pt_regs *regs)
         sf = (struct signal_frame __user *) regs->u_regs[UREG_FP];
 
         /* 1. Make sure we are not getting garbage from the user */
-        if (!access_ok(VERIFY_READ, sf, sizeof(*sf)))
+        if (!invalid_frame_pointer(sf, sizeof(*sf)))
+                goto segv_and_exit;
+
+        if (get_user(ufp, &sf->info.si_regs.u_regs[UREG_FP]))
                 goto segv_and_exit;
 
-        if (((unsigned long) sf) & 3)
+        if (ufp & 0x7)
                 goto segv_and_exit;
 
         err = __get_user(pc,  &sf->info.si_regs.pc);
@@ -127,7 +142,7 @@ segv_and_exit:
 asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
 {
         struct rt_signal_frame __user *sf;
-        unsigned int psr, pc, npc;
+        unsigned int psr, pc, npc, ufp;
         __siginfo_fpu_t __user *fpu_save;
         __siginfo_rwin_t __user *rwin_save;
         sigset_t set;
@@ -135,8 +150,13 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
 
         synchronize_user_stack();
         sf = (struct rt_signal_frame __user *) regs->u_regs[UREG_FP];
-        if (!access_ok(VERIFY_READ, sf, sizeof(*sf)) ||
-            (((unsigned long) sf) & 0x03))
+        if (!invalid_frame_pointer(sf, sizeof(*sf)))
+                goto segv;
+
+        if (get_user(ufp, &sf->regs.u_regs[UREG_FP]))
+                goto segv;
+
+        if (ufp & 0x7)
                 goto segv;
 
         err = __get_user(pc, &sf->regs.pc);
@@ -178,15 +198,6 @@ segv:
         force_sig(SIGSEGV, current);
 }
 
-/* Checks if the fp is valid */
-static inline int invalid_frame_pointer(void __user *fp, int fplen)
-{
-        if ((((unsigned long) fp) & 7) || !__access_ok((unsigned long)fp, fplen))
-                return 1;
-
-        return 0;
-}
-
 static inline void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, unsigned long framesize)
 {
         unsigned long sp = regs->u_regs[UREG_FP];
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index 39aaec173f66..5ee930c48f4c 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -234,6 +234,17 @@ do_sigsegv:
         goto out;
 }
 
+/* Checks if the fp is valid.  We always build rt signal frames which
+ * are 16-byte aligned, therefore we can always enforce that the
+ * restore frame has that property as well.
+ */
+static bool invalid_frame_pointer(void __user *fp)
+{
+        if (((unsigned long) fp) & 15)
+                return true;
+        return false;
+}
+
 struct rt_signal_frame {
         struct sparc_stackf     ss;
         siginfo_t               info;
@@ -246,8 +257,8 @@ struct rt_signal_frame {
 
 void do_rt_sigreturn(struct pt_regs *regs)
 {
+        unsigned long tpc, tnpc, tstate, ufp;
         struct rt_signal_frame __user *sf;
-        unsigned long tpc, tnpc, tstate;
         __siginfo_fpu_t __user *fpu_save;
         __siginfo_rwin_t __user *rwin_save;
         sigset_t set;
@@ -261,10 +272,16 @@ void do_rt_sigreturn(struct pt_regs *regs)
                 (regs->u_regs [UREG_FP] + STACK_BIAS);
 
         /* 1. Make sure we are not getting garbage from the user */
-        if (((unsigned long) sf) & 3)
+        if (invalid_frame_pointer(sf))
+                goto segv;
+
+        if (get_user(ufp, &sf->regs.u_regs[UREG_FP]))
                 goto segv;
 
-        err = get_user(tpc, &sf->regs.tpc);
+        if ((ufp + STACK_BIAS) & 0x7)
+                goto segv;
+
+        err = __get_user(tpc, &sf->regs.tpc);
         err |= __get_user(tnpc, &sf->regs.tnpc);
         if (test_thread_flag(TIF_32BIT)) {
                 tpc &= 0xffffffff;
@@ -308,14 +325,6 @@ segv:
         force_sig(SIGSEGV, current);
 }
 
-/* Checks if the fp is valid */
-static int invalid_frame_pointer(void __user *fp)
-{
-        if (((unsigned long) fp) & 15)
-                return 1;
-        return 0;
-}
-
 static inline void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, unsigned long framesize)
 {
         unsigned long sp = regs->u_regs[UREG_FP] + STACK_BIAS;
diff --git a/arch/sparc/kernel/sigutil_32.c b/arch/sparc/kernel/sigutil_32.c
index 0f6eebe71e6c..e5fe8cef9a69 100644
--- a/arch/sparc/kernel/sigutil_32.c
+++ b/arch/sparc/kernel/sigutil_32.c
@@ -48,6 +48,10 @@ int save_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu)
 int restore_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu)
 {
         int err;
+
+        if (((unsigned long) fpu) & 3)
+                return -EFAULT;
+
 #ifdef CONFIG_SMP
         if (test_tsk_thread_flag(current, TIF_USEDFPU))
                 regs->psr &= ~PSR_EF;
@@ -97,7 +101,10 @@ int restore_rwin_state(__siginfo_rwin_t __user *rp)
         struct thread_info *t = current_thread_info();
         int i, wsaved, err;
 
-        __get_user(wsaved, &rp->wsaved);
+        if (((unsigned long) rp) & 3)
+                return -EFAULT;
+
+        get_user(wsaved, &rp->wsaved);
         if (wsaved > NSWINS)
                 return -EFAULT;
 
diff --git a/arch/sparc/kernel/sigutil_64.c b/arch/sparc/kernel/sigutil_64.c
index 387834a9c56a..36aadcbeac69 100644
--- a/arch/sparc/kernel/sigutil_64.c
+++ b/arch/sparc/kernel/sigutil_64.c
@@ -37,7 +37,10 @@ int restore_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu)
         unsigned long fprs;
         int err;
 
-        err = __get_user(fprs, &fpu->si_fprs);
+        if (((unsigned long) fpu) & 7)
+                return -EFAULT;
+
+        err = get_user(fprs, &fpu->si_fprs);
         fprs_write(0);
         regs->tstate &= ~TSTATE_PEF;
         if (fprs & FPRS_DL)
@@ -72,7 +75,10 @@ int restore_rwin_state(__siginfo_rwin_t __user *rp)
         struct thread_info *t = current_thread_info();
         int i, wsaved, err;
 
-        __get_user(wsaved, &rp->wsaved);
+        if (((unsigned long) rp) & 7)
+                return -EFAULT;
+
+        get_user(wsaved, &rp->wsaved);
         if (wsaved > NSWINS)
                 return -EFAULT;
 
diff --git a/arch/sparc/kernel/urtt_fill.S b/arch/sparc/kernel/urtt_fill.S
new file mode 100644
index 000000000000..5604a2b051d4
--- /dev/null
+++ b/arch/sparc/kernel/urtt_fill.S
@@ -0,0 +1,98 @@
+#include <asm/thread_info.h>
+#include <asm/trap_block.h>
+#include <asm/spitfire.h>
+#include <asm/ptrace.h>
+#include <asm/head.h>
+
+                .text
+                .align  8
+                .globl  user_rtt_fill_fixup_common
+user_rtt_fill_fixup_common:
+                rdpr    %cwp, %g1
+                add     %g1, 1, %g1
+                wrpr    %g1, 0x0, %cwp
+
+                rdpr    %wstate, %g2
+                sll     %g2, 3, %g2
+                wrpr    %g2, 0x0, %wstate
+
+                /* We know %canrestore and %otherwin are both zero.  */
+
+                sethi   %hi(sparc64_kern_pri_context), %g2
+                ldx     [%g2 + %lo(sparc64_kern_pri_context)], %g2
+                mov     PRIMARY_CONTEXT, %g1
+
+661:            stxa    %g2, [%g1] ASI_DMMU
+                .section .sun4v_1insn_patch, "ax"
+                .word   661b
+                stxa    %g2, [%g1] ASI_MMU
+                .previous
+
+                sethi   %hi(KERNBASE), %g1
+                flush   %g1
+
+                mov     %g4, %l4
+                mov     %g5, %l5
+                brnz,pn %g3, 1f
+                 mov    %g3, %l3
+
+                or      %g4, FAULT_CODE_WINFIXUP, %g4
+                stb     %g4, [%g6 + TI_FAULT_CODE]
+                stx     %g5, [%g6 + TI_FAULT_ADDR]
+1:
+                mov     %g6, %l1
+                wrpr    %g0, 0x0, %tl
+
+661:            nop
+                .section                .sun4v_1insn_patch, "ax"
+                .word                   661b
+                SET_GL(0)
+                .previous
+
+                wrpr    %g0, RTRAP_PSTATE, %pstate
+
+                mov     %l1, %g6
+                ldx     [%g6 + TI_TASK], %g4
+                LOAD_PER_CPU_BASE(%g5, %g6, %g1, %g2, %g3)
+
+                brnz,pn %l3, 1f
+                 nop
+
+                call    do_sparc64_fault
+                 add    %sp, PTREGS_OFF, %o0
+                ba,pt   %xcc, rtrap
+                 nop
+
+1:              cmp     %g3, 2
+                bne,pn  %xcc, 2f
+                 nop
+
+                sethi   %hi(tlb_type), %g1
+                lduw    [%g1 + %lo(tlb_type)], %g1
+                cmp     %g1, 3
+                bne,pt  %icc, 1f
+                 add    %sp, PTREGS_OFF, %o0
+                mov     %l4, %o2
+                call    sun4v_do_mna
+                 mov    %l5, %o1
+                ba,a,pt %xcc, rtrap
+1:              mov     %l4, %o1
+                mov     %l5, %o2
+                call    mem_address_unaligned
+                 nop
+                ba,a,pt %xcc, rtrap
+
+2:              sethi   %hi(tlb_type), %g1
+                mov     %l4, %o1
+                lduw    [%g1 + %lo(tlb_type)], %g1
+                mov     %l5, %o2
+                cmp     %g1, 3
+                bne,pt  %icc, 1f
+                 add    %sp, PTREGS_OFF, %o0
+                call    sun4v_data_access_exception
+                 nop
+                ba,a,pt %xcc, rtrap
+
+1:              call    spitfire_data_access_exception
+                 nop
+                ba,a,pt %xcc, rtrap
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 652683cb4b4b..aec508e37490 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2704,8 +2704,7 @@ void __flush_tlb_all(void)
 pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                             unsigned long address)
 {
-        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
-                                       __GFP_REPEAT | __GFP_ZERO);
+        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);
         pte_t *pte = NULL;
 
         if (page)
@@ -2717,8 +2716,7 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 pgtable_t pte_alloc_one(struct mm_struct *mm,
                         unsigned long address)
 {
-        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
-                                       __GFP_REPEAT | __GFP_ZERO);
+        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);
         if (!page)
                 return NULL;
         if (!pgtable_page_ctor(page)) {
@@ -2824,9 +2822,10 @@ void hugetlb_setup(struct pt_regs *regs)
          * the Data-TLB for huge pages.
          */
         if (tlb_type == cheetah_plus) {
+                bool need_context_reload = false;
                 unsigned long ctx;
 
-                spin_lock(&ctx_alloc_lock);
+                spin_lock_irq(&ctx_alloc_lock);
                 ctx = mm->context.sparc64_ctx_val;
                 ctx &= ~CTX_PGSZ_MASK;
                 ctx |= CTX_PGSZ_BASE << CTX_PGSZ0_SHIFT;
@@ -2845,9 +2844,12 @@ void hugetlb_setup(struct pt_regs *regs)
                          * also executing in this address space.
                          */
                         mm->context.sparc64_ctx_val = ctx;
-                        on_each_cpu(context_reload, mm, 0);
+                        need_context_reload = true;
                 }
-                spin_unlock(&ctx_alloc_lock);
+                spin_unlock_irq(&ctx_alloc_lock);
+
+                if (need_context_reload)
+                        on_each_cpu(context_reload, mm, 0);
         }
 }
 #endif
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index 4b7cef9e94e0..c1467ac59ce6 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -78,7 +78,7 @@ struct thread_info {
 
 #ifndef __ASSEMBLY__
 
-void arch_release_thread_info(struct thread_info *info);
+void arch_release_thread_stack(unsigned long *stack);
 
 /* How to get the thread information struct from C. */
 register unsigned long stack_pointer __asm__("sp");
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 6b705ccc9cc1..a465d8372edd 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -73,8 +73,9 @@ void arch_cpu_idle(void)
 /*
  * Release a thread_info structure
  */
-void arch_release_thread_info(struct thread_info *info)
+void arch_release_thread_stack(unsigned long *stack)
 {
+        struct thread_info *info = (void *)stack;
         struct single_step_state *step_state = info->step_state;
 
         if (step_state) {
diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c
index 7bf2491a9c1f..c4d5bf841a7f 100644
--- a/arch/tile/mm/pgtable.c
+++ b/arch/tile/mm/pgtable.c
@@ -231,7 +231,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 struct page *pgtable_alloc_one(struct mm_struct *mm, unsigned long address,
                                int order)
 {
-        gfp_t flags = GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO;
+        gfp_t flags = GFP_KERNEL|__GFP_ZERO;
         struct page *p;
         int i;
 
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index b2a2dff50b4e..e7437ec62710 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -204,7 +204,7 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
         pte_t *pte;
 
-        pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
         return pte;
 }
 
@@ -212,7 +212,7 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
         struct page *pte;
 
-        pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
+        pte = alloc_page(GFP_KERNEL|__GFP_ZERO);
         if (!pte)
                 return NULL;
         if (!pgtable_page_ctor(pte)) {
diff --git a/arch/unicore32/include/asm/pgalloc.h b/arch/unicore32/include/asm/pgalloc.h
index 2e02d1356fdf..26775793c204 100644
--- a/arch/unicore32/include/asm/pgalloc.h
+++ b/arch/unicore32/include/asm/pgalloc.h
@@ -28,7 +28,7 @@ extern void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd);
 #define pgd_alloc(mm)                   get_pgd_slow(mm)
 #define pgd_free(mm, pgd)               free_pgd_slow(mm, pgd)
 
-#define PGALLOC_GFP     (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)
+#define PGALLOC_GFP     (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
 
 /*
  * Allocate one PTE table.
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0a7b885964ba..d9a94da0c29f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2439,6 +2439,15 @@ config PCI_CNB20LE_QUIRK
 
 source "drivers/pci/Kconfig"
 
+config ISA_BUS
+        bool "ISA-style bus support on modern systems" if EXPERT
+        select ISA_BUS_API
+        help
+          Enables ISA-style drivers on modern systems. This is necessary to
+          support PC/104 devices on X86_64 platforms.
+
+          If unsure, say N.
+
 # x86_64 have no ISA slots, but can have ISA-style DMA.
 config ISA_DMA_API
         bool "ISA-style DMA support" if (X86_64 && EXPERT)
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 700a9c6e6159..be8e688fa0d4 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -162,6 +162,9 @@ isoimage: $(obj)/bzImage
         for i in lib lib64 share end ; do \
                 if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \
                         cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \
+                        if [ -f /usr/$$i/syslinux/ldlinux.c32 ]; then \
+                                cp /usr/$$i/syslinux/ldlinux.c32 $(obj)/isoimage ; \
+                        fi ; \
                         break ; \
                 fi ; \
                 if [ $$i = end ] ; then exit 1 ; fi ; \
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 99c4bab123cd..e30eef4f29a6 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -714,7 +714,7 @@ static void cleanup_rapl_pmus(void)
         int i;
 
         for (i = 0; i < rapl_pmus->maxpkg; i++)
-                kfree(rapl_pmus->pmus + i);
+                kfree(rapl_pmus->pmus[i]);
         kfree(rapl_pmus);
 }
 
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index b2625867ebd1..874e8bd64d1d 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -2868,27 +2868,10 @@ static struct intel_uncore_type bdx_uncore_cbox = {
         .format_group           = &hswep_uncore_cbox_format_group,
 };
 
-static struct intel_uncore_type bdx_uncore_sbox = {
-        .name                   = "sbox",
-        .num_counters           = 4,
-        .num_boxes              = 4,
-        .perf_ctr_bits          = 48,
-        .event_ctl              = HSWEP_S0_MSR_PMON_CTL0,
-        .perf_ctr               = HSWEP_S0_MSR_PMON_CTR0,
-        .event_mask             = HSWEP_S_MSR_PMON_RAW_EVENT_MASK,
-        .box_ctl                = HSWEP_S0_MSR_PMON_BOX_CTL,
-        .msr_offset             = HSWEP_SBOX_MSR_OFFSET,
-        .ops                    = &hswep_uncore_sbox_msr_ops,
-        .format_group           = &hswep_uncore_sbox_format_group,
-};
-
-#define BDX_MSR_UNCORE_SBOX     3
-
 static struct intel_uncore_type *bdx_msr_uncores[] = {
         &bdx_uncore_ubox,
         &bdx_uncore_cbox,
         &hswep_uncore_pcu,
-        &bdx_uncore_sbox,
         NULL,
 };
 
@@ -2897,10 +2880,6 @@ void bdx_uncore_cpu_init(void)
         if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
                 bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
         uncore_msr_uncores = bdx_msr_uncores;
-
-        /* BDX-DE doesn't have SBOX */
-        if (boot_cpu_data.x86_model == 86)
-                uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;
 }
 
 static struct intel_uncore_type bdx_uncore_ha = {
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
new file mode 100644
index 000000000000..6999f7d01a0d
--- /dev/null
+++ b/arch/x86/include/asm/intel-family.h
@@ -0,0 +1,68 @@
+#ifndef _ASM_X86_INTEL_FAMILY_H
+#define _ASM_X86_INTEL_FAMILY_H
+
+/*
+ * "Big Core" Processors (Branded as Core, Xeon, etc...)
+ *
+ * The "_X" parts are generally the EP and EX Xeons, or the
+ * "Extreme" ones, like Broadwell-E.
+ *
+ * Things ending in "2" are usually because we have no better
+ * name for them.  There's no processor called "WESTMERE2".
+ */
+
+#define INTEL_FAM6_CORE_YONAH           0x0E
+#define INTEL_FAM6_CORE2_MEROM          0x0F
+#define INTEL_FAM6_CORE2_MEROM_L        0x16
+#define INTEL_FAM6_CORE2_PENRYN         0x17
+#define INTEL_FAM6_CORE2_DUNNINGTON     0x1D
+
+#define INTEL_FAM6_NEHALEM              0x1E
+#define INTEL_FAM6_NEHALEM_EP           0x1A
+#define INTEL_FAM6_NEHALEM_EX           0x2E
+#define INTEL_FAM6_WESTMERE             0x25
+#define INTEL_FAM6_WESTMERE2            0x1F
+#define INTEL_FAM6_WESTMERE_EP          0x2C
+#define INTEL_FAM6_WESTMERE_EX          0x2F
+
+#define INTEL_FAM6_SANDYBRIDGE          0x2A
+#define INTEL_FAM6_SANDYBRIDGE_X        0x2D
+#define INTEL_FAM6_IVYBRIDGE            0x3A
+#define INTEL_FAM6_IVYBRIDGE_X          0x3E
+
+#define INTEL_FAM6_HASWELL_CORE         0x3C
+#define INTEL_FAM6_HASWELL_X            0x3F
+#define INTEL_FAM6_HASWELL_ULT          0x45
+#define INTEL_FAM6_HASWELL_GT3E         0x46
+
+#define INTEL_FAM6_BROADWELL_CORE       0x3D
+#define INTEL_FAM6_BROADWELL_XEON_D     0x56
+#define INTEL_FAM6_BROADWELL_GT3E       0x47
+#define INTEL_FAM6_BROADWELL_X          0x4F
+
+#define INTEL_FAM6_SKYLAKE_MOBILE       0x4E
+#define INTEL_FAM6_SKYLAKE_DESKTOP      0x5E
+#define INTEL_FAM6_SKYLAKE_X            0x55
+#define INTEL_FAM6_KABYLAKE_MOBILE      0x8E
+#define INTEL_FAM6_KABYLAKE_DESKTOP     0x9E
+
+/* "Small Core" Processors (Atom) */
+
+#define INTEL_FAM6_ATOM_PINEVIEW        0x1C
+#define INTEL_FAM6_ATOM_LINCROFT        0x26
+#define INTEL_FAM6_ATOM_PENWELL         0x27
+#define INTEL_FAM6_ATOM_CLOVERVIEW      0x35
+#define INTEL_FAM6_ATOM_CEDARVIEW       0x36
+#define INTEL_FAM6_ATOM_SILVERMONT1     0x37 /* BayTrail/BYT / Valleyview */
+#define INTEL_FAM6_ATOM_SILVERMONT2     0x4D /* Avaton/Rangely */
+#define INTEL_FAM6_ATOM_AIRMONT         0x4C /* CherryTrail / Braswell */
+#define INTEL_FAM6_ATOM_MERRIFIELD1     0x4A /* Tangier */
+#define INTEL_FAM6_ATOM_MERRIFIELD2     0x5A /* Annidale */
+#define INTEL_FAM6_ATOM_GOLDMONT        0x5C
+#define INTEL_FAM6_ATOM_DENVERTON       0x5F /* Goldmont Microserver */
+
+/* Xeon Phi */
+
+#define INTEL_FAM6_XEON_PHI_KNL         0x57 /* Knights Landing */
+
+#endif /* _ASM_X86_INTEL_FAMILY_H */
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
index 4421b5da409d..d1d1e5094c28 100644
--- a/arch/x86/include/asm/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
@@ -38,12 +38,11 @@ typedef u8 kprobe_opcode_t;
 #define RELATIVECALL_OPCODE 0xe8
 #define RELATIVE_ADDR_SIZE 4
 #define MAX_STACK_SIZE 64
-#define MIN_STACK_SIZE(ADDR)                                           \
-        (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
-                              THREAD_SIZE - (unsigned long)(ADDR)))    \
-         ? (MAX_STACK_SIZE)                                            \
-         : (((unsigned long)current_thread_info()) +                   \
-            THREAD_SIZE - (unsigned long)(ADDR)))
+#define CUR_STACK_SIZE(ADDR) \
+        (current_top_of_stack() - (unsigned long)(ADDR))
+#define MIN_STACK_SIZE(ADDR)                            \
+        (MAX_STACK_SIZE < CUR_STACK_SIZE(ADDR) ?        \
+         MAX_STACK_SIZE : CUR_STACK_SIZE(ADDR))
 
 #define flush_insn_slot(p)      do { } while (0)
 
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e0fbe7e70dc1..69e62862b622 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -27,6 +27,7 @@
 #include <linux/irqbypass.h>
 #include <linux/hyperv.h>
 
+#include <asm/apic.h>
 #include <asm/pvclock-abi.h>
 #include <asm/desc.h>
 #include <asm/mtrr.h>
@@ -1368,4 +1369,14 @@ static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)
 
 static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {}
 
+static inline int kvm_cpu_get_apicid(int mps_cpu)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+        return __default_cpu_present_to_apicid(mps_cpu);
+#else
+        WARN_ON_ONCE(1);
+        return BAD_APICID;
+#endif
+}
+
 #endif /* _ASM_X86_KVM_HOST_H */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 7dc1d8fef7fd..b5fee97813cd 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -122,7 +122,7 @@ notrace static inline void native_write_msr(unsigned int msr,
                      "2:\n"
                      _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)
                      : : "c" (msr), "a"(low), "d" (high) : "memory");
-        if (msr_tracepoint_active(__tracepoint_read_msr))
+        if (msr_tracepoint_active(__tracepoint_write_msr))
                 do_trace_write_msr(msr, ((u64)high << 32 | low), 0);
 }
 
@@ -141,7 +141,7 @@ notrace static inline int native_write_msr_safe(unsigned int msr,
                      : "c" (msr), "0" (low), "d" (high),
                        [fault] "i" (-EIO)
                      : "memory");
-        if (msr_tracepoint_active(__tracepoint_read_msr))
+        if (msr_tracepoint_active(__tracepoint_write_msr))
                 do_trace_write_msr(msr, ((u64)high << 32 | low), err);
         return err;
 }
diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
index bf7f8b55b0f9..574c23cf761a 100644
--- a/arch/x86/include/asm/pgalloc.h
+++ b/arch/x86/include/asm/pgalloc.h
@@ -81,7 +81,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
         struct page *page;
-        page = alloc_pages(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO, 0);
+        page = alloc_pages(GFP_KERNEL |  __GFP_ZERO, 0);
         if (!page)
                 return NULL;
         if (!pgtable_pmd_page_ctor(page)) {
@@ -125,7 +125,7 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
 
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
+        return (pud_t *)get_zeroed_page(GFP_KERNEL);
 }
 
 static inline void pud_free(struct mm_struct *mm, pud_t *pud)
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index 7c247e7404be..0944218af9e2 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -14,7 +14,7 @@ extern int kstack_depth_to_print;
 struct thread_info;
 struct stacktrace_ops;
 
-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
+typedef unsigned long (*walk_stack_t)(struct task_struct *task,
                                       unsigned long *stack,
                                       unsigned long bp,
                                       const struct stacktrace_ops *ops,
@@ -23,13 +23,13 @@ typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
                                       int *graph);
 
 extern unsigned long
-print_context_stack(struct thread_info *tinfo,
+print_context_stack(struct task_struct *task,
                     unsigned long *stack, unsigned long bp,
                     const struct stacktrace_ops *ops, void *data,
                     unsigned long *end, int *graph);
 
 extern unsigned long
-print_context_stack_bp(struct thread_info *tinfo,
+print_context_stack_bp(struct task_struct *task,
                        unsigned long *stack, unsigned long bp,
                        const struct stacktrace_ops *ops, void *data,
                        unsigned long *end, int *graph);
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 84e33ff5a6d5..446702ed99dc 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2588,8 +2588,8 @@ static struct resource * __init ioapic_setup_resources(void)
                 res[num].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                 snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);
                 mem += IOAPIC_RESOURCE_NAME_SIZE;
+                ioapics[i].iomem_res = &res[num];
                 num++;
-                ioapics[i].iomem_res = res;
         }
 
         ioapic_resources = res;
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index c343a54bed39..f5c69d8974e1 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -674,14 +674,14 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
         u64 value;
 
         /* re-enable TopologyExtensions if switched off by BIOS */
-        if ((c->x86_model >= 0x10) && (c->x86_model <= 0x1f) &&
+        if ((c->x86_model >= 0x10) && (c->x86_model <= 0x6f) &&
             !cpu_has(c, X86_FEATURE_TOPOEXT)) {
 
                 if (msr_set_bit(0xc0011005, 54) > 0) {
                         rdmsrl(0xc0011005, value);
                         if (value & BIT_64(54)) {
                                 set_cpu_cap(c, X86_FEATURE_TOPOEXT);
-                                pr_info(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n");
+                                pr_info_once(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n");
                         }
                 }
         }
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 2bb25c3fe2e8..ef8017ca5ba9 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -42,16 +42,14 @@ void printk_address(unsigned long address)
 static void
 print_ftrace_graph_addr(unsigned long addr, void *data,
                         const struct stacktrace_ops *ops,
-                        struct thread_info *tinfo, int *graph)
+                        struct task_struct *task, int *graph)
 {
-        struct task_struct *task;
         unsigned long ret_addr;
         int index;
 
         if (addr != (unsigned long)return_to_handler)
                 return;
 
-        task = tinfo->task;
         index = task->curr_ret_stack;
 
         if (!task->ret_stack || index < *graph)
@@ -68,7 +66,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
 static inline void
 print_ftrace_graph_addr(unsigned long addr, void *data,
                         const struct stacktrace_ops *ops,
-                        struct thread_info *tinfo, int *graph)
+                        struct task_struct *task, int *graph)
 { }
 #endif
 
@@ -79,10 +77,10 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
  * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
  */
 
-static inline int valid_stack_ptr(struct thread_info *tinfo,
+static inline int valid_stack_ptr(struct task_struct *task,
                         void *p, unsigned int size, void *end)
 {
-        void *t = tinfo;
+        void *t = task_stack_page(task);
         if (end) {
                 if (p < end && p >= (end-THREAD_SIZE))
                         return 1;
@@ -93,14 +91,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
 }
 
 unsigned long
-print_context_stack(struct thread_info *tinfo,
+print_context_stack(struct task_struct *task,
                 unsigned long *stack, unsigned long bp,
                 const struct stacktrace_ops *ops, void *data,
                 unsigned long *end, int *graph)
 {
         struct stack_frame *frame = (struct stack_frame *)bp;
 
-        while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
+        while (valid_stack_ptr(task, stack, sizeof(*stack), end)) {
                 unsigned long addr;
 
                 addr = *stack;
@@ -112,7 +110,7 @@ print_context_stack(struct thread_info *tinfo,
                         } else {
                                 ops->address(data, addr, 0);
                         }
-                        print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
+                        print_ftrace_graph_addr(addr, data, ops, task, graph);
                 }
                 stack++;
         }
@@ -121,7 +119,7 @@ print_context_stack(struct thread_info *tinfo,
 EXPORT_SYMBOL_GPL(print_context_stack);
 
 unsigned long
-print_context_stack_bp(struct thread_info *tinfo,
+print_context_stack_bp(struct task_struct *task,
                        unsigned long *stack, unsigned long bp,
                        const struct stacktrace_ops *ops, void *data,
                        unsigned long *end, int *graph)
@@ -129,7 +127,7 @@ print_context_stack_bp(struct thread_info *tinfo,
         struct stack_frame *frame = (struct stack_frame *)bp;
         unsigned long *ret_addr = &frame->return_address;
 
-        while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
+        while (valid_stack_ptr(task, ret_addr, sizeof(*ret_addr), end)) {
                 unsigned long addr = *ret_addr;
 
                 if (!__kernel_text_address(addr))
@@ -139,7 +137,7 @@ print_context_stack_bp(struct thread_info *tinfo,
                         break;
                 frame = frame->next_frame;
                 ret_addr = &frame->return_address;
-                print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
+                print_ftrace_graph_addr(addr, data, ops, task, graph);
         }
 
         return (unsigned long)frame;
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index 464ffd69b92e..fef917e79b9d 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -61,15 +61,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
                 bp = stack_frame(task, regs);
 
         for (;;) {
-                struct thread_info *context;
                 void *end_stack;
 
                 end_stack = is_hardirq_stack(stack, cpu);
                 if (!end_stack)
                         end_stack = is_softirq_stack(stack, cpu);
 
-                context = task_thread_info(task);
-                bp = ops->walk_stack(context, stack, bp, ops, data,
+                bp = ops->walk_stack(task, stack, bp, ops, data,
                                      end_stack, &graph);
 
                 /* Stop if not on irq stack */
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 5f1c6266eb30..d558a8a49016 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -153,7 +153,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
                 const struct stacktrace_ops *ops, void *data)
 {
         const unsigned cpu = get_cpu();
-        struct thread_info *tinfo;
         unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
         unsigned long dummy;
         unsigned used = 0;
@@ -179,7 +178,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
          * current stack address. If the stacks consist of nested
          * exceptions
          */
-        tinfo = task_thread_info(task);
         while (!done) {
                 unsigned long *stack_end;
                 enum stack_type stype;
@@ -202,7 +200,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
                         if (ops->stack(data, id) < 0)
                                 break;
 
-                        bp = ops->walk_stack(tinfo, stack, bp, ops,
+                        bp = ops->walk_stack(task, stack, bp, ops,
                                              data, stack_end, &graph);
                         ops->stack(data, "<EOE>");
                         /*
@@ -218,7 +216,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
 
                         if (ops->stack(data, "IRQ") < 0)
                                 break;
-                        bp = ops->walk_stack(tinfo, stack, bp,
+                        bp = ops->walk_stack(task, stack, bp,
                                      ops, data, stack_end, &graph);
                         /*
                          * We link to the next stack (which would be
@@ -240,7 +238,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
         /*
          * This handles the process stack:
          */
-        bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
+        bp = ops->walk_stack(task, stack, bp, ops, data, NULL, &graph);
         put_cpu();
 }
 EXPORT_SYMBOL(dump_trace);
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bca14c899137..757390eb562b 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -223,36 +223,19 @@ static void __init intel_remapping_check(int num, int slot, int func)
  * despite the efforts of the "RAM buffer" approach, which simply rounds
  * memory boundaries up to 64M to try to catch space that may decode
  * as RAM and so is not suitable for MMIO.
- *
- * And yes, so far on current devices the base addr is always under 4G.
  */
-static u32 __init intel_stolen_base(int num, int slot, int func, size_t stolen_size)
-{
-        u32 base;
-
-        /*
-         * For the PCI IDs in this quirk, the stolen base is always
-         * in 0x5c, aka the BDSM register (yes that's really what
-         * it's called).
-         */
-        base = read_pci_config(num, slot, func, 0x5c);
-        base &= ~((1<<20) - 1);
-
-        return base;
-}
 
 #define KB(x)   ((x) * 1024UL)
 #define MB(x)   (KB (KB (x)))
-#define GB(x)   (MB (KB (x)))
 
 static size_t __init i830_tseg_size(void)
 {
-        u8 tmp = read_pci_config_byte(0, 0, 0, I830_ESMRAMC);
+        u8 esmramc = read_pci_config_byte(0, 0, 0, I830_ESMRAMC);
 
-        if (!(tmp & TSEG_ENABLE))
+        if (!(esmramc & TSEG_ENABLE))
                 return 0;
 
-        if (tmp & I830_TSEG_SIZE_1M)
+        if (esmramc & I830_TSEG_SIZE_1M)
                 return MB(1);
         else
                 return KB(512);
@@ -260,27 +243,26 @@ static size_t __init i830_tseg_size(void)
 
 static size_t __init i845_tseg_size(void)
 {
-        u8 tmp = read_pci_config_byte(0, 0, 0, I845_ESMRAMC);
+        u8 esmramc = read_pci_config_byte(0, 0, 0, I845_ESMRAMC);
+        u8 tseg_size = esmramc & I845_TSEG_SIZE_MASK;
 
-        if (!(tmp & TSEG_ENABLE))
+        if (!(esmramc & TSEG_ENABLE))
                 return 0;
 
-        switch (tmp & I845_TSEG_SIZE_MASK) {
-        case I845_TSEG_SIZE_512K:
-                return KB(512);
-        case I845_TSEG_SIZE_1M:
-                return MB(1);
+        switch (tseg_size) {
+        case I845_TSEG_SIZE_512K:       return KB(512);
+        case I845_TSEG_SIZE_1M:         return MB(1);
         default:
-                WARN_ON(1);
-                return 0;
+                WARN(1, "Unknown ESMRAMC value: %x!\n", esmramc);
         }
+        return 0;
 }
 
 static size_t __init i85x_tseg_size(void)
 {
-        u8 tmp = read_pci_config_byte(0, 0, 0, I85X_ESMRAMC);
+        u8 esmramc = read_pci_config_byte(0, 0, 0, I85X_ESMRAMC);
 
-        if (!(tmp & TSEG_ENABLE))
+        if (!(esmramc & TSEG_ENABLE))
                 return 0;
 
         return MB(1);
@@ -300,285 +282,287 @@ static size_t __init i85x_mem_size(void)
  * On 830/845/85x the stolen memory base isn't available in any
  * register. We need to calculate it as TOM-TSEG_SIZE-stolen_size.
  */
-static u32 __init i830_stolen_base(int num, int slot, int func, size_t stolen_size)
+static phys_addr_t __init i830_stolen_base(int num, int slot, int func,
+                                           size_t stolen_size)
 {
-        return i830_mem_size() - i830_tseg_size() - stolen_size;
+        return (phys_addr_t)i830_mem_size() - i830_tseg_size() - stolen_size;
 }
 
-static u32 __init i845_stolen_base(int num, int slot, int func, size_t stolen_size)
+static phys_addr_t __init i845_stolen_base(int num, int slot, int func,
+                                           size_t stolen_size)
 {
-        return i830_mem_size() - i845_tseg_size() - stolen_size;
+        return (phys_addr_t)i830_mem_size() - i845_tseg_size() - stolen_size;
 }
 
-static u32 __init i85x_stolen_base(int num, int slot, int func, size_t stolen_size)
+static phys_addr_t __init i85x_stolen_base(int num, int slot, int func,
+                                           size_t stolen_size)
 {
-        return i85x_mem_size() - i85x_tseg_size() - stolen_size;
+        return (phys_addr_t)i85x_mem_size() - i85x_tseg_size() - stolen_size;
 }
 
-static u32 __init i865_stolen_base(int num, int slot, int func, size_t stolen_size)
+static phys_addr_t __init i865_stolen_base(int num, int slot, int func,
+                                           size_t stolen_size)
 {
+        u16 toud;
+
         /*
          * FIXME is the graphics stolen memory region
          * always at TOUD? Ie. is it always the last
          * one to be allocated by the BIOS?
          */
-        return read_pci_config_16(0, 0, 0, I865_TOUD) << 16;
+        toud = read_pci_config_16(0, 0, 0, I865_TOUD);
+
+        return (phys_addr_t)toud << 16;
+}
+
+static phys_addr_t __init gen3_stolen_base(int num, int slot, int func,
+                                           size_t stolen_size)
+{
+        u32 bsm;
+
+        /* Almost universally we can find the Graphics Base of Stolen Memory
+         * at register BSM (0x5c) in the igfx configuration space. On a few
+         * (desktop) machines this is also mirrored in the bridge device at
+         * different locations, or in the MCHBAR.
+         */
+        bsm = read_pci_config(num, slot, func, INTEL_BSM);
+
+        return (phys_addr_t)bsm & INTEL_BSM_MASK;
 }
 
 static size_t __init i830_stolen_size(int num, int slot, int func)
 {
-        size_t stolen_size;
         u16 gmch_ctrl;
+        u16 gms;
 
         gmch_ctrl = read_pci_config_16(0, 0, 0, I830_GMCH_CTRL);
-
-        switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
-        case I830_GMCH_GMS_STOLEN_512:
-                stolen_size = KB(512);
-                break;
-        case I830_GMCH_GMS_STOLEN_1024:
-                stolen_size = MB(1);
-                break;
-        case I830_GMCH_GMS_STOLEN_8192:
-                stolen_size = MB(8);
-                break;
-        case I830_GMCH_GMS_LOCAL:
-                /* local memory isn't part of the normal address space */
-                stolen_size = 0;
-                break;
+        gms = gmch_ctrl & I830_GMCH_GMS_MASK;
+
+        switch (gms) {
+        case I830_GMCH_GMS_STOLEN_512:  return KB(512);
+        case I830_GMCH_GMS_STOLEN_1024: return MB(1);
+        case I830_GMCH_GMS_STOLEN_8192: return MB(8);
+        /* local memory isn't part of the normal address space */
+        case I830_GMCH_GMS_LOCAL:       return 0;
         default:
-                return 0;
+                WARN(1, "Unknown GMCH_CTRL value: %x!\n", gmch_ctrl);
         }
 
-        return stolen_size;
+        return 0;
 }
 
 static size_t __init gen3_stolen_size(int num, int slot, int func)
 {
-        size_t stolen_size;
         u16 gmch_ctrl;
+        u16 gms;
 
         gmch_ctrl = read_pci_config_16(0, 0, 0, I830_GMCH_CTRL);
-
-        switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
-        case I855_GMCH_GMS_STOLEN_1M:
-                stolen_size = MB(1);
-                break;
-        case I855_GMCH_GMS_STOLEN_4M:
-                stolen_size = MB(4);
-                break;
-        case I855_GMCH_GMS_STOLEN_8M:
-                stolen_size = MB(8);
-                break;
-        case I855_GMCH_GMS_STOLEN_16M:
-                stolen_size = MB(16);
-                break;
-        case I855_GMCH_GMS_STOLEN_32M:
-                stolen_size = MB(32);
-                break;
-        case I915_GMCH_GMS_STOLEN_48M:
-                stolen_size = MB(48);
-                break;
-        case I915_GMCH_GMS_STOLEN_64M:
-                stolen_size = MB(64);
-                break;
-        case G33_GMCH_GMS_STOLEN_128M:
-                stolen_size = MB(128);
-                break;
-        case G33_GMCH_GMS_STOLEN_256M:
-                stolen_size = MB(256);
-                break;
-        case INTEL_GMCH_GMS_STOLEN_96M:
-                stolen_size = MB(96);
-                break;
-        case INTEL_GMCH_GMS_STOLEN_160M:
-                stolen_size = MB(160);
-                break;
-        case INTEL_GMCH_GMS_STOLEN_224M:
-                stolen_size = MB(224);
-                break;
-        case INTEL_GMCH_GMS_STOLEN_352M:
-                stolen_size = MB(352);
-                break;
+        gms = gmch_ctrl & I855_GMCH_GMS_MASK;
+
+        switch (gms) {
+        case I855_GMCH_GMS_STOLEN_1M:   return MB(1);
+        case I855_GMCH_GMS_STOLEN_4M:   return MB(4);
+        case I855_GMCH_GMS_STOLEN_8M:   return MB(8);
+        case I855_GMCH_GMS_STOLEN_16M:  return MB(16);
+        case I855_GMCH_GMS_STOLEN_32M:  return MB(32);
+        case I915_GMCH_GMS_STOLEN_48M:  return MB(48);
+        case I915_GMCH_GMS_STOLEN_64M:  return MB(64);
+        case G33_GMCH_GMS_STOLEN_128M:  return MB(128);
+        case G33_GMCH_GMS_STOLEN_256M:  return MB(256);
+        case INTEL_GMCH_GMS_STOLEN_96M: return MB(96);
+        case INTEL_GMCH_GMS_STOLEN_160M:return MB(160);
+        case INTEL_GMCH_GMS_STOLEN_224M:return MB(224);
+        case INTEL_GMCH_GMS_STOLEN_352M:return MB(352);
         default:
-                stolen_size = 0;
-                break;
+                WARN(1, "Unknown GMCH_CTRL value: %x!\n", gmch_ctrl);
         }
 
-        return stolen_size;
+        return 0;
 }
 
 static size_t __init gen6_stolen_size(int num, int slot, int func)
 {
         u16 gmch_ctrl;
+        u16 gms;
 
         gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);
-        gmch_ctrl >>= SNB_GMCH_GMS_SHIFT;
-        gmch_ctrl &= SNB_GMCH_GMS_MASK;
+        gms = (gmch_ctrl >> SNB_GMCH_GMS_SHIFT) & SNB_GMCH_GMS_MASK;
 
-        return gmch_ctrl << 25; /* 32 MB units */
+        return (size_t)gms * MB(32);
 }
 
 static size_t __init gen8_stolen_size(int num, int slot, int func)
 {
         u16 gmch_ctrl;
+        u16 gms;
 
         gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);
-        gmch_ctrl >>= BDW_GMCH_GMS_SHIFT;
-        gmch_ctrl &= BDW_GMCH_GMS_MASK;
-        return gmch_ctrl << 25; /* 32 MB units */
+        gms = (gmch_ctrl >> BDW_GMCH_GMS_SHIFT) & BDW_GMCH_GMS_MASK;
+
+        return (size_t)gms * MB(32);
 }
 
 static size_t __init chv_stolen_size(int num, int slot, int func)
 {
         u16 gmch_ctrl;
+        u16 gms;
 
         gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);
-        gmch_ctrl >>= SNB_GMCH_GMS_SHIFT;
-        gmch_ctrl &= SNB_GMCH_GMS_MASK;
+        gms = (gmch_ctrl >> SNB_GMCH_GMS_SHIFT) & SNB_GMCH_GMS_MASK;
 
         /*
          * 0x0  to 0x10: 32MB increments starting at 0MB
          * 0x11 to 0x16: 4MB increments starting at 8MB
          * 0x17 to 0x1d: 4MB increments start at 36MB
          */
-        if (gmch_ctrl < 0x11)
-                return gmch_ctrl << 25;
-        else if (gmch_ctrl < 0x17)
-                return (gmch_ctrl - 0x11 + 2) << 22;
+        if (gms < 0x11)
+                return (size_t)gms * MB(32);
+        else if (gms < 0x17)
+                return (size_t)(gms - 0x11 + 2) * MB(4);
         else
-                return (gmch_ctrl - 0x17 + 9) << 22;
+                return (size_t)(gms - 0x17 + 9) * MB(4);
 }
 
-struct intel_stolen_funcs {
-        size_t (*size)(int num, int slot, int func);
-        u32 (*base)(int num, int slot, int func, size_t size);
-};
-
 static size_t __init gen9_stolen_size(int num, int slot, int func)
 {
         u16 gmch_ctrl;
+        u16 gms;
 
         gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);
-        gmch_ctrl >>= BDW_GMCH_GMS_SHIFT;
-        gmch_ctrl &= BDW_GMCH_GMS_MASK;
+        gms = (gmch_ctrl >> BDW_GMCH_GMS_SHIFT) & BDW_GMCH_GMS_MASK;
 
-        if (gmch_ctrl < 0xf0)
-                return gmch_ctrl << 25; /* 32 MB units */
+        /* 0x0  to 0xef: 32MB increments starting at 0MB */
+        /* 0xf0 to 0xfe: 4MB increments starting at 4MB */
+        if (gms < 0xf0)
+                return (size_t)gms * MB(32);
         else
-                /* 4MB increments starting at 0xf0 for 4MB */
-                return (gmch_ctrl - 0xf0 + 1) << 22;
+                return (size_t)(gms - 0xf0 + 1) * MB(4);
 }
 
-typedef size_t (*stolen_size_fn)(int num, int slot, int func);
+struct intel_early_ops {
+        size_t (*stolen_size)(int num, int slot, int func);
+        phys_addr_t (*stolen_base)(int num, int slot, int func, size_t size);
+};
 
-static const struct intel_stolen_funcs i830_stolen_funcs __initconst = {
-        .base = i830_stolen_base,
-        .size = i830_stolen_size,
+static const struct intel_early_ops i830_early_ops __initconst = {
+        .stolen_base = i830_stolen_base,
+        .stolen_size = i830_stolen_size,
 };
 
-static const struct intel_stolen_funcs i845_stolen_funcs __initconst = {
-        .base = i845_stolen_base,
-        .size = i830_stolen_size,
+static const struct intel_early_ops i845_early_ops __initconst = {
+        .stolen_base = i845_stolen_base,
+        .stolen_size = i830_stolen_size,
 };
 
-static const struct intel_stolen_funcs i85x_stolen_funcs __initconst = {
-        .base = i85x_stolen_base,
-        .size = gen3_stolen_size,
+static const struct intel_early_ops i85x_early_ops __initconst = {
+        .stolen_base = i85x_stolen_base,
+        .stolen_size = gen3_stolen_size,
 };
 
-static const struct intel_stolen_funcs i865_stolen_funcs __initconst = {
-        .base = i865_stolen_base,
-        .size = gen3_stolen_size,
+static const struct intel_early_ops i865_early_ops __initconst = {
+        .stolen_base = i865_stolen_base,
+        .stolen_size = gen3_stolen_size,
 };
 
-static const struct intel_stolen_funcs gen3_stolen_funcs __initconst = {
-        .base = intel_stolen_base,
-        .size = gen3_stolen_size,
+static const struct intel_early_ops gen3_early_ops __initconst = {
+        .stolen_base = gen3_stolen_base,
+        .stolen_size = gen3_stolen_size,
 };
 
-static const struct intel_stolen_funcs gen6_stolen_funcs __initconst = {
-        .base = intel_stolen_base,
-        .size = gen6_stolen_size,
+static const struct intel_early_ops gen6_early_ops __initconst = {
+        .stolen_base = gen3_stolen_base,
+        .stolen_size = gen6_stolen_size,
 };
 
-static const struct intel_stolen_funcs gen8_stolen_funcs __initconst = {
-        .base = intel_stolen_base,
-        .size = gen8_stolen_size,
+static const struct intel_early_ops gen8_early_ops __initconst = {
+        .stolen_base = gen3_stolen_base,
+        .stolen_size = gen8_stolen_size,
 };
 
-static const struct intel_stolen_funcs gen9_stolen_funcs __initconst = {
-        .base = intel_stolen_base,
-        .size = gen9_stolen_size,
+static const struct intel_early_ops gen9_early_ops __initconst = {
+        .stolen_base = gen3_stolen_base,
+        .stolen_size = gen9_stolen_size,
 };
 
-static const struct intel_stolen_funcs chv_stolen_funcs __initconst = {
-        .base = intel_stolen_base,
-        .size = chv_stolen_size,
+static const struct intel_early_ops chv_early_ops __initconst = {
+        .stolen_base = gen3_stolen_base,
+        .stolen_size = chv_stolen_size,
 };
 
-static const struct pci_device_id intel_stolen_ids[] __initconst = {
-        INTEL_I830_IDS(&i830_stolen_funcs),
-        INTEL_I845G_IDS(&i845_stolen_funcs),
-        INTEL_I85X_IDS(&i85x_stolen_funcs),
-        INTEL_I865G_IDS(&i865_stolen_funcs),
-        INTEL_I915G_IDS(&gen3_stolen_funcs),
-        INTEL_I915GM_IDS(&gen3_stolen_funcs),
-        INTEL_I945G_IDS(&gen3_stolen_funcs),
-        INTEL_I945GM_IDS(&gen3_stolen_funcs),
-        INTEL_VLV_M_IDS(&gen6_stolen_funcs),
-        INTEL_VLV_D_IDS(&gen6_stolen_funcs),
-        INTEL_PINEVIEW_IDS(&gen3_stolen_funcs),
-        INTEL_I965G_IDS(&gen3_stolen_funcs),
-        INTEL_G33_IDS(&gen3_stolen_funcs),
-        INTEL_I965GM_IDS(&gen3_stolen_funcs),
-        INTEL_GM45_IDS(&gen3_stolen_funcs),
-        INTEL_G45_IDS(&gen3_stolen_funcs),
-        INTEL_IRONLAKE_D_IDS(&gen3_stolen_funcs),
-        INTEL_IRONLAKE_M_IDS(&gen3_stolen_funcs),
-        INTEL_SNB_D_IDS(&gen6_stolen_funcs),
-        INTEL_SNB_M_IDS(&gen6_stolen_funcs),
-        INTEL_IVB_M_IDS(&gen6_stolen_funcs),
-        INTEL_IVB_D_IDS(&gen6_stolen_funcs),
-        INTEL_HSW_D_IDS(&gen6_stolen_funcs),
-        INTEL_HSW_M_IDS(&gen6_stolen_funcs),
-        INTEL_BDW_M_IDS(&gen8_stolen_funcs),
-        INTEL_BDW_D_IDS(&gen8_stolen_funcs),
-        INTEL_CHV_IDS(&chv_stolen_funcs),
-        INTEL_SKL_IDS(&gen9_stolen_funcs),
-        INTEL_BXT_IDS(&gen9_stolen_funcs),
-        INTEL_KBL_IDS(&gen9_stolen_funcs),
+static const struct pci_device_id intel_early_ids[] __initconst = {
+        INTEL_I830_IDS(&i830_early_ops),
+        INTEL_I845G_IDS(&i845_early_ops),
+        INTEL_I85X_IDS(&i85x_early_ops),
+        INTEL_I865G_IDS(&i865_early_ops),
+        INTEL_I915G_IDS(&gen3_early_ops),
+        INTEL_I915GM_IDS(&gen3_early_ops),
+        INTEL_I945G_IDS(&gen3_early_ops),
+        INTEL_I945GM_IDS(&gen3_early_ops),
+        INTEL_VLV_M_IDS(&gen6_early_ops),
+        INTEL_VLV_D_IDS(&gen6_early_ops),
+        INTEL_PINEVIEW_IDS(&gen3_early_ops),
+        INTEL_I965G_IDS(&gen3_early_ops),
+        INTEL_G33_IDS(&gen3_early_ops),
+        INTEL_I965GM_IDS(&gen3_early_ops),
+        INTEL_GM45_IDS(&gen3_early_ops),
+        INTEL_G45_IDS(&gen3_early_ops),
+        INTEL_IRONLAKE_D_IDS(&gen3_early_ops),
+        INTEL_IRONLAKE_M_IDS(&gen3_early_ops),
+        INTEL_SNB_D_IDS(&gen6_early_ops),
+        INTEL_SNB_M_IDS(&gen6_early_ops),
+        INTEL_IVB_M_IDS(&gen6_early_ops),
+        INTEL_IVB_D_IDS(&gen6_early_ops),
+        INTEL_HSW_D_IDS(&gen6_early_ops),
+        INTEL_HSW_M_IDS(&gen6_early_ops),
+        INTEL_BDW_M_IDS(&gen8_early_ops),
+        INTEL_BDW_D_IDS(&gen8_early_ops),
+        INTEL_CHV_IDS(&chv_early_ops),
+        INTEL_SKL_IDS(&gen9_early_ops),
+        INTEL_BXT_IDS(&gen9_early_ops),
+        INTEL_KBL_IDS(&gen9_early_ops),
 };
 
-static void __init intel_graphics_stolen(int num, int slot, int func)
+static void __init
+intel_graphics_stolen(int num, int slot, int func,
+                      const struct intel_early_ops *early_ops)
 {
+        phys_addr_t base, end;
         size_t size;
+
+        size = early_ops->stolen_size(num, slot, func);
+        base = early_ops->stolen_base(num, slot, func, size);
+
+        if (!size || !base)
+                return;
+
+        end = base + size - 1;
+        printk(KERN_INFO "Reserving Intel graphics memory at %pa-%pa\n",
+               &base, &end);
+
+        /* Mark this space as reserved */
+        e820_add_region(base, size, E820_RESERVED);
+        sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+}
+
+static void __init intel_graphics_quirks(int num, int slot, int func)
+{
+        const struct intel_early_ops *early_ops;
+        u16 device;
         int i;
-        u32 start;
-        u16 device, subvendor, subdevice;
 
         device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID);
-        subvendor = read_pci_config_16(num, slot, func,
-                                       PCI_SUBSYSTEM_VENDOR_ID);
-        subdevice = read_pci_config_16(num, slot, func, PCI_SUBSYSTEM_ID);
-
-        for (i = 0; i < ARRAY_SIZE(intel_stolen_ids); i++) {
-                if (intel_stolen_ids[i].device == device) {
-                        const struct intel_stolen_funcs *stolen_funcs =
-                                (const struct intel_stolen_funcs *)intel_stolen_ids[i].driver_data;
-                        size = stolen_funcs->size(num, slot, func);
-                        start = stolen_funcs->base(num, slot, func, size);
-                        if (size && start) {
-                                printk(KERN_INFO "Reserving Intel graphics stolen memory at 0x%x-0x%x\n",
-                                       start, start + (u32)size - 1);
-                                /* Mark this space as reserved */
-                                e820_add_region(start, size, E820_RESERVED);
-                                sanitize_e820_map(e820.map,
-                                                  ARRAY_SIZE(e820.map),
-                                                  &e820.nr_map);
-                        }
-                        return;
-                }
+
+        for (i = 0; i < ARRAY_SIZE(intel_early_ids); i++) {
+                kernel_ulong_t driver_data = intel_early_ids[i].driver_data;
+
+                if (intel_early_ids[i].device != device)
+                        continue;
+
+                early_ops = (typeof(early_ops))driver_data;
+
+                intel_graphics_stolen(num, slot, func, early_ops);
+
+                return;
         }
 }
 
@@ -627,7 +611,7 @@ static struct chipset early_qrk[] __initdata = {
         { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST,
           PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
         { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA, PCI_ANY_ID,
-          QFLAG_APPLY_ONCE, intel_graphics_stolen },
+          QFLAG_APPLY_ONCE, intel_graphics_quirks },
         /*
          * HPET on the current version of the Baytrail platform has accuracy
          * problems: it will halt in deep idle state - so we disable it.
diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
index 4d38416e2a7f..04f89caef9c4 100644
--- a/arch/x86/kernel/espfix_64.c
+++ b/arch/x86/kernel/espfix_64.c
@@ -57,7 +57,7 @@
 # error "Need more than one PGD for the ESPFIX hack"
 #endif
 
-#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)
+#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
 
 /* This contains the *bottom* address of the espfix stack */
 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, espfix_stack);
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 38da8f29a9c8..c627bf8d98ad 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -130,11 +130,9 @@ void irq_ctx_init(int cpu)
 
 void do_softirq_own_stack(void)
 {
-        struct thread_info *curstk;
         struct irq_stack *irqstk;
         u32 *isp, *prev_esp;
 
-        curstk = current_stack();
         irqstk = __this_cpu_read(softirq_stack);
 
         /* build the stack frame on the softirq stack */
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 38cf7a741250..7847e5c0e0b5 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -961,7 +961,19 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
                  * normal page fault.
                  */
                 regs->ip = (unsigned long)cur->addr;
+                /*
+                 * Trap flag (TF) has been set here because this fault
+                 * happened where the single stepping will be done.
+                 * So clear it by resetting the current kprobe:
+                 */
+                regs->flags &= ~X86_EFLAGS_TF;
+
+                /*
+                 * If the TF flag was set before the kprobe hit,
+                 * don't touch it:
+                 */
                 regs->flags |= kcb->kprobe_old_flags;
+
                 if (kcb->kprobe_status == KPROBE_REENTER)
                         restore_previous_kprobe(kcb);
                 else
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index d1590486204a..00f03d82e69a 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -96,6 +96,12 @@ static inline void cond_local_irq_disable(struct pt_regs *regs)
                 local_irq_disable();
 }
 
+/*
+ * In IST context, we explicitly disable preemption.  This serves two
+ * purposes: it makes it much less likely that we would accidentally
+ * schedule in IST context and it will force a warning if we somehow
+ * manage to schedule by accident.
+ */
 void ist_enter(struct pt_regs *regs)
 {
         if (user_mode(regs)) {
@@ -110,13 +116,7 @@ void ist_enter(struct pt_regs *regs)
                 rcu_nmi_enter();
         }
 
-        /*
-         * We are atomic because we're on the IST stack; or we're on
-         * x86_32, in which case we still shouldn't schedule; or we're
-         * on x86_64 and entered from user mode, in which case we're
-         * still atomic unless ist_begin_non_atomic is called.
-         */
-        preempt_count_add(HARDIRQ_OFFSET);
+        preempt_disable();
 
         /* This code is a bit fragile.  Test it. */
         RCU_LOCKDEP_WARN(!rcu_is_watching(), "ist_enter didn't work");
@@ -124,7 +124,7 @@ void ist_enter(struct pt_regs *regs)
 
 void ist_exit(struct pt_regs *regs)
 {
-        preempt_count_sub(HARDIRQ_OFFSET);
+        preempt_enable_no_resched();
 
         if (!user_mode(regs))
                 rcu_nmi_exit();
@@ -155,7 +155,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
         BUG_ON((unsigned long)(current_top_of_stack() -
                                current_stack_pointer()) >= THREAD_SIZE);
 
-        preempt_count_sub(HARDIRQ_OFFSET);
+        preempt_enable_no_resched();
 }
 
 /**
@@ -165,7 +165,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
  */
 void ist_end_non_atomic(void)
 {
-        preempt_count_add(HARDIRQ_OFFSET);
+        preempt_disable();
 }
 
 static nokprobe_inline int
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 769af907f824..7597b42a8a88 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -181,19 +181,22 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
                              struct kvm_cpuid_entry __user *entries)
 {
         int r, i;
-        struct kvm_cpuid_entry *cpuid_entries;
+        struct kvm_cpuid_entry *cpuid_entries = NULL;
 
         r = -E2BIG;
         if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
                 goto out;
         r = -ENOMEM;
-        cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry) * cpuid->nent);
-        if (!cpuid_entries)
-                goto out;
-        r = -EFAULT;
-        if (copy_from_user(cpuid_entries, entries,
-                           cpuid->nent * sizeof(struct kvm_cpuid_entry)))
-                goto out_free;
+        if (cpuid->nent) {
+                cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry) *
+                                        cpuid->nent);
+                if (!cpuid_entries)
+                        goto out;
+                r = -EFAULT;
+                if (copy_from_user(cpuid_entries, entries,
+                                   cpuid->nent * sizeof(struct kvm_cpuid_entry)))
+                        goto out;
+        }
         for (i = 0; i < cpuid->nent; i++) {
                 vcpu->arch.cpuid_entries[i].function = cpuid_entries[i].function;
                 vcpu->arch.cpuid_entries[i].eax = cpuid_entries[i].eax;
@@ -212,9 +215,8 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
         kvm_x86_ops->cpuid_update(vcpu);
         r = kvm_update_cpuid(vcpu);
 
-out_free:
-        vfree(cpuid_entries);
 out:
+        vfree(cpuid_entries);
         return r;
 }
 
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 24e800116ab4..def97b3a392b 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -336,12 +336,12 @@ static gfn_t pse36_gfn_delta(u32 gpte)
 #ifdef CONFIG_X86_64
 static void __set_spte(u64 *sptep, u64 spte)
 {
-        *sptep = spte;
+        WRITE_ONCE(*sptep, spte);
 }
 
 static void __update_clear_spte_fast(u64 *sptep, u64 spte)
 {
-        *sptep = spte;
+        WRITE_ONCE(*sptep, spte);
 }
 
 static u64 __update_clear_spte_slow(u64 *sptep, u64 spte)
@@ -390,7 +390,7 @@ static void __set_spte(u64 *sptep, u64 spte)
          */
         smp_wmb();
 
-        ssptep->spte_low = sspte.spte_low;
+        WRITE_ONCE(ssptep->spte_low, sspte.spte_low);
 }
 
 static void __update_clear_spte_fast(u64 *sptep, u64 spte)
@@ -400,7 +400,7 @@ static void __update_clear_spte_fast(u64 *sptep, u64 spte)
         ssptep = (union split_spte *)sptep;
         sspte = (union split_spte)spte;
 
-        ssptep->spte_low = sspte.spte_low;
+        WRITE_ONCE(ssptep->spte_low, sspte.spte_low);
 
         /*
          * If we map the spte from present to nonpresent, we should clear
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 1163e8173e5a..16ef31b87452 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -238,7 +238,9 @@ module_param(nested, int, S_IRUGO);
 
 /* enable / disable AVIC */
 static int avic;
+#ifdef CONFIG_X86_LOCAL_APIC
 module_param(avic, int, S_IRUGO);
+#endif
 
 static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0);
 static void svm_flush_tlb(struct kvm_vcpu *vcpu);
@@ -981,11 +983,14 @@ static __init int svm_hardware_setup(void)
         } else
                 kvm_disable_tdp();
 
-        if (avic && (!npt_enabled || !boot_cpu_has(X86_FEATURE_AVIC)))
-                avic = false;
-
-        if (avic)
-                pr_info("AVIC enabled\n");
+        if (avic) {
+                if (!npt_enabled ||
+                    !boot_cpu_has(X86_FEATURE_AVIC) ||
+                    !IS_ENABLED(CONFIG_X86_LOCAL_APIC))
+                        avic = false;
+                else
+                        pr_info("AVIC enabled\n");
+        }
 
         return 0;
 
@@ -1324,7 +1329,7 @@ free_avic:
 static void avic_set_running(struct kvm_vcpu *vcpu, bool is_run)
 {
         u64 entry;
-        int h_physical_id = __default_cpu_present_to_apicid(vcpu->cpu);
+        int h_physical_id = kvm_cpu_get_apicid(vcpu->cpu);
         struct vcpu_svm *svm = to_svm(vcpu);
 
         if (!kvm_vcpu_apicv_active(vcpu))
@@ -1349,7 +1354,7 @@ static void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
         u64 entry;
         /* ID = 0xff (broadcast), ID > 0xff (reserved) */
-        int h_physical_id = __default_cpu_present_to_apicid(cpu);
+        int h_physical_id = kvm_cpu_get_apicid(cpu);
         struct vcpu_svm *svm = to_svm(vcpu);
 
         if (!kvm_vcpu_apicv_active(vcpu))
@@ -4236,7 +4241,7 @@ static void svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec)
 
         if (avic_vcpu_is_running(vcpu))
                 wrmsrl(SVM_AVIC_DOORBELL,
-                       __default_cpu_present_to_apicid(vcpu->cpu));
+                       kvm_cpu_get_apicid(vcpu->cpu));
         else
                 kvm_vcpu_wake_up(vcpu);
 }
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index fb93010beaa4..003618e324ce 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2072,7 +2072,8 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu)
         unsigned int dest;
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return;
 
         do {
@@ -2180,7 +2181,8 @@ static void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu)
         struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return;
 
         /* Set SN when the vCPU is preempted */
@@ -10714,7 +10716,8 @@ static int vmx_pre_block(struct kvm_vcpu *vcpu)
         struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return 0;
 
         vcpu->pre_pcpu = vcpu->cpu;
@@ -10780,7 +10783,8 @@ static void vmx_post_block(struct kvm_vcpu *vcpu)
         unsigned long flags;
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return;
 
         do {
@@ -10833,7 +10837,8 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq,
         int idx, ret = -EINVAL;
 
         if (!kvm_arch_has_assigned_device(kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP) ||
+                !kvm_vcpu_apicv_active(kvm->vcpus[0]))
                 return 0;
 
         idx = srcu_read_lock(&kvm->irq_srcu);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c805cf494154..902d9da12392 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2314,6 +2314,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
         case MSR_AMD64_NB_CFG:
         case MSR_FAM10H_MMIO_CONF_BASE:
         case MSR_AMD64_BU_CFG2:
+        case MSR_IA32_PERF_CTL:
                 msr_info->data = 0;
                 break;
         case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL3:
@@ -2972,6 +2973,10 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
                               | KVM_VCPUEVENT_VALID_SMM))
                 return -EINVAL;
 
+        if (events->exception.injected &&
+            (events->exception.nr > 31 || events->exception.nr == NMI_VECTOR))
+                return -EINVAL;
+
         process_nmi(vcpu);
         vcpu->arch.exception.pending = events->exception.injected;
         vcpu->arch.exception.nr = events->exception.nr;
@@ -3036,6 +3041,11 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
         if (dbgregs->flags)
                 return -EINVAL;
 
+        if (dbgregs->dr6 & ~0xffffffffull)
+                return -EINVAL;
+        if (dbgregs->dr7 & ~0xffffffffull)
+                return -EINVAL;
+
         memcpy(vcpu->arch.db, dbgregs->db, sizeof(vcpu->arch.db));
         kvm_update_dr0123(vcpu);
         vcpu->arch.dr6 = dbgregs->dr6;
@@ -7815,7 +7825,7 @@ int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size)
 
         slot = id_to_memslot(slots, id);
         if (size) {
-                if (WARN_ON(slot->npages))
+                if (slot->npages)
                         return -EEXIST;
 
                 /*
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 4eb287e25043..aa0ff4b02a96 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -6,7 +6,7 @@
 #include <asm/fixmap.h>
 #include <asm/mtrr.h>
 
-#define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO
+#define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO
 
 #ifdef CONFIG_HIGHPTE
 #define PGALLOC_USER_GFP __GFP_HIGHMEM
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 6e7242be1c87..b226b3f497f1 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -139,7 +139,7 @@ int __init efi_alloc_page_tables(void)
         if (efi_enabled(EFI_OLD_MEMMAP))
                 return 0;
 
-        gfp_mask = GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO;
+        gfp_mask = GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO;
         efi_pgd = (pgd_t *)__get_free_page(gfp_mask);
         if (!efi_pgd)
                 return -ENOMEM;
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 478a2de543a5..67433714b791 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1113,7 +1113,7 @@ static void __init xen_cleanhighmap(unsigned long vaddr,
 
         /* NOTE: The loop is more greedy than the cleanup_highmap variant.
          * We include the PMD passed in on _both_ boundaries. */
-        for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PAGE_SIZE));
+        for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PTRS_PER_PMD));
                         pmd++, vaddr += PMD_SIZE) {
                 if (pmd_none(*pmd))
                         continue;
@@ -1551,41 +1551,6 @@ static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd)
 #endif
 }
 
-#ifdef CONFIG_X86_32
-static pte_t __init mask_rw_pte(pte_t *ptep, pte_t pte)
-{
-        /* If there's an existing pte, then don't allow _PAGE_RW to be set */
-        if (pte_val_ma(*ptep) & _PAGE_PRESENT)
-                pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
-                               pte_val_ma(pte));
-
-        return pte;
-}
-#else /* CONFIG_X86_64 */
-static pte_t __init mask_rw_pte(pte_t *ptep, pte_t pte)
-{
-        unsigned long pfn;
-
-        if (xen_feature(XENFEAT_writable_page_tables) ||
-            xen_feature(XENFEAT_auto_translated_physmap) ||
-            xen_start_info->mfn_list >= __START_KERNEL_map)
-                return pte;
-
-        /*
-         * Pages belonging to the initial p2m list mapped outside the default
-         * address range must be mapped read-only. This region contains the
-         * page tables for mapping the p2m list, too, and page tables MUST be
-         * mapped read-only.
-         */
-        pfn = pte_pfn(pte);
-        if (pfn >= xen_start_info->first_p2m_pfn &&
-            pfn < xen_start_info->first_p2m_pfn + xen_start_info->nr_p2m_frames)
-                pte = __pte_ma(pte_val_ma(pte) & ~_PAGE_RW);
-
-        return pte;
-}
-#endif /* CONFIG_X86_64 */
-
 /*
  * Init-time set_pte while constructing initial pagetables, which
  * doesn't allow RO page table pages to be remapped RW.
@@ -1600,13 +1565,37 @@ static pte_t __init mask_rw_pte(pte_t *ptep, pte_t pte)
  * so always write the PTE directly and rely on Xen trapping and
  * emulating any updates as necessary.
  */
-static void __init xen_set_pte_init(pte_t *ptep, pte_t pte)
+__visible pte_t xen_make_pte_init(pteval_t pte)
 {
-        if (pte_mfn(pte) != INVALID_P2M_ENTRY)
-                pte = mask_rw_pte(ptep, pte);
-        else
-                pte = __pte_ma(0);
+#ifdef CONFIG_X86_64
+        unsigned long pfn;
+
+        /*
+         * Pages belonging to the initial p2m list mapped outside the default
+         * address range must be mapped read-only. This region contains the
+         * page tables for mapping the p2m list, too, and page tables MUST be
+         * mapped read-only.
+         */
+        pfn = (pte & PTE_PFN_MASK) >> PAGE_SHIFT;
+        if (xen_start_info->mfn_list < __START_KERNEL_map &&
+            pfn >= xen_start_info->first_p2m_pfn &&
+            pfn < xen_start_info->first_p2m_pfn + xen_start_info->nr_p2m_frames)
+                pte &= ~_PAGE_RW;
+#endif
+        pte = pte_pfn_to_mfn(pte);
+        return native_make_pte(pte);
+}
+PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte_init);
 
+static void __init xen_set_pte_init(pte_t *ptep, pte_t pte)
+{
+#ifdef CONFIG_X86_32
+        /* If there's an existing pte, then don't allow _PAGE_RW to be set */
+        if (pte_mfn(pte) != INVALID_P2M_ENTRY
+            && pte_val_ma(*ptep) & _PAGE_PRESENT)
+                pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
+                               pte_val_ma(pte));
+#endif
         native_set_pte(ptep, pte);
 }
 
@@ -2407,6 +2396,7 @@ static void __init xen_post_allocator_init(void)
         pv_mmu_ops.alloc_pud = xen_alloc_pud;
         pv_mmu_ops.release_pud = xen_release_pud;
 #endif
+        pv_mmu_ops.make_pte = PV_CALLEE_SAVE(xen_make_pte);
 
 #ifdef CONFIG_X86_64
         pv_mmu_ops.write_cr3 = &xen_write_cr3;
@@ -2455,7 +2445,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
         .pte_val = PV_CALLEE_SAVE(xen_pte_val),
         .pgd_val = PV_CALLEE_SAVE(xen_pgd_val),
 
-        .make_pte = PV_CALLEE_SAVE(xen_make_pte),
+        .make_pte = PV_CALLEE_SAVE(xen_make_pte_init),
         .make_pgd = PV_CALLEE_SAVE(xen_make_pgd),
 
 #ifdef CONFIG_X86_PAE
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index cab9f766bb06..dd2a49a8aacc 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -182,7 +182,7 @@ static void * __ref alloc_p2m_page(void)
         if (unlikely(!slab_is_available()))
                 return alloc_bootmem_align(PAGE_SIZE, PAGE_SIZE);
 
-        return (void *)__get_free_page(GFP_KERNEL | __GFP_REPEAT);
+        return (void *)__get_free_page(GFP_KERNEL);
 }
 
 static void __ref free_p2m_page(void *p)
diff --git a/arch/xtensa/include/asm/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h
index d38eb9237e64..1065bc8bcae5 100644
--- a/arch/xtensa/include/asm/pgalloc.h
+++ b/arch/xtensa/include/asm/pgalloc.h
@@ -44,7 +44,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
         pte_t *ptep;
         int i;
 
-        ptep = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+        ptep = (pte_t *)__get_free_page(GFP_KERNEL);
         if (!ptep)
                 return NULL;
         for (i = 0; i < 1024; i++)
diff --git a/block/blk-lib.c b/block/blk-lib.c
index 23d7f301a196..9e29dc351695 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -113,6 +113,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                 ret = submit_bio_wait(type, bio);
                 if (ret == -EOPNOTSUPP)
                         ret = 0;
+                bio_put(bio);
         }
         blk_finish_plug(&plug);
 
@@ -165,8 +166,10 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,
                 }
         }
 
-        if (bio)
+        if (bio) {
                 ret = submit_bio_wait(REQ_WRITE | REQ_WRITE_SAME, bio);
+                bio_put(bio);
+        }
         return ret != -EOPNOTSUPP ? ret : 0;
 }
 EXPORT_SYMBOL(blkdev_issue_write_same);
@@ -206,8 +209,11 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
                 }
         }
 
-        if (bio)
-                return submit_bio_wait(WRITE, bio);
+        if (bio) {
+                ret = submit_bio_wait(WRITE, bio);
+                bio_put(bio);
+                return ret;
+        }
         return 0;
 }
 
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 29cbc1b5fbdb..f9b9049b1284 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1262,12 +1262,9 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
 
         blk_queue_split(q, &bio, q->bio_split);
 
-        if (!is_flush_fua && !blk_queue_nomerges(q)) {
-                if (blk_attempt_plug_merge(q, bio, &request_count,
-                                           &same_queue_rq))
-                        return BLK_QC_T_NONE;
-        } else
-                request_count = blk_plug_queued_count(q);
+        if (!is_flush_fua && !blk_queue_nomerges(q) &&
+            blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq))
+                return BLK_QC_T_NONE;
 
         rq = blk_mq_map_request(q, bio, &data);
         if (unlikely(!rq))
@@ -1358,9 +1355,11 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)
 
         blk_queue_split(q, &bio, q->bio_split);
 
-        if (!is_flush_fua && !blk_queue_nomerges(q) &&
-            blk_attempt_plug_merge(q, bio, &request_count, NULL))
-                return BLK_QC_T_NONE;
+        if (!is_flush_fua && !blk_queue_nomerges(q)) {
+                if (blk_attempt_plug_merge(q, bio, &request_count, NULL))
+                        return BLK_QC_T_NONE;
+        } else
+                request_count = blk_plug_queued_count(q);
 
         rq = blk_mq_map_request(q, bio, &data);
         if (unlikely(!rq))
diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
index e28e912000a7..331f6baf2df8 100644
--- a/crypto/asymmetric_keys/Kconfig
+++ b/crypto/asymmetric_keys/Kconfig
@@ -13,6 +13,7 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE
         tristate "Asymmetric public-key crypto algorithm subtype"
         select MPILIB
         select CRYPTO_HASH_INFO
+        select CRYPTO_AKCIPHER
         help
           This option provides support for asymmetric public key type handling.
           If signature generation and/or verification are to be used,
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 0d92d0f915e9..c7ba948d253c 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -331,15 +331,6 @@ static int acpi_processor_get_info(struct acpi_device *device)
                 pr->throttling.duty_width = acpi_gbl_FADT.duty_width;
 
                 pr->pblk = object.processor.pblk_address;
-
-                /*
-                 * We don't care about error returns - we just try to mark
-                 * these reserved so that nobody else is confused into thinking
-                 * that this region might be unused..
-                 *
-                 * (In particular, allocating the IO range for Cardbus)
-                 */
-                request_region(pr->throttling.address, 6, "ACPI CPU throttle");
         }
 
         /*
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 3d5b8a099351..c1d138e128cb 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -754,7 +754,8 @@ static int acpi_video_bqc_quirk(struct acpi_video_device *device,
 }
 
 int acpi_video_get_levels(struct acpi_device *device,
-                          struct acpi_video_device_brightness **dev_br)
+                          struct acpi_video_device_brightness **dev_br,
+                          int *pmax_level)
 {
         union acpi_object *obj = NULL;
         int i, max_level = 0, count = 0, level_ac_battery = 0;
@@ -841,6 +842,8 @@ int acpi_video_get_levels(struct acpi_device *device,
 
         br->count = count;
         *dev_br = br;
+        if (pmax_level)
+                *pmax_level = max_level;
 
 out:
         kfree(obj);
@@ -869,7 +872,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)
         struct acpi_video_device_brightness *br = NULL;
         int result = -EINVAL;
 
-        result = acpi_video_get_levels(device->dev, &br);
+        result = acpi_video_get_levels(device->dev, &br, &max_level);
         if (result)
                 return result;
         device->brightness = br;
@@ -1737,7 +1740,7 @@ static void acpi_video_run_bcl_for_osi(struct acpi_video_bus *video)
 
         mutex_lock(&video->device_list_lock);
         list_for_each_entry(dev, &video->video_device_list, entry) {
-                if (!acpi_video_device_lcd_query_levels(dev, &levels))
+                if (!acpi_video_device_lcd_query_levels(dev->dev->handle, &levels))
                         kfree(levels);
         }
         mutex_unlock(&video->device_list_lock);
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index a1d177d58254..21932d640a41 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -108,7 +108,9 @@ acpi_ex_add_table(u32 table_index,
 
         /* Add the table to the namespace */
 
+        acpi_ex_exit_interpreter();
         status = acpi_ns_load_table(table_index, parent_node);
+        acpi_ex_enter_interpreter();
         if (ACPI_FAILURE(status)) {
                 acpi_ut_remove_reference(obj_desc);
                 *ddb_handle = NULL;
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 0f18dbc9a37f..3b7fb99362b6 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -83,27 +83,22 @@ acpi_hw_write_multiple(u32 value,
 static u8
 acpi_hw_get_access_bit_width(struct acpi_generic_address *reg, u8 max_bit_width)
 {
-        u64 address;
-
         if (!reg->access_width) {
+                if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
+                        max_bit_width = 32;
+                }
+
                 /*
                  * Detect old register descriptors where only the bit_width field
-                 * makes senses. The target address is copied to handle possible
-                 * alignment issues.
+                 * makes senses.
                  */
-                ACPI_MOVE_64_TO_64(&address, &reg->address);
-                if (!reg->bit_offset && reg->bit_width &&
+                if (reg->bit_width < max_bit_width &&
+                    !reg->bit_offset && reg->bit_width &&
                     ACPI_IS_POWER_OF_TWO(reg->bit_width) &&
-                    ACPI_IS_ALIGNED(reg->bit_width, 8) &&
-                    ACPI_IS_ALIGNED(address, reg->bit_width)) {
+                    ACPI_IS_ALIGNED(reg->bit_width, 8)) {
                         return (reg->bit_width);
-                } else {
-                        if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
-                                return (32);
-                        } else {
-                                return (max_bit_width);
-                        }
                 }
+                return (max_bit_width);
         } else {
                 return (1 << (reg->access_width + 2));
         }
@@ -311,12 +306,6 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
 acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
 {
         u64 address;
-        u8 access_width;
-        u32 bit_width;
-        u8 bit_offset;
-        u64 value64;
-        u32 new_value32, old_value32;
-        u8 index;
         acpi_status status;
 
         ACPI_FUNCTION_NAME(hw_write);
@@ -328,145 +317,23 @@ acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
                 return (status);
         }
 
-        /* Convert access_width into number of bits based */
-
-        access_width = acpi_hw_get_access_bit_width(reg, 32);
-        bit_width = reg->bit_offset + reg->bit_width;
-        bit_offset = reg->bit_offset;
-
         /*
          * Two address spaces supported: Memory or IO. PCI_Config is
          * not supported here because the GAS structure is insufficient
          */
-        index = 0;
-        while (bit_width) {
-                /*
-                 * Use offset style bit reads because "Index * AccessWidth" is
-                 * ensured to be less than 32-bits by acpi_hw_validate_register().
-                 */
-                new_value32 = ACPI_GET_BITS(&value, index * access_width,
-                                            ACPI_MASK_BITS_ABOVE_32
-                                            (access_width));
-
-                if (bit_offset >= access_width) {
-                        bit_offset -= access_width;
-                } else {
-                        /*
-                         * Use offset style bit masks because access_width is ensured
-                         * to be less than 32-bits by acpi_hw_validate_register() and
-                         * bit_offset/bit_width is less than access_width here.
-                         */
-                        if (bit_offset) {
-                                new_value32 &= ACPI_MASK_BITS_BELOW(bit_offset);
-                        }
-                        if (bit_width < access_width) {
-                                new_value32 &= ACPI_MASK_BITS_ABOVE(bit_width);
-                        }
-
-                        if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
-                                if (bit_offset || bit_width < access_width) {
-                                        /*
-                                         * Read old values in order not to modify the bits that
-                                         * are beyond the register bit_width/bit_offset setting.
-                                         */
-                                        status =
-                                            acpi_os_read_memory((acpi_physical_address)
-                                                                address +
-                                                                index *
-                                                                ACPI_DIV_8
-                                                                (access_width),
-                                                                &value64,
-                                                                access_width);
-                                        old_value32 = (u32)value64;
-
-                                        /*
-                                         * Use offset style bit masks because access_width is
-                                         * ensured to be less than 32-bits by
-                                         * acpi_hw_validate_register() and bit_offset/bit_width is
-                                         * less than access_width here.
-                                         */
-                                        if (bit_offset) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_ABOVE
-                                                    (bit_offset);
-                                                bit_offset = 0;
-                                        }
-                                        if (bit_width < access_width) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_BELOW
-                                                    (bit_width);
-                                        }
-
-                                        new_value32 |= old_value32;
-                                }
-
-                                value64 = (u64)new_value32;
-                                status =
-                                    acpi_os_write_memory((acpi_physical_address)
-                                                         address +
-                                                         index *
-                                                         ACPI_DIV_8
-                                                         (access_width),
-                                                         value64, access_width);
-                        } else {        /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
-
-                                if (bit_offset || bit_width < access_width) {
-                                        /*
-                                         * Read old values in order not to modify the bits that
-                                         * are beyond the register bit_width/bit_offset setting.
-                                         */
-                                        status =
-                                            acpi_hw_read_port((acpi_io_address)
-                                                              address +
-                                                              index *
-                                                              ACPI_DIV_8
-                                                              (access_width),
-                                                              &old_value32,
-                                                              access_width);
-
-                                        /*
-                                         * Use offset style bit masks because access_width is
-                                         * ensured to be less than 32-bits by
-                                         * acpi_hw_validate_register() and bit_offset/bit_width is
-                                         * less than access_width here.
-                                         */
-                                        if (bit_offset) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_ABOVE
-                                                    (bit_offset);
-                                                bit_offset = 0;
-                                        }
-                                        if (bit_width < access_width) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_BELOW
-                                                    (bit_width);
-                                        }
-
-                                        new_value32 |= old_value32;
-                                }
-
-                                status = acpi_hw_write_port((acpi_io_address)
-                                                            address +
-                                                            index *
-                                                            ACPI_DIV_8
-                                                            (access_width),
-                                                            new_value32,
-                                                            access_width);
-                        }
-                }
-
-                /*
-                 * Index * access_width is ensured to be less than 32-bits by
-                 * acpi_hw_validate_register().
-                 */
-                bit_width -=
-                    bit_width > access_width ? access_width : bit_width;
-                index++;
+        if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+                status = acpi_os_write_memory((acpi_physical_address)
+                                              address, (u64)value,
+                                              reg->bit_width);
+        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+
+                status = acpi_hw_write_port((acpi_io_address)
+                                            address, value, reg->bit_width);
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_IO,
                           "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
-                          value, access_width, ACPI_FORMAT_UINT64(address),
+                          value, reg->bit_width, ACPI_FORMAT_UINT64(address),
                           acpi_ut_get_region_name(reg->space_id)));
 
         return (status);
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index f631a47724f0..1783cd7e1446 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -47,6 +47,7 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "actables.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsparse")
@@ -170,6 +171,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
 
         ACPI_FUNCTION_TRACE(ns_parse_table);
 
+        acpi_ex_enter_interpreter();
+
         /*
          * AML Parse, pass 1
          *
@@ -185,7 +188,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
                                             table_index, start_node);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                goto error_exit;
         }
 
         /*
@@ -201,8 +204,10 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
                                             table_index, start_node);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                goto error_exit;
         }
 
+error_exit:
+        acpi_ex_exit_interpreter();
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 31e8da648fff..262ca31b86d9 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1051,7 +1051,7 @@ static int __init acpi_bus_init(void)
          * Maybe EC region is required at bus_scan/acpi_get_devices. So it
          * is necessary to enable it as early as possible.
          */
-        acpi_boot_ec_enable();
+        acpi_ec_dsdt_probe();
 
         printk(KERN_INFO PREFIX "Interpreter enabled\n");
 
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 0e70181f150c..73c76d646064 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1446,10 +1446,30 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
         return AE_OK;
 }
 
-int __init acpi_boot_ec_enable(void)
+static const struct acpi_device_id ec_device_ids[] = {
+        {"PNP0C09", 0},
+        {"", 0},
+};
+
+int __init acpi_ec_dsdt_probe(void)
 {
-        if (!boot_ec)
+        acpi_status status;
+
+        if (boot_ec)
                 return 0;
+
+        /*
+         * Finding EC from DSDT if there is no ECDT EC available. When this
+         * function is invoked, ACPI tables have been fully loaded, we can
+         * walk namespace now.
+         */
+        boot_ec = make_acpi_ec();
+        if (!boot_ec)
+                return -ENOMEM;
+        status = acpi_get_devices(ec_device_ids[0].id,
+                                  ec_parse_device, boot_ec, NULL);
+        if (ACPI_FAILURE(status) || !boot_ec->handle)
+                return -ENODEV;
         if (!ec_install_handlers(boot_ec)) {
                 first_ec = boot_ec;
                 return 0;
@@ -1457,11 +1477,6 @@ int __init acpi_boot_ec_enable(void)
         return -EFAULT;
 }
 
-static const struct acpi_device_id ec_device_ids[] = {
-        {"PNP0C09", 0},
-        {"", 0},
-};
-
 #if 0
 /*
  * Some EC firmware variations refuses to respond QR_EC when SCI_EVT is not
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 9bb0773d39bf..27cc7feabfe4 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -181,7 +181,7 @@ typedef int (*acpi_ec_query_func) (void *data);
 
 int acpi_ec_init(void);
 int acpi_ec_ecdt_probe(void);
-int acpi_boot_ec_enable(void);
+int acpi_ec_dsdt_probe(void);
 void acpi_ec_block_transactions(void);
 void acpi_ec_unblock_transactions(void);
 void acpi_ec_unblock_transactions_early(void);
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index f170d746336d..c72e64893d03 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -676,6 +676,15 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
         if (!pr->flags.throttling)
                 return -ENODEV;
 
+        /*
+         * We don't care about error returns - we just try to mark
+         * these reserved so that nobody else is confused into thinking
+         * that this region might be unused..
+         *
+         * (In particular, allocating the IO range for Cardbus)
+         */
+        request_region(pr->throttling.address, 6, "ACPI CPU throttle");
+
         pr->throttling.state = 0;
 
         duty_mask = pr->throttling.state_count - 1;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 61dc7a99e89a..c6f017458958 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -606,7 +606,7 @@ void ata_scsi_error(struct Scsi_Host *host)
         ata_scsi_port_error_handler(host, ap);
 
         /* finish or retry handled scmd's and clean up */
-        WARN_ON(host->host_failed || !list_empty(&eh_work_q));
+        WARN_ON(!list_empty(&eh_work_q));
 
         DPRINTK("EXIT\n");
 }
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index a969a7e443be..85aaf2222587 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -181,13 +181,17 @@ static char *res_strings[] = {
         "reserved 27", 
         "reserved 28", 
         "reserved 29", 
-        "reserved 30", 
+        "reserved 30", /* FIXME: The strings between 30-40 might be wrong. */
         "reassembly abort: no buffers", 
         "receive buffer overflow", 
         "change in GFC", 
         "receive buffer full", 
         "low priority discard - no receive descriptor", 
         "low priority discard - missing end of packet", 
+        "reserved 37",
+        "reserved 38",
+        "reserved 39",
+        "reseverd 40",
         "reserved 41", 
         "reserved 42", 
         "reserved 43", 
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 7d00f2994738..809dd1e02091 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1128,7 +1128,7 @@ static int rx_pkt(struct atm_dev *dev)
         /* make the ptr point to the corresponding buffer desc entry */  
         buf_desc_ptr += desc;     
         if (!desc || (desc > iadev->num_rx_desc) || 
-                      ((buf_desc_ptr->vc_index & 0xffff) > iadev->num_vc)) { 
+                      ((buf_desc_ptr->vc_index & 0xffff) >= iadev->num_vc)) {
             free_desc(dev, desc);
             IF_ERR(printk("IA: bad descriptor desc = %d \n", desc);)
             return -1;
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 6b2a84e7f2be..2609ba20b396 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y                   += power/
 obj-$(CONFIG_HAS_DMA)   += dma-mapping.o
 obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
-obj-$(CONFIG_ISA)       += isa.o
+obj-$(CONFIG_ISA_BUS_API)       += isa.o
 obj-$(CONFIG_FW_LOADER) += firmware_class.o
 obj-$(CONFIG_NUMA)      += node.o
 obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index 91dba65d7264..cd6ccdcf9df0 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -180,4 +180,4 @@ static int __init isa_bus_init(void)
         return error;
 }
 
-device_initcall(isa_bus_init);
+postcore_initcall(isa_bus_init);
diff --git a/drivers/base/module.c b/drivers/base/module.c
index db930d3ee312..2a215780eda2 100644
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -24,10 +24,12 @@ static char *make_driver_name(struct device_driver *drv)
 
 static void module_create_drivers_dir(struct module_kobject *mk)
 {
-        if (!mk || mk->drivers_dir)
-                return;
+        static DEFINE_MUTEX(drivers_dir_mutex);
 
-        mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+        mutex_lock(&drivers_dir_mutex);
+        if (mk && !mk->drivers_dir)
+                mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+        mutex_unlock(&drivers_dir_mutex);
 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)
diff --git a/drivers/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c
index 83d6e7ba1a34..8c3434bdb26d 100644
--- a/drivers/base/power/opp/cpu.c
+++ b/drivers/base/power/opp/cpu.c
@@ -211,7 +211,7 @@ int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev,
                 }
 
                 /* Mark opp-table as multiple CPUs are sharing it now */
-                opp_table->shared_opp = true;
+                opp_table->shared_opp = OPP_TABLE_ACCESS_SHARED;
         }
 unlock:
         mutex_unlock(&opp_table_lock);
@@ -227,7 +227,8 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_sharing_cpus);
  *
  * This updates the @cpumask with CPUs that are sharing OPPs with @cpu_dev.
  *
- * Returns -ENODEV if OPP table isn't already present.
+ * Returns -ENODEV if OPP table isn't already present and -EINVAL if the OPP
+ * table's status is access-unknown.
  *
  * Locking: The internal opp_table and opp structures are RCU protected.
  * Hence this function internally uses RCU updater strategy with mutex locks
@@ -249,9 +250,14 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)
                 goto unlock;
         }
 
+        if (opp_table->shared_opp == OPP_TABLE_ACCESS_UNKNOWN) {
+                ret = -EINVAL;
+                goto unlock;
+        }
+
         cpumask_clear(cpumask);
 
-        if (opp_table->shared_opp) {
+        if (opp_table->shared_opp == OPP_TABLE_ACCESS_SHARED) {
                 list_for_each_entry(opp_dev, &opp_table->dev_list, node)
                         cpumask_set_cpu(opp_dev->dev->id, cpumask);
         } else {
diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
index 94d2010558e3..1dfd3dd92624 100644
--- a/drivers/base/power/opp/of.c
+++ b/drivers/base/power/opp/of.c
@@ -34,7 +34,10 @@ static struct opp_table *_managed_opp(const struct device_node *np)
                          * But the OPPs will be considered as shared only if the
                          * OPP table contains a "opp-shared" property.
                          */
-                        return opp_table->shared_opp ? opp_table : NULL;
+                        if (opp_table->shared_opp == OPP_TABLE_ACCESS_SHARED)
+                                return opp_table;
+
+                        return NULL;
                 }
         }
 
@@ -353,7 +356,10 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np)
         }
 
         opp_table->np = opp_np;
-        opp_table->shared_opp = of_property_read_bool(opp_np, "opp-shared");
+        if (of_property_read_bool(opp_np, "opp-shared"))
+                opp_table->shared_opp = OPP_TABLE_ACCESS_SHARED;
+        else
+                opp_table->shared_opp = OPP_TABLE_ACCESS_EXCLUSIVE;
 
         mutex_unlock(&opp_table_lock);
 
diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
index 20f3be22e060..fabd5ca1a083 100644
--- a/drivers/base/power/opp/opp.h
+++ b/drivers/base/power/opp/opp.h
@@ -119,6 +119,12 @@ struct opp_device {
 #endif
 };
 
+enum opp_table_access {
+        OPP_TABLE_ACCESS_UNKNOWN = 0,
+        OPP_TABLE_ACCESS_EXCLUSIVE = 1,
+        OPP_TABLE_ACCESS_SHARED = 2,
+};
+
 /**
  * struct opp_table - Device opp structure
  * @node:       table node - contains the devices with OPPs that
@@ -166,7 +172,7 @@ struct opp_table {
         /* For backward compatibility with v1 bindings */
         unsigned int voltage_tolerance_v1;
 
-        bool shared_opp;
+        enum opp_table_access shared_opp;
         struct dev_pm_opp *suspend_opp;
 
         unsigned int *supported_hw;
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index d597e432e195..ab19adb07a12 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1750,7 +1750,7 @@ aoecmd_init(void)
         int ret;
 
         /* get_zeroed_page returns page with ref count 1 */
-        p = (void *) get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);
+        p = (void *) get_zeroed_page(GFP_KERNEL);
         if (!p)
                 return -ENOMEM;
         empty_page = virt_to_page(p);
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 31e73a7a40f2..6a48ed41963f 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -941,7 +941,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)
         debugfs_create_u64("size_bytes", 0444, dir, &nbd->bytesize);
         debugfs_create_u32("timeout", 0444, dir, &nbd->xmit_timeout);
         debugfs_create_u32("blocksize", 0444, dir, &nbd->blksize);
-        debugfs_create_file("flags", 0444, dir, &nbd, &nbd_dbg_flags_ops);
+        debugfs_create_file("flags", 0444, dir, nbd, &nbd_dbg_flags_ops);
 
         return 0;
 }
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index ca13df854639..2e6d1e9c3345 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -874,8 +874,12 @@ static int blkif_queue_rq(struct blk_mq_hw_ctx *hctx,
                           const struct blk_mq_queue_data *qd)
 {
         unsigned long flags;
-        struct blkfront_ring_info *rinfo = (struct blkfront_ring_info *)hctx->driver_data;
+        int qid = hctx->queue_num;
+        struct blkfront_info *info = hctx->queue->queuedata;
+        struct blkfront_ring_info *rinfo = NULL;
 
+        BUG_ON(info->nr_rings <= qid);
+        rinfo = &info->rinfo[qid];
         blk_mq_start_request(qd->rq);
         spin_lock_irqsave(&rinfo->ring_lock, flags);
         if (RING_FULL(&rinfo->ring))
@@ -901,20 +905,9 @@ out_busy:
         return BLK_MQ_RQ_QUEUE_BUSY;
 }
 
-static int blk_mq_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
-                            unsigned int index)
-{
-        struct blkfront_info *info = (struct blkfront_info *)data;
-
-        BUG_ON(info->nr_rings <= index);
-        hctx->driver_data = &info->rinfo[index];
-        return 0;
-}
-
 static struct blk_mq_ops blkfront_mq_ops = {
         .queue_rq = blkif_queue_rq,
         .map_queue = blk_mq_map_queue,
-        .init_hctx = blk_mq_init_hctx,
 };
 
 static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size,
@@ -950,6 +943,7 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size,
                 return PTR_ERR(rq);
         }
 
+        rq->queuedata = info;
         queue_flag_set_unlocked(QUEUE_FLAG_VIRT, rq);
 
         if (info->feature_discard) {
@@ -2149,6 +2143,8 @@ static int blkfront_resume(struct xenbus_device *dev)
                 return err;
 
         err = talk_to_blkback(dev, info);
+        if (!err)
+                blk_mq_update_nr_hw_queues(&info->tag_set, info->nr_rings);
 
         /*
          * We have to wait for the backend to switch to
@@ -2485,10 +2481,23 @@ static void blkback_changed(struct xenbus_device *dev,
                 break;
 
         case XenbusStateConnected:
-                if (dev->state != XenbusStateInitialised) {
+                /*
+                 * talk_to_blkback sets state to XenbusStateInitialised
+                 * and blkfront_connect sets it to XenbusStateConnected
+                 * (if connection went OK).
+                 *
+                 * If the backend (or toolstack) decides to poke at backend
+                 * state (and re-trigger the watch by setting the state repeatedly
+                 * to XenbusStateConnected (4)) we need to deal with this.
+                 * This is allowed as this is used to communicate to the guest
+                 * that the size of disk has changed!
+                 */
+                if ((dev->state != XenbusStateInitialised) &&
+                    (dev->state != XenbusStateConnected)) {
                         if (talk_to_blkback(dev, info))
                                 break;
                 }
+
                 blkfront_connect(info);
                 break;
 
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index aef87fdbd187..44311296ec02 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -840,6 +840,14 @@ static bool i830_check_flags(unsigned int flags)
         return false;
 }
 
+void intel_gtt_insert_page(dma_addr_t addr,
+                           unsigned int pg,
+                           unsigned int flags)
+{
+        intel_private.driver->write_entry(addr, pg, flags);
+}
+EXPORT_SYMBOL(intel_gtt_insert_page);
+
 void intel_gtt_insert_sg_entries(struct sg_table *st,
                                  unsigned int pg_start,
                                  unsigned int flags)
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 94fb407d8561..44b1bd6baa38 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -3820,6 +3820,7 @@ static void handle_new_recv_msgs(ipmi_smi_t intf)
         while (!list_empty(&intf->waiting_rcv_msgs)) {
                 smi_msg = list_entry(intf->waiting_rcv_msgs.next,
                                      struct ipmi_smi_msg, link);
+                list_del(&smi_msg->link);
                 if (!run_to_completion)
                         spin_unlock_irqrestore(&intf->waiting_rcv_msgs_lock,
                                                flags);
@@ -3829,11 +3830,14 @@ static void handle_new_recv_msgs(ipmi_smi_t intf)
                 if (rv > 0) {
                         /*
                          * To preserve message order, quit if we
-                         * can't handle a message.
+                         * can't handle a message.  Add the message
+                         * back at the head, this is safe because this
+                         * tasklet is the only thing that pulls the
+                         * messages.
                          */
+                        list_add(&smi_msg->link, &intf->waiting_rcv_msgs);
                         break;
                 } else {
-                        list_del(&smi_msg->link);
                         if (rv == 0)
                                 /* Message handled */
                                 ipmi_free_smi_msg(smi_msg);
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 53ddba26578c..98efbfcdb503 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -175,6 +175,7 @@ config COMMON_CLK_KEYSTONE
 config COMMON_CLK_NXP
         def_bool COMMON_CLK && (ARCH_LPC18XX || ARCH_LPC32XX)
         select REGMAP_MMIO if ARCH_LPC32XX
+        select MFD_SYSCON if ARCH_LPC18XX
         ---help---
           Support for clock providers on NXP platforms.
 
diff --git a/drivers/clk/microchip/clk-pic32mzda.c b/drivers/clk/microchip/clk-pic32mzda.c
index 020a29acc5b0..51f54380474b 100644
--- a/drivers/clk/microchip/clk-pic32mzda.c
+++ b/drivers/clk/microchip/clk-pic32mzda.c
@@ -180,15 +180,15 @@ static int pic32mzda_clk_probe(struct platform_device *pdev)
 
         /* register fixed rate clocks */
         clks[POSCCLK] = clk_register_fixed_rate(&pdev->dev, "posc_clk", NULL,
-                                                CLK_IS_ROOT, 24000000);
+                                                0, 24000000);
         clks[FRCCLK] =  clk_register_fixed_rate(&pdev->dev, "frc_clk", NULL,
-                                                CLK_IS_ROOT, 8000000);
+                                                0, 8000000);
         clks[BFRCCLK] = clk_register_fixed_rate(&pdev->dev, "bfrc_clk", NULL,
-                                                CLK_IS_ROOT, 8000000);
+                                                0, 8000000);
         clks[LPRCCLK] = clk_register_fixed_rate(&pdev->dev, "lprc_clk", NULL,
-                                                CLK_IS_ROOT, 32000);
+                                                0, 32000);
         clks[UPLLCLK] = clk_register_fixed_rate(&pdev->dev, "usbphy_clk", NULL,
-                                                CLK_IS_ROOT, 24000000);
+                                                0, 24000000);
         /* fixed rate (optional) clock */
         if (of_find_property(np, "microchip,pic32mzda-sosc", NULL)) {
                 pr_info("pic32-clk: dt requests SOSC.\n");
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 36bc11a106aa..9009295f5134 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1832,7 +1832,7 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier);
 unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,
                                         unsigned int target_freq)
 {
-        clamp_val(target_freq, policy->min, policy->max);
+        target_freq = clamp_val(target_freq, policy->min, policy->max);
 
         return cpufreq_driver->fast_switch(policy, target_freq);
 }
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 3a9c4325d6e2..fe9dc17ea873 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -372,26 +372,9 @@ static bool intel_pstate_get_ppc_enable_status(void)
         return acpi_ppc;
 }
 
-/*
- * The max target pstate ratio is a 8 bit value in both PLATFORM_INFO MSR and
- * in TURBO_RATIO_LIMIT MSR, which pstate driver stores in max_pstate and
- * max_turbo_pstate fields. The PERF_CTL MSR contains 16 bit value for P state
- * ratio, out of it only high 8 bits are used. For example 0x1700 is setting
- * target ratio 0x17. The _PSS control value stores in a format which can be
- * directly written to PERF_CTL MSR. But in intel_pstate driver this shift
- * occurs during write to PERF_CTL (E.g. for cores core_set_pstate()).
- * This function converts the _PSS control value to intel pstate driver format
- * for comparison and assignment.
- */
-static int convert_to_native_pstate_format(struct cpudata *cpu, int index)
-{
-        return cpu->acpi_perf_data.states[index].control >> 8;
-}
-
 static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
 {
         struct cpudata *cpu;
-        int turbo_pss_ctl;
         int ret;
         int i;
 
@@ -441,15 +424,14 @@ static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
          * max frequency, which will cause a reduced performance as
          * this driver uses real max turbo frequency as the max
          * frequency. So correct this frequency in _PSS table to
-         * correct max turbo frequency based on the turbo ratio.
+         * correct max turbo frequency based on the turbo state.
          * Also need to convert to MHz as _PSS freq is in MHz.
          */
-        turbo_pss_ctl = convert_to_native_pstate_format(cpu, 0);
-        if (turbo_pss_ctl > cpu->pstate.max_pstate)
+        if (!limits->turbo_disabled)
                 cpu->acpi_perf_data.states[0].core_frequency =
                                         policy->cpuinfo.max_freq / 1000;
         cpu->valid_pss_table = true;
-        pr_info("_PPC limits will be enforced\n");
+        pr_debug("_PPC limits will be enforced\n");
 
         return;
 
@@ -1460,6 +1442,9 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 
         intel_pstate_clear_update_util_hook(policy->cpu);
 
+        pr_debug("set_policy cpuinfo.max %u policy->max %u\n",
+                 policy->cpuinfo.max_freq, policy->max);
+
         cpu = all_cpu_data[0];
         if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate &&
             policy->max < policy->cpuinfo.max_freq &&
@@ -1495,13 +1480,13 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
                                    limits->max_sysfs_pct);
         limits->max_perf_pct = max(limits->min_policy_pct,
                                    limits->max_perf_pct);
-        limits->max_perf = round_up(limits->max_perf, FRAC_BITS);
 
         /* Make sure min_perf_pct <= max_perf_pct */
         limits->min_perf_pct = min(limits->max_perf_pct, limits->min_perf_pct);
 
         limits->min_perf = div_fp(limits->min_perf_pct, 100);
         limits->max_perf = div_fp(limits->max_perf_pct, 100);
+        limits->max_perf = round_up(limits->max_perf, FRAC_BITS);
 
  out:
         intel_pstate_set_update_util_hook(policy->cpu);
@@ -1558,8 +1543,11 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
 
         /* cpuinfo and default policy values */
         policy->cpuinfo.min_freq = cpu->pstate.min_pstate * cpu->pstate.scaling;
-        policy->cpuinfo.max_freq =
-                cpu->pstate.turbo_pstate * cpu->pstate.scaling;
+        update_turbo_state();
+        policy->cpuinfo.max_freq = limits->turbo_disabled ?
+                        cpu->pstate.max_pstate : cpu->pstate.turbo_pstate;
+        policy->cpuinfo.max_freq *= cpu->pstate.scaling;
+
         intel_pstate_init_acpi_perf_limits(policy);
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
         cpumask_set_cpu(policy->cpu, policy->cpus);
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 808a320e9d5d..a7ecb9a84c15 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -487,7 +487,7 @@ static int __init pcc_cpufreq_probe(void)
         doorbell.space_id = reg_resource->space_id;
         doorbell.bit_width = reg_resource->bit_width;
         doorbell.bit_offset = reg_resource->bit_offset;
-        doorbell.access_width = 64;
+        doorbell.access_width = 4;
         doorbell.address = reg_resource->address;
 
         pr_debug("probe: doorbell: space_id is %d, bit_width is %d, "
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
index 52c7395cb8d8..0d0d4529ee36 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
@@ -122,6 +122,7 @@ static int ccp_aes_xts_crypt(struct ablkcipher_request *req,
         struct ccp_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
         struct ccp_aes_req_ctx *rctx = ablkcipher_request_ctx(req);
         unsigned int unit;
+        u32 unit_size;
         int ret;
 
         if (!ctx->u.aes.key_len)
@@ -133,11 +134,17 @@ static int ccp_aes_xts_crypt(struct ablkcipher_request *req,
         if (!req->info)
                 return -EINVAL;
 
-        for (unit = 0; unit < ARRAY_SIZE(unit_size_map); unit++)
-                if (!(req->nbytes & (unit_size_map[unit].size - 1)))
-                        break;
+        unit_size = CCP_XTS_AES_UNIT_SIZE__LAST;
+        if (req->nbytes <= unit_size_map[0].size) {
+                for (unit = 0; unit < ARRAY_SIZE(unit_size_map); unit++) {
+                        if (!(req->nbytes & (unit_size_map[unit].size - 1))) {
+                                unit_size = unit_size_map[unit].value;
+                                break;
+                        }
+                }
+        }
 
-        if ((unit_size_map[unit].value == CCP_XTS_AES_UNIT_SIZE__LAST) ||
+        if ((unit_size == CCP_XTS_AES_UNIT_SIZE__LAST) ||
             (ctx->u.aes.key_len != AES_KEYSIZE_128)) {
                 /* Use the fallback to process the request for any
                  * unsupported unit sizes or key sizes
@@ -158,7 +165,7 @@ static int ccp_aes_xts_crypt(struct ablkcipher_request *req,
         rctx->cmd.engine = CCP_ENGINE_XTS_AES_128;
         rctx->cmd.u.xts.action = (encrypt) ? CCP_AES_ACTION_ENCRYPT
                                            : CCP_AES_ACTION_DECRYPT;
-        rctx->cmd.u.xts.unit_size = unit_size_map[unit].value;
+        rctx->cmd.u.xts.unit_size = unit_size;
         rctx->cmd.u.xts.key = &ctx->u.aes.key_sg;
         rctx->cmd.u.xts.key_len = ctx->u.aes.key_len;
         rctx->cmd.u.xts.iv = &rctx->iv_sg;
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 6eefaa2fe58f..63464e86f2b1 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1986,7 +1986,7 @@ err_algs:
                                         &dd->pdata->algs_info[i].algs_list[j]);
 err_pm:
         pm_runtime_disable(dev);
-        if (dd->polling_mode)
+        if (!dd->polling_mode)
                 dma_release_channel(dd->dma_lch);
 data_err:
         dev_err(dev, "initialization failed.\n");
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 1d6c803804d5..e92418facc92 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -268,8 +268,11 @@ int update_devfreq(struct devfreq *devfreq)
         devfreq_notify_transition(devfreq, &freqs, DEVFREQ_PRECHANGE);
 
         err = devfreq->profile->target(devfreq->dev.parent, &freq, flags);
-        if (err)
+        if (err) {
+                freqs.new = cur_freq;
+                devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
                 return err;
+        }
 
         freqs.new = freq;
         devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
@@ -552,6 +555,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
         devfreq->profile = profile;
         strncpy(devfreq->governor_name, governor_name, DEVFREQ_NAME_LEN);
         devfreq->previous_freq = profile->initial_freq;
+        devfreq->last_status.current_frequency = profile->initial_freq;
         devfreq->data = data;
         devfreq->nb.notifier_call = devfreq_notifier_call;
 
@@ -561,23 +565,22 @@ struct devfreq *devfreq_add_device(struct device *dev,
                 mutex_lock(&devfreq->lock);
         }
 
-        devfreq->trans_table =  devm_kzalloc(dev, sizeof(unsigned int) *
-                                                devfreq->profile->max_state *
-                                                devfreq->profile->max_state,
-                                                GFP_KERNEL);
-        devfreq->time_in_state = devm_kzalloc(dev, sizeof(unsigned long) *
-                                                devfreq->profile->max_state,
-                                                GFP_KERNEL);
-        devfreq->last_stat_updated = jiffies;
-
         dev_set_name(&devfreq->dev, "%s", dev_name(dev));
         err = device_register(&devfreq->dev);
         if (err) {
-                put_device(&devfreq->dev);
                 mutex_unlock(&devfreq->lock);
                 goto err_out;
         }
 
+        devfreq->trans_table =  devm_kzalloc(&devfreq->dev, sizeof(unsigned int) *
+                                                devfreq->profile->max_state *
+                                                devfreq->profile->max_state,
+                                                GFP_KERNEL);
+        devfreq->time_in_state = devm_kzalloc(&devfreq->dev, sizeof(unsigned long) *
+                                                devfreq->profile->max_state,
+                                                GFP_KERNEL);
+        devfreq->last_stat_updated = jiffies;
+
         srcu_init_notifier_head(&devfreq->transition_notifier_list);
 
         mutex_unlock(&devfreq->lock);
@@ -603,7 +606,6 @@ struct devfreq *devfreq_add_device(struct device *dev,
 err_init:
         list_del(&devfreq->node);
         device_unregister(&devfreq->dev);
-        kfree(devfreq);
 err_out:
         return ERR_PTR(err);
 }
@@ -621,7 +623,6 @@ int devfreq_remove_device(struct devfreq *devfreq)
                 return -EINVAL;
 
         device_unregister(&devfreq->dev);
-        put_device(&devfreq->dev);
 
         return 0;
 }
diff --git a/drivers/devfreq/event/exynos-nocp.c b/drivers/devfreq/event/exynos-nocp.c
index 6b6a5f310486..a5841403bde8 100644
--- a/drivers/devfreq/event/exynos-nocp.c
+++ b/drivers/devfreq/event/exynos-nocp.c
@@ -220,9 +220,6 @@ static int exynos_nocp_parse_dt(struct platform_device *pdev,
 
         /* Maps the memory mapped IO to control nocp register */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (IS_ERR(res))
-                return PTR_ERR(res);
-
         base = devm_ioremap_resource(dev, res);
         if (IS_ERR(base))
                 return PTR_ERR(base);
diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile
index 4a424eca75ed..f353db213a81 100644
--- a/drivers/dma-buf/Makefile
+++ b/drivers/dma-buf/Makefile
@@ -1,2 +1,2 @@
-obj-y := dma-buf.o fence.o reservation.o seqno-fence.o
+obj-y := dma-buf.o fence.o reservation.o seqno-fence.o fence-array.o
 obj-$(CONFIG_SYNC_FILE)         += sync_file.o
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 4a2c07ee6677..20ce0687b111 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -33,6 +33,7 @@
 #include <linux/seq_file.h>
 #include <linux/poll.h>
 #include <linux/reservation.h>
+#include <linux/mm.h>
 
 #include <uapi/linux/dma-buf.h>
 
@@ -90,7 +91,7 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma)
         dmabuf = file->private_data;
 
         /* check for overflowing the buffer's size */
-        if (vma->vm_pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) >
+        if (vma->vm_pgoff + vma_pages(vma) >
             dmabuf->size >> PAGE_SHIFT)
                 return -EINVAL;
 
@@ -723,11 +724,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
                 return -EINVAL;
 
         /* check for offset overflow */
-        if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) < pgoff)
+        if (pgoff + vma_pages(vma) < pgoff)
                 return -EOVERFLOW;
 
         /* check for overflowing the buffer's size */
-        if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) >
+        if (pgoff + vma_pages(vma) >
             dmabuf->size >> PAGE_SHIFT)
                 return -EINVAL;
 
@@ -823,7 +824,7 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
 EXPORT_SYMBOL_GPL(dma_buf_vunmap);
 
 #ifdef CONFIG_DEBUG_FS
-static int dma_buf_describe(struct seq_file *s)
+static int dma_buf_debug_show(struct seq_file *s, void *unused)
 {
         int ret;
         struct dma_buf *buf_obj;
@@ -878,17 +879,9 @@ static int dma_buf_describe(struct seq_file *s)
         return 0;
 }
 
-static int dma_buf_show(struct seq_file *s, void *unused)
-{
-        void (*func)(struct seq_file *) = s->private;
-
-        func(s);
-        return 0;
-}
-
 static int dma_buf_debug_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, dma_buf_show, inode->i_private);
+        return single_open(file, dma_buf_debug_show, NULL);
 }
 
 static const struct file_operations dma_buf_debug_fops = {
@@ -902,20 +895,23 @@ static struct dentry *dma_buf_debugfs_dir;
 
 static int dma_buf_init_debugfs(void)
 {
+        struct dentry *d;
         int err = 0;
 
-        dma_buf_debugfs_dir = debugfs_create_dir("dma_buf", NULL);
-
-        if (IS_ERR(dma_buf_debugfs_dir)) {
-                err = PTR_ERR(dma_buf_debugfs_dir);
-                dma_buf_debugfs_dir = NULL;
-                return err;
-        }
+        d = debugfs_create_dir("dma_buf", NULL);
+        if (IS_ERR(d))
+                return PTR_ERR(d);
 
-        err = dma_buf_debugfs_create_file("bufinfo", dma_buf_describe);
+        dma_buf_debugfs_dir = d;
 
-        if (err)
+        d = debugfs_create_file("bufinfo", S_IRUGO, dma_buf_debugfs_dir,
+                                NULL, &dma_buf_debug_fops);
+        if (IS_ERR(d)) {
                 pr_debug("dma_buf: debugfs: failed to create node bufinfo\n");
+                debugfs_remove_recursive(dma_buf_debugfs_dir);
+                dma_buf_debugfs_dir = NULL;
+                err = PTR_ERR(d);
+        }
 
         return err;
 }
@@ -925,17 +921,6 @@ static void dma_buf_uninit_debugfs(void)
         if (dma_buf_debugfs_dir)
                 debugfs_remove_recursive(dma_buf_debugfs_dir);
 }
-
-int dma_buf_debugfs_create_file(const char *name,
-                                int (*write)(struct seq_file *))
-{
-        struct dentry *d;
-
-        d = debugfs_create_file(name, S_IRUGO, dma_buf_debugfs_dir,
-                        write, &dma_buf_debug_fops);
-
-        return PTR_ERR_OR_ZERO(d);
-}
 #else
 static inline int dma_buf_init_debugfs(void)
 {
diff --git a/drivers/dma-buf/fence-array.c b/drivers/dma-buf/fence-array.c
new file mode 100644
index 000000000000..a8731c853da6
--- /dev/null
+++ b/drivers/dma-buf/fence-array.c
@@ -0,0 +1,144 @@
+/*
+ * fence-array: aggregate fences to be waited together
+ *
+ * Copyright (C) 2016 Collabora Ltd
+ * Copyright (C) 2016 Advanced Micro Devices, Inc.
+ * Authors:
+ *      Gustavo Padovan <gustavo@padovan.org>
+ *      Christian König <christian.koenig@amd.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <linux/export.h>
+#include <linux/slab.h>
+#include <linux/fence-array.h>
+
+static void fence_array_cb_func(struct fence *f, struct fence_cb *cb);
+
+static const char *fence_array_get_driver_name(struct fence *fence)
+{
+        return "fence_array";
+}
+
+static const char *fence_array_get_timeline_name(struct fence *fence)
+{
+        return "unbound";
+}
+
+static void fence_array_cb_func(struct fence *f, struct fence_cb *cb)
+{
+        struct fence_array_cb *array_cb =
+                container_of(cb, struct fence_array_cb, cb);
+        struct fence_array *array = array_cb->array;
+
+        if (atomic_dec_and_test(&array->num_pending))
+                fence_signal(&array->base);
+        fence_put(&array->base);
+}
+
+static bool fence_array_enable_signaling(struct fence *fence)
+{
+        struct fence_array *array = to_fence_array(fence);
+        struct fence_array_cb *cb = (void *)(&array[1]);
+        unsigned i;
+
+        for (i = 0; i < array->num_fences; ++i) {
+                cb[i].array = array;
+                /*
+                 * As we may report that the fence is signaled before all
+                 * callbacks are complete, we need to take an additional
+                 * reference count on the array so that we do not free it too
+                 * early. The core fence handling will only hold the reference
+                 * until we signal the array as complete (but that is now
+                 * insufficient).
+                 */
+                fence_get(&array->base);
+                if (fence_add_callback(array->fences[i], &cb[i].cb,
+                                       fence_array_cb_func)) {
+                        fence_put(&array->base);
+                        if (atomic_dec_and_test(&array->num_pending))
+                                return false;
+                }
+        }
+
+        return true;
+}
+
+static bool fence_array_signaled(struct fence *fence)
+{
+        struct fence_array *array = to_fence_array(fence);
+
+        return atomic_read(&array->num_pending) <= 0;
+}
+
+static void fence_array_release(struct fence *fence)
+{
+        struct fence_array *array = to_fence_array(fence);
+        unsigned i;
+
+        for (i = 0; i < array->num_fences; ++i)
+                fence_put(array->fences[i]);
+
+        kfree(array->fences);
+        fence_free(fence);
+}
+
+const struct fence_ops fence_array_ops = {
+        .get_driver_name = fence_array_get_driver_name,
+        .get_timeline_name = fence_array_get_timeline_name,
+        .enable_signaling = fence_array_enable_signaling,
+        .signaled = fence_array_signaled,
+        .wait = fence_default_wait,
+        .release = fence_array_release,
+};
+
+/**
+ * fence_array_create - Create a custom fence array
+ * @num_fences:         [in]    number of fences to add in the array
+ * @fences:             [in]    array containing the fences
+ * @context:            [in]    fence context to use
+ * @seqno:              [in]    sequence number to use
+ * @signal_on_any       [in]    signal on any fence in the array
+ *
+ * Allocate a fence_array object and initialize the base fence with fence_init().
+ * In case of error it returns NULL.
+ *
+ * The caller should allocte the fences array with num_fences size
+ * and fill it with the fences it wants to add to the object. Ownership of this
+ * array is take and fence_put() is used on each fence on release.
+ *
+ * If @signal_on_any is true the fence array signals if any fence in the array
+ * signals, otherwise it signals when all fences in the array signal.
+ */
+struct fence_array *fence_array_create(int num_fences, struct fence **fences,
+                                       u64 context, unsigned seqno,
+                                       bool signal_on_any)
+{
+        struct fence_array *array;
+        size_t size = sizeof(*array);
+
+        /* Allocate the callback structures behind the array. */
+        size += num_fences * sizeof(struct fence_array_cb);
+        array = kzalloc(size, GFP_KERNEL);
+        if (!array)
+                return NULL;
+
+        spin_lock_init(&array->lock);
+        fence_init(&array->base, &fence_array_ops, &array->lock,
+                   context, seqno);
+
+        array->num_fences = num_fences;
+        atomic_set(&array->num_pending, signal_on_any ? 1 : num_fences);
+        array->fences = fences;
+
+        return array;
+}
+EXPORT_SYMBOL(fence_array_create);
diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c
index 7b05dbe9b296..4d51f9e83fa8 100644
--- a/drivers/dma-buf/fence.c
+++ b/drivers/dma-buf/fence.c
@@ -35,7 +35,7 @@ EXPORT_TRACEPOINT_SYMBOL(fence_emit);
  * context or not. One device can have multiple separate contexts,
  * and they're used if some engine can run independently of another.
  */
-static atomic_t fence_context_counter = ATOMIC_INIT(0);
+static atomic64_t fence_context_counter = ATOMIC64_INIT(0);
 
 /**
  * fence_context_alloc - allocate an array of fence contexts
@@ -44,10 +44,10 @@ static atomic_t fence_context_counter = ATOMIC_INIT(0);
  * This function will return the first index of the number of fences allocated.
  * The fence context is used for setting fence->context to a unique number.
  */
-unsigned fence_context_alloc(unsigned num)
+u64 fence_context_alloc(unsigned num)
 {
         BUG_ON(!num);
-        return atomic_add_return(num, &fence_context_counter) - num;
+        return atomic64_add_return(num, &fence_context_counter) - num;
 }
 EXPORT_SYMBOL(fence_context_alloc);
 
@@ -513,7 +513,7 @@ EXPORT_SYMBOL(fence_wait_any_timeout);
  */
 void
 fence_init(struct fence *fence, const struct fence_ops *ops,
-             spinlock_t *lock, unsigned context, unsigned seqno)
+             spinlock_t *lock, u64 context, unsigned seqno)
 {
         BUG_ON(!lock);
         BUG_ON(!ops || !ops->wait || !ops->enable_signaling ||
diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
index c0bd5722c997..9566a62ad8e3 100644
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -35,6 +35,17 @@
 #include <linux/reservation.h>
 #include <linux/export.h>
 
+/**
+ * DOC: Reservation Object Overview
+ *
+ * The reservation object provides a mechanism to manage shared and
+ * exclusive fences associated with a buffer.  A reservation object
+ * can have attached one exclusive fence (normally associated with
+ * write operations) or N shared fences (read operations).  The RCU
+ * mechanism is used to protect read access to fences from locked
+ * write-side updates.
+ */
+
 DEFINE_WW_CLASS(reservation_ww_class);
 EXPORT_SYMBOL(reservation_ww_class);
 
@@ -43,9 +54,17 @@ EXPORT_SYMBOL(reservation_seqcount_class);
 
 const char reservation_seqcount_string[] = "reservation_seqcount";
 EXPORT_SYMBOL(reservation_seqcount_string);
-/*
- * Reserve space to add a shared fence to a reservation_object,
- * must be called with obj->lock held.
+
+/**
+ * reservation_object_reserve_shared - Reserve space to add a shared
+ * fence to a reservation_object.
+ * @obj: reservation object
+ *
+ * Should be called before reservation_object_add_shared_fence().  Must
+ * be called with obj->lock held.
+ *
+ * RETURNS
+ * Zero for success, or -errno
  */
 int reservation_object_reserve_shared(struct reservation_object *obj)
 {
@@ -180,7 +199,11 @@ done:
                 fence_put(old_fence);
 }
 
-/*
+/**
+ * reservation_object_add_shared_fence - Add a fence to a shared slot
+ * @obj: the reservation object
+ * @fence: the shared fence to add
+ *
  * Add a fence to a shared slot, obj->lock must be held, and
  * reservation_object_reserve_shared_fence has been called.
  */
@@ -200,6 +223,13 @@ void reservation_object_add_shared_fence(struct reservation_object *obj,
 }
 EXPORT_SYMBOL(reservation_object_add_shared_fence);
 
+/**
+ * reservation_object_add_excl_fence - Add an exclusive fence.
+ * @obj: the reservation object
+ * @fence: the shared fence to add
+ *
+ * Add a fence to the exclusive slot.  The obj->lock must be held.
+ */
 void reservation_object_add_excl_fence(struct reservation_object *obj,
                                        struct fence *fence)
 {
@@ -233,6 +263,18 @@ void reservation_object_add_excl_fence(struct reservation_object *obj,
 }
 EXPORT_SYMBOL(reservation_object_add_excl_fence);
 
+/**
+ * reservation_object_get_fences_rcu - Get an object's shared and exclusive
+ * fences without update side lock held
+ * @obj: the reservation object
+ * @pfence_excl: the returned exclusive fence (or NULL)
+ * @pshared_count: the number of shared fences returned
+ * @pshared: the array of shared fence ptrs returned (array is krealloc'd to
+ * the required size, and must be freed by caller)
+ *
+ * RETURNS
+ * Zero or -errno
+ */
 int reservation_object_get_fences_rcu(struct reservation_object *obj,
                                       struct fence **pfence_excl,
                                       unsigned *pshared_count,
@@ -319,6 +361,18 @@ unlock:
 }
 EXPORT_SYMBOL_GPL(reservation_object_get_fences_rcu);
 
+/**
+ * reservation_object_wait_timeout_rcu - Wait on reservation's objects
+ * shared and/or exclusive fences.
+ * @obj: the reservation object
+ * @wait_all: if true, wait on all fences, else wait on just exclusive fence
+ * @intr: if true, do interruptible wait
+ * @timeout: timeout value in jiffies or zero to return immediately
+ *
+ * RETURNS
+ * Returns -ERESTARTSYS if interrupted, 0 if the wait timed out, or
+ * greater than zer on success.
+ */
 long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
                                          bool wait_all, bool intr,
                                          unsigned long timeout)
@@ -416,6 +470,16 @@ reservation_object_test_signaled_single(struct fence *passed_fence)
         return ret;
 }
 
+/**
+ * reservation_object_test_signaled_rcu - Test if a reservation object's
+ * fences have been signaled.
+ * @obj: the reservation object
+ * @test_all: if true, test all fences, otherwise only test the exclusive
+ * fence
+ *
+ * RETURNS
+ * true if all fences signaled, else false
+ */
 bool reservation_object_test_signaled_rcu(struct reservation_object *obj,
                                           bool test_all)
 {
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index f08cf2d8309e..9aaa608dfe01 100644
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -82,7 +82,7 @@ struct sync_file *sync_file_create(struct fence *fence)
 
         sync_file->num_fences = 1;
         atomic_set(&sync_file->status, 1);
-        snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%d-%d",
+        snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%llu-%d",
                  fence->ops->get_driver_name(fence),
                  fence->ops->get_timeline_name(fence), fence->context,
                  fence->seqno);
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 8e304b1befc5..75bd6621dc5d 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -242,7 +242,7 @@ struct at_xdmac_lld {
         u32             mbr_dus;        /* Destination Microblock Stride Register */
 };
 
-
+/* 64-bit alignment needed to update CNDA and CUBC registers in an atomic way. */
 struct at_xdmac_desc {
         struct at_xdmac_lld             lld;
         enum dma_transfer_direction     direction;
@@ -253,7 +253,7 @@ struct at_xdmac_desc {
         unsigned int                    xfer_size;
         struct list_head                descs_list;
         struct list_head                xfer_node;
-};
+} __aligned(sizeof(u64));
 
 static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, unsigned int chan_nb)
 {
@@ -1400,6 +1400,7 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         u32                     cur_nda, check_nda, cur_ubc, mask, value;
         u8                      dwidth = 0;
         unsigned long           flags;
+        bool                    initd;
 
         ret = dma_cookie_status(chan, cookie, txstate);
         if (ret == DMA_COMPLETE)
@@ -1424,7 +1425,16 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         residue = desc->xfer_size;
         /*
          * Flush FIFO: only relevant when the transfer is source peripheral
-         * synchronized.
+         * synchronized. Flush is needed before reading CUBC because data in
+         * the FIFO are not reported by CUBC. Reporting a residue of the
+         * transfer length while we have data in FIFO can cause issue.
+         * Usecase: atmel USART has a timeout which means I have received
+         * characters but there is no more character received for a while. On
+         * timeout, it requests the residue. If the data are in the DMA FIFO,
+         * we will return a residue of the transfer length. It means no data
+         * received. If an application is waiting for these data, it will hang
+         * since we won't have another USART timeout without receiving new
+         * data.
          */
         mask = AT_XDMAC_CC_TYPE | AT_XDMAC_CC_DSYNC;
         value = AT_XDMAC_CC_TYPE_PER_TRAN | AT_XDMAC_CC_DSYNC_PER2MEM;
@@ -1435,34 +1445,43 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         }
 
         /*
-         * When processing the residue, we need to read two registers but we
-         * can't do it in an atomic way. AT_XDMAC_CNDA is used to find where
-         * we stand in the descriptor list and AT_XDMAC_CUBC is used
-         * to know how many data are remaining for the current descriptor.
-         * Since the dma channel is not paused to not loose data, between the
-         * AT_XDMAC_CNDA and AT_XDMAC_CUBC read, we may have change of
-         * descriptor.
-         * For that reason, after reading AT_XDMAC_CUBC, we check if we are
-         * still using the same descriptor by reading a second time
-         * AT_XDMAC_CNDA. If AT_XDMAC_CNDA has changed, it means we have to
-         * read again AT_XDMAC_CUBC.
+         * The easiest way to compute the residue should be to pause the DMA
+         * but doing this can lead to miss some data as some devices don't
+         * have FIFO.
+         * We need to read several registers because:
+         * - DMA is running therefore a descriptor change is possible while
+         * reading these registers
+         * - When the block transfer is done, the value of the CUBC register
+         * is set to its initial value until the fetch of the next descriptor.
+         * This value will corrupt the residue calculation so we have to skip
+         * it.
+         *
+         * INITD --------                    ------------
+         *              |____________________|
+         *       _______________________  _______________
+         * NDA       @desc2             \/   @desc3
+         *       _______________________/\_______________
+         *       __________  ___________  _______________
+         * CUBC       0    \/ MAX desc1 \/  MAX desc2
+         *       __________/\___________/\_______________
+         *
+         * Since descriptors are aligned on 64 bits, we can assume that
+         * the update of NDA and CUBC is atomic.
          * Memory barriers are used to ensure the read order of the registers.
-         * A max number of retries is set because unlikely it can never ends if
-         * we are transferring a lot of data with small buffers.
+         * A max number of retries is set because unlikely it could never ends.
          */
-        cur_nda = at_xdmac_chan_read(atchan, AT_XDMAC_CNDA) & 0xfffffffc;
-        rmb();
-        cur_ubc = at_xdmac_chan_read(atchan, AT_XDMAC_CUBC);
         for (retry = 0; retry < AT_XDMAC_RESIDUE_MAX_RETRIES; retry++) {
-                rmb();
                 check_nda = at_xdmac_chan_read(atchan, AT_XDMAC_CNDA) & 0xfffffffc;
-
-                if (likely(cur_nda == check_nda))
-                        break;
-
-                cur_nda = check_nda;
+                rmb();
+                initd = !!(at_xdmac_chan_read(atchan, AT_XDMAC_CC) & AT_XDMAC_CC_INITD);
                 rmb();
                 cur_ubc = at_xdmac_chan_read(atchan, AT_XDMAC_CUBC);
+                rmb();
+                cur_nda = at_xdmac_chan_read(atchan, AT_XDMAC_CNDA) & 0xfffffffc;
+                rmb();
+
+                if ((check_nda == cur_nda) && initd)
+                        break;
         }
 
         if (unlikely(retry >= AT_XDMAC_RESIDUE_MAX_RETRIES)) {
@@ -1471,6 +1490,19 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         }
 
         /*
+         * Flush FIFO: only relevant when the transfer is source peripheral
+         * synchronized. Another flush is needed here because CUBC is updated
+         * when the controller sends the data write command. It can lead to
+         * report data that are not written in the memory or the device. The
+         * FIFO flush ensures that data are really written.
+         */
+        if ((desc->lld.mbr_cfg & mask) == value) {
+                at_xdmac_write(atxdmac, AT_XDMAC_GSWF, atchan->mask);
+                while (!(at_xdmac_chan_read(atchan, AT_XDMAC_CIS) & AT_XDMAC_CIS_FIS))
+                        cpu_relax();
+        }
+
+        /*
          * Remove size of all microblocks already transferred and the current
          * one. Then add the remaining size to transfer of the current
          * microblock.
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 25d1dadcddd1..d0446a75990a 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -703,8 +703,9 @@ static int mv_chan_memcpy_self_test(struct mv_xor_chan *mv_chan)
                 goto free_resources;
         }
 
-        src_dma = dma_map_page(dma_chan->device->dev, virt_to_page(src), 0,
-                                 PAGE_SIZE, DMA_TO_DEVICE);
+        src_dma = dma_map_page(dma_chan->device->dev, virt_to_page(src),
+                               (size_t)src & ~PAGE_MASK, PAGE_SIZE,
+                               DMA_TO_DEVICE);
         unmap->addr[0] = src_dma;
 
         ret = dma_mapping_error(dma_chan->device->dev, src_dma);
@@ -714,8 +715,9 @@ static int mv_chan_memcpy_self_test(struct mv_xor_chan *mv_chan)
         }
         unmap->to_cnt = 1;
 
-        dest_dma = dma_map_page(dma_chan->device->dev, virt_to_page(dest), 0,
-                                  PAGE_SIZE, DMA_FROM_DEVICE);
+        dest_dma = dma_map_page(dma_chan->device->dev, virt_to_page(dest),
+                                (size_t)dest & ~PAGE_MASK, PAGE_SIZE,
+                                DMA_FROM_DEVICE);
         unmap->addr[1] = dest_dma;
 
         ret = dma_mapping_error(dma_chan->device->dev, dest_dma);
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 6aa256b0a1ed..c3ee3ad98a63 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -565,7 +565,8 @@ void edac_mc_reset_delay_period(unsigned long value)
         list_for_each(item, &mc_devices) {
                 mci = list_entry(item, struct mem_ctl_info, link);
 
-                edac_mod_work(&mci->work, value);
+                if (mci->op_state == OP_RUNNING_POLL)
+                        edac_mod_work(&mci->work, value);
         }
         mutex_unlock(&mem_ctls_mutex);
 }
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index b4d0bf6534cf..6744d88bdea8 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -239,8 +239,11 @@ static const u32 rir_offset[MAX_RIR_RANGES][MAX_RIR_WAY] = {
         { 0x1a0, 0x1a4, 0x1a8, 0x1ac, 0x1b0, 0x1b4, 0x1b8, 0x1bc },
 };
 
-#define RIR_RNK_TGT(reg)                GET_BITFIELD(reg, 16, 19)
-#define RIR_OFFSET(reg)         GET_BITFIELD(reg,  2, 14)
+#define RIR_RNK_TGT(type, reg) (((type) == BROADWELL) ? \
+        GET_BITFIELD(reg, 20, 23) : GET_BITFIELD(reg, 16, 19))
+
+#define RIR_OFFSET(type, reg) (((type) == HASWELL || (type) == BROADWELL) ? \
+        GET_BITFIELD(reg,  2, 15) : GET_BITFIELD(reg,  2, 14))
 
 /* Device 16, functions 2-7 */
 
@@ -326,6 +329,7 @@ struct pci_id_descr {
 struct pci_id_table {
         const struct pci_id_descr       *descr;
         int                             n_devs;
+        enum type                       type;
 };
 
 struct sbridge_dev {
@@ -394,9 +398,14 @@ static const struct pci_id_descr pci_dev_descr_sbridge[] = {
         { PCI_DESCR(PCI_DEVICE_ID_INTEL_SBRIDGE_BR, 0)          },
 };
 
-#define PCI_ID_TABLE_ENTRY(A) { .descr=A, .n_devs = ARRAY_SIZE(A) }
+#define PCI_ID_TABLE_ENTRY(A, T) {      \
+        .descr = A,                     \
+        .n_devs = ARRAY_SIZE(A),        \
+        .type = T                       \
+}
+
 static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
-        PCI_ID_TABLE_ENTRY(pci_dev_descr_sbridge),
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_sbridge, SANDY_BRIDGE),
         {0,}                    /* 0 terminated list. */
 };
 
@@ -463,7 +472,7 @@ static const struct pci_id_descr pci_dev_descr_ibridge[] = {
 };
 
 static const struct pci_id_table pci_dev_descr_ibridge_table[] = {
-        PCI_ID_TABLE_ENTRY(pci_dev_descr_ibridge),
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_ibridge, IVY_BRIDGE),
         {0,}                    /* 0 terminated list. */
 };
 
@@ -536,7 +545,7 @@ static const struct pci_id_descr pci_dev_descr_haswell[] = {
 };
 
 static const struct pci_id_table pci_dev_descr_haswell_table[] = {
-        PCI_ID_TABLE_ENTRY(pci_dev_descr_haswell),
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_haswell, HASWELL),
         {0,}                    /* 0 terminated list. */
 };
 
@@ -580,7 +589,7 @@ static const struct pci_id_descr pci_dev_descr_knl[] = {
 };
 
 static const struct pci_id_table pci_dev_descr_knl_table[] = {
-        PCI_ID_TABLE_ENTRY(pci_dev_descr_knl),
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_knl, KNIGHTS_LANDING),
         {0,}
 };
 
@@ -648,7 +657,7 @@ static const struct pci_id_descr pci_dev_descr_broadwell[] = {
 };
 
 static const struct pci_id_table pci_dev_descr_broadwell_table[] = {
-        PCI_ID_TABLE_ENTRY(pci_dev_descr_broadwell),
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_broadwell, BROADWELL),
         {0,}                    /* 0 terminated list. */
 };
 
@@ -1894,14 +1903,14 @@ static void get_memory_layout(const struct mem_ctl_info *mci)
                                 pci_read_config_dword(pvt->pci_tad[i],
                                                       rir_offset[j][k],
                                                       &reg);
-                                tmp_mb = RIR_OFFSET(reg) << 6;
+                                tmp_mb = RIR_OFFSET(pvt->info.type, reg) << 6;
 
                                 gb = div_u64_rem(tmp_mb, 1024, &mb);
                                 edac_dbg(0, "CH#%d RIR#%d INTL#%d, offset %u.%03u GB (0x%016Lx), tgt: %d, reg=0x%08x\n",
                                          i, j, k,
                                          gb, (mb*1000)/1024,
                                          ((u64)tmp_mb) << 20L,
-                                         (u32)RIR_RNK_TGT(reg),
+                                         (u32)RIR_RNK_TGT(pvt->info.type, reg),
                                          reg);
                         }
                 }
@@ -2234,7 +2243,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
         pci_read_config_dword(pvt->pci_tad[ch_add + base_ch],
                               rir_offset[n_rir][idx],
                               &reg);
-        *rank = RIR_RNK_TGT(reg);
+        *rank = RIR_RNK_TGT(pvt->info.type, reg);
 
         edac_dbg(0, "RIR#%d: channel address 0x%08Lx < 0x%08Lx, RIR interleave %d, index %d\n",
                  n_rir,
@@ -3357,12 +3366,12 @@ fail0:
 #define ICPU(model, table) \
         { X86_VENDOR_INTEL, 6, model, 0, (unsigned long)&table }
 
-/* Order here must match "enum type" */
 static const struct x86_cpu_id sbridge_cpuids[] = {
         ICPU(0x2d, pci_dev_descr_sbridge_table),        /* SANDY_BRIDGE */
         ICPU(0x3e, pci_dev_descr_ibridge_table),        /* IVY_BRIDGE */
         ICPU(0x3f, pci_dev_descr_haswell_table),        /* HASWELL */
         ICPU(0x4f, pci_dev_descr_broadwell_table),      /* BROADWELL */
+        ICPU(0x56, pci_dev_descr_broadwell_table),      /* BROADWELL-DE */
         ICPU(0x57, pci_dev_descr_knl_table),            /* KNIGHTS_LANDING */
         { }
 };
@@ -3398,7 +3407,7 @@ static int sbridge_probe(const struct x86_cpu_id *id)
                          mc, mc + 1, num_mc);
 
                 sbridge_dev->mc = mc++;
-                rc = sbridge_register_mci(sbridge_dev, id - sbridge_cpuids);
+                rc = sbridge_register_mci(sbridge_dev, ptable->type);
                 if (unlikely(rc < 0))
                         goto fail1;
         }
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index 8b3226dca1d9..caff46c0e214 100644
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -360,6 +360,8 @@ static int palmas_usb_probe(struct platform_device *pdev)
 
         palmas_enable_irq(palmas_usb);
         /* perform initial detection */
+        if (palmas_usb->enable_gpio_vbus_detection)
+                palmas_vbus_irq_handler(palmas_usb->gpio_vbus_irq, palmas_usb);
         palmas_gpio_id_detect(&palmas_usb->wq_detectid.work);
         device_set_wakeup_capable(&pdev->dev, true);
         return 0;
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index a850cbc48d8d..c49d50e68aee 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -174,6 +174,7 @@ static __init void reserve_regions(void)
 {
         efi_memory_desc_t *md;
         u64 paddr, npages, size;
+        int resv;
 
         if (efi_enabled(EFI_DBG))
                 pr_info("Processing EFI memory map:\n");
@@ -190,12 +191,14 @@ static __init void reserve_regions(void)
                 paddr = md->phys_addr;
                 npages = md->num_pages;
 
+                resv = is_reserve_region(md);
                 if (efi_enabled(EFI_DBG)) {
                         char buf[64];
 
-                        pr_info("  0x%012llx-0x%012llx %s",
+                        pr_info("  0x%012llx-0x%012llx %s%s\n",
                                 paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
-                                efi_md_typeattr_format(buf, sizeof(buf), md));
+                                efi_md_typeattr_format(buf, sizeof(buf), md),
+                                resv ? "*" : "");
                 }
 
                 memrange_efi_to_native(&paddr, &npages);
@@ -204,14 +207,9 @@ static __init void reserve_regions(void)
                 if (is_normal_ram(md))
                         early_init_dt_add_memory_arch(paddr, size);
 
-                if (is_reserve_region(md)) {
+                if (resv)
                         memblock_mark_nomap(paddr, size);
-                        if (efi_enabled(EFI_DBG))
-                                pr_cont("*");
-                }
 
-                if (efi_enabled(EFI_DBG))
-                        pr_cont("\n");
         }
 
         set_bit(EFI_MEMMAP, &efi.flags);
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 48da857f4774..cebcb405812e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -33,6 +33,7 @@ config ARCH_REQUIRE_GPIOLIB
 
 menuconfig GPIOLIB
         bool "GPIO Support"
+        select ANON_INODES
         help
           This enables GPIO support through the generic GPIO library.
           You only need to enable this, if you also want to enable
@@ -530,7 +531,7 @@ menu "Port-mapped I/O GPIO drivers"
 
 config GPIO_104_DIO_48E
         tristate "ACCES 104-DIO-48E GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the ACCES 104-DIO-48E series (104-DIO-48E,
@@ -540,7 +541,7 @@ config GPIO_104_DIO_48E
 
 config GPIO_104_IDIO_16
         tristate "ACCES 104-IDIO-16 GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the ACCES 104-IDIO-16 family (104-IDIO-16,
@@ -551,7 +552,7 @@ config GPIO_104_IDIO_16
 
 config GPIO_104_IDI_48
         tristate "ACCES 104-IDI-48 GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the ACCES 104-IDI-48 family (104-IDI-48A,
@@ -627,7 +628,7 @@ config GPIO_TS5500
 
 config GPIO_WS16C48
         tristate "WinSystems WS16C48 GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the WinSystems WS16C48. The base port
diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index 1a647c07be67..fcf776971ca9 100644
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -75,7 +75,7 @@ static int dio48e_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
         struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
         const unsigned io_port = offset / 8;
-        const unsigned control_port = io_port / 2;
+        const unsigned int control_port = io_port / 3;
         const unsigned control_addr = dio48egpio->base + 3 + control_port*4;
         unsigned long flags;
         unsigned control;
@@ -115,7 +115,7 @@ static int dio48e_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
 {
         struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
         const unsigned io_port = offset / 8;
-        const unsigned control_port = io_port / 2;
+        const unsigned int control_port = io_port / 3;
         const unsigned mask = BIT(offset % 8);
         const unsigned control_addr = dio48egpio->base + 3 + control_port*4;
         const unsigned out_port = (io_port > 2) ? io_port + 1 : io_port;
diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c
index 6c75c83baf5a..2d2763ea1a68 100644
--- a/drivers/gpio/gpio-104-idi-48.c
+++ b/drivers/gpio/gpio-104-idi-48.c
@@ -247,6 +247,7 @@ static int idi_48_probe(struct device *dev, unsigned int id)
         idi48gpio->irq = irq[id];
 
         spin_lock_init(&idi48gpio->lock);
+        spin_lock_init(&idi48gpio->ack_lock);
 
         dev_set_drvdata(dev, idi48gpio);
 
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index 9aabc48ff5de..953e4b829e32 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -547,11 +547,11 @@ static void bcm_kona_gpio_reset(struct bcm_kona_gpio *kona_gpio)
         /* disable interrupts and clear status */
         for (i = 0; i < kona_gpio->num_bank; i++) {
                 /* Unlock the entire bank first */
-                bcm_kona_gpio_write_lock_regs(kona_gpio, i, UNLOCK_CODE);
+                bcm_kona_gpio_write_lock_regs(reg_base, i, UNLOCK_CODE);
                 writel(0xffffffff, reg_base + GPIO_INT_MASK(i));
                 writel(0xffffffff, reg_base + GPIO_INT_STATUS(i));
                 /* Now re-lock the bank */
-                bcm_kona_gpio_write_lock_regs(kona_gpio, i, LOCK_CODE);
+                bcm_kona_gpio_write_lock_regs(reg_base, i, LOCK_CODE);
         }
 }
 
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index d39014daeef9..fc5f197906ac 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -29,7 +29,6 @@
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
-#include <mach/irqs.h>
 
 #define LPC32XX_GPIO_P3_INP_STATE               _GPREG(0x000)
 #define LPC32XX_GPIO_P3_OUTP_SET                _GPREG(0x004)
@@ -371,61 +370,16 @@ static int lpc32xx_gpio_request(struct gpio_chip *chip, unsigned pin)
 
 static int lpc32xx_gpio_to_irq_p01(struct gpio_chip *chip, unsigned offset)
 {
-        return IRQ_LPC32XX_P0_P1_IRQ;
+        return -ENXIO;
 }
 
-static const char lpc32xx_gpio_to_irq_gpio_p3_table[] = {
-        IRQ_LPC32XX_GPIO_00,
-        IRQ_LPC32XX_GPIO_01,
-        IRQ_LPC32XX_GPIO_02,
-        IRQ_LPC32XX_GPIO_03,
-        IRQ_LPC32XX_GPIO_04,
-        IRQ_LPC32XX_GPIO_05,
-};
-
 static int lpc32xx_gpio_to_irq_gpio_p3(struct gpio_chip *chip, unsigned offset)
 {
-        if (offset < ARRAY_SIZE(lpc32xx_gpio_to_irq_gpio_p3_table))
-                return lpc32xx_gpio_to_irq_gpio_p3_table[offset];
         return -ENXIO;
 }
 
-static const char lpc32xx_gpio_to_irq_gpi_p3_table[] = {
-        IRQ_LPC32XX_GPI_00,
-        IRQ_LPC32XX_GPI_01,
-        IRQ_LPC32XX_GPI_02,
-        IRQ_LPC32XX_GPI_03,
-        IRQ_LPC32XX_GPI_04,
-        IRQ_LPC32XX_GPI_05,
-        IRQ_LPC32XX_GPI_06,
-        IRQ_LPC32XX_GPI_07,
-        IRQ_LPC32XX_GPI_08,
-        IRQ_LPC32XX_GPI_09,
-        -ENXIO, /* 10 */
-        -ENXIO, /* 11 */
-        -ENXIO, /* 12 */
-        -ENXIO, /* 13 */
-        -ENXIO, /* 14 */
-        -ENXIO, /* 15 */
-        -ENXIO, /* 16 */
-        -ENXIO, /* 17 */
-        -ENXIO, /* 18 */
-        IRQ_LPC32XX_GPI_19,
-        -ENXIO, /* 20 */
-        -ENXIO, /* 21 */
-        -ENXIO, /* 22 */
-        -ENXIO, /* 23 */
-        -ENXIO, /* 24 */
-        -ENXIO, /* 25 */
-        -ENXIO, /* 26 */
-        -ENXIO, /* 27 */
-        IRQ_LPC32XX_GPI_28,
-};
-
 static int lpc32xx_gpio_to_irq_gpi_p3(struct gpio_chip *chip, unsigned offset)
 {
-        if (offset < ARRAY_SIZE(lpc32xx_gpio_to_irq_gpi_p3_table))
-                return lpc32xx_gpio_to_irq_gpi_p3_table[offset];
         return -ENXIO;
 }
 
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index 75c6355b018d..e72794e463aa 100644
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -709,7 +709,13 @@ static int zynq_gpio_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "input clock not found.\n");
                 return PTR_ERR(gpio->clk);
         }
+        ret = clk_prepare_enable(gpio->clk);
+        if (ret) {
+                dev_err(&pdev->dev, "Unable to enable clock.\n");
+                return ret;
+        }
 
+        pm_runtime_set_active(&pdev->dev);
         pm_runtime_enable(&pdev->dev);
         ret = pm_runtime_get_sync(&pdev->dev);
         if (ret < 0)
@@ -747,6 +753,7 @@ err_pm_put:
         pm_runtime_put(&pdev->dev);
 err_pm_dis:
         pm_runtime_disable(&pdev->dev);
+        clk_disable_unprepare(gpio->clk);
 
         return ret;
 }
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index d22dcc38179d..4aabddb38b59 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/io-mapping.h>
 #include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index d407f904a31c..570771ed19e6 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -20,6 +20,7 @@
 #include <linux/cdev.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
+#include <linux/compat.h>
 #include <uapi/linux/gpio.h>
 
 #include "gpiolib.h"
@@ -316,7 +317,7 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
         struct gpio_device *gdev = filp->private_data;
         struct gpio_chip *chip = gdev->chip;
-        int __user *ip = (int __user *)arg;
+        void __user *ip = (void __user *)arg;
 
         /* We fail any subsequent ioctl():s when the chip is gone */
         if (!chip)
@@ -388,6 +389,14 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         return -EINVAL;
 }
 
+#ifdef CONFIG_COMPAT
+static long gpio_ioctl_compat(struct file *filp, unsigned int cmd,
+                              unsigned long arg)
+{
+        return gpio_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
+}
+#endif
+
 /**
  * gpio_chrdev_open() - open the chardev for ioctl operations
  * @inode: inode for this chardev
@@ -431,14 +440,15 @@ static const struct file_operations gpio_fileops = {
         .owner = THIS_MODULE,
         .llseek = noop_llseek,
         .unlocked_ioctl = gpio_ioctl,
-        .compat_ioctl = gpio_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = gpio_ioctl_compat,
+#endif
 };
 
 static void gpiodevice_release(struct device *dev)
 {
         struct gpio_device *gdev = dev_get_drvdata(dev);
 
-        cdev_del(&gdev->chrdev);
         list_del(&gdev->list);
         ida_simple_remove(&gpio_ida, gdev->id);
         kfree(gdev->label);
@@ -471,7 +481,6 @@ static int gpiochip_setup_dev(struct gpio_device *gdev)
 
         /* From this point, the .release() function cleans up gpio_device */
         gdev->dev.release = gpiodevice_release;
-        get_device(&gdev->dev);
         pr_debug("%s: registered GPIOs %d to %d on device: %s (%s)\n",
                  __func__, gdev->base, gdev->base + gdev->ngpio - 1,
                  dev_name(&gdev->dev), gdev->chip->label ? : "generic");
@@ -618,6 +627,8 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
                 goto err_free_label;
         }
 
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
         for (i = 0; i < chip->ngpio; i++) {
                 struct gpio_desc *desc = &gdev->descs[i];
 
@@ -649,8 +660,6 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
                 }
         }
 
-        spin_unlock_irqrestore(&gpio_lock, flags);
-
 #ifdef CONFIG_PINCTRL
         INIT_LIST_HEAD(&gdev->pin_ranges);
 #endif
@@ -759,6 +768,8 @@ void gpiochip_remove(struct gpio_chip *chip)
          * be removed, else it will be dangling until the last user is
          * gone.
          */
+        cdev_del(&gdev->chrdev);
+        device_del(&gdev->dev);
         put_device(&gdev->dev);
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);
@@ -858,7 +869,7 @@ struct gpio_chip *gpiochip_find(void *data,
 
         spin_lock_irqsave(&gpio_lock, flags);
         list_for_each_entry(gdev, &gpio_devices, list)
-                if (match(gdev->chip, data))
+                if (gdev->chip && match(gdev->chip, data))
                         break;
 
         /* No match? */
@@ -1356,11 +1367,18 @@ done:
 /*
  * This descriptor validation needs to be inserted verbatim into each
  * function taking a descriptor, so we need to use a preprocessor
- * macro to avoid endless duplication.
+ * macro to avoid endless duplication. If the desc is NULL it is an
+ * optional GPIO and calls should just bail out.
  */
 #define VALIDATE_DESC(desc) do { \
-        if (!desc || !desc->gdev) { \
-                pr_warn("%s: invalid GPIO\n", __func__); \
+        if (!desc) \
+                return 0; \
+        if (IS_ERR(desc)) {                                             \
+                pr_warn("%s: invalid GPIO (errorpointer)\n", __func__); \
+                return PTR_ERR(desc); \
+        } \
+        if (!desc->gdev) { \
+                pr_warn("%s: invalid GPIO (no device)\n", __func__); \
                 return -EINVAL; \
         } \
         if ( !desc->gdev->chip ) { \
@@ -1370,8 +1388,14 @@ done:
         } } while (0)
 
 #define VALIDATE_DESC_VOID(desc) do { \
-        if (!desc || !desc->gdev) { \
-                pr_warn("%s: invalid GPIO\n", __func__); \
+        if (!desc) \
+                return; \
+        if (IS_ERR(desc)) {                                             \
+                pr_warn("%s: invalid GPIO (errorpointer)\n", __func__); \
+                return; \
+        } \
+        if (!desc->gdev) { \
+                pr_warn("%s: invalid GPIO (no device)\n", __func__); \
                 return; \
         } \
         if (!desc->gdev->chip) { \
@@ -2040,7 +2064,14 @@ int gpiod_to_irq(const struct gpio_desc *desc)
         struct gpio_chip *chip;
         int offset;
 
-        VALIDATE_DESC(desc);
+        /*
+         * Cannot VALIDATE_DESC() here as gpiod_to_irq() consumer semantics
+         * requires this function to not return zero on an invalid descriptor
+         * but rather a negative error number.
+         */
+        if (!desc || IS_ERR(desc) || !desc->gdev || !desc->gdev->chip)
+                return -EINVAL;
+
         chip = desc->gdev->chip;
         offset = gpio_chip_hwgpio(desc);
         if (chip->to_irq) {
@@ -2066,17 +2097,30 @@ EXPORT_SYMBOL_GPL(gpiod_to_irq);
  */
 int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
 {
-        if (offset >= chip->ngpio)
-                return -EINVAL;
+        struct gpio_desc *desc;
+
+        desc = gpiochip_get_desc(chip, offset);
+        if (IS_ERR(desc))
+                return PTR_ERR(desc);
+
+        /* Flush direction if something changed behind our back */
+        if (chip->get_direction) {
+                int dir = chip->get_direction(chip, offset);
+
+                if (dir)
+                        clear_bit(FLAG_IS_OUT, &desc->flags);
+                else
+                        set_bit(FLAG_IS_OUT, &desc->flags);
+        }
 
-        if (test_bit(FLAG_IS_OUT, &chip->gpiodev->descs[offset].flags)) {
+        if (test_bit(FLAG_IS_OUT, &desc->flags)) {
                 chip_err(chip,
                           "%s: tried to flag a GPIO set as output for IRQ\n",
                           __func__);
                 return -EIO;
         }
 
-        set_bit(FLAG_USED_AS_IRQ, &chip->gpiodev->descs[offset].flags);
+        set_bit(FLAG_USED_AS_IRQ, &desc->flags);
         return 0;
 }
 EXPORT_SYMBOL_GPL(gpiochip_lock_as_irq);
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index be43afb08c69..e3dba6f44a79 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -8,7 +8,7 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
                 drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
                 drm_scatter.o drm_pci.o \
                 drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
-                drm_crtc.o drm_modes.o drm_edid.o \
+                drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \
                 drm_info.o drm_debugfs.o drm_encoder_slave.o \
                 drm_trace_points.o drm_global.o drm_prime.o \
                 drm_rect.o drm_vma_manager.o drm_flip_work.o \
@@ -23,7 +23,8 @@ drm-$(CONFIG_AGP) += drm_agpsupport.o
 
 drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \
                 drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \
-                drm_kms_helper_common.o drm_dp_dual_mode_helper.o
+                drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
+                drm_simple_kms_helper.o
 
 drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
 drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 992f00b65be4..ac8e02f9105a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1820,6 +1820,8 @@ struct amdgpu_asic_funcs {
         /* MM block clocks */
         int (*set_uvd_clocks)(struct amdgpu_device *adev, u32 vclk, u32 dclk);
         int (*set_vce_clocks)(struct amdgpu_device *adev, u32 evclk, u32 ecclk);
+        /* query virtual capabilities */
+        u32 (*get_virtual_caps)(struct amdgpu_device *adev);
 };
 
 /*
@@ -1914,8 +1916,12 @@ void amdgpu_cgs_destroy_device(struct cgs_device *cgs_device);
 
 
 /* GPU virtualization */
+#define AMDGPU_VIRT_CAPS_SRIOV_EN       (1 << 0)
+#define AMDGPU_VIRT_CAPS_IS_VF          (1 << 1)
 struct amdgpu_virtualization {
         bool supports_sr_iov;
+        bool is_virtual;
+        u32 caps;
 };
 
 /*
@@ -2032,7 +2038,7 @@ struct amdgpu_device {
         struct amdgpu_irq_src           hpd_irq;
 
         /* rings */
-        unsigned                        fence_context;
+        u64                             fence_context;
         unsigned                        num_rings;
         struct amdgpu_ring              *rings[AMDGPU_MAX_RINGS];
         bool                            ib_pool_ready;
@@ -2204,6 +2210,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 #define amdgpu_asic_get_xclk(adev) (adev)->asic_funcs->get_xclk((adev))
 #define amdgpu_asic_set_uvd_clocks(adev, v, d) (adev)->asic_funcs->set_uvd_clocks((adev), (v), (d))
 #define amdgpu_asic_set_vce_clocks(adev, ev, ec) (adev)->asic_funcs->set_vce_clocks((adev), (ev), (ec))
+#define amdgpu_asic_get_virtual_caps(adev) ((adev)->asic_funcs->get_virtual_caps((adev)))
 #define amdgpu_asic_get_gpu_clock_counter(adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))
 #define amdgpu_asic_read_disabled_bios(adev) (adev)->asic_funcs->read_disabled_bios((adev))
 #define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 199f76baf22c..cf6f49fc1c75 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -696,6 +696,17 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type)
         return result;
 }
 
+static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucode_id type)
+{
+        CGS_FUNC_ADEV;
+        if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {
+                release_firmware(adev->pm.fw);
+                return 0;
+        }
+        /* cannot release other firmware because they are not created by cgs */
+        return -EINVAL;
+}
+
 static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                         enum cgs_ucode_id type,
                                         struct cgs_firmware_info *info)
@@ -898,7 +909,7 @@ static int amdgpu_cgs_acpi_eval_object(struct cgs_device *cgs_device,
         struct cgs_acpi_method_argument *argument = NULL;
         uint32_t i, count;
         acpi_status status;
-        int result;
+        int result = 0;
         uint32_t func_no = 0xFFFFFFFF;
 
         handle = ACPI_HANDLE(&adev->pdev->dev);
@@ -1125,6 +1136,7 @@ static const struct cgs_ops amdgpu_cgs_ops = {
         amdgpu_cgs_pm_query_clock_limits,
         amdgpu_cgs_set_camera_voltages,
         amdgpu_cgs_get_firmware_info,
+        amdgpu_cgs_rel_firmware,
         amdgpu_cgs_set_powergating_state,
         amdgpu_cgs_set_clockgating_state,
         amdgpu_cgs_get_active_displays_info,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index bb8b149786d7..6e920086af46 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -827,8 +827,10 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)
  */
 static void amdgpu_atombios_fini(struct amdgpu_device *adev)
 {
-        if (adev->mode_info.atom_context)
+        if (adev->mode_info.atom_context) {
                 kfree(adev->mode_info.atom_context->scratch);
+                kfree(adev->mode_info.atom_context->iio);
+        }
         kfree(adev->mode_info.atom_context);
         adev->mode_info.atom_context = NULL;
         kfree(adev->mode_info.atom_card_info);
@@ -1325,6 +1327,11 @@ static int amdgpu_fini(struct amdgpu_device *adev)
                 adev->ip_block_status[i].valid = false;
         }
 
+        for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
+                if (adev->ip_blocks[i].funcs->late_fini)
+                        adev->ip_blocks[i].funcs->late_fini((void *)adev);
+        }
+
         return 0;
 }
 
@@ -1378,6 +1385,15 @@ static int amdgpu_resume(struct amdgpu_device *adev)
         return 0;
 }
 
+static bool amdgpu_device_is_virtual(void)
+{
+#ifdef CONFIG_X86
+        return boot_cpu_has(X86_FEATURE_HYPERVISOR);
+#else
+        return false;
+#endif
+}
+
 /**
  * amdgpu_device_init - initialize the driver
  *
@@ -1512,9 +1528,14 @@ int amdgpu_device_init(struct amdgpu_device *adev,
         adev->virtualization.supports_sr_iov =
                 amdgpu_atombios_has_gpu_virtualization_table(adev);
 
+        /* Check if we are executing in a virtualized environment */
+        adev->virtualization.is_virtual = amdgpu_device_is_virtual();
+        adev->virtualization.caps = amdgpu_asic_get_virtual_caps(adev);
+
         /* Post card if necessary */
         if (!amdgpu_card_posted(adev) ||
-            adev->virtualization.supports_sr_iov) {
+            (adev->virtualization.is_virtual &&
+             !(adev->virtualization.caps & AMDGPU_VIRT_CAPS_SRIOV_EN))) {
                 if (!adev->bios) {
                         dev_err(adev->dev, "Card not posted and no BIOS - ignoring\n");
                         return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index b0832da2ef7e..a6eecf6f9065 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -240,7 +240,7 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
 
         work->base = base;
 
-        r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id);
+        r = drm_crtc_vblank_get(crtc);
         if (r) {
                 DRM_ERROR("failed to get vblank before flip\n");
                 goto pflip_cleanup;
@@ -268,7 +268,7 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
         return 0;
 
 vblank_cleanup:
-        drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id);
+        drm_crtc_vblank_put(crtc);
 
 pflip_cleanup:
         if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 40a23704a981..d851ea15059f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -447,7 +447,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                         dev_info.max_memory_clock = adev->pm.default_mclk * 10;
                 }
                 dev_info.enabled_rb_pipes_mask = adev->gfx.config.backend_enable_mask;
-                dev_info.num_rb_pipes = adev->gfx.config.num_rbs;
+                dev_info.num_rb_pipes = adev->gfx.config.max_backends_per_se *
+                        adev->gfx.config.max_shader_engines;
                 dev_info.num_hw_gfx_contexts = adev->gfx.config.max_hw_contexts;
                 dev_info._pad = 0;
                 dev_info.ids_flags = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 589b36e8c5cf..0e13d80d2a95 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -270,30 +270,28 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
         struct drm_device *ddev = dev_get_drvdata(dev);
         struct amdgpu_device *adev = ddev->dev_private;
         enum amd_pm_state_type state = 0;
-        long idx;
+        unsigned long idx;
         int ret;
 
         if (strlen(buf) == 1)
                 adev->pp_force_state_enabled = false;
-        else {
-                ret = kstrtol(buf, 0, &idx);
+        else if (adev->pp_enabled) {
+                struct pp_states_info data;
 
-                if (ret) {
+                ret = kstrtoul(buf, 0, &idx);
+                if (ret || idx >= ARRAY_SIZE(data.states)) {
                         count = -EINVAL;
                         goto fail;
                 }
 
-                if (adev->pp_enabled) {
-                        struct pp_states_info data;
-                        amdgpu_dpm_get_pp_num_states(adev, &data);
-                        state = data.states[idx];
-                        /* only set user selected power states */
-                        if (state != POWER_STATE_TYPE_INTERNAL_BOOT &&
-                                state != POWER_STATE_TYPE_DEFAULT) {
-                                amdgpu_dpm_dispatch_task(adev,
-                                                AMD_PP_EVENT_ENABLE_USER_STATE, &state, NULL);
-                                adev->pp_force_state_enabled = true;
-                        }
+                amdgpu_dpm_get_pp_num_states(adev, &data);
+                state = data.states[idx];
+                /* only set user selected power states */
+                if (state != POWER_STATE_TYPE_INTERNAL_BOOT &&
+                    state != POWER_STATE_TYPE_DEFAULT) {
+                        amdgpu_dpm_dispatch_task(adev,
+                                        AMD_PP_EVENT_ENABLE_USER_STATE, &state, NULL);
+                        adev->pp_force_state_enabled = true;
                 }
         }
 fail:
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 6bd961fb43dc..82256558e0f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -183,13 +183,6 @@ static int amdgpu_pp_sw_fini(void *handle)
         if (ret)
                 return ret;
 
-#ifdef CONFIG_DRM_AMD_POWERPLAY
-        if (adev->pp_enabled) {
-                amdgpu_pm_sysfs_fini(adev);
-                amd_powerplay_fini(adev->powerplay.pp_handle);
-        }
-#endif
-
         return ret;
 }
 
@@ -223,6 +216,22 @@ static int amdgpu_pp_hw_fini(void *handle)
         return ret;
 }
 
+static void amdgpu_pp_late_fini(void *handle)
+{
+#ifdef CONFIG_DRM_AMD_POWERPLAY
+        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+        if (adev->pp_enabled) {
+                amdgpu_pm_sysfs_fini(adev);
+                amd_powerplay_fini(adev->powerplay.pp_handle);
+        }
+
+        if (adev->powerplay.ip_funcs->late_fini)
+                adev->powerplay.ip_funcs->late_fini(
+                          adev->powerplay.pp_handle);
+#endif
+}
+
 static int amdgpu_pp_suspend(void *handle)
 {
         int ret = 0;
@@ -311,6 +320,7 @@ const struct amd_ip_funcs amdgpu_pp_ip_funcs = {
         .sw_fini = amdgpu_pp_sw_fini,
         .hw_init = amdgpu_pp_hw_init,
         .hw_fini = amdgpu_pp_hw_fini,
+        .late_fini = amdgpu_pp_late_fini,
         .suspend = amdgpu_pp_suspend,
         .resume = amdgpu_pp_resume,
         .is_idle = amdgpu_pp_is_idle,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 3b02272db678..870f9494252c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -343,6 +343,7 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
         ring->ring = NULL;
         ring->ring_obj = NULL;
 
+        amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
         amdgpu_wb_free(ring->adev, ring->fence_offs);
         amdgpu_wb_free(ring->adev, ring->rptr_offs);
         amdgpu_wb_free(ring->adev, ring->wptr_offs);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
index 8bf84efafb04..d8af37a845f4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
@@ -115,6 +115,7 @@ int amdgpu_sa_bo_manager_start(struct amdgpu_device *adev,
                 return r;
         }
         r = amdgpu_bo_kmap(sa_manager->bo, &sa_manager->cpu_ptr);
+        memset(sa_manager->cpu_ptr, 0, sa_manager->size);
         amdgpu_bo_unreserve(sa_manager->bo);
         return r;
 }
@@ -427,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
                            soffset, eoffset, eoffset - soffset);
 
                 if (i->fence)
-                        seq_printf(m, " protected by 0x%08x on context %d",
+                        seq_printf(m, " protected by 0x%08x on context %llu",
                                    i->fence->seqno, i->fence->context);
 
                 seq_printf(m, "\n");
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 01abfc21b4a2..e19520c4b4b6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -253,19 +253,20 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
 {
         int r;
 
-        if (adev->uvd.vcpu_bo == NULL)
-                return 0;
+        kfree(adev->uvd.saved_bo);
 
         amd_sched_entity_fini(&adev->uvd.ring.sched, &adev->uvd.entity);
 
-        r = amdgpu_bo_reserve(adev->uvd.vcpu_bo, false);
-        if (!r) {
-                amdgpu_bo_kunmap(adev->uvd.vcpu_bo);
-                amdgpu_bo_unpin(adev->uvd.vcpu_bo);
-                amdgpu_bo_unreserve(adev->uvd.vcpu_bo);
-        }
+        if (adev->uvd.vcpu_bo) {
+                r = amdgpu_bo_reserve(adev->uvd.vcpu_bo, false);
+                if (!r) {
+                        amdgpu_bo_kunmap(adev->uvd.vcpu_bo);
+                        amdgpu_bo_unpin(adev->uvd.vcpu_bo);
+                        amdgpu_bo_unreserve(adev->uvd.vcpu_bo);
+                }
 
-        amdgpu_bo_unref(&adev->uvd.vcpu_bo);
+                amdgpu_bo_unref(&adev->uvd.vcpu_bo);
+        }
 
         amdgpu_ring_fini(&adev->uvd.ring);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index ea407db1fbcf..5ec1f1e9c983 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -6221,6 +6221,9 @@ static int ci_dpm_sw_fini(void *handle)
         ci_dpm_fini(adev);
         mutex_unlock(&adev->pm.mutex);
 
+        release_firmware(adev->pm.fw);
+        adev->pm.fw = NULL;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 07bc795a4ca9..910431808542 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -962,6 +962,12 @@ static bool cik_read_bios_from_rom(struct amdgpu_device *adev,
         return true;
 }
 
+static u32 cik_get_virtual_caps(struct amdgpu_device *adev)
+{
+        /* CIK does not support SR-IOV */
+        return 0;
+}
+
 static const struct amdgpu_allowed_register_entry cik_allowed_read_registers[] = {
         {mmGRBM_STATUS, false},
         {mmGB_ADDR_CONFIG, false},
@@ -2007,6 +2013,7 @@ static const struct amdgpu_asic_funcs cik_asic_funcs =
         .get_xclk = &cik_get_xclk,
         .set_uvd_clocks = &cik_set_uvd_clocks,
         .set_vce_clocks = &cik_set_vce_clocks,
+        .get_virtual_caps = &cik_get_virtual_caps,
         /* these should be moved to their own ip modules */
         .get_gpu_clock_counter = &gfx_v7_0_get_gpu_clock_counter,
         .wait_for_mc_idle = &gmc_v7_0_mc_wait_for_idle,
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 518dca43b133..9dc4e24e31e7 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -66,6 +66,16 @@ MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
 
 u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 
+
+static void cik_sdma_free_microcode(struct amdgpu_device *adev)
+{
+        int i;
+        for (i = 0; i < adev->sdma.num_instances; i++) {
+                        release_firmware(adev->sdma.instance[i].fw);
+                        adev->sdma.instance[i].fw = NULL;
+        }
+}
+
 /*
  * sDMA - System DMA
  * Starting with CIK, the GPU has new asynchronous
@@ -419,6 +429,8 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)
                 /* Initialize the ring buffer's read and write pointers */
                 WREG32(mmSDMA0_GFX_RB_RPTR + sdma_offsets[i], 0);
                 WREG32(mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], 0);
+                WREG32(mmSDMA0_GFX_IB_RPTR + sdma_offsets[i], 0);
+                WREG32(mmSDMA0_GFX_IB_OFFSET + sdma_offsets[i], 0);
 
                 /* set the wb address whether it's enabled or not */
                 WREG32(mmSDMA0_GFX_RB_RPTR_ADDR_HI + sdma_offsets[i],
@@ -446,7 +458,12 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)
                 WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
 
                 ring->ready = true;
+        }
+
+        cik_sdma_enable(adev, true);
 
+        for (i = 0; i < adev->sdma.num_instances; i++) {
+                ring = &adev->sdma.instance[i].ring;
                 r = amdgpu_ring_test_ring(ring);
                 if (r) {
                         ring->ready = false;
@@ -529,8 +546,8 @@ static int cik_sdma_start(struct amdgpu_device *adev)
         if (r)
                 return r;
 
-        /* unhalt the MEs */
-        cik_sdma_enable(adev, true);
+        /* halt the engine before programing */
+        cik_sdma_enable(adev, false);
 
         /* start the gfx rings and rlc compute queues */
         r = cik_sdma_gfx_resume(adev);
@@ -998,6 +1015,7 @@ static int cik_sdma_sw_fini(void *handle)
         for (i = 0; i < adev->sdma.num_instances; i++)
                 amdgpu_ring_fini(&adev->sdma.instance[i].ring);
 
+        cik_sdma_free_microcode(adev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 8227344d2ff6..c1b04e9aab57 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2667,19 +2667,21 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
         }
 }
 
-static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                    u16 *blue, uint32_t start, uint32_t size)
+static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                                    u16 *blue, uint32_t size)
 {
         struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-        int end = (start + size > 256) ? 256 : start + size, i;
+        int i;
 
         /* userspace palettes are always correct as is */
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 amdgpu_crtc->lut_r[i] = red[i] >> 6;
                 amdgpu_crtc->lut_g[i] = green[i] >> 6;
                 amdgpu_crtc->lut_b[i] = blue[i] >> 6;
         }
         dce_v10_0_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc)
@@ -2717,13 +2719,13 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode)
                 type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
                 amdgpu_irq_update(adev, &adev->crtc_irq, type);
                 amdgpu_irq_update(adev, &adev->pageflip_irq, type);
-                drm_vblank_on(dev, amdgpu_crtc->crtc_id);
+                drm_crtc_vblank_on(crtc);
                 dce_v10_0_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                drm_vblank_off(dev, amdgpu_crtc->crtc_id);
+                drm_crtc_vblank_off(crtc);
                 if (amdgpu_crtc->enabled) {
                         dce_v10_0_vga_enable(crtc, true);
                         amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
@@ -3372,7 +3374,7 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev,
 
         spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 
-        drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
+        drm_crtc_vblank_put(&amdgpu_crtc->base);
         schedule_work(&works->unpin_work);
 
         return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index af26ec0bc59d..c90408bc0fde 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2678,19 +2678,21 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)
         }
 }
 
-static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                    u16 *blue, uint32_t start, uint32_t size)
+static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                                    u16 *blue, uint32_t size)
 {
         struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-        int end = (start + size > 256) ? 256 : start + size, i;
+        int i;
 
         /* userspace palettes are always correct as is */
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 amdgpu_crtc->lut_r[i] = red[i] >> 6;
                 amdgpu_crtc->lut_g[i] = green[i] >> 6;
                 amdgpu_crtc->lut_b[i] = blue[i] >> 6;
         }
         dce_v11_0_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc)
@@ -2728,13 +2730,13 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode)
                 type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
                 amdgpu_irq_update(adev, &adev->crtc_irq, type);
                 amdgpu_irq_update(adev, &adev->pageflip_irq, type);
-                drm_vblank_on(dev, amdgpu_crtc->crtc_id);
+                drm_crtc_vblank_on(crtc);
                 dce_v11_0_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                drm_vblank_off(dev, amdgpu_crtc->crtc_id);
+                drm_crtc_vblank_off(crtc);
                 if (amdgpu_crtc->enabled) {
                         dce_v11_0_vga_enable(crtc, true);
                         amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
@@ -3433,7 +3435,7 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev,
 
         spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 
-        drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
+        drm_crtc_vblank_put(&amdgpu_crtc->base);
         schedule_work(&works->unpin_work);
 
         return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 3fb65e41a6ef..300ff4aab0fd 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2574,19 +2574,21 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)
         }
 }
 
-static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                    u16 *blue, uint32_t start, uint32_t size)
+static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                                   u16 *blue, uint32_t size)
 {
         struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-        int end = (start + size > 256) ? 256 : start + size, i;
+        int i;
 
         /* userspace palettes are always correct as is */
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 amdgpu_crtc->lut_r[i] = red[i] >> 6;
                 amdgpu_crtc->lut_g[i] = green[i] >> 6;
                 amdgpu_crtc->lut_b[i] = blue[i] >> 6;
         }
         dce_v8_0_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc)
@@ -2624,13 +2626,13 @@ static void dce_v8_0_crtc_dpms(struct drm_crtc *crtc, int mode)
                 type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
                 amdgpu_irq_update(adev, &adev->crtc_irq, type);
                 amdgpu_irq_update(adev, &adev->pageflip_irq, type);
-                drm_vblank_on(dev, amdgpu_crtc->crtc_id);
+                drm_crtc_vblank_on(crtc);
                 dce_v8_0_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                drm_vblank_off(dev, amdgpu_crtc->crtc_id);
+                drm_crtc_vblank_off(crtc);
                 if (amdgpu_crtc->enabled) {
                         dce_v8_0_vga_enable(crtc, true);
                         amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
@@ -3376,7 +3378,7 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev,
 
         spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 
-        drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
+        drm_crtc_vblank_put(&amdgpu_crtc->base);
         schedule_work(&works->unpin_work);
 
         return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
index 245cabf06575..ed03b75175d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
@@ -72,6 +72,11 @@ static int fiji_dpm_sw_init(void *handle)
 
 static int fiji_dpm_sw_fini(void *handle)
 {
+        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+        release_firmware(adev->pm.fw);
+        adev->pm.fw = NULL;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 7f18a53ab53a..fc8ff4d3ccf8 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -991,6 +991,22 @@ out:
         return err;
 }
 
+static void gfx_v7_0_free_microcode(struct amdgpu_device *adev)
+{
+        release_firmware(adev->gfx.pfp_fw);
+        adev->gfx.pfp_fw = NULL;
+        release_firmware(adev->gfx.me_fw);
+        adev->gfx.me_fw = NULL;
+        release_firmware(adev->gfx.ce_fw);
+        adev->gfx.ce_fw = NULL;
+        release_firmware(adev->gfx.mec_fw);
+        adev->gfx.mec_fw = NULL;
+        release_firmware(adev->gfx.mec2_fw);
+        adev->gfx.mec2_fw = NULL;
+        release_firmware(adev->gfx.rlc_fw);
+        adev->gfx.rlc_fw = NULL;
+}
+
 /**
  * gfx_v7_0_tiling_mode_table_init - init the hw tiling table
  *
@@ -4489,6 +4505,7 @@ static int gfx_v7_0_sw_fini(void *handle)
         gfx_v7_0_cp_compute_fini(adev);
         gfx_v7_0_rlc_fini(adev);
         gfx_v7_0_mec_fini(adev);
+        gfx_v7_0_free_microcode(adev);
 
         return 0;
 }
@@ -4816,7 +4833,7 @@ static int gfx_v7_0_eop_irq(struct amdgpu_device *adev,
         case 2:
                 for (i = 0; i < adev->gfx.num_compute_rings; i++) {
                         ring = &adev->gfx.compute_ring[i];
-                        if ((ring->me == me_id) & (ring->pipe == pipe_id))
+                        if ((ring->me == me_id) && (ring->pipe == pipe_id))
                                 amdgpu_fence_process(ring);
                 }
                 break;
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index f19bab68fd83..1a5cbaff1e34 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -297,7 +297,8 @@ static const u32 polaris11_golden_common_all[] =
 static const u32 golden_settings_polaris10_a11[] =
 {
         mmATC_MISC_CG, 0x000c0fc0, 0x000c0200,
-        mmCB_HW_CONTROL, 0xfffdf3cf, 0x00006208,
+        mmCB_HW_CONTROL, 0xfffdf3cf, 0x00007208,
+        mmCB_HW_CONTROL_2, 0, 0x0f000000,
         mmCB_HW_CONTROL_3, 0x000001ff, 0x00000040,
         mmDB_DEBUG2, 0xf00fffff, 0x00000400,
         mmPA_SC_ENHANCE, 0xffffffff, 0x20000001,
@@ -836,6 +837,26 @@ err1:
         return r;
 }
 
+
+static void gfx_v8_0_free_microcode(struct amdgpu_device *adev) {
+        release_firmware(adev->gfx.pfp_fw);
+        adev->gfx.pfp_fw = NULL;
+        release_firmware(adev->gfx.me_fw);
+        adev->gfx.me_fw = NULL;
+        release_firmware(adev->gfx.ce_fw);
+        adev->gfx.ce_fw = NULL;
+        release_firmware(adev->gfx.rlc_fw);
+        adev->gfx.rlc_fw = NULL;
+        release_firmware(adev->gfx.mec_fw);
+        adev->gfx.mec_fw = NULL;
+        if ((adev->asic_type != CHIP_STONEY) &&
+            (adev->asic_type != CHIP_TOPAZ))
+                release_firmware(adev->gfx.mec2_fw);
+        adev->gfx.mec2_fw = NULL;
+
+        kfree(adev->gfx.rlc.register_list_format);
+}
+
 static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
 {
         const char *chip_name;
@@ -1983,7 +2004,7 @@ static int gfx_v8_0_sw_fini(void *handle)
 
         gfx_v8_0_rlc_fini(adev);
 
-        kfree(adev->gfx.rlc.register_list_format);
+        gfx_v8_0_free_microcode(adev);
 
         return 0;
 }
@@ -3974,11 +3995,15 @@ static int gfx_v8_0_cp_gfx_start(struct amdgpu_device *adev)
                 amdgpu_ring_write(ring, 0x3a00161a);
                 amdgpu_ring_write(ring, 0x0000002e);
                 break;
-        case CHIP_TOPAZ:
         case CHIP_CARRIZO:
                 amdgpu_ring_write(ring, 0x00000002);
                 amdgpu_ring_write(ring, 0x00000000);
                 break;
+        case CHIP_TOPAZ:
+                amdgpu_ring_write(ring, adev->gfx.config.num_rbs == 1 ?
+                                0x00000000 : 0x00000002);
+                amdgpu_ring_write(ring, 0x00000000);
+                break;
         case CHIP_STONEY:
                 amdgpu_ring_write(ring, 0x00000000);
                 amdgpu_ring_write(ring, 0x00000000);
diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
index 460bc8ad37e6..825ccd63f2dc 100644
--- a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
@@ -72,6 +72,11 @@ static int iceland_dpm_sw_init(void *handle)
 
 static int iceland_dpm_sw_fini(void *handle)
 {
+        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+        release_firmware(adev->pm.fw);
+        adev->pm.fw = NULL;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index f4c3130d3fdb..b556bd0a8797 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -105,6 +105,15 @@ static void sdma_v2_4_init_golden_registers(struct amdgpu_device *adev)
         }
 }
 
+static void sdma_v2_4_free_microcode(struct amdgpu_device *adev)
+{
+        int i;
+        for (i = 0; i < adev->sdma.num_instances; i++) {
+                release_firmware(adev->sdma.instance[i].fw);
+                adev->sdma.instance[i].fw = NULL;
+        }
+}
+
 /**
  * sdma_v2_4_init_microcode - load ucode images from disk
  *
@@ -461,6 +470,8 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)
                 /* Initialize the ring buffer's read and write pointers */
                 WREG32(mmSDMA0_GFX_RB_RPTR + sdma_offsets[i], 0);
                 WREG32(mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], 0);
+                WREG32(mmSDMA0_GFX_IB_RPTR + sdma_offsets[i], 0);
+                WREG32(mmSDMA0_GFX_IB_OFFSET + sdma_offsets[i], 0);
 
                 /* set the wb address whether it's enabled or not */
                 WREG32(mmSDMA0_GFX_RB_RPTR_ADDR_HI + sdma_offsets[i],
@@ -489,7 +500,11 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)
                 WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
 
                 ring->ready = true;
+        }
 
+        sdma_v2_4_enable(adev, true);
+        for (i = 0; i < adev->sdma.num_instances; i++) {
+                ring = &adev->sdma.instance[i].ring;
                 r = amdgpu_ring_test_ring(ring);
                 if (r) {
                         ring->ready = false;
@@ -580,8 +595,8 @@ static int sdma_v2_4_start(struct amdgpu_device *adev)
                         return -EINVAL;
         }
 
-        /* unhalt the MEs */
-        sdma_v2_4_enable(adev, true);
+        /* halt the engine before programing */
+        sdma_v2_4_enable(adev, false);
 
         /* start the gfx rings and rlc compute queues */
         r = sdma_v2_4_gfx_resume(adev);
@@ -1012,6 +1027,7 @@ static int sdma_v2_4_sw_fini(void *handle)
         for (i = 0; i < adev->sdma.num_instances; i++)
                 amdgpu_ring_fini(&adev->sdma.instance[i].ring);
 
+        sdma_v2_4_free_microcode(adev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 31d99b0010f7..532ea88da66a 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -236,6 +236,15 @@ static void sdma_v3_0_init_golden_registers(struct amdgpu_device *adev)
         }
 }
 
+static void sdma_v3_0_free_microcode(struct amdgpu_device *adev)
+{
+        int i;
+        for (i = 0; i < adev->sdma.num_instances; i++) {
+                release_firmware(adev->sdma.instance[i].fw);
+                adev->sdma.instance[i].fw = NULL;
+        }
+}
+
 /**
  * sdma_v3_0_init_microcode - load ucode images from disk
  *
@@ -672,6 +681,8 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)
                 /* Initialize the ring buffer's read and write pointers */
                 WREG32(mmSDMA0_GFX_RB_RPTR + sdma_offsets[i], 0);
                 WREG32(mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], 0);
+                WREG32(mmSDMA0_GFX_IB_RPTR + sdma_offsets[i], 0);
+                WREG32(mmSDMA0_GFX_IB_OFFSET + sdma_offsets[i], 0);
 
                 /* set the wb address whether it's enabled or not */
                 WREG32(mmSDMA0_GFX_RB_RPTR_ADDR_HI + sdma_offsets[i],
@@ -711,7 +722,15 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)
                 WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
 
                 ring->ready = true;
+        }
+
+        /* unhalt the MEs */
+        sdma_v3_0_enable(adev, true);
+        /* enable sdma ring preemption */
+        sdma_v3_0_ctx_switch_enable(adev, true);
 
+        for (i = 0; i < adev->sdma.num_instances; i++) {
+                ring = &adev->sdma.instance[i].ring;
                 r = amdgpu_ring_test_ring(ring);
                 if (r) {
                         ring->ready = false;
@@ -804,10 +823,9 @@ static int sdma_v3_0_start(struct amdgpu_device *adev)
                 }
         }
 
-        /* unhalt the MEs */
-        sdma_v3_0_enable(adev, true);
-        /* enable sdma ring preemption */
-        sdma_v3_0_ctx_switch_enable(adev, true);
+        /* disble sdma engine before programing it */
+        sdma_v3_0_ctx_switch_enable(adev, false);
+        sdma_v3_0_enable(adev, false);
 
         /* start the gfx rings and rlc compute queues */
         r = sdma_v3_0_gfx_resume(adev);
@@ -1247,6 +1265,7 @@ static int sdma_v3_0_sw_fini(void *handle)
         for (i = 0; i < adev->sdma.num_instances; i++)
                 amdgpu_ring_fini(&adev->sdma.instance[i].ring);
 
+        sdma_v3_0_free_microcode(adev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
index b7615cefcac4..f06f6f4dc3a8 100644
--- a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
@@ -71,6 +71,11 @@ static int tonga_dpm_sw_init(void *handle)
 
 static int tonga_dpm_sw_fini(void *handle)
 {
+        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+        release_firmware(adev->pm.fw);
+        adev->pm.fw = NULL;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 2c88d0b66cf3..a65c96029476 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -421,6 +421,20 @@ static bool vi_read_bios_from_rom(struct amdgpu_device *adev,
         return true;
 }
 
+static u32 vi_get_virtual_caps(struct amdgpu_device *adev)
+{
+        u32 caps = 0;
+        u32 reg = RREG32(mmBIF_IOV_FUNC_IDENTIFIER);
+
+        if (REG_GET_FIELD(reg, BIF_IOV_FUNC_IDENTIFIER, IOV_ENABLE))
+                caps |= AMDGPU_VIRT_CAPS_SRIOV_EN;
+
+        if (REG_GET_FIELD(reg, BIF_IOV_FUNC_IDENTIFIER, FUNC_IDENTIFIER))
+                caps |= AMDGPU_VIRT_CAPS_IS_VF;
+
+        return caps;
+}
+
 static const struct amdgpu_allowed_register_entry tonga_allowed_read_registers[] = {
         {mmGB_MACROTILE_MODE7, true},
 };
@@ -1118,6 +1132,7 @@ static const struct amdgpu_asic_funcs vi_asic_funcs =
         .get_xclk = &vi_get_xclk,
         .set_uvd_clocks = &vi_set_uvd_clocks,
         .set_vce_clocks = &vi_set_vce_clocks,
+        .get_virtual_caps = &vi_get_virtual_caps,
         /* these should be moved to their own ip modules */
         .get_gpu_clock_counter = &gfx_v8_0_get_gpu_clock_counter,
         .wait_for_mc_idle = &gmc_v8_0_mc_wait_for_idle,
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index ec4036a09f3e..a625b9137da2 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@ -187,12 +187,12 @@ int init_pipelines(struct device_queue_manager *dqm,
 unsigned int get_first_pipe(struct device_queue_manager *dqm);
 unsigned int get_pipes_num(struct device_queue_manager *dqm);
 
-extern inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
+static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
 {
         return (pdd->lds_base >> 16) & 0xFF;
 }
 
-extern inline unsigned int
+static inline unsigned int
 get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)
 {
         return (pdd->lds_base >> 60) & 0x0E;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index d0d5f4baf72d..80113c335966 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -617,10 +617,7 @@ int kgd2kfd_resume(struct kfd_dev *kfd);
 int kfd_init_apertures(struct kfd_process *process);
 
 /* Queue Context Management */
-inline uint32_t lower_32(uint64_t x);
-inline uint32_t upper_32(uint64_t x);
 struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd);
-inline uint32_t get_sdma_base_addr(struct cik_sdma_rlc_registers *m);
 
 int init_queue(struct queue **q, struct queue_properties properties);
 void uninit_queue(struct queue *q);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index ac005796b71c..7708d90b9da9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -242,13 +242,19 @@ static void kfd_process_notifier_release(struct mmu_notifier *mn,
         pqm_uninit(&p->pqm);
 
         /* Iterate over all process device data structure and check
-         * if we should reset all wavefronts */
-        list_for_each_entry(pdd, &p->per_device_data, per_device_list)
+         * if we should delete debug managers and reset all wavefronts
+         */
+        list_for_each_entry(pdd, &p->per_device_data, per_device_list) {
+                if ((pdd->dev->dbgmgr) &&
+                                (pdd->dev->dbgmgr->pasid == p->pasid))
+                        kfd_dbgmgr_destroy(pdd->dev->dbgmgr);
+
                 if (pdd->reset_wavefronts) {
                         pr_warn("amdkfd: Resetting all wave fronts\n");
                         dbgdev_wave_reset_wavefronts(pdd->dev, p);
                         pdd->reset_wavefronts = false;
                 }
+        }
 
         mutex_unlock(&p->mutex);
 
@@ -404,42 +410,52 @@ void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid)
 
         idx = srcu_read_lock(&kfd_processes_srcu);
 
+        /*
+         * Look for the process that matches the pasid. If there is no such
+         * process, we either released it in amdkfd's own notifier, or there
+         * is a bug. Unfortunately, there is no way to tell...
+         */
         hash_for_each_rcu(kfd_processes_table, i, p, kfd_processes)
-                if (p->pasid == pasid)
-                        break;
+                if (p->pasid == pasid) {
 
-        srcu_read_unlock(&kfd_processes_srcu, idx);
+                        srcu_read_unlock(&kfd_processes_srcu, idx);
 
-        BUG_ON(p->pasid != pasid);
+                        pr_debug("Unbinding process %d from IOMMU\n", pasid);
 
-        mutex_lock(&p->mutex);
+                        mutex_lock(&p->mutex);
 
-        if ((dev->dbgmgr) && (dev->dbgmgr->pasid == p->pasid))
-                kfd_dbgmgr_destroy(dev->dbgmgr);
+                        if ((dev->dbgmgr) && (dev->dbgmgr->pasid == p->pasid))
+                                kfd_dbgmgr_destroy(dev->dbgmgr);
 
-        pqm_uninit(&p->pqm);
+                        pqm_uninit(&p->pqm);
 
-        pdd = kfd_get_process_device_data(dev, p);
+                        pdd = kfd_get_process_device_data(dev, p);
 
-        if (!pdd) {
-                mutex_unlock(&p->mutex);
-                return;
-        }
+                        if (!pdd) {
+                                mutex_unlock(&p->mutex);
+                                return;
+                        }
 
-        if (pdd->reset_wavefronts) {
-                dbgdev_wave_reset_wavefronts(pdd->dev, p);
-                pdd->reset_wavefronts = false;
-        }
+                        if (pdd->reset_wavefronts) {
+                                dbgdev_wave_reset_wavefronts(pdd->dev, p);
+                                pdd->reset_wavefronts = false;
+                        }
 
-        /*
-         * Just mark pdd as unbound, because we still need it to call
-         * amd_iommu_unbind_pasid() in when the process exits.
-         * We don't call amd_iommu_unbind_pasid() here
-         * because the IOMMU called us.
-         */
-        pdd->bound = false;
+                        /*
+                         * Just mark pdd as unbound, because we still need it
+                         * to call amd_iommu_unbind_pasid() in when the
+                         * process exits.
+                         * We don't call amd_iommu_unbind_pasid() here
+                         * because the IOMMU called us.
+                         */
+                        pdd->bound = false;
 
-        mutex_unlock(&p->mutex);
+                        mutex_unlock(&p->mutex);
+
+                        return;
+                }
+
+        srcu_read_unlock(&kfd_processes_srcu, idx);
 }
 
 struct kfd_process_device *kfd_get_first_process_device_data(struct kfd_process *p)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 74909e72a009..884c96f50c3d 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -666,7 +666,7 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
                         dev->node_props.simd_count);
 
         if (dev->mem_bank_count < dev->node_props.mem_banks_count) {
-                pr_warn("kfd: mem_banks_count truncated from %d to %d\n",
+                pr_info_once("kfd: mem_banks_count truncated from %d to %d\n",
                                 dev->node_props.mem_banks_count,
                                 dev->mem_bank_count);
                 sysfs_show_32bit_prop(buffer, "mem_banks_count",
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 6080951d539d..afce1edbe250 100644
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -157,6 +157,7 @@ struct amd_ip_funcs {
         int (*hw_init)(void *handle);
         /* tears down the hw state */
         int (*hw_fini)(void *handle);
+        void (*late_fini)(void *handle);
         /* handles IP specific hw/sw changes for suspend */
         int (*suspend)(void *handle);
         /* handles IP specific hw/sw changes for resume */
diff --git a/drivers/gpu/drm/amd/include/atombios.h b/drivers/gpu/drm/amd/include/atombios.h
index 32f3e345de08..3493da5c8f0e 100644
--- a/drivers/gpu/drm/amd/include/atombios.h
+++ b/drivers/gpu/drm/amd/include/atombios.h
@@ -5538,6 +5538,78 @@ typedef struct  _ATOM_ASIC_PROFILING_INFO_V3_5
   ULONG  ulReserved[12];
 }ATOM_ASIC_PROFILING_INFO_V3_5;
 
+/* for Polars10/11 AVFS parameters */
+typedef struct  _ATOM_ASIC_PROFILING_INFO_V3_6
+{
+  ATOM_COMMON_TABLE_HEADER         asHeader;
+  ULONG  ulMaxVddc;
+  ULONG  ulMinVddc;
+  USHORT usLkgEuseIndex;
+  UCHAR  ucLkgEfuseBitLSB;
+  UCHAR  ucLkgEfuseLength;
+  ULONG  ulLkgEncodeLn_MaxDivMin;
+  ULONG  ulLkgEncodeMax;
+  ULONG  ulLkgEncodeMin;
+  EFUSE_LINEAR_FUNC_PARAM sRoFuse;
+  ULONG  ulEvvDefaultVddc;
+  ULONG  ulEvvNoCalcVddc;
+  ULONG  ulSpeed_Model;
+  ULONG  ulSM_A0;
+  ULONG  ulSM_A1;
+  ULONG  ulSM_A2;
+  ULONG  ulSM_A3;
+  ULONG  ulSM_A4;
+  ULONG  ulSM_A5;
+  ULONG  ulSM_A6;
+  ULONG  ulSM_A7;
+  UCHAR  ucSM_A0_sign;
+  UCHAR  ucSM_A1_sign;
+  UCHAR  ucSM_A2_sign;
+  UCHAR  ucSM_A3_sign;
+  UCHAR  ucSM_A4_sign;
+  UCHAR  ucSM_A5_sign;
+  UCHAR  ucSM_A6_sign;
+  UCHAR  ucSM_A7_sign;
+  ULONG  ulMargin_RO_a;
+  ULONG  ulMargin_RO_b;
+  ULONG  ulMargin_RO_c;
+  ULONG  ulMargin_fixed;
+  ULONG  ulMargin_Fmax_mean;
+  ULONG  ulMargin_plat_mean;
+  ULONG  ulMargin_Fmax_sigma;
+  ULONG  ulMargin_plat_sigma;
+  ULONG  ulMargin_DC_sigma;
+  ULONG  ulLoadLineSlop;
+  ULONG  ulaTDClimitPerDPM[8];
+  ULONG  ulaNoCalcVddcPerDPM[8];
+  ULONG  ulAVFS_meanNsigma_Acontant0;
+  ULONG  ulAVFS_meanNsigma_Acontant1;
+  ULONG  ulAVFS_meanNsigma_Acontant2;
+  USHORT usAVFS_meanNsigma_DC_tol_sigma;
+  USHORT usAVFS_meanNsigma_Platform_mean;
+  USHORT usAVFS_meanNsigma_Platform_sigma;
+  ULONG  ulGB_VDROOP_TABLE_CKSOFF_a0;
+  ULONG  ulGB_VDROOP_TABLE_CKSOFF_a1;
+  ULONG  ulGB_VDROOP_TABLE_CKSOFF_a2;
+  ULONG  ulGB_VDROOP_TABLE_CKSON_a0;
+  ULONG  ulGB_VDROOP_TABLE_CKSON_a1;
+  ULONG  ulGB_VDROOP_TABLE_CKSON_a2;
+  ULONG  ulAVFSGB_FUSE_TABLE_CKSOFF_m1;
+  USHORT usAVFSGB_FUSE_TABLE_CKSOFF_m2;
+  ULONG  ulAVFSGB_FUSE_TABLE_CKSOFF_b;
+  ULONG  ulAVFSGB_FUSE_TABLE_CKSON_m1;
+  USHORT usAVFSGB_FUSE_TABLE_CKSON_m2;
+  ULONG  ulAVFSGB_FUSE_TABLE_CKSON_b;
+  USHORT usMaxVoltage_0_25mv;
+  UCHAR  ucEnableGB_VDROOP_TABLE_CKSOFF;
+  UCHAR  ucEnableGB_VDROOP_TABLE_CKSON;
+  UCHAR  ucEnableGB_FUSE_TABLE_CKSOFF;
+  UCHAR  ucEnableGB_FUSE_TABLE_CKSON;
+  USHORT usPSM_Age_ComFactor;
+  UCHAR  ucEnableApplyAVFS_CKS_OFF_Voltage;
+  UCHAR  ucReserved;
+}ATOM_ASIC_PROFILING_INFO_V3_6;
+
 
 typedef struct _ATOM_SCLK_FCW_RANGE_ENTRY_V1{
   ULONG  ulMaxSclkFreq;
diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
index a461e155a160..7464daf89ca1 100644
--- a/drivers/gpu/drm/amd/include/cgs_common.h
+++ b/drivers/gpu/drm/amd/include/cgs_common.h
@@ -581,6 +581,9 @@ typedef int (*cgs_get_firmware_info)(struct cgs_device *cgs_device,
                                      enum cgs_ucode_id type,
                                      struct cgs_firmware_info *info);
 
+typedef int (*cgs_rel_firmware)(struct cgs_device *cgs_device,
+                                         enum cgs_ucode_id type);
+
 typedef int(*cgs_set_powergating_state)(struct cgs_device *cgs_device,
                                   enum amd_ip_block_type block_type,
                                   enum amd_powergating_state state);
@@ -645,6 +648,7 @@ struct cgs_ops {
         cgs_set_camera_voltages_t set_camera_voltages;
         /* Firmware Info */
         cgs_get_firmware_info get_firmware_info;
+        cgs_rel_firmware rel_firmware;
         /* cg pg interface*/
         cgs_set_powergating_state set_powergating_state;
         cgs_set_clockgating_state set_clockgating_state;
@@ -738,6 +742,8 @@ struct cgs_device
         CGS_CALL(set_camera_voltages,dev,mask,voltages)
 #define cgs_get_firmware_info(dev, type, info)  \
         CGS_CALL(get_firmware_info, dev, type, info)
+#define cgs_rel_firmware(dev, type)     \
+        CGS_CALL(rel_firmware, dev, type)
 #define cgs_set_powergating_state(dev, block_type, state)       \
         CGS_CALL(set_powergating_state, dev, block_type, state)
 #define cgs_set_clockgating_state(dev, block_type, state)       \
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 8e345bfddb69..e629f8a9fe93 100644
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -73,11 +73,14 @@ static int pp_sw_init(void *handle)
 
         ret = hwmgr->hwmgr_func->backend_init(hwmgr);
         if (ret)
-                goto err;
+                goto err1;
 
         pr_info("amdgpu: powerplay initialized\n");
 
         return 0;
+err1:
+        if (hwmgr->pptable_func->pptable_fini)
+                hwmgr->pptable_func->pptable_fini(hwmgr);
 err:
         pr_err("amdgpu: powerplay initialization failed\n");
         return ret;
@@ -100,6 +103,9 @@ static int pp_sw_fini(void *handle)
         if (hwmgr->hwmgr_func->backend_fini != NULL)
                 ret = hwmgr->hwmgr_func->backend_fini(hwmgr);
 
+        if (hwmgr->pptable_func->pptable_fini)
+                hwmgr->pptable_func->pptable_fini(hwmgr);
+
         return ret;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
index 46410e3c7349..fb88e4e5d625 100644
--- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
@@ -58,9 +58,6 @@ static void pem_fini(struct pp_eventmgr *eventmgr)
         pem_unregister_interrupts(eventmgr);
 
         pem_handle_event(eventmgr, AMD_PP_EVENT_UNINITIALIZE, &event_data);
-
-        if (eventmgr != NULL)
-                kfree(eventmgr);
 }
 
 int eventmgr_init(struct pp_instance *handle)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
index 24a16e49b571..92912ab20944 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
@@ -633,6 +633,8 @@ static int fiji_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
         data->vddci_control = FIJI_VOLTAGE_CONTROL_NONE;
         data->mvdd_control = FIJI_VOLTAGE_CONTROL_NONE;
 
+        data->force_pcie_gen = PP_PCIEGenInvalid;
+
         if (atomctrl_is_voltage_controled_by_gpio_v3(hwmgr,
                         VOLTAGE_TYPE_VDDC, VOLTAGE_OBJ_SVID2))
                 data->voltage_control = FIJI_VOLTAGE_CONTROL_BY_SVID2;
@@ -1830,7 +1832,7 @@ static uint16_t fiji_find_closest_vddci(struct pp_hwmgr *hwmgr, uint16_t vddci)
 
         PP_ASSERT_WITH_CODE(false,
                         "VDDCI is larger than max VDDCI in VDDCI Voltage Table!",
-                        return vddci_table->entries[i].value);
+                        return vddci_table->entries[i-1].value);
 }
 
 static int fiji_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
index fa208ada6892..efb77eda7508 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
@@ -306,10 +306,14 @@ int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr,
 {
         PHM_FUNC_CHECK(hwmgr);
 
-        if (hwmgr->hwmgr_func->store_cc6_data == NULL)
+        if (display_config == NULL)
                 return -EINVAL;
 
         hwmgr->display_config = *display_config;
+
+        if (hwmgr->hwmgr_func->store_cc6_data == NULL)
+                return -EINVAL;
+
         /* to do pass other display configuration in furture */
 
         if (hwmgr->hwmgr_func->store_cc6_data)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 1c48917da3cf..20f20e075588 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -93,6 +93,13 @@ int hwmgr_fini(struct pp_hwmgr *hwmgr)
         if (hwmgr == NULL || hwmgr->ps == NULL)
                 return -EINVAL;
 
+        /* do hwmgr finish*/
+        kfree(hwmgr->backend);
+
+        kfree(hwmgr->start_thermal_controller.function_list);
+
+        kfree(hwmgr->set_temperature_range.function_list);
+
         kfree(hwmgr->ps);
         kfree(hwmgr);
         return 0;
@@ -462,7 +469,7 @@ uint16_t phm_find_closest_vddci(struct pp_atomctrl_voltage_table *vddci_table, u
 
         PP_ASSERT_WITH_CODE(false,
                         "VDDCI is larger than max VDDCI in VDDCI Voltage Table!",
-                        return vddci_table->entries[i].value);
+                        return vddci_table->entries[i-1].value);
 }
 
 int phm_find_boot_level(void *table,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
index 347fef127ce9..2930a3355948 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
@@ -39,6 +39,7 @@ struct phm_ppt_v1_clock_voltage_dependency_record {
         uint8_t phases;
         uint8_t cks_enable;
         uint8_t cks_voffset;
+        uint32_t sclk_offset;
 };
 
 typedef struct phm_ppt_v1_clock_voltage_dependency_record phm_ppt_v1_clock_voltage_dependency_record;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
index aa6be033f21b..64ee78f7d41e 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
@@ -999,7 +999,7 @@ static int polaris10_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr,
                                 vddci = phm_find_closest_vddci(&(data->vddci_voltage_table),
                                                 (dep_table->entries[i].vddc -
                                                                 (uint16_t)data->vddc_vddci_delta));
-                                *voltage |= (vddci * VOLTAGE_SCALE) <<  VDDCI_SHIFT;
+                                *voltage |= (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;
                         }
 
                         if (POLARIS10_VOLTAGE_CONTROL_NONE == data->mvdd_control)
@@ -1296,7 +1296,6 @@ static int polaris10_populate_single_memory_level(struct pp_hwmgr *hwmgr,
         }
 
         mem_level->MclkFrequency = clock;
-        mem_level->StutterEnable = 0;
         mem_level->EnabledForThrottle = 1;
         mem_level->EnabledForActivity = 0;
         mem_level->UpHyst = 0;
@@ -1304,7 +1303,6 @@ static int polaris10_populate_single_memory_level(struct pp_hwmgr *hwmgr,
         mem_level->VoltageDownHyst = 0;
         mem_level->ActivityLevel = (uint16_t)data->mclk_activity_target;
         mem_level->StutterEnable = false;
-
         mem_level->DisplayWatermark = PPSMC_DISPLAY_WATERMARK_LOW;
 
         data->display_timing.num_existing_displays = info.display_count;
@@ -1363,7 +1361,7 @@ static int polaris10_populate_all_memory_levels(struct pp_hwmgr *hwmgr)
          * a higher state by default such that we are not effected by
          * up threshold or and MCLK DPM latency.
          */
-        levels[0].ActivityLevel = (uint16_t)data->mclk_dpm0_activity_target;
+        levels[0].ActivityLevel = 0x1f;
         CONVERT_FROM_HOST_TO_SMC_US(levels[0].ActivityLevel);
 
         data->smc_state_table.MemoryDpmLevelCount =
@@ -1761,12 +1759,9 @@ static int polaris10_populate_smc_initailial_state(struct pp_hwmgr *hwmgr)
 
 static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
 {
-        uint32_t ro, efuse, efuse2, clock_freq, volt_without_cks,
-                        volt_with_cks, value;
-        uint16_t clock_freq_u16;
+        uint32_t ro, efuse, volt_without_cks, volt_with_cks, value, max, min;
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
-        uint8_t type, i, j, cks_setting, stretch_amount, stretch_amount2,
-                        volt_offset = 0;
+        uint8_t i, stretch_amount, stretch_amount2, volt_offset = 0;
         struct phm_ppt_v1_information *table_info =
                         (struct phm_ppt_v1_information *)(hwmgr->pptable);
         struct phm_ppt_v1_clock_voltage_dependency_table *sclk_table =
@@ -1778,50 +1773,38 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
          * if the part is SS or FF. if RO >= 1660MHz, part is FF.
          */
         efuse = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC,
-                        ixSMU_EFUSE_0 + (146 * 4));
-        efuse2 = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC,
-                        ixSMU_EFUSE_0 + (148 * 4));
+                        ixSMU_EFUSE_0 + (67 * 4));
         efuse &= 0xFF000000;
         efuse = efuse >> 24;
-        efuse2 &= 0xF;
-
-        if (efuse2 == 1)
-                ro = (2300 - 1350) * efuse / 255 + 1350;
-        else
-                ro = (2500 - 1000) * efuse / 255 + 1000;
 
-        if (ro >= 1660)
-                type = 0;
-        else
-                type = 1;
+        if (hwmgr->chip_id == CHIP_POLARIS10) {
+                min = 1000;
+                max = 2300;
+        } else {
+                min = 1100;
+                max = 2100;
+        }
 
-        /* Populate Stretch amount */
-        data->smc_state_table.ClockStretcherAmount = stretch_amount;
+        ro = efuse * (max -min)/255 + min;
 
         /* Populate Sclk_CKS_masterEn0_7 and Sclk_voltageOffset */
         for (i = 0; i < sclk_table->count; i++) {
                 data->smc_state_table.Sclk_CKS_masterEn0_7 |=
                                 sclk_table->entries[i].cks_enable << i;
-                volt_without_cks = (uint32_t)((14041 *
-                        (sclk_table->entries[i].clk/100) / 10000 + 3571 + 75 - ro) * 1000 /
-                        (4026 - (13924 * (sclk_table->entries[i].clk/100) / 10000)));
-                volt_with_cks = (uint32_t)((13946 *
-                        (sclk_table->entries[i].clk/100) / 10000 + 3320 + 45 - ro) * 1000 /
-                        (3664 - (11454 * (sclk_table->entries[i].clk/100) / 10000)));
+
+                volt_without_cks =  (uint32_t)(((ro - 40) * 1000 - 2753594 - sclk_table->entries[i].clk/100 * 136418 /1000) / \
+                                        (sclk_table->entries[i].clk/100 * 1132925 /10000 - 242418)/100);
+
+                volt_with_cks = (uint32_t)((ro * 1000 -2396351 - sclk_table->entries[i].clk/100 * 329021/1000) / \
+                                (sclk_table->entries[i].clk/10000 * 649434 /1000  - 18005)/10);
+
                 if (volt_without_cks >= volt_with_cks)
                         volt_offset = (uint8_t)(((volt_without_cks - volt_with_cks +
                                         sclk_table->entries[i].cks_voffset) * 100 / 625) + 1);
+
                 data->smc_state_table.Sclk_voltageOffset[i] = volt_offset;
         }
 
-        PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PWR_CKS_ENABLE,
-                        STRETCH_ENABLE, 0x0);
-        PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PWR_CKS_ENABLE,
-                        masterReset, 0x1);
-        /* PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PWR_CKS_ENABLE, staticEnable, 0x1); */
-        PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, PWR_CKS_ENABLE,
-                        masterReset, 0x0);
-
         /* Populate CKS Lookup Table */
         if (stretch_amount == 1 || stretch_amount == 2 || stretch_amount == 5)
                 stretch_amount2 = 0;
@@ -1835,69 +1818,6 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
                                 return -EINVAL);
         }
 
-        value = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC,
-                        ixPWR_CKS_CNTL);
-        value &= 0xFFC2FF87;
-        data->smc_state_table.CKS_LOOKUPTable.CKS_LOOKUPTableEntry[0].minFreq =
-                        polaris10_clock_stretcher_lookup_table[stretch_amount2][0];
-        data->smc_state_table.CKS_LOOKUPTable.CKS_LOOKUPTableEntry[0].maxFreq =
-                        polaris10_clock_stretcher_lookup_table[stretch_amount2][1];
-        clock_freq_u16 = (uint16_t)(PP_SMC_TO_HOST_UL(data->smc_state_table.
-                        GraphicsLevel[data->smc_state_table.GraphicsDpmLevelCount - 1].SclkSetting.SclkFrequency) / 100);
-        if (polaris10_clock_stretcher_lookup_table[stretch_amount2][0] < clock_freq_u16
-        && polaris10_clock_stretcher_lookup_table[stretch_amount2][1] > clock_freq_u16) {
-                /* Program PWR_CKS_CNTL. CKS_USE_FOR_LOW_FREQ */
-                value |= (polaris10_clock_stretcher_lookup_table[stretch_amount2][3]) << 16;
-                /* Program PWR_CKS_CNTL. CKS_LDO_REFSEL */
-                value |= (polaris10_clock_stretcher_lookup_table[stretch_amount2][2]) << 18;
-                /* Program PWR_CKS_CNTL. CKS_STRETCH_AMOUNT */
-                value |= (polaris10_clock_stretch_amount_conversion
-                                [polaris10_clock_stretcher_lookup_table[stretch_amount2][3]]
-                                 [stretch_amount]) << 3;
-        }
-        CONVERT_FROM_HOST_TO_SMC_US(data->smc_state_table.CKS_LOOKUPTable.CKS_LOOKUPTableEntry[0].minFreq);
-        CONVERT_FROM_HOST_TO_SMC_US(data->smc_state_table.CKS_LOOKUPTable.CKS_LOOKUPTableEntry[0].maxFreq);
-        data->smc_state_table.CKS_LOOKUPTable.CKS_LOOKUPTableEntry[0].setting =
-                        polaris10_clock_stretcher_lookup_table[stretch_amount2][2] & 0x7F;
-        data->smc_state_table.CKS_LOOKUPTable.CKS_LOOKUPTableEntry[0].setting |=
-                        (polaris10_clock_stretcher_lookup_table[stretch_amount2][3]) << 7;
-
-        cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,
-                        ixPWR_CKS_CNTL, value);
-
-        /* Populate DDT Lookup Table */
-        for (i = 0; i < 4; i++) {
-                /* Assign the minimum and maximum VID stored
-                 * in the last row of Clock Stretcher Voltage Table.
-                 */
-                data->smc_state_table.ClockStretcherDataTable.ClockStretcherDataTableEntry[i].minVID =
-                                (uint8_t) polaris10_clock_stretcher_ddt_table[type][i][2];
-                data->smc_state_table.ClockStretcherDataTable.ClockStretcherDataTableEntry[i].maxVID =
-                                (uint8_t) polaris10_clock_stretcher_ddt_table[type][i][3];
-                /* Loop through each SCLK and check the frequency
-                 * to see if it lies within the frequency for clock stretcher.
-                 */
-                for (j = 0; j < data->smc_state_table.GraphicsDpmLevelCount; j++) {
-                        cks_setting = 0;
-                        clock_freq = PP_SMC_TO_HOST_UL(
-                                        data->smc_state_table.GraphicsLevel[j].SclkSetting.SclkFrequency);
-                        /* Check the allowed frequency against the sclk level[j].
-                         *  Sclk's endianness has already been converted,
-                         *  and it's in 10Khz unit,
-                         *  as opposed to Data table, which is in Mhz unit.
-                         */
-                        if (clock_freq >= (polaris10_clock_stretcher_ddt_table[type][i][0]) * 100) {
-                                cks_setting |= 0x2;
-                                if (clock_freq < (polaris10_clock_stretcher_ddt_table[type][i][1]) * 100)
-                                        cks_setting |= 0x1;
-                        }
-                        data->smc_state_table.ClockStretcherDataTable.ClockStretcherDataTableEntry[i].setting
-                                                        |= cks_setting << (j * 2);
-                }
-                CONVERT_FROM_HOST_TO_SMC_US(
-                        data->smc_state_table.ClockStretcherDataTable.ClockStretcherDataTableEntry[i].setting);
-        }
-
         value = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixPWR_CKS_CNTL);
         value &= 0xFFFFFFFE;
         cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixPWR_CKS_CNTL, value);
@@ -1956,6 +1876,90 @@ static int polaris10_populate_vr_config(struct pp_hwmgr *hwmgr,
         return 0;
 }
 
+
+int polaris10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
+{
+        struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
+        SMU74_Discrete_DpmTable  *table = &(data->smc_state_table);
+        int result = 0;
+        struct pp_atom_ctrl__avfs_parameters avfs_params = {0};
+        AVFS_meanNsigma_t AVFS_meanNsigma = { {0} };
+        AVFS_Sclk_Offset_t AVFS_SclkOffset = { {0} };
+        uint32_t tmp, i;
+        struct pp_smumgr *smumgr = hwmgr->smumgr;
+        struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend);
+
+        struct phm_ppt_v1_information *table_info =
+                        (struct phm_ppt_v1_information *)hwmgr->pptable;
+        struct phm_ppt_v1_clock_voltage_dependency_table *sclk_table =
+                        table_info->vdd_dep_on_sclk;
+
+
+        if (smu_data->avfs.avfs_btc_status == AVFS_BTC_NOTSUPPORTED)
+                return result;
+
+        result = atomctrl_get_avfs_information(hwmgr, &avfs_params);
+
+        if (0 == result) {
+                table->BTCGB_VDROOP_TABLE[0].a0  = PP_HOST_TO_SMC_UL(avfs_params.ulGB_VDROOP_TABLE_CKSON_a0);
+                table->BTCGB_VDROOP_TABLE[0].a1  = PP_HOST_TO_SMC_UL(avfs_params.ulGB_VDROOP_TABLE_CKSON_a1);
+                table->BTCGB_VDROOP_TABLE[0].a2  = PP_HOST_TO_SMC_UL(avfs_params.ulGB_VDROOP_TABLE_CKSON_a2);
+                table->BTCGB_VDROOP_TABLE[1].a0  = PP_HOST_TO_SMC_UL(avfs_params.ulGB_VDROOP_TABLE_CKSOFF_a0);
+                table->BTCGB_VDROOP_TABLE[1].a1  = PP_HOST_TO_SMC_UL(avfs_params.ulGB_VDROOP_TABLE_CKSOFF_a1);
+                table->BTCGB_VDROOP_TABLE[1].a2  = PP_HOST_TO_SMC_UL(avfs_params.ulGB_VDROOP_TABLE_CKSOFF_a2);
+                table->AVFSGB_VDROOP_TABLE[0].m1 = PP_HOST_TO_SMC_UL(avfs_params.ulAVFSGB_FUSE_TABLE_CKSON_m1);
+                table->AVFSGB_VDROOP_TABLE[0].m2 = PP_HOST_TO_SMC_US(avfs_params.usAVFSGB_FUSE_TABLE_CKSON_m2);
+                table->AVFSGB_VDROOP_TABLE[0].b  = PP_HOST_TO_SMC_UL(avfs_params.ulAVFSGB_FUSE_TABLE_CKSON_b);
+                table->AVFSGB_VDROOP_TABLE[0].m1_shift = 24;
+                table->AVFSGB_VDROOP_TABLE[0].m2_shift  = 12;
+                table->AVFSGB_VDROOP_TABLE[1].m1 = PP_HOST_TO_SMC_UL(avfs_params.ulAVFSGB_FUSE_TABLE_CKSOFF_m1);
+                table->AVFSGB_VDROOP_TABLE[1].m2 = PP_HOST_TO_SMC_US(avfs_params.usAVFSGB_FUSE_TABLE_CKSOFF_m2);
+                table->AVFSGB_VDROOP_TABLE[1].b  = PP_HOST_TO_SMC_UL(avfs_params.ulAVFSGB_FUSE_TABLE_CKSOFF_b);
+                table->AVFSGB_VDROOP_TABLE[1].m1_shift = 24;
+                table->AVFSGB_VDROOP_TABLE[1].m2_shift  = 12;
+                table->MaxVoltage                = PP_HOST_TO_SMC_US(avfs_params.usMaxVoltage_0_25mv);
+                AVFS_meanNsigma.Aconstant[0]      = PP_HOST_TO_SMC_UL(avfs_params.ulAVFS_meanNsigma_Acontant0);
+                AVFS_meanNsigma.Aconstant[1]      = PP_HOST_TO_SMC_UL(avfs_params.ulAVFS_meanNsigma_Acontant1);
+                AVFS_meanNsigma.Aconstant[2]      = PP_HOST_TO_SMC_UL(avfs_params.ulAVFS_meanNsigma_Acontant2);
+                AVFS_meanNsigma.DC_tol_sigma      = PP_HOST_TO_SMC_US(avfs_params.usAVFS_meanNsigma_DC_tol_sigma);
+                AVFS_meanNsigma.Platform_mean     = PP_HOST_TO_SMC_US(avfs_params.usAVFS_meanNsigma_Platform_mean);
+                AVFS_meanNsigma.PSM_Age_CompFactor = PP_HOST_TO_SMC_US(avfs_params.usPSM_Age_ComFactor);
+                AVFS_meanNsigma.Platform_sigma     = PP_HOST_TO_SMC_US(avfs_params.usAVFS_meanNsigma_Platform_sigma);
+
+                for (i = 0; i < NUM_VFT_COLUMNS; i++) {
+                        AVFS_meanNsigma.Static_Voltage_Offset[i] = (uint8_t)(sclk_table->entries[i].cks_voffset * 100 / 625);
+                        AVFS_SclkOffset.Sclk_Offset[i] = PP_HOST_TO_SMC_US((uint16_t)(sclk_table->entries[i].sclk_offset) / 100);
+                }
+
+                result = polaris10_read_smc_sram_dword(smumgr,
+                                SMU7_FIRMWARE_HEADER_LOCATION + offsetof(SMU74_Firmware_Header, AvfsMeanNSigma),
+                                &tmp, data->sram_end);
+
+                polaris10_copy_bytes_to_smc(smumgr,
+                                        tmp,
+                                        (uint8_t *)&AVFS_meanNsigma,
+                                        sizeof(AVFS_meanNsigma_t),
+                                        data->sram_end);
+
+                result = polaris10_read_smc_sram_dword(smumgr,
+                                SMU7_FIRMWARE_HEADER_LOCATION + offsetof(SMU74_Firmware_Header, AvfsSclkOffsetTable),
+                                &tmp, data->sram_end);
+                polaris10_copy_bytes_to_smc(smumgr,
+                                        tmp,
+                                        (uint8_t *)&AVFS_SclkOffset,
+                                        sizeof(AVFS_Sclk_Offset_t),
+                                        data->sram_end);
+
+                data->avfs_vdroop_override_setting = (avfs_params.ucEnableGB_VDROOP_TABLE_CKSON << BTCGB0_Vdroop_Enable_SHIFT) |
+                                                (avfs_params.ucEnableGB_VDROOP_TABLE_CKSOFF << BTCGB1_Vdroop_Enable_SHIFT) |
+                                                (avfs_params.ucEnableGB_FUSE_TABLE_CKSON << AVFSGB0_Vdroop_Enable_SHIFT) |
+                                                (avfs_params.ucEnableGB_FUSE_TABLE_CKSOFF << AVFSGB1_Vdroop_Enable_SHIFT);
+                data->apply_avfs_cks_off_voltage = (avfs_params.ucEnableApplyAVFS_CKS_OFF_Voltage == 1) ? true : false;
+        }
+        return result;
+}
+
+
 /**
 * Initializes the SMC table and uploads it
 *
@@ -2056,6 +2060,10 @@ static int polaris10_init_smc_table(struct pp_hwmgr *hwmgr)
                                 "Failed to populate Clock Stretcher Data Table!",
                                 return result);
         }
+
+        result = polaris10_populate_avfs_parameters(hwmgr);
+        PP_ASSERT_WITH_CODE(0 == result, "Failed to populate AVFS Parameters!", return result;);
+
         table->CurrSclkPllRange = 0xff;
         table->GraphicsVoltageChangeEnable  = 1;
         table->GraphicsThermThrottleEnable  = 1;
@@ -2252,6 +2260,9 @@ static int polaris10_enable_deep_sleep_master_switch(struct pp_hwmgr *hwmgr)
 static int polaris10_enable_sclk_mclk_dpm(struct pp_hwmgr *hwmgr)
 {
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
+        uint32_t soft_register_value = 0;
+        uint32_t handshake_disables_offset = data->soft_regs_start
+                                + offsetof(SMU74_SoftRegisters, HandshakeDisables);
 
         /* enable SCLK dpm */
         if (!data->sclk_dpm_key_disabled)
@@ -2262,6 +2273,12 @@ static int polaris10_enable_sclk_mclk_dpm(struct pp_hwmgr *hwmgr)
 
         /* enable MCLK dpm */
         if (0 == data->mclk_dpm_key_disabled) {
+/* Disable UVD - SMU handshake for MCLK. */
+                soft_register_value = cgs_read_ind_register(hwmgr->device,
+                                        CGS_IND_REG__SMC, handshake_disables_offset);
+                soft_register_value |= SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
+                cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,
+                                handshake_disables_offset, soft_register_value);
 
                 PP_ASSERT_WITH_CODE(
                                 (0 == smum_send_msg_to_smc(hwmgr->smumgr,
@@ -2269,7 +2286,6 @@ static int polaris10_enable_sclk_mclk_dpm(struct pp_hwmgr *hwmgr)
                                 "Failed to enable MCLK DPM during DPM Start Function!",
                                 return -1);
 
-
                 PHM_WRITE_FIELD(hwmgr->device, MC_SEQ_CNTL_3, CAC_EN, 0x1);
 
                 cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixLCAC_MC0_CNTL, 0x5);
@@ -2606,6 +2622,7 @@ int polaris10_set_features_platform_caps(struct pp_hwmgr *hwmgr)
 
         phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                                                 PHM_PlatformCaps_FanSpeedInTableIsRPM);
+
         if (hwmgr->chip_id == CHIP_POLARIS11)
                 phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                                         PHM_PlatformCaps_SPLLShutdownSupport);
@@ -2938,6 +2955,11 @@ int polaris10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
         data->vddci_control = POLARIS10_VOLTAGE_CONTROL_NONE;
         data->mvdd_control = POLARIS10_VOLTAGE_CONTROL_NONE;
 
+        data->enable_tdc_limit_feature = true;
+        data->enable_pkg_pwr_tracking_feature = true;
+        data->force_pcie_gen = PP_PCIEGenInvalid;
+        data->mclk_stutter_mode_threshold = 40000;
+
         if (atomctrl_is_voltage_controled_by_gpio_v3(hwmgr,
                         VOLTAGE_TYPE_VDDC, VOLTAGE_OBJ_SVID2))
                 data->voltage_control = POLARIS10_VOLTAGE_CONTROL_BY_SVID2;
@@ -2962,6 +2984,10 @@ int polaris10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
                         data->vddci_control = POLARIS10_VOLTAGE_CONTROL_BY_SVID2;
         }
 
+        if (table_info->cac_dtp_table->usClockStretchAmount != 0)
+                phm_cap_set(hwmgr->platform_descriptor.platformCaps,
+                                        PHM_PlatformCaps_ClockStretcher);
+
         polaris10_set_features_platform_caps(hwmgr);
 
         polaris10_init_dpm_defaults(hwmgr);
@@ -3520,10 +3546,11 @@ static int polaris10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,
         ATOM_Tonga_State *state_entry = (ATOM_Tonga_State *)state;
         ATOM_Tonga_POWERPLAYTABLE *powerplay_table =
                         (ATOM_Tonga_POWERPLAYTABLE *)pp_table;
-        ATOM_Tonga_SCLK_Dependency_Table *sclk_dep_table =
-                        (ATOM_Tonga_SCLK_Dependency_Table *)
+        PPTable_Generic_SubTable_Header *sclk_dep_table =
+                        (PPTable_Generic_SubTable_Header *)
                         (((unsigned long)powerplay_table) +
                                 le16_to_cpu(powerplay_table->usSclkDependencyTableOffset));
+
         ATOM_Tonga_MCLK_Dependency_Table *mclk_dep_table =
                         (ATOM_Tonga_MCLK_Dependency_Table *)
                         (((unsigned long)powerplay_table) +
@@ -3575,7 +3602,11 @@ static int polaris10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,
         /* Performance levels are arranged from low to high. */
         performance_level->memory_clock = mclk_dep_table->entries
                         [state_entry->ucMemoryClockIndexLow].ulMclk;
-        performance_level->engine_clock = sclk_dep_table->entries
+        if (sclk_dep_table->ucRevId == 0)
+                performance_level->engine_clock = ((ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table)->entries
+                        [state_entry->ucEngineClockIndexLow].ulSclk;
+        else if (sclk_dep_table->ucRevId == 1)
+                performance_level->engine_clock = ((ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table)->entries
                         [state_entry->ucEngineClockIndexLow].ulSclk;
         performance_level->pcie_gen = get_pcie_gen_support(data->pcie_gen_cap,
                         state_entry->ucPCIEGenLow);
@@ -3586,8 +3617,14 @@ static int polaris10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,
                         [polaris10_power_state->performance_level_count++]);
         performance_level->memory_clock = mclk_dep_table->entries
                         [state_entry->ucMemoryClockIndexHigh].ulMclk;
-        performance_level->engine_clock = sclk_dep_table->entries
+
+        if (sclk_dep_table->ucRevId == 0)
+                performance_level->engine_clock = ((ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table)->entries
                         [state_entry->ucEngineClockIndexHigh].ulSclk;
+        else if (sclk_dep_table->ucRevId == 1)
+                performance_level->engine_clock = ((ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table)->entries
+                        [state_entry->ucEngineClockIndexHigh].ulSclk;
+
         performance_level->pcie_gen = get_pcie_gen_support(data->pcie_gen_cap,
                         state_entry->ucPCIEGenHigh);
         performance_level->pcie_lane = get_pcie_lane_support(data->pcie_lane_cap,
@@ -3645,7 +3682,6 @@ static int polaris10_get_pp_table_entry(struct pp_hwmgr *hwmgr,
                 switch (state->classification.ui_label) {
                 case PP_StateUILabel_Performance:
                         data->use_pcie_performance_levels = true;
-
                         for (i = 0; i < ps->performance_level_count; i++) {
                                 if (data->pcie_gen_performance.max <
                                                 ps->performance_levels[i].pcie_gen)
@@ -3661,7 +3697,6 @@ static int polaris10_get_pp_table_entry(struct pp_hwmgr *hwmgr,
                                                 ps->performance_levels[i].pcie_lane)
                                         data->pcie_lane_performance.max =
                                                         ps->performance_levels[i].pcie_lane;
-
                                 if (data->pcie_lane_performance.min >
                                                 ps->performance_levels[i].pcie_lane)
                                         data->pcie_lane_performance.min =
@@ -4187,12 +4222,9 @@ int polaris10_update_samu_dpm(struct pp_hwmgr *hwmgr, bool bgate)
 {
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
         uint32_t mm_boot_level_offset, mm_boot_level_value;
-        struct phm_ppt_v1_information *table_info =
-                        (struct phm_ppt_v1_information *)(hwmgr->pptable);
 
         if (!bgate) {
-                data->smc_state_table.SamuBootLevel =
-                                (uint8_t) (table_info->mm_dep_table->count - 1);
+                data->smc_state_table.SamuBootLevel = 0;
                 mm_boot_level_offset = data->dpm_table_start +
                                 offsetof(SMU74_Discrete_DpmTable, SamuBootLevel);
                 mm_boot_level_offset /= 4;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
index beedf35cbfa6..d717789441f5 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
@@ -312,6 +312,9 @@ struct polaris10_hwmgr {
 
         /* soft pptable for re-uploading into smu */
         void *soft_pp_table;
+
+        uint32_t                              avfs_vdroop_override_setting;
+        bool                                  apply_avfs_cks_off_voltage;
 };
 
 /* To convert to Q8.8 format for firmware */
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.c
index 0b99ab3ba0c5..ae96f14b827c 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.c
@@ -286,7 +286,7 @@ int polaris10_populate_pm_fuses(struct pp_hwmgr *hwmgr)
 
                 if (polaris10_copy_bytes_to_smc(hwmgr->smumgr, pm_fuse_table_offset,
                                 (uint8_t *)&data->power_tune_table,
-                                sizeof(struct SMU74_Discrete_PmFuses), data->sram_end))
+                                (sizeof(struct SMU74_Discrete_PmFuses) - 92), data->sram_end))
                         PP_ASSERT_WITH_CODE(false,
                                         "Attempt to download PmFuseTable Failed!",
                                         return -EINVAL);
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c
index aba167f7d167..b206632d4650 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c
@@ -625,10 +625,14 @@ static int tf_polaris10_thermal_avfs_enable(struct pp_hwmgr *hwmgr,
         int ret;
         struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr->smumgr);
         struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend);
+        struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
 
-        if (smu_data->avfs.avfs_btc_status != AVFS_BTC_ENABLEAVFS)
+        if (smu_data->avfs.avfs_btc_status == AVFS_BTC_NOTSUPPORTED)
                 return 0;
 
+        ret = smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                        PPSMC_MSG_SetGBDroopSettings, data->avfs_vdroop_override_setting);
+
         ret = (smum_send_msg_to_smc(smumgr, PPSMC_MSG_EnableAvfs) == 0) ?
                         0 : -1;
 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
index 58742e0d1492..a3c38bbd1e94 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
@@ -44,6 +44,20 @@ bool acpi_atcs_functions_supported(void *device, uint32_t index)
         return result == 0 ? (output_buf.function_bits & (1 << (index - 1))) != 0 : false;
 }
 
+bool acpi_atcs_notify_pcie_device_ready(void *device)
+{
+        int32_t temp_buffer = 1;
+
+        return cgs_call_acpi_method(device, CGS_ACPI_METHOD_ATCS,
+                                ATCS_FUNCTION_PCIE_DEVICE_READY_NOTIFICATION,
+                                                &temp_buffer,
+                                                NULL,
+                                                0,
+                                                sizeof(temp_buffer),
+                                                0);
+}
+
+
 int acpi_pcie_perf_request(void *device, uint8_t perf_req, bool advertise)
 {
         struct atcs_pref_req_input atcs_input;
@@ -52,7 +66,7 @@ int acpi_pcie_perf_request(void *device, uint8_t perf_req, bool advertise)
         int result;
         struct cgs_system_info info = {0};
 
-        if (!acpi_atcs_functions_supported(device, ATCS_FUNCTION_PCIE_PERFORMANCE_REQUEST))
+        if( 0 != acpi_atcs_notify_pcie_device_ready(device))
                 return -EINVAL;
 
         info.size = sizeof(struct cgs_system_info);
@@ -77,7 +91,7 @@ int acpi_pcie_perf_request(void *device, uint8_t perf_req, bool advertise)
                                                 ATCS_FUNCTION_PCIE_PERFORMANCE_REQUEST,
                                                 &atcs_input,
                                                 &atcs_output,
-                                                0,
+                                                1,
                                                 sizeof(atcs_input),
                                                 sizeof(atcs_output));
                 if (result != 0)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
index da9f5f1b6dc2..bf4e18fd3872 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
@@ -1302,3 +1302,46 @@ int atomctrl_get_smc_sclk_range_table(struct pp_hwmgr *hwmgr, struct pp_atom_ctr
 
         return 0;
 }
+
+int atomctrl_get_avfs_information(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl__avfs_parameters *param)
+{
+        ATOM_ASIC_PROFILING_INFO_V3_6 *profile = NULL;
+
+        if (param == NULL)
+                return -EINVAL;
+
+        profile = (ATOM_ASIC_PROFILING_INFO_V3_6 *)
+                        cgs_atom_get_data_table(hwmgr->device,
+                                        GetIndexIntoMasterTable(DATA, ASIC_ProfilingInfo),
+                                        NULL, NULL, NULL);
+        if (!profile)
+                return -1;
+
+        param->ulAVFS_meanNsigma_Acontant0 = profile->ulAVFS_meanNsigma_Acontant0;
+        param->ulAVFS_meanNsigma_Acontant1 = profile->ulAVFS_meanNsigma_Acontant1;
+        param->ulAVFS_meanNsigma_Acontant2 = profile->ulAVFS_meanNsigma_Acontant2;
+        param->usAVFS_meanNsigma_DC_tol_sigma = profile->usAVFS_meanNsigma_DC_tol_sigma;
+        param->usAVFS_meanNsigma_Platform_mean = profile->usAVFS_meanNsigma_Platform_mean;
+        param->usAVFS_meanNsigma_Platform_sigma = profile->usAVFS_meanNsigma_Platform_sigma;
+        param->ulGB_VDROOP_TABLE_CKSOFF_a0 = profile->ulGB_VDROOP_TABLE_CKSOFF_a0;
+        param->ulGB_VDROOP_TABLE_CKSOFF_a1 = profile->ulGB_VDROOP_TABLE_CKSOFF_a1;
+        param->ulGB_VDROOP_TABLE_CKSOFF_a2 = profile->ulGB_VDROOP_TABLE_CKSOFF_a2;
+        param->ulGB_VDROOP_TABLE_CKSON_a0 = profile->ulGB_VDROOP_TABLE_CKSON_a0;
+        param->ulGB_VDROOP_TABLE_CKSON_a1 = profile->ulGB_VDROOP_TABLE_CKSON_a1;
+        param->ulGB_VDROOP_TABLE_CKSON_a2 = profile->ulGB_VDROOP_TABLE_CKSON_a2;
+        param->ulAVFSGB_FUSE_TABLE_CKSOFF_m1 = profile->ulAVFSGB_FUSE_TABLE_CKSOFF_m1;
+        param->usAVFSGB_FUSE_TABLE_CKSOFF_m2 = profile->usAVFSGB_FUSE_TABLE_CKSOFF_m2;
+        param->ulAVFSGB_FUSE_TABLE_CKSOFF_b = profile->ulAVFSGB_FUSE_TABLE_CKSOFF_b;
+        param->ulAVFSGB_FUSE_TABLE_CKSON_m1 = profile->ulAVFSGB_FUSE_TABLE_CKSON_m1;
+        param->usAVFSGB_FUSE_TABLE_CKSON_m2 = profile->usAVFSGB_FUSE_TABLE_CKSON_m2;
+        param->ulAVFSGB_FUSE_TABLE_CKSON_b = profile->ulAVFSGB_FUSE_TABLE_CKSON_b;
+        param->usMaxVoltage_0_25mv = profile->usMaxVoltage_0_25mv;
+        param->ucEnableGB_VDROOP_TABLE_CKSOFF = profile->ucEnableGB_VDROOP_TABLE_CKSOFF;
+        param->ucEnableGB_VDROOP_TABLE_CKSON = profile->ucEnableGB_VDROOP_TABLE_CKSON;
+        param->ucEnableGB_FUSE_TABLE_CKSOFF = profile->ucEnableGB_FUSE_TABLE_CKSOFF;
+        param->ucEnableGB_FUSE_TABLE_CKSON = profile->ucEnableGB_FUSE_TABLE_CKSON;
+        param->usPSM_Age_ComFactor = profile->usPSM_Age_ComFactor;
+        param->ucEnableApplyAVFS_CKS_OFF_Voltage = profile->ucEnableApplyAVFS_CKS_OFF_Voltage;
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
index d24ebb566905..248c5db5f380 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
@@ -250,6 +250,35 @@ struct pp_atomctrl_gpio_pin_assignment {
 };
 typedef struct pp_atomctrl_gpio_pin_assignment pp_atomctrl_gpio_pin_assignment;
 
+struct pp_atom_ctrl__avfs_parameters {
+        uint32_t  ulAVFS_meanNsigma_Acontant0;
+        uint32_t  ulAVFS_meanNsigma_Acontant1;
+        uint32_t  ulAVFS_meanNsigma_Acontant2;
+        uint16_t usAVFS_meanNsigma_DC_tol_sigma;
+        uint16_t usAVFS_meanNsigma_Platform_mean;
+        uint16_t usAVFS_meanNsigma_Platform_sigma;
+        uint32_t  ulGB_VDROOP_TABLE_CKSOFF_a0;
+        uint32_t  ulGB_VDROOP_TABLE_CKSOFF_a1;
+        uint32_t  ulGB_VDROOP_TABLE_CKSOFF_a2;
+        uint32_t  ulGB_VDROOP_TABLE_CKSON_a0;
+        uint32_t  ulGB_VDROOP_TABLE_CKSON_a1;
+        uint32_t  ulGB_VDROOP_TABLE_CKSON_a2;
+        uint32_t  ulAVFSGB_FUSE_TABLE_CKSOFF_m1;
+        uint16_t  usAVFSGB_FUSE_TABLE_CKSOFF_m2;
+        uint32_t  ulAVFSGB_FUSE_TABLE_CKSOFF_b;
+        uint32_t  ulAVFSGB_FUSE_TABLE_CKSON_m1;
+        uint16_t  usAVFSGB_FUSE_TABLE_CKSON_m2;
+        uint32_t  ulAVFSGB_FUSE_TABLE_CKSON_b;
+        uint16_t  usMaxVoltage_0_25mv;
+        uint8_t  ucEnableGB_VDROOP_TABLE_CKSOFF;
+        uint8_t  ucEnableGB_VDROOP_TABLE_CKSON;
+        uint8_t  ucEnableGB_FUSE_TABLE_CKSOFF;
+        uint8_t  ucEnableGB_FUSE_TABLE_CKSON;
+        uint16_t usPSM_Age_ComFactor;
+        uint8_t  ucEnableApplyAVFS_CKS_OFF_Voltage;
+        uint8_t  ucReserved;
+};
+
 extern bool atomctrl_get_pp_assign_pin(struct pp_hwmgr *hwmgr, const uint32_t pinId, pp_atomctrl_gpio_pin_assignment *gpio_pin_assignment);
 extern int atomctrl_get_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type, uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage);
 extern uint32_t atomctrl_get_mpll_reference_clock(struct pp_hwmgr *hwmgr);
@@ -278,5 +307,8 @@ extern int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clo
 extern int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
                                 uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage);
 extern int atomctrl_get_smc_sclk_range_table(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl_sclk_range_table *table);
+
+extern int atomctrl_get_avfs_information(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl__avfs_parameters *param);
+
 #endif
 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
index 16fed487973b..233eb7f36c1d 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
@@ -2847,27 +2847,6 @@ static int tonga_setup_default_dpm_tables(struct pp_hwmgr *hwmgr)
                 }
         }
 
-        /* Initialize Vddc DPM table based on allow Vddc values.  And populate corresponding std values. */
-        for (i = 0; i < allowed_vdd_sclk_table->count; i++) {
-                data->dpm_table.vddc_table.dpm_levels[i].value = allowed_vdd_mclk_table->entries[i].vddc;
-                /* tonga_hwmgr->dpm_table.VddcTable.dpm_levels[i].param1 = stdVoltageTable->entries[i].Leakage; */
-                /* param1 is for corresponding std voltage */
-                data->dpm_table.vddc_table.dpm_levels[i].enabled = 1;
-        }
-        data->dpm_table.vddc_table.count = allowed_vdd_sclk_table->count;
-
-        if (NULL != allowed_vdd_mclk_table) {
-                /* Initialize Vddci DPM table based on allow Mclk values */
-                for (i = 0; i < allowed_vdd_mclk_table->count; i++) {
-                        data->dpm_table.vdd_ci_table.dpm_levels[i].value = allowed_vdd_mclk_table->entries[i].vddci;
-                        data->dpm_table.vdd_ci_table.dpm_levels[i].enabled = 1;
-                        data->dpm_table.mvdd_table.dpm_levels[i].value = allowed_vdd_mclk_table->entries[i].mvdd;
-                        data->dpm_table.mvdd_table.dpm_levels[i].enabled = 1;
-                }
-                data->dpm_table.vdd_ci_table.count = allowed_vdd_mclk_table->count;
-                data->dpm_table.mvdd_table.count = allowed_vdd_mclk_table->count;
-        }
-
         /* setup PCIE gen speed levels*/
         tonga_setup_default_pcie_tables(hwmgr);
 
@@ -4510,6 +4489,7 @@ int tonga_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
         data->vdd_ci_control = TONGA_VOLTAGE_CONTROL_NONE;
         data->vdd_gfx_control = TONGA_VOLTAGE_CONTROL_NONE;
         data->mvdd_control = TONGA_VOLTAGE_CONTROL_NONE;
+        data->force_pcie_gen = PP_PCIEGenInvalid;
 
         if (atomctrl_is_voltage_controled_by_gpio_v3(hwmgr,
                                 VOLTAGE_TYPE_VDDC, VOLTAGE_OBJ_SVID2)) {
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h
index 1b44f4e9b8f5..f127198aafc4 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h
@@ -197,6 +197,22 @@ typedef struct _ATOM_Tonga_SCLK_Dependency_Table {
         ATOM_Tonga_SCLK_Dependency_Record entries[1];                            /* Dynamically allocate entries. */
 } ATOM_Tonga_SCLK_Dependency_Table;
 
+typedef struct _ATOM_Polaris_SCLK_Dependency_Record {
+        UCHAR  ucVddInd;                                                                                        /* Base voltage */
+        USHORT usVddcOffset;                                                                            /* Offset relative to base voltage */
+        ULONG ulSclk;
+        USHORT usEdcCurrent;
+        UCHAR  ucReliabilityTemperature;
+        UCHAR  ucCKSVOffsetandDisable;                  /* Bits 0~6: Voltage offset for CKS, Bit 7: Disable/enable for the SCLK level. */
+        ULONG  ulSclkOffset;
+} ATOM_Polaris_SCLK_Dependency_Record;
+
+typedef struct _ATOM_Polaris_SCLK_Dependency_Table {
+        UCHAR ucRevId;
+        UCHAR ucNumEntries;                                                     /* Number of entries. */
+        ATOM_Polaris_SCLK_Dependency_Record entries[1];                          /* Dynamically allocate entries. */
+} ATOM_Polaris_SCLK_Dependency_Table;
+
 typedef struct _ATOM_Tonga_PCIE_Record {
         UCHAR ucPCIEGenSpeed;
         UCHAR usPCIELaneWidth;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
index 10e3630ee39d..671fdb4d615a 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
@@ -408,41 +408,78 @@ static int get_mclk_voltage_dependency_table(
 static int get_sclk_voltage_dependency_table(
                 struct pp_hwmgr *hwmgr,
                 phm_ppt_v1_clock_voltage_dependency_table **pp_tonga_sclk_dep_table,
-                const ATOM_Tonga_SCLK_Dependency_Table * sclk_dep_table
+                const PPTable_Generic_SubTable_Header *sclk_dep_table
                 )
 {
         uint32_t table_size, i;
         phm_ppt_v1_clock_voltage_dependency_table *sclk_table;
 
-        PP_ASSERT_WITH_CODE((0 != sclk_dep_table->ucNumEntries),
-                "Invalid PowerPlay Table!", return -1);
+        if (sclk_dep_table->ucRevId < 1) {
+                const ATOM_Tonga_SCLK_Dependency_Table *tonga_table =
+                            (ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table;
 
-        table_size = sizeof(uint32_t) + sizeof(phm_ppt_v1_clock_voltage_dependency_record)
-                * sclk_dep_table->ucNumEntries;
+                PP_ASSERT_WITH_CODE((0 != tonga_table->ucNumEntries),
+                        "Invalid PowerPlay Table!", return -1);
 
-        sclk_table = (phm_ppt_v1_clock_voltage_dependency_table *)
-                kzalloc(table_size, GFP_KERNEL);
+                table_size = sizeof(uint32_t) + sizeof(phm_ppt_v1_clock_voltage_dependency_record)
+                        * tonga_table->ucNumEntries;
 
-        if (NULL == sclk_table)
-                return -ENOMEM;
+                sclk_table = (phm_ppt_v1_clock_voltage_dependency_table *)
+                        kzalloc(table_size, GFP_KERNEL);
 
-        memset(sclk_table, 0x00, table_size);
-
-        sclk_table->count = (uint32_t)sclk_dep_table->ucNumEntries;
-
-        for (i = 0; i < sclk_dep_table->ucNumEntries; i++) {
-                sclk_table->entries[i].vddInd =
-                        sclk_dep_table->entries[i].ucVddInd;
-                sclk_table->entries[i].vdd_offset =
-                        sclk_dep_table->entries[i].usVddcOffset;
-                sclk_table->entries[i].clk =
-                        sclk_dep_table->entries[i].ulSclk;
-                sclk_table->entries[i].cks_enable =
-                        (((sclk_dep_table->entries[i].ucCKSVOffsetandDisable & 0x80) >> 7) == 0) ? 1 : 0;
-                sclk_table->entries[i].cks_voffset =
-                        (sclk_dep_table->entries[i].ucCKSVOffsetandDisable & 0x7F);
-        }
+                if (NULL == sclk_table)
+                        return -ENOMEM;
+
+                memset(sclk_table, 0x00, table_size);
+
+                sclk_table->count = (uint32_t)tonga_table->ucNumEntries;
+
+                for (i = 0; i < tonga_table->ucNumEntries; i++) {
+                        sclk_table->entries[i].vddInd =
+                                tonga_table->entries[i].ucVddInd;
+                        sclk_table->entries[i].vdd_offset =
+                                tonga_table->entries[i].usVddcOffset;
+                        sclk_table->entries[i].clk =
+                                tonga_table->entries[i].ulSclk;
+                        sclk_table->entries[i].cks_enable =
+                                (((tonga_table->entries[i].ucCKSVOffsetandDisable & 0x80) >> 7) == 0) ? 1 : 0;
+                        sclk_table->entries[i].cks_voffset =
+                                (tonga_table->entries[i].ucCKSVOffsetandDisable & 0x7F);
+                }
+        } else {
+                const ATOM_Polaris_SCLK_Dependency_Table *polaris_table =
+                            (ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table;
+
+                PP_ASSERT_WITH_CODE((0 != polaris_table->ucNumEntries),
+                        "Invalid PowerPlay Table!", return -1);
+
+                table_size = sizeof(uint32_t) + sizeof(phm_ppt_v1_clock_voltage_dependency_record)
+                        * polaris_table->ucNumEntries;
+
+                sclk_table = (phm_ppt_v1_clock_voltage_dependency_table *)
+                        kzalloc(table_size, GFP_KERNEL);
 
+                if (NULL == sclk_table)
+                        return -ENOMEM;
+
+                memset(sclk_table, 0x00, table_size);
+
+                sclk_table->count = (uint32_t)polaris_table->ucNumEntries;
+
+                for (i = 0; i < polaris_table->ucNumEntries; i++) {
+                        sclk_table->entries[i].vddInd =
+                                polaris_table->entries[i].ucVddInd;
+                        sclk_table->entries[i].vdd_offset =
+                                polaris_table->entries[i].usVddcOffset;
+                        sclk_table->entries[i].clk =
+                                polaris_table->entries[i].ulSclk;
+                        sclk_table->entries[i].cks_enable =
+                                (((polaris_table->entries[i].ucCKSVOffsetandDisable & 0x80) >> 7) == 0) ? 1 : 0;
+                        sclk_table->entries[i].cks_voffset =
+                                (polaris_table->entries[i].ucCKSVOffsetandDisable & 0x7F);
+                        sclk_table->entries[i].sclk_offset = polaris_table->entries[i].ulSclkOffset;
+                }
+        }
         *pp_tonga_sclk_dep_table = sclk_table;
 
         return 0;
@@ -708,8 +745,8 @@ static int init_clock_voltage_dependency(
         const ATOM_Tonga_MCLK_Dependency_Table *mclk_dep_table =
                 (const ATOM_Tonga_MCLK_Dependency_Table *)(((unsigned long) powerplay_table) +
                 le16_to_cpu(powerplay_table->usMclkDependencyTableOffset));
-        const ATOM_Tonga_SCLK_Dependency_Table *sclk_dep_table =
-                (const ATOM_Tonga_SCLK_Dependency_Table *)(((unsigned long) powerplay_table) +
+        const PPTable_Generic_SubTable_Header *sclk_dep_table =
+                (const PPTable_Generic_SubTable_Header *)(((unsigned long) powerplay_table) +
                 le16_to_cpu(powerplay_table->usSclkDependencyTableOffset));
         const ATOM_Tonga_Hard_Limit_Table *pHardLimits =
                 (const ATOM_Tonga_Hard_Limit_Table *)(((unsigned long) powerplay_table) +
@@ -1040,48 +1077,44 @@ int tonga_pp_tables_uninitialize(struct pp_hwmgr *hwmgr)
         struct phm_ppt_v1_information *pp_table_information =
                 (struct phm_ppt_v1_information *)(hwmgr->pptable);
 
-        if (NULL != hwmgr->soft_pp_table) {
-                kfree(hwmgr->soft_pp_table);
+        if (NULL != hwmgr->soft_pp_table)
                 hwmgr->soft_pp_table = NULL;
-        }
 
-        if (NULL != pp_table_information->vdd_dep_on_sclk)
-                pp_table_information->vdd_dep_on_sclk = NULL;
+        kfree(pp_table_information->vdd_dep_on_sclk);
+        pp_table_information->vdd_dep_on_sclk = NULL;
 
-        if (NULL != pp_table_information->vdd_dep_on_mclk)
-                pp_table_information->vdd_dep_on_mclk = NULL;
+        kfree(pp_table_information->vdd_dep_on_mclk);
+        pp_table_information->vdd_dep_on_mclk = NULL;
 
-        if (NULL != pp_table_information->valid_mclk_values)
-                pp_table_information->valid_mclk_values = NULL;
+        kfree(pp_table_information->valid_mclk_values);
+        pp_table_information->valid_mclk_values = NULL;
 
-        if (NULL != pp_table_information->valid_sclk_values)
-                pp_table_information->valid_sclk_values = NULL;
+        kfree(pp_table_information->valid_sclk_values);
+        pp_table_information->valid_sclk_values = NULL;
 
-        if (NULL != pp_table_information->vddc_lookup_table)
-                pp_table_information->vddc_lookup_table = NULL;
+        kfree(pp_table_information->vddc_lookup_table);
+        pp_table_information->vddc_lookup_table = NULL;
 
-        if (NULL != pp_table_information->vddgfx_lookup_table)
-                pp_table_information->vddgfx_lookup_table = NULL;
+        kfree(pp_table_information->vddgfx_lookup_table);
+        pp_table_information->vddgfx_lookup_table = NULL;
 
-        if (NULL != pp_table_information->mm_dep_table)
-                pp_table_information->mm_dep_table = NULL;
+        kfree(pp_table_information->mm_dep_table);
+        pp_table_information->mm_dep_table = NULL;
 
-        if (NULL != pp_table_information->cac_dtp_table)
-                pp_table_information->cac_dtp_table = NULL;
+        kfree(pp_table_information->cac_dtp_table);
+        pp_table_information->cac_dtp_table = NULL;
 
-        if (NULL != hwmgr->dyn_state.cac_dtp_table)
-                hwmgr->dyn_state.cac_dtp_table = NULL;
+        kfree(hwmgr->dyn_state.cac_dtp_table);
+        hwmgr->dyn_state.cac_dtp_table = NULL;
 
-        if (NULL != pp_table_information->ppm_parameter_table)
-                pp_table_information->ppm_parameter_table = NULL;
+        kfree(pp_table_information->ppm_parameter_table);
+        pp_table_information->ppm_parameter_table = NULL;
 
-        if (NULL != pp_table_information->pcie_table)
-                pp_table_information->pcie_table = NULL;
+        kfree(pp_table_information->pcie_table);
+        pp_table_information->pcie_table = NULL;
 
-        if (NULL != hwmgr->pptable) {
-                kfree(hwmgr->pptable);
-                hwmgr->pptable = NULL;
-        }
+        kfree(hwmgr->pptable);
+        hwmgr->pptable = NULL;
 
         return result;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h b/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h
index 0c6a413eaa5b..d41d37ab5b7c 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h
@@ -27,6 +27,7 @@
 
 #pragma pack(push, 1)
 
+#define PPSMC_MSG_SetGBDroopSettings          ((uint16_t) 0x305)
 
 #define PPSMC_SWSTATE_FLAG_DC                           0x01
 #define PPSMC_SWSTATE_FLAG_UVD                          0x02
diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h b/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
index 3bd5e69b9045..3df5de2cdab0 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
@@ -26,3 +26,4 @@ extern bool acpi_atcs_functions_supported(void *device,
 extern int acpi_pcie_perf_request(void *device,
                                                 uint8_t perf_req,
                                                 bool advertise);
+extern bool acpi_atcs_notify_pcie_device_ready(void *device);
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu74.h b/drivers/gpu/drm/amd/powerplay/inc/smu74.h
index 1a12d85b8e97..fd10a9fa843d 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smu74.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu74.h
@@ -34,6 +34,30 @@
 #define SMU__NUM_LCLK_DPM_LEVELS 8
 #define SMU__NUM_PCIE_DPM_LEVELS 8
 
+#define EXP_M1  35
+#define EXP_M2  92821
+#define EXP_B   66629747
+
+#define EXP_M1_1  365
+#define EXP_M2_1  658700
+#define EXP_B_1   305506134
+
+#define EXP_M1_2  189
+#define EXP_M2_2  379692
+#define EXP_B_2   194609469
+
+#define EXP_M1_3  99
+#define EXP_M2_3  217915
+#define EXP_B_3   122255994
+
+#define EXP_M1_4  51
+#define EXP_M2_4  122643
+#define EXP_B_4   74893384
+
+#define EXP_M1_5  423
+#define EXP_M2_5  1103326
+#define EXP_B_5   728122621
+
 enum SID_OPTION {
         SID_OPTION_HI,
         SID_OPTION_LO,
@@ -548,20 +572,20 @@ struct SMU74_Firmware_Header {
         uint32_t CacConfigTable;
         uint32_t CacStatusTable;
 
-
         uint32_t mcRegisterTable;
 
-
         uint32_t mcArbDramTimingTable;
 
-
-
-
         uint32_t PmFuseTable;
         uint32_t Globals;
         uint32_t ClockStretcherTable;
         uint32_t VftTable;
-        uint32_t Reserved[21];
+        uint32_t Reserved1;
+        uint32_t AvfsTable;
+        uint32_t AvfsCksOffGbvTable;
+        uint32_t AvfsMeanNSigma;
+        uint32_t AvfsSclkOffsetTable;
+        uint32_t Reserved[16];
         uint32_t Signature;
 };
 
@@ -701,8 +725,6 @@ VR Config info is contained in dpmTable.VRConfig */
 struct SMU_ClockStretcherDataTableEntry {
         uint8_t minVID;
         uint8_t maxVID;
-
-
         uint16_t setting;
 };
 typedef struct SMU_ClockStretcherDataTableEntry SMU_ClockStretcherDataTableEntry;
@@ -769,6 +791,43 @@ struct VFT_TABLE_t {
 typedef struct VFT_TABLE_t VFT_TABLE_t;
 
 
+/* Total margin, root mean square of Fmax + DC + Platform */
+struct AVFS_Margin_t {
+        VFT_CELL_t Cell[NUM_VFT_COLUMNS];
+};
+typedef struct AVFS_Margin_t AVFS_Margin_t;
+
+#define BTCGB_VDROOP_TABLE_MAX_ENTRIES 2
+#define AVFSGB_VDROOP_TABLE_MAX_ENTRIES 2
+
+struct GB_VDROOP_TABLE_t {
+        int32_t a0;
+        int32_t a1;
+        int32_t a2;
+        uint32_t spare;
+};
+typedef struct GB_VDROOP_TABLE_t GB_VDROOP_TABLE_t;
+
+struct AVFS_CksOff_Gbv_t {
+        VFT_CELL_t Cell[NUM_VFT_COLUMNS];
+};
+typedef struct AVFS_CksOff_Gbv_t AVFS_CksOff_Gbv_t;
+
+struct AVFS_meanNsigma_t {
+        uint32_t Aconstant[3];
+        uint16_t DC_tol_sigma;
+        uint16_t Platform_mean;
+        uint16_t Platform_sigma;
+        uint16_t PSM_Age_CompFactor;
+        uint8_t  Static_Voltage_Offset[NUM_VFT_COLUMNS];
+};
+typedef struct AVFS_meanNsigma_t AVFS_meanNsigma_t;
+
+struct AVFS_Sclk_Offset_t {
+        uint16_t Sclk_Offset[8];
+};
+typedef struct AVFS_Sclk_Offset_t AVFS_Sclk_Offset_t;
+
 #endif
 
 
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h b/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
index 0dfe82336dc7..b85ff5400e57 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
@@ -223,6 +223,16 @@ struct SMU74_Discrete_StateInfo {
 
 typedef struct SMU74_Discrete_StateInfo SMU74_Discrete_StateInfo;
 
+struct SMU_QuadraticCoeffs {
+        int32_t m1;
+        uint32_t b;
+
+        int16_t m2;
+        uint8_t m1_shift;
+        uint8_t m2_shift;
+};
+typedef struct SMU_QuadraticCoeffs SMU_QuadraticCoeffs;
+
 struct SMU74_Discrete_DpmTable {
 
         SMU74_PIDController                  GraphicsPIDController;
@@ -258,7 +268,14 @@ struct SMU74_Discrete_DpmTable {
         uint8_t                             ThermOutPolarity;
         uint8_t                             ThermOutMode;
         uint8_t                             BootPhases;
-        uint32_t                            Reserved[4];
+
+        uint8_t                             VRHotLevel;
+        uint8_t                             Reserved1[3];
+        uint16_t                            FanStartTemperature;
+        uint16_t                            FanStopTemperature;
+        uint16_t                            MaxVoltage;
+        uint16_t                            Reserved2;
+        uint32_t                            Reserved[1];
 
         SMU74_Discrete_GraphicsLevel        GraphicsLevel[SMU74_MAX_LEVELS_GRAPHICS];
         SMU74_Discrete_MemoryLevel          MemoryACPILevel;
@@ -347,6 +364,8 @@ struct SMU74_Discrete_DpmTable {
 
         uint32_t                            CurrSclkPllRange;
         sclkFcwRange_t                      SclkFcwRangeTable[NUM_SCLK_RANGE];
+        GB_VDROOP_TABLE_t                   BTCGB_VDROOP_TABLE[BTCGB_VDROOP_TABLE_MAX_ENTRIES];
+        SMU_QuadraticCoeffs                 AVFSGB_VDROOP_TABLE[AVFSGB_VDROOP_TABLE_MAX_ENTRIES];
 };
 
 typedef struct SMU74_Discrete_DpmTable SMU74_Discrete_DpmTable;
@@ -550,16 +569,6 @@ struct SMU7_AcpiScoreboard {
 
 typedef struct SMU7_AcpiScoreboard SMU7_AcpiScoreboard;
 
-struct SMU_QuadraticCoeffs {
-        int32_t m1;
-        uint32_t b;
-
-        int16_t m2;
-        uint8_t m1_shift;
-        uint8_t m2_shift;
-};
-typedef struct SMU_QuadraticCoeffs SMU_QuadraticCoeffs;
-
 struct SMU74_Discrete_PmFuses {
         uint8_t BapmVddCVidHiSidd[8];
         uint8_t BapmVddCVidLoSidd[8];
@@ -821,6 +830,17 @@ typedef struct SMU7_GfxCuPgScoreboard SMU7_GfxCuPgScoreboard;
 #define DB_PCC_SHIFT 26 
 #define DB_EDC_SHIFT 27
 
+#define BTCGB0_Vdroop_Enable_MASK  0x1
+#define BTCGB1_Vdroop_Enable_MASK  0x2
+#define AVFSGB0_Vdroop_Enable_MASK 0x4
+#define AVFSGB1_Vdroop_Enable_MASK 0x8
+
+#define BTCGB0_Vdroop_Enable_SHIFT  0
+#define BTCGB1_Vdroop_Enable_SHIFT  1
+#define AVFSGB0_Vdroop_Enable_SHIFT 2
+#define AVFSGB1_Vdroop_Enable_SHIFT 3
+
+
 #pragma pack(pop)
 
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
index 673a75c74e18..8e52a2e82db5 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
@@ -1006,10 +1006,16 @@ static int fiji_smu_init(struct pp_smumgr *smumgr)
 
 static int fiji_smu_fini(struct pp_smumgr *smumgr)
 {
+        struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend);
+
+        smu_free_memory(smumgr->device, (void *)priv->header_buffer.handle);
+
         if (smumgr->backend) {
                 kfree(smumgr->backend);
                 smumgr->backend = NULL;
         }
+
+        cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
index de618ead9db8..5dba7c509710 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
@@ -52,19 +52,18 @@
 static const SMU74_Discrete_GraphicsLevel avfs_graphics_level_polaris10[8] = {
         /*  Min      pcie   DeepSleep Activity  CgSpll      CgSpll    CcPwr  CcPwr  Sclk         Enabled      Enabled                       Voltage    Power */
         /* Voltage, DpmLevel, DivId,  Level,  FuncCntl3,  FuncCntl4,  DynRm, DynRm1 Did, Padding,ForActivity, ForThrottle, UpHyst, DownHyst, DownHyst, Throttle */
-        { 0x3c0fd047, 0x00, 0x03, 0x1e00, 0x00200410, 0x87020000, 0, 0, 0x16, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0x30750000, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0xa00fd047, 0x01, 0x04, 0x1e00, 0x00800510, 0x87020000, 0, 0, 0x16, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0x409c0000, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0x0410d047, 0x01, 0x00, 0x1e00, 0x00600410, 0x87020000, 0, 0, 0x0e, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0x50c30000, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0x6810d047, 0x01, 0x00, 0x1e00, 0x00800410, 0x87020000, 0, 0, 0x0c, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0x60ea0000, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0xcc10d047, 0x01, 0x00, 0x1e00, 0x00e00410, 0x87020000, 0, 0, 0x0c, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0xe8fd0000, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0x3011d047, 0x01, 0x00, 0x1e00, 0x00400510, 0x87020000, 0, 0, 0x0c, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0x70110100, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0x9411d047, 0x01, 0x00, 0x1e00, 0x00a00510, 0x87020000, 0, 0, 0x0c, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0xf8240100, 0, 0, 0, 0, 0, 0, 0 } },
-        { 0xf811d047, 0x01, 0x00, 0x1e00, 0x00000610, 0x87020000, 0, 0, 0x0c, 0, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, { 0x80380100, 0, 0, 0, 0, 0, 0, 0 } }
+        { 0x100ea446, 0x00, 0x03, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x30750000, 0x3000, 0, 0x2600, 0, 0, 0x0004, 0x8f02, 0xffff, 0x2f00, 0x300e, 0x2700 } },
+        { 0x400ea446, 0x01, 0x04, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x409c0000, 0x2000, 0, 0x1e00, 1, 1, 0x0004, 0x8300, 0xffff, 0x1f00, 0xcb5e, 0x1a00 } },
+        { 0x740ea446, 0x01, 0x00, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x50c30000, 0x2800, 0, 0x2000, 1, 1, 0x0004, 0x0c02, 0xffff, 0x2700, 0x6433, 0x2100 } },
+        { 0xa40ea446, 0x01, 0x00, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x60ea0000, 0x3000, 0, 0x2600, 1, 1, 0x0004, 0x8f02, 0xffff, 0x2f00, 0x300e, 0x2700 } },
+        { 0xd80ea446, 0x01, 0x00, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x70110100, 0x3800, 0, 0x2c00, 1, 1, 0x0004, 0x1203, 0xffff, 0x3600, 0xc9e2, 0x2e00 } },
+        { 0x3c0fa446, 0x01, 0x00, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x80380100, 0x2000, 0, 0x1e00, 2, 1, 0x0004, 0x8300, 0xffff, 0x1f00, 0xcb5e, 0x1a00 } },
+        { 0x6c0fa446, 0x01, 0x00, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0x905f0100, 0x2400, 0, 0x1e00, 2, 1, 0x0004, 0x8901, 0xffff, 0x2300, 0x314c, 0x1d00 } },
+        { 0xa00fa446, 0x01, 0x00, 0x3200, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x00, { 0xa0860100, 0x2800, 0, 0x2000, 2, 1, 0x0004, 0x0c02, 0xffff, 0x2700, 0x6433, 0x2100 } }
 };
 
 static const SMU74_Discrete_MemoryLevel avfs_memory_level_polaris10 =
-        {0x50140000, 0x50140000, 0x00320000, 0x00, 0x00,
-         0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x00, 0x00};
+        {0x100ea446, 0, 0x30750000, 0x01, 0x01, 0x01, 0x00, 0x00, 0x64, 0x00, 0x00, 0x1f00, 0x00, 0x00};
 
 /**
 * Set the address for reading/writing the SMC SRAM space.
@@ -219,6 +218,18 @@ bool polaris10_is_smc_ram_running(struct pp_smumgr *smumgr)
         && (0x20100 <= cgs_read_ind_register(smumgr->device, CGS_IND_REG__SMC, ixSMC_PC_C)));
 }
 
+static bool polaris10_is_hw_avfs_present(struct pp_smumgr *smumgr)
+{
+        uint32_t efuse;
+
+        efuse = cgs_read_ind_register(smumgr->device, CGS_IND_REG__SMC, ixSMU_EFUSE_0 + (49*4));
+        efuse &= 0x00000001;
+        if (efuse)
+                return true;
+
+        return false;
+}
+
 /**
 * Send a message to the SMC, and wait for its response.
 *
@@ -228,21 +239,27 @@ bool polaris10_is_smc_ram_running(struct pp_smumgr *smumgr)
 */
 int polaris10_send_msg_to_smc(struct pp_smumgr *smumgr, uint16_t msg)
 {
+        int ret;
+
         if (!polaris10_is_smc_ram_running(smumgr))
                 return -1;
 
+
         SMUM_WAIT_FIELD_UNEQUAL(smumgr, SMC_RESP_0, SMC_RESP, 0);
 
-        if (1 != SMUM_READ_FIELD(smumgr->device, SMC_RESP_0, SMC_RESP))
-                printk("Failed to send Previous Message.\n");
+        ret = SMUM_READ_FIELD(smumgr->device, SMC_RESP_0, SMC_RESP);
 
+        if (ret != 1)
+                printk("\n failed to send pre message %x ret is %d \n",  msg, ret);
 
         cgs_write_register(smumgr->device, mmSMC_MESSAGE_0, msg);
 
         SMUM_WAIT_FIELD_UNEQUAL(smumgr, SMC_RESP_0, SMC_RESP, 0);
 
-        if (1 != SMUM_READ_FIELD(smumgr->device, SMC_RESP_0, SMC_RESP))
-                printk("Failed to send Message.\n");
+        ret = SMUM_READ_FIELD(smumgr->device, SMC_RESP_0, SMC_RESP);
+
+        if (ret != 1)
+                printk("\n failed to send message %x ret is %d \n",  msg, ret);
 
         return 0;
 }
@@ -469,6 +486,7 @@ int polaris10_smu_fini(struct pp_smumgr *smumgr)
                 kfree(smumgr->backend);
                 smumgr->backend = NULL;
         }
+        cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU);
         return 0;
 }
 
@@ -952,6 +970,11 @@ static int polaris10_smu_init(struct pp_smumgr *smumgr)
                 (cgs_handle_t)smu_data->smu_buffer.handle);
                 return -1;);
 
+        if (polaris10_is_hw_avfs_present(smumgr))
+                smu_data->avfs.avfs_btc_status = AVFS_BTC_BOOT;
+        else
+                smu_data->avfs.avfs_btc_status = AVFS_BTC_NOTSUPPORTED;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
index c483baf6b4fb..0728c1e3d97a 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
@@ -81,6 +81,7 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
 
 int smum_fini(struct pp_smumgr *smumgr)
 {
+        kfree(smumgr->device);
         kfree(smumgr);
         return 0;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
index 32820b680d88..b22722eabafc 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
@@ -328,10 +328,17 @@ int tonga_write_smc_sram_dword(struct pp_smumgr *smumgr,
 
 static int tonga_smu_fini(struct pp_smumgr *smumgr)
 {
+        struct tonga_smumgr *priv = (struct tonga_smumgr *)(smumgr->backend);
+
+        smu_free_memory(smumgr->device, (void *)priv->smu_buffer.handle);
+        smu_free_memory(smumgr->device, (void *)priv->header_buffer.handle);
+
         if (smumgr->backend != NULL) {
                 kfree(smumgr->backend);
                 smumgr->backend = NULL;
         }
+
+        cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/arc/Makefile b/drivers/gpu/drm/arc/Makefile
index d48fda70f857..73de56a0139a 100644
--- a/drivers/gpu/drm/arc/Makefile
+++ b/drivers/gpu/drm/arc/Makefile
@@ -1,2 +1,2 @@
-arcpgu-y := arcpgu_crtc.o arcpgu_hdmi.o arcpgu_drv.o
+arcpgu-y := arcpgu_crtc.o arcpgu_hdmi.o arcpgu_sim.o arcpgu_drv.o
 obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o
diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h
index 86574b698a78..e8fcf3ab1d9a 100644
--- a/drivers/gpu/drm/arc/arcpgu.h
+++ b/drivers/gpu/drm/arc/arcpgu.h
@@ -22,7 +22,6 @@ struct arcpgu_drm_private {
         struct clk              *clk;
         struct drm_fbdev_cma    *fbdev;
         struct drm_framebuffer  *fb;
-        struct list_head        event_list;
         struct drm_crtc         crtc;
         struct drm_plane        *plane;
 };
@@ -43,6 +42,7 @@ static inline u32 arc_pgu_read(struct arcpgu_drm_private *arcpgu,
 
 int arc_pgu_setup_crtc(struct drm_device *dev);
 int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np);
+int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np);
 struct drm_fbdev_cma *arcpgu_fbdev_cma_init(struct drm_device *dev,
         unsigned int preferred_bpp, unsigned int num_crtc,
         unsigned int max_conn_count);
diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
index 92f8beff8e60..ee0a61c2861b 100644
--- a/drivers/gpu/drm/arc/arcpgu_crtc.c
+++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
@@ -145,20 +145,14 @@ static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc,
 static void arc_pgu_crtc_atomic_begin(struct drm_crtc *crtc,
                                       struct drm_crtc_state *state)
 {
-        struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
-        unsigned long flags;
-
-        if (crtc->state->event) {
-                struct drm_pending_vblank_event *event = crtc->state->event;
+        struct drm_pending_vblank_event *event = crtc->state->event;
 
+        if (event) {
                 crtc->state->event = NULL;
-                event->pipe = drm_crtc_index(crtc);
-
-                WARN_ON(drm_crtc_vblank_get(crtc) != 0);
 
-                spin_lock_irqsave(&crtc->dev->event_lock, flags);
-                list_add_tail(&event->base.link, &arcpgu->event_list);
-                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
+                spin_lock_irq(&crtc->dev->event_lock);
+                drm_crtc_send_vblank_event(crtc, event);
+                spin_unlock_irq(&crtc->dev->event_lock);
         }
 }
 
diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
index 76e187a5bde0..ccbdadb108dc 100644
--- a/drivers/gpu/drm/arc/arcpgu_drv.c
+++ b/drivers/gpu/drm/arc/arcpgu_drv.c
@@ -32,17 +32,11 @@ static void arcpgu_fb_output_poll_changed(struct drm_device *dev)
                 drm_fbdev_cma_hotplug_event(arcpgu->fbdev);
 }
 
-static int arcpgu_atomic_commit(struct drm_device *dev,
-                                    struct drm_atomic_state *state, bool async)
-{
-        return drm_atomic_helper_commit(dev, state, false);
-}
-
 static struct drm_mode_config_funcs arcpgu_drm_modecfg_funcs = {
         .fb_create  = drm_fb_cma_create,
         .output_poll_changed = arcpgu_fb_output_poll_changed,
         .atomic_check = drm_atomic_helper_check,
-        .atomic_commit = arcpgu_atomic_commit,
+        .atomic_commit = drm_atomic_helper_commit,
 };
 
 static void arcpgu_setup_mode_config(struct drm_device *drm)
@@ -81,22 +75,6 @@ static const struct file_operations arcpgu_drm_ops = {
         .mmap = arcpgu_gem_mmap,
 };
 
-static void arcpgu_preclose(struct drm_device *drm, struct drm_file *file)
-{
-        struct arcpgu_drm_private *arcpgu = drm->dev_private;
-        struct drm_pending_vblank_event *e, *t;
-        unsigned long flags;
-
-        spin_lock_irqsave(&drm->event_lock, flags);
-        list_for_each_entry_safe(e, t, &arcpgu->event_list, base.link) {
-                if (e->base.file_priv != file)
-                        continue;
-                list_del(&e->base.link);
-                e->base.destroy(&e->base);
-        }
-        spin_unlock_irqrestore(&drm->event_lock, flags);
-}
-
 static void arcpgu_lastclose(struct drm_device *drm)
 {
         struct arcpgu_drm_private *arcpgu = drm->dev_private;
@@ -122,8 +100,6 @@ static int arcpgu_load(struct drm_device *drm)
         if (IS_ERR(arcpgu->clk))
                 return PTR_ERR(arcpgu->clk);
 
-        INIT_LIST_HEAD(&arcpgu->event_list);
-
         arcpgu_setup_mode_config(drm);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -149,15 +125,16 @@ static int arcpgu_load(struct drm_device *drm)
 
         /* find the encoder node and initialize it */
         encoder_node = of_parse_phandle(drm->dev->of_node, "encoder-slave", 0);
-        if (!encoder_node) {
-                dev_err(drm->dev, "failed to get an encoder slave node\n");
-                return -ENODEV;
+        if (encoder_node) {
+                ret = arcpgu_drm_hdmi_init(drm, encoder_node);
+                if (ret < 0)
+                        return ret;
+        } else {
+                ret = arcpgu_drm_sim_init(drm, 0);
+                if (ret < 0)
+                        return ret;
         }
 
-        ret = arcpgu_drm_hdmi_init(drm, encoder_node);
-        if (ret < 0)
-                return ret;
-
         drm_mode_config_reset(drm);
         drm_kms_helper_poll_init(drm);
 
@@ -192,7 +169,6 @@ int arcpgu_unload(struct drm_device *drm)
 static struct drm_driver arcpgu_drm_driver = {
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
                            DRIVER_ATOMIC,
-        .preclose = arcpgu_preclose,
         .lastclose = arcpgu_lastclose,
         .name = "drm-arcpgu",
         .desc = "ARC PGU Controller",
@@ -207,7 +183,7 @@ static struct drm_driver arcpgu_drm_driver = {
         .get_vblank_counter = drm_vblank_no_hw_counter,
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-        .gem_free_object = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops = &drm_gem_cma_vm_ops,
         .gem_prime_export = drm_gem_prime_export,
         .gem_prime_import = drm_gem_prime_import,
@@ -235,15 +211,8 @@ static int arcpgu_probe(struct platform_device *pdev)
         if (ret)
                 goto err_unload;
 
-        ret = drm_connector_register_all(drm);
-        if (ret)
-                goto err_unregister;
-
         return 0;
 
-err_unregister:
-        drm_dev_unregister(drm);
-
 err_unload:
         arcpgu_unload(drm);
 
@@ -257,7 +226,6 @@ static int arcpgu_remove(struct platform_device *pdev)
 {
         struct drm_device *drm = platform_get_drvdata(pdev);
 
-        drm_connector_unregister_all(drm);
         drm_dev_unregister(drm);
         arcpgu_unload(drm);
         drm_dev_unref(drm);
diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c
index 08b6baeb320d..b7a8b2ac4055 100644
--- a/drivers/gpu/drm/arc/arcpgu_hdmi.c
+++ b/drivers/gpu/drm/arc/arcpgu_hdmi.c
@@ -46,23 +46,6 @@ static int arcpgu_drm_connector_get_modes(struct drm_connector *connector)
         return sfuncs->get_modes(&slave->base, connector);
 }
 
-struct drm_encoder *
-arcpgu_drm_connector_best_encoder(struct drm_connector *connector)
-{
-        struct drm_encoder_slave *slave;
-        struct arcpgu_drm_connector *con =
-                container_of(connector, struct arcpgu_drm_connector, connector);
-
-        slave = con->encoder_slave;
-        if (slave == NULL) {
-                dev_err(connector->dev->dev,
-                        "connector_best_encoder: cannot find slave encoder for connector\n");
-                return NULL;
-        }
-
-        return &slave->base;
-}
-
 static enum drm_connector_status
 arcpgu_drm_connector_detect(struct drm_connector *connector, bool force)
 {
@@ -97,7 +80,6 @@ static void arcpgu_drm_connector_destroy(struct drm_connector *connector)
 static const struct drm_connector_helper_funcs
 arcpgu_drm_connector_helper_funcs = {
         .get_modes = arcpgu_drm_connector_get_modes,
-        .best_encoder = arcpgu_drm_connector_best_encoder,
 };
 
 static const struct drm_connector_funcs arcpgu_drm_connector_funcs = {
diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
new file mode 100644
index 000000000000..2bf06d71556a
--- /dev/null
+++ b/drivers/gpu/drm/arc/arcpgu_sim.c
@@ -0,0 +1,128 @@
+/*
+ * ARC PGU DRM driver.
+ *
+ * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_encoder_slave.h>
+#include <drm/drm_atomic_helper.h>
+
+#include "arcpgu.h"
+
+#define XRES_DEF        640
+#define YRES_DEF        480
+
+#define XRES_MAX        8192
+#define YRES_MAX        8192
+
+
+struct arcpgu_drm_connector {
+        struct drm_connector connector;
+        struct drm_encoder_slave *encoder_slave;
+};
+
+static int arcpgu_drm_connector_get_modes(struct drm_connector *connector)
+{
+        int count;
+
+        count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
+        drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
+        return count;
+}
+
+static enum drm_connector_status
+arcpgu_drm_connector_detect(struct drm_connector *connector, bool force)
+{
+        return connector_status_connected;
+}
+
+static void arcpgu_drm_connector_destroy(struct drm_connector *connector)
+{
+        drm_connector_unregister(connector);
+        drm_connector_cleanup(connector);
+}
+
+static const struct drm_connector_helper_funcs
+arcpgu_drm_connector_helper_funcs = {
+        .get_modes = arcpgu_drm_connector_get_modes,
+};
+
+static const struct drm_connector_funcs arcpgu_drm_connector_funcs = {
+        .dpms = drm_helper_connector_dpms,
+        .reset = drm_atomic_helper_connector_reset,
+        .detect = arcpgu_drm_connector_detect,
+        .fill_modes = drm_helper_probe_single_connector_modes,
+        .destroy = arcpgu_drm_connector_destroy,
+        .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
+        .destroy = drm_encoder_cleanup,
+};
+
+int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
+{
+        struct arcpgu_drm_connector *arcpgu_connector;
+        struct drm_encoder_slave *encoder;
+        struct drm_connector *connector;
+        int ret;
+
+        encoder = devm_kzalloc(drm->dev, sizeof(*encoder), GFP_KERNEL);
+        if (encoder == NULL)
+                return -ENOMEM;
+
+        encoder->base.possible_crtcs = 1;
+        encoder->base.possible_clones = 0;
+
+        ret = drm_encoder_init(drm, &encoder->base, &arcpgu_drm_encoder_funcs,
+                               DRM_MODE_ENCODER_VIRTUAL, NULL);
+        if (ret)
+                return ret;
+
+        arcpgu_connector = devm_kzalloc(drm->dev, sizeof(*arcpgu_connector),
+                                        GFP_KERNEL);
+        if (!arcpgu_connector) {
+                ret = -ENOMEM;
+                goto error_encoder_cleanup;
+        }
+
+        connector = &arcpgu_connector->connector;
+        drm_connector_helper_add(connector, &arcpgu_drm_connector_helper_funcs);
+
+        ret = drm_connector_init(drm, connector, &arcpgu_drm_connector_funcs,
+                        DRM_MODE_CONNECTOR_VIRTUAL);
+        if (ret < 0) {
+                dev_err(drm->dev, "failed to initialize drm connector\n");
+                goto error_encoder_cleanup;
+        }
+
+        ret = drm_mode_connector_attach_encoder(connector, &encoder->base);
+        if (ret < 0) {
+                dev_err(drm->dev, "could not attach connector to encoder\n");
+                drm_connector_unregister(connector);
+                goto error_connector_cleanup;
+        }
+
+        arcpgu_connector->encoder_slave = encoder;
+
+        return 0;
+
+error_connector_cleanup:
+        drm_connector_cleanup(connector);
+
+error_encoder_cleanup:
+        drm_encoder_cleanup(&encoder->base);
+        return ret;
+}
diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig
index eaed454e043c..1b2906568a48 100644
--- a/drivers/gpu/drm/arm/Kconfig
+++ b/drivers/gpu/drm/arm/Kconfig
@@ -25,3 +25,19 @@ config DRM_HDLCD_SHOW_UNDERRUN
           Enable this option to show in red colour the pixels that the
           HDLCD device did not fetch from framebuffer due to underrun
           conditions.
+
+config DRM_MALI_DISPLAY
+        tristate "ARM Mali Display Processor"
+        depends on DRM && OF && (ARM || ARM64)
+        depends on COMMON_CLK
+        select DRM_ARM
+        select DRM_KMS_HELPER
+        select DRM_KMS_CMA_HELPER
+        select DRM_GEM_CMA_HELPER
+        select VIDEOMODE_HELPERS
+        help
+          Choose this option if you want to compile the ARM Mali Display
+          Processor driver. It supports the DP500, DP550 and DP650 variants
+          of the hardware.
+
+          If compiled as a module it will be called mali-dp.
diff --git a/drivers/gpu/drm/arm/Makefile b/drivers/gpu/drm/arm/Makefile
index 89dcb7bab93a..bb8b158ff90d 100644
--- a/drivers/gpu/drm/arm/Makefile
+++ b/drivers/gpu/drm/arm/Makefile
@@ -1,2 +1,4 @@
 hdlcd-y := hdlcd_drv.o hdlcd_crtc.o
 obj-$(CONFIG_DRM_HDLCD) += hdlcd.o
+mali-dp-y := malidp_drv.o malidp_hw.o malidp_planes.o malidp_crtc.o
+obj-$(CONFIG_DRM_MALI_DISPLAY)  += mali-dp.o
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
index fef1b04c2aab..48019ae22ddb 100644
--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -33,8 +33,17 @@
  *
  */
 
+static void hdlcd_crtc_cleanup(struct drm_crtc *crtc)
+{
+        struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
+
+        /* stop the controller on cleanup */
+        hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);
+        drm_crtc_cleanup(crtc);
+}
+
 static const struct drm_crtc_funcs hdlcd_crtc_funcs = {
-        .destroy = drm_crtc_cleanup,
+        .destroy = hdlcd_crtc_cleanup,
         .set_config = drm_atomic_helper_set_config,
         .page_flip = drm_atomic_helper_page_flip,
         .reset = drm_atomic_helper_crtc_reset,
@@ -97,7 +106,7 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
         struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
         struct drm_display_mode *m = &crtc->state->adjusted_mode;
         struct videomode vm;
-        unsigned int polarities, line_length, err;
+        unsigned int polarities, err;
 
         vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay;
         vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end;
@@ -113,23 +122,18 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
         if (m->flags & DRM_MODE_FLAG_PVSYNC)
                 polarities |= HDLCD_POLARITY_VSYNC;
 
-        line_length = crtc->primary->state->fb->pitches[0];
-
         /* Allow max number of outstanding requests and largest burst size */
         hdlcd_write(hdlcd, HDLCD_REG_BUS_OPTIONS,
                     HDLCD_BUS_MAX_OUTSTAND | HDLCD_BUS_BURST_16);
 
-        hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, line_length);
-        hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_PITCH, line_length);
-        hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_COUNT, m->crtc_vdisplay - 1);
         hdlcd_write(hdlcd, HDLCD_REG_V_DATA, m->crtc_vdisplay - 1);
         hdlcd_write(hdlcd, HDLCD_REG_V_BACK_PORCH, vm.vback_porch - 1);
         hdlcd_write(hdlcd, HDLCD_REG_V_FRONT_PORCH, vm.vfront_porch - 1);
         hdlcd_write(hdlcd, HDLCD_REG_V_SYNC, vm.vsync_len - 1);
+        hdlcd_write(hdlcd, HDLCD_REG_H_DATA, m->crtc_hdisplay - 1);
         hdlcd_write(hdlcd, HDLCD_REG_H_BACK_PORCH, vm.hback_porch - 1);
         hdlcd_write(hdlcd, HDLCD_REG_H_FRONT_PORCH, vm.hfront_porch - 1);
         hdlcd_write(hdlcd, HDLCD_REG_H_SYNC, vm.hsync_len - 1);
-        hdlcd_write(hdlcd, HDLCD_REG_H_DATA, m->crtc_hdisplay - 1);
         hdlcd_write(hdlcd, HDLCD_REG_POLARITIES, polarities);
 
         err = hdlcd_set_pxl_fmt(crtc);
@@ -144,20 +148,19 @@ static void hdlcd_crtc_enable(struct drm_crtc *crtc)
         struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
         clk_prepare_enable(hdlcd->clk);
+        hdlcd_crtc_mode_set_nofb(crtc);
         hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
-        drm_crtc_vblank_on(crtc);
 }
 
 static void hdlcd_crtc_disable(struct drm_crtc *crtc)
 {
         struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
-        if (!crtc->primary->fb)
+        if (!crtc->state->active)
                 return;
 
-        clk_disable_unprepare(hdlcd->clk);
         hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);
-        drm_crtc_vblank_off(crtc);
+        clk_disable_unprepare(hdlcd->clk);
 }
 
 static int hdlcd_crtc_atomic_check(struct drm_crtc *crtc,
@@ -179,52 +182,39 @@ static int hdlcd_crtc_atomic_check(struct drm_crtc *crtc,
 static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc,
                                     struct drm_crtc_state *state)
 {
-        struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
-        unsigned long flags;
-
-        if (crtc->state->event) {
-                struct drm_pending_vblank_event *event = crtc->state->event;
+        struct drm_pending_vblank_event *event = crtc->state->event;
 
+        if (event) {
                 crtc->state->event = NULL;
-                event->pipe = drm_crtc_index(crtc);
-
-                WARN_ON(drm_crtc_vblank_get(crtc) != 0);
 
-                spin_lock_irqsave(&crtc->dev->event_lock, flags);
-                list_add_tail(&event->base.link, &hdlcd->event_list);
-                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
+                spin_lock_irq(&crtc->dev->event_lock);
+                if (drm_crtc_vblank_get(crtc) == 0)
+                        drm_crtc_arm_vblank_event(crtc, event);
+                else
+                        drm_crtc_send_vblank_event(crtc, event);
+                spin_unlock_irq(&crtc->dev->event_lock);
         }
 }
 
-static void hdlcd_crtc_atomic_flush(struct drm_crtc *crtc,
-                                    struct drm_crtc_state *state)
-{
-}
-
-static bool hdlcd_crtc_mode_fixup(struct drm_crtc *crtc,
-                        const struct drm_display_mode *mode,
-                        struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
 static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = {
-        .mode_fixup     = hdlcd_crtc_mode_fixup,
-        .mode_set       = drm_helper_crtc_mode_set,
-        .mode_set_base  = drm_helper_crtc_mode_set_base,
-        .mode_set_nofb  = hdlcd_crtc_mode_set_nofb,
         .enable         = hdlcd_crtc_enable,
         .disable        = hdlcd_crtc_disable,
-        .prepare        = hdlcd_crtc_disable,
-        .commit         = hdlcd_crtc_enable,
         .atomic_check   = hdlcd_crtc_atomic_check,
         .atomic_begin   = hdlcd_crtc_atomic_begin,
-        .atomic_flush   = hdlcd_crtc_atomic_flush,
 };
 
 static int hdlcd_plane_atomic_check(struct drm_plane *plane,
                                     struct drm_plane_state *state)
 {
+        u32 src_w, src_h;
+
+        src_w = state->src_w >> 16;
+        src_h = state->src_h >> 16;
+
+        /* we can't do any scaling of the plane source */
+        if ((src_w != state->crtc_w) || (src_h != state->crtc_h))
+                return -EINVAL;
+
         return 0;
 }
 
@@ -233,20 +223,31 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane,
 {
         struct hdlcd_drm_private *hdlcd;
         struct drm_gem_cma_object *gem;
+        unsigned int depth, bpp;
+        u32 src_w, src_h, dest_w, dest_h;
         dma_addr_t scanout_start;
 
-        if (!plane->state->crtc || !plane->state->fb)
+        if (!plane->state->fb)
                 return;
 
-        hdlcd = crtc_to_hdlcd_priv(plane->state->crtc);
+        drm_fb_get_bpp_depth(plane->state->fb->pixel_format, &depth, &bpp);
+        src_w = plane->state->src_w >> 16;
+        src_h = plane->state->src_h >> 16;
+        dest_w = plane->state->crtc_w;
+        dest_h = plane->state->crtc_h;
         gem = drm_fb_cma_get_gem_obj(plane->state->fb, 0);
-        scanout_start = gem->paddr;
+        scanout_start = gem->paddr + plane->state->fb->offsets[0] +
+                plane->state->crtc_y * plane->state->fb->pitches[0] +
+                plane->state->crtc_x * bpp / 8;
+
+        hdlcd = plane->dev->dev_private;
+        hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, plane->state->fb->pitches[0]);
+        hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_PITCH, plane->state->fb->pitches[0]);
+        hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_COUNT, dest_h - 1);
         hdlcd_write(hdlcd, HDLCD_REG_FB_BASE, scanout_start);
 }
 
 static const struct drm_plane_helper_funcs hdlcd_plane_helper_funcs = {
-        .prepare_fb = NULL,
-        .cleanup_fb = NULL,
         .atomic_check = hdlcd_plane_atomic_check,
         .atomic_update = hdlcd_plane_atomic_update,
 };
@@ -294,16 +295,6 @@ static struct drm_plane *hdlcd_plane_init(struct drm_device *drm)
         return plane;
 }
 
-void hdlcd_crtc_suspend(struct drm_crtc *crtc)
-{
-        hdlcd_crtc_disable(crtc);
-}
-
-void hdlcd_crtc_resume(struct drm_crtc *crtc)
-{
-        hdlcd_crtc_enable(crtc);
-}
-
 int hdlcd_setup_crtc(struct drm_device *drm)
 {
         struct hdlcd_drm_private *hdlcd = drm->dev_private;
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index b987c63ba8d6..74279be20b75 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -49,8 +49,6 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
         atomic_set(&hdlcd->dma_end_count, 0);
 #endif
 
-        INIT_LIST_HEAD(&hdlcd->event_list);
-
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         hdlcd->mmio = devm_ioremap_resource(drm->dev, res);
         if (IS_ERR(hdlcd->mmio)) {
@@ -84,11 +82,7 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
                 goto setup_fail;
         }
 
-        pm_runtime_enable(drm->dev);
-
-        pm_runtime_get_sync(drm->dev);
         ret = drm_irq_install(drm, platform_get_irq(pdev, 0));
-        pm_runtime_put_sync(drm->dev);
         if (ret < 0) {
                 DRM_ERROR("failed to install IRQ handler\n");
                 goto irq_fail;
@@ -112,17 +106,11 @@ static void hdlcd_fb_output_poll_changed(struct drm_device *drm)
                 drm_fbdev_cma_hotplug_event(hdlcd->fbdev);
 }
 
-static int hdlcd_atomic_commit(struct drm_device *dev,
-                               struct drm_atomic_state *state, bool nonblock)
-{
-        return drm_atomic_helper_commit(dev, state, false);
-}
-
 static const struct drm_mode_config_funcs hdlcd_mode_config_funcs = {
         .fb_create = drm_fb_cma_create,
         .output_poll_changed = hdlcd_fb_output_poll_changed,
         .atomic_check = drm_atomic_helper_check,
-        .atomic_commit = hdlcd_atomic_commit,
+        .atomic_commit = drm_atomic_helper_commit,
 };
 
 static void hdlcd_setup_mode_config(struct drm_device *drm)
@@ -164,24 +152,9 @@ static irqreturn_t hdlcd_irq(int irq, void *arg)
                 atomic_inc(&hdlcd->vsync_count);
 
 #endif
-        if (irq_status & HDLCD_INTERRUPT_VSYNC) {
-                bool events_sent = false;
-                unsigned long flags;
-                struct drm_pending_vblank_event *e, *t;
-
+        if (irq_status & HDLCD_INTERRUPT_VSYNC)
                 drm_crtc_handle_vblank(&hdlcd->crtc);
 
-                spin_lock_irqsave(&drm->event_lock, flags);
-                list_for_each_entry_safe(e, t, &hdlcd->event_list, base.link) {
-                        list_del(&e->base.link);
-                        drm_crtc_send_vblank_event(&hdlcd->crtc, e);
-                        events_sent = true;
-                }
-                if (events_sent)
-                        drm_crtc_vblank_put(&hdlcd->crtc);
-                spin_unlock_irqrestore(&drm->event_lock, flags);
-        }
-
         /* acknowledge interrupt(s) */
         hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status);
 
@@ -275,6 +248,7 @@ static int hdlcd_show_pxlclock(struct seq_file *m, void *arg)
 static struct drm_info_list hdlcd_debugfs_list[] = {
         { "interrupt_count", hdlcd_show_underrun_count, 0 },
         { "clocks", hdlcd_show_pxlclock, 0 },
+        { "fb", drm_fb_cma_debugfs_show, 0 },
 };
 
 static int hdlcd_debugfs_init(struct drm_minor *minor)
@@ -316,7 +290,7 @@ static struct drm_driver hdlcd_driver = {
         .get_vblank_counter = drm_vblank_no_hw_counter,
         .enable_vblank = hdlcd_enable_vblank,
         .disable_vblank = hdlcd_disable_vblank,
-        .gem_free_object = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops = &drm_gem_cma_vm_ops,
         .dumb_create = drm_gem_cma_dumb_create,
         .dumb_map_offset = drm_gem_cma_dumb_map_offset,
@@ -357,6 +331,8 @@ static int hdlcd_drm_bind(struct device *dev)
                 return -ENOMEM;
 
         drm->dev_private = hdlcd;
+        dev_set_drvdata(dev, drm);
+
         hdlcd_setup_mode_config(drm);
         ret = hdlcd_load(drm, 0);
         if (ret)
@@ -366,14 +342,18 @@ static int hdlcd_drm_bind(struct device *dev)
         if (ret)
                 goto err_unload;
 
-        dev_set_drvdata(dev, drm);
-
         ret = component_bind_all(dev, drm);
         if (ret) {
                 DRM_ERROR("Failed to bind all components\n");
                 goto err_unregister;
         }
 
+        ret = pm_runtime_set_active(dev);
+        if (ret)
+                goto err_pm_active;
+
+        pm_runtime_enable(dev);
+
         ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
         if (ret < 0) {
                 DRM_ERROR("failed to initialise vblank\n");
@@ -399,16 +379,16 @@ err_fbdev:
         drm_mode_config_cleanup(drm);
         drm_vblank_cleanup(drm);
 err_vblank:
+        pm_runtime_disable(drm->dev);
+err_pm_active:
         component_unbind_all(dev, drm);
 err_unregister:
         drm_dev_unregister(drm);
 err_unload:
-        pm_runtime_get_sync(drm->dev);
         drm_irq_uninstall(drm);
-        pm_runtime_put_sync(drm->dev);
-        pm_runtime_disable(drm->dev);
         of_reserved_mem_device_release(drm->dev);
 err_free:
+        dev_set_drvdata(dev, NULL);
         drm_dev_unref(drm);
 
         return ret;
@@ -495,30 +475,34 @@ MODULE_DEVICE_TABLE(of, hdlcd_of_match);
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
         struct drm_device *drm = dev_get_drvdata(dev);
-        struct drm_crtc *crtc;
+        struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-        if (pm_runtime_suspended(dev))
+        if (!hdlcd)
                 return 0;
 
-        drm_modeset_lock_all(drm);
-        list_for_each_entry(crtc, &drm->mode_config.crtc_list, head)
-                hdlcd_crtc_suspend(crtc);
-        drm_modeset_unlock_all(drm);
+        drm_kms_helper_poll_disable(drm);
+
+        hdlcd->state = drm_atomic_helper_suspend(drm);
+        if (IS_ERR(hdlcd->state)) {
+                drm_kms_helper_poll_enable(drm);
+                return PTR_ERR(hdlcd->state);
+        }
+
         return 0;
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
         struct drm_device *drm = dev_get_drvdata(dev);
-        struct drm_crtc *crtc;
+        struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-        if (!pm_runtime_suspended(dev))
+        if (!hdlcd)
                 return 0;
 
-        drm_modeset_lock_all(drm);
-        list_for_each_entry(crtc, &drm->mode_config.crtc_list, head)
-                hdlcd_crtc_resume(crtc);
-        drm_modeset_unlock_all(drm);
+        drm_atomic_helper_resume(drm, hdlcd->state);
+        drm_kms_helper_poll_enable(drm);
+        pm_runtime_set_active(dev);
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_drv.h
index aa234784f053..e3950a071152 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.h
+++ b/drivers/gpu/drm/arm/hdlcd_drv.h
@@ -9,10 +9,9 @@ struct hdlcd_drm_private {
         void __iomem                    *mmio;
         struct clk                      *clk;
         struct drm_fbdev_cma            *fbdev;
-        struct drm_framebuffer          *fb;
-        struct list_head                event_list;
         struct drm_crtc                 crtc;
         struct drm_plane                *plane;
+        struct drm_atomic_state         *state;
 #ifdef CONFIG_DEBUG_FS
         atomic_t buffer_underrun_count;
         atomic_t bus_error_count;
@@ -36,7 +35,5 @@ static inline u32 hdlcd_read(struct hdlcd_drm_private *hdlcd, unsigned int reg)
 
 int hdlcd_setup_crtc(struct drm_device *dev);
 void hdlcd_set_scanout(struct hdlcd_drm_private *hdlcd);
-void hdlcd_crtc_suspend(struct drm_crtc *crtc);
-void hdlcd_crtc_resume(struct drm_crtc *crtc);
 
 #endif /* __HDLCD_DRV_H__ */
diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c
new file mode 100644
index 000000000000..08e6a71f5d05
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_crtc.c
@@ -0,0 +1,216 @@
+/*
+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved.
+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP500/DP550/DP650 driver (crtc operations)
+ */
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <linux/clk.h>
+#include <video/videomode.h>
+
+#include "malidp_drv.h"
+#include "malidp_hw.h"
+
+static bool malidp_crtc_mode_fixup(struct drm_crtc *crtc,
+                                   const struct drm_display_mode *mode,
+                                   struct drm_display_mode *adjusted_mode)
+{
+        struct malidp_drm *malidp = crtc_to_malidp_device(crtc);
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        /*
+         * check that the hardware can drive the required clock rate,
+         * but skip the check if the clock is meant to be disabled (req_rate = 0)
+         */
+        long rate, req_rate = mode->crtc_clock * 1000;
+
+        if (req_rate) {
+                rate = clk_round_rate(hwdev->mclk, req_rate);
+                if (rate < req_rate) {
+                        DRM_DEBUG_DRIVER("mclk clock unable to reach %d kHz\n",
+                                         mode->crtc_clock);
+                        return false;
+                }
+
+                rate = clk_round_rate(hwdev->pxlclk, req_rate);
+                if (rate != req_rate) {
+                        DRM_DEBUG_DRIVER("pxlclk doesn't support %ld Hz\n",
+                                         req_rate);
+                        return false;
+                }
+        }
+
+        return true;
+}
+
+static void malidp_crtc_enable(struct drm_crtc *crtc)
+{
+        struct malidp_drm *malidp = crtc_to_malidp_device(crtc);
+        struct malidp_hw_device *hwdev = malidp->dev;
+        struct videomode vm;
+
+        drm_display_mode_to_videomode(&crtc->state->adjusted_mode, &vm);
+
+        clk_prepare_enable(hwdev->pxlclk);
+
+        /* mclk needs to be set to the same or higher rate than pxlclk */
+        clk_set_rate(hwdev->mclk, crtc->state->adjusted_mode.crtc_clock * 1000);
+        clk_set_rate(hwdev->pxlclk, crtc->state->adjusted_mode.crtc_clock * 1000);
+
+        hwdev->modeset(hwdev, &vm);
+        hwdev->leave_config_mode(hwdev);
+        drm_crtc_vblank_on(crtc);
+}
+
+static void malidp_crtc_disable(struct drm_crtc *crtc)
+{
+        struct malidp_drm *malidp = crtc_to_malidp_device(crtc);
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        drm_crtc_vblank_off(crtc);
+        hwdev->enter_config_mode(hwdev);
+        clk_disable_unprepare(hwdev->pxlclk);
+}
+
+static int malidp_crtc_atomic_check(struct drm_crtc *crtc,
+                                    struct drm_crtc_state *state)
+{
+        struct malidp_drm *malidp = crtc_to_malidp_device(crtc);
+        struct malidp_hw_device *hwdev = malidp->dev;
+        struct drm_plane *plane;
+        const struct drm_plane_state *pstate;
+        u32 rot_mem_free, rot_mem_usable;
+        int rotated_planes = 0;
+
+        /*
+         * check if there is enough rotation memory available for planes
+         * that need 90° and 270° rotation. Each plane has set its required
+         * memory size in the ->plane_check() callback, here we only make
+         * sure that the sums are less that the total usable memory.
+         *
+         * The rotation memory allocation algorithm (for each plane):
+         *  a. If no more rotated planes exist, all remaining rotate
+         *     memory in the bank is available for use by the plane.
+         *  b. If other rotated planes exist, and plane's layer ID is
+         *     DE_VIDEO1, it can use all the memory from first bank if
+         *     secondary rotation memory bank is available, otherwise it can
+         *     use up to half the bank's memory.
+         *  c. If other rotated planes exist, and plane's layer ID is not
+         *     DE_VIDEO1, it can use half of the available memory
+         *
+         * Note: this algorithm assumes that the order in which the planes are
+         * checked always has DE_VIDEO1 plane first in the list if it is
+         * rotated. Because that is how we create the planes in the first
+         * place, under current DRM version things work, but if ever the order
+         * in which drm_atomic_crtc_state_for_each_plane() iterates over planes
+         * changes, we need to pre-sort the planes before validation.
+         */
+
+        /* first count the number of rotated planes */
+        drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) {
+                if (pstate->rotation & MALIDP_ROTATED_MASK)
+                        rotated_planes++;
+        }
+
+        rot_mem_free = hwdev->rotation_memory[0];
+        /*
+         * if we have more than 1 plane using rotation memory, use the second
+         * block of rotation memory as well
+         */
+        if (rotated_planes > 1)
+                rot_mem_free += hwdev->rotation_memory[1];
+
+        /* now validate the rotation memory requirements */
+        drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) {
+                struct malidp_plane *mp = to_malidp_plane(plane);
+                struct malidp_plane_state *ms = to_malidp_plane_state(pstate);
+
+                if (pstate->rotation & MALIDP_ROTATED_MASK) {
+                        /* process current plane */
+                        rotated_planes--;
+
+                        if (!rotated_planes) {
+                                /* no more rotated planes, we can use what's left */
+                                rot_mem_usable = rot_mem_free;
+                        } else {
+                                if ((mp->layer->id != DE_VIDEO1) ||
+                                    (hwdev->rotation_memory[1] == 0))
+                                        rot_mem_usable = rot_mem_free / 2;
+                                else
+                                        rot_mem_usable = hwdev->rotation_memory[0];
+                        }
+
+                        rot_mem_free -= rot_mem_usable;
+
+                        if (ms->rotmem_size > rot_mem_usable)
+                                return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
+static const struct drm_crtc_helper_funcs malidp_crtc_helper_funcs = {
+        .mode_fixup = malidp_crtc_mode_fixup,
+        .enable = malidp_crtc_enable,
+        .disable = malidp_crtc_disable,
+        .atomic_check = malidp_crtc_atomic_check,
+};
+
+static const struct drm_crtc_funcs malidp_crtc_funcs = {
+        .destroy = drm_crtc_cleanup,
+        .set_config = drm_atomic_helper_set_config,
+        .page_flip = drm_atomic_helper_page_flip,
+        .reset = drm_atomic_helper_crtc_reset,
+        .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+};
+
+int malidp_crtc_init(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct drm_plane *primary = NULL, *plane;
+        int ret;
+
+        ret = malidp_de_planes_init(drm);
+        if (ret < 0) {
+                DRM_ERROR("Failed to initialise planes\n");
+                return ret;
+        }
+
+        drm_for_each_plane(plane, drm) {
+                if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
+                        primary = plane;
+                        break;
+                }
+        }
+
+        if (!primary) {
+                DRM_ERROR("no primary plane found\n");
+                ret = -EINVAL;
+                goto crtc_cleanup_planes;
+        }
+
+        ret = drm_crtc_init_with_planes(drm, &malidp->crtc, primary, NULL,
+                                        &malidp_crtc_funcs, NULL);
+
+        if (!ret) {
+                drm_crtc_helper_add(&malidp->crtc, &malidp_crtc_helper_funcs);
+                return 0;
+        }
+
+crtc_cleanup_planes:
+        malidp_de_planes_destroy(drm);
+
+        return ret;
+}
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
new file mode 100644
index 000000000000..e5b44e92f8cf
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -0,0 +1,512 @@
+/*
+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved.
+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP500/DP550/DP650 KMS/DRM driver
+ */
+
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+
+#include "malidp_drv.h"
+#include "malidp_regs.h"
+#include "malidp_hw.h"
+
+#define MALIDP_CONF_VALID_TIMEOUT       250
+
+/*
+ * set the "config valid" bit and wait until the hardware acts on it
+ */
+static int malidp_set_and_wait_config_valid(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+        int ret;
+
+        hwdev->set_config_valid(hwdev);
+        /* don't wait for config_valid flag if we are in config mode */
+        if (hwdev->in_config_mode(hwdev))
+                return 0;
+
+        ret = wait_event_interruptible_timeout(malidp->wq,
+                        atomic_read(&malidp->config_valid) == 1,
+                        msecs_to_jiffies(MALIDP_CONF_VALID_TIMEOUT));
+
+        return (ret > 0) ? 0 : -ETIMEDOUT;
+}
+
+static void malidp_output_poll_changed(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+
+        drm_fbdev_cma_hotplug_event(malidp->fbdev);
+}
+
+static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
+{
+        struct drm_pending_vblank_event *event;
+        struct drm_device *drm = state->dev;
+        struct malidp_drm *malidp = drm->dev_private;
+        int ret = malidp_set_and_wait_config_valid(drm);
+
+        if (ret)
+                DRM_DEBUG_DRIVER("timed out waiting for updated configuration\n");
+
+        event = malidp->crtc.state->event;
+        if (event) {
+                malidp->crtc.state->event = NULL;
+
+                spin_lock_irq(&drm->event_lock);
+                if (drm_crtc_vblank_get(&malidp->crtc) == 0)
+                        drm_crtc_arm_vblank_event(&malidp->crtc, event);
+                else
+                        drm_crtc_send_vblank_event(&malidp->crtc, event);
+                spin_unlock_irq(&drm->event_lock);
+        }
+        drm_atomic_helper_commit_hw_done(state);
+}
+
+static void malidp_atomic_commit_tail(struct drm_atomic_state *state)
+{
+        struct drm_device *drm = state->dev;
+
+        drm_atomic_helper_commit_modeset_disables(drm, state);
+        drm_atomic_helper_commit_modeset_enables(drm, state);
+        drm_atomic_helper_commit_planes(drm, state, true);
+
+        malidp_atomic_commit_hw_done(state);
+
+        drm_atomic_helper_wait_for_vblanks(drm, state);
+
+        drm_atomic_helper_cleanup_planes(drm, state);
+}
+
+static struct drm_mode_config_helper_funcs malidp_mode_config_helpers = {
+        .atomic_commit_tail = malidp_atomic_commit_tail,
+};
+
+static const struct drm_mode_config_funcs malidp_mode_config_funcs = {
+        .fb_create = drm_fb_cma_create,
+        .output_poll_changed = malidp_output_poll_changed,
+        .atomic_check = drm_atomic_helper_check,
+        .atomic_commit = drm_atomic_helper_commit,
+};
+
+static int malidp_enable_vblank(struct drm_device *drm, unsigned int crtc)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        malidp_hw_enable_irq(hwdev, MALIDP_DE_BLOCK,
+                             hwdev->map.de_irq_map.vsync_irq);
+        return 0;
+}
+
+static void malidp_disable_vblank(struct drm_device *drm, unsigned int pipe)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        malidp_hw_disable_irq(hwdev, MALIDP_DE_BLOCK,
+                              hwdev->map.de_irq_map.vsync_irq);
+}
+
+static int malidp_init(struct drm_device *drm)
+{
+        int ret;
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        drm_mode_config_init(drm);
+
+        drm->mode_config.min_width = hwdev->min_line_size;
+        drm->mode_config.min_height = hwdev->min_line_size;
+        drm->mode_config.max_width = hwdev->max_line_size;
+        drm->mode_config.max_height = hwdev->max_line_size;
+        drm->mode_config.funcs = &malidp_mode_config_funcs;
+        drm->mode_config.helper_private = &malidp_mode_config_helpers;
+
+        ret = malidp_crtc_init(drm);
+        if (ret) {
+                drm_mode_config_cleanup(drm);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int malidp_irq_init(struct platform_device *pdev)
+{
+        int irq_de, irq_se, ret = 0;
+        struct drm_device *drm = dev_get_drvdata(&pdev->dev);
+
+        /* fetch the interrupts from DT */
+        irq_de = platform_get_irq_byname(pdev, "DE");
+        if (irq_de < 0) {
+                DRM_ERROR("no 'DE' IRQ specified!\n");
+                return irq_de;
+        }
+        irq_se = platform_get_irq_byname(pdev, "SE");
+        if (irq_se < 0) {
+                DRM_ERROR("no 'SE' IRQ specified!\n");
+                return irq_se;
+        }
+
+        ret = malidp_de_irq_init(drm, irq_de);
+        if (ret)
+                return ret;
+
+        ret = malidp_se_irq_init(drm, irq_se);
+        if (ret) {
+                malidp_de_irq_fini(drm);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void malidp_lastclose(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+
+        drm_fbdev_cma_restore_mode(malidp->fbdev);
+}
+
+static const struct file_operations fops = {
+        .owner = THIS_MODULE,
+        .open = drm_open,
+        .release = drm_release,
+        .unlocked_ioctl = drm_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = drm_compat_ioctl,
+#endif
+        .poll = drm_poll,
+        .read = drm_read,
+        .llseek = noop_llseek,
+        .mmap = drm_gem_cma_mmap,
+};
+
+static struct drm_driver malidp_driver = {
+        .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |
+                           DRIVER_PRIME,
+        .lastclose = malidp_lastclose,
+        .get_vblank_counter = drm_vblank_no_hw_counter,
+        .enable_vblank = malidp_enable_vblank,
+        .disable_vblank = malidp_disable_vblank,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
+        .gem_vm_ops = &drm_gem_cma_vm_ops,
+        .dumb_create = drm_gem_cma_dumb_create,
+        .dumb_map_offset = drm_gem_cma_dumb_map_offset,
+        .dumb_destroy = drm_gem_dumb_destroy,
+        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+        .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+        .gem_prime_export = drm_gem_prime_export,
+        .gem_prime_import = drm_gem_prime_import,
+        .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
+        .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
+        .gem_prime_vmap = drm_gem_cma_prime_vmap,
+        .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
+        .gem_prime_mmap = drm_gem_cma_prime_mmap,
+        .fops = &fops,
+        .name = "mali-dp",
+        .desc = "ARM Mali Display Processor driver",
+        .date = "20160106",
+        .major = 1,
+        .minor = 0,
+};
+
+static const struct of_device_id  malidp_drm_of_match[] = {
+        {
+                .compatible = "arm,mali-dp500",
+                .data = &malidp_device[MALIDP_500]
+        },
+        {
+                .compatible = "arm,mali-dp550",
+                .data = &malidp_device[MALIDP_550]
+        },
+        {
+                .compatible = "arm,mali-dp650",
+                .data = &malidp_device[MALIDP_650]
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, malidp_drm_of_match);
+
+#define MAX_OUTPUT_CHANNELS     3
+
+static int malidp_bind(struct device *dev)
+{
+        struct resource *res;
+        struct drm_device *drm;
+        struct malidp_drm *malidp;
+        struct malidp_hw_device *hwdev;
+        struct platform_device *pdev = to_platform_device(dev);
+        /* number of lines for the R, G and B output */
+        u8 output_width[MAX_OUTPUT_CHANNELS];
+        int ret = 0, i;
+        u32 version, out_depth = 0;
+
+        malidp = devm_kzalloc(dev, sizeof(*malidp), GFP_KERNEL);
+        if (!malidp)
+                return -ENOMEM;
+
+        hwdev = devm_kzalloc(dev, sizeof(*hwdev), GFP_KERNEL);
+        if (!hwdev)
+                return -ENOMEM;
+
+        /*
+         * copy the associated data from malidp_drm_of_match to avoid
+         * having to keep a reference to the OF node after binding
+         */
+        memcpy(hwdev, of_device_get_match_data(dev), sizeof(*hwdev));
+        malidp->dev = hwdev;
+
+        INIT_LIST_HEAD(&malidp->event_list);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        hwdev->regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(hwdev->regs)) {
+                DRM_ERROR("Failed to map control registers area\n");
+                return PTR_ERR(hwdev->regs);
+        }
+
+        hwdev->pclk = devm_clk_get(dev, "pclk");
+        if (IS_ERR(hwdev->pclk))
+                return PTR_ERR(hwdev->pclk);
+
+        hwdev->aclk = devm_clk_get(dev, "aclk");
+        if (IS_ERR(hwdev->aclk))
+                return PTR_ERR(hwdev->aclk);
+
+        hwdev->mclk = devm_clk_get(dev, "mclk");
+        if (IS_ERR(hwdev->mclk))
+                return PTR_ERR(hwdev->mclk);
+
+        hwdev->pxlclk = devm_clk_get(dev, "pxlclk");
+        if (IS_ERR(hwdev->pxlclk))
+                return PTR_ERR(hwdev->pxlclk);
+
+        /* Get the optional framebuffer memory resource */
+        ret = of_reserved_mem_device_init(dev);
+        if (ret && ret != -ENODEV)
+                return ret;
+
+        drm = drm_dev_alloc(&malidp_driver, dev);
+        if (!drm) {
+                ret = -ENOMEM;
+                goto alloc_fail;
+        }
+
+        /* Enable APB clock in order to get access to the registers */
+        clk_prepare_enable(hwdev->pclk);
+        /*
+         * Enable AXI clock and main clock so that prefetch can start once
+         * the registers are set
+         */
+        clk_prepare_enable(hwdev->aclk);
+        clk_prepare_enable(hwdev->mclk);
+
+        ret = hwdev->query_hw(hwdev);
+        if (ret) {
+                DRM_ERROR("Invalid HW configuration\n");
+                goto query_hw_fail;
+        }
+
+        version = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_DE_CORE_ID);
+        DRM_INFO("found ARM Mali-DP%3x version r%dp%d\n", version >> 16,
+                 (version >> 12) & 0xf, (version >> 8) & 0xf);
+
+        /* set the number of lines used for output of RGB data */
+        ret = of_property_read_u8_array(dev->of_node,
+                                        "arm,malidp-output-port-lines",
+                                        output_width, MAX_OUTPUT_CHANNELS);
+        if (ret)
+                goto query_hw_fail;
+
+        for (i = 0; i < MAX_OUTPUT_CHANNELS; i++)
+                out_depth = (out_depth << 8) | (output_width[i] & 0xf);
+        malidp_hw_write(hwdev, out_depth, hwdev->map.out_depth_base);
+
+        drm->dev_private = malidp;
+        dev_set_drvdata(dev, drm);
+        atomic_set(&malidp->config_valid, 0);
+        init_waitqueue_head(&malidp->wq);
+
+        ret = malidp_init(drm);
+        if (ret < 0)
+                goto init_fail;
+
+        ret = drm_dev_register(drm, 0);
+        if (ret)
+                goto register_fail;
+
+        /* Set the CRTC's port so that the encoder component can find it */
+        malidp->crtc.port = of_graph_get_next_endpoint(dev->of_node, NULL);
+
+        ret = component_bind_all(dev, drm);
+        of_node_put(malidp->crtc.port);
+
+        if (ret) {
+                DRM_ERROR("Failed to bind all components\n");
+                goto bind_fail;
+        }
+
+        ret = malidp_irq_init(pdev);
+        if (ret < 0)
+                goto irq_init_fail;
+
+        ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+        if (ret < 0) {
+                DRM_ERROR("failed to initialise vblank\n");
+                goto vblank_fail;
+        }
+
+        drm_mode_config_reset(drm);
+
+        malidp->fbdev = drm_fbdev_cma_init(drm, 32, drm->mode_config.num_crtc,
+                                           drm->mode_config.num_connector);
+
+        if (IS_ERR(malidp->fbdev)) {
+                ret = PTR_ERR(malidp->fbdev);
+                malidp->fbdev = NULL;
+                goto fbdev_fail;
+        }
+
+        drm_kms_helper_poll_init(drm);
+        return 0;
+
+fbdev_fail:
+        drm_vblank_cleanup(drm);
+vblank_fail:
+        malidp_se_irq_fini(drm);
+        malidp_de_irq_fini(drm);
+irq_init_fail:
+        component_unbind_all(dev, drm);
+bind_fail:
+        drm_dev_unregister(drm);
+register_fail:
+        malidp_de_planes_destroy(drm);
+        drm_mode_config_cleanup(drm);
+init_fail:
+        drm->dev_private = NULL;
+        dev_set_drvdata(dev, NULL);
+query_hw_fail:
+        clk_disable_unprepare(hwdev->mclk);
+        clk_disable_unprepare(hwdev->aclk);
+        clk_disable_unprepare(hwdev->pclk);
+        drm_dev_unref(drm);
+alloc_fail:
+        of_reserved_mem_device_release(dev);
+
+        return ret;
+}
+
+static void malidp_unbind(struct device *dev)
+{
+        struct drm_device *drm = dev_get_drvdata(dev);
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        if (malidp->fbdev) {
+                drm_fbdev_cma_fini(malidp->fbdev);
+                malidp->fbdev = NULL;
+        }
+        drm_kms_helper_poll_fini(drm);
+        malidp_se_irq_fini(drm);
+        malidp_de_irq_fini(drm);
+        drm_vblank_cleanup(drm);
+        component_unbind_all(dev, drm);
+        drm_dev_unregister(drm);
+        malidp_de_planes_destroy(drm);
+        drm_mode_config_cleanup(drm);
+        drm->dev_private = NULL;
+        dev_set_drvdata(dev, NULL);
+        clk_disable_unprepare(hwdev->mclk);
+        clk_disable_unprepare(hwdev->aclk);
+        clk_disable_unprepare(hwdev->pclk);
+        drm_dev_unref(drm);
+        of_reserved_mem_device_release(dev);
+}
+
+static const struct component_master_ops malidp_master_ops = {
+        .bind = malidp_bind,
+        .unbind = malidp_unbind,
+};
+
+static int malidp_compare_dev(struct device *dev, void *data)
+{
+        struct device_node *np = data;
+
+        return dev->of_node == np;
+}
+
+static int malidp_platform_probe(struct platform_device *pdev)
+{
+        struct device_node *port, *ep;
+        struct component_match *match = NULL;
+
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
+        /* there is only one output port inside each device, find it */
+        ep = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
+        if (!ep)
+                return -ENODEV;
+
+        if (!of_device_is_available(ep)) {
+                of_node_put(ep);
+                return -ENODEV;
+        }
+
+        /* add the remote encoder port as component */
+        port = of_graph_get_remote_port_parent(ep);
+        of_node_put(ep);
+        if (!port || !of_device_is_available(port)) {
+                of_node_put(port);
+                return -EAGAIN;
+        }
+
+        component_match_add(&pdev->dev, &match, malidp_compare_dev, port);
+        return component_master_add_with_match(&pdev->dev, &malidp_master_ops,
+                                               match);
+}
+
+static int malidp_platform_remove(struct platform_device *pdev)
+{
+        component_master_del(&pdev->dev, &malidp_master_ops);
+        return 0;
+}
+
+static struct platform_driver malidp_platform_driver = {
+        .probe          = malidp_platform_probe,
+        .remove         = malidp_platform_remove,
+        .driver = {
+                .name = "mali-dp",
+                .of_match_table = malidp_drm_of_match,
+        },
+};
+
+module_platform_driver(malidp_platform_driver);
+
+MODULE_AUTHOR("Liviu Dudau <Liviu.Dudau@arm.com>");
+MODULE_DESCRIPTION("ARM Mali DP DRM driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h
new file mode 100644
index 000000000000..95558fde214b
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_drv.h
@@ -0,0 +1,54 @@
+/*
+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved.
+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP500/DP550/DP650 KMS/DRM driver structures
+ */
+
+#ifndef __MALIDP_DRV_H__
+#define __MALIDP_DRV_H__
+
+#include <linux/mutex.h>
+#include <linux/wait.h>
+#include "malidp_hw.h"
+
+struct malidp_drm {
+        struct malidp_hw_device *dev;
+        struct drm_fbdev_cma *fbdev;
+        struct list_head event_list;
+        struct drm_crtc crtc;
+        wait_queue_head_t wq;
+        atomic_t config_valid;
+};
+
+#define crtc_to_malidp_device(x) container_of(x, struct malidp_drm, crtc)
+
+struct malidp_plane {
+        struct drm_plane base;
+        struct malidp_hw_device *hwdev;
+        const struct malidp_layer *layer;
+};
+
+struct malidp_plane_state {
+        struct drm_plane_state base;
+
+        /* size of the required rotation memory if plane is rotated */
+        u32 rotmem_size;
+};
+
+#define to_malidp_plane(x) container_of(x, struct malidp_plane, base)
+#define to_malidp_plane_state(x) container_of(x, struct malidp_plane_state, base)
+
+int malidp_de_planes_init(struct drm_device *drm);
+void malidp_de_planes_destroy(struct drm_device *drm);
+int malidp_crtc_init(struct drm_device *drm);
+
+/* often used combination of rotational bits */
+#define MALIDP_ROTATED_MASK     (BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270))
+
+#endif  /* __MALIDP_DRV_H__ */
diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c
new file mode 100644
index 000000000000..a6132f1d58c1
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_hw.c
@@ -0,0 +1,691 @@
+/*
+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved.
+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP500/DP550/DP650 hardware manipulation routines. This is where
+ * the difference between various versions of the hardware is being dealt with
+ * in an attempt to provide to the rest of the driver code a unified view
+ */
+
+#include <linux/types.h>
+#include <linux/io.h>
+#include <drm/drmP.h>
+#include <video/videomode.h>
+#include <video/display_timing.h>
+
+#include "malidp_drv.h"
+#include "malidp_hw.h"
+
+static const struct malidp_input_format malidp500_de_formats[] = {
+        /*    fourcc,   layers supporting the format,     internal id  */
+        { DRM_FORMAT_ARGB2101010, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  0 },
+        { DRM_FORMAT_ABGR2101010, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  1 },
+        { DRM_FORMAT_ARGB8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  2 },
+        { DRM_FORMAT_ABGR8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  3 },
+        { DRM_FORMAT_XRGB8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  4 },
+        { DRM_FORMAT_XBGR8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  5 },
+        { DRM_FORMAT_RGB888, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  6 },
+        { DRM_FORMAT_BGR888, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  7 },
+        { DRM_FORMAT_RGBA5551, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  8 },
+        { DRM_FORMAT_ABGR1555, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2,  9 },
+        { DRM_FORMAT_RGB565, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2, 10 },
+        { DRM_FORMAT_BGR565, DE_VIDEO1 | DE_GRAPHICS1 | DE_GRAPHICS2, 11 },
+        { DRM_FORMAT_UYVY, DE_VIDEO1, 12 },
+        { DRM_FORMAT_YUYV, DE_VIDEO1, 13 },
+        { DRM_FORMAT_NV12, DE_VIDEO1, 14 },
+        { DRM_FORMAT_YUV420, DE_VIDEO1, 15 },
+};
+
+#define MALIDP_ID(__group, __format) \
+        ((((__group) & 0x7) << 3) | ((__format) & 0x7))
+
+#define MALIDP_COMMON_FORMATS \
+        /*    fourcc,   layers supporting the format,      internal id   */ \
+        { DRM_FORMAT_ARGB2101010, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(0, 0) }, \
+        { DRM_FORMAT_ABGR2101010, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(0, 1) }, \
+        { DRM_FORMAT_RGBA1010102, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(0, 2) }, \
+        { DRM_FORMAT_BGRA1010102, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(0, 3) }, \
+        { DRM_FORMAT_ARGB8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(1, 0) }, \
+        { DRM_FORMAT_ABGR8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(1, 1) }, \
+        { DRM_FORMAT_RGBA8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(1, 2) }, \
+        { DRM_FORMAT_BGRA8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(1, 3) }, \
+        { DRM_FORMAT_XRGB8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(2, 0) }, \
+        { DRM_FORMAT_XBGR8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(2, 1) }, \
+        { DRM_FORMAT_RGBX8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(2, 2) }, \
+        { DRM_FORMAT_BGRX8888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2 | DE_SMART, MALIDP_ID(2, 3) }, \
+        { DRM_FORMAT_RGB888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(3, 0) }, \
+        { DRM_FORMAT_BGR888, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(3, 1) }, \
+        { DRM_FORMAT_RGBA5551, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(4, 0) }, \
+        { DRM_FORMAT_ABGR1555, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(4, 1) }, \
+        { DRM_FORMAT_RGB565, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(4, 2) }, \
+        { DRM_FORMAT_BGR565, DE_VIDEO1 | DE_GRAPHICS1 | DE_VIDEO2, MALIDP_ID(4, 3) }, \
+        { DRM_FORMAT_YUYV, DE_VIDEO1 | DE_VIDEO2, MALIDP_ID(5, 2) },    \
+        { DRM_FORMAT_UYVY, DE_VIDEO1 | DE_VIDEO2, MALIDP_ID(5, 3) },    \
+        { DRM_FORMAT_NV12, DE_VIDEO1 | DE_VIDEO2, MALIDP_ID(5, 6) },    \
+        { DRM_FORMAT_YUV420, DE_VIDEO1 | DE_VIDEO2, MALIDP_ID(5, 7) }
+
+static const struct malidp_input_format malidp550_de_formats[] = {
+        MALIDP_COMMON_FORMATS,
+};
+
+static const struct malidp_layer malidp500_layers[] = {
+        { DE_VIDEO1, MALIDP500_DE_LV_BASE, MALIDP500_DE_LV_PTR_BASE },
+        { DE_GRAPHICS1, MALIDP500_DE_LG1_BASE, MALIDP500_DE_LG1_PTR_BASE },
+        { DE_GRAPHICS2, MALIDP500_DE_LG2_BASE, MALIDP500_DE_LG2_PTR_BASE },
+};
+
+static const struct malidp_layer malidp550_layers[] = {
+        { DE_VIDEO1, MALIDP550_DE_LV1_BASE, MALIDP550_DE_LV1_PTR_BASE },
+        { DE_GRAPHICS1, MALIDP550_DE_LG_BASE, MALIDP550_DE_LG_PTR_BASE },
+        { DE_VIDEO2, MALIDP550_DE_LV2_BASE, MALIDP550_DE_LV2_PTR_BASE },
+        { DE_SMART, MALIDP550_DE_LS_BASE, MALIDP550_DE_LS_PTR_BASE },
+};
+
+#define MALIDP_DE_DEFAULT_PREFETCH_START        5
+
+static int malidp500_query_hw(struct malidp_hw_device *hwdev)
+{
+        u32 conf = malidp_hw_read(hwdev, MALIDP500_CONFIG_ID);
+        /* bit 4 of the CONFIG_ID register holds the line size multiplier */
+        u8 ln_size_mult = conf & 0x10 ? 2 : 1;
+
+        hwdev->min_line_size = 2;
+        hwdev->max_line_size = SZ_2K * ln_size_mult;
+        hwdev->rotation_memory[0] = SZ_1K * 64 * ln_size_mult;
+        hwdev->rotation_memory[1] = 0; /* no second rotation memory bank */
+
+        return 0;
+}
+
+static void malidp500_enter_config_mode(struct malidp_hw_device *hwdev)
+{
+        u32 status, count = 100;
+
+        malidp_hw_setbits(hwdev, MALIDP500_DC_CONFIG_REQ, MALIDP500_DC_CONTROL);
+        while (count) {
+                status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+                if ((status & MALIDP500_DC_CONFIG_REQ) == MALIDP500_DC_CONFIG_REQ)
+                        break;
+                /*
+                 * entering config mode can take as long as the rendering
+                 * of a full frame, hence the long sleep here
+                 */
+                usleep_range(1000, 10000);
+                count--;
+        }
+        WARN(count == 0, "timeout while entering config mode");
+}
+
+static void malidp500_leave_config_mode(struct malidp_hw_device *hwdev)
+{
+        u32 status, count = 100;
+
+        malidp_hw_clearbits(hwdev, MALIDP500_DC_CONFIG_REQ, MALIDP500_DC_CONTROL);
+        while (count) {
+                status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+                if ((status & MALIDP500_DC_CONFIG_REQ) == 0)
+                        break;
+                usleep_range(100, 1000);
+                count--;
+        }
+        WARN(count == 0, "timeout while leaving config mode");
+}
+
+static bool malidp500_in_config_mode(struct malidp_hw_device *hwdev)
+{
+        u32 status;
+
+        status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+        if ((status & MALIDP500_DC_CONFIG_REQ) == MALIDP500_DC_CONFIG_REQ)
+                return true;
+
+        return false;
+}
+
+static void malidp500_set_config_valid(struct malidp_hw_device *hwdev)
+{
+        malidp_hw_setbits(hwdev, MALIDP_CFG_VALID, MALIDP500_CONFIG_VALID);
+}
+
+static void malidp500_modeset(struct malidp_hw_device *hwdev, struct videomode *mode)
+{
+        u32 val = 0;
+
+        malidp_hw_clearbits(hwdev, MALIDP500_DC_CLEAR_MASK, MALIDP500_DC_CONTROL);
+        if (mode->flags & DISPLAY_FLAGS_HSYNC_HIGH)
+                val |= MALIDP500_HSYNCPOL;
+        if (mode->flags & DISPLAY_FLAGS_VSYNC_HIGH)
+                val |= MALIDP500_VSYNCPOL;
+        val |= MALIDP_DE_DEFAULT_PREFETCH_START;
+        malidp_hw_setbits(hwdev, val, MALIDP500_DC_CONTROL);
+
+        /*
+         * Mali-DP500 encodes the background color like this:
+         *    - red   @ MALIDP500_BGND_COLOR[12:0]
+         *    - green @ MALIDP500_BGND_COLOR[27:16]
+         *    - blue  @ (MALIDP500_BGND_COLOR + 4)[12:0]
+         */
+        val = ((MALIDP_BGND_COLOR_G & 0xfff) << 16) |
+              (MALIDP_BGND_COLOR_R & 0xfff);
+        malidp_hw_write(hwdev, val, MALIDP500_BGND_COLOR);
+        malidp_hw_write(hwdev, MALIDP_BGND_COLOR_B, MALIDP500_BGND_COLOR + 4);
+
+        val = MALIDP_DE_H_FRONTPORCH(mode->hfront_porch) |
+                MALIDP_DE_H_BACKPORCH(mode->hback_porch);
+        malidp_hw_write(hwdev, val, MALIDP500_TIMINGS_BASE + MALIDP_DE_H_TIMINGS);
+
+        val = MALIDP500_DE_V_FRONTPORCH(mode->vfront_porch) |
+                MALIDP_DE_V_BACKPORCH(mode->vback_porch);
+        malidp_hw_write(hwdev, val, MALIDP500_TIMINGS_BASE + MALIDP_DE_V_TIMINGS);
+
+        val = MALIDP_DE_H_SYNCWIDTH(mode->hsync_len) |
+                MALIDP_DE_V_SYNCWIDTH(mode->vsync_len);
+        malidp_hw_write(hwdev, val, MALIDP500_TIMINGS_BASE + MALIDP_DE_SYNC_WIDTH);
+
+        val = MALIDP_DE_H_ACTIVE(mode->hactive) | MALIDP_DE_V_ACTIVE(mode->vactive);
+        malidp_hw_write(hwdev, val, MALIDP500_TIMINGS_BASE + MALIDP_DE_HV_ACTIVE);
+
+        if (mode->flags & DISPLAY_FLAGS_INTERLACED)
+                malidp_hw_setbits(hwdev, MALIDP_DISP_FUNC_ILACED, MALIDP_DE_DISPLAY_FUNC);
+        else
+                malidp_hw_clearbits(hwdev, MALIDP_DISP_FUNC_ILACED, MALIDP_DE_DISPLAY_FUNC);
+}
+
+static int malidp500_rotmem_required(struct malidp_hw_device *hwdev, u16 w, u16 h, u32 fmt)
+{
+        unsigned int depth;
+        int bpp;
+
+        /* RGB888 or BGR888 can't be rotated */
+        if ((fmt == DRM_FORMAT_RGB888) || (fmt == DRM_FORMAT_BGR888))
+                return -EINVAL;
+
+        /*
+         * Each layer needs enough rotation memory to fit 8 lines
+         * worth of pixel data. Required size is then:
+         *    size = rotated_width * (bpp / 8) * 8;
+         */
+        drm_fb_get_bpp_depth(fmt, &depth, &bpp);
+
+        return w * bpp;
+}
+
+static int malidp550_query_hw(struct malidp_hw_device *hwdev)
+{
+        u32 conf = malidp_hw_read(hwdev, MALIDP550_CONFIG_ID);
+        u8 ln_size = (conf >> 4) & 0x3, rsize;
+
+        hwdev->min_line_size = 2;
+
+        switch (ln_size) {
+        case 0:
+                hwdev->max_line_size = SZ_2K;
+                /* two banks of 64KB for rotation memory */
+                rsize = 64;
+                break;
+        case 1:
+                hwdev->max_line_size = SZ_4K;
+                /* two banks of 128KB for rotation memory */
+                rsize = 128;
+                break;
+        case 2:
+                hwdev->max_line_size = 1280;
+                /* two banks of 40KB for rotation memory */
+                rsize = 40;
+                break;
+        case 3:
+                /* reserved value */
+                hwdev->max_line_size = 0;
+                return -EINVAL;
+        }
+
+        hwdev->rotation_memory[0] = hwdev->rotation_memory[1] = rsize * SZ_1K;
+        return 0;
+}
+
+static void malidp550_enter_config_mode(struct malidp_hw_device *hwdev)
+{
+        u32 status, count = 100;
+
+        malidp_hw_setbits(hwdev, MALIDP550_DC_CONFIG_REQ, MALIDP550_DC_CONTROL);
+        while (count) {
+                status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+                if ((status & MALIDP550_DC_CONFIG_REQ) == MALIDP550_DC_CONFIG_REQ)
+                        break;
+                /*
+                 * entering config mode can take as long as the rendering
+                 * of a full frame, hence the long sleep here
+                 */
+                usleep_range(1000, 10000);
+                count--;
+        }
+        WARN(count == 0, "timeout while entering config mode");
+}
+
+static void malidp550_leave_config_mode(struct malidp_hw_device *hwdev)
+{
+        u32 status, count = 100;
+
+        malidp_hw_clearbits(hwdev, MALIDP550_DC_CONFIG_REQ, MALIDP550_DC_CONTROL);
+        while (count) {
+                status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+                if ((status & MALIDP550_DC_CONFIG_REQ) == 0)
+                        break;
+                usleep_range(100, 1000);
+                count--;
+        }
+        WARN(count == 0, "timeout while leaving config mode");
+}
+
+static bool malidp550_in_config_mode(struct malidp_hw_device *hwdev)
+{
+        u32 status;
+
+        status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+        if ((status & MALIDP550_DC_CONFIG_REQ) == MALIDP550_DC_CONFIG_REQ)
+                return true;
+
+        return false;
+}
+
+static void malidp550_set_config_valid(struct malidp_hw_device *hwdev)
+{
+        malidp_hw_setbits(hwdev, MALIDP_CFG_VALID, MALIDP550_CONFIG_VALID);
+}
+
+static void malidp550_modeset(struct malidp_hw_device *hwdev, struct videomode *mode)
+{
+        u32 val = MALIDP_DE_DEFAULT_PREFETCH_START;
+
+        malidp_hw_write(hwdev, val, MALIDP550_DE_CONTROL);
+        /*
+         * Mali-DP550 and Mali-DP650 encode the background color like this:
+         *   - red   @ MALIDP550_DE_BGND_COLOR[23:16]
+         *   - green @ MALIDP550_DE_BGND_COLOR[15:8]
+         *   - blue  @ MALIDP550_DE_BGND_COLOR[7:0]
+         *
+         * We need to truncate the least significant 4 bits from the default
+         * MALIDP_BGND_COLOR_x values
+         */
+        val = (((MALIDP_BGND_COLOR_R >> 4) & 0xff) << 16) |
+              (((MALIDP_BGND_COLOR_G >> 4) & 0xff) << 8) |
+              ((MALIDP_BGND_COLOR_B >> 4) & 0xff);
+        malidp_hw_write(hwdev, val, MALIDP550_DE_BGND_COLOR);
+
+        val = MALIDP_DE_H_FRONTPORCH(mode->hfront_porch) |
+                MALIDP_DE_H_BACKPORCH(mode->hback_porch);
+        malidp_hw_write(hwdev, val, MALIDP550_TIMINGS_BASE + MALIDP_DE_H_TIMINGS);
+
+        val = MALIDP550_DE_V_FRONTPORCH(mode->vfront_porch) |
+                MALIDP_DE_V_BACKPORCH(mode->vback_porch);
+        malidp_hw_write(hwdev, val, MALIDP550_TIMINGS_BASE + MALIDP_DE_V_TIMINGS);
+
+        val = MALIDP_DE_H_SYNCWIDTH(mode->hsync_len) |
+                MALIDP_DE_V_SYNCWIDTH(mode->vsync_len);
+        if (mode->flags & DISPLAY_FLAGS_HSYNC_HIGH)
+                val |= MALIDP550_HSYNCPOL;
+        if (mode->flags & DISPLAY_FLAGS_VSYNC_HIGH)
+                val |= MALIDP550_VSYNCPOL;
+        malidp_hw_write(hwdev, val, MALIDP550_TIMINGS_BASE + MALIDP_DE_SYNC_WIDTH);
+
+        val = MALIDP_DE_H_ACTIVE(mode->hactive) | MALIDP_DE_V_ACTIVE(mode->vactive);
+        malidp_hw_write(hwdev, val, MALIDP550_TIMINGS_BASE + MALIDP_DE_HV_ACTIVE);
+
+        if (mode->flags & DISPLAY_FLAGS_INTERLACED)
+                malidp_hw_setbits(hwdev, MALIDP_DISP_FUNC_ILACED, MALIDP_DE_DISPLAY_FUNC);
+        else
+                malidp_hw_clearbits(hwdev, MALIDP_DISP_FUNC_ILACED, MALIDP_DE_DISPLAY_FUNC);
+}
+
+static int malidp550_rotmem_required(struct malidp_hw_device *hwdev, u16 w, u16 h, u32 fmt)
+{
+        u32 bytes_per_col;
+
+        /* raw RGB888 or BGR888 can't be rotated */
+        if ((fmt == DRM_FORMAT_RGB888) || (fmt == DRM_FORMAT_BGR888))
+                return -EINVAL;
+
+        switch (fmt) {
+        /* 8 lines at 4 bytes per pixel */
+        case DRM_FORMAT_ARGB2101010:
+        case DRM_FORMAT_ABGR2101010:
+        case DRM_FORMAT_RGBA1010102:
+        case DRM_FORMAT_BGRA1010102:
+        case DRM_FORMAT_ARGB8888:
+        case DRM_FORMAT_ABGR8888:
+        case DRM_FORMAT_RGBA8888:
+        case DRM_FORMAT_BGRA8888:
+        case DRM_FORMAT_XRGB8888:
+        case DRM_FORMAT_XBGR8888:
+        case DRM_FORMAT_RGBX8888:
+        case DRM_FORMAT_BGRX8888:
+        case DRM_FORMAT_RGB888:
+        case DRM_FORMAT_BGR888:
+        /* 16 lines at 2 bytes per pixel */
+        case DRM_FORMAT_RGBA5551:
+        case DRM_FORMAT_ABGR1555:
+        case DRM_FORMAT_RGB565:
+        case DRM_FORMAT_BGR565:
+        case DRM_FORMAT_UYVY:
+        case DRM_FORMAT_YUYV:
+                bytes_per_col = 32;
+                break;
+        /* 16 lines at 1.5 bytes per pixel */
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_YUV420:
+                bytes_per_col = 24;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return w * bytes_per_col;
+}
+
+static int malidp650_query_hw(struct malidp_hw_device *hwdev)
+{
+        u32 conf = malidp_hw_read(hwdev, MALIDP550_CONFIG_ID);
+        u8 ln_size = (conf >> 4) & 0x3, rsize;
+
+        hwdev->min_line_size = 4;
+
+        switch (ln_size) {
+        case 0:
+        case 2:
+                /* reserved values */
+                hwdev->max_line_size = 0;
+                return -EINVAL;
+        case 1:
+                hwdev->max_line_size = SZ_4K;
+                /* two banks of 128KB for rotation memory */
+                rsize = 128;
+                break;
+        case 3:
+                hwdev->max_line_size = 2560;
+                /* two banks of 80KB for rotation memory */
+                rsize = 80;
+        }
+
+        hwdev->rotation_memory[0] = hwdev->rotation_memory[1] = rsize * SZ_1K;
+        return 0;
+}
+
+const struct malidp_hw_device malidp_device[MALIDP_MAX_DEVICES] = {
+        [MALIDP_500] = {
+                .map = {
+                        .se_base = MALIDP500_SE_BASE,
+                        .dc_base = MALIDP500_DC_BASE,
+                        .out_depth_base = MALIDP500_OUTPUT_DEPTH,
+                        .features = 0,  /* no CLEARIRQ register */
+                        .n_layers = ARRAY_SIZE(malidp500_layers),
+                        .layers = malidp500_layers,
+                        .de_irq_map = {
+                                .irq_mask = MALIDP_DE_IRQ_UNDERRUN |
+                                            MALIDP500_DE_IRQ_AXI_ERR |
+                                            MALIDP500_DE_IRQ_VSYNC |
+                                            MALIDP500_DE_IRQ_GLOBAL,
+                                .vsync_irq = MALIDP500_DE_IRQ_VSYNC,
+                        },
+                        .se_irq_map = {
+                                .irq_mask = MALIDP500_SE_IRQ_CONF_MODE,
+                                .vsync_irq = 0,
+                        },
+                        .dc_irq_map = {
+                                .irq_mask = MALIDP500_DE_IRQ_CONF_VALID,
+                                .vsync_irq = MALIDP500_DE_IRQ_CONF_VALID,
+                        },
+                        .input_formats = malidp500_de_formats,
+                        .n_input_formats = ARRAY_SIZE(malidp500_de_formats),
+                },
+                .query_hw = malidp500_query_hw,
+                .enter_config_mode = malidp500_enter_config_mode,
+                .leave_config_mode = malidp500_leave_config_mode,
+                .in_config_mode = malidp500_in_config_mode,
+                .set_config_valid = malidp500_set_config_valid,
+                .modeset = malidp500_modeset,
+                .rotmem_required = malidp500_rotmem_required,
+        },
+        [MALIDP_550] = {
+                .map = {
+                        .se_base = MALIDP550_SE_BASE,
+                        .dc_base = MALIDP550_DC_BASE,
+                        .out_depth_base = MALIDP550_DE_OUTPUT_DEPTH,
+                        .features = MALIDP_REGMAP_HAS_CLEARIRQ,
+                        .n_layers = ARRAY_SIZE(malidp550_layers),
+                        .layers = malidp550_layers,
+                        .de_irq_map = {
+                                .irq_mask = MALIDP_DE_IRQ_UNDERRUN |
+                                            MALIDP550_DE_IRQ_VSYNC,
+                                .vsync_irq = MALIDP550_DE_IRQ_VSYNC,
+                        },
+                        .se_irq_map = {
+                                .irq_mask = MALIDP550_SE_IRQ_EOW |
+                                            MALIDP550_SE_IRQ_AXI_ERR,
+                        },
+                        .dc_irq_map = {
+                                .irq_mask = MALIDP550_DC_IRQ_CONF_VALID,
+                                .vsync_irq = MALIDP550_DC_IRQ_CONF_VALID,
+                        },
+                        .input_formats = malidp550_de_formats,
+                        .n_input_formats = ARRAY_SIZE(malidp550_de_formats),
+                },
+                .query_hw = malidp550_query_hw,
+                .enter_config_mode = malidp550_enter_config_mode,
+                .leave_config_mode = malidp550_leave_config_mode,
+                .in_config_mode = malidp550_in_config_mode,
+                .set_config_valid = malidp550_set_config_valid,
+                .modeset = malidp550_modeset,
+                .rotmem_required = malidp550_rotmem_required,
+        },
+        [MALIDP_650] = {
+                .map = {
+                        .se_base = MALIDP550_SE_BASE,
+                        .dc_base = MALIDP550_DC_BASE,
+                        .out_depth_base = MALIDP550_DE_OUTPUT_DEPTH,
+                        .features = MALIDP_REGMAP_HAS_CLEARIRQ,
+                        .n_layers = ARRAY_SIZE(malidp550_layers),
+                        .layers = malidp550_layers,
+                        .de_irq_map = {
+                                .irq_mask = MALIDP_DE_IRQ_UNDERRUN |
+                                            MALIDP650_DE_IRQ_DRIFT |
+                                            MALIDP550_DE_IRQ_VSYNC,
+                                .vsync_irq = MALIDP550_DE_IRQ_VSYNC,
+                        },
+                        .se_irq_map = {
+                                .irq_mask = MALIDP550_SE_IRQ_EOW |
+                                            MALIDP550_SE_IRQ_AXI_ERR,
+                        },
+                        .dc_irq_map = {
+                                .irq_mask = MALIDP550_DC_IRQ_CONF_VALID,
+                                .vsync_irq = MALIDP550_DC_IRQ_CONF_VALID,
+                        },
+                        .input_formats = malidp550_de_formats,
+                        .n_input_formats = ARRAY_SIZE(malidp550_de_formats),
+                },
+                .query_hw = malidp650_query_hw,
+                .enter_config_mode = malidp550_enter_config_mode,
+                .leave_config_mode = malidp550_leave_config_mode,
+                .in_config_mode = malidp550_in_config_mode,
+                .set_config_valid = malidp550_set_config_valid,
+                .modeset = malidp550_modeset,
+                .rotmem_required = malidp550_rotmem_required,
+        },
+};
+
+u8 malidp_hw_get_format_id(const struct malidp_hw_regmap *map,
+                           u8 layer_id, u32 format)
+{
+        unsigned int i;
+
+        for (i = 0; i < map->n_input_formats; i++) {
+                if (((map->input_formats[i].layer & layer_id) == layer_id) &&
+                    (map->input_formats[i].format == format))
+                        return map->input_formats[i].id;
+        }
+
+        return MALIDP_INVALID_FORMAT_ID;
+}
+
+static void malidp_hw_clear_irq(struct malidp_hw_device *hwdev, u8 block, u32 irq)
+{
+        u32 base = malidp_get_block_base(hwdev, block);
+
+        if (hwdev->map.features & MALIDP_REGMAP_HAS_CLEARIRQ)
+                malidp_hw_write(hwdev, irq, base + MALIDP_REG_CLEARIRQ);
+        else
+                malidp_hw_write(hwdev, irq, base + MALIDP_REG_STATUS);
+}
+
+static irqreturn_t malidp_de_irq(int irq, void *arg)
+{
+        struct drm_device *drm = arg;
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev;
+        const struct malidp_irq_map *de;
+        u32 status, mask, dc_status;
+        irqreturn_t ret = IRQ_NONE;
+
+        if (!drm->dev_private)
+                return IRQ_HANDLED;
+
+        hwdev = malidp->dev;
+        de = &hwdev->map.de_irq_map;
+
+        /* first handle the config valid IRQ */
+        dc_status = malidp_hw_read(hwdev, hwdev->map.dc_base + MALIDP_REG_STATUS);
+        if (dc_status & hwdev->map.dc_irq_map.vsync_irq) {
+                /* we have a page flip event */
+                atomic_set(&malidp->config_valid, 1);
+                malidp_hw_clear_irq(hwdev, MALIDP_DC_BLOCK, dc_status);
+                ret = IRQ_WAKE_THREAD;
+        }
+
+        status = malidp_hw_read(hwdev, MALIDP_REG_STATUS);
+        if (!(status & de->irq_mask))
+                return ret;
+
+        mask = malidp_hw_read(hwdev, MALIDP_REG_MASKIRQ);
+        status &= mask;
+        if (status & de->vsync_irq)
+                drm_crtc_handle_vblank(&malidp->crtc);
+
+        malidp_hw_clear_irq(hwdev, MALIDP_DE_BLOCK, status);
+
+        return (ret == IRQ_NONE) ? IRQ_HANDLED : ret;
+}
+
+static irqreturn_t malidp_de_irq_thread_handler(int irq, void *arg)
+{
+        struct drm_device *drm = arg;
+        struct malidp_drm *malidp = drm->dev_private;
+
+        wake_up(&malidp->wq);
+
+        return IRQ_HANDLED;
+}
+
+int malidp_de_irq_init(struct drm_device *drm, int irq)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+        int ret;
+
+        /* ensure interrupts are disabled */
+        malidp_hw_disable_irq(hwdev, MALIDP_DE_BLOCK, 0xffffffff);
+        malidp_hw_clear_irq(hwdev, MALIDP_DE_BLOCK, 0xffffffff);
+        malidp_hw_disable_irq(hwdev, MALIDP_DC_BLOCK, 0xffffffff);
+        malidp_hw_clear_irq(hwdev, MALIDP_DC_BLOCK, 0xffffffff);
+
+        ret = devm_request_threaded_irq(drm->dev, irq, malidp_de_irq,
+                                        malidp_de_irq_thread_handler,
+                                        IRQF_SHARED, "malidp-de", drm);
+        if (ret < 0) {
+                DRM_ERROR("failed to install DE IRQ handler\n");
+                return ret;
+        }
+
+        /* first enable the DC block IRQs */
+        malidp_hw_enable_irq(hwdev, MALIDP_DC_BLOCK,
+                             hwdev->map.dc_irq_map.irq_mask);
+
+        /* now enable the DE block IRQs */
+        malidp_hw_enable_irq(hwdev, MALIDP_DE_BLOCK,
+                             hwdev->map.de_irq_map.irq_mask);
+
+        return 0;
+}
+
+void malidp_de_irq_fini(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        malidp_hw_disable_irq(hwdev, MALIDP_DE_BLOCK,
+                              hwdev->map.de_irq_map.irq_mask);
+        malidp_hw_disable_irq(hwdev, MALIDP_DC_BLOCK,
+                              hwdev->map.dc_irq_map.irq_mask);
+}
+
+static irqreturn_t malidp_se_irq(int irq, void *arg)
+{
+        struct drm_device *drm = arg;
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+        u32 status, mask;
+
+        status = malidp_hw_read(hwdev, hwdev->map.se_base + MALIDP_REG_STATUS);
+        if (!(status & hwdev->map.se_irq_map.irq_mask))
+                return IRQ_NONE;
+
+        mask = malidp_hw_read(hwdev, hwdev->map.se_base + MALIDP_REG_MASKIRQ);
+        status = malidp_hw_read(hwdev, hwdev->map.se_base + MALIDP_REG_STATUS);
+        status &= mask;
+        /* ToDo: status decoding and firing up of VSYNC and page flip events */
+
+        malidp_hw_clear_irq(hwdev, MALIDP_SE_BLOCK, status);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t malidp_se_irq_thread_handler(int irq, void *arg)
+{
+        return IRQ_HANDLED;
+}
+
+int malidp_se_irq_init(struct drm_device *drm, int irq)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+        int ret;
+
+        /* ensure interrupts are disabled */
+        malidp_hw_disable_irq(hwdev, MALIDP_SE_BLOCK, 0xffffffff);
+        malidp_hw_clear_irq(hwdev, MALIDP_SE_BLOCK, 0xffffffff);
+
+        ret = devm_request_threaded_irq(drm->dev, irq, malidp_se_irq,
+                                        malidp_se_irq_thread_handler,
+                                        IRQF_SHARED, "malidp-se", drm);
+        if (ret < 0) {
+                DRM_ERROR("failed to install SE IRQ handler\n");
+                return ret;
+        }
+
+        malidp_hw_enable_irq(hwdev, MALIDP_SE_BLOCK,
+                             hwdev->map.se_irq_map.irq_mask);
+
+        return 0;
+}
+
+void malidp_se_irq_fini(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        struct malidp_hw_device *hwdev = malidp->dev;
+
+        malidp_hw_disable_irq(hwdev, MALIDP_SE_BLOCK,
+                              hwdev->map.se_irq_map.irq_mask);
+}
diff --git a/drivers/gpu/drm/arm/malidp_hw.h b/drivers/gpu/drm/arm/malidp_hw.h
new file mode 100644
index 000000000000..141743e9f3a6
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_hw.h
@@ -0,0 +1,241 @@
+/*
+ *
+ * (C) COPYRIGHT 2013-2016 ARM Limited. All rights reserved.
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP hardware manipulation routines.
+ */
+
+#ifndef __MALIDP_HW_H__
+#define __MALIDP_HW_H__
+
+#include <linux/bitops.h>
+#include "malidp_regs.h"
+
+struct videomode;
+struct clk;
+
+/* Mali DP IP blocks */
+enum {
+        MALIDP_DE_BLOCK = 0,
+        MALIDP_SE_BLOCK,
+        MALIDP_DC_BLOCK
+};
+
+/* Mali DP layer IDs */
+enum {
+        DE_VIDEO1 = BIT(0),
+        DE_GRAPHICS1 = BIT(1),
+        DE_GRAPHICS2 = BIT(2), /* used only in DP500 */
+        DE_VIDEO2 = BIT(3),
+        DE_SMART = BIT(4),
+};
+
+struct malidp_input_format {
+        u32 format;             /* DRM fourcc */
+        u8 layer;               /* bitmask of layers supporting it */
+        u8 id;                  /* used internally */
+};
+
+#define MALIDP_INVALID_FORMAT_ID        0xff
+
+/*
+ * hide the differences between register maps
+ * by using a common structure to hold the
+ * base register offsets
+ */
+
+struct malidp_irq_map {
+        u32 irq_mask;           /* mask of IRQs that can be enabled in the block */
+        u32 vsync_irq;          /* IRQ bit used for signaling during VSYNC */
+};
+
+struct malidp_layer {
+        u16 id;                 /* layer ID */
+        u16 base;               /* address offset for the register bank */
+        u16 ptr;                /* address offset for the pointer register */
+};
+
+/* regmap features */
+#define MALIDP_REGMAP_HAS_CLEARIRQ      (1 << 0)
+
+struct malidp_hw_regmap {
+        /* address offset of the DE register bank */
+        /* is always 0x0000 */
+        /* address offset of the SE registers bank */
+        const u16 se_base;
+        /* address offset of the DC registers bank */
+        const u16 dc_base;
+
+        /* address offset for the output depth register */
+        const u16 out_depth_base;
+
+        /* bitmap with register map features */
+        const u8 features;
+
+        /* list of supported layers */
+        const u8 n_layers;
+        const struct malidp_layer *layers;
+
+        const struct malidp_irq_map de_irq_map;
+        const struct malidp_irq_map se_irq_map;
+        const struct malidp_irq_map dc_irq_map;
+
+        /* list of supported input formats for each layer */
+        const struct malidp_input_format *input_formats;
+        const u8 n_input_formats;
+};
+
+struct malidp_hw_device {
+        const struct malidp_hw_regmap map;
+        void __iomem *regs;
+
+        /* APB clock */
+        struct clk *pclk;
+        /* AXI clock */
+        struct clk *aclk;
+        /* main clock for display core */
+        struct clk *mclk;
+        /* pixel clock for display core */
+        struct clk *pxlclk;
+
+        /*
+         * Validate the driver instance against the hardware bits
+         */
+        int (*query_hw)(struct malidp_hw_device *hwdev);
+
+        /*
+         * Set the hardware into config mode, ready to accept mode changes
+         */
+        void (*enter_config_mode)(struct malidp_hw_device *hwdev);
+
+        /*
+         * Tell hardware to exit configuration mode
+         */
+        void (*leave_config_mode)(struct malidp_hw_device *hwdev);
+
+        /*
+         * Query if hardware is in configuration mode
+         */
+        bool (*in_config_mode)(struct malidp_hw_device *hwdev);
+
+        /*
+         * Set configuration valid flag for hardware parameters that can
+         * be changed outside the configuration mode. Hardware will use
+         * the new settings when config valid is set after the end of the
+         * current buffer scanout
+         */
+        void (*set_config_valid)(struct malidp_hw_device *hwdev);
+
+        /*
+         * Set a new mode in hardware. Requires the hardware to be in
+         * configuration mode before this function is called.
+         */
+        void (*modeset)(struct malidp_hw_device *hwdev, struct videomode *m);
+
+        /*
+         * Calculate the required rotation memory given the active area
+         * and the buffer format.
+         */
+        int (*rotmem_required)(struct malidp_hw_device *hwdev, u16 w, u16 h, u32 fmt);
+
+        u8 features;
+
+        u8 min_line_size;
+        u16 max_line_size;
+
+        /* size of memory used for rotating layers, up to two banks available */
+        u32 rotation_memory[2];
+};
+
+/* Supported variants of the hardware */
+enum {
+        MALIDP_500 = 0,
+        MALIDP_550,
+        MALIDP_650,
+        /* keep the next entry last */
+        MALIDP_MAX_DEVICES
+};
+
+extern const struct malidp_hw_device malidp_device[MALIDP_MAX_DEVICES];
+
+static inline u32 malidp_hw_read(struct malidp_hw_device *hwdev, u32 reg)
+{
+        return readl(hwdev->regs + reg);
+}
+
+static inline void malidp_hw_write(struct malidp_hw_device *hwdev,
+                                   u32 value, u32 reg)
+{
+        writel(value, hwdev->regs + reg);
+}
+
+static inline void malidp_hw_setbits(struct malidp_hw_device *hwdev,
+                                     u32 mask, u32 reg)
+{
+        u32 data = malidp_hw_read(hwdev, reg);
+
+        data |= mask;
+        malidp_hw_write(hwdev, data, reg);
+}
+
+static inline void malidp_hw_clearbits(struct malidp_hw_device *hwdev,
+                                       u32 mask, u32 reg)
+{
+        u32 data = malidp_hw_read(hwdev, reg);
+
+        data &= ~mask;
+        malidp_hw_write(hwdev, data, reg);
+}
+
+static inline u32 malidp_get_block_base(struct malidp_hw_device *hwdev,
+                                        u8 block)
+{
+        switch (block) {
+        case MALIDP_SE_BLOCK:
+                return hwdev->map.se_base;
+        case MALIDP_DC_BLOCK:
+                return hwdev->map.dc_base;
+        }
+
+        return 0;
+}
+
+static inline void malidp_hw_disable_irq(struct malidp_hw_device *hwdev,
+                                         u8 block, u32 irq)
+{
+        u32 base = malidp_get_block_base(hwdev, block);
+
+        malidp_hw_clearbits(hwdev, irq, base + MALIDP_REG_MASKIRQ);
+}
+
+static inline void malidp_hw_enable_irq(struct malidp_hw_device *hwdev,
+                                        u8 block, u32 irq)
+{
+        u32 base = malidp_get_block_base(hwdev, block);
+
+        malidp_hw_setbits(hwdev, irq, base + MALIDP_REG_MASKIRQ);
+}
+
+int malidp_de_irq_init(struct drm_device *drm, int irq);
+void malidp_de_irq_fini(struct drm_device *drm);
+int malidp_se_irq_init(struct drm_device *drm, int irq);
+void malidp_se_irq_fini(struct drm_device *drm);
+
+u8 malidp_hw_get_format_id(const struct malidp_hw_regmap *map,
+                           u8 layer_id, u32 format);
+
+/*
+ * background color components are defined as 12bits values,
+ * they will be shifted right when stored on hardware that
+ * supports only 8bits per channel
+ */
+#define MALIDP_BGND_COLOR_R             0x000
+#define MALIDP_BGND_COLOR_G             0x000
+#define MALIDP_BGND_COLOR_B             0x000
+
+#endif  /* __MALIDP_HW_H__ */
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
new file mode 100644
index 000000000000..725098d6179a
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -0,0 +1,298 @@
+/*
+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved.
+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP plane manipulation routines.
+ */
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_plane_helper.h>
+
+#include "malidp_hw.h"
+#include "malidp_drv.h"
+
+/* Layer specific register offsets */
+#define MALIDP_LAYER_FORMAT             0x000
+#define MALIDP_LAYER_CONTROL            0x004
+#define   LAYER_ENABLE                  (1 << 0)
+#define   LAYER_ROT_OFFSET              8
+#define   LAYER_H_FLIP                  (1 << 10)
+#define   LAYER_V_FLIP                  (1 << 11)
+#define   LAYER_ROT_MASK                (0xf << 8)
+#define MALIDP_LAYER_SIZE               0x00c
+#define   LAYER_H_VAL(x)                (((x) & 0x1fff) << 0)
+#define   LAYER_V_VAL(x)                (((x) & 0x1fff) << 16)
+#define MALIDP_LAYER_COMP_SIZE          0x010
+#define MALIDP_LAYER_OFFSET             0x014
+#define MALIDP_LAYER_STRIDE             0x018
+
+static void malidp_de_plane_destroy(struct drm_plane *plane)
+{
+        struct malidp_plane *mp = to_malidp_plane(plane);
+
+        if (mp->base.fb)
+                drm_framebuffer_unreference(mp->base.fb);
+
+        drm_plane_helper_disable(plane);
+        drm_plane_cleanup(plane);
+        devm_kfree(plane->dev->dev, mp);
+}
+
+struct drm_plane_state *malidp_duplicate_plane_state(struct drm_plane *plane)
+{
+        struct malidp_plane_state *state, *m_state;
+
+        if (!plane->state)
+                return NULL;
+
+        state = kmalloc(sizeof(*state), GFP_KERNEL);
+        if (state) {
+                m_state = to_malidp_plane_state(plane->state);
+                __drm_atomic_helper_plane_duplicate_state(plane, &state->base);
+                state->rotmem_size = m_state->rotmem_size;
+        }
+
+        return &state->base;
+}
+
+void malidp_destroy_plane_state(struct drm_plane *plane,
+                                struct drm_plane_state *state)
+{
+        struct malidp_plane_state *m_state = to_malidp_plane_state(state);
+
+        __drm_atomic_helper_plane_destroy_state(state);
+        kfree(m_state);
+}
+
+static const struct drm_plane_funcs malidp_de_plane_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = malidp_de_plane_destroy,
+        .reset = drm_atomic_helper_plane_reset,
+        .atomic_duplicate_state = malidp_duplicate_plane_state,
+        .atomic_destroy_state = malidp_destroy_plane_state,
+};
+
+static int malidp_de_plane_check(struct drm_plane *plane,
+                                 struct drm_plane_state *state)
+{
+        struct malidp_plane *mp = to_malidp_plane(plane);
+        struct malidp_plane_state *ms = to_malidp_plane_state(state);
+        u8 format_id;
+        u32 src_w, src_h;
+
+        if (!state->crtc || !state->fb)
+                return 0;
+
+        format_id = malidp_hw_get_format_id(&mp->hwdev->map, mp->layer->id,
+                                            state->fb->pixel_format);
+        if (format_id == MALIDP_INVALID_FORMAT_ID)
+                return -EINVAL;
+
+        src_w = state->src_w >> 16;
+        src_h = state->src_h >> 16;
+
+        if ((state->crtc_w > mp->hwdev->max_line_size) ||
+            (state->crtc_h > mp->hwdev->max_line_size) ||
+            (state->crtc_w < mp->hwdev->min_line_size) ||
+            (state->crtc_h < mp->hwdev->min_line_size) ||
+            (state->crtc_w != src_w) || (state->crtc_h != src_h))
+                return -EINVAL;
+
+        /* packed RGB888 / BGR888 can't be rotated or flipped */
+        if (state->rotation != BIT(DRM_ROTATE_0) &&
+            (state->fb->pixel_format == DRM_FORMAT_RGB888 ||
+             state->fb->pixel_format == DRM_FORMAT_BGR888))
+                return -EINVAL;
+
+        ms->rotmem_size = 0;
+        if (state->rotation & MALIDP_ROTATED_MASK) {
+                int val;
+
+                val = mp->hwdev->rotmem_required(mp->hwdev, state->crtc_h,
+                                                 state->crtc_w,
+                                                 state->fb->pixel_format);
+                if (val < 0)
+                        return val;
+
+                ms->rotmem_size = val;
+        }
+
+        return 0;
+}
+
+static void malidp_de_plane_update(struct drm_plane *plane,
+                                   struct drm_plane_state *old_state)
+{
+        struct drm_gem_cma_object *obj;
+        struct malidp_plane *mp;
+        const struct malidp_hw_regmap *map;
+        u8 format_id;
+        u16 ptr;
+        u32 format, src_w, src_h, dest_w, dest_h, val = 0;
+        int num_planes, i;
+
+        mp = to_malidp_plane(plane);
+
+        map = &mp->hwdev->map;
+        format = plane->state->fb->pixel_format;
+        format_id = malidp_hw_get_format_id(map, mp->layer->id, format);
+        num_planes = drm_format_num_planes(format);
+
+        /* convert src values from Q16 fixed point to integer */
+        src_w = plane->state->src_w >> 16;
+        src_h = plane->state->src_h >> 16;
+        if (plane->state->rotation & MALIDP_ROTATED_MASK) {
+                dest_w = plane->state->crtc_h;
+                dest_h = plane->state->crtc_w;
+        } else {
+                dest_w = plane->state->crtc_w;
+                dest_h = plane->state->crtc_h;
+        }
+
+        malidp_hw_write(mp->hwdev, format_id, mp->layer->base);
+
+        for (i = 0; i < num_planes; i++) {
+                /* calculate the offset for the layer's plane registers */
+                ptr = mp->layer->ptr + (i << 4);
+
+                obj = drm_fb_cma_get_gem_obj(plane->state->fb, i);
+                malidp_hw_write(mp->hwdev, lower_32_bits(obj->paddr), ptr);
+                malidp_hw_write(mp->hwdev, upper_32_bits(obj->paddr), ptr + 4);
+                malidp_hw_write(mp->hwdev, plane->state->fb->pitches[i],
+                                mp->layer->base + MALIDP_LAYER_STRIDE);
+        }
+
+        malidp_hw_write(mp->hwdev, LAYER_H_VAL(src_w) | LAYER_V_VAL(src_h),
+                        mp->layer->base + MALIDP_LAYER_SIZE);
+
+        malidp_hw_write(mp->hwdev, LAYER_H_VAL(dest_w) | LAYER_V_VAL(dest_h),
+                        mp->layer->base + MALIDP_LAYER_COMP_SIZE);
+
+        malidp_hw_write(mp->hwdev, LAYER_H_VAL(plane->state->crtc_x) |
+                        LAYER_V_VAL(plane->state->crtc_y),
+                        mp->layer->base + MALIDP_LAYER_OFFSET);
+
+        /* first clear the rotation bits in the register */
+        malidp_hw_clearbits(mp->hwdev, LAYER_ROT_MASK,
+                            mp->layer->base + MALIDP_LAYER_CONTROL);
+
+        /* setup the rotation and axis flip bits */
+        if (plane->state->rotation & DRM_ROTATE_MASK)
+                val = ilog2(plane->state->rotation & DRM_ROTATE_MASK) << LAYER_ROT_OFFSET;
+        if (plane->state->rotation & BIT(DRM_REFLECT_X))
+                val |= LAYER_V_FLIP;
+        if (plane->state->rotation & BIT(DRM_REFLECT_Y))
+                val |= LAYER_H_FLIP;
+
+        /* set the 'enable layer' bit */
+        val |= LAYER_ENABLE;
+
+        malidp_hw_setbits(mp->hwdev, val,
+                          mp->layer->base + MALIDP_LAYER_CONTROL);
+}
+
+static void malidp_de_plane_disable(struct drm_plane *plane,
+                                    struct drm_plane_state *state)
+{
+        struct malidp_plane *mp = to_malidp_plane(plane);
+
+        malidp_hw_clearbits(mp->hwdev, LAYER_ENABLE,
+                            mp->layer->base + MALIDP_LAYER_CONTROL);
+}
+
+static const struct drm_plane_helper_funcs malidp_de_plane_helper_funcs = {
+        .atomic_check = malidp_de_plane_check,
+        .atomic_update = malidp_de_plane_update,
+        .atomic_disable = malidp_de_plane_disable,
+};
+
+int malidp_de_planes_init(struct drm_device *drm)
+{
+        struct malidp_drm *malidp = drm->dev_private;
+        const struct malidp_hw_regmap *map = &malidp->dev->map;
+        struct malidp_plane *plane = NULL;
+        enum drm_plane_type plane_type;
+        unsigned long crtcs = 1 << drm->mode_config.num_crtc;
+        u32 *formats;
+        int ret, i, j, n;
+
+        formats = kcalloc(map->n_input_formats, sizeof(*formats), GFP_KERNEL);
+        if (!formats) {
+                ret = -ENOMEM;
+                goto cleanup;
+        }
+
+        for (i = 0; i < map->n_layers; i++) {
+                u8 id = map->layers[i].id;
+
+                plane = kzalloc(sizeof(*plane), GFP_KERNEL);
+                if (!plane) {
+                        ret = -ENOMEM;
+                        goto cleanup;
+                }
+
+                /* build the list of DRM supported formats based on the map */
+                for (n = 0, j = 0;  j < map->n_input_formats; j++) {
+                        if ((map->input_formats[j].layer & id) == id)
+                                formats[n++] = map->input_formats[j].format;
+                }
+
+                plane_type = (i == 0) ? DRM_PLANE_TYPE_PRIMARY :
+                                        DRM_PLANE_TYPE_OVERLAY;
+                ret = drm_universal_plane_init(drm, &plane->base, crtcs,
+                                               &malidp_de_plane_funcs, formats,
+                                               n, plane_type, NULL);
+                if (ret < 0)
+                        goto cleanup;
+
+                if (!drm->mode_config.rotation_property) {
+                        unsigned long flags = BIT(DRM_ROTATE_0) |
+                                              BIT(DRM_ROTATE_90) |
+                                              BIT(DRM_ROTATE_180) |
+                                              BIT(DRM_ROTATE_270) |
+                                              BIT(DRM_REFLECT_X) |
+                                              BIT(DRM_REFLECT_Y);
+                        drm->mode_config.rotation_property =
+                                drm_mode_create_rotation_property(drm, flags);
+                }
+                /* SMART layer can't be rotated */
+                if (drm->mode_config.rotation_property && (id != DE_SMART))
+                        drm_object_attach_property(&plane->base.base,
+                                                   drm->mode_config.rotation_property,
+                                                   BIT(DRM_ROTATE_0));
+
+                drm_plane_helper_add(&plane->base,
+                                     &malidp_de_plane_helper_funcs);
+                plane->hwdev = malidp->dev;
+                plane->layer = &map->layers[i];
+        }
+
+        kfree(formats);
+
+        return 0;
+
+cleanup:
+        malidp_de_planes_destroy(drm);
+        kfree(formats);
+
+        return ret;
+}
+
+void malidp_de_planes_destroy(struct drm_device *drm)
+{
+        struct drm_plane *p, *pt;
+
+        list_for_each_entry_safe(p, pt, &drm->mode_config.plane_list, head) {
+                drm_plane_cleanup(p);
+                kfree(p);
+        }
+}
diff --git a/drivers/gpu/drm/arm/malidp_regs.h b/drivers/gpu/drm/arm/malidp_regs.h
new file mode 100644
index 000000000000..73fecb38f955
--- /dev/null
+++ b/drivers/gpu/drm/arm/malidp_regs.h
@@ -0,0 +1,172 @@
+/*
+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved.
+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
+ *
+ * This program is free software and is provided to you under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU licence.
+ *
+ * ARM Mali DP500/DP550/DP650 registers definition.
+ */
+
+#ifndef __MALIDP_REGS_H__
+#define __MALIDP_REGS_H__
+
+/*
+ * abbreviations used:
+ *    - DC - display core (general settings)
+ *    - DE - display engine
+ *    - SE - scaling engine
+ */
+
+/* interrupt bit masks */
+#define MALIDP_DE_IRQ_UNDERRUN                  (1 << 0)
+
+#define MALIDP500_DE_IRQ_AXI_ERR                (1 << 4)
+#define MALIDP500_DE_IRQ_VSYNC                  (1 << 5)
+#define MALIDP500_DE_IRQ_PROG_LINE              (1 << 6)
+#define MALIDP500_DE_IRQ_SATURATION             (1 << 7)
+#define MALIDP500_DE_IRQ_CONF_VALID             (1 << 8)
+#define MALIDP500_DE_IRQ_CONF_MODE              (1 << 11)
+#define MALIDP500_DE_IRQ_CONF_ACTIVE            (1 << 17)
+#define MALIDP500_DE_IRQ_PM_ACTIVE              (1 << 18)
+#define MALIDP500_DE_IRQ_TESTMODE_ACTIVE        (1 << 19)
+#define MALIDP500_DE_IRQ_FORCE_BLNK_ACTIVE      (1 << 24)
+#define MALIDP500_DE_IRQ_AXI_BUSY               (1 << 28)
+#define MALIDP500_DE_IRQ_GLOBAL                 (1 << 31)
+#define MALIDP500_SE_IRQ_CONF_MODE              (1 << 0)
+#define MALIDP500_SE_IRQ_CONF_VALID             (1 << 4)
+#define MALIDP500_SE_IRQ_INIT_BUSY              (1 << 5)
+#define MALIDP500_SE_IRQ_AXI_ERROR              (1 << 8)
+#define MALIDP500_SE_IRQ_OVERRUN                (1 << 9)
+#define MALIDP500_SE_IRQ_PROG_LINE1             (1 << 12)
+#define MALIDP500_SE_IRQ_PROG_LINE2             (1 << 13)
+#define MALIDP500_SE_IRQ_CONF_ACTIVE            (1 << 17)
+#define MALIDP500_SE_IRQ_PM_ACTIVE              (1 << 18)
+#define MALIDP500_SE_IRQ_AXI_BUSY               (1 << 28)
+#define MALIDP500_SE_IRQ_GLOBAL                 (1 << 31)
+
+#define MALIDP550_DE_IRQ_SATURATION             (1 << 8)
+#define MALIDP550_DE_IRQ_VSYNC                  (1 << 12)
+#define MALIDP550_DE_IRQ_PROG_LINE              (1 << 13)
+#define MALIDP550_DE_IRQ_AXI_ERR                (1 << 16)
+#define MALIDP550_SE_IRQ_EOW                    (1 << 0)
+#define MALIDP550_SE_IRQ_AXI_ERR                (1 << 16)
+#define MALIDP550_DC_IRQ_CONF_VALID             (1 << 0)
+#define MALIDP550_DC_IRQ_CONF_MODE              (1 << 4)
+#define MALIDP550_DC_IRQ_CONF_ACTIVE            (1 << 16)
+#define MALIDP550_DC_IRQ_DE                     (1 << 20)
+#define MALIDP550_DC_IRQ_SE                     (1 << 24)
+
+#define MALIDP650_DE_IRQ_DRIFT                  (1 << 4)
+
+/* bit masks that are common between products */
+#define   MALIDP_CFG_VALID              (1 << 0)
+#define   MALIDP_DISP_FUNC_ILACED       (1 << 8)
+
+/* register offsets for IRQ management */
+#define MALIDP_REG_STATUS               0x00000
+#define MALIDP_REG_SETIRQ               0x00004
+#define MALIDP_REG_MASKIRQ              0x00008
+#define MALIDP_REG_CLEARIRQ             0x0000c
+
+/* register offsets */
+#define MALIDP_DE_CORE_ID               0x00018
+#define MALIDP_DE_DISPLAY_FUNC          0x00020
+
+/* these offsets are relative to MALIDP5x0_TIMINGS_BASE */
+#define MALIDP_DE_H_TIMINGS             0x0
+#define MALIDP_DE_V_TIMINGS             0x4
+#define MALIDP_DE_SYNC_WIDTH            0x8
+#define MALIDP_DE_HV_ACTIVE             0xc
+
+/* macros to set values into registers */
+#define MALIDP_DE_H_FRONTPORCH(x)       (((x) & 0xfff) << 0)
+#define MALIDP_DE_H_BACKPORCH(x)        (((x) & 0x3ff) << 16)
+#define MALIDP500_DE_V_FRONTPORCH(x)    (((x) & 0xff) << 0)
+#define MALIDP550_DE_V_FRONTPORCH(x)    (((x) & 0xfff) << 0)
+#define MALIDP_DE_V_BACKPORCH(x)        (((x) & 0xff) << 16)
+#define MALIDP_DE_H_SYNCWIDTH(x)        (((x) & 0x3ff) << 0)
+#define MALIDP_DE_V_SYNCWIDTH(x)        (((x) & 0xff) << 16)
+#define MALIDP_DE_H_ACTIVE(x)           (((x) & 0x1fff) << 0)
+#define MALIDP_DE_V_ACTIVE(x)           (((x) & 0x1fff) << 16)
+
+/* register offsets and bits specific to DP500 */
+#define MALIDP500_DC_BASE               0x00000
+#define MALIDP500_DC_CONTROL            0x0000c
+#define   MALIDP500_DC_CONFIG_REQ       (1 << 17)
+#define   MALIDP500_HSYNCPOL            (1 << 20)
+#define   MALIDP500_VSYNCPOL            (1 << 21)
+#define   MALIDP500_DC_CLEAR_MASK       0x300fff
+#define MALIDP500_DE_LINE_COUNTER       0x00010
+#define MALIDP500_DE_AXI_CONTROL        0x00014
+#define MALIDP500_DE_SECURE_CTRL        0x0001c
+#define MALIDP500_DE_CHROMA_KEY         0x00024
+#define MALIDP500_TIMINGS_BASE          0x00028
+
+#define MALIDP500_CONFIG_3D             0x00038
+#define MALIDP500_BGND_COLOR            0x0003c
+#define MALIDP500_OUTPUT_DEPTH          0x00044
+#define MALIDP500_YUV_RGB_COEF          0x00048
+#define MALIDP500_COLOR_ADJ_COEF        0x00078
+#define MALIDP500_COEF_TABLE_ADDR       0x000a8
+#define MALIDP500_COEF_TABLE_DATA       0x000ac
+#define MALIDP500_DE_LV_BASE            0x00100
+#define MALIDP500_DE_LV_PTR_BASE        0x00124
+#define MALIDP500_DE_LG1_BASE           0x00200
+#define MALIDP500_DE_LG1_PTR_BASE       0x0021c
+#define MALIDP500_DE_LG2_BASE           0x00300
+#define MALIDP500_DE_LG2_PTR_BASE       0x0031c
+#define MALIDP500_SE_BASE               0x00c00
+#define MALIDP500_SE_PTR_BASE           0x00e0c
+#define MALIDP500_DC_IRQ_BASE           0x00f00
+#define MALIDP500_CONFIG_VALID          0x00f00
+#define MALIDP500_CONFIG_ID             0x00fd4
+
+/* register offsets and bits specific to DP550/DP650 */
+#define MALIDP550_DE_CONTROL            0x00010
+#define MALIDP550_DE_LINE_COUNTER       0x00014
+#define MALIDP550_DE_AXI_CONTROL        0x00018
+#define MALIDP550_DE_QOS                0x0001c
+#define MALIDP550_TIMINGS_BASE          0x00030
+#define MALIDP550_HSYNCPOL              (1 << 12)
+#define MALIDP550_VSYNCPOL              (1 << 28)
+
+#define MALIDP550_DE_DISP_SIDEBAND      0x00040
+#define MALIDP550_DE_BGND_COLOR         0x00044
+#define MALIDP550_DE_OUTPUT_DEPTH       0x0004c
+#define MALIDP550_DE_COLOR_COEF         0x00050
+#define MALIDP550_DE_COEF_TABLE_ADDR    0x00080
+#define MALIDP550_DE_COEF_TABLE_DATA    0x00084
+#define MALIDP550_DE_LV1_BASE           0x00100
+#define MALIDP550_DE_LV1_PTR_BASE       0x00124
+#define MALIDP550_DE_LV2_BASE           0x00200
+#define MALIDP550_DE_LV2_PTR_BASE       0x00224
+#define MALIDP550_DE_LG_BASE            0x00300
+#define MALIDP550_DE_LG_PTR_BASE        0x0031c
+#define MALIDP550_DE_LS_BASE            0x00400
+#define MALIDP550_DE_LS_PTR_BASE        0x0042c
+#define MALIDP550_DE_PERF_BASE          0x00500
+#define MALIDP550_SE_BASE               0x08000
+#define MALIDP550_DC_BASE               0x0c000
+#define MALIDP550_DC_CONTROL            0x0c010
+#define   MALIDP550_DC_CONFIG_REQ       (1 << 16)
+#define MALIDP550_CONFIG_VALID          0x0c014
+#define MALIDP550_CONFIG_ID             0x0ffd4
+
+/*
+ * Starting with DP550 the register map blocks has been standardised to the
+ * following layout:
+ *
+ *   Offset            Block registers
+ *  0x00000            Display Engine
+ *  0x08000            Scaling Engine
+ *  0x0c000            Display Core
+ *  0x10000            Secure control
+ *
+ * The old DP500 IP mixes some DC with the DE registers, hence the need
+ * for a mapping structure.
+ */
+
+#endif /* __MALIDP_REGS_H__ */
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 3130aa8bcdd0..34405e4a5d36 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -199,7 +199,7 @@ static void armada_drm_plane_work_run(struct armada_crtc *dcrtc,
         /* Handle any pending frame work. */
         if (work) {
                 work->fn(dcrtc, plane, work);
-                drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
+                drm_crtc_vblank_put(&dcrtc->crtc);
         }
 
         wake_up(&plane->frame_wait);
@@ -210,7 +210,7 @@ int armada_drm_plane_work_queue(struct armada_crtc *dcrtc,
 {
         int ret;
 
-        ret = drm_vblank_get(dcrtc->crtc.dev, dcrtc->num);
+        ret = drm_crtc_vblank_get(&dcrtc->crtc);
         if (ret) {
                 DRM_ERROR("failed to acquire vblank counter\n");
                 return ret;
@@ -218,7 +218,7 @@ int armada_drm_plane_work_queue(struct armada_crtc *dcrtc,
 
         ret = cmpxchg(&plane->work, NULL, work) ? -EBUSY : 0;
         if (ret)
-                drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
+                drm_crtc_vblank_put(&dcrtc->crtc);
 
         return ret;
 }
@@ -234,7 +234,7 @@ struct armada_plane_work *armada_drm_plane_work_cancel(
         struct armada_plane_work *work = xchg(&plane->work, NULL);
 
         if (work)
-                drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
+                drm_crtc_vblank_put(&dcrtc->crtc);
 
         return work;
 }
@@ -260,7 +260,7 @@ static void armada_drm_crtc_complete_frame_work(struct armada_crtc *dcrtc,
 
         if (fwork->event) {
                 spin_lock_irqsave(&dev->event_lock, flags);
-                drm_send_vblank_event(dev, dcrtc->num, fwork->event);
+                drm_crtc_send_vblank_event(&dcrtc->crtc, fwork->event);
                 spin_unlock_irqrestore(&dev->event_lock, flags);
         }
 
@@ -592,9 +592,9 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc,
 
         if (interlaced ^ dcrtc->interlaced) {
                 if (adj->flags & DRM_MODE_FLAG_INTERLACE)
-                        drm_vblank_get(dcrtc->crtc.dev, dcrtc->num);
+                        drm_crtc_vblank_get(&dcrtc->crtc);
                 else
-                        drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
+                        drm_crtc_vblank_put(&dcrtc->crtc);
                 dcrtc->interlaced = interlaced;
         }
 
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 439824a61aa5..f5ebdd681445 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -189,7 +189,6 @@ static struct drm_driver armada_drm_driver = {
         .load                   = armada_drm_load,
         .lastclose              = armada_drm_lastclose,
         .unload                 = armada_drm_unload,
-        .set_busid              = drm_platform_set_busid,
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = armada_drm_enable_vblank,
         .disable_vblank         = armada_drm_disable_vblank,
@@ -197,7 +196,7 @@ static struct drm_driver armada_drm_driver = {
         .debugfs_init           = armada_drm_debugfs_init,
         .debugfs_cleanup        = armada_drm_debugfs_cleanup,
 #endif
-        .gem_free_object        = armada_gem_free_object,
+        .gem_free_object_unlocked = armada_gem_free_object,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
         .gem_prime_export       = armada_gem_prime_export,
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index 148e8a42b2c6..1ee707ef6b8d 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -121,6 +121,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
         int ret;
 
         ret = drm_plane_helper_check_update(plane, crtc, fb, &src, &dest, &clip,
+                                            BIT(DRM_ROTATE_0),
                                             0, INT_MAX, true, false, &visible);
         if (ret)
                 return ret;
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index fcd9c0714836..f54afd2113a9 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -209,7 +209,7 @@ static struct drm_driver driver = {
         .minor = DRIVER_MINOR,
         .patchlevel = DRIVER_PATCHLEVEL,
 
-        .gem_free_object = ast_gem_free_object,
+        .gem_free_object_unlocked = ast_gem_free_object,
         .dumb_create = ast_dumb_create,
         .dumb_map_offset = ast_dumb_mmap_offset,
         .dumb_destroy = drm_gem_dumb_destroy,
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index 5320f8c57884..c017a9330a18 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -167,12 +167,9 @@ static int astfb_create_object(struct ast_fbdev *afbdev,
                                struct drm_gem_object **gobj_p)
 {
         struct drm_device *dev = afbdev->helper.dev;
-        u32 bpp, depth;
         u32 size;
         struct drm_gem_object *gobj;
-
         int ret = 0;
-        drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
 
         size = mode_cmd->pitches[0] * mode_cmd->height;
         ret = ast_gem_create(dev, size, true, &gobj);
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index c337922606e3..5957c3e659fe 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -624,19 +624,21 @@ static void ast_crtc_reset(struct drm_crtc *crtc)
 
 }
 
-static void ast_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                 u16 *blue, uint32_t start, uint32_t size)
+static int ast_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                              u16 *blue, uint32_t size)
 {
         struct ast_crtc *ast_crtc = to_ast_crtc(crtc);
-        int end = (start + size > 256) ? 256 : start + size, i;
+        int i;
 
         /* userspace palettes are always correct as is */
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 ast_crtc->lut_r[i] = red[i] >> 8;
                 ast_crtc->lut_g[i] = green[i] >> 8;
                 ast_crtc->lut_b[i] = blue[i] >> 8;
         }
         ast_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
index cf23a755f777..613f6c99b76a 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
@@ -374,8 +374,8 @@ static void atmel_hlcdc_crtc_finish_page_flip(struct atmel_hlcdc_crtc *crtc)
 
         spin_lock_irqsave(&dev->event_lock, flags);
         if (crtc->event) {
-                drm_send_vblank_event(dev, crtc->id, crtc->event);
-                drm_vblank_put(dev, crtc->id);
+                drm_crtc_send_vblank_event(&crtc->base, crtc->event);
+                drm_crtc_vblank_put(&crtc->base);
                 crtc->event = NULL;
         }
         spin_unlock_irqrestore(&dev->event_lock, flags);
@@ -391,12 +391,11 @@ void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc)
 {
         struct atmel_hlcdc_crtc_state *state;
 
-        if (crtc->state && crtc->state->mode_blob)
-                drm_property_unreference_blob(crtc->state->mode_blob);
-
         if (crtc->state) {
+                __drm_atomic_helper_crtc_destroy_state(crtc->state);
                 state = drm_crtc_state_to_atmel_hlcdc_crtc_state(crtc->state);
                 kfree(state);
+                crtc->state = NULL;
         }
 
         state = kzalloc(sizeof(*state), GFP_KERNEL);
@@ -415,8 +414,9 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc)
                 return NULL;
 
         state = kmalloc(sizeof(*state), GFP_KERNEL);
-        if (state)
-                __drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
+        if (!state)
+                return NULL;
+        __drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
 
         cur = drm_crtc_state_to_atmel_hlcdc_crtc_state(crtc->state);
         state->output_mode = cur->output_mode;
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 8ded7645747e..d4a3d61b7b06 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -519,7 +519,7 @@ static int atmel_hlcdc_dc_atomic_commit(struct drm_device *dev,
         }
 
         /* Swap the state, this is the point of no return. */
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (async)
                 queue_work(dc->wq, &commit->work);
@@ -691,13 +691,6 @@ static void atmel_hlcdc_dc_unload(struct drm_device *dev)
         destroy_workqueue(dc->wq);
 }
 
-static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev)
-{
-        mutex_lock(&dev->mode_config.mutex);
-        drm_connector_unregister_all(dev);
-        mutex_unlock(&dev->mode_config.mutex);
-}
-
 static void atmel_hlcdc_dc_lastclose(struct drm_device *dev)
 {
         struct atmel_hlcdc_dc *dc = dev->dev_private;
@@ -776,7 +769,7 @@ static struct drm_driver atmel_hlcdc_dc_driver = {
         .get_vblank_counter = drm_vblank_no_hw_counter,
         .enable_vblank = atmel_hlcdc_dc_enable_vblank,
         .disable_vblank = atmel_hlcdc_dc_disable_vblank,
-        .gem_free_object = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops = &drm_gem_cma_vm_ops,
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
@@ -815,15 +808,8 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)
         if (ret)
                 goto err_unload;
 
-        ret = drm_connector_register_all(ddev);
-        if (ret)
-                goto err_unregister;
-
         return 0;
 
-err_unregister:
-        drm_dev_unregister(ddev);
-
 err_unload:
         atmel_hlcdc_dc_unload(ddev);
 
@@ -837,7 +823,6 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev)
 {
         struct drm_device *ddev = platform_get_drvdata(pdev);
 
-        atmel_hlcdc_dc_connector_unplug_all(ddev);
         drm_dev_unregister(ddev);
         atmel_hlcdc_dc_unload(ddev);
         drm_dev_unref(ddev);
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
index 39802c0539b6..6119b5085501 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
@@ -113,21 +113,9 @@ static int atmel_hlcdc_rgb_mode_valid(struct drm_connector *connector,
         return atmel_hlcdc_dc_mode_valid(rgb->dc, mode);
 }
 
-
-
-static struct drm_encoder *
-atmel_hlcdc_rgb_best_encoder(struct drm_connector *connector)
-{
-        struct atmel_hlcdc_rgb_output *rgb =
-                        drm_connector_to_atmel_hlcdc_rgb_output(connector);
-
-        return &rgb->encoder;
-}
-
 static const struct drm_connector_helper_funcs atmel_hlcdc_panel_connector_helper_funcs = {
         .get_modes = atmel_hlcdc_panel_get_modes,
         .mode_valid = atmel_hlcdc_rgb_mode_valid,
-        .best_encoder = atmel_hlcdc_rgb_best_encoder,
 };
 
 static enum drm_connector_status
@@ -266,9 +254,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
                 if (!ret)
                         ret = atmel_hlcdc_check_endpoint(dev, &ep);
 
-                of_node_put(ep_np);
-                if (ret)
+                if (ret) {
+                        of_node_put(ep_np);
                         return ret;
+                }
         }
 
         for_each_endpoint_of_node(dev->dev->of_node, ep_np) {
@@ -276,9 +265,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
                 if (!ret)
                         ret = atmel_hlcdc_attach_endpoint(dev, &ep);
 
-                of_node_put(ep_np);
-                if (ret)
+                if (ret) {
+                        of_node_put(ep_np);
                         return ret;
+                }
         }
 
         return 0;
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index aef3ca8a81fa..016c191221f3 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -339,6 +339,8 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane,
 
                 atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff,
                                              factor_reg);
+        } else {
+                atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, 0);
         }
 }
 
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index b332b4d3b0e2..abace82de6ea 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -89,7 +89,7 @@ static struct drm_driver bochs_driver = {
         .date                   = "20130925",
         .major                  = 1,
         .minor                  = 0,
-        .gem_free_object        = bochs_gem_free_object,
+        .gem_free_object_unlocked = bochs_gem_free_object,
         .dumb_create            = bochs_dumb_create,
         .dumb_map_offset        = bochs_dumb_mmap_offset,
         .dumb_destroy           = drm_gem_dumb_destroy,
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 8f7423f18da5..a141921445f4 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -50,6 +50,14 @@ config DRM_PARADE_PS8622
         ---help---
           Parade eDP-LVDS bridge chip driver.
 
+config DRM_SII902X
+        tristate "Silicon Image sii902x RGB/HDMI bridge"
+        depends on OF
+        select DRM_KMS_HELPER
+        select REGMAP_I2C
+        ---help---
+          Silicon Image sii902x bridge chip driver.
+
 source "drivers/gpu/drm/bridge/analogix/Kconfig"
 
 endmenu
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 96b13b30e6ab..bfec9f8cb9d2 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -5,4 +5,5 @@ obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o
 obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o
 obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o
 obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o
+obj-$(CONFIG_DRM_SII902X) += sii902x.o
 obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index d087b054c360..f9f03bcba0af 100644
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -986,16 +986,8 @@ unlock:
         return num_modes;
 }
 
-static struct drm_encoder *anx78xx_best_encoder(struct drm_connector *connector)
-{
-        struct anx78xx *anx78xx = connector_to_anx78xx(connector);
-
-        return anx78xx->bridge.encoder;
-}
-
 static const struct drm_connector_helper_funcs anx78xx_connector_helper_funcs = {
         .get_modes = anx78xx_get_modes,
-        .best_encoder = anx78xx_best_encoder,
 };
 
 static enum drm_connector_status anx78xx_detect(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
index c9d941283d30..70b1f7d4270b 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
@@ -1476,15 +1476,6 @@ dw_hdmi_connector_mode_valid(struct drm_connector *connector,
         return mode_status;
 }
 
-static struct drm_encoder *dw_hdmi_connector_best_encoder(struct drm_connector
-                                                           *connector)
-{
-        struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
-                                             connector);
-
-        return hdmi->encoder;
-}
-
 static void dw_hdmi_connector_destroy(struct drm_connector *connector)
 {
         drm_connector_unregister(connector);
@@ -1525,7 +1516,7 @@ static const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = {
 static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = {
         .get_modes = dw_hdmi_connector_get_modes,
         .mode_valid = dw_hdmi_connector_mode_valid,
-        .best_encoder = dw_hdmi_connector_best_encoder,
+        .best_encoder = drm_atomic_helper_best_encoder,
 };
 
 static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = {
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index 7ecd59f70b8e..93f3dacf9e27 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -235,16 +235,8 @@ out:
         return num_modes;
 }
 
-static struct drm_encoder *ptn3460_best_encoder(struct drm_connector *connector)
-{
-        struct ptn3460_bridge *ptn_bridge = connector_to_ptn3460(connector);
-
-        return ptn_bridge->bridge.encoder;
-}
-
 static const struct drm_connector_helper_funcs ptn3460_connector_helper_funcs = {
         .get_modes = ptn3460_get_modes,
-        .best_encoder = ptn3460_best_encoder,
 };
 
 static enum drm_connector_status ptn3460_detect(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index be881e9fef8f..5cd8dd7e5904 100644
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -474,18 +474,8 @@ static int ps8622_get_modes(struct drm_connector *connector)
         return drm_panel_get_modes(ps8622->panel);
 }
 
-static struct drm_encoder *ps8622_best_encoder(struct drm_connector *connector)
-{
-        struct ps8622_bridge *ps8622;
-
-        ps8622 = connector_to_ps8622(connector);
-
-        return ps8622->bridge.encoder;
-}
-
 static const struct drm_connector_helper_funcs ps8622_connector_helper_funcs = {
         .get_modes = ps8622_get_modes,
-        .best_encoder = ps8622_best_encoder,
 };
 
 static enum drm_connector_status ps8622_detect(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
new file mode 100644
index 000000000000..9126d0306ab5
--- /dev/null
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -0,0 +1,467 @@
+/*
+ * Copyright (C) 2016 Atmel
+ *                    Bo Shen <voice.shen@atmel.com>
+ *
+ * Authors:           Bo Shen <voice.shen@atmel.com>
+ *                    Boris Brezillon <boris.brezillon@free-electrons.com>
+ *                    Wu, Songjun <Songjun.Wu@atmel.com>
+ *
+ *
+ * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+
+#define SII902X_TPI_VIDEO_DATA                  0x0
+
+#define SII902X_TPI_PIXEL_REPETITION            0x8
+#define SII902X_TPI_AVI_PIXEL_REP_BUS_24BIT     BIT(5)
+#define SII902X_TPI_AVI_PIXEL_REP_RISING_EDGE   BIT(4)
+#define SII902X_TPI_AVI_PIXEL_REP_4X            3
+#define SII902X_TPI_AVI_PIXEL_REP_2X            1
+#define SII902X_TPI_AVI_PIXEL_REP_NONE          0
+#define SII902X_TPI_CLK_RATIO_HALF              (0 << 6)
+#define SII902X_TPI_CLK_RATIO_1X                (1 << 6)
+#define SII902X_TPI_CLK_RATIO_2X                (2 << 6)
+#define SII902X_TPI_CLK_RATIO_4X                (3 << 6)
+
+#define SII902X_TPI_AVI_IN_FORMAT               0x9
+#define SII902X_TPI_AVI_INPUT_BITMODE_12BIT     BIT(7)
+#define SII902X_TPI_AVI_INPUT_DITHER            BIT(6)
+#define SII902X_TPI_AVI_INPUT_RANGE_LIMITED     (2 << 2)
+#define SII902X_TPI_AVI_INPUT_RANGE_FULL        (1 << 2)
+#define SII902X_TPI_AVI_INPUT_RANGE_AUTO        (0 << 2)
+#define SII902X_TPI_AVI_INPUT_COLORSPACE_BLACK  (3 << 0)
+#define SII902X_TPI_AVI_INPUT_COLORSPACE_YUV422 (2 << 0)
+#define SII902X_TPI_AVI_INPUT_COLORSPACE_YUV444 (1 << 0)
+#define SII902X_TPI_AVI_INPUT_COLORSPACE_RGB    (0 << 0)
+
+#define SII902X_TPI_AVI_INFOFRAME               0x0c
+
+#define SII902X_SYS_CTRL_DATA                   0x1a
+#define SII902X_SYS_CTRL_PWR_DWN                BIT(4)
+#define SII902X_SYS_CTRL_AV_MUTE                BIT(3)
+#define SII902X_SYS_CTRL_DDC_BUS_REQ            BIT(2)
+#define SII902X_SYS_CTRL_DDC_BUS_GRTD           BIT(1)
+#define SII902X_SYS_CTRL_OUTPUT_MODE            BIT(0)
+#define SII902X_SYS_CTRL_OUTPUT_HDMI            1
+#define SII902X_SYS_CTRL_OUTPUT_DVI             0
+
+#define SII902X_REG_CHIPID(n)                   (0x1b + (n))
+
+#define SII902X_PWR_STATE_CTRL                  0x1e
+#define SII902X_AVI_POWER_STATE_MSK             GENMASK(1, 0)
+#define SII902X_AVI_POWER_STATE_D(l)            ((l) & SII902X_AVI_POWER_STATE_MSK)
+
+#define SII902X_INT_ENABLE                      0x3c
+#define SII902X_INT_STATUS                      0x3d
+#define SII902X_HOTPLUG_EVENT                   BIT(0)
+#define SII902X_PLUGGED_STATUS                  BIT(2)
+
+#define SII902X_REG_TPI_RQB                     0xc7
+
+#define SII902X_I2C_BUS_ACQUISITION_TIMEOUT_MS  500
+
+struct sii902x {
+        struct i2c_client *i2c;
+        struct regmap *regmap;
+        struct drm_bridge bridge;
+        struct drm_connector connector;
+        struct gpio_desc *reset_gpio;
+};
+
+static inline struct sii902x *bridge_to_sii902x(struct drm_bridge *bridge)
+{
+        return container_of(bridge, struct sii902x, bridge);
+}
+
+static inline struct sii902x *connector_to_sii902x(struct drm_connector *con)
+{
+        return container_of(con, struct sii902x, connector);
+}
+
+static void sii902x_reset(struct sii902x *sii902x)
+{
+        if (!sii902x->reset_gpio)
+                return;
+
+        gpiod_set_value(sii902x->reset_gpio, 1);
+
+        /* The datasheet says treset-min = 100us. Make it 150us to be sure. */
+        usleep_range(150, 200);
+
+        gpiod_set_value(sii902x->reset_gpio, 0);
+}
+
+static enum drm_connector_status
+sii902x_connector_detect(struct drm_connector *connector, bool force)
+{
+        struct sii902x *sii902x = connector_to_sii902x(connector);
+        unsigned int status;
+
+        regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
+
+        return (status & SII902X_PLUGGED_STATUS) ?
+               connector_status_connected : connector_status_disconnected;
+}
+
+static const struct drm_connector_funcs sii902x_connector_funcs = {
+        .dpms = drm_atomic_helper_connector_dpms,
+        .detect = sii902x_connector_detect,
+        .fill_modes = drm_helper_probe_single_connector_modes,
+        .destroy = drm_connector_cleanup,
+        .reset = drm_atomic_helper_connector_reset,
+        .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+static int sii902x_get_modes(struct drm_connector *connector)
+{
+        struct sii902x *sii902x = connector_to_sii902x(connector);
+        struct regmap *regmap = sii902x->regmap;
+        u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+        unsigned long timeout;
+        unsigned int status;
+        struct edid *edid;
+        int num = 0;
+        int ret;
+
+        ret = regmap_update_bits(regmap, SII902X_SYS_CTRL_DATA,
+                                 SII902X_SYS_CTRL_DDC_BUS_REQ,
+                                 SII902X_SYS_CTRL_DDC_BUS_REQ);
+        if (ret)
+                return ret;
+
+        timeout = jiffies +
+                  msecs_to_jiffies(SII902X_I2C_BUS_ACQUISITION_TIMEOUT_MS);
+        do {
+                ret = regmap_read(regmap, SII902X_SYS_CTRL_DATA, &status);
+                if (ret)
+                        return ret;
+        } while (!(status & SII902X_SYS_CTRL_DDC_BUS_GRTD) &&
+                 time_before(jiffies, timeout));
+
+        if (!(status & SII902X_SYS_CTRL_DDC_BUS_GRTD)) {
+                dev_err(&sii902x->i2c->dev, "failed to acquire the i2c bus");
+                return -ETIMEDOUT;
+        }
+
+        ret = regmap_write(regmap, SII902X_SYS_CTRL_DATA, status);
+        if (ret)
+                return ret;
+
+        edid = drm_get_edid(connector, sii902x->i2c->adapter);
+        drm_mode_connector_update_edid_property(connector, edid);
+        if (edid) {
+                num = drm_add_edid_modes(connector, edid);
+                kfree(edid);
+        }
+
+        ret = drm_display_info_set_bus_formats(&connector->display_info,
+                                               &bus_format, 1);
+        if (ret)
+                return ret;
+
+        ret = regmap_read(regmap, SII902X_SYS_CTRL_DATA, &status);
+        if (ret)
+                return ret;
+
+        ret = regmap_update_bits(regmap, SII902X_SYS_CTRL_DATA,
+                                 SII902X_SYS_CTRL_DDC_BUS_REQ |
+                                 SII902X_SYS_CTRL_DDC_BUS_GRTD, 0);
+        if (ret)
+                return ret;
+
+        timeout = jiffies +
+                  msecs_to_jiffies(SII902X_I2C_BUS_ACQUISITION_TIMEOUT_MS);
+        do {
+                ret = regmap_read(regmap, SII902X_SYS_CTRL_DATA, &status);
+                if (ret)
+                        return ret;
+        } while (status & (SII902X_SYS_CTRL_DDC_BUS_REQ |
+                           SII902X_SYS_CTRL_DDC_BUS_GRTD) &&
+                 time_before(jiffies, timeout));
+
+        if (status & (SII902X_SYS_CTRL_DDC_BUS_REQ |
+                      SII902X_SYS_CTRL_DDC_BUS_GRTD)) {
+                dev_err(&sii902x->i2c->dev, "failed to release the i2c bus");
+                return -ETIMEDOUT;
+        }
+
+        return num;
+}
+
+static enum drm_mode_status sii902x_mode_valid(struct drm_connector *connector,
+                                               struct drm_display_mode *mode)
+{
+        /* TODO: check mode */
+
+        return MODE_OK;
+}
+
+static const struct drm_connector_helper_funcs sii902x_connector_helper_funcs = {
+        .get_modes = sii902x_get_modes,
+        .mode_valid = sii902x_mode_valid,
+};
+
+static void sii902x_bridge_disable(struct drm_bridge *bridge)
+{
+        struct sii902x *sii902x = bridge_to_sii902x(bridge);
+
+        regmap_update_bits(sii902x->regmap, SII902X_SYS_CTRL_DATA,
+                           SII902X_SYS_CTRL_PWR_DWN,
+                           SII902X_SYS_CTRL_PWR_DWN);
+}
+
+static void sii902x_bridge_enable(struct drm_bridge *bridge)
+{
+        struct sii902x *sii902x = bridge_to_sii902x(bridge);
+
+        regmap_update_bits(sii902x->regmap, SII902X_PWR_STATE_CTRL,
+                           SII902X_AVI_POWER_STATE_MSK,
+                           SII902X_AVI_POWER_STATE_D(0));
+        regmap_update_bits(sii902x->regmap, SII902X_SYS_CTRL_DATA,
+                           SII902X_SYS_CTRL_PWR_DWN, 0);
+}
+
+static void sii902x_bridge_mode_set(struct drm_bridge *bridge,
+                                    struct drm_display_mode *mode,
+                                    struct drm_display_mode *adj)
+{
+        struct sii902x *sii902x = bridge_to_sii902x(bridge);
+        struct regmap *regmap = sii902x->regmap;
+        u8 buf[HDMI_INFOFRAME_SIZE(AVI)];
+        struct hdmi_avi_infoframe frame;
+        int ret;
+
+        buf[0] = adj->clock;
+        buf[1] = adj->clock >> 8;
+        buf[2] = adj->vrefresh;
+        buf[3] = 0x00;
+        buf[4] = adj->hdisplay;
+        buf[5] = adj->hdisplay >> 8;
+        buf[6] = adj->vdisplay;
+        buf[7] = adj->vdisplay >> 8;
+        buf[8] = SII902X_TPI_CLK_RATIO_1X | SII902X_TPI_AVI_PIXEL_REP_NONE |
+                 SII902X_TPI_AVI_PIXEL_REP_BUS_24BIT;
+        buf[9] = SII902X_TPI_AVI_INPUT_RANGE_AUTO |
+                 SII902X_TPI_AVI_INPUT_COLORSPACE_RGB;
+
+        ret = regmap_bulk_write(regmap, SII902X_TPI_VIDEO_DATA, buf, 10);
+        if (ret)
+                return;
+
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj);
+        if (ret < 0) {
+                DRM_ERROR("couldn't fill AVI infoframe\n");
+                return;
+        }
+
+        ret = hdmi_avi_infoframe_pack(&frame, buf, sizeof(buf));
+        if (ret < 0) {
+                DRM_ERROR("failed to pack AVI infoframe: %d\n", ret);
+                return;
+        }
+
+        /* Do not send the infoframe header, but keep the CRC field. */
+        regmap_bulk_write(regmap, SII902X_TPI_AVI_INFOFRAME,
+                          buf + HDMI_INFOFRAME_HEADER_SIZE - 1,
+                          HDMI_AVI_INFOFRAME_SIZE + 1);
+}
+
+static int sii902x_bridge_attach(struct drm_bridge *bridge)
+{
+        struct sii902x *sii902x = bridge_to_sii902x(bridge);
+        struct drm_device *drm = bridge->dev;
+        int ret;
+
+        drm_connector_helper_add(&sii902x->connector,
+                                 &sii902x_connector_helper_funcs);
+
+        if (!drm_core_check_feature(drm, DRIVER_ATOMIC)) {
+                dev_err(&sii902x->i2c->dev,
+                        "sii902x driver is only compatible with DRM devices supporting atomic updates");
+                return -ENOTSUPP;
+        }
+
+        ret = drm_connector_init(drm, &sii902x->connector,
+                                 &sii902x_connector_funcs,
+                                 DRM_MODE_CONNECTOR_HDMIA);
+        if (ret)
+                return ret;
+
+        if (sii902x->i2c->irq > 0)
+                sii902x->connector.polled = DRM_CONNECTOR_POLL_HPD;
+        else
+                sii902x->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
+
+        drm_mode_connector_attach_encoder(&sii902x->connector, bridge->encoder);
+
+        return 0;
+}
+
+static const struct drm_bridge_funcs sii902x_bridge_funcs = {
+        .attach = sii902x_bridge_attach,
+        .mode_set = sii902x_bridge_mode_set,
+        .disable = sii902x_bridge_disable,
+        .enable = sii902x_bridge_enable,
+};
+
+static const struct regmap_range sii902x_volatile_ranges[] = {
+        { .range_min = 0, .range_max = 0xff },
+};
+
+static const struct regmap_access_table sii902x_volatile_table = {
+        .yes_ranges = sii902x_volatile_ranges,
+        .n_yes_ranges = ARRAY_SIZE(sii902x_volatile_ranges),
+};
+
+static const struct regmap_config sii902x_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .volatile_table = &sii902x_volatile_table,
+        .cache_type = REGCACHE_NONE,
+};
+
+static irqreturn_t sii902x_interrupt(int irq, void *data)
+{
+        struct sii902x *sii902x = data;
+        unsigned int status = 0;
+
+        regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
+        regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
+
+        if ((status & SII902X_HOTPLUG_EVENT) && sii902x->bridge.dev)
+                drm_helper_hpd_irq_event(sii902x->bridge.dev);
+
+        return IRQ_HANDLED;
+}
+
+static int sii902x_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct device *dev = &client->dev;
+        unsigned int status = 0;
+        struct sii902x *sii902x;
+        u8 chipid[4];
+        int ret;
+
+        sii902x = devm_kzalloc(dev, sizeof(*sii902x), GFP_KERNEL);
+        if (!sii902x)
+                return -ENOMEM;
+
+        sii902x->i2c = client;
+        sii902x->regmap = devm_regmap_init_i2c(client, &sii902x_regmap_config);
+        if (IS_ERR(sii902x->regmap))
+                return PTR_ERR(sii902x->regmap);
+
+        sii902x->reset_gpio = devm_gpiod_get_optional(dev, "reset",
+                                                      GPIOD_OUT_LOW);
+        if (IS_ERR(sii902x->reset_gpio)) {
+                dev_err(dev, "Failed to retrieve/request reset gpio: %ld\n",
+                        PTR_ERR(sii902x->reset_gpio));
+                return PTR_ERR(sii902x->reset_gpio);
+        }
+
+        sii902x_reset(sii902x);
+
+        ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
+        if (ret)
+                return ret;
+
+        ret = regmap_bulk_read(sii902x->regmap, SII902X_REG_CHIPID(0),
+                               &chipid, 4);
+        if (ret) {
+                dev_err(dev, "regmap_read failed %d\n", ret);
+                return ret;
+        }
+
+        if (chipid[0] != 0xb0) {
+                dev_err(dev, "Invalid chipid: %02x (expecting 0xb0)\n",
+                        chipid[0]);
+                return -EINVAL;
+        }
+
+        /* Clear all pending interrupts */
+        regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
+        regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
+
+        if (client->irq > 0) {
+                regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
+                             SII902X_HOTPLUG_EVENT);
+
+                ret = devm_request_threaded_irq(dev, client->irq, NULL,
+                                                sii902x_interrupt,
+                                                IRQF_ONESHOT, dev_name(dev),
+                                                sii902x);
+                if (ret)
+                        return ret;
+        }
+
+        sii902x->bridge.funcs = &sii902x_bridge_funcs;
+        sii902x->bridge.of_node = dev->of_node;
+        ret = drm_bridge_add(&sii902x->bridge);
+        if (ret) {
+                dev_err(dev, "Failed to add drm_bridge\n");
+                return ret;
+        }
+
+        i2c_set_clientdata(client, sii902x);
+
+        return 0;
+}
+
+static int sii902x_remove(struct i2c_client *client)
+
+{
+        struct sii902x *sii902x = i2c_get_clientdata(client);
+
+        drm_bridge_remove(&sii902x->bridge);
+
+        return 0;
+}
+
+static const struct of_device_id sii902x_dt_ids[] = {
+        { .compatible = "sil,sii9022", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, sii902x_dt_ids);
+
+static const struct i2c_device_id sii902x_i2c_ids[] = {
+        { "sii9022", 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids);
+
+static struct i2c_driver sii902x_driver = {
+        .probe = sii902x_probe,
+        .remove = sii902x_remove,
+        .driver = {
+                .name = "sii902x",
+                .of_match_table = sii902x_dt_ids,
+        },
+        .id_table = sii902x_i2c_ids,
+};
+module_i2c_driver(sii902x_driver);
+
+MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com>");
+MODULE_DESCRIPTION("SII902x RGB -> HDMI bridges");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index dc83f69da6f1..b05f7eae32ce 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -142,7 +142,7 @@ static struct drm_driver driver = {
         .major = DRIVER_MAJOR,
         .minor = DRIVER_MINOR,
         .patchlevel = DRIVER_PATCHLEVEL,
-        .gem_free_object = cirrus_gem_free_object,
+        .gem_free_object_unlocked = cirrus_gem_free_object,
         .dumb_create = cirrus_dumb_create,
         .dumb_map_offset = cirrus_dumb_mmap_offset,
         .dumb_destroy = drm_gem_dumb_destroy,
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index d3d8d7bfcc57..17c915d9a03e 100644
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -325,21 +325,20 @@ static void cirrus_crtc_commit(struct drm_crtc *crtc)
  * use this for 8-bit mode so can't perform smooth fades on deeper modes,
  * but it's a requirement that we provide the function
  */
-static void cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                  u16 *blue, uint32_t start, uint32_t size)
+static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                                 u16 *blue, uint32_t size)
 {
         struct cirrus_crtc *cirrus_crtc = to_cirrus_crtc(crtc);
         int i;
 
-        if (size != CIRRUS_LUT_SIZE)
-                return;
-
-        for (i = 0; i < CIRRUS_LUT_SIZE; i++) {
+        for (i = 0; i < size; i++) {
                 cirrus_crtc->lut_r[i] = red[i];
                 cirrus_crtc->lut_g[i] = green[i];
                 cirrus_crtc->lut_b[i] = blue[i];
         }
         cirrus_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 /* Simple cleanup function */
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 3ff1ed7b33db..3cee084e9d28 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -33,6 +33,20 @@
 
 #include "drm_crtc_internal.h"
 
+static void crtc_commit_free(struct kref *kref)
+{
+        struct drm_crtc_commit *commit =
+                container_of(kref, struct drm_crtc_commit, ref);
+
+        kfree(commit);
+}
+
+void drm_crtc_commit_put(struct drm_crtc_commit *commit)
+{
+        kref_put(&commit->ref, crtc_commit_free);
+}
+EXPORT_SYMBOL(drm_crtc_commit_put);
+
 /**
  * drm_atomic_state_default_release -
  * release memory initialized by drm_atomic_state_init
@@ -44,11 +58,8 @@
 void drm_atomic_state_default_release(struct drm_atomic_state *state)
 {
         kfree(state->connectors);
-        kfree(state->connector_states);
         kfree(state->crtcs);
-        kfree(state->crtc_states);
         kfree(state->planes);
-        kfree(state->plane_states);
 }
 EXPORT_SYMBOL(drm_atomic_state_default_release);
 
@@ -72,18 +83,10 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
                                sizeof(*state->crtcs), GFP_KERNEL);
         if (!state->crtcs)
                 goto fail;
-        state->crtc_states = kcalloc(dev->mode_config.num_crtc,
-                                     sizeof(*state->crtc_states), GFP_KERNEL);
-        if (!state->crtc_states)
-                goto fail;
         state->planes = kcalloc(dev->mode_config.num_total_plane,
                                 sizeof(*state->planes), GFP_KERNEL);
         if (!state->planes)
                 goto fail;
-        state->plane_states = kcalloc(dev->mode_config.num_total_plane,
-                                      sizeof(*state->plane_states), GFP_KERNEL);
-        if (!state->plane_states)
-                goto fail;
 
         state->dev = dev;
 
@@ -139,40 +142,48 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
         DRM_DEBUG_ATOMIC("Clearing atomic state %p\n", state);
 
         for (i = 0; i < state->num_connector; i++) {
-                struct drm_connector *connector = state->connectors[i];
+                struct drm_connector *connector = state->connectors[i].ptr;
 
                 if (!connector)
                         continue;
 
                 connector->funcs->atomic_destroy_state(connector,
-                                                       state->connector_states[i]);
-                state->connectors[i] = NULL;
-                state->connector_states[i] = NULL;
+                                                       state->connectors[i].state);
+                state->connectors[i].ptr = NULL;
+                state->connectors[i].state = NULL;
                 drm_connector_unreference(connector);
         }
 
         for (i = 0; i < config->num_crtc; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
+                struct drm_crtc *crtc = state->crtcs[i].ptr;
 
                 if (!crtc)
                         continue;
 
                 crtc->funcs->atomic_destroy_state(crtc,
-                                                  state->crtc_states[i]);
-                state->crtcs[i] = NULL;
-                state->crtc_states[i] = NULL;
+                                                  state->crtcs[i].state);
+
+                if (state->crtcs[i].commit) {
+                        kfree(state->crtcs[i].commit->event);
+                        state->crtcs[i].commit->event = NULL;
+                        drm_crtc_commit_put(state->crtcs[i].commit);
+                }
+
+                state->crtcs[i].commit = NULL;
+                state->crtcs[i].ptr = NULL;
+                state->crtcs[i].state = NULL;
         }
 
         for (i = 0; i < config->num_total_plane; i++) {
-                struct drm_plane *plane = state->planes[i];
+                struct drm_plane *plane = state->planes[i].ptr;
 
                 if (!plane)
                         continue;
 
                 plane->funcs->atomic_destroy_state(plane,
-                                                   state->plane_states[i]);
-                state->planes[i] = NULL;
-                state->plane_states[i] = NULL;
+                                                   state->planes[i].state);
+                state->planes[i].ptr = NULL;
+                state->planes[i].state = NULL;
         }
 }
 EXPORT_SYMBOL(drm_atomic_state_default_clear);
@@ -270,8 +281,8 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,
         if (!crtc_state)
                 return ERR_PTR(-ENOMEM);
 
-        state->crtc_states[index] = crtc_state;
-        state->crtcs[index] = crtc;
+        state->crtcs[index].state = crtc_state;
+        state->crtcs[index].ptr = crtc;
         crtc_state->state = state;
 
         DRM_DEBUG_ATOMIC("Added [CRTC:%d:%s] %p state to %p\n",
@@ -351,6 +362,8 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
         drm_property_unreference_blob(state->mode_blob);
         state->mode_blob = NULL;
 
+        memset(&state->mode, 0, sizeof(state->mode));
+
         if (blob) {
                 if (blob->length != sizeof(struct drm_mode_modeinfo) ||
                     drm_mode_convert_umode(&state->mode,
@@ -363,7 +376,6 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
                 DRM_DEBUG_ATOMIC("Set [MODE:%s] for CRTC state %p\n",
                                  state->mode.name, state);
         } else {
-                memset(&state->mode, 0, sizeof(state->mode));
                 state->enable = false;
                 DRM_DEBUG_ATOMIC("Set [NOMODE] for CRTC state %p\n",
                                  state);
@@ -631,8 +643,8 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,
         if (!plane_state)
                 return ERR_PTR(-ENOMEM);
 
-        state->plane_states[index] = plane_state;
-        state->planes[index] = plane;
+        state->planes[index].state = plane_state;
+        state->planes[index].ptr = plane;
         plane_state->state = state;
 
         DRM_DEBUG_ATOMIC("Added [PLANE:%d:%s] %p state to %p\n",
@@ -896,8 +908,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,
         index = drm_connector_index(connector);
 
         if (index >= state->num_connector) {
-                struct drm_connector **c;
-                struct drm_connector_state **cs;
+                struct __drm_connnectors_state *c;
                 int alloc = max(index + 1, config->num_connector);
 
                 c = krealloc(state->connectors, alloc * sizeof(*state->connectors), GFP_KERNEL);
@@ -908,26 +919,19 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,
                 memset(&state->connectors[state->num_connector], 0,
                        sizeof(*state->connectors) * (alloc - state->num_connector));
 
-                cs = krealloc(state->connector_states, alloc * sizeof(*state->connector_states), GFP_KERNEL);
-                if (!cs)
-                        return ERR_PTR(-ENOMEM);
-
-                state->connector_states = cs;
-                memset(&state->connector_states[state->num_connector], 0,
-                       sizeof(*state->connector_states) * (alloc - state->num_connector));
                 state->num_connector = alloc;
         }
 
-        if (state->connector_states[index])
-                return state->connector_states[index];
+        if (state->connectors[index].state)
+                return state->connectors[index].state;
 
         connector_state = connector->funcs->atomic_duplicate_state(connector);
         if (!connector_state)
                 return ERR_PTR(-ENOMEM);
 
         drm_connector_reference(connector);
-        state->connector_states[index] = connector_state;
-        state->connectors[index] = connector;
+        state->connectors[index].state = connector_state;
+        state->connectors[index].ptr = connector;
         connector_state->state = state;
 
         DRM_DEBUG_ATOMIC("Added [CONNECTOR:%d] %p state to %p\n",
@@ -1295,14 +1299,39 @@ EXPORT_SYMBOL(drm_atomic_add_affected_planes);
  */
 void drm_atomic_legacy_backoff(struct drm_atomic_state *state)
 {
+        struct drm_device *dev = state->dev;
+        unsigned crtc_mask = 0;
+        struct drm_crtc *crtc;
         int ret;
+        bool global = false;
+
+        drm_for_each_crtc(crtc, dev) {
+                if (crtc->acquire_ctx != state->acquire_ctx)
+                        continue;
+
+                crtc_mask |= drm_crtc_mask(crtc);
+                crtc->acquire_ctx = NULL;
+        }
+
+        if (WARN_ON(dev->mode_config.acquire_ctx == state->acquire_ctx)) {
+                global = true;
+
+                dev->mode_config.acquire_ctx = NULL;
+        }
 
 retry:
         drm_modeset_backoff(state->acquire_ctx);
 
-        ret = drm_modeset_lock_all_ctx(state->dev, state->acquire_ctx);
+        ret = drm_modeset_lock_all_ctx(dev, state->acquire_ctx);
         if (ret)
                 goto retry;
+
+        drm_for_each_crtc(crtc, dev)
+                if (drm_crtc_mask(crtc) & crtc_mask)
+                        crtc->acquire_ctx = state->acquire_ctx;
+
+        if (global)
+                dev->mode_config.acquire_ctx = state->acquire_ctx;
 }
 EXPORT_SYMBOL(drm_atomic_legacy_backoff);
 
@@ -1431,7 +1460,8 @@ EXPORT_SYMBOL(drm_atomic_nonblocking_commit);
  */
 
 static struct drm_pending_vblank_event *create_vblank_event(
-                struct drm_device *dev, struct drm_file *file_priv, uint64_t user_data)
+                struct drm_device *dev, struct drm_file *file_priv,
+                struct fence *fence, uint64_t user_data)
 {
         struct drm_pending_vblank_event *e = NULL;
         int ret;
@@ -1444,12 +1474,17 @@ static struct drm_pending_vblank_event *create_vblank_event(
         e->event.base.length = sizeof(e->event);
         e->event.user_data = user_data;
 
-        ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base);
-        if (ret) {
-                kfree(e);
-                return NULL;
+        if (file_priv) {
+                ret = drm_event_reserve_init(dev, file_priv, &e->base,
+                                             &e->event.base);
+                if (ret) {
+                        kfree(e);
+                        return NULL;
+                }
         }
 
+        e->base.fence = fence;
+
         return e;
 }
 
@@ -1689,7 +1724,8 @@ retry:
                 for_each_crtc_in_state(state, crtc, crtc_state, i) {
                         struct drm_pending_vblank_event *e;
 
-                        e = create_vblank_event(dev, file_priv, arg->user_data);
+                        e = create_vblank_event(dev, file_priv, NULL,
+                                                arg->user_data);
                         if (!e) {
                                 ret = -ENOMEM;
                                 goto out;
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index ddfa0d120e39..de7fddce3cef 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -110,8 +110,10 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,
 
                 if (funcs->atomic_best_encoder)
                         new_encoder = funcs->atomic_best_encoder(connector, conn_state);
-                else
+                else if (funcs->best_encoder)
                         new_encoder = funcs->best_encoder(connector);
+                else
+                        new_encoder = drm_atomic_helper_best_encoder(connector);
 
                 if (new_encoder) {
                         if (encoder_mask & (1 << drm_encoder_index(new_encoder))) {
@@ -298,8 +300,10 @@ update_connector_routing(struct drm_atomic_state *state,
         if (funcs->atomic_best_encoder)
                 new_encoder = funcs->atomic_best_encoder(connector,
                                                          connector_state);
-        else
+        else if (funcs->best_encoder)
                 new_encoder = funcs->best_encoder(connector);
+        else
+                new_encoder = drm_atomic_helper_best_encoder(connector);
 
         if (!new_encoder) {
                 DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n",
@@ -414,6 +418,9 @@ mode_fixup(struct drm_atomic_state *state)
         for_each_crtc_in_state(state, crtc, crtc_state, i) {
                 const struct drm_crtc_helper_funcs *funcs;
 
+                if (!crtc_state->enable)
+                        continue;
+
                 if (!crtc_state->mode_changed &&
                     !crtc_state->connectors_changed)
                         continue;
@@ -458,7 +465,7 @@ mode_fixup(struct drm_atomic_state *state)
  * times for the same update, e.g. when the ->atomic_check functions depend upon
  * the adjusted dotclock for fifo space allocation and watermark computation.
  *
- * RETURNS
+ * RETURNS:
  * Zero for success or -errno
  */
 int
@@ -572,7 +579,7 @@ EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
  * It also sets crtc_state->planes_changed to indicate that a crtc has
  * updated planes.
  *
- * RETURNS
+ * RETURNS:
  * Zero for success or -errno
  */
 int
@@ -611,7 +618,7 @@ drm_atomic_helper_check_planes(struct drm_device *dev,
                 if (!funcs || !funcs->atomic_check)
                         continue;
 
-                ret = funcs->atomic_check(crtc, state->crtc_states[i]);
+                ret = funcs->atomic_check(crtc, crtc_state);
                 if (ret) {
                         DRM_DEBUG_ATOMIC("[CRTC:%d:%s] atomic driver check failed\n",
                                          crtc->base.id, crtc->name);
@@ -640,7 +647,7 @@ EXPORT_SYMBOL(drm_atomic_helper_check_planes);
  * ->atomic_check functions depend upon an updated adjusted_mode.clock to
  * e.g. properly compute watermarks.
  *
- * RETURNS
+ * RETURNS:
  * Zero for success or -errno
  */
 int drm_atomic_helper_check(struct drm_device *dev,
@@ -1113,22 +1120,17 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
 EXPORT_SYMBOL(drm_atomic_helper_wait_for_vblanks);
 
 /**
- * drm_atomic_helper_commit - commit validated state object
- * @dev: DRM device
- * @state: the driver state object
- * @nonblocking: whether nonblocking behavior is requested.
+ * drm_atomic_helper_commit_tail - commit atomic update to hardware
+ * @state: new modeset state to be committed
  *
- * This function commits a with drm_atomic_helper_check() pre-validated state
- * object. This can still fail when e.g. the framebuffer reservation fails. For
- * now this doesn't implement nonblocking commits.
+ * This is the default implemenation for the ->atomic_commit_tail() hook of the
+ * &drm_mode_config_helper_funcs vtable.
  *
- * Note that right now this function does not support nonblocking commits, hence
- * driver writers must implement their own version for now. Also note that the
- * default ordering of how the various stages are called is to match the legacy
- * modeset helper library closest. One peculiarity of that is that it doesn't
- * mesh well with runtime PM at all.
+ * Note that the default ordering of how the various stages are called is to
+ * match the legacy modeset helper library closest. One peculiarity of that is
+ * that it doesn't mesh well with runtime PM at all.
  *
- * For drivers supporting runtime PM the recommended sequence is
+ * For drivers supporting runtime PM the recommended sequence is instead ::
  *
  *     drm_atomic_helper_commit_modeset_disables(dev, state);
  *
@@ -1136,9 +1138,75 @@ EXPORT_SYMBOL(drm_atomic_helper_wait_for_vblanks);
  *
  *     drm_atomic_helper_commit_planes(dev, state, true);
  *
- * See the kerneldoc entries for these three functions for more details.
+ * for committing the atomic update to hardware.  See the kerneldoc entries for
+ * these three functions for more details.
+ */
+void drm_atomic_helper_commit_tail(struct drm_atomic_state *state)
+{
+        struct drm_device *dev = state->dev;
+
+        drm_atomic_helper_commit_modeset_disables(dev, state);
+
+        drm_atomic_helper_commit_planes(dev, state, false);
+
+        drm_atomic_helper_commit_modeset_enables(dev, state);
+
+        drm_atomic_helper_commit_hw_done(state);
+
+        drm_atomic_helper_wait_for_vblanks(dev, state);
+
+        drm_atomic_helper_cleanup_planes(dev, state);
+}
+EXPORT_SYMBOL(drm_atomic_helper_commit_tail);
+
+static void commit_tail(struct drm_atomic_state *state)
+{
+        struct drm_device *dev = state->dev;
+        struct drm_mode_config_helper_funcs *funcs;
+
+        funcs = dev->mode_config.helper_private;
+
+        drm_atomic_helper_wait_for_fences(dev, state);
+
+        drm_atomic_helper_wait_for_dependencies(state);
+
+        if (funcs && funcs->atomic_commit_tail)
+                funcs->atomic_commit_tail(state);
+        else
+                drm_atomic_helper_commit_tail(state);
+
+        drm_atomic_helper_commit_cleanup_done(state);
+
+        drm_atomic_state_free(state);
+}
+
+static void commit_work(struct work_struct *work)
+{
+        struct drm_atomic_state *state = container_of(work,
+                                                      struct drm_atomic_state,
+                                                      commit_work);
+        commit_tail(state);
+}
+
+/**
+ * drm_atomic_helper_commit - commit validated state object
+ * @dev: DRM device
+ * @state: the driver state object
+ * @nonblock: whether nonblocking behavior is requested.
+ *
+ * This function commits a with drm_atomic_helper_check() pre-validated state
+ * object. This can still fail when e.g. the framebuffer reservation fails. This
+ * function implements nonblocking commits, using
+ * drm_atomic_helper_setup_commit() and related functions.
+ *
+ * Note that right now this function does not support nonblocking commits, hence
+ * driver writers must implement their own version for now.
+ *
+ * Committing the actual hardware state is done through the
+ * ->atomic_commit_tail() callback of the &drm_mode_config_helper_funcs vtable,
+ * or it's default implementation drm_atomic_helper_commit_tail().
  *
- * RETURNS
+ * RETURNS:
  * Zero for success or -errno.
  */
 int drm_atomic_helper_commit(struct drm_device *dev,
@@ -1147,8 +1215,11 @@ int drm_atomic_helper_commit(struct drm_device *dev,
 {
         int ret;
 
-        if (nonblock)
-                return -EBUSY;
+        ret = drm_atomic_helper_setup_commit(state, nonblock);
+        if (ret)
+                return ret;
+
+        INIT_WORK(&state->commit_work, commit_work);
 
         ret = drm_atomic_helper_prepare_planes(dev, state);
         if (ret)
@@ -1160,7 +1231,7 @@ int drm_atomic_helper_commit(struct drm_device *dev,
          * the software side now.
          */
 
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         /*
          * Everything below can be run asynchronously without the need to grab
@@ -1176,21 +1247,16 @@ int drm_atomic_helper_commit(struct drm_device *dev,
          * update. Which is important since compositors need to figure out the
          * composition of the next frame right after having submitted the
          * current layout.
+         *
+         * NOTE: Commit work has multiple phases, first hardware commit, then
+         * cleanup. We want them to overlap, hence need system_unbound_wq to
+         * make sure work items don't artifically stall on each another.
          */
 
-        drm_atomic_helper_wait_for_fences(dev, state);
-
-        drm_atomic_helper_commit_modeset_disables(dev, state);
-
-        drm_atomic_helper_commit_planes(dev, state, false);
-
-        drm_atomic_helper_commit_modeset_enables(dev, state);
-
-        drm_atomic_helper_wait_for_vblanks(dev, state);
-
-        drm_atomic_helper_cleanup_planes(dev, state);
-
-        drm_atomic_state_free(state);
+        if (nonblock)
+                queue_work(system_unbound_wq, &state->commit_work);
+        else
+                commit_tail(state);
 
         return 0;
 }
@@ -1199,12 +1265,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit);
 /**
  * DOC: implementing nonblocking commit
  *
- * For now the atomic helpers don't support nonblocking commit directly. If
- * there is real need it could be added though, using the dma-buf fence
- * infrastructure for generic synchronization with outstanding rendering.
- *
- * For now drivers have to implement nonblocking commit themselves, with the
- * following sequence being the recommended one:
+ * Nonblocking atomic commits have to be implemented in the following sequence:
  *
  * 1. Run drm_atomic_helper_prepare_planes() first. This is the only function
  * which commit needs to call which can fail, so we want to run it first and
@@ -1216,10 +1277,14 @@ EXPORT_SYMBOL(drm_atomic_helper_commit);
  * cancelled updates. Note that it is important to ensure that the framebuffer
  * cleanup is still done when cancelling.
  *
- * For sufficient parallelism it is recommended to have a work item per crtc
- * (for updates which don't touch global state) and a global one. Then we only
- * need to synchronize with the crtc work items for changed crtcs and the global
- * work item, which allows nice concurrent updates on disjoint sets of crtcs.
+ * Asynchronous workers need to have sufficient parallelism to be able to run
+ * different atomic commits on different CRTCs in parallel. The simplest way to
+ * achive this is by running them on the &system_unbound_wq work queue. Note
+ * that drivers are not required to split up atomic commits and run an
+ * individual commit in parallel - userspace is supposed to do that if it cares.
+ * But it might be beneficial to do that for modesets, since those necessarily
+ * must be done as one global operation, and enabling or disabling a CRTC can
+ * take a long time. But even that is not required.
  *
  * 3. The software state is updated synchronously with
  * drm_atomic_helper_swap_state(). Doing this under the protection of all modeset
@@ -1232,8 +1297,310 @@ EXPORT_SYMBOL(drm_atomic_helper_commit);
  * commit helpers: a) pre-plane commit b) plane commit c) post-plane commit and
  * then cleaning up the framebuffers after the old framebuffer is no longer
  * being displayed.
+ *
+ * The above scheme is implemented in the atomic helper libraries in
+ * drm_atomic_helper_commit() using a bunch of helper functions. See
+ * drm_atomic_helper_setup_commit() for a starting point.
  */
 
+static int stall_checks(struct drm_crtc *crtc, bool nonblock)
+{
+        struct drm_crtc_commit *commit, *stall_commit = NULL;
+        bool completed = true;
+        int i;
+        long ret = 0;
+
+        spin_lock(&crtc->commit_lock);
+        i = 0;
+        list_for_each_entry(commit, &crtc->commit_list, commit_entry) {
+                if (i == 0) {
+                        completed = try_wait_for_completion(&commit->flip_done);
+                        /* Userspace is not allowed to get ahead of the previous
+                         * commit with nonblocking ones. */
+                        if (!completed && nonblock) {
+                                spin_unlock(&crtc->commit_lock);
+                                return -EBUSY;
+                        }
+                } else if (i == 1) {
+                        stall_commit = commit;
+                        drm_crtc_commit_get(stall_commit);
+                        break;
+                }
+
+                i++;
+        }
+        spin_unlock(&crtc->commit_lock);
+
+        if (!stall_commit)
+                return 0;
+
+        /* We don't want to let commits get ahead of cleanup work too much,
+         * stalling on 2nd previous commit means triple-buffer won't ever stall.
+         */
+        ret = wait_for_completion_interruptible_timeout(&stall_commit->cleanup_done,
+                                                        10*HZ);
+        if (ret == 0)
+                DRM_ERROR("[CRTC:%d:%s] cleanup_done timed out\n",
+                          crtc->base.id, crtc->name);
+
+        drm_crtc_commit_put(stall_commit);
+
+        return ret < 0 ? ret : 0;
+}
+
+/**
+ * drm_atomic_helper_setup_commit - setup possibly nonblocking commit
+ * @state: new modeset state to be committed
+ * @nonblock: whether nonblocking behavior is requested.
+ *
+ * This function prepares @state to be used by the atomic helper's support for
+ * nonblocking commits. Drivers using the nonblocking commit infrastructure
+ * should always call this function from their ->atomic_commit hook.
+ *
+ * To be able to use this support drivers need to use a few more helper
+ * functions. drm_atomic_helper_wait_for_dependencies() must be called before
+ * actually committing the hardware state, and for nonblocking commits this call
+ * must be placed in the async worker. See also drm_atomic_helper_swap_state()
+ * and it's stall parameter, for when a driver's commit hooks look at the
+ * ->state pointers of struct &drm_crtc, &drm_plane or &drm_connector directly.
+ *
+ * Completion of the hardware commit step must be signalled using
+ * drm_atomic_helper_commit_hw_done(). After this step the driver is not allowed
+ * to read or change any permanent software or hardware modeset state. The only
+ * exception is state protected by other means than &drm_modeset_lock locks.
+ * Only the free standing @state with pointers to the old state structures can
+ * be inspected, e.g. to clean up old buffers using
+ * drm_atomic_helper_cleanup_planes().
+ *
+ * At the very end, before cleaning up @state drivers must call
+ * drm_atomic_helper_commit_cleanup_done().
+ *
+ * This is all implemented by in drm_atomic_helper_commit(), giving drivers a
+ * complete and esay-to-use default implementation of the atomic_commit() hook.
+ *
+ * The tracking of asynchronously executed and still pending commits is done
+ * using the core structure &drm_crtc_commit.
+ *
+ * By default there's no need to clean up resources allocated by this function
+ * explicitly: drm_atomic_state_default_clear() will take care of that
+ * automatically.
+ *
+ * Returns:
+ *
+ * 0 on success. -EBUSY when userspace schedules nonblocking commits too fast,
+ * -ENOMEM on allocation failures and -EINTR when a signal is pending.
+ */
+int drm_atomic_helper_setup_commit(struct drm_atomic_state *state,
+                                   bool nonblock)
+{
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_crtc_commit *commit;
+        int i, ret;
+
+        for_each_crtc_in_state(state, crtc, crtc_state, i) {
+                commit = kzalloc(sizeof(*commit), GFP_KERNEL);
+                if (!commit)
+                        return -ENOMEM;
+
+                init_completion(&commit->flip_done);
+                init_completion(&commit->hw_done);
+                init_completion(&commit->cleanup_done);
+                INIT_LIST_HEAD(&commit->commit_entry);
+                kref_init(&commit->ref);
+                commit->crtc = crtc;
+
+                state->crtcs[i].commit = commit;
+
+                ret = stall_checks(crtc, nonblock);
+                if (ret)
+                        return ret;
+
+                /* Drivers only send out events when at least either current or
+                 * new CRTC state is active. Complete right away if everything
+                 * stays off. */
+                if (!crtc->state->active && !crtc_state->active) {
+                        complete_all(&commit->flip_done);
+                        continue;
+                }
+
+                /* Legacy cursor updates are fully unsynced. */
+                if (state->legacy_cursor_update) {
+                        complete_all(&commit->flip_done);
+                        continue;
+                }
+
+                if (!crtc_state->event) {
+                        commit->event = kzalloc(sizeof(*commit->event),
+                                                GFP_KERNEL);
+                        if (!commit->event)
+                                return -ENOMEM;
+
+                        crtc_state->event = commit->event;
+                }
+
+                crtc_state->event->base.completion = &commit->flip_done;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_atomic_helper_setup_commit);
+
+
+static struct drm_crtc_commit *preceeding_commit(struct drm_crtc *crtc)
+{
+        struct drm_crtc_commit *commit;
+        int i = 0;
+
+        list_for_each_entry(commit, &crtc->commit_list, commit_entry) {
+                /* skip the first entry, that's the current commit */
+                if (i == 1)
+                        return commit;
+                i++;
+        }
+
+        return NULL;
+}
+
+/**
+ * drm_atomic_helper_wait_for_dependencies - wait for required preceeding commits
+ * @state: new modeset state to be committed
+ *
+ * This function waits for all preceeding commits that touch the same CRTC as
+ * @state to both be committed to the hardware (as signalled by
+ * drm_atomic_helper_commit_hw_done) and executed by the hardware (as signalled
+ * by calling drm_crtc_vblank_send_event on the event member of
+ * &drm_crtc_state).
+ *
+ * This is part of the atomic helper support for nonblocking commits, see
+ * drm_atomic_helper_setup_commit() for an overview.
+ */
+void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *state)
+{
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_crtc_commit *commit;
+        int i;
+        long ret;
+
+        for_each_crtc_in_state(state, crtc, crtc_state, i) {
+                spin_lock(&crtc->commit_lock);
+                commit = preceeding_commit(crtc);
+                if (commit)
+                        drm_crtc_commit_get(commit);
+                spin_unlock(&crtc->commit_lock);
+
+                if (!commit)
+                        continue;
+
+                ret = wait_for_completion_timeout(&commit->hw_done,
+                                                  10*HZ);
+                if (ret == 0)
+                        DRM_ERROR("[CRTC:%d:%s] hw_done timed out\n",
+                                  crtc->base.id, crtc->name);
+
+                /* Currently no support for overwriting flips, hence
+                 * stall for previous one to execute completely. */
+                ret = wait_for_completion_timeout(&commit->flip_done,
+                                                  10*HZ);
+                if (ret == 0)
+                        DRM_ERROR("[CRTC:%d:%s] flip_done timed out\n",
+                                  crtc->base.id, crtc->name);
+
+                drm_crtc_commit_put(commit);
+        }
+}
+EXPORT_SYMBOL(drm_atomic_helper_wait_for_dependencies);
+
+/**
+ * drm_atomic_helper_commit_hw_done - setup possible nonblocking commit
+ * @state: new modeset state to be committed
+ *
+ * This function is used to signal completion of the hardware commit step. After
+ * this step the driver is not allowed to read or change any permanent software
+ * or hardware modeset state. The only exception is state protected by other
+ * means than &drm_modeset_lock locks.
+ *
+ * Drivers should try to postpone any expensive or delayed cleanup work after
+ * this function is called.
+ *
+ * This is part of the atomic helper support for nonblocking commits, see
+ * drm_atomic_helper_setup_commit() for an overview.
+ */
+void drm_atomic_helper_commit_hw_done(struct drm_atomic_state *state)
+{
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_crtc_commit *commit;
+        int i;
+
+        for_each_crtc_in_state(state, crtc, crtc_state, i) {
+                commit = state->crtcs[i].commit;
+                if (!commit)
+                        continue;
+
+                /* backend must have consumed any event by now */
+                WARN_ON(crtc->state->event);
+                spin_lock(&crtc->commit_lock);
+                complete_all(&commit->hw_done);
+                spin_unlock(&crtc->commit_lock);
+        }
+}
+EXPORT_SYMBOL(drm_atomic_helper_commit_hw_done);
+
+/**
+ * drm_atomic_helper_commit_cleanup_done - signal completion of commit
+ * @state: new modeset state to be committed
+ *
+ * This signals completion of the atomic update @state, including any cleanup
+ * work. If used, it must be called right before calling
+ * drm_atomic_state_free().
+ *
+ * This is part of the atomic helper support for nonblocking commits, see
+ * drm_atomic_helper_setup_commit() for an overview.
+ */
+void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *state)
+{
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_crtc_commit *commit;
+        int i;
+        long ret;
+
+        for_each_crtc_in_state(state, crtc, crtc_state, i) {
+                commit = state->crtcs[i].commit;
+                if (WARN_ON(!commit))
+                        continue;
+
+                spin_lock(&crtc->commit_lock);
+                complete_all(&commit->cleanup_done);
+                WARN_ON(!try_wait_for_completion(&commit->hw_done));
+
+                /* commit_list borrows our reference, need to remove before we
+                 * clean up our drm_atomic_state. But only after it actually
+                 * completed, otherwise subsequent commits won't stall properly. */
+                if (try_wait_for_completion(&commit->flip_done))
+                        goto del_commit;
+
+                spin_unlock(&crtc->commit_lock);
+
+                /* We must wait for the vblank event to signal our completion
+                 * before releasing our reference, since the vblank work does
+                 * not hold a reference of its own. */
+                ret = wait_for_completion_timeout(&commit->flip_done,
+                                                  10*HZ);
+                if (ret == 0)
+                        DRM_ERROR("[CRTC:%d:%s] flip_done timed out\n",
+                                  crtc->base.id, crtc->name);
+
+                spin_lock(&crtc->commit_lock);
+del_commit:
+                list_del(&commit->commit_entry);
+                spin_unlock(&crtc->commit_lock);
+        }
+}
+EXPORT_SYMBOL(drm_atomic_helper_commit_cleanup_done);
+
 /**
  * drm_atomic_helper_prepare_planes - prepare plane resources before commit
  * @dev: DRM device
@@ -1249,16 +1616,12 @@ EXPORT_SYMBOL(drm_atomic_helper_commit);
 int drm_atomic_helper_prepare_planes(struct drm_device *dev,
                                      struct drm_atomic_state *state)
 {
-        int nplanes = dev->mode_config.num_total_plane;
-        int ret, i;
+        struct drm_plane *plane;
+        struct drm_plane_state *plane_state;
+        int ret, i, j;
 
-        for (i = 0; i < nplanes; i++) {
+        for_each_plane_in_state(state, plane, plane_state, i) {
                 const struct drm_plane_helper_funcs *funcs;
-                struct drm_plane *plane = state->planes[i];
-                struct drm_plane_state *plane_state = state->plane_states[i];
-
-                if (!plane)
-                        continue;
 
                 funcs = plane->helper_private;
 
@@ -1272,12 +1635,10 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev,
         return 0;
 
 fail:
-        for (i--; i >= 0; i--) {
+        for_each_plane_in_state(state, plane, plane_state, j) {
                 const struct drm_plane_helper_funcs *funcs;
-                struct drm_plane *plane = state->planes[i];
-                struct drm_plane_state *plane_state = state->plane_states[i];
 
-                if (!plane)
+                if (j >= i)
                         continue;
 
                 funcs = plane->helper_private;
@@ -1537,8 +1898,8 @@ EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);
 
 /**
  * drm_atomic_helper_swap_state - store atomic state into current sw state
- * @dev: DRM device
  * @state: atomic state
+ * @stall: stall for proceeding commits
  *
  * This function stores the atomic state into the current state pointers in all
  * driver objects. It should be called after all failing steps have been done
@@ -1559,42 +1920,70 @@ EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);
  *
  * 5. Call drm_atomic_helper_cleanup_planes() with @state, which since step 3
  * contains the old state. Also do any other cleanup required with that state.
+ *
+ * @stall must be set when nonblocking commits for this driver directly access
+ * the ->state pointer of &drm_plane, &drm_crtc or &drm_connector. With the
+ * current atomic helpers this is almost always the case, since the helpers
+ * don't pass the right state structures to the callbacks.
  */
-void drm_atomic_helper_swap_state(struct drm_device *dev,
-                                  struct drm_atomic_state *state)
+void drm_atomic_helper_swap_state(struct drm_atomic_state *state,
+                                  bool stall)
 {
         int i;
+        long ret;
+        struct drm_connector *connector;
+        struct drm_connector_state *conn_state;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_plane *plane;
+        struct drm_plane_state *plane_state;
+        struct drm_crtc_commit *commit;
+
+        if (stall) {
+                for_each_crtc_in_state(state, crtc, crtc_state, i) {
+                        spin_lock(&crtc->commit_lock);
+                        commit = list_first_entry_or_null(&crtc->commit_list,
+                                        struct drm_crtc_commit, commit_entry);
+                        if (commit)
+                                drm_crtc_commit_get(commit);
+                        spin_unlock(&crtc->commit_lock);
+
+                        if (!commit)
+                                continue;
 
-        for (i = 0; i < state->num_connector; i++) {
-                struct drm_connector *connector = state->connectors[i];
-
-                if (!connector)
-                        continue;
+                        ret = wait_for_completion_timeout(&commit->hw_done,
+                                                          10*HZ);
+                        if (ret == 0)
+                                DRM_ERROR("[CRTC:%d:%s] hw_done timed out\n",
+                                          crtc->base.id, crtc->name);
+                        drm_crtc_commit_put(commit);
+                }
+        }
 
+        for_each_connector_in_state(state, connector, conn_state, i) {
                 connector->state->state = state;
-                swap(state->connector_states[i], connector->state);
+                swap(state->connectors[i].state, connector->state);
                 connector->state->state = NULL;
         }
 
-        for (i = 0; i < dev->mode_config.num_crtc; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
-
-                if (!crtc)
-                        continue;
-
+        for_each_crtc_in_state(state, crtc, crtc_state, i) {
                 crtc->state->state = state;
-                swap(state->crtc_states[i], crtc->state);
+                swap(state->crtcs[i].state, crtc->state);
                 crtc->state->state = NULL;
-        }
 
-        for (i = 0; i < dev->mode_config.num_total_plane; i++) {
-                struct drm_plane *plane = state->planes[i];
+                if (state->crtcs[i].commit) {
+                        spin_lock(&crtc->commit_lock);
+                        list_add(&state->crtcs[i].commit->commit_entry,
+                                 &crtc->commit_list);
+                        spin_unlock(&crtc->commit_lock);
 
-                if (!plane)
-                        continue;
+                        state->crtcs[i].commit->event = NULL;
+                }
+        }
 
+        for_each_plane_in_state(state, plane, plane_state, i) {
                 plane->state->state = state;
-                swap(state->plane_states[i], plane->state);
+                swap(state->planes[i].state, plane->state);
                 plane->state->state = NULL;
         }
 }
@@ -2409,7 +2798,7 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip);
  * This is the main helper function provided by the atomic helper framework for
  * implementing the legacy DPMS connector interface. It computes the new desired
  * ->active state for the corresponding CRTC (if the connector is enabled) and
- *  updates it.
+ * updates it.
  *
  * Returns:
  * Returns 0 on success, negative errno numbers on failure.
@@ -2930,16 +3319,15 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_destroy_state);
  * @red: red correction table
  * @green: green correction table
  * @blue: green correction table
- * @start:
  * @size: size of the tables
  *
  * Implements support for legacy gamma correction table for drivers
  * that support color management through the DEGAMMA_LUT/GAMMA_LUT
  * properties.
  */
-void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
-                                        u16 *red, u16 *green, u16 *blue,
-                                        uint32_t start, uint32_t size)
+int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
+                                       u16 *red, u16 *green, u16 *blue,
+                                       uint32_t size)
 {
         struct drm_device *dev = crtc->dev;
         struct drm_mode_config *config = &dev->mode_config;
@@ -2951,7 +3339,7 @@ void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
 
         state = drm_atomic_state_alloc(crtc->dev);
         if (!state)
-                return;
+                return -ENOMEM;
 
         blob = drm_property_create_blob(dev,
                                         sizeof(struct drm_color_lut) * size,
@@ -3002,7 +3390,7 @@ retry:
 
         drm_property_unreference_blob(blob);
 
-        return;
+        return 0;
 fail:
         if (ret == -EDEADLK)
                 goto backoff;
@@ -3010,7 +3398,7 @@ fail:
         drm_atomic_state_free(state);
         drm_property_unreference_blob(blob);
 
-        return;
+        return ret;
 backoff:
         drm_atomic_state_clear(state);
         drm_atomic_legacy_backoff(state);
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 50d0baa06db0..4153e8a193af 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -30,25 +30,36 @@
 
 #include <drm/drmP.h>
 #include "drm_internal.h"
+#include "drm_legacy.h"
 
 /**
- * drm_getmagic - Get unique magic of a client
- * @dev: DRM device to operate on
- * @data: ioctl data containing the drm_auth object
- * @file_priv: DRM file that performs the operation
+ * DOC: master and authentication
  *
- * This looks up the unique magic of the passed client and returns it. If the
- * client did not have a magic assigned, yet, a new one is registered. The magic
- * is stored in the passed drm_auth object.
+ * struct &drm_master is used to track groups of clients with open
+ * primary/legacy device nodes. For every struct &drm_file which has had at
+ * least once successfully became the device master (either through the
+ * SET_MASTER IOCTL, or implicitly through opening the primary device node when
+ * no one else is the current master that time) there exists one &drm_master.
+ * This is noted in the is_master member of &drm_file. All other clients have
+ * just a pointer to the &drm_master they are associated with.
  *
- * Returns: 0 on success, negative error code on failure.
+ * In addition only one &drm_master can be the current master for a &drm_device.
+ * It can be switched through the DROP_MASTER and SET_MASTER IOCTL, or
+ * implicitly through closing/openeing the primary device node. See also
+ * drm_is_current_master().
+ *
+ * Clients can authenticate against the current master (if it matches their own)
+ * using the GETMAGIC and AUTHMAGIC IOCTLs. Together with exchanging masters,
+ * this allows controlled access to the device for an entire group of mutually
+ * trusted clients.
  */
+
 int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         struct drm_auth *auth = data;
         int ret = 0;
 
-        mutex_lock(&dev->struct_mutex);
+        mutex_lock(&dev->master_mutex);
         if (!file_priv->magic) {
                 ret = idr_alloc(&file_priv->master->magic_map, file_priv,
                                 1, 0, GFP_KERNEL);
@@ -56,23 +67,13 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         file_priv->magic = ret;
         }
         auth->magic = file_priv->magic;
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev->master_mutex);
 
         DRM_DEBUG("%u\n", auth->magic);
 
         return ret < 0 ? ret : 0;
 }
 
-/**
- * drm_authmagic - Authenticate client with a magic
- * @dev: DRM device to operate on
- * @data: ioctl data containing the drm_auth object
- * @file_priv: DRM file that performs the operation
- *
- * This looks up a DRM client by the passed magic and authenticates it.
- *
- * Returns: 0 on success, negative error code on failure.
- */
 int drm_authmagic(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {
@@ -81,13 +82,253 @@ int drm_authmagic(struct drm_device *dev, void *data,
 
         DRM_DEBUG("%u\n", auth->magic);
 
-        mutex_lock(&dev->struct_mutex);
+        mutex_lock(&dev->master_mutex);
         file = idr_find(&file_priv->master->magic_map, auth->magic);
         if (file) {
                 file->authenticated = 1;
                 idr_replace(&file_priv->master->magic_map, NULL, auth->magic);
         }
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev->master_mutex);
 
         return file ? 0 : -EINVAL;
 }
+
+static struct drm_master *drm_master_create(struct drm_device *dev)
+{
+        struct drm_master *master;
+
+        master = kzalloc(sizeof(*master), GFP_KERNEL);
+        if (!master)
+                return NULL;
+
+        kref_init(&master->refcount);
+        spin_lock_init(&master->lock.spinlock);
+        init_waitqueue_head(&master->lock.lock_queue);
+        idr_init(&master->magic_map);
+        master->dev = dev;
+
+        return master;
+}
+
+static int drm_set_master(struct drm_device *dev, struct drm_file *fpriv,
+                          bool new_master)
+{
+        int ret = 0;
+
+        dev->master = drm_master_get(fpriv->master);
+        if (dev->driver->master_set) {
+                ret = dev->driver->master_set(dev, fpriv, new_master);
+                if (unlikely(ret != 0)) {
+                        drm_master_put(&dev->master);
+                }
+        }
+
+        return ret;
+}
+
+static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
+{
+        struct drm_master *old_master;
+        int ret;
+
+        lockdep_assert_held_once(&dev->master_mutex);
+
+        old_master = fpriv->master;
+        fpriv->master = drm_master_create(dev);
+        if (!fpriv->master) {
+                fpriv->master = old_master;
+                return -ENOMEM;
+        }
+
+        if (dev->driver->master_create) {
+                ret = dev->driver->master_create(dev, fpriv->master);
+                if (ret)
+                        goto out_err;
+        }
+        fpriv->is_master = 1;
+        fpriv->authenticated = 1;
+
+        ret = drm_set_master(dev, fpriv, true);
+        if (ret)
+                goto out_err;
+
+        if (old_master)
+                drm_master_put(&old_master);
+
+        return 0;
+
+out_err:
+        /* drop references and restore old master on failure */
+        drm_master_put(&fpriv->master);
+        fpriv->master = old_master;
+
+        return ret;
+}
+
+int drm_setmaster_ioctl(struct drm_device *dev, void *data,
+                        struct drm_file *file_priv)
+{
+        int ret = 0;
+
+        mutex_lock(&dev->master_mutex);
+        if (drm_is_current_master(file_priv))
+                goto out_unlock;
+
+        if (dev->master) {
+                ret = -EINVAL;
+                goto out_unlock;
+        }
+
+        if (!file_priv->master) {
+                ret = -EINVAL;
+                goto out_unlock;
+        }
+
+        if (!file_priv->is_master) {
+                ret = drm_new_set_master(dev, file_priv);
+                goto out_unlock;
+        }
+
+        ret = drm_set_master(dev, file_priv, false);
+out_unlock:
+        mutex_unlock(&dev->master_mutex);
+        return ret;
+}
+
+static void drm_drop_master(struct drm_device *dev,
+                            struct drm_file *fpriv)
+{
+        if (dev->driver->master_drop)
+                dev->driver->master_drop(dev, fpriv);
+        drm_master_put(&dev->master);
+}
+
+int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv)
+{
+        int ret = -EINVAL;
+
+        mutex_lock(&dev->master_mutex);
+        if (!drm_is_current_master(file_priv))
+                goto out_unlock;
+
+        if (!dev->master)
+                goto out_unlock;
+
+        ret = 0;
+        drm_drop_master(dev, file_priv);
+out_unlock:
+        mutex_unlock(&dev->master_mutex);
+        return ret;
+}
+
+int drm_master_open(struct drm_file *file_priv)
+{
+        struct drm_device *dev = file_priv->minor->dev;
+        int ret = 0;
+
+        /* if there is no current master make this fd it, but do not create
+         * any master object for render clients */
+        mutex_lock(&dev->master_mutex);
+        if (!dev->master)
+                ret = drm_new_set_master(dev, file_priv);
+        else
+                file_priv->master = drm_master_get(dev->master);
+        mutex_unlock(&dev->master_mutex);
+
+        return ret;
+}
+
+void drm_master_release(struct drm_file *file_priv)
+{
+        struct drm_device *dev = file_priv->minor->dev;
+        struct drm_master *master = file_priv->master;
+
+        mutex_lock(&dev->master_mutex);
+        if (file_priv->magic)
+                idr_remove(&file_priv->master->magic_map, file_priv->magic);
+
+        if (!drm_is_current_master(file_priv))
+                goto out;
+
+        if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
+                /*
+                 * Since the master is disappearing, so is the
+                 * possibility to lock.
+                 */
+                mutex_lock(&dev->struct_mutex);
+                if (master->lock.hw_lock) {
+                        if (dev->sigdata.lock == master->lock.hw_lock)
+                                dev->sigdata.lock = NULL;
+                        master->lock.hw_lock = NULL;
+                        master->lock.file_priv = NULL;
+                        wake_up_interruptible_all(&master->lock.lock_queue);
+                }
+                mutex_unlock(&dev->struct_mutex);
+        }
+
+        if (dev->master == file_priv->master)
+                drm_drop_master(dev, file_priv);
+out:
+        /* drop the master reference held by the file priv */
+        if (file_priv->master)
+                drm_master_put(&file_priv->master);
+        mutex_unlock(&dev->master_mutex);
+}
+
+/**
+ * drm_is_current_master - checks whether @priv is the current master
+ * @fpriv: DRM file private
+ *
+ * Checks whether @fpriv is current master on its device. This decides whether a
+ * client is allowed to run DRM_MASTER IOCTLs.
+ *
+ * Most of the modern IOCTL which require DRM_MASTER are for kernel modesetting
+ * - the current master is assumed to own the non-shareable display hardware.
+ */
+bool drm_is_current_master(struct drm_file *fpriv)
+{
+        return fpriv->is_master && fpriv->master == fpriv->minor->dev->master;
+}
+EXPORT_SYMBOL(drm_is_current_master);
+
+/**
+ * drm_master_get - reference a master pointer
+ * @master: struct &drm_master
+ *
+ * Increments the reference count of @master and returns a pointer to @master.
+ */
+struct drm_master *drm_master_get(struct drm_master *master)
+{
+        kref_get(&master->refcount);
+        return master;
+}
+EXPORT_SYMBOL(drm_master_get);
+
+static void drm_master_destroy(struct kref *kref)
+{
+        struct drm_master *master = container_of(kref, struct drm_master, refcount);
+        struct drm_device *dev = master->dev;
+
+        if (dev->driver->master_destroy)
+                dev->driver->master_destroy(dev, master);
+
+        drm_legacy_master_rmmaps(dev, master);
+
+        idr_destroy(&master->magic_map);
+        kfree(master->unique);
+        kfree(master);
+}
+
+/**
+ * drm_master_put - unreference and clear a master pointer
+ * @master: pointer to a pointer of struct &drm_master
+ *
+ * This decrements the &drm_master behind @master and sets it to NULL.
+ */
+void drm_master_put(struct drm_master **master)
+{
+        kref_put(&(*master)->refcount, drm_master_destroy);
+        *master = NULL;
+}
+EXPORT_SYMBOL(drm_master_put);
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index b3654404abd0..255543086590 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -36,7 +36,7 @@
  * encoder chain.
  *
  * A bridge is always attached to a single &drm_encoder at a time, but can be
- * either connected to it directly, or through an intermediate bridge:
+ * either connected to it directly, or through an intermediate bridge::
  *
  *     encoder ---> bridge B ---> bridge A
  *
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 9b34158c0f77..c3a12cd8bd0d 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -51,7 +51,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
                  */
                 if (!entry->map ||
                     map->type != entry->map->type ||
-                    entry->master != dev->primary->master)
+                    entry->master != dev->master)
                         continue;
                 switch (map->type) {
                 case _DRM_SHM:
@@ -245,12 +245,12 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                 map->offset = (unsigned long)map->handle;
                 if (map->flags & _DRM_CONTAINS_LOCK) {
                         /* Prevent a 2nd X Server from creating a 2nd lock */
-                        if (dev->primary->master->lock.hw_lock != NULL) {
+                        if (dev->master->lock.hw_lock != NULL) {
                                 vfree(map->handle);
                                 kfree(map);
                                 return -EBUSY;
                         }
-                        dev->sigdata.lock = dev->primary->master->lock.hw_lock = map->handle;   /* Pointer to lock */
+                        dev->sigdata.lock = dev->master->lock.hw_lock = map->handle;    /* Pointer to lock */
                 }
                 break;
         case _DRM_AGP: {
@@ -356,7 +356,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
         mutex_unlock(&dev->struct_mutex);
 
         if (!(map->flags & _DRM_DRIVER))
-                list->master = dev->primary->master;
+                list->master = dev->master;
         *maplist = list;
         return 0;
 }
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d2a6d958ca76..fd93e9c79d28 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -39,6 +39,7 @@
 #include <drm/drm_fourcc.h>
 #include <drm/drm_modeset_lock.h>
 #include <drm/drm_atomic.h>
+#include <drm/drm_auth.h>
 
 #include "drm_crtc_internal.h"
 #include "drm_internal.h"
@@ -239,37 +240,6 @@ const char *drm_get_subpixel_order_name(enum subpixel_order order)
 }
 EXPORT_SYMBOL(drm_get_subpixel_order_name);
 
-static char printable_char(int c)
-{
-        return isascii(c) && isprint(c) ? c : '?';
-}
-
-/**
- * drm_get_format_name - return a string for drm fourcc format
- * @format: format to compute name of
- *
- * Note that the buffer used by this function is globally shared and owned by
- * the function itself.
- *
- * FIXME: This isn't really multithreading safe.
- */
-const char *drm_get_format_name(uint32_t format)
-{
-        static char buf[32];
-
-        snprintf(buf, sizeof(buf),
-                 "%c%c%c%c %s-endian (0x%08x)",
-                 printable_char(format & 0xff),
-                 printable_char((format >> 8) & 0xff),
-                 printable_char((format >> 16) & 0xff),
-                 printable_char((format >> 24) & 0x7f),
-                 format & DRM_FORMAT_BIG_ENDIAN ? "big" : "little",
-                 format);
-
-        return buf;
-}
-EXPORT_SYMBOL(drm_get_format_name);
-
 /*
  * Internal function to assign a slot in the object idr and optionally
  * register the object into the idr.
@@ -535,7 +505,7 @@ EXPORT_SYMBOL(drm_framebuffer_unregister_private);
  *
  * Cleanup framebuffer. This function is intended to be used from the drivers
  * ->destroy callback. It can also be used to clean up driver private
- *  framebuffers embedded into a larger structure.
+ * framebuffers embedded into a larger structure.
  *
  * Note that this function does not remove the fb from active usuage - if it is
  * still used anywhere, hilarity can ensue since userspace could call getfb on
@@ -639,6 +609,31 @@ static unsigned int drm_num_crtcs(struct drm_device *dev)
         return num;
 }
 
+static int drm_crtc_register_all(struct drm_device *dev)
+{
+        struct drm_crtc *crtc;
+        int ret = 0;
+
+        drm_for_each_crtc(crtc, dev) {
+                if (crtc->funcs->late_register)
+                        ret = crtc->funcs->late_register(crtc);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static void drm_crtc_unregister_all(struct drm_device *dev)
+{
+        struct drm_crtc *crtc;
+
+        drm_for_each_crtc(crtc, dev) {
+                if (crtc->funcs->early_unregister)
+                        crtc->funcs->early_unregister(crtc);
+        }
+}
+
 /**
  * drm_crtc_init_with_planes - Initialise a new CRTC object with
  *    specified primary and cursor planes.
@@ -669,6 +664,9 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc,
         crtc->dev = dev;
         crtc->funcs = funcs;
 
+        INIT_LIST_HEAD(&crtc->commit_list);
+        spin_lock_init(&crtc->commit_lock);
+
         drm_modeset_lock_init(&crtc->mutex);
         ret = drm_mode_object_get(dev, &crtc->base, DRM_MODE_OBJECT_CRTC);
         if (ret)
@@ -692,7 +690,7 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc,
         crtc->base.properties = &crtc->properties;
 
         list_add_tail(&crtc->head, &config->crtc_list);
-        config->num_crtc++;
+        crtc->index = config->num_crtc++;
 
         crtc->primary = primary;
         crtc->cursor = cursor;
@@ -722,6 +720,11 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
 {
         struct drm_device *dev = crtc->dev;
 
+        /* Note that the crtc_list is considered to be static; should we
+         * remove the drm_crtc at runtime we would have to decrement all
+         * the indices on the drm_crtc after us in the crtc_list.
+         */
+
         kfree(crtc->gamma_store);
         crtc->gamma_store = NULL;
 
@@ -741,29 +744,6 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(drm_crtc_cleanup);
 
-/**
- * drm_crtc_index - find the index of a registered CRTC
- * @crtc: CRTC to find index for
- *
- * Given a registered CRTC, return the index of that CRTC within a DRM
- * device's list of CRTCs.
- */
-unsigned int drm_crtc_index(struct drm_crtc *crtc)
-{
-        unsigned int index = 0;
-        struct drm_crtc *tmp;
-
-        drm_for_each_crtc(tmp, crtc->dev) {
-                if (tmp == crtc)
-                        return index;
-
-                index++;
-        }
-
-        BUG();
-}
-EXPORT_SYMBOL(drm_crtc_index);
-
 /*
  * drm_mode_remove - remove and free a mode
  * @connector: connector list to modify
@@ -984,6 +964,12 @@ void drm_connector_cleanup(struct drm_connector *connector)
         struct drm_device *dev = connector->dev;
         struct drm_display_mode *mode, *t;
 
+        /* The connector should have been removed from userspace long before
+         * it is finally destroyed.
+         */
+        if (WARN_ON(connector->registered))
+                drm_connector_unregister(connector);
+
         if (connector->tile_group) {
                 drm_mode_put_tile_group(dev, connector->tile_group);
                 connector->tile_group = NULL;
@@ -1030,19 +1016,34 @@ int drm_connector_register(struct drm_connector *connector)
 {
         int ret;
 
+        if (connector->registered)
+                return 0;
+
         ret = drm_sysfs_connector_add(connector);
         if (ret)
                 return ret;
 
         ret = drm_debugfs_connector_add(connector);
         if (ret) {
-                drm_sysfs_connector_remove(connector);
-                return ret;
+                goto err_sysfs;
+        }
+
+        if (connector->funcs->late_register) {
+                ret = connector->funcs->late_register(connector);
+                if (ret)
+                        goto err_debugfs;
         }
 
         drm_mode_object_register(connector->dev, &connector->base);
 
+        connector->registered = true;
         return 0;
+
+err_debugfs:
+        drm_debugfs_connector_remove(connector);
+err_sysfs:
+        drm_sysfs_connector_remove(connector);
+        return ret;
 }
 EXPORT_SYMBOL(drm_connector_register);
 
@@ -1054,8 +1055,16 @@ EXPORT_SYMBOL(drm_connector_register);
  */
 void drm_connector_unregister(struct drm_connector *connector)
 {
+        if (!connector->registered)
+                return;
+
+        if (connector->funcs->early_unregister)
+                connector->funcs->early_unregister(connector);
+
         drm_sysfs_connector_remove(connector);
         drm_debugfs_connector_remove(connector);
+
+        connector->registered = false;
 }
 EXPORT_SYMBOL(drm_connector_unregister);
 
@@ -1064,9 +1073,9 @@ EXPORT_SYMBOL(drm_connector_unregister);
  * @dev: drm device
  *
  * This function registers all connectors in sysfs and other places so that
- * userspace can start to access them. Drivers can call it after calling
- * drm_dev_register() to complete the device registration, if they don't call
- * drm_connector_register() on each connector individually.
+ * userspace can start to access them. drm_connector_register_all() is called
+ * automatically from drm_dev_register() to complete the device registration,
+ * if they don't call drm_connector_register() on each connector individually.
  *
  * When a device is unplugged and should be removed from userspace access,
  * call drm_connector_unregister_all(), which is the inverse of this
@@ -1119,6 +1128,31 @@ void drm_connector_unregister_all(struct drm_device *dev)
 }
 EXPORT_SYMBOL(drm_connector_unregister_all);
 
+static int drm_encoder_register_all(struct drm_device *dev)
+{
+        struct drm_encoder *encoder;
+        int ret = 0;
+
+        drm_for_each_encoder(encoder, dev) {
+                if (encoder->funcs->late_register)
+                        ret = encoder->funcs->late_register(encoder);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static void drm_encoder_unregister_all(struct drm_device *dev)
+{
+        struct drm_encoder *encoder;
+
+        drm_for_each_encoder(encoder, dev) {
+                if (encoder->funcs->early_unregister)
+                        encoder->funcs->early_unregister(encoder);
+        }
+}
+
 /**
  * drm_encoder_init - Init a preallocated encoder
  * @dev: drm device
@@ -1166,7 +1200,7 @@ int drm_encoder_init(struct drm_device *dev,
         }
 
         list_add_tail(&encoder->head, &dev->mode_config.encoder_list);
-        dev->mode_config.num_encoder++;
+        encoder->index = dev->mode_config.num_encoder++;
 
 out_put:
         if (ret)
@@ -1180,29 +1214,6 @@ out_unlock:
 EXPORT_SYMBOL(drm_encoder_init);
 
 /**
- * drm_encoder_index - find the index of a registered encoder
- * @encoder: encoder to find index for
- *
- * Given a registered encoder, return the index of that encoder within a DRM
- * device's list of encoders.
- */
-unsigned int drm_encoder_index(struct drm_encoder *encoder)
-{
-        unsigned int index = 0;
-        struct drm_encoder *tmp;
-
-        drm_for_each_encoder(tmp, encoder->dev) {
-                if (tmp == encoder)
-                        return index;
-
-                index++;
-        }
-
-        BUG();
-}
-EXPORT_SYMBOL(drm_encoder_index);
-
-/**
  * drm_encoder_cleanup - cleans up an initialised encoder
  * @encoder: encoder to cleanup
  *
@@ -1212,6 +1223,11 @@ void drm_encoder_cleanup(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
 
+        /* Note that the encoder_list is considered to be static; should we
+         * remove the drm_encoder at runtime we would have to decrement all
+         * the indices on the drm_encoder after us in the encoder_list.
+         */
+
         drm_modeset_lock_all(dev);
         drm_mode_object_unregister(dev, &encoder->base);
         kfree(encoder->name);
@@ -1300,7 +1316,7 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
         plane->type = type;
 
         list_add_tail(&plane->head, &config->plane_list);
-        config->num_total_plane++;
+        plane->index = config->num_total_plane++;
         if (plane->type == DRM_PLANE_TYPE_OVERLAY)
                 config->num_overlay_plane++;
 
@@ -1325,6 +1341,31 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
 }
 EXPORT_SYMBOL(drm_universal_plane_init);
 
+static int drm_plane_register_all(struct drm_device *dev)
+{
+        struct drm_plane *plane;
+        int ret = 0;
+
+        drm_for_each_plane(plane, dev) {
+                if (plane->funcs->late_register)
+                        ret = plane->funcs->late_register(plane);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static void drm_plane_unregister_all(struct drm_device *dev)
+{
+        struct drm_plane *plane;
+
+        drm_for_each_plane(plane, dev) {
+                if (plane->funcs->early_unregister)
+                        plane->funcs->early_unregister(plane);
+        }
+}
+
 /**
  * drm_plane_init - Initialize a legacy plane
  * @dev: DRM device
@@ -1374,6 +1415,11 @@ void drm_plane_cleanup(struct drm_plane *plane)
 
         BUG_ON(list_empty(&plane->head));
 
+        /* Note that the plane_list is considered to be static; should we
+         * remove the drm_plane at runtime we would have to decrement all
+         * the indices on the drm_plane after us in the plane_list.
+         */
+
         list_del(&plane->head);
         dev->mode_config.num_total_plane--;
         if (plane->type == DRM_PLANE_TYPE_OVERLAY)
@@ -1391,29 +1437,6 @@ void drm_plane_cleanup(struct drm_plane *plane)
 EXPORT_SYMBOL(drm_plane_cleanup);
 
 /**
- * drm_plane_index - find the index of a registered plane
- * @plane: plane to find index for
- *
- * Given a registered plane, return the index of that CRTC within a DRM
- * device's list of planes.
- */
-unsigned int drm_plane_index(struct drm_plane *plane)
-{
-        unsigned int index = 0;
-        struct drm_plane *tmp;
-
-        drm_for_each_plane(tmp, plane->dev) {
-                if (tmp == plane)
-                        return index;
-
-                index++;
-        }
-
-        BUG();
-}
-EXPORT_SYMBOL(drm_plane_index);
-
-/**
  * drm_plane_from_index - find the registered plane at an index
  * @dev: DRM device
  * @idx: index of registered plane to find for
@@ -1425,13 +1448,11 @@ struct drm_plane *
 drm_plane_from_index(struct drm_device *dev, int idx)
 {
         struct drm_plane *plane;
-        unsigned int i = 0;
 
-        drm_for_each_plane(plane, dev) {
-                if (i == idx)
+        drm_for_each_plane(plane, dev)
+                if (idx == plane->index)
                         return plane;
-                i++;
-        }
+
         return NULL;
 }
 EXPORT_SYMBOL(drm_plane_from_index);
@@ -1467,6 +1488,46 @@ void drm_plane_force_disable(struct drm_plane *plane)
 }
 EXPORT_SYMBOL(drm_plane_force_disable);
 
+int drm_modeset_register_all(struct drm_device *dev)
+{
+        int ret;
+
+        ret = drm_plane_register_all(dev);
+        if (ret)
+                goto err_plane;
+
+        ret = drm_crtc_register_all(dev);
+        if  (ret)
+                goto err_crtc;
+
+        ret = drm_encoder_register_all(dev);
+        if (ret)
+                goto err_encoder;
+
+        ret = drm_connector_register_all(dev);
+        if (ret)
+                goto err_connector;
+
+        return 0;
+
+err_connector:
+        drm_encoder_unregister_all(dev);
+err_encoder:
+        drm_crtc_unregister_all(dev);
+err_crtc:
+        drm_plane_unregister_all(dev);
+err_plane:
+        return ret;
+}
+
+void drm_modeset_unregister_all(struct drm_device *dev)
+{
+        drm_connector_unregister_all(dev);
+        drm_encoder_unregister_all(dev);
+        drm_crtc_unregister_all(dev);
+        drm_plane_unregister_all(dev);
+}
+
 static int drm_mode_create_standard_properties(struct drm_device *dev)
 {
         struct drm_property *prop;
@@ -2821,8 +2882,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                         goto out;
                 }
 
-                drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
-
                 /*
                  * Check whether the primary plane supports the fb pixel format.
                  * Drivers not implementing the universal planes API use a
@@ -2977,6 +3036,8 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,
                                 DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n");
                                 return PTR_ERR(fb);
                         }
+                        fb->hot_x = req->hot_x;
+                        fb->hot_y = req->hot_y;
                 } else {
                         fb = NULL;
                 }
@@ -3583,7 +3644,7 @@ int drm_mode_getfb(struct drm_device *dev,
         r->bpp = fb->bits_per_pixel;
         r->pitch = fb->pitches[0];
         if (fb->funcs->create_handle) {
-                if (file_priv->is_master || capable(CAP_SYS_ADMIN) ||
+                if (drm_is_current_master(file_priv) || capable(CAP_SYS_ADMIN) ||
                     drm_is_control_client(file_priv)) {
                         ret = fb->funcs->create_handle(fb, file_priv,
                                                        &r->handle);
@@ -3740,6 +3801,13 @@ void drm_fb_release(struct drm_file *priv)
         }
 }
 
+static bool drm_property_type_valid(struct drm_property *property)
+{
+        if (property->flags & DRM_MODE_PROP_EXTENDED_TYPE)
+                return !(property->flags & DRM_MODE_PROP_LEGACY_TYPE);
+        return !!(property->flags & DRM_MODE_PROP_LEGACY_TYPE);
+}
+
 /**
  * drm_property_create - create a new property type
  * @dev: drm device
@@ -4841,7 +4909,8 @@ bool drm_property_change_valid_get(struct drm_property *property,
                 if (value == 0)
                         return true;
 
-                return _object_find(property->dev, value, property->values[0]) != NULL;
+                *ref = _object_find(property->dev, value, property->values[0]);
+                return *ref != NULL;
         }
 
         for (i = 0; i < property->num_values; i++)
@@ -5139,6 +5208,9 @@ EXPORT_SYMBOL(drm_mode_connector_attach_encoder);
 int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
                                  int gamma_size)
 {
+        uint16_t *r_base, *g_base, *b_base;
+        int i;
+
         crtc->gamma_size = gamma_size;
 
         crtc->gamma_store = kcalloc(gamma_size, sizeof(uint16_t) * 3,
@@ -5148,6 +5220,16 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
                 return -ENOMEM;
         }
 
+        r_base = crtc->gamma_store;
+        g_base = r_base + gamma_size;
+        b_base = g_base + gamma_size;
+        for (i = 0; i < gamma_size; i++) {
+                r_base[i] = i << 8;
+                g_base[i] = i << 8;
+                b_base[i] = i << 8;
+        }
+
+
         return 0;
 }
 EXPORT_SYMBOL(drm_mode_crtc_set_gamma_size);
@@ -5215,7 +5297,7 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
                 goto out;
         }
 
-        crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
+        ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);
 
 out:
         drm_modeset_unlock_all(dev);
@@ -5545,264 +5627,6 @@ int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
 }
 
 /**
- * drm_fb_get_bpp_depth - get the bpp/depth values for format
- * @format: pixel format (DRM_FORMAT_*)
- * @depth: storage for the depth value
- * @bpp: storage for the bpp value
- *
- * This only supports RGB formats here for compat with code that doesn't use
- * pixel formats directly yet.
- */
-void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
-                          int *bpp)
-{
-        switch (format) {
-        case DRM_FORMAT_C8:
-        case DRM_FORMAT_RGB332:
-        case DRM_FORMAT_BGR233:
-                *depth = 8;
-                *bpp = 8;
-                break;
-        case DRM_FORMAT_XRGB1555:
-        case DRM_FORMAT_XBGR1555:
-        case DRM_FORMAT_RGBX5551:
-        case DRM_FORMAT_BGRX5551:
-        case DRM_FORMAT_ARGB1555:
-        case DRM_FORMAT_ABGR1555:
-        case DRM_FORMAT_RGBA5551:
-        case DRM_FORMAT_BGRA5551:
-                *depth = 15;
-                *bpp = 16;
-                break;
-        case DRM_FORMAT_RGB565:
-        case DRM_FORMAT_BGR565:
-                *depth = 16;
-                *bpp = 16;
-                break;
-        case DRM_FORMAT_RGB888:
-        case DRM_FORMAT_BGR888:
-                *depth = 24;
-                *bpp = 24;
-                break;
-        case DRM_FORMAT_XRGB8888:
-        case DRM_FORMAT_XBGR8888:
-        case DRM_FORMAT_RGBX8888:
-        case DRM_FORMAT_BGRX8888:
-                *depth = 24;
-                *bpp = 32;
-                break;
-        case DRM_FORMAT_XRGB2101010:
-        case DRM_FORMAT_XBGR2101010:
-        case DRM_FORMAT_RGBX1010102:
-        case DRM_FORMAT_BGRX1010102:
-        case DRM_FORMAT_ARGB2101010:
-        case DRM_FORMAT_ABGR2101010:
-        case DRM_FORMAT_RGBA1010102:
-        case DRM_FORMAT_BGRA1010102:
-                *depth = 30;
-                *bpp = 32;
-                break;
-        case DRM_FORMAT_ARGB8888:
-        case DRM_FORMAT_ABGR8888:
-        case DRM_FORMAT_RGBA8888:
-        case DRM_FORMAT_BGRA8888:
-                *depth = 32;
-                *bpp = 32;
-                break;
-        default:
-                DRM_DEBUG_KMS("unsupported pixel format %s\n",
-                              drm_get_format_name(format));
-                *depth = 0;
-                *bpp = 0;
-                break;
-        }
-}
-EXPORT_SYMBOL(drm_fb_get_bpp_depth);
-
-/**
- * drm_format_num_planes - get the number of planes for format
- * @format: pixel format (DRM_FORMAT_*)
- *
- * Returns:
- * The number of planes used by the specified pixel format.
- */
-int drm_format_num_planes(uint32_t format)
-{
-        switch (format) {
-        case DRM_FORMAT_YUV410:
-        case DRM_FORMAT_YVU410:
-        case DRM_FORMAT_YUV411:
-        case DRM_FORMAT_YVU411:
-        case DRM_FORMAT_YUV420:
-        case DRM_FORMAT_YVU420:
-        case DRM_FORMAT_YUV422:
-        case DRM_FORMAT_YVU422:
-        case DRM_FORMAT_YUV444:
-        case DRM_FORMAT_YVU444:
-                return 3;
-        case DRM_FORMAT_NV12:
-        case DRM_FORMAT_NV21:
-        case DRM_FORMAT_NV16:
-        case DRM_FORMAT_NV61:
-        case DRM_FORMAT_NV24:
-        case DRM_FORMAT_NV42:
-                return 2;
-        default:
-                return 1;
-        }
-}
-EXPORT_SYMBOL(drm_format_num_planes);
-
-/**
- * drm_format_plane_cpp - determine the bytes per pixel value
- * @format: pixel format (DRM_FORMAT_*)
- * @plane: plane index
- *
- * Returns:
- * The bytes per pixel value for the specified plane.
- */
-int drm_format_plane_cpp(uint32_t format, int plane)
-{
-        unsigned int depth;
-        int bpp;
-
-        if (plane >= drm_format_num_planes(format))
-                return 0;
-
-        switch (format) {
-        case DRM_FORMAT_YUYV:
-        case DRM_FORMAT_YVYU:
-        case DRM_FORMAT_UYVY:
-        case DRM_FORMAT_VYUY:
-                return 2;
-        case DRM_FORMAT_NV12:
-        case DRM_FORMAT_NV21:
-        case DRM_FORMAT_NV16:
-        case DRM_FORMAT_NV61:
-        case DRM_FORMAT_NV24:
-        case DRM_FORMAT_NV42:
-                return plane ? 2 : 1;
-        case DRM_FORMAT_YUV410:
-        case DRM_FORMAT_YVU410:
-        case DRM_FORMAT_YUV411:
-        case DRM_FORMAT_YVU411:
-        case DRM_FORMAT_YUV420:
-        case DRM_FORMAT_YVU420:
-        case DRM_FORMAT_YUV422:
-        case DRM_FORMAT_YVU422:
-        case DRM_FORMAT_YUV444:
-        case DRM_FORMAT_YVU444:
-                return 1;
-        default:
-                drm_fb_get_bpp_depth(format, &depth, &bpp);
-                return bpp >> 3;
-        }
-}
-EXPORT_SYMBOL(drm_format_plane_cpp);
-
-/**
- * drm_format_horz_chroma_subsampling - get the horizontal chroma subsampling factor
- * @format: pixel format (DRM_FORMAT_*)
- *
- * Returns:
- * The horizontal chroma subsampling factor for the
- * specified pixel format.
- */
-int drm_format_horz_chroma_subsampling(uint32_t format)
-{
-        switch (format) {
-        case DRM_FORMAT_YUV411:
-        case DRM_FORMAT_YVU411:
-        case DRM_FORMAT_YUV410:
-        case DRM_FORMAT_YVU410:
-                return 4;
-        case DRM_FORMAT_YUYV:
-        case DRM_FORMAT_YVYU:
-        case DRM_FORMAT_UYVY:
-        case DRM_FORMAT_VYUY:
-        case DRM_FORMAT_NV12:
-        case DRM_FORMAT_NV21:
-        case DRM_FORMAT_NV16:
-        case DRM_FORMAT_NV61:
-        case DRM_FORMAT_YUV422:
-        case DRM_FORMAT_YVU422:
-        case DRM_FORMAT_YUV420:
-        case DRM_FORMAT_YVU420:
-                return 2;
-        default:
-                return 1;
-        }
-}
-EXPORT_SYMBOL(drm_format_horz_chroma_subsampling);
-
-/**
- * drm_format_vert_chroma_subsampling - get the vertical chroma subsampling factor
- * @format: pixel format (DRM_FORMAT_*)
- *
- * Returns:
- * The vertical chroma subsampling factor for the
- * specified pixel format.
- */
-int drm_format_vert_chroma_subsampling(uint32_t format)
-{
-        switch (format) {
-        case DRM_FORMAT_YUV410:
-        case DRM_FORMAT_YVU410:
-                return 4;
-        case DRM_FORMAT_YUV420:
-        case DRM_FORMAT_YVU420:
-        case DRM_FORMAT_NV12:
-        case DRM_FORMAT_NV21:
-                return 2;
-        default:
-                return 1;
-        }
-}
-EXPORT_SYMBOL(drm_format_vert_chroma_subsampling);
-
-/**
- * drm_format_plane_width - width of the plane given the first plane
- * @width: width of the first plane
- * @format: pixel format
- * @plane: plane index
- *
- * Returns:
- * The width of @plane, given that the width of the first plane is @width.
- */
-int drm_format_plane_width(int width, uint32_t format, int plane)
-{
-        if (plane >= drm_format_num_planes(format))
-                return 0;
-
-        if (plane == 0)
-                return width;
-
-        return width / drm_format_horz_chroma_subsampling(format);
-}
-EXPORT_SYMBOL(drm_format_plane_width);
-
-/**
- * drm_format_plane_height - height of the plane given the first plane
- * @height: height of the first plane
- * @format: pixel format
- * @plane: plane index
- *
- * Returns:
- * The height of @plane, given that the height of the first plane is @height.
- */
-int drm_format_plane_height(int height, uint32_t format, int plane)
-{
-        if (plane >= drm_format_num_planes(format))
-                return 0;
-
-        if (plane == 0)
-                return height;
-
-        return height / drm_format_vert_chroma_subsampling(format);
-}
-EXPORT_SYMBOL(drm_format_plane_height);
-
-/**
  * drm_rotation_simplify() - Try to simplify the rotation
  * @rotation: Rotation to be simplified
  * @supported_rotations: Supported rotations
@@ -6065,3 +5889,48 @@ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev,
         return tg;
 }
 EXPORT_SYMBOL(drm_mode_create_tile_group);
+
+/**
+ * drm_crtc_enable_color_mgmt - enable color management properties
+ * @crtc: DRM CRTC
+ * @degamma_lut_size: the size of the degamma lut (before CSC)
+ * @has_ctm: whether to attach ctm_property for CSC matrix
+ * @gamma_lut_size: the size of the gamma lut (after CSC)
+ *
+ * This function lets the driver enable the color correction
+ * properties on a CRTC. This includes 3 degamma, csc and gamma
+ * properties that userspace can set and 2 size properties to inform
+ * the userspace of the lut sizes. Each of the properties are
+ * optional. The gamma and degamma properties are only attached if
+ * their size is not 0 and ctm_property is only attached if has_ctm is
+ * true.
+ */
+void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
+                                uint degamma_lut_size,
+                                bool has_ctm,
+                                uint gamma_lut_size)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_mode_config *config = &dev->mode_config;
+
+        if (degamma_lut_size) {
+                drm_object_attach_property(&crtc->base,
+                                           config->degamma_lut_property, 0);
+                drm_object_attach_property(&crtc->base,
+                                           config->degamma_lut_size_property,
+                                           degamma_lut_size);
+        }
+
+        if (has_ctm)
+                drm_object_attach_property(&crtc->base,
+                                           config->ctm_property, 0);
+
+        if (gamma_lut_size) {
+                drm_object_attach_property(&crtc->base,
+                                           config->gamma_lut_property, 0);
+                drm_object_attach_property(&crtc->base,
+                                           config->gamma_lut_size_property,
+                                           gamma_lut_size);
+        }
+}
+EXPORT_SYMBOL(drm_crtc_enable_color_mgmt);
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index a6e42433ef0e..604d3ef72ffa 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -232,6 +232,9 @@ static void __drm_helper_disable_unused_functions(struct drm_device *dev)
  */
 void drm_helper_disable_unused_functions(struct drm_device *dev)
 {
+        if (drm_core_check_feature(dev, DRIVER_ATOMIC))
+                DRM_ERROR("Called for atomic driver, this is not what you want.\n");
+
         drm_modeset_lock_all(dev);
         __drm_helper_disable_unused_functions(dev);
         drm_modeset_unlock_all(dev);
@@ -528,11 +531,11 @@ drm_crtc_helper_disable(struct drm_crtc *crtc)
 int drm_crtc_helper_set_config(struct drm_mode_set *set)
 {
         struct drm_device *dev;
-        struct drm_crtc *new_crtc;
-        struct drm_encoder *save_encoders, *new_encoder, *encoder;
+        struct drm_crtc **save_encoder_crtcs, *new_crtc;
+        struct drm_encoder **save_connector_encoders, *new_encoder, *encoder;
         bool mode_changed = false; /* if true do a full mode set */
         bool fb_changed = false; /* if true and !mode_changed just do a flip */
-        struct drm_connector *save_connectors, *connector;
+        struct drm_connector *connector;
         int count = 0, ro, fail = 0;
         const struct drm_crtc_helper_funcs *crtc_funcs;
         struct drm_mode_set save_set;
@@ -574,15 +577,15 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
          * Allocate space for the backup of all (non-pointer) encoder and
          * connector data.
          */
-        save_encoders = kzalloc(dev->mode_config.num_encoder *
-                                sizeof(struct drm_encoder), GFP_KERNEL);
-        if (!save_encoders)
+        save_encoder_crtcs = kzalloc(dev->mode_config.num_encoder *
+                                sizeof(struct drm_crtc *), GFP_KERNEL);
+        if (!save_encoder_crtcs)
                 return -ENOMEM;
 
-        save_connectors = kzalloc(dev->mode_config.num_connector *
-                                sizeof(struct drm_connector), GFP_KERNEL);
-        if (!save_connectors) {
-                kfree(save_encoders);
+        save_connector_encoders = kzalloc(dev->mode_config.num_connector *
+                                sizeof(struct drm_encoder *), GFP_KERNEL);
+        if (!save_connector_encoders) {
+                kfree(save_encoder_crtcs);
                 return -ENOMEM;
         }
 
@@ -593,12 +596,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
          */
         count = 0;
         drm_for_each_encoder(encoder, dev) {
-                save_encoders[count++] = *encoder;
+                save_encoder_crtcs[count++] = encoder->crtc;
         }
 
         count = 0;
         drm_for_each_connector(connector, dev) {
-                save_connectors[count++] = *connector;
+                save_connector_encoders[count++] = connector->encoder;
         }
 
         save_set.crtc = set->crtc;
@@ -631,8 +634,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                 mode_changed = true;
         }
 
-        /* take a reference on all connectors in set */
+        /* take a reference on all unbound connectors in set, reuse the
+         * already taken reference for bound connectors
+         */
         for (ro = 0; ro < set->num_connectors; ro++) {
+                if (set->connectors[ro]->encoder)
+                        continue;
                 drm_connector_reference(set->connectors[ro]);
         }
 
@@ -754,30 +761,28 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                 }
         }
 
-        /* after fail drop reference on all connectors in save set */
-        count = 0;
-        drm_for_each_connector(connector, dev) {
-                drm_connector_unreference(&save_connectors[count++]);
-        }
-
-        kfree(save_connectors);
-        kfree(save_encoders);
+        kfree(save_connector_encoders);
+        kfree(save_encoder_crtcs);
         return 0;
 
 fail:
         /* Restore all previous data. */
         count = 0;
         drm_for_each_encoder(encoder, dev) {
-                *encoder = save_encoders[count++];
+                encoder->crtc = save_encoder_crtcs[count++];
         }
 
         count = 0;
         drm_for_each_connector(connector, dev) {
-                *connector = save_connectors[count++];
+                connector->encoder = save_connector_encoders[count++];
         }
 
-        /* after fail drop reference on all connectors in set */
+        /* after fail drop reference on all unbound connectors in set, let
+         * bound connectors keep their reference
+         */
         for (ro = 0; ro < set->num_connectors; ro++) {
+                if (set->connectors[ro]->encoder)
+                        continue;
                 drm_connector_unreference(set->connectors[ro]);
         }
 
@@ -787,8 +792,8 @@ fail:
                                       save_set.y, save_set.fb))
                 DRM_ERROR("failed to restore config after modeset failure\n");
 
-        kfree(save_connectors);
-        kfree(save_encoders);
+        kfree(save_connector_encoders);
+        kfree(save_encoder_crtcs);
         return ret;
 }
 EXPORT_SYMBOL(drm_crtc_helper_set_config);
@@ -1121,36 +1126,3 @@ int drm_helper_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
         return drm_plane_helper_commit(plane, plane_state, old_fb);
 }
 EXPORT_SYMBOL(drm_helper_crtc_mode_set_base);
-
-/**
- * drm_helper_crtc_enable_color_mgmt - enable color management properties
- * @crtc: DRM CRTC
- * @degamma_lut_size: the size of the degamma lut (before CSC)
- * @gamma_lut_size: the size of the gamma lut (after CSC)
- *
- * This function lets the driver enable the color correction properties on a
- * CRTC. This includes 3 degamma, csc and gamma properties that userspace can
- * set and 2 size properties to inform the userspace of the lut sizes.
- */
-void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc,
-                                       int degamma_lut_size,
-                                       int gamma_lut_size)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_mode_config *config = &dev->mode_config;
-
-        drm_object_attach_property(&crtc->base,
-                                   config->degamma_lut_property, 0);
-        drm_object_attach_property(&crtc->base,
-                                   config->ctm_property, 0);
-        drm_object_attach_property(&crtc->base,
-                                   config->gamma_lut_property, 0);
-
-        drm_object_attach_property(&crtc->base,
-                                   config->degamma_lut_size_property,
-                                   degamma_lut_size);
-        drm_object_attach_property(&crtc->base,
-                                   config->gamma_lut_size_property,
-                                   gamma_lut_size);
-}
-EXPORT_SYMBOL(drm_helper_crtc_enable_color_mgmt);
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index a78c138282ea..47a500b90fd7 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -31,14 +31,100 @@
  * and are not exported to drivers.
  */
 
+
+/* drm_crtc.c */
+void drm_connector_ida_init(void);
+void drm_connector_ida_destroy(void);
 int drm_mode_object_get(struct drm_device *dev,
                         struct drm_mode_object *obj, uint32_t obj_type);
 void drm_mode_object_unregister(struct drm_device *dev,
                                 struct drm_mode_object *object);
+bool drm_property_change_valid_get(struct drm_property *property,
+                                   uint64_t value,
+                                   struct drm_mode_object **ref);
+void drm_property_change_valid_put(struct drm_property *property,
+                                   struct drm_mode_object *ref);
+
+int drm_plane_check_pixel_format(const struct drm_plane *plane,
+                                 u32 format);
+int drm_crtc_check_viewport(const struct drm_crtc *crtc,
+                            int x, int y,
+                            const struct drm_display_mode *mode,
+                            const struct drm_framebuffer *fb);
+
+void drm_fb_release(struct drm_file *file_priv);
+void drm_property_destroy_user_blobs(struct drm_device *dev,
+                                     struct drm_file *file_priv);
+
+/* dumb buffer support IOCTLs */
+int drm_mode_create_dumb_ioctl(struct drm_device *dev,
+                               void *data, struct drm_file *file_priv);
+int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,
+                             void *data, struct drm_file *file_priv);
+int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
+                                void *data, struct drm_file *file_priv);
+
+/* framebuffer IOCTLs */
+extern int drm_mode_addfb(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv);
+extern int drm_mode_addfb2(struct drm_device *dev,
+                           void *data, struct drm_file *file_priv);
+int drm_mode_rmfb(struct drm_device *dev,
+                         void *data, struct drm_file *file_priv);
+int drm_mode_getfb(struct drm_device *dev,
+                   void *data, struct drm_file *file_priv);
+int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
+                           void *data, struct drm_file *file_priv);
+
+/* IOCTLs */
+int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
+                                      struct drm_file *file_priv);
+int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
+                                    struct drm_file *file_priv);
+
+int drm_mode_getresources(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv);
+int drm_mode_getplane_res(struct drm_device *dev, void *data,
+                          struct drm_file *file_priv);
+int drm_mode_getcrtc(struct drm_device *dev,
+                     void *data, struct drm_file *file_priv);
+int drm_mode_getconnector(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv);
+int drm_mode_setcrtc(struct drm_device *dev,
+                     void *data, struct drm_file *file_priv);
+int drm_mode_getplane(struct drm_device *dev,
+                      void *data, struct drm_file *file_priv);
+int drm_mode_setplane(struct drm_device *dev,
+                      void *data, struct drm_file *file_priv);
+int drm_mode_cursor_ioctl(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv);
+int drm_mode_cursor2_ioctl(struct drm_device *dev,
+                           void *data, struct drm_file *file_priv);
+int drm_mode_getproperty_ioctl(struct drm_device *dev,
+                               void *data, struct drm_file *file_priv);
+int drm_mode_getblob_ioctl(struct drm_device *dev,
+                           void *data, struct drm_file *file_priv);
+int drm_mode_createblob_ioctl(struct drm_device *dev,
+                              void *data, struct drm_file *file_priv);
+int drm_mode_destroyblob_ioctl(struct drm_device *dev,
+                               void *data, struct drm_file *file_priv);
+int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
+                                          void *data, struct drm_file *file_priv);
+int drm_mode_getencoder(struct drm_device *dev,
+                        void *data, struct drm_file *file_priv);
+int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+                             void *data, struct drm_file *file_priv);
+int drm_mode_gamma_set_ioctl(struct drm_device *dev,
+                             void *data, struct drm_file *file_priv);
+
+int drm_mode_page_flip_ioctl(struct drm_device *dev,
+                             void *data, struct drm_file *file_priv);
 
 /* drm_atomic.c */
 int drm_atomic_get_property(struct drm_mode_object *obj,
-                           struct drm_property *property, uint64_t *val);
+                            struct drm_property *property, uint64_t *val);
 int drm_mode_atomic_ioctl(struct drm_device *dev,
                           void *data, struct drm_file *file_priv);
 
+int drm_modeset_register_all(struct drm_device *dev);
+void drm_modeset_unregister_all(struct drm_device *dev);
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 3bcf8e6a85b3..fa10cef2ba37 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -46,11 +46,8 @@
 
 static const struct drm_info_list drm_debugfs_list[] = {
         {"name", drm_name_info, 0},
-        {"vm", drm_vm_info, 0},
         {"clients", drm_clients_info, 0},
-        {"bufs", drm_bufs_info, 0},
         {"gem_names", drm_gem_name_info, DRIVER_GEM},
-        {"vma", drm_vma_info, 0},
 };
 #define DRM_DEBUGFS_ENTRIES ARRAY_SIZE(drm_debugfs_list)
 
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index eeaf5a7c3aa7..091053e995e5 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -708,8 +708,6 @@ static int drm_dp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
 
         memset(&msg, 0, sizeof(msg));
 
-        mutex_lock(&aux->hw_mutex);
-
         for (i = 0; i < num; i++) {
                 msg.address = msgs[i].addr;
                 drm_dp_i2c_msg_set_request(&msg, &msgs[i]);
@@ -764,8 +762,6 @@ static int drm_dp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
         msg.size = 0;
         (void)drm_dp_i2c_do_msg(aux, &msg);
 
-        mutex_unlock(&aux->hw_mutex);
-
         return err;
 }
 
@@ -774,22 +770,64 @@ static const struct i2c_algorithm drm_dp_i2c_algo = {
         .master_xfer = drm_dp_i2c_xfer,
 };
 
+static struct drm_dp_aux *i2c_to_aux(struct i2c_adapter *i2c)
+{
+        return container_of(i2c, struct drm_dp_aux, ddc);
+}
+
+static void lock_bus(struct i2c_adapter *i2c, unsigned int flags)
+{
+        mutex_lock(&i2c_to_aux(i2c)->hw_mutex);
+}
+
+static int trylock_bus(struct i2c_adapter *i2c, unsigned int flags)
+{
+        return mutex_trylock(&i2c_to_aux(i2c)->hw_mutex);
+}
+
+static void unlock_bus(struct i2c_adapter *i2c, unsigned int flags)
+{
+        mutex_unlock(&i2c_to_aux(i2c)->hw_mutex);
+}
+
 /**
- * drm_dp_aux_register() - initialise and register aux channel
+ * drm_dp_aux_init() - minimally initialise an aux channel
  * @aux: DisplayPort AUX channel
  *
- * Returns 0 on success or a negative error code on failure.
+ * If you need to use the drm_dp_aux's i2c adapter prior to registering it
+ * with the outside world, call drm_dp_aux_init() first. You must still
+ * call drm_dp_aux_register() once the connector has been registered to
+ * allow userspace access to the auxiliary DP channel.
  */
-int drm_dp_aux_register(struct drm_dp_aux *aux)
+void drm_dp_aux_init(struct drm_dp_aux *aux)
 {
-        int ret;
-
         mutex_init(&aux->hw_mutex);
 
         aux->ddc.algo = &drm_dp_i2c_algo;
         aux->ddc.algo_data = aux;
         aux->ddc.retries = 3;
 
+        aux->ddc.lock_bus = lock_bus;
+        aux->ddc.trylock_bus = trylock_bus;
+        aux->ddc.unlock_bus = unlock_bus;
+}
+EXPORT_SYMBOL(drm_dp_aux_init);
+
+/**
+ * drm_dp_aux_register() - initialise and register aux channel
+ * @aux: DisplayPort AUX channel
+ *
+ * Automatically calls drm_dp_aux_init() if this hasn't been done yet.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int drm_dp_aux_register(struct drm_dp_aux *aux)
+{
+        int ret;
+
+        if (!aux->ddc.algo)
+                drm_dp_aux_init(aux);
+
         aux->ddc.class = I2C_CLASS_DDC;
         aux->ddc.owner = THIS_MODULE;
         aux->ddc.dev.parent = aux->dev;
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index a13edf5de2d6..6537908050d7 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2927,11 +2927,9 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
                 drm_dp_port_teardown_pdt(port, port->pdt);
 
                 if (!port->input && port->vcpi.vcpi > 0) {
-                        if (mgr->mst_state) {
-                                drm_dp_mst_reset_vcpi_slots(mgr, port);
-                                drm_dp_update_payload_part1(mgr);
-                                drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
-                        }
+                        drm_dp_mst_reset_vcpi_slots(mgr, port);
+                        drm_dp_update_payload_part1(mgr);
+                        drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
                 }
 
                 kref_put(&port->kref, drm_dp_free_mst_port);
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index bff89226a344..aead9ffcbe29 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -34,8 +34,10 @@
 #include <linux/slab.h>
 #include <drm/drmP.h>
 #include <drm/drm_core.h>
+#include "drm_crtc_internal.h"
 #include "drm_legacy.h"
 #include "drm_internal.h"
+#include "drm_crtc_internal.h"
 
 /*
  * drm_debug: Enable debug output.
@@ -93,114 +95,6 @@ void drm_ut_debug_printk(const char *function_name, const char *format, ...)
 }
 EXPORT_SYMBOL(drm_ut_debug_printk);
 
-struct drm_master *drm_master_create(struct drm_minor *minor)
-{
-        struct drm_master *master;
-
-        master = kzalloc(sizeof(*master), GFP_KERNEL);
-        if (!master)
-                return NULL;
-
-        kref_init(&master->refcount);
-        spin_lock_init(&master->lock.spinlock);
-        init_waitqueue_head(&master->lock.lock_queue);
-        idr_init(&master->magic_map);
-        master->minor = minor;
-
-        return master;
-}
-
-struct drm_master *drm_master_get(struct drm_master *master)
-{
-        kref_get(&master->refcount);
-        return master;
-}
-EXPORT_SYMBOL(drm_master_get);
-
-static void drm_master_destroy(struct kref *kref)
-{
-        struct drm_master *master = container_of(kref, struct drm_master, refcount);
-        struct drm_device *dev = master->minor->dev;
-
-        if (dev->driver->master_destroy)
-                dev->driver->master_destroy(dev, master);
-
-        drm_legacy_master_rmmaps(dev, master);
-
-        idr_destroy(&master->magic_map);
-        kfree(master->unique);
-        kfree(master);
-}
-
-void drm_master_put(struct drm_master **master)
-{
-        kref_put(&(*master)->refcount, drm_master_destroy);
-        *master = NULL;
-}
-EXPORT_SYMBOL(drm_master_put);
-
-int drm_setmaster_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv)
-{
-        int ret = 0;
-
-        mutex_lock(&dev->master_mutex);
-        if (file_priv->is_master)
-                goto out_unlock;
-
-        if (file_priv->minor->master) {
-                ret = -EINVAL;
-                goto out_unlock;
-        }
-
-        if (!file_priv->master) {
-                ret = -EINVAL;
-                goto out_unlock;
-        }
-
-        if (!file_priv->allowed_master) {
-                ret = drm_new_set_master(dev, file_priv);
-                goto out_unlock;
-        }
-
-        file_priv->minor->master = drm_master_get(file_priv->master);
-        file_priv->is_master = 1;
-        if (dev->driver->master_set) {
-                ret = dev->driver->master_set(dev, file_priv, false);
-                if (unlikely(ret != 0)) {
-                        file_priv->is_master = 0;
-                        drm_master_put(&file_priv->minor->master);
-                }
-        }
-
-out_unlock:
-        mutex_unlock(&dev->master_mutex);
-        return ret;
-}
-
-int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv)
-{
-        int ret = -EINVAL;
-
-        mutex_lock(&dev->master_mutex);
-        if (!file_priv->is_master)
-                goto out_unlock;
-
-        if (!file_priv->minor->master)
-                goto out_unlock;
-
-        ret = 0;
-        if (dev->driver->master_drop)
-                dev->driver->master_drop(dev, file_priv, false);
-        drm_master_put(&file_priv->minor->master);
-        file_priv->is_master = 0;
-
-out_unlock:
-        mutex_unlock(&dev->master_mutex);
-        return ret;
-}
-
 /*
  * DRM Minors
  * A DRM device can provide several char-dev interfaces on the DRM-Major. Each
@@ -405,10 +299,9 @@ void drm_minor_release(struct drm_minor *minor)
  * callbacks implemented by the driver. The driver then needs to initialize all
  * the various subsystems for the drm device like memory management, vblank
  * handling, modesetting support and intial output configuration plus obviously
- * initialize all the corresponding hardware bits. An important part of this is
- * also calling drm_dev_set_unique() to set the userspace-visible unique name of
- * this device instance. Finally when everything is up and running and ready for
- * userspace the device instance can be published using drm_dev_register().
+ * initialize all the corresponding hardware bits. Finally when everything is up
+ * and running and ready for userspace the device instance can be published
+ * using drm_dev_register().
  *
  * There is also deprecated support for initalizing device instances using
  * bus-specific helpers and the ->load() callback. But due to
@@ -430,6 +323,14 @@ void drm_minor_release(struct drm_minor *minor)
  * dev_priv field of &drm_device.
  */
 
+static int drm_dev_set_unique(struct drm_device *dev, const char *name)
+{
+        kfree(dev->unique);
+        dev->unique = kstrdup(name, GFP_KERNEL);
+
+        return dev->unique ? 0 : -ENOMEM;
+}
+
 /**
  * drm_put_dev - Unregister and release a DRM device
  * @dev: DRM device
@@ -549,11 +450,12 @@ static void drm_fs_inode_free(struct inode *inode)
 }
 
 /**
- * drm_dev_alloc - Allocate new DRM device
- * @driver: DRM driver to allocate device for
+ * drm_dev_init - Initialise new DRM device
+ * @dev: DRM device
+ * @driver: DRM driver
  * @parent: Parent device object
  *
- * Allocate and initialize a new DRM device. No device registration is done.
+ * Initialize a new DRM device. No device registration is done.
  * Call drm_dev_register() to advertice the device to user space and register it
  * with other core subsystems. This should be done last in the device
  * initialization sequence to make sure userspace can't access an inconsistent
@@ -564,19 +466,18 @@ static void drm_fs_inode_free(struct inode *inode)
  *
  * Note that for purely virtual devices @parent can be NULL.
  *
+ * Drivers that do not want to allocate their own device struct
+ * embedding struct &drm_device can call drm_dev_alloc() instead.
+ *
  * RETURNS:
- * Pointer to new DRM device, or NULL if out of memory.
+ * 0 on success, or error code on failure.
  */
-struct drm_device *drm_dev_alloc(struct drm_driver *driver,
-                                 struct device *parent)
+int drm_dev_init(struct drm_device *dev,
+                 struct drm_driver *driver,
+                 struct device *parent)
 {
-        struct drm_device *dev;
         int ret;
 
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev)
-                return NULL;
-
         kref_init(&dev->ref);
         dev->dev = parent;
         dev->driver = driver;
@@ -605,8 +506,6 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
                 ret = drm_minor_alloc(dev, DRM_MINOR_CONTROL);
                 if (ret)
                         goto err_minors;
-
-                WARN_ON(driver->suspend || driver->resume);
         }
 
         if (drm_core_check_feature(dev, DRIVER_RENDER)) {
@@ -619,7 +518,8 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
         if (ret)
                 goto err_minors;
 
-        if (drm_ht_create(&dev->map_hash, 12))
+        ret = drm_ht_create(&dev->map_hash, 12);
+        if (ret)
                 goto err_minors;
 
         drm_legacy_ctxbitmap_init(dev);
@@ -632,13 +532,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
                 }
         }
 
-        if (parent) {
-                ret = drm_dev_set_unique(dev, dev_name(parent));
-                if (ret)
-                        goto err_setunique;
-        }
+        /* Use the parent device name as DRM device unique identifier, but fall
+         * back to the driver name for virtual devices like vgem. */
+        ret = drm_dev_set_unique(dev, parent ? dev_name(parent) : driver->name);
+        if (ret)
+                goto err_setunique;
 
-        return dev;
+        return 0;
 
 err_setunique:
         if (drm_core_check_feature(dev, DRIVER_GEM))
@@ -653,8 +553,49 @@ err_minors:
         drm_fs_inode_free(dev->anon_inode);
 err_free:
         mutex_destroy(&dev->master_mutex);
-        kfree(dev);
-        return NULL;
+        return ret;
+}
+EXPORT_SYMBOL(drm_dev_init);
+
+/**
+ * drm_dev_alloc - Allocate new DRM device
+ * @driver: DRM driver to allocate device for
+ * @parent: Parent device object
+ *
+ * Allocate and initialize a new DRM device. No device registration is done.
+ * Call drm_dev_register() to advertice the device to user space and register it
+ * with other core subsystems. This should be done last in the device
+ * initialization sequence to make sure userspace can't access an inconsistent
+ * state.
+ *
+ * The initial ref-count of the object is 1. Use drm_dev_ref() and
+ * drm_dev_unref() to take and drop further ref-counts.
+ *
+ * Note that for purely virtual devices @parent can be NULL.
+ *
+ * Drivers that wish to subclass or embed struct &drm_device into their
+ * own struct should look at using drm_dev_init() instead.
+ *
+ * RETURNS:
+ * Pointer to new DRM device, or NULL if out of memory.
+ */
+struct drm_device *drm_dev_alloc(struct drm_driver *driver,
+                                 struct device *parent)
+{
+        struct drm_device *dev;
+        int ret;
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        ret = drm_dev_init(dev, driver, parent);
+        if (ret) {
+                kfree(dev);
+                return NULL;
+        }
+
+        return dev;
 }
 EXPORT_SYMBOL(drm_dev_alloc);
 
@@ -718,11 +659,7 @@ EXPORT_SYMBOL(drm_dev_unref);
  *
  * Register the DRM device @dev with the system, advertise device to user-space
  * and start normal device operation. @dev must be allocated via drm_dev_alloc()
- * previously. Right after drm_dev_register() the driver should call
- * drm_connector_register_all() to register all connectors in sysfs. This is
- * a separate call for backward compatibility with drivers still using
- * the deprecated ->load() callback, where connectors are registered from within
- * the ->load() callback.
+ * previously.
  *
  * Never call this twice on any device!
  *
@@ -759,6 +696,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
                         goto err_minors;
         }
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                drm_modeset_register_all(dev);
+
         ret = 0;
         goto out_unlock;
 
@@ -789,6 +729,9 @@ void drm_dev_unregister(struct drm_device *dev)
 
         drm_lastclose(dev);
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                drm_modeset_unregister_all(dev);
+
         if (dev->driver->unload)
                 dev->driver->unload(dev);
 
@@ -806,26 +749,6 @@ void drm_dev_unregister(struct drm_device *dev)
 }
 EXPORT_SYMBOL(drm_dev_unregister);
 
-/**
- * drm_dev_set_unique - Set the unique name of a DRM device
- * @dev: device of which to set the unique name
- * @name: unique name
- *
- * Sets the unique name of a DRM device using the specified string. Drivers
- * can use this at driver probe time if the unique name of the devices they
- * drive is static.
- *
- * Return: 0 on success or a negative error code on failure.
- */
-int drm_dev_set_unique(struct drm_device *dev, const char *name)
-{
-        kfree(dev->unique);
-        dev->unique = kstrdup(name, GFP_KERNEL);
-
-        return dev->unique ? 0 : -ENOMEM;
-}
-EXPORT_SYMBOL(drm_dev_set_unique);
-
 /*
  * DRM Core
  * The DRM core module initializes all global DRM objects and makes them
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 9a401aed98e0..622f788bff46 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -271,7 +271,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
          * by commas, search through the list looking for one that
          * matches the connector.
          *
-         * If there's one or more that don't't specify a connector, keep
+         * If there's one or more that doesn't specify a connector, keep
          * the last one found one as a fallback.
          */
         fwstr = kstrdup(edid_firmware, GFP_KERNEL);
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 172cafe11c71..1fd6eac1400c 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -23,6 +23,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 
 #define DEFAULT_FBDEFIO_DELAY_MS 50
@@ -52,7 +53,7 @@ struct drm_fbdev_cma {
  * will be set up automatically. dirty() is called by
  * drm_fb_helper_deferred_io() in process context (struct delayed_work).
  *
- * Example fbdev deferred io code:
+ * Example fbdev deferred io code::
  *
  *     static int driver_fbdev_fb_dirty(struct drm_framebuffer *fb,
  *                                      struct drm_file *file_priv,
@@ -162,6 +163,10 @@ static struct drm_fb_cma *drm_fb_cma_alloc(struct drm_device *dev,
  * drm_fb_cma_create_with_funcs() - helper function for the
  *                                  &drm_mode_config_funcs ->fb_create
  *                                  callback function
+ * @dev: DRM device
+ * @file_priv: drm file for the ioctl call
+ * @mode_cmd: metadata from the userspace fb creation request
+ * @funcs: vtable to be used for the new framebuffer object
  *
  * This can be used to set &drm_framebuffer_funcs for drivers that need the
  * dirty() callback. Use drm_fb_cma_create() if you don't need to change
@@ -223,6 +228,9 @@ EXPORT_SYMBOL_GPL(drm_fb_cma_create_with_funcs);
 
 /**
  * drm_fb_cma_create() - &drm_mode_config_funcs ->fb_create callback function
+ * @dev: DRM device
+ * @file_priv: drm file for the ioctl call
+ * @mode_cmd: metadata from the userspace fb creation request
  *
  * If your hardware has special alignment or pitch requirements these should be
  * checked before calling this function. Use drm_fb_cma_create_with_funcs() if
@@ -246,7 +254,7 @@ EXPORT_SYMBOL_GPL(drm_fb_cma_create);
  * This function will usually be called from the CRTC callback functions.
  */
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
-        unsigned int plane)
+                                                  unsigned int plane)
 {
         struct drm_fb_cma *fb_cma = to_fb_cma(fb);
 
@@ -258,10 +266,6 @@ struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
 EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_obj);
 
 #ifdef CONFIG_DEBUG_FS
-/*
- * drm_fb_cma_describe() - Helper to dump information about a single
- * CMA framebuffer object
- */
 static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)
 {
         struct drm_fb_cma *fb_cma = to_fb_cma(fb);
@@ -279,7 +283,9 @@ static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)
 
 /**
  * drm_fb_cma_debugfs_show() - Helper to list CMA framebuffer objects
- * in debugfs.
+ *                             in debugfs.
+ * @m: output file
+ * @arg: private data for the callback
  */
 int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg)
 {
@@ -297,6 +303,12 @@ int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg)
 EXPORT_SYMBOL_GPL(drm_fb_cma_debugfs_show);
 #endif
 
+static int drm_fb_cma_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+        return dma_mmap_writecombine(info->device, vma, info->screen_base,
+                                     info->fix.smem_start, info->fix.smem_len);
+}
+
 static struct fb_ops drm_fbdev_cma_ops = {
         .owner          = THIS_MODULE,
         .fb_fillrect    = drm_fb_helper_sys_fillrect,
@@ -307,6 +319,7 @@ static struct fb_ops drm_fbdev_cma_ops = {
         .fb_blank       = drm_fb_helper_blank,
         .fb_pan_display = drm_fb_helper_pan_display,
         .fb_setcmap     = drm_fb_helper_setcmap,
+        .fb_mmap        = drm_fb_cma_mmap,
 };
 
 static int drm_fbdev_cma_deferred_io_mmap(struct fb_info *info,
@@ -333,6 +346,7 @@ static int drm_fbdev_cma_defio_init(struct fb_info *fbi,
         fbops = kzalloc(sizeof(*fbops), GFP_KERNEL);
         if (!fbdefio || !fbops) {
                 kfree(fbdefio);
+                kfree(fbops);
                 return -ENOMEM;
         }
 
@@ -445,7 +459,7 @@ err_cma_destroy:
 err_fb_info_destroy:
         drm_fb_helper_release_fbi(helper);
 err_gem_free_object:
-        dev->driver->gem_free_object(&obj->base);
+        drm_gem_object_unreference_unlocked(&obj->base);
         return ret;
 }
 EXPORT_SYMBOL(drm_fbdev_cma_create_with_funcs);
@@ -582,3 +596,18 @@ void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma)
                 drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
+
+/**
+ * drm_fbdev_cma_set_suspend - wrapper around drm_fb_helper_set_suspend
+ * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
+ * @state: desired state, zero to resume, non-zero to suspend
+ *
+ * Calls drm_fb_helper_set_suspend, which is a wrapper around
+ * fb_set_suspend implemented by fbdev core.
+ */
+void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, int state)
+{
+        if (fbdev_cma)
+                drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
+}
+EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 7c2eb75db60f..ce54e985d91b 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -227,7 +227,7 @@ static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc)
         g_base = r_base + crtc->gamma_size;
         b_base = g_base + crtc->gamma_size;
 
-        crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
+        crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);
 }
 
 /**
@@ -385,7 +385,7 @@ static int restore_fbdev_mode(struct drm_fb_helper *fb_helper)
 
         drm_warn_on_modeset_not_all_locked(dev);
 
-        if (fb_helper->atomic)
+        if (dev->mode_config.funcs->atomic_commit)
                 return restore_fbdev_mode_atomic(fb_helper);
 
         drm_for_each_plane(plane, dev) {
@@ -464,7 +464,7 @@ static bool drm_fb_helper_is_bound(struct drm_fb_helper *fb_helper)
 
         /* Sometimes user space wants everything disabled, so don't steal the
          * display if there's a master. */
-        if (dev->primary->master)
+        if (lockless_dereference(dev->master))
                 return false;
 
         drm_for_each_crtc(crtc, dev) {
@@ -716,8 +716,6 @@ int drm_fb_helper_init(struct drm_device *dev,
                 i++;
         }
 
-        fb_helper->atomic = !!drm_core_check_feature(dev, DRIVER_ATOMIC);
-
         return 0;
 out_free:
         drm_fb_helper_crtc_free(fb_helper);
@@ -1042,7 +1040,6 @@ static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
 {
         struct drm_fb_helper *fb_helper = info->par;
         struct drm_framebuffer *fb = fb_helper->fb;
-        int pindex;
 
         if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
                 u32 *palette;
@@ -1074,38 +1071,10 @@ static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
                     !fb_helper->funcs->gamma_get))
                 return -EINVAL;
 
-        pindex = regno;
-
-        if (fb->bits_per_pixel == 16) {
-                pindex = regno << 3;
-
-                if (fb->depth == 16 && regno > 63)
-                        return -EINVAL;
-                if (fb->depth == 15 && regno > 31)
-                        return -EINVAL;
-
-                if (fb->depth == 16) {
-                        u16 r, g, b;
-                        int i;
-                        if (regno < 32) {
-                                for (i = 0; i < 8; i++)
-                                        fb_helper->funcs->gamma_set(crtc, red,
-                                                green, blue, pindex + i);
-                        }
+        WARN_ON(fb->bits_per_pixel != 8);
 
-                        fb_helper->funcs->gamma_get(crtc, &r,
-                                                    &g, &b,
-                                                    pindex >> 1);
+        fb_helper->funcs->gamma_set(crtc, red, green, blue, regno);
 
-                        for (i = 0; i < 4; i++)
-                                fb_helper->funcs->gamma_set(crtc, r,
-                                                            green, b,
-                                                            (pindex >> 1) + i);
-                }
-        }
-
-        if (fb->depth != 16)
-                fb_helper->funcs->gamma_set(crtc, red, green, blue, pindex);
         return 0;
 }
 
@@ -1373,7 +1342,7 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
                 return -EBUSY;
         }
 
-        if (fb_helper->atomic) {
+        if (dev->mode_config.funcs->atomic_commit) {
                 ret = pan_display_atomic(var, info);
                 goto unlock;
         }
@@ -2000,7 +1969,18 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,
                 my_score++;
 
         connector_funcs = connector->helper_private;
-        encoder = connector_funcs->best_encoder(connector);
+
+        /*
+         * If the DRM device implements atomic hooks and ->best_encoder() is
+         * NULL we fallback to the default drm_atomic_helper_best_encoder()
+         * helper.
+         */
+        if (fb_helper->dev->mode_config.funcs->atomic_commit &&
+            !connector_funcs->best_encoder)
+                encoder = drm_atomic_helper_best_encoder(connector);
+        else
+                encoder = connector_funcs->best_encoder(connector);
+
         if (!encoder)
                 goto out;
 
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 7af7f8bcb355..323c238fcac7 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -40,6 +40,7 @@
 #include <linux/module.h>
 #include "drm_legacy.h"
 #include "drm_internal.h"
+#include "drm_crtc_internal.h"
 
 /* from BKL pushdown */
 DEFINE_MUTEX(drm_global_mutex);
@@ -67,7 +68,7 @@ DEFINE_MUTEX(drm_global_mutex);
  * specific implementations. For GEM-based drivers this is drm_gem_mmap().
  *
  * No other file operations are supported by the DRM userspace API. Overall the
- * following is an example #file_operations structure:
+ * following is an example #file_operations structure::
  *
  *     static const example_drm_fops = {
  *             .owner = THIS_MODULE,
@@ -168,60 +169,6 @@ static int drm_cpu_valid(void)
 }
 
 /*
- * drm_new_set_master - Allocate a new master object and become master for the
- * associated master realm.
- *
- * @dev: The associated device.
- * @fpriv: File private identifying the client.
- *
- * This function must be called with dev::struct_mutex held.
- * Returns negative error code on failure. Zero on success.
- */
-int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
-{
-        struct drm_master *old_master;
-        int ret;
-
-        lockdep_assert_held_once(&dev->master_mutex);
-
-        /* create a new master */
-        fpriv->minor->master = drm_master_create(fpriv->minor);
-        if (!fpriv->minor->master)
-                return -ENOMEM;
-
-        /* take another reference for the copy in the local file priv */
-        old_master = fpriv->master;
-        fpriv->master = drm_master_get(fpriv->minor->master);
-
-        if (dev->driver->master_create) {
-                ret = dev->driver->master_create(dev, fpriv->master);
-                if (ret)
-                        goto out_err;
-        }
-        if (dev->driver->master_set) {
-                ret = dev->driver->master_set(dev, fpriv, true);
-                if (ret)
-                        goto out_err;
-        }
-
-        fpriv->is_master = 1;
-        fpriv->allowed_master = 1;
-        fpriv->authenticated = 1;
-        if (old_master)
-                drm_master_put(&old_master);
-
-        return 0;
-
-out_err:
-        /* drop both references and restore old master on failure */
-        drm_master_put(&fpriv->minor->master);
-        drm_master_put(&fpriv->master);
-        fpriv->master = old_master;
-
-        return ret;
-}
-
-/*
  * Called whenever a process opens /dev/drm.
  *
  * \param filp file pointer.
@@ -283,19 +230,11 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
                         goto out_prime_destroy;
         }
 
-        /* if there is no current master make this fd it, but do not create
-         * any master object for render clients */
-        mutex_lock(&dev->master_mutex);
-        if (drm_is_primary_client(priv) && !priv->minor->master) {
-                /* create a new master */
-                ret = drm_new_set_master(dev, priv);
+        if (drm_is_primary_client(priv)) {
+                ret = drm_master_open(priv);
                 if (ret)
                         goto out_close;
-        } else if (drm_is_primary_client(priv)) {
-                /* get a reference to the master */
-                priv->master = drm_master_get(priv->minor->master);
         }
-        mutex_unlock(&dev->master_mutex);
 
         mutex_lock(&dev->filelist_mutex);
         list_add(&priv->lhead, &dev->filelist);
@@ -324,7 +263,6 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
         return 0;
 
 out_close:
-        mutex_unlock(&dev->master_mutex);
         if (dev->driver->postclose)
                 dev->driver->postclose(dev, priv);
 out_prime_destroy:
@@ -338,18 +276,6 @@ out_prime_destroy:
         return ret;
 }
 
-static void drm_master_release(struct drm_device *dev, struct file *filp)
-{
-        struct drm_file *file_priv = filp->private_data;
-
-        if (drm_legacy_i_have_hw_lock(dev, file_priv)) {
-                DRM_DEBUG("File %p released, freeing lock for context %d\n",
-                          filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
-                drm_legacy_lock_free(&file_priv->master->lock,
-                                     _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
-        }
-}
-
 static void drm_events_release(struct drm_file *file_priv)
 {
         struct drm_device *dev = file_priv->minor->dev;
@@ -368,7 +294,7 @@ static void drm_events_release(struct drm_file *file_priv)
         /* Remove unconsumed events */
         list_for_each_entry_safe(e, et, &file_priv->event_list, link) {
                 list_del(&e->link);
-                e->destroy(e);
+                kfree(e);
         }
 
         spin_unlock_irqrestore(&dev->event_lock, flags);
@@ -451,11 +377,6 @@ int drm_release(struct inode *inode, struct file *filp)
         list_del(&file_priv->lhead);
         mutex_unlock(&dev->filelist_mutex);
 
-        mutex_lock(&dev->struct_mutex);
-        if (file_priv->magic)
-                idr_remove(&file_priv->master->magic_map, file_priv->magic);
-        mutex_unlock(&dev->struct_mutex);
-
         if (dev->driver->preclose)
                 dev->driver->preclose(dev, file_priv);
 
@@ -468,9 +389,8 @@ int drm_release(struct inode *inode, struct file *filp)
                   (long)old_encode_dev(file_priv->minor->kdev->devt),
                   dev->open_count);
 
-        /* if the master has gone away we can't do anything with the lock */
-        if (file_priv->minor->master)
-                drm_master_release(dev, filp);
+        if (!drm_core_check_feature(dev, DRIVER_MODESET))
+                drm_legacy_lock_release(dev, filp);
 
         if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 drm_legacy_reclaim_buffers(dev, file_priv);
@@ -487,43 +407,12 @@ int drm_release(struct inode *inode, struct file *filp)
 
         drm_legacy_ctxbitmap_flush(dev, file_priv);
 
-        mutex_lock(&dev->master_mutex);
-
-        if (file_priv->is_master) {
-                struct drm_master *master = file_priv->master;
-
-                /*
-                 * Since the master is disappearing, so is the
-                 * possibility to lock.
-                 */
-                mutex_lock(&dev->struct_mutex);
-                if (master->lock.hw_lock) {
-                        if (dev->sigdata.lock == master->lock.hw_lock)
-                                dev->sigdata.lock = NULL;
-                        master->lock.hw_lock = NULL;
-                        master->lock.file_priv = NULL;
-                        wake_up_interruptible_all(&master->lock.lock_queue);
-                }
-                mutex_unlock(&dev->struct_mutex);
-
-                if (file_priv->minor->master == file_priv->master) {
-                        /* drop the reference held my the minor */
-                        if (dev->driver->master_drop)
-                                dev->driver->master_drop(dev, file_priv, true);
-                        drm_master_put(&file_priv->minor->master);
-                }
-        }
-
-        /* drop the master reference held by the file priv */
-        if (file_priv->master)
-                drm_master_put(&file_priv->master);
-        file_priv->is_master = 0;
-        mutex_unlock(&dev->master_mutex);
+        if (drm_is_primary_client(file_priv))
+                drm_master_release(file_priv);
 
         if (dev->driver->postclose)
                 dev->driver->postclose(dev, file_priv);
 
-
         if (drm_core_check_feature(dev, DRIVER_PRIME))
                 drm_prime_destroy_file_private(&file_priv->prime);
 
@@ -636,7 +525,7 @@ put_back_event:
                         }
 
                         ret += length;
-                        e->destroy(e);
+                        kfree(e);
                 }
         }
         mutex_unlock(&file_priv->event_read_lock);
@@ -713,9 +602,6 @@ int drm_event_reserve_init_locked(struct drm_device *dev,
         list_add(&p->pending_link, &file_priv->pending_event_list);
         p->file_priv = file_priv;
 
-        /* we *could* pass this in as arg, but everyone uses kfree: */
-        p->destroy = (void (*) (struct drm_pending_event *)) kfree;
-
         return 0;
 }
 EXPORT_SYMBOL(drm_event_reserve_init_locked);
@@ -778,7 +664,7 @@ void drm_event_cancel_free(struct drm_device *dev,
                 list_del(&p->pending_link);
         }
         spin_unlock_irqrestore(&dev->event_lock, flags);
-        p->destroy(p);
+        kfree(p);
 }
 EXPORT_SYMBOL(drm_event_cancel_free);
 
@@ -800,8 +686,19 @@ void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e)
 {
         assert_spin_locked(&dev->event_lock);
 
+        if (e->completion) {
+                /* ->completion might disappear as soon as it signalled. */
+                complete_all(e->completion);
+                e->completion = NULL;
+        }
+
+        if (e->fence) {
+                fence_signal(e->fence);
+                fence_put(e->fence);
+        }
+
         if (!e->file_priv) {
-                e->destroy(e);
+                kfree(e);
                 return;
         }
 
diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
new file mode 100644
index 000000000000..0645c85d5f95
--- /dev/null
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2016 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *
+ * DRM core format related functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <linux/bug.h>
+#include <linux/ctype.h>
+#include <linux/export.h>
+#include <linux/kernel.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_fourcc.h>
+
+static char printable_char(int c)
+{
+        return isascii(c) && isprint(c) ? c : '?';
+}
+
+/**
+ * drm_get_format_name - return a string for drm fourcc format
+ * @format: format to compute name of
+ *
+ * Note that the buffer used by this function is globally shared and owned by
+ * the function itself.
+ *
+ * FIXME: This isn't really multithreading safe.
+ */
+const char *drm_get_format_name(uint32_t format)
+{
+        static char buf[32];
+
+        snprintf(buf, sizeof(buf),
+                 "%c%c%c%c %s-endian (0x%08x)",
+                 printable_char(format & 0xff),
+                 printable_char((format >> 8) & 0xff),
+                 printable_char((format >> 16) & 0xff),
+                 printable_char((format >> 24) & 0x7f),
+                 format & DRM_FORMAT_BIG_ENDIAN ? "big" : "little",
+                 format);
+
+        return buf;
+}
+EXPORT_SYMBOL(drm_get_format_name);
+
+/**
+ * drm_fb_get_bpp_depth - get the bpp/depth values for format
+ * @format: pixel format (DRM_FORMAT_*)
+ * @depth: storage for the depth value
+ * @bpp: storage for the bpp value
+ *
+ * This only supports RGB formats here for compat with code that doesn't use
+ * pixel formats directly yet.
+ */
+void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
+                          int *bpp)
+{
+        switch (format) {
+        case DRM_FORMAT_C8:
+        case DRM_FORMAT_RGB332:
+        case DRM_FORMAT_BGR233:
+                *depth = 8;
+                *bpp = 8;
+                break;
+        case DRM_FORMAT_XRGB1555:
+        case DRM_FORMAT_XBGR1555:
+        case DRM_FORMAT_RGBX5551:
+        case DRM_FORMAT_BGRX5551:
+        case DRM_FORMAT_ARGB1555:
+        case DRM_FORMAT_ABGR1555:
+        case DRM_FORMAT_RGBA5551:
+        case DRM_FORMAT_BGRA5551:
+                *depth = 15;
+                *bpp = 16;
+                break;
+        case DRM_FORMAT_RGB565:
+        case DRM_FORMAT_BGR565:
+                *depth = 16;
+                *bpp = 16;
+                break;
+        case DRM_FORMAT_RGB888:
+        case DRM_FORMAT_BGR888:
+                *depth = 24;
+                *bpp = 24;
+                break;
+        case DRM_FORMAT_XRGB8888:
+        case DRM_FORMAT_XBGR8888:
+        case DRM_FORMAT_RGBX8888:
+        case DRM_FORMAT_BGRX8888:
+                *depth = 24;
+                *bpp = 32;
+                break;
+        case DRM_FORMAT_XRGB2101010:
+        case DRM_FORMAT_XBGR2101010:
+        case DRM_FORMAT_RGBX1010102:
+        case DRM_FORMAT_BGRX1010102:
+        case DRM_FORMAT_ARGB2101010:
+        case DRM_FORMAT_ABGR2101010:
+        case DRM_FORMAT_RGBA1010102:
+        case DRM_FORMAT_BGRA1010102:
+                *depth = 30;
+                *bpp = 32;
+                break;
+        case DRM_FORMAT_ARGB8888:
+        case DRM_FORMAT_ABGR8888:
+        case DRM_FORMAT_RGBA8888:
+        case DRM_FORMAT_BGRA8888:
+                *depth = 32;
+                *bpp = 32;
+                break;
+        default:
+                DRM_DEBUG_KMS("unsupported pixel format %s\n",
+                              drm_get_format_name(format));
+                *depth = 0;
+                *bpp = 0;
+                break;
+        }
+}
+EXPORT_SYMBOL(drm_fb_get_bpp_depth);
+
+/**
+ * drm_format_num_planes - get the number of planes for format
+ * @format: pixel format (DRM_FORMAT_*)
+ *
+ * Returns:
+ * The number of planes used by the specified pixel format.
+ */
+int drm_format_num_planes(uint32_t format)
+{
+        switch (format) {
+        case DRM_FORMAT_YUV410:
+        case DRM_FORMAT_YVU410:
+        case DRM_FORMAT_YUV411:
+        case DRM_FORMAT_YVU411:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+        case DRM_FORMAT_YUV422:
+        case DRM_FORMAT_YVU422:
+        case DRM_FORMAT_YUV444:
+        case DRM_FORMAT_YVU444:
+                return 3;
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+                return 2;
+        default:
+                return 1;
+        }
+}
+EXPORT_SYMBOL(drm_format_num_planes);
+
+/**
+ * drm_format_plane_cpp - determine the bytes per pixel value
+ * @format: pixel format (DRM_FORMAT_*)
+ * @plane: plane index
+ *
+ * Returns:
+ * The bytes per pixel value for the specified plane.
+ */
+int drm_format_plane_cpp(uint32_t format, int plane)
+{
+        unsigned int depth;
+        int bpp;
+
+        if (plane >= drm_format_num_planes(format))
+                return 0;
+
+        switch (format) {
+        case DRM_FORMAT_YUYV:
+        case DRM_FORMAT_YVYU:
+        case DRM_FORMAT_UYVY:
+        case DRM_FORMAT_VYUY:
+                return 2;
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_NV24:
+        case DRM_FORMAT_NV42:
+                return plane ? 2 : 1;
+        case DRM_FORMAT_YUV410:
+        case DRM_FORMAT_YVU410:
+        case DRM_FORMAT_YUV411:
+        case DRM_FORMAT_YVU411:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+        case DRM_FORMAT_YUV422:
+        case DRM_FORMAT_YVU422:
+        case DRM_FORMAT_YUV444:
+        case DRM_FORMAT_YVU444:
+                return 1;
+        default:
+                drm_fb_get_bpp_depth(format, &depth, &bpp);
+                return bpp >> 3;
+        }
+}
+EXPORT_SYMBOL(drm_format_plane_cpp);
+
+/**
+ * drm_format_horz_chroma_subsampling - get the horizontal chroma subsampling factor
+ * @format: pixel format (DRM_FORMAT_*)
+ *
+ * Returns:
+ * The horizontal chroma subsampling factor for the
+ * specified pixel format.
+ */
+int drm_format_horz_chroma_subsampling(uint32_t format)
+{
+        switch (format) {
+        case DRM_FORMAT_YUV411:
+        case DRM_FORMAT_YVU411:
+        case DRM_FORMAT_YUV410:
+        case DRM_FORMAT_YVU410:
+                return 4;
+        case DRM_FORMAT_YUYV:
+        case DRM_FORMAT_YVYU:
+        case DRM_FORMAT_UYVY:
+        case DRM_FORMAT_VYUY:
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+        case DRM_FORMAT_NV16:
+        case DRM_FORMAT_NV61:
+        case DRM_FORMAT_YUV422:
+        case DRM_FORMAT_YVU422:
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+                return 2;
+        default:
+                return 1;
+        }
+}
+EXPORT_SYMBOL(drm_format_horz_chroma_subsampling);
+
+/**
+ * drm_format_vert_chroma_subsampling - get the vertical chroma subsampling factor
+ * @format: pixel format (DRM_FORMAT_*)
+ *
+ * Returns:
+ * The vertical chroma subsampling factor for the
+ * specified pixel format.
+ */
+int drm_format_vert_chroma_subsampling(uint32_t format)
+{
+        switch (format) {
+        case DRM_FORMAT_YUV410:
+        case DRM_FORMAT_YVU410:
+                return 4;
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV21:
+                return 2;
+        default:
+                return 1;
+        }
+}
+EXPORT_SYMBOL(drm_format_vert_chroma_subsampling);
+
+/**
+ * drm_format_plane_width - width of the plane given the first plane
+ * @width: width of the first plane
+ * @format: pixel format
+ * @plane: plane index
+ *
+ * Returns:
+ * The width of @plane, given that the width of the first plane is @width.
+ */
+int drm_format_plane_width(int width, uint32_t format, int plane)
+{
+        if (plane >= drm_format_num_planes(format))
+                return 0;
+
+        if (plane == 0)
+                return width;
+
+        return width / drm_format_horz_chroma_subsampling(format);
+}
+EXPORT_SYMBOL(drm_format_plane_width);
+
+/**
+ * drm_format_plane_height - height of the plane given the first plane
+ * @height: height of the first plane
+ * @format: pixel format
+ * @plane: plane index
+ *
+ * Returns:
+ * The height of @plane, given that the height of the first plane is @height.
+ */
+int drm_format_plane_height(int height, uint32_t format, int plane)
+{
+        if (plane >= drm_format_num_planes(format))
+                return 0;
+
+        if (plane == 0)
+                return height;
+
+        return height / drm_format_vert_chroma_subsampling(format);
+}
+EXPORT_SYMBOL(drm_format_plane_height);
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 32156060b9c9..5c19dde1cd31 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -787,7 +787,7 @@ EXPORT_SYMBOL(drm_gem_object_release);
  * @kref: kref of the object to free
  *
  * Called after the last reference to the object has been lost.
- * Must be called holding struct_ mutex
+ * Must be called holding &drm_device->struct_mutex.
  *
  * Frees the object
  */
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index e1ab008b3f08..1d6c335584ec 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
         return cma_obj;
 
 error:
-        drm->driver->gem_free_object(&cma_obj->base);
+        drm_gem_object_unreference_unlocked(&cma_obj->base);
         return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(drm_gem_cma_create);
@@ -162,18 +162,12 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv,
          * and handle has the id what user can see.
          */
         ret = drm_gem_handle_create(file_priv, gem_obj, handle);
-        if (ret)
-                goto err_handle_create;
-
         /* drop reference from allocate - handle holds it now. */
         drm_gem_object_unreference_unlocked(gem_obj);
+        if (ret)
+                return ERR_PTR(ret);
 
         return cma_obj;
-
-err_handle_create:
-        drm->driver->gem_free_object(gem_obj);
-
-        return ERR_PTR(ret);
 }
 
 /**
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index 5d469b2f26f4..9ae353f4dd06 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -50,106 +50,24 @@ int drm_name_info(struct seq_file *m, void *data)
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_minor *minor = node->minor;
         struct drm_device *dev = minor->dev;
-        struct drm_master *master = minor->master;
-        if (!master)
-                return 0;
-
-        if (master->unique) {
-                seq_printf(m, "%s %s %s\n",
-                           dev->driver->name,
-                           dev_name(dev->dev), master->unique);
-        } else {
-                seq_printf(m, "%s %s\n",
-                           dev->driver->name, dev_name(dev->dev));
-        }
-        return 0;
-}
-
-/**
- * Called when "/proc/dri/.../vm" is read.
- *
- * Prints information about all mappings in drm_device::maplist.
- */
-int drm_vm_info(struct seq_file *m, void *data)
-{
-        struct drm_info_node *node = (struct drm_info_node *) m->private;
-        struct drm_device *dev = node->minor->dev;
-        struct drm_local_map *map;
-        struct drm_map_list *r_list;
-
-        /* Hardcoded from _DRM_FRAME_BUFFER,
-           _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
-           _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
-        const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
-        const char *type;
-        int i;
-
-        mutex_lock(&dev->struct_mutex);
-        seq_printf(m, "slot      offset       size type flags    address mtrr\n\n");
-        i = 0;
-        list_for_each_entry(r_list, &dev->maplist, head) {
-                map = r_list->map;
-                if (!map)
-                        continue;
-                if (map->type < 0 || map->type > 5)
-                        type = "??";
-                else
-                        type = types[map->type];
-
-                seq_printf(m, "%4d 0x%016llx 0x%08lx %4.4s  0x%02x 0x%08lx ",
-                           i,
-                           (unsigned long long)map->offset,
-                           map->size, type, map->flags,
-                           (unsigned long) r_list->user_token);
-                if (map->mtrr < 0)
-                        seq_printf(m, "none\n");
-                else
-                        seq_printf(m, "%4d\n", map->mtrr);
-                i++;
-        }
-        mutex_unlock(&dev->struct_mutex);
-        return 0;
-}
+        struct drm_master *master;
 
-/**
- * Called when "/proc/dri/.../bufs" is read.
- */
-int drm_bufs_info(struct seq_file *m, void *data)
-{
-        struct drm_info_node *node = (struct drm_info_node *) m->private;
-        struct drm_device *dev = node->minor->dev;
-        struct drm_device_dma *dma;
-        int i, seg_pages;
-
-        mutex_lock(&dev->struct_mutex);
-        dma = dev->dma;
-        if (!dma) {
-                mutex_unlock(&dev->struct_mutex);
-                return 0;
-        }
-
-        seq_printf(m, " o     size count  free   segs pages    kB\n\n");
-        for (i = 0; i <= DRM_MAX_ORDER; i++) {
-                if (dma->bufs[i].buf_count) {
-                        seg_pages = dma->bufs[i].seg_count * (1 << dma->bufs[i].page_order);
-                        seq_printf(m, "%2d %8d %5d %5d %5d %5d %5ld\n",
-                                   i,
-                                   dma->bufs[i].buf_size,
-                                   dma->bufs[i].buf_count,
-                                   0,
-                                   dma->bufs[i].seg_count,
-                                   seg_pages,
-                                   seg_pages * PAGE_SIZE / 1024);
-                }
-        }
-        seq_printf(m, "\n");
-        for (i = 0; i < dma->buf_count; i++) {
-                if (i && !(i % 32))
-                        seq_printf(m, "\n");
-                seq_printf(m, " %d", dma->buflist[i]->list);
-        }
+        mutex_lock(&dev->master_mutex);
+        master = dev->master;
+        if (!master)
+                goto out_unlock;
+
+        seq_printf(m, "%s", dev->driver->name);
+        if (dev->dev)
+                seq_printf(m, " dev=%s", dev_name(dev->dev));
+        if (master && master->unique)
+                seq_printf(m, " master=%s", master->unique);
+        if (dev->unique)
+                seq_printf(m, " unique=%s", dev->unique);
         seq_printf(m, "\n");
-        mutex_unlock(&dev->struct_mutex);
+out_unlock:
+        mutex_unlock(&dev->master_mutex);
+
         return 0;
 }
 
@@ -184,7 +102,7 @@ int drm_clients_info(struct seq_file *m, void *data)
                            task ? task->comm : "<unknown>",
                            pid_vnr(priv->pid),
                            priv->minor->index,
-                           priv->is_master ? 'y' : 'n',
+                           drm_is_current_master(priv) ? 'y' : 'n',
                            priv->authenticated ? 'y' : 'n',
                            from_kuid_munged(seq_user_ns(m), priv->uid),
                            priv->magic);
@@ -194,7 +112,6 @@ int drm_clients_info(struct seq_file *m, void *data)
         return 0;
 }
 
-
 static int drm_gem_one_name_info(int id, void *ptr, void *data)
 {
         struct drm_gem_object *obj = ptr;
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index 902cf6a15212..b86dc9b921a5 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -29,15 +29,9 @@ extern struct mutex drm_global_mutex;
 void drm_lastclose(struct drm_device *dev);
 
 /* drm_pci.c */
-int drm_pci_set_unique(struct drm_device *dev,
-                       struct drm_master *master,
-                       struct drm_unique *u);
 int drm_irq_by_busid(struct drm_device *dev, void *data,
                      struct drm_file *file_priv);
 
-/* drm_vm.c */
-int drm_vma_info(struct seq_file *m, void *data);
-
 /* drm_prime.c */
 int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
                                  struct drm_file *file_priv);
@@ -51,8 +45,6 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr
 
 /* drm_info.c */
 int drm_name_info(struct seq_file *m, void *data);
-int drm_vm_info(struct seq_file *m, void *data);
-int drm_bufs_info(struct seq_file *m, void *data);
 int drm_clients_info(struct seq_file *m, void* data);
 int drm_gem_name_info(struct seq_file *m, void *data);
 
@@ -67,6 +59,12 @@ int drm_getmagic(struct drm_device *dev, void *data,
                  struct drm_file *file_priv);
 int drm_authmagic(struct drm_device *dev, void *data,
                   struct drm_file *file_priv);
+int drm_setmaster_ioctl(struct drm_device *dev, void *data,
+                        struct drm_file *file_priv);
+int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv);
+int drm_master_open(struct drm_file *file_priv);
+void drm_master_release(struct drm_file *file_priv);
 
 /* drm_sysfs.c */
 extern struct class *drm_class;
@@ -92,13 +90,6 @@ int drm_gem_open_ioctl(struct drm_device *dev, void *data,
 void drm_gem_open(struct drm_device *dev, struct drm_file *file_private);
 void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
 
-/* drm_drv.c */
-int drm_setmaster_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-struct drm_master *drm_master_create(struct drm_minor *minor);
-
 /* drm_debugfs.c */
 #if defined(CONFIG_DEBUG_FS)
 int drm_debugfs_init(struct drm_minor *minor, int minor_id,
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index b7a39771c152..1f84ff5f1bf8 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -30,6 +30,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm_core.h>
+#include <drm/drm_auth.h>
 #include "drm_legacy.h"
 #include "drm_internal.h"
 #include "drm_crtc_internal.h"
@@ -37,6 +38,64 @@
 #include <linux/pci.h>
 #include <linux/export.h>
 
+/**
+ * DOC: getunique and setversion story
+ *
+ * BEWARE THE DRAGONS! MIND THE TRAPDOORS!
+ *
+ * In an attempt to warn anyone else who's trying to figure out what's going
+ * on here, I'll try to summarize the story. First things first, let's clear up
+ * the names, because the kernel internals, libdrm and the ioctls are all named
+ * differently:
+ *
+ *  - GET_UNIQUE ioctl, implemented by drm_getunique is wrapped up in libdrm
+ *    through the drmGetBusid function.
+ *  - The libdrm drmSetBusid function is backed by the SET_UNIQUE ioctl. All
+ *    that code is nerved in the kernel with drm_invalid_op().
+ *  - The internal set_busid kernel functions and driver callbacks are
+ *    exclusively use by the SET_VERSION ioctl, because only drm 1.0 (which is
+ *    nerved) allowed userspace to set the busid through the above ioctl.
+ *  - Other ioctls and functions involved are named consistently.
+ *
+ * For anyone wondering what's the difference between drm 1.1 and 1.4: Correctly
+ * handling pci domains in the busid on ppc. Doing this correctly was only
+ * implemented in libdrm in 2010, hence can't be nerved yet. No one knows what's
+ * special with drm 1.2 and 1.3.
+ *
+ * Now the actual horror story of how device lookup in drm works. At large,
+ * there's 2 different ways, either by busid, or by device driver name.
+ *
+ * Opening by busid is fairly simple:
+ *
+ * 1. First call SET_VERSION to make sure pci domains are handled properly. As a
+ *    side-effect this fills out the unique name in the master structure.
+ * 2. Call GET_UNIQUE to read out the unique name from the master structure,
+ *    which matches the busid thanks to step 1. If it doesn't, proceed to try
+ *    the next device node.
+ *
+ * Opening by name is slightly different:
+ *
+ * 1. Directly call VERSION to get the version and to match against the driver
+ *    name returned by that ioctl. Note that SET_VERSION is not called, which
+ *    means the the unique name for the master node just opening is _not_ filled
+ *    out. This despite that with current drm device nodes are always bound to
+ *    one device, and can't be runtime assigned like with drm 1.0.
+ * 2. Match driver name. If it mismatches, proceed to the next device node.
+ * 3. Call GET_UNIQUE, and check whether the unique name has length zero (by
+ *    checking that the first byte in the string is 0). If that's not the case
+ *    libdrm skips and proceeds to the next device node. Probably this is just
+ *    copypasta from drm 1.0 times where a set unique name meant that the driver
+ *    was in use already, but that's just conjecture.
+ *
+ * Long story short: To keep the open by name logic working, GET_UNIQUE must
+ * _not_ return a unique string when SET_VERSION hasn't been called yet,
+ * otherwise libdrm breaks. Even when that unique string can't ever change, and
+ * is totally irrelevant for actually opening the device because runtime
+ * assignable device instances were only support in drm 1.0, which is long dead.
+ * But the libdrm code in drmOpenByName somehow survived, hence this can't be
+ * broken.
+ */
+
 static int drm_version(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 
@@ -75,51 +134,6 @@ drm_unset_busid(struct drm_device *dev,
         master->unique_len = 0;
 }
 
-/*
- * Set the bus id.
- *
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg user argument, pointing to a drm_unique structure.
- * \return zero on success or a negative number on failure.
- *
- * Copies the bus id from userspace into drm_device::unique, and verifies that
- * it matches the device this DRM is attached to (EINVAL otherwise).  Deprecated
- * in interface version 1.1 and will return EBUSY when setversion has requested
- * version 1.1 or greater. Also note that KMS is all version 1.1 and later and
- * UMS was only ever supported on pci devices.
- */
-static int drm_setunique(struct drm_device *dev, void *data,
-                  struct drm_file *file_priv)
-{
-        struct drm_unique *u = data;
-        struct drm_master *master = file_priv->master;
-        int ret;
-
-        if (master->unique_len || master->unique)
-                return -EBUSY;
-
-        if (!u->unique_len || u->unique_len > 1024)
-                return -EINVAL;
-
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
-                return 0;
-
-        if (WARN_ON(!dev->pdev))
-                return -EINVAL;
-
-        ret = drm_pci_set_unique(dev, master, u);
-        if (ret)
-                goto err;
-
-        return 0;
-
-err:
-        drm_unset_busid(dev, master);
-        return ret;
-}
-
 static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
 {
         struct drm_master *master = file_priv->master;
@@ -135,12 +149,7 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
                         return ret;
                 }
         } else {
-                if (WARN(dev->unique == NULL,
-                         "No drm_driver.set_busid() implementation provided by "
-                         "%ps. Use drm_dev_set_unique() to set the unique "
-                         "name explicitly.", dev->driver))
-                        return -EINVAL;
-
+                WARN_ON(!dev->unique);
                 master->unique = kstrdup(dev->unique, GFP_KERNEL);
                 if (master->unique)
                         master->unique_len = strlen(dev->unique);
@@ -473,7 +482,8 @@ int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
                 return -EACCES;
 
         /* MASTER is only for master or control clients */
-        if (unlikely((flags & DRM_MASTER) && !file_priv->is_master &&
+        if (unlikely((flags & DRM_MASTER) && 
+                     !drm_is_current_master(file_priv) &&
                      !drm_is_control_client(file_priv)))
                 return -EACCES;
 
@@ -504,7 +514,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version,
                       DRM_UNLOCKED|DRM_RENDER_ALLOW|DRM_CONTROL_ALLOW),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
-        DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
+        DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_legacy_getmap_ioctl, DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED),
@@ -513,10 +523,10 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_SET_CLIENT_CAP, drm_setclientcap, 0),
         DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
 
-        DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
-        DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER),
+        DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_UNLOCKED|DRM_MASTER),
 
         DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_legacy_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_legacy_rmmap_ioctl, DRM_AUTH),
@@ -524,8 +534,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_legacy_setsareactx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_legacy_getsareactx, DRM_AUTH),
 
-        DRM_IOCTL_DEF(DRM_IOCTL_SET_MASTER, drm_setmaster_ioctl, DRM_ROOT_ONLY),
-        DRM_IOCTL_DEF(DRM_IOCTL_DROP_MASTER, drm_dropmaster_ioctl, DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_IOCTL_SET_MASTER, drm_setmaster_ioctl, DRM_UNLOCKED|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_IOCTL_DROP_MASTER, drm_dropmaster_ioctl, DRM_UNLOCKED|DRM_ROOT_ONLY),
 
         DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_legacy_addctx, DRM_AUTH|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_legacy_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 0fac801c18fe..8ca3d2bf2bda 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -42,10 +42,6 @@
 #include <linux/vgaarb.h>
 #include <linux/export.h>
 
-/* Access macro for slots in vblank timestamp ringbuffer. */
-#define vblanktimestamp(dev, pipe, count) \
-        ((dev)->vblank[pipe].time[(count) % DRM_VBLANKTIME_RBSIZE])
-
 /* Retry timestamp calculation up to 3 times to satisfy
  * drm_timestamp_precision before giving up.
  */
@@ -82,36 +78,18 @@ static void store_vblank(struct drm_device *dev, unsigned int pipe,
                          struct timeval *t_vblank, u32 last)
 {
         struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-        u32 tslot;
 
         assert_spin_locked(&dev->vblank_time_lock);
 
         vblank->last = last;
 
-        /* All writers hold the spinlock, but readers are serialized by
-         * the latching of vblank->count below.
-         */
-        tslot = vblank->count + vblank_count_inc;
-        vblanktimestamp(dev, pipe, tslot) = *t_vblank;
-
-        /*
-         * vblank timestamp updates are protected on the write side with
-         * vblank_time_lock, but on the read side done locklessly using a
-         * sequence-lock on the vblank counter. Ensure correct ordering using
-         * memory barrriers. We need the barrier both before and also after the
-         * counter update to synchronize with the next timestamp write.
-         * The read-side barriers for this are in drm_vblank_count_and_time.
-         */
-        smp_wmb();
+        write_seqlock(&vblank->seqlock);
+        vblank->time = *t_vblank;
         vblank->count += vblank_count_inc;
-        smp_wmb();
+        write_sequnlock(&vblank->seqlock);
 }
 
-/**
- * drm_reset_vblank_timestamp - reset the last timestamp to the last vblank
- * @dev: DRM device
- * @pipe: index of CRTC for which to reset the timestamp
- *
+/*
  * Reset the stored timestamp for the current vblank count to correspond
  * to the last vblank occurred.
  *
@@ -155,11 +133,7 @@ static void drm_reset_vblank_timestamp(struct drm_device *dev, unsigned int pipe
         spin_unlock(&dev->vblank_time_lock);
 }
 
-/**
- * drm_update_vblank_count - update the master vblank counter
- * @dev: DRM device
- * @pipe: counter to update
- *
+/*
  * Call back into the driver to update the appropriate vblank counter
  * (specified by @pipe).  Deal with wraparound, if it occurred, and
  * update the last read value so we can deal with wraparound on the next
@@ -205,7 +179,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
                 const struct timeval *t_old;
                 u64 diff_ns;
 
-                t_old = &vblanktimestamp(dev, pipe, vblank->count);
+                t_old = &vblank->time;
                 diff_ns = timeval_to_ns(&t_vblank) - timeval_to_ns(t_old);
 
                 /*
@@ -239,49 +213,6 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
                 diff = 1;
         }
 
-        /*
-         * FIMXE: Need to replace this hack with proper seqlocks.
-         *
-         * Restrict the bump of the software vblank counter to a safe maximum
-         * value of +1 whenever there is the possibility that concurrent readers
-         * of vblank timestamps could be active at the moment, as the current
-         * implementation of the timestamp caching and updating is not safe
-         * against concurrent readers for calls to store_vblank() with a bump
-         * of anything but +1. A bump != 1 would very likely return corrupted
-         * timestamps to userspace, because the same slot in the cache could
-         * be concurrently written by store_vblank() and read by one of those
-         * readers without the read-retry logic detecting the collision.
-         *
-         * Concurrent readers can exist when we are called from the
-         * drm_vblank_off() or drm_vblank_on() functions and other non-vblank-
-         * irq callers. However, all those calls to us are happening with the
-         * vbl_lock locked to prevent drm_vblank_get(), so the vblank refcount
-         * can't increase while we are executing. Therefore a zero refcount at
-         * this point is safe for arbitrary counter bumps if we are called
-         * outside vblank irq, a non-zero count is not 100% safe. Unfortunately
-         * we must also accept a refcount of 1, as whenever we are called from
-         * drm_vblank_get() -> drm_vblank_enable() the refcount will be 1 and
-         * we must let that one pass through in order to not lose vblank counts
-         * during vblank irq off - which would completely defeat the whole
-         * point of this routine.
-         *
-         * Whenever we are called from vblank irq, we have to assume concurrent
-         * readers exist or can show up any time during our execution, even if
-         * the refcount is currently zero, as vblank irqs are usually only
-         * enabled due to the presence of readers, and because when we are called
-         * from vblank irq we can't hold the vbl_lock to protect us from sudden
-         * bumps in vblank refcount. Therefore also restrict bumps to +1 when
-         * called from vblank irq.
-         */
-        if ((diff > 1) && (atomic_read(&vblank->refcount) > 1 ||
-            (flags & DRM_CALLED_FROM_VBLIRQ))) {
-                DRM_DEBUG_VBL("clamping vblank bump to 1 on crtc %u: diffr=%u "
-                              "refcount %u, vblirq %u\n", pipe, diff,
-                              atomic_read(&vblank->refcount),
-                              (flags & DRM_CALLED_FROM_VBLIRQ) != 0);
-                diff = 1;
-        }
-
         DRM_DEBUG_VBL("updating vblank count on crtc %u:"
                       " current=%u, diff=%u, hw=%u hw_last=%u\n",
                       pipe, vblank->count, diff, cur_vblank, vblank->last);
@@ -303,6 +234,37 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
         store_vblank(dev, pipe, diff, &t_vblank, cur_vblank);
 }
 
+/**
+ * drm_accurate_vblank_count - retrieve the master vblank counter
+ * @crtc: which counter to retrieve
+ *
+ * This function is similar to @drm_crtc_vblank_count but this
+ * function interpolates to handle a race with vblank irq's.
+ *
+ * This is mostly useful for hardware that can obtain the scanout
+ * position, but doesn't have a frame counter.
+ */
+u32 drm_accurate_vblank_count(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        unsigned int pipe = drm_crtc_index(crtc);
+        u32 vblank;
+        unsigned long flags;
+
+        WARN(!dev->driver->get_vblank_timestamp,
+             "This function requires support for accurate vblank timestamps.");
+
+        spin_lock_irqsave(&dev->vblank_time_lock, flags);
+
+        drm_update_vblank_count(dev, pipe, 0);
+        vblank = drm_vblank_count(dev, pipe);
+
+        spin_unlock_irqrestore(&dev->vblank_time_lock, flags);
+
+        return vblank;
+}
+EXPORT_SYMBOL(drm_accurate_vblank_count);
+
 /*
  * Disable vblank irq's on crtc, make sure that last vblank count
  * of hardware and corresponding consistent software vblank counter
@@ -417,6 +379,7 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
                 init_waitqueue_head(&vblank->queue);
                 setup_timer(&vblank->disable_timer, vblank_disable_fn,
                             (unsigned long)vblank);
+                seqlock_init(&vblank->seqlock);
         }
 
         DRM_INFO("Supports vblank timestamp caching Rev 2 (21.10.2013).\n");
@@ -986,25 +949,19 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
                               struct timeval *vblanktime)
 {
         struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-        int count = DRM_TIMESTAMP_MAXRETRIES;
-        u32 cur_vblank;
+        u32 vblank_count;
+        unsigned int seq;
 
         if (WARN_ON(pipe >= dev->num_crtcs))
                 return 0;
 
-        /*
-         * Vblank timestamps are read lockless. To ensure consistency the vblank
-         * counter is rechecked and ordering is ensured using memory barriers.
-         * This works like a seqlock. The write-side barriers are in store_vblank.
-         */
         do {
-                cur_vblank = vblank->count;
-                smp_rmb();
-                *vblanktime = vblanktimestamp(dev, pipe, cur_vblank);
-                smp_rmb();
-        } while (cur_vblank != vblank->count && --count > 0);
+                seq = read_seqbegin(&vblank->seqlock);
+                vblank_count = vblank->count;
+                *vblanktime = vblank->time;
+        } while (read_seqretry(&vblank->seqlock, seq));
 
-        return cur_vblank;
+        return vblank_count;
 }
 EXPORT_SYMBOL(drm_vblank_count_and_time);
 
@@ -1037,39 +994,11 @@ static void send_vblank_event(struct drm_device *dev,
         e->event.tv_sec = now->tv_sec;
         e->event.tv_usec = now->tv_usec;
 
-        drm_send_event_locked(dev, &e->base);
-
         trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
                                          e->event.sequence);
-}
 
-/**
- * drm_arm_vblank_event - arm vblank event after pageflip
- * @dev: DRM device
- * @pipe: CRTC index
- * @e: the event to prepare to send
- *
- * A lot of drivers need to generate vblank events for the very next vblank
- * interrupt. For example when the page flip interrupt happens when the page
- * flip gets armed, but not when it actually executes within the next vblank
- * period. This helper function implements exactly the required vblank arming
- * behaviour.
- *
- * Caller must hold event lock. Caller must also hold a vblank reference for
- * the event @e, which will be dropped when the next vblank arrives.
- *
- * This is the legacy version of drm_crtc_arm_vblank_event().
- */
-void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe,
-                          struct drm_pending_vblank_event *e)
-{
-        assert_spin_locked(&dev->event_lock);
-
-        e->pipe = pipe;
-        e->event.sequence = drm_vblank_count(dev, pipe);
-        list_add_tail(&e->base.link, &dev->vblank_event_list);
+        drm_send_event_locked(dev, &e->base);
 }
-EXPORT_SYMBOL(drm_arm_vblank_event);
 
 /**
  * drm_crtc_arm_vblank_event - arm vblank event after pageflip
@@ -1084,32 +1013,35 @@ EXPORT_SYMBOL(drm_arm_vblank_event);
  *
  * Caller must hold event lock. Caller must also hold a vblank reference for
  * the event @e, which will be dropped when the next vblank arrives.
- *
- * This is the native KMS version of drm_arm_vblank_event().
  */
 void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
                                struct drm_pending_vblank_event *e)
 {
-        drm_arm_vblank_event(crtc->dev, drm_crtc_index(crtc), e);
+        struct drm_device *dev = crtc->dev;
+        unsigned int pipe = drm_crtc_index(crtc);
+
+        assert_spin_locked(&dev->event_lock);
+
+        e->pipe = pipe;
+        e->event.sequence = drm_vblank_count(dev, pipe);
+        list_add_tail(&e->base.link, &dev->vblank_event_list);
 }
 EXPORT_SYMBOL(drm_crtc_arm_vblank_event);
 
 /**
- * drm_send_vblank_event - helper to send vblank event after pageflip
- * @dev: DRM device
- * @pipe: CRTC index
+ * drm_crtc_send_vblank_event - helper to send vblank event after pageflip
+ * @crtc: the source CRTC of the vblank event
  * @e: the event to send
  *
  * Updates sequence # and timestamp on event, and sends it to userspace.
  * Caller must hold event lock.
- *
- * This is the legacy version of drm_crtc_send_vblank_event().
  */
-void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
-                           struct drm_pending_vblank_event *e)
+void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
+                                struct drm_pending_vblank_event *e)
 {
+        struct drm_device *dev = crtc->dev;
+        unsigned int seq, pipe = drm_crtc_index(crtc);
         struct timeval now;
-        unsigned int seq;
 
         if (dev->num_crtcs > 0) {
                 seq = drm_vblank_count_and_time(dev, pipe, &now);
@@ -1121,23 +1053,6 @@ void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
         e->pipe = pipe;
         send_vblank_event(dev, e, seq, &now);
 }
-EXPORT_SYMBOL(drm_send_vblank_event);
-
-/**
- * drm_crtc_send_vblank_event - helper to send vblank event after pageflip
- * @crtc: the source CRTC of the vblank event
- * @e: the event to send
- *
- * Updates sequence # and timestamp on event, and sends it to userspace.
- * Caller must hold event lock.
- *
- * This is the native KMS version of drm_send_vblank_event().
- */
-void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
-                                struct drm_pending_vblank_event *e)
-{
-        drm_send_vblank_event(crtc->dev, drm_crtc_index(crtc), e);
-}
 EXPORT_SYMBOL(drm_crtc_send_vblank_event);
 
 /**
@@ -1193,7 +1108,7 @@ static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
  * Returns:
  * Zero on success or a negative error code on failure.
  */
-int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
+static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
 {
         struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
         unsigned long irqflags;
@@ -1219,7 +1134,6 @@ int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
 
         return ret;
 }
-EXPORT_SYMBOL(drm_vblank_get);
 
 /**
  * drm_crtc_vblank_get - get a reference count on vblank events
@@ -1228,8 +1142,6 @@ EXPORT_SYMBOL(drm_vblank_get);
  * Acquire a reference count on vblank events to avoid having them disabled
  * while in use.
  *
- * This is the native kms version of drm_vblank_get().
- *
  * Returns:
  * Zero on success or a negative error code on failure.
  */
@@ -1249,7 +1161,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_get);
  *
  * This is the legacy version of drm_crtc_vblank_put().
  */
-void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
+static void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
 {
         struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 
@@ -1270,7 +1182,6 @@ void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
                                   jiffies + ((drm_vblank_offdelay * HZ)/1000));
         }
 }
-EXPORT_SYMBOL(drm_vblank_put);
 
 /**
  * drm_crtc_vblank_put - give up ownership of vblank events
@@ -1278,8 +1189,6 @@ EXPORT_SYMBOL(drm_vblank_put);
  *
  * Release ownership of a given vblank counter, turning off interrupts
  * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
- *
- * This is the native kms version of drm_vblank_put().
  */
 void drm_crtc_vblank_put(struct drm_crtc *crtc)
 {
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
index d3b6ee357a2b..c6f422e879dd 100644
--- a/drivers/gpu/drm/drm_legacy.h
+++ b/drivers/gpu/drm/drm_legacy.h
@@ -88,14 +88,10 @@ struct drm_agp_mem {
         struct list_head head;
 };
 
-/*
- * Generic Userspace Locking-API
- */
-
-int drm_legacy_i_have_hw_lock(struct drm_device *d, struct drm_file *f);
+/* drm_lock.c */
 int drm_legacy_lock(struct drm_device *d, void *v, struct drm_file *f);
 int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f);
-int drm_legacy_lock_free(struct drm_lock_data *lock, unsigned int ctx);
+void drm_legacy_lock_release(struct drm_device *dev, struct file *filp);
 
 /* DMA support */
 int drm_legacy_dma_setup(struct drm_device *dev);
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index daa2ff12101b..48ac0ebbd663 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -41,6 +41,110 @@
 static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
 
 /**
+ * Take the heavyweight lock.
+ *
+ * \param lock lock pointer.
+ * \param context locking context.
+ * \return one if the lock is held, or zero otherwise.
+ *
+ * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction.
+ */
+static
+int drm_lock_take(struct drm_lock_data *lock_data,
+                  unsigned int context)
+{
+        unsigned int old, new, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
+
+        spin_lock_bh(&lock_data->spinlock);
+        do {
+                old = *lock;
+                if (old & _DRM_LOCK_HELD)
+                        new = old | _DRM_LOCK_CONT;
+                else {
+                        new = context | _DRM_LOCK_HELD |
+                                ((lock_data->user_waiters + lock_data->kernel_waiters > 1) ?
+                                 _DRM_LOCK_CONT : 0);
+                }
+                prev = cmpxchg(lock, old, new);
+        } while (prev != old);
+        spin_unlock_bh(&lock_data->spinlock);
+
+        if (_DRM_LOCKING_CONTEXT(old) == context) {
+                if (old & _DRM_LOCK_HELD) {
+                        if (context != DRM_KERNEL_CONTEXT) {
+                                DRM_ERROR("%d holds heavyweight lock\n",
+                                          context);
+                        }
+                        return 0;
+                }
+        }
+
+        if ((_DRM_LOCKING_CONTEXT(new)) == context && (new & _DRM_LOCK_HELD)) {
+                /* Have lock */
+                return 1;
+        }
+        return 0;
+}
+
+/**
+ * This takes a lock forcibly and hands it to context.  Should ONLY be used
+ * inside *_unlock to give lock to kernel before calling *_dma_schedule.
+ *
+ * \param dev DRM device.
+ * \param lock lock pointer.
+ * \param context locking context.
+ * \return always one.
+ *
+ * Resets the lock file pointer.
+ * Marks the lock as held by the given context, via the \p cmpxchg instruction.
+ */
+static int drm_lock_transfer(struct drm_lock_data *lock_data,
+                             unsigned int context)
+{
+        unsigned int old, new, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
+
+        lock_data->file_priv = NULL;
+        do {
+                old = *lock;
+                new = context | _DRM_LOCK_HELD;
+                prev = cmpxchg(lock, old, new);
+        } while (prev != old);
+        return 1;
+}
+
+static int drm_legacy_lock_free(struct drm_lock_data *lock_data,
+                                unsigned int context)
+{
+        unsigned int old, new, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
+
+        spin_lock_bh(&lock_data->spinlock);
+        if (lock_data->kernel_waiters != 0) {
+                drm_lock_transfer(lock_data, 0);
+                lock_data->idle_has_lock = 1;
+                spin_unlock_bh(&lock_data->spinlock);
+                return 1;
+        }
+        spin_unlock_bh(&lock_data->spinlock);
+
+        do {
+                old = *lock;
+                new = _DRM_LOCKING_CONTEXT(old);
+                prev = cmpxchg(lock, old, new);
+        } while (prev != old);
+
+        if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
+                DRM_ERROR("%d freed heavyweight lock held by %d\n",
+                          context, _DRM_LOCKING_CONTEXT(old));
+                return 1;
+        }
+        wake_up_interruptible(&lock_data->lock_queue);
+        return 0;
+}
+
+/**
  * Lock ioctl.
  *
  * \param inode device inode.
@@ -115,7 +219,7 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
         /* don't set the block all signals on the master process for now 
          * really probably not the correct answer but lets us debug xkb
          * xserver for now */
-        if (!file_priv->is_master) {
+        if (!drm_is_current_master(file_priv)) {
                 dev->sigdata.context = lock->context;
                 dev->sigdata.lock = master->lock.hw_lock;
         }
@@ -165,120 +269,6 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
 }
 
 /**
- * Take the heavyweight lock.
- *
- * \param lock lock pointer.
- * \param context locking context.
- * \return one if the lock is held, or zero otherwise.
- *
- * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction.
- */
-static
-int drm_lock_take(struct drm_lock_data *lock_data,
-                  unsigned int context)
-{
-        unsigned int old, new, prev;
-        volatile unsigned int *lock = &lock_data->hw_lock->lock;
-
-        spin_lock_bh(&lock_data->spinlock);
-        do {
-                old = *lock;
-                if (old & _DRM_LOCK_HELD)
-                        new = old | _DRM_LOCK_CONT;
-                else {
-                        new = context | _DRM_LOCK_HELD |
-                                ((lock_data->user_waiters + lock_data->kernel_waiters > 1) ?
-                                 _DRM_LOCK_CONT : 0);
-                }
-                prev = cmpxchg(lock, old, new);
-        } while (prev != old);
-        spin_unlock_bh(&lock_data->spinlock);
-
-        if (_DRM_LOCKING_CONTEXT(old) == context) {
-                if (old & _DRM_LOCK_HELD) {
-                        if (context != DRM_KERNEL_CONTEXT) {
-                                DRM_ERROR("%d holds heavyweight lock\n",
-                                          context);
-                        }
-                        return 0;
-                }
-        }
-
-        if ((_DRM_LOCKING_CONTEXT(new)) == context && (new & _DRM_LOCK_HELD)) {
-                /* Have lock */
-                return 1;
-        }
-        return 0;
-}
-
-/**
- * This takes a lock forcibly and hands it to context.  Should ONLY be used
- * inside *_unlock to give lock to kernel before calling *_dma_schedule.
- *
- * \param dev DRM device.
- * \param lock lock pointer.
- * \param context locking context.
- * \return always one.
- *
- * Resets the lock file pointer.
- * Marks the lock as held by the given context, via the \p cmpxchg instruction.
- */
-static int drm_lock_transfer(struct drm_lock_data *lock_data,
-                             unsigned int context)
-{
-        unsigned int old, new, prev;
-        volatile unsigned int *lock = &lock_data->hw_lock->lock;
-
-        lock_data->file_priv = NULL;
-        do {
-                old = *lock;
-                new = context | _DRM_LOCK_HELD;
-                prev = cmpxchg(lock, old, new);
-        } while (prev != old);
-        return 1;
-}
-
-/**
- * Free lock.
- *
- * \param dev DRM device.
- * \param lock lock.
- * \param context context.
- *
- * Resets the lock file pointer.
- * Marks the lock as not held, via the \p cmpxchg instruction. Wakes any task
- * waiting on the lock queue.
- */
-int drm_legacy_lock_free(struct drm_lock_data *lock_data, unsigned int context)
-{
-        unsigned int old, new, prev;
-        volatile unsigned int *lock = &lock_data->hw_lock->lock;
-
-        spin_lock_bh(&lock_data->spinlock);
-        if (lock_data->kernel_waiters != 0) {
-                drm_lock_transfer(lock_data, 0);
-                lock_data->idle_has_lock = 1;
-                spin_unlock_bh(&lock_data->spinlock);
-                return 1;
-        }
-        spin_unlock_bh(&lock_data->spinlock);
-
-        do {
-                old = *lock;
-                new = _DRM_LOCKING_CONTEXT(old);
-                prev = cmpxchg(lock, old, new);
-        } while (prev != old);
-
-        if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
-                DRM_ERROR("%d freed heavyweight lock held by %d\n",
-                          context, _DRM_LOCKING_CONTEXT(old));
-                return 1;
-        }
-        wake_up_interruptible(&lock_data->lock_queue);
-        return 0;
-}
-
-/**
  * This function returns immediately and takes the hw lock
  * with the kernel context if it is free, otherwise it gets the highest priority when and if
  * it is eventually released.
@@ -330,11 +320,27 @@ void drm_legacy_idlelock_release(struct drm_lock_data *lock_data)
 }
 EXPORT_SYMBOL(drm_legacy_idlelock_release);
 
-int drm_legacy_i_have_hw_lock(struct drm_device *dev,
-                              struct drm_file *file_priv)
+static int drm_legacy_i_have_hw_lock(struct drm_device *dev,
+                                     struct drm_file *file_priv)
 {
         struct drm_master *master = file_priv->master;
         return (file_priv->lock_count && master->lock.hw_lock &&
                 _DRM_LOCK_IS_HELD(master->lock.hw_lock->lock) &&
                 master->lock.file_priv == file_priv);
 }
+
+void drm_legacy_lock_release(struct drm_device *dev, struct file *filp)
+{
+        struct drm_file *file_priv = filp->private_data;
+
+        /* if the master has gone away we can't do anything with the lock */
+        if (!dev->master)
+                return;
+
+        if (drm_legacy_i_have_hw_lock(dev, file_priv)) {
+                DRM_DEBUG("File %p released, freeing lock for context %d\n",
+                          filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
+                drm_legacy_lock_free(&file_priv->master->lock,
+                                     _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
+        }
+}
diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index f5d80839a90c..49311fc61d5d 100644
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -60,6 +60,21 @@ static int mipi_dsi_device_match(struct device *dev, struct device_driver *drv)
         return 0;
 }
 
+static int mipi_dsi_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);
+        int err;
+
+        err = of_device_uevent_modalias(dev, env);
+        if (err != -ENODEV)
+                return err;
+
+        add_uevent_var(env, "MODALIAS=%s%s", MIPI_DSI_MODULE_PREFIX,
+                       dsi->name);
+
+        return 0;
+}
+
 static const struct dev_pm_ops mipi_dsi_device_pm_ops = {
         .runtime_suspend = pm_generic_runtime_suspend,
         .runtime_resume = pm_generic_runtime_resume,
@@ -74,6 +89,7 @@ static const struct dev_pm_ops mipi_dsi_device_pm_ops = {
 static struct bus_type mipi_dsi_bus_type = {
         .name = "mipi-dsi",
         .match = mipi_dsi_device_match,
+        .uevent = mipi_dsi_uevent,
         .pm = &mipi_dsi_device_pm_ops,
 };
 
@@ -983,6 +999,28 @@ int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,
 EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on);
 
 /**
+ * mipi_dsi_set_tear_scanline() - turn on the display module's Tearing Effect
+ * output signal on the TE signal line when display module reaches line N
+ * defined by STS[n:0].
+ * @dsi: DSI peripheral device
+ * @param: STS[10:0]
+ * Return: 0 on success or a negative error code on failure
+ */
+int mipi_dsi_set_tear_scanline(struct mipi_dsi_device *dsi, u16 param)
+{
+        u8 payload[3] = { MIPI_DCS_SET_TEAR_SCANLINE, param >> 8,
+                          param & 0xff };
+        ssize_t err;
+
+        err = mipi_dsi_generic_write(dsi, payload, sizeof(payload));
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+EXPORT_SYMBOL(mipi_dsi_set_tear_scanline);
+
+/**
  * mipi_dsi_dcs_set_pixel_format() - sets the pixel format for the RGB image
  *    data used by the interface
  * @dsi: DSI peripheral device
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 04de6fd88f8c..cb39f45d6a16 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -179,12 +179,14 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
 int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)
 {
         struct drm_mm_node *hole;
-        u64 end = node->start + node->size;
+        u64 end;
         u64 hole_start;
         u64 hole_end;
 
         BUG_ON(node == NULL);
 
+        end = node->start + node->size;
+
         /* Find the relevant hole to add our node to */
         drm_mm_for_each_hole(hole, mm, hole_start, hole_end) {
                 if (hole_start > node->start || hole_end < end)
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 7def3d58da18..fc5040ae5f25 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -544,6 +544,7 @@ EXPORT_SYMBOL(drm_gtf_mode_complex);
  *
  * This function is to create the modeline based on the GTF algorithm.
  * Generalized Timing Formula is derived from:
+ *
  *      GTF Spreadsheet by Andy Morrish (1/5/97)
  *      available at http://www.vesa.org
  *
@@ -552,7 +553,8 @@ EXPORT_SYMBOL(drm_gtf_mode_complex);
  * I also refer to the function of fb_get_mode in the file of
  * drivers/video/fbmon.c
  *
- * Standard GTF parameters:
+ * Standard GTF parameters::
+ *
  *     M = 600
  *     C = 40
  *     K = 128
@@ -1518,6 +1520,8 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
         if (out->status != MODE_OK)
                 goto out;
 
+        drm_mode_set_crtcinfo(out, CRTC_INTERLACE_HALVE_V);
+
         ret = 0;
 
 out:
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index e3a4adf03e7b..61146f5b4f56 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -30,14 +30,14 @@
  *
  * As KMS moves toward more fine grained locking, and atomic ioctl where
  * userspace can indirectly control locking order, it becomes necessary
- * to use ww_mutex and acquire-contexts to avoid deadlocks.  But because
+ * to use &ww_mutex and acquire-contexts to avoid deadlocks.  But because
  * the locking is more distributed around the driver code, we want a bit
  * of extra utility/tracking out of our acquire-ctx.  This is provided
  * by drm_modeset_lock / drm_modeset_acquire_ctx.
  *
- * For basic principles of ww_mutex, see: Documentation/locking/ww-mutex-design.txt
+ * For basic principles of &ww_mutex, see: Documentation/locking/ww-mutex-design.txt
  *
- * The basic usage pattern is to:
+ * The basic usage pattern is to::
  *
  *     drm_modeset_acquire_init(&ctx)
  *     retry:
@@ -51,6 +51,13 @@
  *     ... do stuff ...
  *     drm_modeset_drop_locks(&ctx);
  *     drm_modeset_acquire_fini(&ctx);
+ *
+ *  On top of of these per-object locks using &ww_mutex there's also an overall
+ *  dev->mode_config.lock, for protecting everything else. Mostly this means
+ *  probe state of connectors, and preventing hotplug add/removal of connectors.
+ *
+ *  Finally there's a bunch of dedicated locks to protect drm core internal
+ *  lists and lookup data structures.
  */
 
 /**
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 29d5a548d07a..b2f8f1062d5f 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -144,50 +144,6 @@ int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
 }
 EXPORT_SYMBOL(drm_pci_set_busid);
 
-int drm_pci_set_unique(struct drm_device *dev,
-                       struct drm_master *master,
-                       struct drm_unique *u)
-{
-        int domain, bus, slot, func, ret;
-
-        master->unique_len = u->unique_len;
-        master->unique = kmalloc(master->unique_len + 1, GFP_KERNEL);
-        if (!master->unique) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        if (copy_from_user(master->unique, u->unique, master->unique_len)) {
-                ret = -EFAULT;
-                goto err;
-        }
-
-        master->unique[master->unique_len] = '\0';
-
-        /* Return error if the busid submitted doesn't match the device's actual
-         * busid.
-         */
-        ret = sscanf(master->unique, "PCI:%d:%d:%d", &bus, &slot, &func);
-        if (ret != 3) {
-                ret = -EINVAL;
-                goto err;
-        }
-
-        domain = bus >> 8;
-        bus &= 0xff;
-
-        if ((domain != drm_get_pci_domain(dev)) ||
-            (bus != dev->pdev->bus->number) ||
-            (slot != PCI_SLOT(dev->pdev->devfn)) ||
-            (func != PCI_FUNC(dev->pdev->devfn))) {
-                ret = -EINVAL;
-                goto err;
-        }
-        return 0;
-err:
-        return ret;
-}
-
 static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
 {
         if ((p->busnum >> 8) != drm_get_pci_domain(dev) ||
@@ -444,13 +400,6 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
 {
         return -EINVAL;
 }
-
-int drm_pci_set_unique(struct drm_device *dev,
-                       struct drm_master *master,
-                       struct drm_unique *u)
-{
-        return -EINVAL;
-}
 #endif
 
 EXPORT_SYMBOL(drm_pci_init);
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 369d2898ff9e..16c4a7bd7465 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -115,6 +115,7 @@ static int get_connectors_for_crtc(struct drm_crtc *crtc,
  * @src: source coordinates in 16.16 fixed point
  * @dest: integer destination coordinates
  * @clip: integer clipping coordinates
+ * @rotation: plane rotation
  * @min_scale: minimum @src:@dest scaling factor in 16.16 fixed point
  * @max_scale: maximum @src:@dest scaling factor in 16.16 fixed point
  * @can_position: is it legal to position the plane such that it
@@ -134,16 +135,17 @@ static int get_connectors_for_crtc(struct drm_crtc *crtc,
  * Zero if update appears valid, error code on failure
  */
 int drm_plane_helper_check_update(struct drm_plane *plane,
-                                    struct drm_crtc *crtc,
-                                    struct drm_framebuffer *fb,
-                                    struct drm_rect *src,
-                                    struct drm_rect *dest,
-                                    const struct drm_rect *clip,
-                                    int min_scale,
-                                    int max_scale,
-                                    bool can_position,
-                                    bool can_update_disabled,
-                                    bool *visible)
+                                  struct drm_crtc *crtc,
+                                  struct drm_framebuffer *fb,
+                                  struct drm_rect *src,
+                                  struct drm_rect *dest,
+                                  const struct drm_rect *clip,
+                                  unsigned int rotation,
+                                  int min_scale,
+                                  int max_scale,
+                                  bool can_position,
+                                  bool can_update_disabled,
+                                  bool *visible)
 {
         int hscale, vscale;
 
@@ -163,6 +165,8 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
                 return -EINVAL;
         }
 
+        drm_rect_rotate(src, fb->width << 16, fb->height << 16, rotation);
+
         /* Check scaling */
         hscale = drm_rect_calc_hscale(src, dest, min_scale, max_scale);
         vscale = drm_rect_calc_vscale(src, dest, min_scale, max_scale);
@@ -174,6 +178,9 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
         }
 
         *visible = drm_rect_clip_scaled(src, dest, clip, hscale, vscale);
+
+        drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, rotation);
+
         if (!*visible)
                 /*
                  * Plane isn't visible; some drivers can handle this
@@ -219,10 +226,12 @@ EXPORT_SYMBOL(drm_plane_helper_check_update);
  *
  * Note that we make some assumptions about hardware limitations that may not be
  * true for all hardware --
- *   1) Primary plane cannot be repositioned.
- *   2) Primary plane cannot be scaled.
- *   3) Primary plane must cover the entire CRTC.
- *   4) Subpixel positioning is not supported.
+ *
+ * 1. Primary plane cannot be repositioned.
+ * 2. Primary plane cannot be scaled.
+ * 3. Primary plane must cover the entire CRTC.
+ * 4. Subpixel positioning is not supported.
+ *
  * Drivers for hardware that don't have these restrictions can provide their
  * own implementation rather than using this helper.
  *
@@ -265,6 +274,7 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
 
         ret = drm_plane_helper_check_update(plane, crtc, fb,
                                             &src, &dest, &clip,
+                                            BIT(DRM_ROTATE_0),
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             false, false, &visible);
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 644169e1a029..2c819ef90090 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -68,24 +68,6 @@ err_free:
         return ret;
 }
 
-int drm_platform_set_busid(struct drm_device *dev, struct drm_master *master)
-{
-        int id;
-
-        id = dev->platformdev->id;
-        if (id < 0)
-                id = 0;
-
-        master->unique = kasprintf(GFP_KERNEL, "platform:%s:%02d",
-                                                dev->platformdev->name, id);
-        if (!master->unique)
-                return -ENOMEM;
-
-        master->unique_len = strlen(master->unique);
-        return 0;
-}
-EXPORT_SYMBOL(drm_platform_set_busid);
-
 /**
  * drm_platform_init - Register a platform device with the DRM subsystem
  * @driver: DRM device driver
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index aab0f3f1f42d..780589b420a4 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -593,7 +593,7 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev,
                 get_dma_buf(dma_buf);
         }
 
-        /* drm_gem_handle_create_tail unlocks dev->object_name_lock. */
+        /* _handle_create_tail unconditionally unlocks dev->object_name_lock. */
         ret = drm_gem_handle_create_tail(file_priv, obj, handle);
         drm_gem_object_unreference_unlocked(obj);
         if (ret)
@@ -601,11 +601,10 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev,
 
         ret = drm_prime_add_buf_handle(&file_priv->prime,
                         dma_buf, *handle);
+        mutex_unlock(&file_priv->prime.lock);
         if (ret)
                 goto fail;
 
-        mutex_unlock(&file_priv->prime.lock);
-
         dma_buf_put(dma_buf);
 
         return 0;
@@ -615,11 +614,14 @@ fail:
          * to detach.. which seems ok..
          */
         drm_gem_handle_delete(file_priv, *handle);
+        dma_buf_put(dma_buf);
+        return ret;
+
 out_unlock:
         mutex_unlock(&dev->object_name_lock);
 out_put:
-        dma_buf_put(dma_buf);
         mutex_unlock(&file_priv->prime.lock);
+        dma_buf_put(dma_buf);
         return ret;
 }
 EXPORT_SYMBOL(drm_gem_prime_fd_to_handle);
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 0329080d7f7c..a0df377d7d1c 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -82,13 +82,30 @@ drm_mode_validate_flag(const struct drm_display_mode *mode,
 
 static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector)
 {
+        struct drm_cmdline_mode *cmdline_mode;
         struct drm_display_mode *mode;
 
-        if (!connector->cmdline_mode.specified)
+        cmdline_mode = &connector->cmdline_mode;
+        if (!cmdline_mode->specified)
                 return 0;
 
+        /* Only add a GTF mode if we find no matching probed modes */
+        list_for_each_entry(mode, &connector->probed_modes, head) {
+                if (mode->hdisplay != cmdline_mode->xres ||
+                    mode->vdisplay != cmdline_mode->yres)
+                        continue;
+
+                if (cmdline_mode->refresh_specified) {
+                        /* The probed mode's vrefresh is set until later */
+                        if (drm_mode_vrefresh(mode) != cmdline_mode->refresh)
+                                continue;
+                }
+
+                return 0;
+        }
+
         mode = drm_mode_create_from_cmdline_mode(connector->dev,
-                                                 &connector->cmdline_mode);
+                                                 cmdline_mode);
         if (mode == NULL)
                 return 0;
 
diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
new file mode 100644
index 000000000000..0db36d27e90b
--- /dev/null
+++ b/drivers/gpu/drm/drm_simple_kms_helper.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2016 Noralf Trønnes
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <drm/drmP.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_simple_kms_helper.h>
+#include <linux/slab.h>
+
+/**
+ * DOC: overview
+ *
+ * This helper library provides helpers for drivers for simple display
+ * hardware.
+ *
+ * drm_simple_display_pipe_init() initializes a simple display pipeline
+ * which has only one full-screen scanout buffer feeding one output. The
+ * pipeline is represented by struct &drm_simple_display_pipe and binds
+ * together &drm_plane, &drm_crtc and &drm_encoder structures into one fixed
+ * entity. Some flexibility for code reuse is provided through a separately
+ * allocated &drm_connector object and supporting optional &drm_bridge
+ * encoder drivers.
+ */
+
+static const struct drm_encoder_funcs drm_simple_kms_encoder_funcs = {
+        .destroy = drm_encoder_cleanup,
+};
+
+static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc)
+{
+        struct drm_simple_display_pipe *pipe;
+
+        pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
+        if (!pipe->funcs || !pipe->funcs->enable)
+                return;
+
+        pipe->funcs->enable(pipe, crtc->state);
+}
+
+static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc)
+{
+        struct drm_simple_display_pipe *pipe;
+
+        pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
+        if (!pipe->funcs || !pipe->funcs->disable)
+                return;
+
+        pipe->funcs->disable(pipe);
+}
+
+static const struct drm_crtc_helper_funcs drm_simple_kms_crtc_helper_funcs = {
+        .disable = drm_simple_kms_crtc_disable,
+        .enable = drm_simple_kms_crtc_enable,
+};
+
+static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = {
+        .reset = drm_atomic_helper_crtc_reset,
+        .destroy = drm_crtc_cleanup,
+        .set_config = drm_atomic_helper_set_config,
+        .page_flip = drm_atomic_helper_page_flip,
+        .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+};
+
+static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
+                                        struct drm_plane_state *plane_state)
+{
+        struct drm_rect src = {
+                .x1 = plane_state->src_x,
+                .y1 = plane_state->src_y,
+                .x2 = plane_state->src_x + plane_state->src_w,
+                .y2 = plane_state->src_y + plane_state->src_h,
+        };
+        struct drm_rect dest = {
+                .x1 = plane_state->crtc_x,
+                .y1 = plane_state->crtc_y,
+                .x2 = plane_state->crtc_x + plane_state->crtc_w,
+                .y2 = plane_state->crtc_y + plane_state->crtc_h,
+        };
+        struct drm_rect clip = { 0 };
+        struct drm_simple_display_pipe *pipe;
+        struct drm_crtc_state *crtc_state;
+        bool visible;
+        int ret;
+
+        pipe = container_of(plane, struct drm_simple_display_pipe, plane);
+        crtc_state = drm_atomic_get_existing_crtc_state(plane_state->state,
+                                                        &pipe->crtc);
+        if (crtc_state->enable != !!plane_state->crtc)
+                return -EINVAL; /* plane must match crtc enable state */
+
+        if (!crtc_state->enable)
+                return 0; /* nothing to check when disabling or disabled */
+
+        clip.x2 = crtc_state->adjusted_mode.hdisplay;
+        clip.y2 = crtc_state->adjusted_mode.vdisplay;
+        ret = drm_plane_helper_check_update(plane, &pipe->crtc,
+                                            plane_state->fb,
+                                            &src, &dest, &clip,
+                                            plane_state->rotation,
+                                            DRM_PLANE_HELPER_NO_SCALING,
+                                            DRM_PLANE_HELPER_NO_SCALING,
+                                            false, true, &visible);
+        if (ret)
+                return ret;
+
+        if (!visible)
+                return -EINVAL;
+
+        if (!pipe->funcs || !pipe->funcs->check)
+                return 0;
+
+        return pipe->funcs->check(pipe, plane_state, crtc_state);
+}
+
+static void drm_simple_kms_plane_atomic_update(struct drm_plane *plane,
+                                        struct drm_plane_state *pstate)
+{
+        struct drm_simple_display_pipe *pipe;
+
+        pipe = container_of(plane, struct drm_simple_display_pipe, plane);
+        if (!pipe->funcs || !pipe->funcs->update)
+                return;
+
+        pipe->funcs->update(pipe, pstate);
+}
+
+static const struct drm_plane_helper_funcs drm_simple_kms_plane_helper_funcs = {
+        .atomic_check = drm_simple_kms_plane_atomic_check,
+        .atomic_update = drm_simple_kms_plane_atomic_update,
+};
+
+static const struct drm_plane_funcs drm_simple_kms_plane_funcs = {
+        .update_plane           = drm_atomic_helper_update_plane,
+        .disable_plane          = drm_atomic_helper_disable_plane,
+        .destroy                = drm_plane_cleanup,
+        .reset                  = drm_atomic_helper_plane_reset,
+        .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+        .atomic_destroy_state   = drm_atomic_helper_plane_destroy_state,
+};
+
+/**
+ * drm_simple_display_pipe_init - Initialize a simple display pipeline
+ * @dev: DRM device
+ * @pipe: simple display pipe object to initialize
+ * @funcs: callbacks for the display pipe (optional)
+ * @formats: array of supported formats (%DRM_FORMAT_*)
+ * @format_count: number of elements in @formats
+ * @connector: connector to attach and register
+ *
+ * Sets up a display pipeline which consist of a really simple
+ * plane-crtc-encoder pipe coupled with the provided connector.
+ * Teardown of a simple display pipe is all handled automatically by the drm
+ * core through calling drm_mode_config_cleanup(). Drivers afterwards need to
+ * release the memory for the structure themselves.
+ *
+ * Returns:
+ * Zero on success, negative error code on failure.
+ */
+int drm_simple_display_pipe_init(struct drm_device *dev,
+                        struct drm_simple_display_pipe *pipe,
+                        const struct drm_simple_display_pipe_funcs *funcs,
+                        const uint32_t *formats, unsigned int format_count,
+                        struct drm_connector *connector)
+{
+        struct drm_encoder *encoder = &pipe->encoder;
+        struct drm_plane *plane = &pipe->plane;
+        struct drm_crtc *crtc = &pipe->crtc;
+        int ret;
+
+        pipe->connector = connector;
+        pipe->funcs = funcs;
+
+        drm_plane_helper_add(plane, &drm_simple_kms_plane_helper_funcs);
+        ret = drm_universal_plane_init(dev, plane, 0,
+                                       &drm_simple_kms_plane_funcs,
+                                       formats, format_count,
+                                       DRM_PLANE_TYPE_PRIMARY, NULL);
+        if (ret)
+                return ret;
+
+        drm_crtc_helper_add(crtc, &drm_simple_kms_crtc_helper_funcs);
+        ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,
+                                        &drm_simple_kms_crtc_funcs, NULL);
+        if (ret)
+                return ret;
+
+        encoder->possible_crtcs = 1 << drm_crtc_index(crtc);
+        ret = drm_encoder_init(dev, encoder, &drm_simple_kms_encoder_funcs,
+                               DRM_MODE_ENCODER_NONE, NULL);
+        if (ret)
+                return ret;
+
+        return drm_mode_connector_attach_encoder(connector, encoder);
+}
+EXPORT_SYMBOL(drm_simple_display_pipe_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index fa7fadce8063..32dd821b7202 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -32,75 +32,6 @@ static struct device_type drm_sysfs_device_minor = {
 
 struct class *drm_class;
 
-/**
- * __drm_class_suspend - internal DRM class suspend routine
- * @dev: Linux device to suspend
- * @state: power state to enter
- *
- * Just figures out what the actual struct drm_device associated with
- * @dev is and calls its suspend hook, if present.
- */
-static int __drm_class_suspend(struct device *dev, pm_message_t state)
-{
-        if (dev->type == &drm_sysfs_device_minor) {
-                struct drm_minor *drm_minor = to_drm_minor(dev);
-                struct drm_device *drm_dev = drm_minor->dev;
-
-                if (drm_minor->type == DRM_MINOR_LEGACY &&
-                    !drm_core_check_feature(drm_dev, DRIVER_MODESET) &&
-                    drm_dev->driver->suspend)
-                        return drm_dev->driver->suspend(drm_dev, state);
-        }
-        return 0;
-}
-
-/**
- * drm_class_suspend - internal DRM class suspend hook. Simply calls
- * __drm_class_suspend() with the correct pm state.
- * @dev: Linux device to suspend
- */
-static int drm_class_suspend(struct device *dev)
-{
-        return __drm_class_suspend(dev, PMSG_SUSPEND);
-}
-
-/**
- * drm_class_freeze - internal DRM class freeze hook. Simply calls
- * __drm_class_suspend() with the correct pm state.
- * @dev: Linux device to freeze
- */
-static int drm_class_freeze(struct device *dev)
-{
-        return __drm_class_suspend(dev, PMSG_FREEZE);
-}
-
-/**
- * drm_class_resume - DRM class resume hook
- * @dev: Linux device to resume
- *
- * Just figures out what the actual struct drm_device associated with
- * @dev is and calls its resume hook, if present.
- */
-static int drm_class_resume(struct device *dev)
-{
-        if (dev->type == &drm_sysfs_device_minor) {
-                struct drm_minor *drm_minor = to_drm_minor(dev);
-                struct drm_device *drm_dev = drm_minor->dev;
-
-                if (drm_minor->type == DRM_MINOR_LEGACY &&
-                    !drm_core_check_feature(drm_dev, DRIVER_MODESET) &&
-                    drm_dev->driver->resume)
-                        return drm_dev->driver->resume(drm_dev);
-        }
-        return 0;
-}
-
-static const struct dev_pm_ops drm_class_dev_pm_ops = {
-        .suspend        = drm_class_suspend,
-        .resume         = drm_class_resume,
-        .freeze         = drm_class_freeze,
-};
-
 static char *drm_devnode(struct device *dev, umode_t *mode)
 {
         return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
@@ -131,8 +62,6 @@ int drm_sysfs_init(void)
         if (IS_ERR(drm_class))
                 return PTR_ERR(drm_class);
 
-        drm_class->pm = &drm_class_dev_pm_ops;
-
         err = class_create_file(drm_class, &class_attr_version.attr);
         if (err) {
                 class_destroy(drm_class);
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index ac9f4b3ec615..43ff44a2b8e7 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -670,57 +670,3 @@ void drm_legacy_vma_flush(struct drm_device *dev)
                 kfree(vma);
         }
 }
-
-int drm_vma_info(struct seq_file *m, void *data)
-{
-        struct drm_info_node *node = (struct drm_info_node *) m->private;
-        struct drm_device *dev = node->minor->dev;
-        struct drm_vma_entry *pt;
-        struct vm_area_struct *vma;
-        unsigned long vma_count = 0;
-#if defined(__i386__)
-        unsigned int pgprot;
-#endif
-
-        mutex_lock(&dev->struct_mutex);
-        list_for_each_entry(pt, &dev->vmalist, head)
-                vma_count++;
-
-        seq_printf(m, "vma use count: %lu, high_memory = %pK, 0x%pK\n",
-                   vma_count, high_memory,
-                   (void *)(unsigned long)virt_to_phys(high_memory));
-
-        list_for_each_entry(pt, &dev->vmalist, head) {
-                vma = pt->vma;
-                if (!vma)
-                        continue;
-                seq_printf(m,
-                           "\n%5d 0x%pK-0x%pK %c%c%c%c%c%c 0x%08lx000",
-                           pt->pid,
-                           (void *)vma->vm_start, (void *)vma->vm_end,
-                           vma->vm_flags & VM_READ ? 'r' : '-',
-                           vma->vm_flags & VM_WRITE ? 'w' : '-',
-                           vma->vm_flags & VM_EXEC ? 'x' : '-',
-                           vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
-                           vma->vm_flags & VM_LOCKED ? 'l' : '-',
-                           vma->vm_flags & VM_IO ? 'i' : '-',
-                           vma->vm_pgoff);
-
-#if defined(__i386__)
-                pgprot = pgprot_val(vma->vm_page_prot);
-                seq_printf(m, " %c%c%c%c%c%c%c%c%c",
-                           pgprot & _PAGE_PRESENT ? 'p' : '-',
-                           pgprot & _PAGE_RW ? 'w' : 'r',
-                           pgprot & _PAGE_USER ? 'u' : 's',
-                           pgprot & _PAGE_PWT ? 't' : 'b',
-                           pgprot & _PAGE_PCD ? 'u' : 'c',
-                           pgprot & _PAGE_ACCESSED ? 'a' : '-',
-                           pgprot & _PAGE_DIRTY ? 'd' : '-',
-                           pgprot & _PAGE_PSE ? 'm' : 'k',
-                           pgprot & _PAGE_GLOBAL ? 'g' : 'l');
-#endif
-                seq_printf(m, "\n");
-        }
-        mutex_unlock(&dev->struct_mutex);
-        return 0;
-}
diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c
index 2f2ecde8285b..f306c8855978 100644
--- a/drivers/gpu/drm/drm_vma_manager.c
+++ b/drivers/gpu/drm/drm_vma_manager.c
@@ -127,6 +127,9 @@ EXPORT_SYMBOL(drm_vma_offset_manager_destroy);
  * used to implement weakly referenced lookups using kref_get_unless_zero().
  *
  * Example:
+ *
+ * ::
+ *
  *     drm_vma_offset_lock_lookup(mgr);
  *     node = drm_vma_offset_lookup_locked(mgr);
  *     if (node)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 3d4f56df8359..340d390306d8 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -496,7 +496,6 @@ static struct drm_driver etnaviv_drm_driver = {
                                 DRIVER_RENDER,
         .open               = etnaviv_open,
         .preclose           = etnaviv_preclose,
-        .set_busid          = drm_platform_set_busid,
         .gem_free_object_unlocked = etnaviv_gem_free_object,
         .gem_vm_ops         = &vm_ops,
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index f5321e2f25ff..a69cdd526bf8 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -125,7 +125,7 @@ struct etnaviv_gpu {
         u32 completed_fence;
         u32 retired_fence;
         wait_queue_head_t fence_event;
-        unsigned int fence_context;
+        u64 fence_context;
         spinlock_t fence_spinlock;
 
         /* worker for handling active-list retiring: */
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
index 522cfd447892..16353ee81651 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
@@ -225,6 +225,7 @@ struct iommu_domain *etnaviv_iommu_domain_alloc(struct etnaviv_gpu *gpu)
 
         etnaviv_domain->domain.type = __IOMMU_DOMAIN_PAGING;
         etnaviv_domain->domain.ops = &etnaviv_iommu_ops.ops;
+        etnaviv_domain->domain.pgsize_bitmap = SZ_4K;
         etnaviv_domain->domain.geometry.aperture_start = GPU_MEM_START;
         etnaviv_domain->domain.geometry.aperture_end = GPU_MEM_START + PT_ENTRIES * SZ_4K - 1;
 
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index f6223f907c15..7f9901b7777b 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -31,7 +31,6 @@
 #include "exynos_drm_plane.h"
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
-#include "exynos_drm_fbdev.h"
 #include "exynos_drm_iommu.h"
 
 /*
diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c
index 468498e3fec1..4c1fb3f8b5a6 100644
--- a/drivers/gpu/drm/exynos/exynos_dp.c
+++ b/drivers/gpu/drm/exynos/exynos_dp.c
@@ -34,7 +34,7 @@
 
 struct exynos_dp_device {
         struct drm_encoder         encoder;
-        struct drm_connector       connector;
+        struct drm_connector       *connector;
         struct drm_bridge          *ptn_bridge;
         struct drm_device          *drm_dev;
         struct device              *dev;
@@ -70,7 +70,7 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data)
 static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data)
 {
         struct exynos_dp_device *dp = to_dp(plat_data);
-        struct drm_connector *connector = &dp->connector;
+        struct drm_connector *connector = dp->connector;
         struct drm_display_mode *mode;
         int num_modes = 0;
 
@@ -103,6 +103,7 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data,
         int ret;
 
         drm_connector_register(connector);
+        dp->connector = connector;
 
         /* Pre-empt DP connector creation if there's a bridge */
         if (dp->ptn_bridge) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c
index 011211e4167d..edbd98ff293e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_core.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_core.c
@@ -15,7 +15,6 @@
 #include <drm/drmP.h>
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
-#include "exynos_drm_fbdev.h"
 
 static LIST_HEAD(exynos_drm_subdrv_list);
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 5e38e749ac17..ad6b73c7fc59 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -93,17 +93,8 @@ static int exynos_dpi_get_modes(struct drm_connector *connector)
         return 0;
 }
 
-static struct drm_encoder *
-exynos_dpi_best_encoder(struct drm_connector *connector)
-{
-        struct exynos_dpi *ctx = connector_to_dpi(connector);
-
-        return &ctx->encoder;
-}
-
 static const struct drm_connector_helper_funcs exynos_dpi_connector_helper_funcs = {
         .get_modes = exynos_dpi_get_modes,
-        .best_encoder = exynos_dpi_best_encoder,
 };
 
 static int exynos_dpi_create_connector(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 2dd820e23b0c..13d28d4229e2 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -267,6 +267,8 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
 {
         struct exynos_drm_private *priv = dev->dev_private;
         struct exynos_atomic_commit *commit;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
         int i, ret;
 
         commit = kzalloc(sizeof(*commit), GFP_KERNEL);
@@ -288,10 +290,8 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
         /* Wait until all affected CRTCs have completed previous commits and
          * mark them as pending.
          */
-        for (i = 0; i < dev->mode_config.num_crtc; ++i) {
-                if (state->crtcs[i])
-                        commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]);
-        }
+        for_each_crtc_in_state(state, crtc, crtc_state, i)
+                commit->crtcs |= drm_crtc_mask(crtc);
 
         wait_event(priv->wait, !commit_is_pending(priv, commit->crtcs));
 
@@ -299,7 +299,7 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
         priv->pending |= commit->crtcs;
         spin_unlock(&priv->lock);
 
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (nonblock)
                 schedule_work(&commit->work);
@@ -407,7 +407,6 @@ static struct drm_driver exynos_drm_driver = {
         .preclose               = exynos_drm_preclose,
         .lastclose              = exynos_drm_lastclose,
         .postclose              = exynos_drm_postclose,
-        .set_busid              = drm_platform_set_busid,
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = exynos_drm_crtc_enable_vblank,
         .disable_vblank         = exynos_drm_crtc_disable_vblank,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 601ecf8006a7..e07cb1fe4860 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1566,17 +1566,8 @@ static int exynos_dsi_get_modes(struct drm_connector *connector)
         return 0;
 }
 
-static struct drm_encoder *
-exynos_dsi_best_encoder(struct drm_connector *connector)
-{
-        struct exynos_dsi *dsi = connector_to_dsi(connector);
-
-        return &dsi->encoder;
-}
-
 static const struct drm_connector_helper_funcs exynos_dsi_connector_helper_funcs = {
         .get_modes = exynos_dsi_get_modes,
-        .best_encoder = exynos_dsi_best_encoder,
 };
 
 static int exynos_dsi_create_connector(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 3efe1aa89416..d47216488985 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -30,7 +30,6 @@
 
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
-#include "exynos_drm_fbdev.h"
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_plane.h"
 #include "exynos_drm_iommu.h"
@@ -120,7 +119,6 @@ static struct fimd_driver_data s3c64xx_fimd_driver_data = {
         .timing_base = 0x0,
         .has_clksel = 1,
         .has_limited_fmt = 1,
-        .has_hw_trigger = 1,
 };
 
 static struct fimd_driver_data exynos3_fimd_driver_data = {
@@ -171,14 +169,11 @@ static struct fimd_driver_data exynos5420_fimd_driver_data = {
         .lcdblk_vt_shift = 24,
         .lcdblk_bypass_shift = 15,
         .lcdblk_mic_bypass_shift = 11,
-        .trg_type = I80_HW_TRG,
         .has_shadowcon = 1,
         .has_vidoutcon = 1,
         .has_vtsel = 1,
         .has_mic_bypass = 1,
         .has_dp_clk = 1,
-        .has_hw_trigger = 1,
-        .has_trigger_per_te = 1,
 };
 
 struct fimd_context {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 493552368295..8564c3da0d22 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -48,13 +48,13 @@
 
 /* registers for base address */
 #define G2D_SRC_BASE_ADDR               0x0304
-#define G2D_SRC_STRIDE_REG              0x0308
+#define G2D_SRC_STRIDE                  0x0308
 #define G2D_SRC_COLOR_MODE              0x030C
 #define G2D_SRC_LEFT_TOP                0x0310
 #define G2D_SRC_RIGHT_BOTTOM            0x0314
 #define G2D_SRC_PLANE2_BASE_ADDR        0x0318
 #define G2D_DST_BASE_ADDR               0x0404
-#define G2D_DST_STRIDE_REG              0x0408
+#define G2D_DST_STRIDE                  0x0408
 #define G2D_DST_COLOR_MODE              0x040C
 #define G2D_DST_LEFT_TOP                0x0410
 #define G2D_DST_RIGHT_BOTTOM            0x0414
@@ -563,7 +563,7 @@ static enum g2d_reg_type g2d_get_reg_type(int reg_offset)
 
         switch (reg_offset) {
         case G2D_SRC_BASE_ADDR:
-        case G2D_SRC_STRIDE_REG:
+        case G2D_SRC_STRIDE:
         case G2D_SRC_COLOR_MODE:
         case G2D_SRC_LEFT_TOP:
         case G2D_SRC_RIGHT_BOTTOM:
@@ -573,7 +573,7 @@ static enum g2d_reg_type g2d_get_reg_type(int reg_offset)
                 reg_type = REG_TYPE_SRC_PLANE2;
                 break;
         case G2D_DST_BASE_ADDR:
-        case G2D_DST_STRIDE_REG:
+        case G2D_DST_STRIDE:
         case G2D_DST_COLOR_MODE:
         case G2D_DST_LEFT_TOP:
         case G2D_DST_RIGHT_BOTTOM:
@@ -968,8 +968,8 @@ static int g2d_check_reg_offset(struct device *dev,
                         } else
                                 buf_info->types[reg_type] = BUF_TYPE_GEM;
                         break;
-                case G2D_SRC_STRIDE_REG:
-                case G2D_DST_STRIDE_REG:
+                case G2D_SRC_STRIDE:
+                case G2D_DST_STRIDE:
                         if (for_addr)
                                 goto err;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 55f1d37c666a..77f12c00abf9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -242,7 +242,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
             state->v_ratio == (1 << 15))
                 height_ok = true;
 
-        if (width_ok & height_ok)
+        if (width_ok && height_ok)
                 return 0;
 
         DRM_DEBUG_KMS("scaling mode is not supported");
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 608b0afa337f..e8f6c92b2a36 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -378,16 +378,8 @@ static int vidi_get_modes(struct drm_connector *connector)
         return drm_add_edid_modes(connector, edid);
 }
 
-static struct drm_encoder *vidi_best_encoder(struct drm_connector *connector)
-{
-        struct vidi_context *ctx = ctx_from_connector(connector);
-
-        return &ctx->encoder;
-}
-
 static const struct drm_connector_helper_funcs vidi_connector_helper_funcs = {
         .get_modes = vidi_get_modes,
-        .best_encoder = vidi_best_encoder,
 };
 
 static int vidi_create_connector(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 58de5a430508..1625d7c8a319 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -937,17 +937,9 @@ static int hdmi_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static struct drm_encoder *hdmi_best_encoder(struct drm_connector *connector)
-{
-        struct hdmi_context *hdata = connector_to_hdmi(connector);
-
-        return &hdata->encoder;
-}
-
 static const struct drm_connector_helper_funcs hdmi_connector_helper_funcs = {
         .get_modes = hdmi_get_modes,
         .mode_valid = hdmi_mode_valid,
-        .best_encoder = hdmi_best_encoder,
 };
 
 static int hdmi_create_connector(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
index 89c0084c2814..3371635cd4d7 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
@@ -22,20 +22,21 @@
 #include "fsl_dcu_drm_drv.h"
 #include "fsl_dcu_drm_plane.h"
 
-static void fsl_dcu_drm_crtc_atomic_begin(struct drm_crtc *crtc,
+static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,
                                           struct drm_crtc_state *old_crtc_state)
 {
-}
+        struct drm_pending_vblank_event *event = crtc->state->event;
 
-static int fsl_dcu_drm_crtc_atomic_check(struct drm_crtc *crtc,
-                                         struct drm_crtc_state *state)
-{
-        return 0;
-}
+        if (event) {
+                crtc->state->event = NULL;
 
-static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,
-                                          struct drm_crtc_state *old_crtc_state)
-{
+                spin_lock_irq(&crtc->dev->event_lock);
+                if (drm_crtc_vblank_get(crtc) == 0)
+                        drm_crtc_arm_vblank_event(crtc, event);
+                else
+                        drm_crtc_send_vblank_event(crtc, event);
+                spin_unlock_irq(&crtc->dev->event_lock);
+        }
 }
 
 static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc)
@@ -43,6 +44,8 @@ static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc)
         struct drm_device *dev = crtc->dev;
         struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
 
+        drm_crtc_vblank_off(crtc);
+
         regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
                            DCU_MODE_DCU_MODE_MASK,
                            DCU_MODE_DCU_MODE(DCU_MODE_OFF));
@@ -60,6 +63,8 @@ static void fsl_dcu_drm_crtc_enable(struct drm_crtc *crtc)
                            DCU_MODE_DCU_MODE(DCU_MODE_NORMAL));
         regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,
                      DCU_UPDATE_MODE_READREG);
+
+        drm_crtc_vblank_on(crtc);
 }
 
 static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -117,8 +122,6 @@ static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
 }
 
 static const struct drm_crtc_helper_funcs fsl_dcu_drm_crtc_helper_funcs = {
-        .atomic_begin = fsl_dcu_drm_crtc_atomic_begin,
-        .atomic_check = fsl_dcu_drm_crtc_atomic_check,
         .atomic_flush = fsl_dcu_drm_crtc_atomic_flush,
         .disable = fsl_dcu_drm_disable_crtc,
         .enable = fsl_dcu_drm_crtc_enable,
@@ -138,9 +141,10 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device *fsl_dev)
 {
         struct drm_plane *primary;
         struct drm_crtc *crtc = &fsl_dev->crtc;
-        unsigned int i, j, reg_num;
         int ret;
 
+        fsl_dcu_drm_init_planes(fsl_dev->drm);
+
         primary = fsl_dcu_drm_primary_create_plane(fsl_dev->drm);
         if (!primary)
                 return -ENOMEM;
@@ -154,19 +158,5 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device *fsl_dev)
 
         drm_crtc_helper_add(crtc, &fsl_dcu_drm_crtc_helper_funcs);
 
-        if (!strcmp(fsl_dev->soc->name, "ls1021a"))
-                reg_num = LS1021A_LAYER_REG_NUM;
-        else
-                reg_num = VF610_LAYER_REG_NUM;
-        for (i = 0; i < fsl_dev->soc->total_layer; i++) {
-                for (j = 1; j <= reg_num; j++)
-                        regmap_write(fsl_dev->regmap, DCU_CTRLDESCLN(i, j), 0);
-        }
-        regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
-                           DCU_MODE_DCU_MODE_MASK,
-                           DCU_MODE_DCU_MODE(DCU_MODE_OFF));
-        regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,
-                     DCU_UPDATE_MODE_READREG);
-
         return 0;
 }
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 0ec1ad961e0d..7882387f9bff 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -11,6 +11,7 @@
 
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
+#include <linux/console.h>
 #include <linux/io.h>
 #include <linux/mfd/syscon.h>
 #include <linux/mm.h>
@@ -22,6 +23,7 @@
 #include <linux/regmap.h>
 
 #include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
@@ -42,7 +44,6 @@ static const struct regmap_config fsl_dcu_regmap_config = {
         .reg_bits = 32,
         .reg_stride = 4,
         .val_bits = 32,
-        .cache_type = REGCACHE_RBTREE,
 
         .volatile_reg = fsl_dcu_drm_is_volatile_reg,
 };
@@ -198,7 +199,7 @@ static struct drm_driver fsl_dcu_drm_driver = {
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = fsl_dcu_drm_enable_vblank,
         .disable_vblank         = fsl_dcu_drm_disable_vblank,
-        .gem_free_object        = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
@@ -228,11 +229,26 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
         if (!fsl_dev)
                 return 0;
 
+        disable_irq(fsl_dev->irq);
         drm_kms_helper_poll_disable(fsl_dev->drm);
-        regcache_cache_only(fsl_dev->regmap, true);
-        regcache_mark_dirty(fsl_dev->regmap);
-        clk_disable(fsl_dev->clk);
-        clk_unprepare(fsl_dev->clk);
+
+        console_lock();
+        drm_fbdev_cma_set_suspend(fsl_dev->fbdev, 1);
+        console_unlock();
+
+        fsl_dev->state = drm_atomic_helper_suspend(fsl_dev->drm);
+        if (IS_ERR(fsl_dev->state)) {
+                console_lock();
+                drm_fbdev_cma_set_suspend(fsl_dev->fbdev, 0);
+                console_unlock();
+
+                drm_kms_helper_poll_enable(fsl_dev->drm);
+                enable_irq(fsl_dev->irq);
+                return PTR_ERR(fsl_dev->state);
+        }
+
+        clk_disable_unprepare(fsl_dev->pix_clk);
+        clk_disable_unprepare(fsl_dev->clk);
 
         return 0;
 }
@@ -245,21 +261,27 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
         if (!fsl_dev)
                 return 0;
 
-        ret = clk_enable(fsl_dev->clk);
+        ret = clk_prepare_enable(fsl_dev->clk);
         if (ret < 0) {
                 dev_err(dev, "failed to enable dcu clk\n");
-                clk_unprepare(fsl_dev->clk);
                 return ret;
         }
-        ret = clk_prepare(fsl_dev->clk);
+
+        ret = clk_prepare_enable(fsl_dev->pix_clk);
         if (ret < 0) {
-                dev_err(dev, "failed to prepare dcu clk\n");
+                dev_err(dev, "failed to enable pix clk\n");
                 return ret;
         }
 
+        fsl_dcu_drm_init_planes(fsl_dev->drm);
+        drm_atomic_helper_resume(fsl_dev->drm, fsl_dev->state);
+
+        console_lock();
+        drm_fbdev_cma_set_suspend(fsl_dev->fbdev, 0);
+        console_unlock();
+
         drm_kms_helper_poll_enable(fsl_dev->drm);
-        regcache_cache_only(fsl_dev->regmap, false);
-        regcache_sync(fsl_dev->regmap);
+        enable_irq(fsl_dev->irq);
 
         return 0;
 }
@@ -273,12 +295,14 @@ static const struct fsl_dcu_soc_data fsl_dcu_ls1021a_data = {
         .name = "ls1021a",
         .total_layer = 16,
         .max_layer = 4,
+        .layer_regs = LS1021A_LAYER_REG_NUM,
 };
 
 static const struct fsl_dcu_soc_data fsl_dcu_vf610_data = {
         .name = "vf610",
         .total_layer = 64,
         .max_layer = 6,
+        .layer_regs = VF610_LAYER_REG_NUM,
 };
 
 static const struct of_device_id fsl_dcu_of_match[] = {
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
index c275f900ff23..3b371fe7491e 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
@@ -175,6 +175,7 @@ struct fsl_dcu_soc_data {
         unsigned int total_layer;
         /*max layer number DCU supported*/
         unsigned int max_layer;
+        unsigned int layer_regs;
 };
 
 struct fsl_dcu_drm_device {
@@ -193,6 +194,7 @@ struct fsl_dcu_drm_device {
         struct drm_encoder encoder;
         struct fsl_dcu_drm_connector connector;
         const struct fsl_dcu_soc_data *soc;
+        struct drm_atomic_state *state;
 };
 
 void fsl_dcu_fbdev_init(struct drm_device *dev);
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c
index c564ec612b59..a6e4cd591960 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c
@@ -37,23 +37,22 @@ int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev)
 
         ret = fsl_dcu_drm_crtc_create(fsl_dev);
         if (ret)
-                return ret;
+                goto err;
 
         ret = fsl_dcu_drm_encoder_create(fsl_dev, &fsl_dev->crtc);
         if (ret)
-                goto fail_encoder;
+                goto err;
 
         ret = fsl_dcu_drm_connector_create(fsl_dev, &fsl_dev->encoder);
         if (ret)
-                goto fail_connector;
+                goto err;
 
         drm_mode_config_reset(fsl_dev->drm);
         drm_kms_helper_poll_init(fsl_dev->drm);
 
         return 0;
-fail_encoder:
-        fsl_dev->crtc.funcs->destroy(&fsl_dev->crtc);
-fail_connector:
-        fsl_dev->encoder.funcs->destroy(&fsl_dev->encoder);
+
+err:
+        drm_mode_config_cleanup(fsl_dev->drm);
         return ret;
 }
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 274558b3b32b..e50467a0deb0 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@ -217,6 +217,22 @@ static const u32 fsl_dcu_drm_plane_formats[] = {
         DRM_FORMAT_YUV422,
 };
 
+void fsl_dcu_drm_init_planes(struct drm_device *dev)
+{
+        struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
+        int i, j;
+
+        for (i = 0; i < fsl_dev->soc->total_layer; i++) {
+                for (j = 1; j <= fsl_dev->soc->layer_regs; j++)
+                        regmap_write(fsl_dev->regmap, DCU_CTRLDESCLN(i, j), 0);
+        }
+        regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
+                           DCU_MODE_DCU_MODE_MASK,
+                           DCU_MODE_DCU_MODE(DCU_MODE_OFF));
+        regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,
+                     DCU_UPDATE_MODE_READREG);
+}
+
 struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev)
 {
         struct drm_plane *primary;
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h
index d657f088d859..8ee45f813ee8 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h
@@ -12,6 +12,7 @@
 #ifndef __FSL_DCU_DRM_PLANE_H__
 #define __FSL_DCU_DRM_PLANE_H__
 
+void fsl_dcu_drm_init_planes(struct drm_device *dev);
 struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev);
 
 #endif /* __FSL_DCU_DRM_PLANE_H__ */
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index 98c998da91eb..0b0989e503ea 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -102,14 +102,6 @@ static const struct drm_connector_funcs fsl_dcu_drm_connector_funcs = {
         .reset = drm_atomic_helper_connector_reset,
 };
 
-static struct drm_encoder *
-fsl_dcu_drm_connector_best_encoder(struct drm_connector *connector)
-{
-        struct fsl_dcu_drm_connector *fsl_con = to_fsl_dcu_connector(connector);
-
-        return fsl_con->encoder;
-}
-
 static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector)
 {
         struct fsl_dcu_drm_connector *fsl_connector;
@@ -136,7 +128,6 @@ static int fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector,
 }
 
 static const struct drm_connector_helper_funcs connector_helper_funcs = {
-        .best_encoder = fsl_dcu_drm_connector_best_encoder,
         .get_modes = fsl_dcu_drm_connector_get_modes,
         .mode_valid = fsl_dcu_drm_connector_mode_valid,
 };
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index c95406e6f44d..1a1cf7a3b5ef 100644
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -175,20 +175,21 @@ void gma_crtc_load_lut(struct drm_crtc *crtc)
         }
 }
 
-void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue,
-                        u32 start, u32 size)
+int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue,
+                       u32 size)
 {
         struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         int i;
-        int end = (start + size > 256) ? 256 : start + size;
 
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 gma_crtc->lut_r[i] = red[i] >> 8;
                 gma_crtc->lut_g[i] = green[i] >> 8;
                 gma_crtc->lut_b[i] = blue[i] >> 8;
         }
 
         gma_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 /**
@@ -281,7 +282,7 @@ void gma_crtc_dpms(struct drm_crtc *crtc, int mode)
                 REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
 
                 /* Turn off vblank interrupts */
-                drm_vblank_off(dev, pipe);
+                drm_crtc_vblank_off(crtc);
 
                 /* Wait for vblank for the disable to take effect */
                 gma_wait_for_vblank(dev);
diff --git a/drivers/gpu/drm/gma500/gma_display.h b/drivers/gpu/drm/gma500/gma_display.h
index b2491c65f053..e72dd08b701b 100644
--- a/drivers/gpu/drm/gma500/gma_display.h
+++ b/drivers/gpu/drm/gma500/gma_display.h
@@ -72,8 +72,8 @@ extern int gma_crtc_cursor_set(struct drm_crtc *crtc,
                                uint32_t width, uint32_t height);
 extern int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);
 extern void gma_crtc_load_lut(struct drm_crtc *crtc);
-extern void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                               u16 *blue, u32 start, u32 size);
+extern int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                              u16 *blue, u32 size);
 extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode);
 extern void gma_crtc_prepare(struct drm_crtc *crtc);
 extern void gma_crtc_commit(struct drm_crtc *crtc);
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
index 398015be87e4..7b6c84925098 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.c
+++ b/drivers/gpu/drm/gma500/psb_intel_display.c
@@ -491,7 +491,6 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct gma_crtc *gma_crtc;
         int i;
-        uint16_t *r_base, *g_base, *b_base;
 
         /* We allocate a extra array of drm_connector pointers
          * for fbdev after the crtc */
@@ -519,16 +518,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
         gma_crtc->pipe = pipe;
         gma_crtc->plane = pipe;
 
-        r_base = gma_crtc->base.gamma_store;
-        g_base = r_base + 256;
-        b_base = g_base + 256;
         for (i = 0; i < 256; i++) {
                 gma_crtc->lut_r[i] = i;
                 gma_crtc->lut_g[i] = i;
                 gma_crtc->lut_b[i] = i;
-                r_base[i] = i << 8;
-                g_base[i] = i << 8;
-                b_base[i] = i << 8;
 
                 gma_crtc->lut_adj[i] = 0;
         }
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index fba6372d060e..ed76baad525f 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -502,13 +502,6 @@ static void ade_crtc_disable(struct drm_crtc *crtc)
         acrtc->enable = false;
 }
 
-static int ade_crtc_atomic_check(struct drm_crtc *crtc,
-                                 struct drm_crtc_state *state)
-{
-        /* do nothing */
-        return 0;
-}
-
 static void ade_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
         struct ade_crtc *acrtc = to_ade_crtc(crtc);
@@ -537,6 +530,7 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
 {
         struct ade_crtc *acrtc = to_ade_crtc(crtc);
         struct ade_hw_ctx *ctx = acrtc->ctx;
+        struct drm_pending_vblank_event *event = crtc->state->event;
         void __iomem *base = ctx->base;
 
         /* only crtc is enabled regs take effect */
@@ -545,12 +539,22 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
                 /* flush ade registers */
                 writel(ADE_ENABLE, base + ADE_EN);
         }
+
+        if (event) {
+                crtc->state->event = NULL;
+
+                spin_lock_irq(&crtc->dev->event_lock);
+                if (drm_crtc_vblank_get(crtc) == 0)
+                        drm_crtc_arm_vblank_event(crtc, event);
+                else
+                        drm_crtc_send_vblank_event(crtc, event);
+                spin_unlock_irq(&crtc->dev->event_lock);
+        }
 }
 
 static const struct drm_crtc_helper_funcs ade_crtc_helper_funcs = {
         .enable         = ade_crtc_enable,
         .disable        = ade_crtc_disable,
-        .atomic_check   = ade_crtc_atomic_check,
         .mode_set_nofb  = ade_crtc_mode_set_nofb,
         .atomic_begin   = ade_crtc_atomic_begin,
         .atomic_flush   = ade_crtc_atomic_flush,
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index 3f94785fbcca..1edd9bc80294 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -171,9 +171,8 @@ static struct drm_driver kirin_drm_driver = {
         .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
                                   DRIVER_ATOMIC | DRIVER_HAVE_IRQ,
         .fops                   = &kirin_drm_fops,
-        .set_busid              = drm_platform_set_busid,
 
-        .gem_free_object        = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .dumb_create            = kirin_gem_cma_dumb_create,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
@@ -221,19 +220,12 @@ static int kirin_drm_bind(struct device *dev)
         if (ret)
                 goto err_kms_cleanup;
 
-        /* connectors should be registered after drm device register */
-        ret = drm_connector_register_all(drm_dev);
-        if (ret)
-                goto err_drm_dev_unregister;
-
         DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
                  driver->name, driver->major, driver->minor, driver->patchlevel,
                  driver->date, drm_dev->primary->index);
 
         return 0;
 
-err_drm_dev_unregister:
-        drm_dev_unregister(drm_dev);
 err_kms_cleanup:
         kirin_drm_kms_cleanup(drm_dev);
 err_drm_dev_unref:
@@ -246,7 +238,6 @@ static void kirin_drm_unbind(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
 
-        drm_connector_unregister_all(drm_dev);
         drm_dev_unregister(drm_dev);
         kirin_drm_kms_cleanup(drm_dev);
         drm_dev_unref(drm_dev);
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 29a32b11953b..7769e469118f 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -57,6 +57,28 @@ config DRM_I915_USERPTR
 
           If in doubt, say "Y".
 
+config DRM_I915_GVT
+        bool "Enable Intel GVT-g graphics virtualization host support"
+        depends on DRM_I915
+        default n
+        help
+          Choose this option if you want to enable Intel GVT-g graphics
+          virtualization technology host support with integrated graphics.
+          With GVT-g, it's possible to have one integrated graphics
+          device shared by multiple VMs under different hypervisors.
+
+          Note that at least one hypervisor like Xen or KVM is required for
+          this driver to work, and it only supports newer device from
+          Broadwell+. For further information and setup guide, you can
+          visit: http://01.org/igvt-g.
+
+          Now it's just a stub to support the modifications of i915 for
+          GVT device model. It requires at least one MPT modules for Xen/KVM
+          and other components of GVT device model to work. Use it under
+          you own risk.
+
+          If in doubt, say "N".
+
 menu "drm/i915 Debugging"
 depends on DRM_I915
 depends on EXPERT
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 0b88ba0f3c1f..276abf1cac2b 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -59,6 +59,7 @@ i915-y += intel_audio.o \
           intel_bios.o \
           intel_color.o \
           intel_display.o \
+          intel_dpio_phy.o \
           intel_dpll_mgr.o \
           intel_fbc.o \
           intel_fifo_underrun.o \
@@ -81,10 +82,12 @@ i915-y += dvo_ch7017.o \
           dvo_tfp410.o \
           intel_crt.o \
           intel_ddi.o \
+          intel_dp_aux_backlight.o \
           intel_dp_link_training.o \
           intel_dp_mst.o \
           intel_dp.o \
           intel_dsi.o \
+          intel_dsi_dcs_backlight.o \
           intel_dsi_panel_vbt.o \
           intel_dsi_pll.o \
           intel_dvo.o \
@@ -101,6 +104,11 @@ i915-y += i915_vgpu.o
 # legacy horrors
 i915-y += i915_dma.o
 
+ifeq ($(CONFIG_DRM_I915_GVT),y)
+i915-y += intel_gvt.o
+include $(src)/gvt/Makefile
+endif
+
 obj-$(CONFIG_DRM_I915)  += i915.o
 
 CFLAGS_i915_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
new file mode 100644
index 000000000000..d0f21a6ad60d
--- /dev/null
+++ b/drivers/gpu/drm/i915/gvt/Makefile
@@ -0,0 +1,5 @@
+GVT_DIR := gvt
+GVT_SOURCE := gvt.o
+
+ccflags-y                      += -I$(src) -I$(src)/$(GVT_DIR) -Wall
+i915-y                         += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
diff --git a/drivers/gpu/drm/i915/gvt/debug.h b/drivers/gpu/drm/i915/gvt/debug.h
new file mode 100644
index 000000000000..7ef412be665f
--- /dev/null
+++ b/drivers/gpu/drm/i915/gvt/debug.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef __GVT_DEBUG_H__
+#define __GVT_DEBUG_H__
+
+#define gvt_dbg_core(fmt, args...) \
+        DRM_DEBUG_DRIVER("gvt: core: "fmt, ##args)
+
+/*
+ * Other GVT debug stuff will be introduced in the GVT device model patches.
+ */
+
+#endif
diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/gvt.c
new file mode 100644
index 000000000000..927f4579f5b6
--- /dev/null
+++ b/drivers/gpu/drm/i915/gvt/gvt.c
@@ -0,0 +1,145 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#include <linux/types.h>
+#include <xen/xen.h>
+
+#include "i915_drv.h"
+
+struct intel_gvt_host intel_gvt_host;
+
+static const char * const supported_hypervisors[] = {
+        [INTEL_GVT_HYPERVISOR_XEN] = "XEN",
+        [INTEL_GVT_HYPERVISOR_KVM] = "KVM",
+};
+
+/**
+ * intel_gvt_init_host - Load MPT modules and detect if we're running in host
+ * @gvt: intel gvt device
+ *
+ * This function is called at the driver loading stage. If failed to find a
+ * loadable MPT module or detect currently we're running in a VM, then GVT-g
+ * will be disabled
+ *
+ * Returns:
+ * Zero on success, negative error code if failed.
+ *
+ */
+int intel_gvt_init_host(void)
+{
+        if (intel_gvt_host.initialized)
+                return 0;
+
+        /* Xen DOM U */
+        if (xen_domain() && !xen_initial_domain())
+                return -ENODEV;
+
+        /* Try to load MPT modules for hypervisors */
+        if (xen_initial_domain()) {
+                /* In Xen dom0 */
+                intel_gvt_host.mpt = try_then_request_module(
+                                symbol_get(xengt_mpt), "xengt");
+                intel_gvt_host.hypervisor_type = INTEL_GVT_HYPERVISOR_XEN;
+        } else {
+                /* not in Xen. Try KVMGT */
+                intel_gvt_host.mpt = try_then_request_module(
+                                symbol_get(kvmgt_mpt), "kvm");
+                intel_gvt_host.hypervisor_type = INTEL_GVT_HYPERVISOR_KVM;
+        }
+
+        /* Fail to load MPT modules - bail out */
+        if (!intel_gvt_host.mpt)
+                return -EINVAL;
+
+        /* Try to detect if we're running in host instead of VM. */
+        if (!intel_gvt_hypervisor_detect_host())
+                return -ENODEV;
+
+        gvt_dbg_core("Running with hypervisor %s in host mode\n",
+                        supported_hypervisors[intel_gvt_host.hypervisor_type]);
+
+        intel_gvt_host.initialized = true;
+        return 0;
+}
+
+static void init_device_info(struct intel_gvt *gvt)
+{
+        if (IS_BROADWELL(gvt->dev_priv))
+                gvt->device_info.max_support_vgpus = 8;
+        /* This function will grow large in GVT device model patches. */
+}
+
+/**
+ * intel_gvt_clean_device - clean a GVT device
+ * @gvt: intel gvt device
+ *
+ * This function is called at the driver unloading stage, to free the
+ * resources owned by a GVT device.
+ *
+ */
+void intel_gvt_clean_device(struct drm_i915_private *dev_priv)
+{
+        struct intel_gvt *gvt = &dev_priv->gvt;
+
+        if (WARN_ON(!gvt->initialized))
+                return;
+
+        /* Other de-initialization of GVT components will be introduced. */
+
+        gvt->initialized = false;
+}
+
+/**
+ * intel_gvt_init_device - initialize a GVT device
+ * @dev_priv: drm i915 private data
+ *
+ * This function is called at the initialization stage, to initialize
+ * necessary GVT components.
+ *
+ * Returns:
+ * Zero on success, negative error code if failed.
+ *
+ */
+int intel_gvt_init_device(struct drm_i915_private *dev_priv)
+{
+        struct intel_gvt *gvt = &dev_priv->gvt;
+        /*
+         * Cannot initialize GVT device without intel_gvt_host gets
+         * initialized first.
+         */
+        if (WARN_ON(!intel_gvt_host.initialized))
+                return -EINVAL;
+
+        if (WARN_ON(gvt->initialized))
+                return -EEXIST;
+
+        gvt_dbg_core("init gvt device\n");
+
+        init_device_info(gvt);
+        /*
+         * Other initialization of GVT components will be introduce here.
+         */
+        gvt_dbg_core("gvt device creation is done\n");
+        gvt->initialized = true;
+        return 0;
+}
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
new file mode 100644
index 000000000000..fb619a6e519d
--- /dev/null
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef _GVT_H_
+#define _GVT_H_
+
+#include "debug.h"
+#include "hypercall.h"
+
+#define GVT_MAX_VGPU 8
+
+enum {
+        INTEL_GVT_HYPERVISOR_XEN = 0,
+        INTEL_GVT_HYPERVISOR_KVM,
+};
+
+struct intel_gvt_host {
+        bool initialized;
+        int hypervisor_type;
+        struct intel_gvt_mpt *mpt;
+};
+
+extern struct intel_gvt_host intel_gvt_host;
+
+/* Describe per-platform limitations. */
+struct intel_gvt_device_info {
+        u32 max_support_vgpus;
+        /* This data structure will grow bigger in GVT device model patches */
+};
+
+struct intel_vgpu {
+        struct intel_gvt *gvt;
+        int id;
+        unsigned long handle; /* vGPU handle used by hypervisor MPT modules */
+};
+
+struct intel_gvt {
+        struct mutex lock;
+        bool initialized;
+
+        struct drm_i915_private *dev_priv;
+        struct idr vgpu_idr;    /* vGPU IDR pool */
+
+        struct intel_gvt_device_info device_info;
+};
+
+#include "mpt.h"
+
+#endif
diff --git a/drivers/gpu/drm/i915/gvt/hypercall.h b/drivers/gpu/drm/i915/gvt/hypercall.h
new file mode 100644
index 000000000000..254df8bf1f35
--- /dev/null
+++ b/drivers/gpu/drm/i915/gvt/hypercall.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef _GVT_HYPERCALL_H_
+#define _GVT_HYPERCALL_H_
+
+/*
+ * Specific GVT-g MPT modules function collections. Currently GVT-g supports
+ * both Xen and KVM by providing dedicated hypervisor-related MPT modules.
+ */
+struct intel_gvt_mpt {
+        int (*detect_host)(void);
+};
+
+extern struct intel_gvt_mpt xengt_mpt;
+extern struct intel_gvt_mpt kvmgt_mpt;
+
+#endif /* _GVT_HYPERCALL_H_ */
diff --git a/drivers/gpu/drm/i915/gvt/mpt.h b/drivers/gpu/drm/i915/gvt/mpt.h
new file mode 100644
index 000000000000..03601e3ffa7c
--- /dev/null
+++ b/drivers/gpu/drm/i915/gvt/mpt.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef _GVT_MPT_H_
+#define _GVT_MPT_H_
+
+/**
+ * DOC: Hypervisor Service APIs for GVT-g Core Logic
+ *
+ * This is the glue layer between specific hypervisor MPT modules and GVT-g core
+ * logic. Each kind of hypervisor MPT module provides a collection of function
+ * callbacks and will be attached to GVT host when the driver is loading.
+ * GVT-g core logic will call these APIs to request specific services from
+ * hypervisor.
+ */
+
+/**
+ * intel_gvt_hypervisor_detect_host - check if GVT-g is running within
+ * hypervisor host/privilged domain
+ *
+ * Returns:
+ * Zero on success, -ENODEV if current kernel is running inside a VM
+ */
+static inline int intel_gvt_hypervisor_detect_host(void)
+{
+        return intel_gvt_host.mpt->detect_host();
+}
+
+#endif /* _GVT_MPT_H_ */
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index a337f33bec5b..b0fd6a7b0603 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -215,7 +215,8 @@ static const struct drm_i915_cmd_descriptor hsw_render_cmds[] = {
         CMD(  MI_RS_CONTEXT,                    SMI,    F,  1,      S  ),
         CMD(  MI_LOAD_SCAN_LINES_INCL,          SMI,   !F,  0x3F,   M  ),
         CMD(  MI_LOAD_SCAN_LINES_EXCL,          SMI,   !F,  0x3F,   R  ),
-        CMD(  MI_LOAD_REGISTER_REG,             SMI,   !F,  0xFF,   R  ),
+        CMD(  MI_LOAD_REGISTER_REG,             SMI,   !F,  0xFF,   W,
+              .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 1 }    ),
         CMD(  MI_RS_STORE_DATA_IMM,             SMI,   !F,  0xFF,   S  ),
         CMD(  MI_LOAD_URB_MEM,                  SMI,   !F,  0xFF,   S  ),
         CMD(  MI_STORE_URB_MEM,                 SMI,   !F,  0xFF,   S  ),
@@ -736,7 +737,7 @@ static void fini_hash_table(struct intel_engine_cs *engine)
 
 /**
  * i915_cmd_parser_init_ring() - set cmd parser related fields for a ringbuffer
- * @ring: the ringbuffer to initialize
+ * @engine: the engine to initialize
  *
  * Optionally initializes fields related to batch buffer command parsing in the
  * struct intel_engine_cs based on whether the platform requires software
@@ -750,12 +751,12 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine)
         int cmd_table_count;
         int ret;
 
-        if (!IS_GEN7(engine->dev))
+        if (!IS_GEN7(engine->i915))
                 return 0;
 
         switch (engine->id) {
         case RCS:
-                if (IS_HASWELL(engine->dev)) {
+                if (IS_HASWELL(engine->i915)) {
                         cmd_tables = hsw_render_ring_cmds;
                         cmd_table_count =
                                 ARRAY_SIZE(hsw_render_ring_cmds);
@@ -764,7 +765,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine)
                         cmd_table_count = ARRAY_SIZE(gen7_render_cmds);
                 }
 
-                if (IS_HASWELL(engine->dev)) {
+                if (IS_HASWELL(engine->i915)) {
                         engine->reg_tables = hsw_render_reg_tables;
                         engine->reg_table_count = ARRAY_SIZE(hsw_render_reg_tables);
                 } else {
@@ -780,7 +781,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine)
                 engine->get_cmd_length_mask = gen7_bsd_get_cmd_length_mask;
                 break;
         case BCS:
-                if (IS_HASWELL(engine->dev)) {
+                if (IS_HASWELL(engine->i915)) {
                         cmd_tables = hsw_blt_ring_cmds;
                         cmd_table_count = ARRAY_SIZE(hsw_blt_ring_cmds);
                 } else {
@@ -788,7 +789,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine)
                         cmd_table_count = ARRAY_SIZE(gen7_blt_cmds);
                 }
 
-                if (IS_HASWELL(engine->dev)) {
+                if (IS_HASWELL(engine->i915)) {
                         engine->reg_tables = hsw_blt_reg_tables;
                         engine->reg_table_count = ARRAY_SIZE(hsw_blt_reg_tables);
                 } else {
@@ -829,7 +830,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine)
 
 /**
  * i915_cmd_parser_fini_ring() - clean up cmd parser related fields
- * @ring: the ringbuffer to clean up
+ * @engine: the engine to clean up
  *
  * Releases any resources related to command parsing that may have been
  * initialized for the specified ring.
@@ -1023,7 +1024,7 @@ unpin_src:
 
 /**
  * i915_needs_cmd_parser() - should a given ring use software command parsing?
- * @ring: the ring in question
+ * @engine: the engine in question
  *
  * Only certain platforms require software batch buffer command parsing, and
  * only when enabled via module parameter.
@@ -1035,7 +1036,7 @@ bool i915_needs_cmd_parser(struct intel_engine_cs *engine)
         if (!engine->needs_cmd_parser)
                 return false;
 
-        if (!USES_PPGTT(engine->dev))
+        if (!USES_PPGTT(engine->i915))
                 return false;
 
         return (i915.enable_cmd_parser == 1);
@@ -1098,6 +1099,11 @@ static bool check_cmd(const struct intel_engine_cs *engine,
                                         return false;
                                 }
 
+                                if (desc->cmd.value == MI_LOAD_REGISTER_REG) {
+                                        DRM_DEBUG_DRIVER("CMD: Rejected LRR to OACONTROL\n");
+                                        return false;
+                                }
+
                                 if (desc->cmd.value == MI_LOAD_REGISTER_IMM(1))
                                         *oacontrol_set = (cmd[offset + 1] != 0);
                         }
@@ -1113,6 +1119,12 @@ static bool check_cmd(const struct intel_engine_cs *engine,
                                         return false;
                                 }
 
+                                if (desc->cmd.value == MI_LOAD_REGISTER_REG) {
+                                        DRM_DEBUG_DRIVER("CMD: Rejected LRR to masked register 0x%08X\n",
+                                                         reg_addr);
+                                        return false;
+                                }
+
                                 if (desc->cmd.value == MI_LOAD_REGISTER_IMM(1) &&
                                     (offset + 2 > length ||
                                      (cmd[offset + 1] & reg->mask) != reg->value)) {
@@ -1164,7 +1176,7 @@ static bool check_cmd(const struct intel_engine_cs *engine,
 
 /**
  * i915_parse_cmds() - parse a submitted batch buffer for privilege violations
- * @ring: the ring on which the batch is to execute
+ * @engine: the engine on which the batch is to execute
  * @batch_obj: the batch buffer in question
  * @shadow_batch_obj: copy of the batch buffer in question
  * @batch_start_offset: byte offset in the batch at which execution starts
@@ -1269,14 +1281,28 @@ int i915_parse_cmds(struct intel_engine_cs *engine,
 
 /**
  * i915_cmd_parser_get_version() - get the cmd parser version number
+ * @dev_priv: i915 device private
  *
  * The cmd parser maintains a simple increasing integer version number suitable
  * for passing to userspace clients to determine what operations are permitted.
  *
  * Return: the current version number of the cmd parser
  */
-int i915_cmd_parser_get_version(void)
+int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv)
 {
+        struct intel_engine_cs *engine;
+        bool active = false;
+
+        /* If the command parser is not enabled, report 0 - unsupported */
+        for_each_engine(engine, dev_priv) {
+                if (i915_needs_cmd_parser(engine)) {
+                        active = true;
+                        break;
+                }
+        }
+        if (!active)
+                return 0;
+
         /*
          * Command parser version history
          *
@@ -1288,6 +1314,7 @@ int i915_cmd_parser_get_version(void)
          * 4. L3 atomic chicken bits of HSW_SCRATCH1 and HSW_ROW_CHICKEN3.
          * 5. GPGPU dispatch compute indirect registers.
          * 6. TIMESTAMP register and Haswell CS GPR registers
+         * 7. Allow MI_LOAD_REGISTER_REG between whitelisted registers.
          */
-        return 6;
+        return 7;
 }
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 32690332d441..5b7526697838 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -89,17 +89,17 @@ static int i915_capabilities(struct seq_file *m, void *data)
         return 0;
 }
 
-static const char get_active_flag(struct drm_i915_gem_object *obj)
+static char get_active_flag(struct drm_i915_gem_object *obj)
 {
         return obj->active ? '*' : ' ';
 }
 
-static const char get_pin_flag(struct drm_i915_gem_object *obj)
+static char get_pin_flag(struct drm_i915_gem_object *obj)
 {
         return obj->pin_display ? 'p' : ' ';
 }
 
-static const char get_tiling_flag(struct drm_i915_gem_object *obj)
+static char get_tiling_flag(struct drm_i915_gem_object *obj)
 {
         switch (obj->tiling_mode) {
         default:
@@ -109,12 +109,12 @@ static const char get_tiling_flag(struct drm_i915_gem_object *obj)
         }
 }
 
-static inline const char get_global_flag(struct drm_i915_gem_object *obj)
+static char get_global_flag(struct drm_i915_gem_object *obj)
 {
         return i915_gem_obj_to_ggtt(obj) ? 'g' : ' ';
 }
 
-static inline const char get_pin_mapped_flag(struct drm_i915_gem_object *obj)
+static char get_pin_mapped_flag(struct drm_i915_gem_object *obj)
 {
         return obj->mapping ? 'M' : ' ';
 }
@@ -199,13 +199,6 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
                 seq_printf(m, " (frontbuffer: 0x%03x)", obj->frontbuffer_bits);
 }
 
-static void describe_ctx(struct seq_file *m, struct intel_context *ctx)
-{
-        seq_putc(m, ctx->legacy_hw_ctx.initialized ? 'I' : 'i');
-        seq_putc(m, ctx->remap_slice ? 'R' : 'r');
-        seq_putc(m, ' ');
-}
-
 static int i915_gem_object_list_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
@@ -424,6 +417,42 @@ static void print_batch_pool_stats(struct seq_file *m,
         print_file_stats(m, "[k]batch pool", stats);
 }
 
+static int per_file_ctx_stats(int id, void *ptr, void *data)
+{
+        struct i915_gem_context *ctx = ptr;
+        int n;
+
+        for (n = 0; n < ARRAY_SIZE(ctx->engine); n++) {
+                if (ctx->engine[n].state)
+                        per_file_stats(0, ctx->engine[n].state, data);
+                if (ctx->engine[n].ringbuf)
+                        per_file_stats(0, ctx->engine[n].ringbuf->obj, data);
+        }
+
+        return 0;
+}
+
+static void print_context_stats(struct seq_file *m,
+                                struct drm_i915_private *dev_priv)
+{
+        struct file_stats stats;
+        struct drm_file *file;
+
+        memset(&stats, 0, sizeof(stats));
+
+        mutex_lock(&dev_priv->dev->struct_mutex);
+        if (dev_priv->kernel_context)
+                per_file_ctx_stats(0, dev_priv->kernel_context, &stats);
+
+        list_for_each_entry(file, &dev_priv->dev->filelist, lhead) {
+                struct drm_i915_file_private *fpriv = file->driver_priv;
+                idr_for_each(&fpriv->context_idr, per_file_ctx_stats, &stats);
+        }
+        mutex_unlock(&dev_priv->dev->struct_mutex);
+
+        print_file_stats(m, "[k]contexts", stats);
+}
+
 #define count_vmas(list, member) do { \
         list_for_each_entry(vma, list, member) { \
                 size += i915_gem_obj_total_ggtt_size(vma->obj); \
@@ -528,10 +557,10 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
 
         seq_putc(m, '\n');
         print_batch_pool_stats(m, dev_priv);
-
         mutex_unlock(&dev->struct_mutex);
 
         mutex_lock(&dev->filelist_mutex);
+        print_context_stats(m, dev_priv);
         list_for_each_entry_reverse(file, &dev->filelist, lhead) {
                 struct file_stats stats;
                 struct task_struct *task;
@@ -607,18 +636,20 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
         for_each_intel_crtc(dev, crtc) {
                 const char pipe = pipe_name(crtc->pipe);
                 const char plane = plane_name(crtc->plane);
-                struct intel_unpin_work *work;
+                struct intel_flip_work *work;
 
                 spin_lock_irq(&dev->event_lock);
-                work = crtc->unpin_work;
+                work = crtc->flip_work;
                 if (work == NULL) {
                         seq_printf(m, "No flip due on pipe %c (plane %c)\n",
                                    pipe, plane);
                 } else {
+                        u32 pending;
                         u32 addr;
 
-                        if (atomic_read(&work->pending) < INTEL_FLIP_COMPLETE) {
-                                seq_printf(m, "Flip queued on pipe %c (plane %c)\n",
+                        pending = atomic_read(&work->pending);
+                        if (pending) {
+                                seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n",
                                            pipe, plane);
                         } else {
                                 seq_printf(m, "Flip pending (waiting for vsync) on pipe %c (plane %c)\n",
@@ -638,11 +669,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
                         seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n",
                                    work->flip_queued_vblank,
                                    work->flip_ready_vblank,
-                                   drm_crtc_vblank_count(&crtc->base));
-                        if (work->enable_stall_check)
-                                seq_puts(m, "Stall check enabled, ");
-                        else
-                                seq_puts(m, "Stall check waiting for page flip ioctl, ");
+                                   intel_crtc_get_vblank_counter(crtc));
                         seq_printf(m, "%d prepares\n", atomic_read(&work->pending));
 
                         if (INTEL_INFO(dev)->gen >= 4)
@@ -1281,6 +1308,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
                 }
                 seq_printf(m, "PM IER=0x%08x IMR=0x%08x ISR=0x%08x IIR=0x%08x, MASK=0x%08x\n",
                            pm_ier, pm_imr, pm_isr, pm_iir, pm_mask);
+                seq_printf(m, "pm_intr_keep: 0x%08x\n", dev_priv->rps.pm_intr_keep);
                 seq_printf(m, "GT_PERF_STATUS: 0x%08x\n", gt_perf_status);
                 seq_printf(m, "Render p-state ratio: %d\n",
                            (gt_perf_status & (IS_GEN9(dev) ? 0x1ff00 : 0xff00)) >> 8);
@@ -1383,7 +1411,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
                 seqno[id] = engine->get_seqno(engine);
         }
 
-        i915_get_extra_instdone(dev, instdone);
+        i915_get_extra_instdone(dev_priv, instdone);
 
         intel_runtime_pm_put(dev_priv);
 
@@ -1991,8 +2019,7 @@ static int i915_context_status(struct seq_file *m, void *unused)
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
-        struct intel_context *ctx;
-        enum intel_engine_id id;
+        struct i915_gem_context *ctx;
         int ret;
 
         ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -2000,32 +2027,36 @@ static int i915_context_status(struct seq_file *m, void *unused)
                 return ret;
 
         list_for_each_entry(ctx, &dev_priv->context_list, link) {
-                if (!i915.enable_execlists &&
-                    ctx->legacy_hw_ctx.rcs_state == NULL)
-                        continue;
-
-                seq_puts(m, "HW context ");
-                describe_ctx(m, ctx);
-                if (ctx == dev_priv->kernel_context)
-                        seq_printf(m, "(kernel context) ");
+                seq_printf(m, "HW context %u ", ctx->hw_id);
+                if (IS_ERR(ctx->file_priv)) {
+                        seq_puts(m, "(deleted) ");
+                } else if (ctx->file_priv) {
+                        struct pid *pid = ctx->file_priv->file->pid;
+                        struct task_struct *task;
 
-                if (i915.enable_execlists) {
-                        seq_putc(m, '\n');
-                        for_each_engine_id(engine, dev_priv, id) {
-                                struct drm_i915_gem_object *ctx_obj =
-                                        ctx->engine[id].state;
-                                struct intel_ringbuffer *ringbuf =
-                                        ctx->engine[id].ringbuf;
-
-                                seq_printf(m, "%s: ", engine->name);
-                                if (ctx_obj)
-                                        describe_obj(m, ctx_obj);
-                                if (ringbuf)
-                                        describe_ctx_ringbuf(m, ringbuf);
-                                seq_putc(m, '\n');
+                        task = get_pid_task(pid, PIDTYPE_PID);
+                        if (task) {
+                                seq_printf(m, "(%s [%d]) ",
+                                           task->comm, task->pid);
+                                put_task_struct(task);
                         }
                 } else {
-                        describe_obj(m, ctx->legacy_hw_ctx.rcs_state);
+                        seq_puts(m, "(kernel) ");
+                }
+
+                seq_putc(m, ctx->remap_slice ? 'R' : 'r');
+                seq_putc(m, '\n');
+
+                for_each_engine(engine, dev_priv) {
+                        struct intel_context *ce = &ctx->engine[engine->id];
+
+                        seq_printf(m, "%s: ", engine->name);
+                        seq_putc(m, ce->initialised ? 'I' : 'i');
+                        if (ce->state)
+                                describe_obj(m, ce->state);
+                        if (ce->ringbuf)
+                                describe_ctx_ringbuf(m, ce->ringbuf);
+                        seq_putc(m, '\n');
                 }
 
                 seq_putc(m, '\n');
@@ -2037,24 +2068,22 @@ static int i915_context_status(struct seq_file *m, void *unused)
 }
 
 static void i915_dump_lrc_obj(struct seq_file *m,
-                              struct intel_context *ctx,
+                              struct i915_gem_context *ctx,
                               struct intel_engine_cs *engine)
 {
+        struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state;
         struct page *page;
         uint32_t *reg_state;
         int j;
-        struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state;
         unsigned long ggtt_offset = 0;
 
+        seq_printf(m, "CONTEXT: %s %u\n", engine->name, ctx->hw_id);
+
         if (ctx_obj == NULL) {
-                seq_printf(m, "Context on %s with no gem object\n",
-                           engine->name);
+                seq_puts(m, "\tNot allocated\n");
                 return;
         }
 
-        seq_printf(m, "CONTEXT: %s %u\n", engine->name,
-                   intel_execlists_ctx_id(ctx, engine));
-
         if (!i915_gem_obj_ggtt_bound(ctx_obj))
                 seq_puts(m, "\tNot bound in GGTT\n");
         else
@@ -2087,7 +2116,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         int ret;
 
         if (!i915.enable_execlists) {
@@ -2100,9 +2129,8 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)
                 return ret;
 
         list_for_each_entry(ctx, &dev_priv->context_list, link)
-                if (ctx != dev_priv->kernel_context)
-                        for_each_engine(engine, dev_priv)
-                                i915_dump_lrc_obj(m, ctx, engine);
+                for_each_engine(engine, dev_priv)
+                        i915_dump_lrc_obj(m, ctx, engine);
 
         mutex_unlock(&dev->struct_mutex);
 
@@ -2173,8 +2201,8 @@ static int i915_execlists(struct seq_file *m, void *data)
 
                 seq_printf(m, "\t%d requests in queue\n", count);
                 if (head_req) {
-                        seq_printf(m, "\tHead request id: %u\n",
-                                   intel_execlists_ctx_id(head_req->ctx, engine));
+                        seq_printf(m, "\tHead request context: %u\n",
+                                   head_req->ctx->hw_id);
                         seq_printf(m, "\tHead request tail: %u\n",
                                    head_req->tail);
                 }
@@ -2268,7 +2296,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
 
 static int per_file_ctx(int id, void *ptr, void *data)
 {
-        struct intel_context *ctx = ptr;
+        struct i915_gem_context *ctx = ptr;
         struct seq_file *m = data;
         struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
 
@@ -2313,12 +2341,12 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
 
-        if (INTEL_INFO(dev)->gen == 6)
+        if (IS_GEN6(dev_priv))
                 seq_printf(m, "GFX_MODE: 0x%08x\n", I915_READ(GFX_MODE));
 
         for_each_engine(engine, dev_priv) {
                 seq_printf(m, "%s\n", engine->name);
-                if (INTEL_INFO(dev)->gen == 7)
+                if (IS_GEN7(dev_priv))
                         seq_printf(m, "GFX_MODE: 0x%08x\n",
                                    I915_READ(RING_MODE_GEN7(engine)));
                 seq_printf(m, "PP_DIR_BASE: 0x%08x\n",
@@ -2365,16 +2393,16 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
                 task = get_pid_task(file->pid, PIDTYPE_PID);
                 if (!task) {
                         ret = -ESRCH;
-                        goto out_put;
+                        goto out_unlock;
                 }
                 seq_printf(m, "\nproc: %s\n", task->comm);
                 put_task_struct(task);
                 idr_for_each(&file_priv->context_idr, per_file_ctx,
                              (void *)(unsigned long)m);
         }
+out_unlock:
         mutex_unlock(&dev->filelist_mutex);
 
-out_put:
         intel_runtime_pm_put(dev_priv);
         mutex_unlock(&dev->struct_mutex);
 
@@ -2509,6 +2537,7 @@ static void i915_guc_client_info(struct seq_file *m,
         seq_printf(m, "\tWQ size %d, offset: 0x%x, tail %d\n",
                 client->wq_size, client->wq_offset, client->wq_tail);
 
+        seq_printf(m, "\tWork queue full: %u\n", client->no_wq_space);
         seq_printf(m, "\tFailed to queue: %u\n", client->q_fail);
         seq_printf(m, "\tFailed doorbell: %u\n", client->b_fail);
         seq_printf(m, "\tLast submission result: %d\n", client->retcode);
@@ -2545,6 +2574,10 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
         mutex_unlock(&dev->struct_mutex);
 
+        seq_printf(m, "Doorbell map:\n");
+        seq_printf(m, "\t%*pb\n", GUC_MAX_DOORBELLS, guc.doorbell_bitmap);
+        seq_printf(m, "Doorbell next cacheline: 0x%x\n\n", guc.db_cacheline);
+
         seq_printf(m, "GuC total action count: %llu\n", guc.action_count);
         seq_printf(m, "GuC action failure count: %u\n", guc.action_fail);
         seq_printf(m, "GuC last action command: 0x%x\n", guc.action_cmd);
@@ -3168,7 +3201,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)
         enum intel_engine_id id;
         int j, ret;
 
-        if (!i915_semaphore_is_enabled(dev)) {
+        if (!i915_semaphore_is_enabled(dev_priv)) {
                 seq_puts(m, "Semaphores are disabled\n");
                 return 0;
         }
@@ -4769,7 +4802,7 @@ i915_wedged_set(void *data, u64 val)
 
         intel_runtime_pm_get(dev_priv);
 
-        i915_handle_error(dev, val,
+        i915_handle_error(dev_priv, val,
                           "Manually setting wedged to %llu", val);
 
         intel_runtime_pm_put(dev_priv);
@@ -4919,7 +4952,7 @@ i915_drop_caches_set(void *data, u64 val)
         }
 
         if (val & (DROP_RETIRE | DROP_ACTIVE))
-                i915_gem_retire_requests(dev);
+                i915_gem_retire_requests(dev_priv);
 
         if (val & DROP_BOUND)
                 i915_gem_shrink(dev_priv, LONG_MAX, I915_SHRINK_BOUND);
@@ -4993,7 +5026,7 @@ i915_max_freq_set(void *data, u64 val)
 
         dev_priv->rps.max_freq_softlimit = val;
 
-        intel_set_rps(dev, val);
+        intel_set_rps(dev_priv, val);
 
         mutex_unlock(&dev_priv->rps.hw_lock);
 
@@ -5060,7 +5093,7 @@ i915_min_freq_set(void *data, u64 val)
 
         dev_priv->rps.min_freq_softlimit = val;
 
-        intel_set_rps(dev, val);
+        intel_set_rps(dev_priv, val);
 
         mutex_unlock(&dev_priv->rps.hw_lock);
 
@@ -5277,6 +5310,10 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
                    INTEL_INFO(dev)->eu_total);
         seq_printf(m, "  Available EU Per Subslice: %u\n",
                    INTEL_INFO(dev)->eu_per_subslice);
+        seq_printf(m, "  Has Pooled EU: %s\n", yesno(HAS_POOLED_EU(dev)));
+        if (HAS_POOLED_EU(dev))
+                seq_printf(m, "  Min EU in pool: %u\n",
+                           INTEL_INFO(dev)->min_eu_in_pool);
         seq_printf(m, "  Has Slice Power Gating: %s\n",
                    yesno(INTEL_INFO(dev)->has_slice_pg));
         seq_printf(m, "  Has Subslice Power Gating: %s\n",
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index b3198fcd0536..d15a461fa84a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -186,7 +186,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
                 value = 1;
                 break;
         case I915_PARAM_HAS_SEMAPHORES:
-                value = i915_semaphore_is_enabled(dev);
+                value = i915_semaphore_is_enabled(dev_priv);
                 break;
         case I915_PARAM_HAS_PRIME_VMAP_FLUSH:
                 value = 1;
@@ -204,7 +204,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
                 value = 1;
                 break;
         case I915_PARAM_CMD_PARSER_VERSION:
-                value = i915_cmd_parser_get_version();
+                value = i915_cmd_parser_get_version(dev_priv);
                 break;
         case I915_PARAM_HAS_COHERENT_PHYS_GTT:
                 value = 1;
@@ -223,8 +223,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
                         return -ENODEV;
                 break;
         case I915_PARAM_HAS_GPU_RESET:
-                value = i915.enable_hangcheck &&
-                        intel_has_gpu_reset(dev);
+                value = i915.enable_hangcheck && intel_has_gpu_reset(dev_priv);
                 break;
         case I915_PARAM_HAS_RESOURCE_STREAMER:
                 value = HAS_RESOURCE_STREAMER(dev);
@@ -425,6 +424,43 @@ static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
         .can_switch = i915_switcheroo_can_switch,
 };
 
+static void i915_gem_fini(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = to_i915(dev);
+
+        /*
+         * Neither the BIOS, ourselves or any other kernel
+         * expects the system to be in execlists mode on startup,
+         * so we need to reset the GPU back to legacy mode. And the only
+         * known way to disable logical contexts is through a GPU reset.
+         *
+         * So in order to leave the system in a known default configuration,
+         * always reset the GPU upon unload. Afterwards we then clean up the
+         * GEM state tracking, flushing off the requests and leaving the
+         * system in a known idle state.
+         *
+         * Note that is of the upmost importance that the GPU is idle and
+         * all stray writes are flushed *before* we dismantle the backing
+         * storage for the pinned objects.
+         *
+         * However, since we are uncertain that reseting the GPU on older
+         * machines is a good idea, we don't - just in case it leaves the
+         * machine in an unusable condition.
+         */
+        if (HAS_HW_CONTEXTS(dev)) {
+                int reset = intel_gpu_reset(dev_priv, ALL_ENGINES);
+                WARN_ON(reset && reset != -ENODEV);
+        }
+
+        mutex_lock(&dev->struct_mutex);
+        i915_gem_reset(dev);
+        i915_gem_cleanup_engines(dev);
+        i915_gem_context_fini(dev);
+        mutex_unlock(&dev->struct_mutex);
+
+        WARN_ON(!list_empty(&to_i915(dev)->context_list));
+}
+
 static int i915_load_modeset_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -454,6 +490,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
         if (ret)
                 goto cleanup_vga_client;
 
+        /* must happen before intel_power_domains_init_hw() on VLV/CHV */
+        intel_update_rawclk(dev_priv);
+
         intel_power_domains_init_hw(dev_priv, false);
 
         intel_csr_ucode_init(dev_priv);
@@ -468,7 +507,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
          * working irqs for e.g. gmbus and dp aux transfers. */
         intel_modeset_init(dev);
 
-        intel_guc_ucode_init(dev);
+        intel_guc_init(dev);
 
         ret = i915_gem_init(dev);
         if (ret)
@@ -503,12 +542,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
         return 0;
 
 cleanup_gem:
-        mutex_lock(&dev->struct_mutex);
-        i915_gem_cleanup_engines(dev);
-        i915_gem_context_fini(dev);
-        mutex_unlock(&dev->struct_mutex);
+        i915_gem_fini(dev);
 cleanup_irq:
-        intel_guc_ucode_fini(dev);
+        intel_guc_fini(dev);
         drm_irq_uninstall(dev);
         intel_teardown_gmbus(dev);
 cleanup_csr:
@@ -728,6 +764,32 @@ static void gen9_sseu_info_init(struct drm_device *dev)
                                (info->slice_total > 1));
         info->has_subslice_pg = (IS_BROXTON(dev) && (info->subslice_total > 1));
         info->has_eu_pg = (info->eu_per_subslice > 2);
+
+        if (IS_BROXTON(dev)) {
+#define IS_SS_DISABLED(_ss_disable, ss)    (_ss_disable & (0x1 << ss))
+                /*
+                 * There is a HW issue in 2x6 fused down parts that requires
+                 * Pooled EU to be enabled as a WA. The pool configuration
+                 * changes depending upon which subslice is fused down. This
+                 * doesn't affect if the device has all 3 subslices enabled.
+                 */
+                /* WaEnablePooledEuFor2x6:bxt */
+                info->has_pooled_eu = ((info->subslice_per_slice == 3) ||
+                                       (info->subslice_per_slice == 2 &&
+                                        INTEL_REVID(dev) < BXT_REVID_C0));
+
+                info->min_eu_in_pool = 0;
+                if (info->has_pooled_eu) {
+                        if (IS_SS_DISABLED(ss_disable, 0) ||
+                            IS_SS_DISABLED(ss_disable, 2))
+                                info->min_eu_in_pool = 3;
+                        else if (IS_SS_DISABLED(ss_disable, 1))
+                                info->min_eu_in_pool = 6;
+                        else
+                                info->min_eu_in_pool = 9;
+                }
+#undef IS_SS_DISABLED
+        }
 }
 
 static void broadwell_sseu_info_init(struct drm_device *dev)
@@ -850,7 +912,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev)
                 DRM_INFO("Display disabled (module parameter)\n");
                 info->num_pipes = 0;
         } else if (info->num_pipes > 0 &&
-                   (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) &&
+                   (IS_GEN7(dev_priv) || IS_GEN8(dev_priv)) &&
                    HAS_PCH_SPLIT(dev)) {
                 u32 fuse_strap = I915_READ(FUSE_STRAP);
                 u32 sfuse_strap = I915_READ(SFUSE_STRAP);
@@ -874,7 +936,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev)
                         DRM_INFO("PipeC fused off\n");
                         info->num_pipes -= 1;
                 }
-        } else if (info->num_pipes > 0 && INTEL_INFO(dev)->gen == 9) {
+        } else if (info->num_pipes > 0 && IS_GEN9(dev_priv)) {
                 u32 dfsm = I915_READ(SKL_DFSM);
                 u8 disabled_mask = 0;
                 bool invalid;
@@ -915,21 +977,40 @@ static void intel_device_info_runtime_init(struct drm_device *dev)
         else if (INTEL_INFO(dev)->gen >= 9)
                 gen9_sseu_info_init(dev);
 
-        /* Snooping is broken on BXT A stepping. */
         info->has_snoop = !info->has_llc;
-        info->has_snoop &= !IS_BXT_REVID(dev, 0, BXT_REVID_A1);
+
+        /* Snooping is broken on BXT A stepping. */
+        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+                info->has_snoop = false;
 
         DRM_DEBUG_DRIVER("slice total: %u\n", info->slice_total);
         DRM_DEBUG_DRIVER("subslice total: %u\n", info->subslice_total);
         DRM_DEBUG_DRIVER("subslice per slice: %u\n", info->subslice_per_slice);
         DRM_DEBUG_DRIVER("EU total: %u\n", info->eu_total);
         DRM_DEBUG_DRIVER("EU per subslice: %u\n", info->eu_per_subslice);
+        DRM_DEBUG_DRIVER("Has Pooled EU: %s\n", HAS_POOLED_EU(dev) ? "y" : "n");
+        if (HAS_POOLED_EU(dev))
+                DRM_DEBUG_DRIVER("Min EU in pool: %u\n", info->min_eu_in_pool);
         DRM_DEBUG_DRIVER("has slice power gating: %s\n",
                          info->has_slice_pg ? "y" : "n");
         DRM_DEBUG_DRIVER("has subslice power gating: %s\n",
                          info->has_subslice_pg ? "y" : "n");
         DRM_DEBUG_DRIVER("has EU power gating: %s\n",
                          info->has_eu_pg ? "y" : "n");
+
+        i915.enable_execlists =
+                intel_sanitize_enable_execlists(dev_priv,
+                                                i915.enable_execlists);
+
+        /*
+         * i915.enable_ppgtt is read-only, so do an early pass to validate the
+         * user's requested state against the hardware/driver capabilities.  We
+         * do this now so that we can print out any log messages once rather
+         * than every time we check intel_enable_ppgtt().
+         */
+        i915.enable_ppgtt =
+                intel_sanitize_enable_ppgtt(dev_priv, i915.enable_ppgtt);
+        DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915.enable_ppgtt);
 }
 
 static void intel_init_dpio(struct drm_i915_private *dev_priv)
@@ -1020,6 +1101,9 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
         memcpy(device_info, info, sizeof(dev_priv->info));
         device_info->device_id = dev->pdev->device;
 
+        BUG_ON(device_info->gen > sizeof(device_info->gen_mask) * BITS_PER_BYTE);
+        device_info->gen_mask = BIT(device_info->gen - 1);
+
         spin_lock_init(&dev_priv->irq_lock);
         spin_lock_init(&dev_priv->gpu_error.lock);
         mutex_init(&dev_priv->backlight_lock);
@@ -1036,6 +1120,10 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
         if (ret < 0)
                 return ret;
 
+        ret = intel_gvt_init(dev_priv);
+        if (ret < 0)
+                goto err_workqueues;
+
         /* This must be called before any calls to HAS_PCH_* */
         intel_detect_pch(dev);
 
@@ -1061,6 +1149,10 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
                          "It may not be fully functional.\n");
 
         return 0;
+
+err_workqueues:
+        i915_workqueues_cleanup(dev_priv);
+        return ret;
 }
 
 /**
@@ -1137,7 +1229,7 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)
         if (ret < 0)
                 goto put_bridge;
 
-        intel_uncore_init(dev);
+        intel_uncore_init(dev_priv);
 
         return 0;
 
@@ -1155,7 +1247,7 @@ static void i915_driver_cleanup_mmio(struct drm_i915_private *dev_priv)
 {
         struct drm_device *dev = dev_priv->dev;
 
-        intel_uncore_fini(dev);
+        intel_uncore_fini(dev_priv);
         i915_mmio_cleanup(dev);
         pci_dev_put(dev_priv->bridge_dev);
 }
@@ -1206,8 +1298,15 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
         pci_set_master(dev->pdev);
 
         /* overlay on gen2 is broken and can't address above 1G */
-        if (IS_GEN2(dev))
-                dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(30));
+        if (IS_GEN2(dev)) {
+                ret = dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(30));
+                if (ret) {
+                        DRM_ERROR("failed to set DMA mask\n");
+
+                        goto out_ggtt;
+                }
+        }
+
 
         /* 965GM sometimes incorrectly writes to hardware status page (HWS)
          * using 32bit addressing, overwriting memory if HWS is located
@@ -1217,8 +1316,15 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
          * behaviour if any general state is accessed within a page above 4GB,
          * which also needs to be handled carefully.
          */
-        if (IS_BROADWATER(dev) || IS_CRESTLINE(dev))
-                dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(32));
+        if (IS_BROADWATER(dev) || IS_CRESTLINE(dev)) {
+                ret = dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(32));
+
+                if (ret) {
+                        DRM_ERROR("failed to set DMA mask\n");
+
+                        goto out_ggtt;
+                }
+        }
 
         aperture_size = ggtt->mappable_end;
 
@@ -1236,9 +1342,9 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
         pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY,
                            PM_QOS_DEFAULT_VALUE);
 
-        intel_uncore_sanitize(dev);
+        intel_uncore_sanitize(dev_priv);
 
-        intel_opregion_setup(dev);
+        intel_opregion_setup(dev_priv);
 
         i915_gem_load_init_fences(dev_priv);
 
@@ -1300,14 +1406,14 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
          * Notify a valid surface after modesetting,
          * when running inside a VM.
          */
-        if (intel_vgpu_active(dev))
+        if (intel_vgpu_active(dev_priv))
                 I915_WRITE(vgtif_reg(display_ready), VGT_DRV_DISPLAY_READY);
 
         i915_setup_sysfs(dev);
 
         if (INTEL_INFO(dev_priv)->num_pipes) {
                 /* Must be done after probing outputs */
-                intel_opregion_init(dev);
+                intel_opregion_register(dev_priv);
                 acpi_video_register();
         }
 
@@ -1326,7 +1432,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
         i915_audio_component_cleanup(dev_priv);
         intel_gpu_ips_teardown();
         acpi_video_unregister();
-        intel_opregion_fini(dev_priv->dev);
+        intel_opregion_unregister(dev_priv);
         i915_teardown_sysfs(dev_priv->dev);
         i915_gem_shrinker_cleanup(dev_priv);
 }
@@ -1418,6 +1524,8 @@ int i915_driver_unload(struct drm_device *dev)
 
         intel_fbdev_fini(dev);
 
+        intel_gvt_cleanup(dev_priv);
+
         ret = i915_gem_suspend(dev);
         if (ret) {
                 DRM_ERROR("failed to idle hardware: %d\n", ret);
@@ -1458,11 +1566,8 @@ int i915_driver_unload(struct drm_device *dev)
         /* Flush any outstanding unpin_work. */
         flush_workqueue(dev_priv->wq);
 
-        intel_guc_ucode_fini(dev);
-        mutex_lock(&dev->struct_mutex);
-        i915_gem_cleanup_engines(dev);
-        i915_gem_context_fini(dev);
-        mutex_unlock(&dev->struct_mutex);
+        intel_guc_fini(dev);
+        i915_gem_fini(dev);
         intel_fbc_cleanup_cfb(dev_priv);
 
         intel_power_domains_fini(dev_priv);
@@ -1570,15 +1675,15 @@ const struct drm_ioctl_desc i915_ioctls[] = {
         DRM_IOCTL_DEF_DRV(I915_GEM_GET_APERTURE, i915_gem_get_aperture_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GET_PIPE_FROM_CRTC_ID, intel_get_pipe_from_crtc_id, 0),
         DRM_IOCTL_DEF_DRV(I915_GEM_MADVISE, i915_gem_madvise_ioctl, DRM_RENDER_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image, DRM_MASTER|DRM_CONTROL_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs, DRM_MASTER|DRM_CONTROL_ALLOW),
+        DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
+        DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER|DRM_CONTROL_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_RENDER_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_get_reset_stats_ioctl, DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_gem_context_reset_stats_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_SETPARAM, i915_gem_context_setparam_ioctl, DRM_RENDER_ALLOW),
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f313b4d8344f..3eb47fbcea73 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -35,11 +35,9 @@
 #include "i915_trace.h"
 #include "intel_drv.h"
 
-#include <linux/apple-gmux.h>
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
-#include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 #include <drm/drm_crtc_helper.h>
 
@@ -300,22 +298,26 @@ static const struct intel_device_info intel_haswell_m_info = {
 static const struct intel_device_info intel_broadwell_d_info = {
         BDW_FEATURES,
         .gen = 8,
+        .is_broadwell = 1,
 };
 
 static const struct intel_device_info intel_broadwell_m_info = {
         BDW_FEATURES,
         .gen = 8, .is_mobile = 1,
+        .is_broadwell = 1,
 };
 
 static const struct intel_device_info intel_broadwell_gt3d_info = {
         BDW_FEATURES,
         .gen = 8,
+        .is_broadwell = 1,
         .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
 
 static const struct intel_device_info intel_broadwell_gt3m_info = {
         BDW_FEATURES,
         .gen = 8, .is_mobile = 1,
+        .is_broadwell = 1,
         .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
 
@@ -353,6 +355,7 @@ static const struct intel_device_info intel_broxton_info = {
         .has_ddi = 1,
         .has_fpga_dbg = 1,
         .has_fbc = 1,
+        .has_pooled_eu = 0,
         GEN_DEFAULT_PIPEOFFSETS,
         IVB_CURSOR_OFFSETS,
         BDW_COLORS,
@@ -515,8 +518,10 @@ void intel_detect_pch(struct drm_device *dev)
                         } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
                                    (id == INTEL_PCH_P3X_DEVICE_ID_TYPE) ||
                                    ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
-                                    pch->subsystem_vendor == 0x1af4 &&
-                                    pch->subsystem_device == 0x1100)) {
+                                    pch->subsystem_vendor ==
+                                            PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
+                                    pch->subsystem_device ==
+                                            PCI_SUBDEVICE_ID_QEMU)) {
                                 dev_priv->pch_type = intel_virt_detect_pch(dev);
                         } else
                                 continue;
@@ -530,9 +535,9 @@ void intel_detect_pch(struct drm_device *dev)
         pci_dev_put(pch);
 }
 
-bool i915_semaphore_is_enabled(struct drm_device *dev)
+bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv)
 {
-        if (INTEL_INFO(dev)->gen < 6)
+        if (INTEL_GEN(dev_priv) < 6)
                 return false;
 
         if (i915.semaphores >= 0)
@@ -542,13 +547,9 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
         if (i915.enable_execlists)
                 return false;
 
-        /* Until we get further testing... */
-        if (IS_GEN8(dev))
-                return false;
-
 #ifdef CONFIG_INTEL_IOMMU
         /* Enable semaphores on SNB when IO remapping is off */
-        if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped)
+        if (IS_GEN6(dev_priv) && intel_iommu_gfx_mapped)
                 return false;
 #endif
 
@@ -610,7 +611,7 @@ static int i915_drm_suspend(struct drm_device *dev)
 
         intel_guc_suspend(dev);
 
-        intel_suspend_gt_powersave(dev);
+        intel_suspend_gt_powersave(dev_priv);
 
         intel_display_suspend(dev);
 
@@ -628,10 +629,10 @@ static int i915_drm_suspend(struct drm_device *dev)
         i915_save_state(dev);
 
         opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold;
-        intel_opregion_notify_adapter(dev, opregion_target_state);
+        intel_opregion_notify_adapter(dev_priv, opregion_target_state);
 
-        intel_uncore_forcewake_reset(dev, false);
-        intel_opregion_fini(dev);
+        intel_uncore_forcewake_reset(dev_priv, false);
+        intel_opregion_unregister(dev_priv);
 
         intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
 
@@ -749,7 +750,7 @@ static int i915_drm_resume(struct drm_device *dev)
         mutex_unlock(&dev->struct_mutex);
 
         i915_restore_state(dev);
-        intel_opregion_setup(dev);
+        intel_opregion_setup(dev_priv);
 
         intel_init_pch_refclk(dev);
         drm_mode_config_reset(dev);
@@ -777,7 +778,7 @@ static int i915_drm_resume(struct drm_device *dev)
 
         spin_lock_irq(&dev_priv->irq_lock);
         if (dev_priv->display.hpd_irq_setup)
-                dev_priv->display.hpd_irq_setup(dev);
+                dev_priv->display.hpd_irq_setup(dev_priv);
         spin_unlock_irq(&dev_priv->irq_lock);
 
         intel_dp_mst_resume(dev);
@@ -794,7 +795,7 @@ static int i915_drm_resume(struct drm_device *dev)
         /* Config may have changed between suspend and resume */
         drm_helper_hpd_irq_event(dev);
 
-        intel_opregion_init(dev);
+        intel_opregion_register(dev_priv);
 
         intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false);
 
@@ -802,7 +803,7 @@ static int i915_drm_resume(struct drm_device *dev)
         dev_priv->modeset_restore = MODESET_DONE;
         mutex_unlock(&dev_priv->modeset_restore_lock);
 
-        intel_opregion_notify_adapter(dev, PCI_D0);
+        intel_opregion_notify_adapter(dev_priv, PCI_D0);
 
         drm_kms_helper_poll_enable(dev);
 
@@ -870,9 +871,9 @@ static int i915_drm_resume_early(struct drm_device *dev)
                 DRM_ERROR("Resume prepare failed: %d, continuing anyway\n",
                           ret);
 
-        intel_uncore_early_sanitize(dev, true);
+        intel_uncore_early_sanitize(dev_priv, true);
 
-        if (IS_BROXTON(dev)) {
+        if (IS_BROXTON(dev_priv)) {
                 if (!dev_priv->suspended_to_idle)
                         gen9_sanitize_dc_state(dev_priv);
                 bxt_disable_dc9(dev_priv);
@@ -880,7 +881,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
                 hsw_disable_pc8(dev_priv);
         }
 
-        intel_uncore_sanitize(dev);
+        intel_uncore_sanitize(dev_priv);
 
         if (IS_BROXTON(dev_priv) ||
             !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload))
@@ -923,14 +924,14 @@ int i915_resume_switcheroo(struct drm_device *dev)
  *   - re-init interrupt state
  *   - re-init display
  */
-int i915_reset(struct drm_device *dev)
+int i915_reset(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_device *dev = dev_priv->dev;
         struct i915_gpu_error *error = &dev_priv->gpu_error;
         unsigned reset_counter;
         int ret;
 
-        intel_reset_gt_powersave(dev);
+        intel_reset_gt_powersave(dev_priv);
 
         mutex_lock(&dev->struct_mutex);
 
@@ -946,7 +947,7 @@ int i915_reset(struct drm_device *dev)
 
         i915_gem_reset(dev);
 
-        ret = intel_gpu_reset(dev, ALL_ENGINES);
+        ret = intel_gpu_reset(dev_priv, ALL_ENGINES);
 
         /* Also reset the gpu hangman. */
         if (error->stop_rings != 0) {
@@ -1001,7 +1002,7 @@ int i915_reset(struct drm_device *dev)
          * of re-init after reset.
          */
         if (INTEL_INFO(dev)->gen > 5)
-                intel_enable_gt_powersave(dev);
+                intel_enable_gt_powersave(dev_priv);
 
         return 0;
 
@@ -1030,13 +1031,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (PCI_FUNC(pdev->devfn))
                 return -ENODEV;
 
-        /*
-         * apple-gmux is needed on dual GPU MacBook Pro
-         * to probe the panel if we're the inactive GPU.
-         */
-        if (IS_ENABLED(CONFIG_VGA_ARB) && IS_ENABLED(CONFIG_VGA_SWITCHEROO) &&
-            apple_gmux_present() && pdev != vga_default_device() &&
-            !vga_switcheroo_handler_flags())
+        if (vga_switcheroo_client_probe_defer(pdev))
                 return -EPROBE_DEFER;
 
         return drm_get_pci_dev(pdev, ent, &driver);
@@ -1115,6 +1110,49 @@ static int i915_pm_resume(struct device *dev)
         return i915_drm_resume(drm_dev);
 }
 
+/* freeze: before creating the hibernation_image */
+static int i915_pm_freeze(struct device *dev)
+{
+        return i915_pm_suspend(dev);
+}
+
+static int i915_pm_freeze_late(struct device *dev)
+{
+        int ret;
+
+        ret = i915_pm_suspend_late(dev);
+        if (ret)
+                return ret;
+
+        ret = i915_gem_freeze_late(dev_to_i915(dev));
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+/* thaw: called after creating the hibernation image, but before turning off. */
+static int i915_pm_thaw_early(struct device *dev)
+{
+        return i915_pm_resume_early(dev);
+}
+
+static int i915_pm_thaw(struct device *dev)
+{
+        return i915_pm_resume(dev);
+}
+
+/* restore: called after loading the hibernation image. */
+static int i915_pm_restore_early(struct device *dev)
+{
+        return i915_pm_resume_early(dev);
+}
+
+static int i915_pm_restore(struct device *dev)
+{
+        return i915_pm_resume(dev);
+}
+
 /*
  * Save all Gunit registers that may be lost after a D3 and a subsequent
  * S0i[R123] transition. The list of registers needing a save/restore is
@@ -1478,7 +1516,7 @@ static int intel_runtime_suspend(struct device *device)
         struct drm_i915_private *dev_priv = dev->dev_private;
         int ret;
 
-        if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6(dev))))
+        if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6())))
                 return -ENODEV;
 
         if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev)))
@@ -1517,7 +1555,7 @@ static int intel_runtime_suspend(struct device *device)
 
         intel_guc_suspend(dev);
 
-        intel_suspend_gt_powersave(dev);
+        intel_suspend_gt_powersave(dev_priv);
         intel_runtime_pm_disable_interrupts(dev_priv);
 
         ret = 0;
@@ -1539,7 +1577,7 @@ static int intel_runtime_suspend(struct device *device)
                 return ret;
         }
 
-        intel_uncore_forcewake_reset(dev, false);
+        intel_uncore_forcewake_reset(dev_priv, false);
 
         enable_rpm_wakeref_asserts(dev_priv);
         WARN_ON_ONCE(atomic_read(&dev_priv->pm.wakeref_count));
@@ -1553,14 +1591,14 @@ static int intel_runtime_suspend(struct device *device)
          * FIXME: We really should find a document that references the arguments
          * used below!
          */
-        if (IS_BROADWELL(dev)) {
+        if (IS_BROADWELL(dev_priv)) {
                 /*
                  * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
                  * being detected, and the call we do at intel_runtime_resume()
                  * won't be able to restore them. Since PCI_D3hot matches the
                  * actual specification and appears to be working, use it.
                  */
-                intel_opregion_notify_adapter(dev, PCI_D3hot);
+                intel_opregion_notify_adapter(dev_priv, PCI_D3hot);
         } else {
                 /*
                  * current versions of firmware which depend on this opregion
@@ -1569,7 +1607,7 @@ static int intel_runtime_suspend(struct device *device)
                  * to distinguish it from notifications that might be sent via
                  * the suspend path.
                  */
-                intel_opregion_notify_adapter(dev, PCI_D1);
+                intel_opregion_notify_adapter(dev_priv, PCI_D1);
         }
 
         assert_forcewakes_inactive(dev_priv);
@@ -1593,7 +1631,7 @@ static int intel_runtime_resume(struct device *device)
         WARN_ON_ONCE(atomic_read(&dev_priv->pm.wakeref_count));
         disable_rpm_wakeref_asserts(dev_priv);
 
-        intel_opregion_notify_adapter(dev, PCI_D0);
+        intel_opregion_notify_adapter(dev_priv, PCI_D0);
         dev_priv->pm.suspended = false;
         if (intel_uncore_unclaimed_mmio(dev_priv))
                 DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
@@ -1620,7 +1658,7 @@ static int intel_runtime_resume(struct device *device)
          * we can do is to hope that things will still work (and disable RPM).
          */
         i915_gem_init_swizzling(dev);
-        gen6_update_ring_freq(dev);
+        gen6_update_ring_freq(dev_priv);
 
         intel_runtime_pm_enable_interrupts(dev_priv);
 
@@ -1632,7 +1670,7 @@ static int intel_runtime_resume(struct device *device)
         if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
                 intel_hpd_init(dev_priv);
 
-        intel_enable_gt_powersave(dev);
+        intel_enable_gt_powersave(dev_priv);
 
         enable_rpm_wakeref_asserts(dev_priv);
 
@@ -1669,14 +1707,14 @@ static const struct dev_pm_ops i915_pm_ops = {
          * @restore, @restore_early : called after rebooting and restoring the
          *                            hibernation image [PMSG_RESTORE]
          */
-        .freeze = i915_pm_suspend,
-        .freeze_late = i915_pm_suspend_late,
-        .thaw_early = i915_pm_resume_early,
-        .thaw = i915_pm_resume,
+        .freeze = i915_pm_freeze,
+        .freeze_late = i915_pm_freeze_late,
+        .thaw_early = i915_pm_thaw_early,
+        .thaw = i915_pm_thaw,
         .poweroff = i915_pm_suspend,
         .poweroff_late = i915_pm_poweroff_late,
-        .restore_early = i915_pm_resume_early,
-        .restore = i915_pm_resume,
+        .restore_early = i915_pm_restore_early,
+        .restore = i915_pm_restore,
 
         /* S0ix (via runtime suspend) event handlers */
         .runtime_suspend = intel_runtime_suspend,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5faacc6e548d..24a86c64d22e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -47,6 +47,7 @@
 #include <drm/intel-gtt.h>
 #include <drm/drm_legacy.h> /* for struct drm_dma_handle */
 #include <drm/drm_gem.h>
+#include <drm/drm_auth.h>
 
 #include "i915_params.h"
 #include "i915_reg.h"
@@ -61,12 +62,14 @@
 #include "i915_gem_gtt.h"
 #include "i915_gem_render_state.h"
 
+#include "intel_gvt.h"
+
 /* General customization:
  */
 
 #define DRIVER_NAME             "i915"
 #define DRIVER_DESC             "Intel Graphics"
-#define DRIVER_DATE             "20160425"
+#define DRIVER_DATE             "20160620"
 
 #undef WARN_ON
 /* Many gcc seem to no see through this and fall over :( */
@@ -324,6 +327,12 @@ struct i915_hotplug {
                             &dev->mode_config.plane_list,       \
                             base.head)
 
+#define for_each_intel_plane_mask(dev, intel_plane, plane_mask)         \
+        list_for_each_entry(intel_plane, &dev->mode_config.plane_list,  \
+                            base.head)                                  \
+                for_each_if ((plane_mask) &                             \
+                             (1 << drm_plane_index(&intel_plane->base)))
+
 #define for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane)      \
         list_for_each_entry(intel_plane,                                \
                             &(dev)->mode_config.plane_list,             \
@@ -333,6 +342,10 @@ struct i915_hotplug {
 #define for_each_intel_crtc(dev, intel_crtc) \
         list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head)
 
+#define for_each_intel_crtc_mask(dev, intel_crtc, crtc_mask) \
+        list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) \
+                for_each_if ((crtc_mask) & (1 << drm_crtc_index(&intel_crtc->base)))
+
 #define for_each_intel_encoder(dev, intel_encoder)              \
         list_for_each_entry(intel_encoder,                      \
                             &(dev)->mode_config.encoder_list,   \
@@ -588,6 +601,7 @@ struct drm_i915_display_funcs {
                                        struct intel_crtc_state *newstate);
         void (*initial_watermarks)(struct intel_crtc_state *cstate);
         void (*optimize_watermarks)(struct intel_crtc_state *cstate);
+        int (*compute_global_watermarks)(struct drm_atomic_state *state);
         void (*update_wm)(struct drm_crtc *crtc);
         int (*modeset_calc_cdclk)(struct drm_atomic_state *state);
         void (*modeset_commit_cdclk)(struct drm_atomic_state *state);
@@ -612,7 +626,7 @@ struct drm_i915_display_funcs {
                           struct drm_i915_gem_object *obj,
                           struct drm_i915_gem_request *req,
                           uint32_t flags);
-        void (*hpd_irq_setup)(struct drm_device *dev);
+        void (*hpd_irq_setup)(struct drm_i915_private *dev_priv);
         /* clock updates for mode set */
         /* cursor updates */
         /* render clock increase/decrease */
@@ -735,6 +749,7 @@ struct intel_csr {
         func(is_valleyview) sep \
         func(is_cherryview) sep \
         func(is_haswell) sep \
+        func(is_broadwell) sep \
         func(is_skylake) sep \
         func(is_broxton) sep \
         func(is_kabylake) sep \
@@ -749,7 +764,8 @@ struct intel_csr {
         func(has_llc) sep \
         func(has_snoop) sep \
         func(has_ddi) sep \
-        func(has_fpga_dbg)
+        func(has_fpga_dbg) sep \
+        func(has_pooled_eu)
 
 #define DEFINE_FLAG(name) u8 name:1
 #define SEP_SEMICOLON ;
@@ -757,9 +773,10 @@ struct intel_csr {
 struct intel_device_info {
         u32 display_mmio_offset;
         u16 device_id;
-        u8 num_pipes:3;
+        u8 num_pipes;
         u8 num_sprites[I915_MAX_PIPES];
         u8 gen;
+        u16 gen_mask;
         u8 ring_mask; /* Rings supported by the HW */
         DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG, SEP_SEMICOLON);
         /* Register offsets for the various display pipes and transcoders */
@@ -774,6 +791,7 @@ struct intel_device_info {
         u8 subslice_per_slice;
         u8 eu_total;
         u8 eu_per_subslice;
+        u8 min_eu_in_pool;
         /* For each slice, which subslice(s) has(have) 7 EUs (bitfield)? */
         u8 subslice_7eu[3];
         u8 has_slice_pg:1;
@@ -821,9 +839,8 @@ struct i915_ctx_hang_stats {
 /* This must match up with the value previously used for execbuf2.rsvd1. */
 #define DEFAULT_CONTEXT_HANDLE 0
 
-#define CONTEXT_NO_ZEROMAP (1<<0)
 /**
- * struct intel_context - as the name implies, represents a context.
+ * struct i915_gem_context - as the name implies, represents a context.
  * @ref: reference count.
  * @user_handle: userspace tracking identity for this context.
  * @remap_slice: l3 row remapping information.
@@ -841,33 +858,37 @@ struct i915_ctx_hang_stats {
  * Contexts are memory images used by the hardware to store copies of their
  * internal state.
  */
-struct intel_context {
+struct i915_gem_context {
         struct kref ref;
-        int user_handle;
-        uint8_t remap_slice;
         struct drm_i915_private *i915;
-        int flags;
         struct drm_i915_file_private *file_priv;
-        struct i915_ctx_hang_stats hang_stats;
         struct i915_hw_ppgtt *ppgtt;
 
-        /* Legacy ring buffer submission */
-        struct {
-                struct drm_i915_gem_object *rcs_state;
-                bool initialized;
-        } legacy_hw_ctx;
+        struct i915_ctx_hang_stats hang_stats;
 
-        /* Execlists */
-        struct {
+        /* Unique identifier for this context, used by the hw for tracking */
+        unsigned long flags;
+        unsigned hw_id;
+        u32 user_handle;
+#define CONTEXT_NO_ZEROMAP              (1<<0)
+
+        struct intel_context {
                 struct drm_i915_gem_object *state;
                 struct intel_ringbuffer *ringbuf;
-                int pin_count;
                 struct i915_vma *lrc_vma;
-                u64 lrc_desc;
                 uint32_t *lrc_reg_state;
+                u64 lrc_desc;
+                int pin_count;
+                bool initialised;
         } engine[I915_NUM_ENGINES];
+        u32 ring_size;
+        u32 desc_template;
+        struct atomic_notifier_head status_notifier;
+        bool execlists_force_single_submission;
 
         struct list_head link;
+
+        u8 remap_slice;
 };
 
 enum fb_op_origin {
@@ -1115,6 +1136,8 @@ struct intel_gen6_power_mgmt {
         bool interrupts_enabled;
         u32 pm_iir;
 
+        u32 pm_intr_keep;
+
         /* Frequencies are stored in potentially platform dependent multiples.
          * In other words, *_freq needs to be multiplied by X to be interesting.
          * Soft limits are those which are used for the dynamic reclocking done
@@ -1488,6 +1511,7 @@ struct intel_vbt_data {
                 bool present;
                 bool active_low_pwm;
                 u8 min_brightness;      /* min_brightness/255 of max */
+                enum intel_backlight_type type;
         } backlight;
 
         /* MIPI DSI */
@@ -1580,7 +1604,7 @@ struct skl_ddb_allocation {
 };
 
 struct skl_wm_values {
-        bool dirty[I915_MAX_PIPES];
+        unsigned dirty_pipes;
         struct skl_ddb_allocation ddb;
         uint32_t wm_linetime[I915_MAX_PIPES];
         uint32_t plane[I915_MAX_PIPES][I915_MAX_PLANES][8];
@@ -1697,7 +1721,7 @@ struct i915_execbuffer_params {
         uint64_t                        batch_obj_vm_offset;
         struct intel_engine_cs *engine;
         struct drm_i915_gem_object      *batch_obj;
-        struct intel_context            *ctx;
+        struct i915_gem_context            *ctx;
         struct drm_i915_gem_request     *request;
 };
 
@@ -1724,6 +1748,8 @@ struct drm_i915_private {
 
         struct i915_virtual_gpu vgpu;
 
+        struct intel_gvt gvt;
+
         struct intel_guc guc;
 
         struct intel_csr csr;
@@ -1747,6 +1773,7 @@ struct drm_i915_private {
         wait_queue_head_t gmbus_wait_queue;
 
         struct pci_dev *bridge_dev;
+        struct i915_gem_context *kernel_context;
         struct intel_engine_cs engine[I915_NUM_ENGINES];
         struct drm_i915_gem_object *semaphore_obj;
         uint32_t last_seqno, next_seqno;
@@ -1802,13 +1829,17 @@ struct drm_i915_private {
         int num_fence_regs; /* 8 on pre-965, 16 otherwise */
 
         unsigned int fsb_freq, mem_freq, is_ddr3;
-        unsigned int skl_boot_cdclk;
+        unsigned int skl_preferred_vco_freq;
         unsigned int cdclk_freq, max_cdclk_freq, atomic_cdclk_freq;
         unsigned int max_dotclk_freq;
         unsigned int rawclk_freq;
         unsigned int hpll_freq;
         unsigned int czclk_freq;
 
+        struct {
+                unsigned int vco, ref;
+        } cdclk_pll;
+
         /**
          * wq - Driver workqueue for GEM.
          *
@@ -1838,6 +1869,13 @@ struct drm_i915_private {
         DECLARE_HASHTABLE(mm_structs, 7);
         struct mutex mm_lock;
 
+        /* The hw wants to have a stable context identifier for the lifetime
+         * of the context (for OA, PASID, faults, etc). This is limited
+         * in execlists to 21 bits.
+         */
+        struct ida context_hw_ida;
+#define MAX_CONTEXT_HW_ID (1<<21) /* exclusive */
+
         /* Kernel Modesetting */
 
         struct drm_crtc *plane_to_crtc_mapping[I915_MAX_PIPES];
@@ -1950,9 +1988,6 @@ struct drm_i915_private {
                  */
                 uint16_t skl_latency[8];
 
-                /* Committed wm config */
-                struct intel_wm_config config;
-
                 /*
                  * The skl_wm_values structure is a bit too big for stack
                  * allocation, so we keep the staging struct where we store
@@ -1975,6 +2010,13 @@ struct drm_i915_private {
                  * cstate->wm.need_postvbl_update.
                  */
                 struct mutex wm_mutex;
+
+                /*
+                 * Set during HW readout of watermarks/DDB.  Some platforms
+                 * need to know when we're still using BIOS-provided values
+                 * (which we don't fully trust).
+                 */
+                bool distrust_bios_wm;
         } wm;
 
         struct i915_runtime_pm pm;
@@ -1989,8 +2031,6 @@ struct drm_i915_private {
                 void (*stop_engine)(struct intel_engine_cs *engine);
         } gt;
 
-        struct intel_context *kernel_context;
-
         /* perform PHY state sanity checks? */
         bool chv_phy_assert[2];
 
@@ -2227,9 +2267,75 @@ struct drm_i915_gem_object {
 };
 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
 
-void i915_gem_track_fb(struct drm_i915_gem_object *old,
-                       struct drm_i915_gem_object *new,
-                       unsigned frontbuffer_bits);
+/*
+ * Optimised SGL iterator for GEM objects
+ */
+static __always_inline struct sgt_iter {
+        struct scatterlist *sgp;
+        union {
+                unsigned long pfn;
+                dma_addr_t dma;
+        };
+        unsigned int curr;
+        unsigned int max;
+} __sgt_iter(struct scatterlist *sgl, bool dma) {
+        struct sgt_iter s = { .sgp = sgl };
+
+        if (s.sgp) {
+                s.max = s.curr = s.sgp->offset;
+                s.max += s.sgp->length;
+                if (dma)
+                        s.dma = sg_dma_address(s.sgp);
+                else
+                        s.pfn = page_to_pfn(sg_page(s.sgp));
+        }
+
+        return s;
+}
+
+/**
+ * __sg_next - return the next scatterlist entry in a list
+ * @sg:         The current sg entry
+ *
+ * Description:
+ *   If the entry is the last, return NULL; otherwise, step to the next
+ *   element in the array (@sg@+1). If that's a chain pointer, follow it;
+ *   otherwise just return the pointer to the current element.
+ **/
+static inline struct scatterlist *__sg_next(struct scatterlist *sg)
+{
+#ifdef CONFIG_DEBUG_SG
+        BUG_ON(sg->sg_magic != SG_MAGIC);
+#endif
+        return sg_is_last(sg) ? NULL :
+                likely(!sg_is_chain(++sg)) ? sg :
+                sg_chain_ptr(sg);
+}
+
+/**
+ * for_each_sgt_dma - iterate over the DMA addresses of the given sg_table
+ * @__dmap:     DMA address (output)
+ * @__iter:     'struct sgt_iter' (iterator state, internal)
+ * @__sgt:      sg_table to iterate over (input)
+ */
+#define for_each_sgt_dma(__dmap, __iter, __sgt)                         \
+        for ((__iter) = __sgt_iter((__sgt)->sgl, true);                 \
+             ((__dmap) = (__iter).dma + (__iter).curr);                 \
+             (((__iter).curr += PAGE_SIZE) < (__iter).max) ||           \
+             ((__iter) = __sgt_iter(__sg_next((__iter).sgp), true), 0))
+
+/**
+ * for_each_sgt_page - iterate over the pages of the given sg_table
+ * @__pp:       page pointer (output)
+ * @__iter:     'struct sgt_iter' (iterator state, internal)
+ * @__sgt:      sg_table to iterate over (input)
+ */
+#define for_each_sgt_page(__pp, __iter, __sgt)                          \
+        for ((__iter) = __sgt_iter((__sgt)->sgl, false);                \
+             ((__pp) = (__iter).pfn == 0 ? NULL :                       \
+              pfn_to_page((__iter).pfn + ((__iter).curr >> PAGE_SHIFT))); \
+             (((__iter).curr += PAGE_SIZE) < (__iter).max) ||           \
+             ((__iter) = __sgt_iter(__sg_next((__iter).sgp), false), 0))
 
 /**
  * Request queue structure.
@@ -2278,6 +2384,9 @@ struct drm_i915_gem_request {
         /** Position in the ringbuffer of the end of the whole request */
         u32 tail;
 
+        /** Preallocate space in the ringbuffer for the emitting the request */
+        u32 reserved_space;
+
         /**
          * Context and ring buffer related to this request
          * Contexts are refcounted, so when this request is associated with a
@@ -2288,9 +2397,20 @@ struct drm_i915_gem_request {
          * i915_gem_request_free() will then decrement the refcount on the
          * context.
          */
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         struct intel_ringbuffer *ringbuf;
 
+        /**
+         * Context related to the previous request.
+         * As the contexts are accessed by the hardware until the switch is
+         * completed to a new context, the hardware may still be writing
+         * to the context object after the breadcrumb is visible. We must
+         * not unpin/unbind/prune that object whilst still active and so
+         * we keep the previous context pinned until the following (this)
+         * request is retired.
+         */
+        struct i915_gem_context *previous_context;
+
         /** Batch buffer related to this request if any (used for
             error state dump only) */
         struct drm_i915_gem_object *batch_obj;
@@ -2327,11 +2447,13 @@ struct drm_i915_gem_request {
         /** Execlists no. of times this request has been sent to the ELSP */
         int elsp_submitted;
 
+        /** Execlists context hardware id. */
+        unsigned ctx_hw_id;
 };
 
 struct drm_i915_gem_request * __must_check
 i915_gem_request_alloc(struct intel_engine_cs *engine,
-                       struct intel_context *ctx);
+                       struct i915_gem_context *ctx);
 void i915_gem_request_free(struct kref *req_ref);
 int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
                                    struct drm_file *file);
@@ -2359,23 +2481,9 @@ i915_gem_request_reference(struct drm_i915_gem_request *req)
 static inline void
 i915_gem_request_unreference(struct drm_i915_gem_request *req)
 {
-        WARN_ON(!mutex_is_locked(&req->engine->dev->struct_mutex));
         kref_put(&req->ref, i915_gem_request_free);
 }
 
-static inline void
-i915_gem_request_unreference__unlocked(struct drm_i915_gem_request *req)
-{
-        struct drm_device *dev;
-
-        if (!req)
-                return;
-
-        dev = req->engine->dev;
-        if (kref_put_mutex(&req->ref, i915_gem_request_free, &dev->struct_mutex))
-                mutex_unlock(&dev->struct_mutex);
-}
-
 static inline void i915_gem_request_assign(struct drm_i915_gem_request **pdst,
                                            struct drm_i915_gem_request *src)
 {
@@ -2503,9 +2611,29 @@ struct drm_i915_cmd_table {
 #define INTEL_INFO(p)   (&__I915__(p)->info)
 #define INTEL_GEN(p)    (INTEL_INFO(p)->gen)
 #define INTEL_DEVID(p)  (INTEL_INFO(p)->device_id)
-#define INTEL_REVID(p)  (__I915__(p)->dev->pdev->revision)
 
 #define REVID_FOREVER           0xff
+#define INTEL_REVID(p)  (__I915__(p)->dev->pdev->revision)
+
+#define GEN_FOREVER (0)
+/*
+ * Returns true if Gen is in inclusive range [Start, End].
+ *
+ * Use GEN_FOREVER for unbound start and or end.
+ */
+#define IS_GEN(p, s, e) ({ \
+        unsigned int __s = (s), __e = (e); \
+        BUILD_BUG_ON(!__builtin_constant_p(s)); \
+        BUILD_BUG_ON(!__builtin_constant_p(e)); \
+        if ((__s) != GEN_FOREVER) \
+                __s = (s) - 1; \
+        if ((__e) == GEN_FOREVER) \
+                __e = BITS_PER_LONG - 1; \
+        else \
+                __e = (e) - 1; \
+        !!(INTEL_INFO(p)->gen_mask & GENMASK((__e), (__s))); \
+})
+
 /*
  * Return true if revision is in range [since,until] inclusive.
  *
@@ -2538,7 +2666,7 @@ struct drm_i915_cmd_table {
 #define IS_VALLEYVIEW(dev)      (INTEL_INFO(dev)->is_valleyview)
 #define IS_CHERRYVIEW(dev)      (INTEL_INFO(dev)->is_cherryview)
 #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell)
-#define IS_BROADWELL(dev)       (!INTEL_INFO(dev)->is_cherryview && IS_GEN8(dev))
+#define IS_BROADWELL(dev)       (INTEL_INFO(dev)->is_broadwell)
 #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake)
 #define IS_BROXTON(dev)         (INTEL_INFO(dev)->is_broxton)
 #define IS_KABYLAKE(dev)        (INTEL_INFO(dev)->is_kabylake)
@@ -2600,20 +2728,29 @@ struct drm_i915_cmd_table {
 
 #define IS_BXT_REVID(p, since, until) (IS_BROXTON(p) && IS_REVID(p, since, until))
 
+#define KBL_REVID_A0            0x0
+#define KBL_REVID_B0            0x1
+#define KBL_REVID_C0            0x2
+#define KBL_REVID_D0            0x3
+#define KBL_REVID_E0            0x4
+
+#define IS_KBL_REVID(p, since, until) \
+        (IS_KABYLAKE(p) && IS_REVID(p, since, until))
+
 /*
  * The genX designation typically refers to the render engine, so render
  * capability related checks should use IS_GEN, while display and other checks
  * have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular
  * chips, etc.).
  */
-#define IS_GEN2(dev)    (INTEL_INFO(dev)->gen == 2)
-#define IS_GEN3(dev)    (INTEL_INFO(dev)->gen == 3)
-#define IS_GEN4(dev)    (INTEL_INFO(dev)->gen == 4)
-#define IS_GEN5(dev)    (INTEL_INFO(dev)->gen == 5)
-#define IS_GEN6(dev)    (INTEL_INFO(dev)->gen == 6)
-#define IS_GEN7(dev)    (INTEL_INFO(dev)->gen == 7)
-#define IS_GEN8(dev)    (INTEL_INFO(dev)->gen == 8)
-#define IS_GEN9(dev)    (INTEL_INFO(dev)->gen == 9)
+#define IS_GEN2(dev)    (INTEL_INFO(dev)->gen_mask & BIT(1))
+#define IS_GEN3(dev)    (INTEL_INFO(dev)->gen_mask & BIT(2))
+#define IS_GEN4(dev)    (INTEL_INFO(dev)->gen_mask & BIT(3))
+#define IS_GEN5(dev)    (INTEL_INFO(dev)->gen_mask & BIT(4))
+#define IS_GEN6(dev)    (INTEL_INFO(dev)->gen_mask & BIT(5))
+#define IS_GEN7(dev)    (INTEL_INFO(dev)->gen_mask & BIT(6))
+#define IS_GEN8(dev)    (INTEL_INFO(dev)->gen_mask & BIT(7))
+#define IS_GEN9(dev)    (INTEL_INFO(dev)->gen_mask & BIT(8))
 
 #define RENDER_RING             (1<<RCS)
 #define BSD_RING                (1<<VCS)
@@ -2686,12 +2823,18 @@ struct drm_i915_cmd_table {
                                  IS_CHERRYVIEW(dev) || IS_SKYLAKE(dev) || \
                                  IS_KABYLAKE(dev) || IS_BROXTON(dev))
 #define HAS_RC6(dev)            (INTEL_INFO(dev)->gen >= 6)
-#define HAS_RC6p(dev)           (INTEL_INFO(dev)->gen == 6 || IS_IVYBRIDGE(dev))
+#define HAS_RC6p(dev)           (IS_GEN6(dev) || IS_IVYBRIDGE(dev))
 
 #define HAS_CSR(dev)    (IS_GEN9(dev))
 
-#define HAS_GUC_UCODE(dev)      (IS_GEN9(dev) && !IS_KABYLAKE(dev))
-#define HAS_GUC_SCHED(dev)      (IS_GEN9(dev) && !IS_KABYLAKE(dev))
+/*
+ * For now, anything with a GuC requires uCode loading, and then supports
+ * command submission once loaded. But these are logically independent
+ * properties, so we have separate macros to test them.
+ */
+#define HAS_GUC(dev)            (IS_GEN9(dev) && !IS_KABYLAKE(dev))
+#define HAS_GUC_UCODE(dev)      (HAS_GUC(dev))
+#define HAS_GUC_SCHED(dev)      (HAS_GUC(dev))
 
 #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
                                     INTEL_INFO(dev)->gen >= 8)
@@ -2700,6 +2843,8 @@ struct drm_i915_cmd_table {
                                  !IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev) && \
                                  !IS_BROXTON(dev))
 
+#define HAS_POOLED_EU(dev)      (INTEL_INFO(dev)->has_pooled_eu)
+
 #define INTEL_PCH_DEVICE_ID_MASK                0xff00
 #define INTEL_PCH_IBX_DEVICE_ID_TYPE            0x3b00
 #define INTEL_PCH_CPT_DEVICE_ID_TYPE            0x1c00
@@ -2740,6 +2885,9 @@ extern int i915_max_ioctl;
 extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);
 extern int i915_resume_switcheroo(struct drm_device *dev);
 
+int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
+                                int enable_ppgtt);
+
 /* i915_dma.c */
 void __printf(3, 4)
 __i915_printk(struct drm_i915_private *dev_priv, const char *level,
@@ -2760,9 +2908,9 @@ extern void i915_driver_postclose(struct drm_device *dev,
 extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
                               unsigned long arg);
 #endif
-extern int intel_gpu_reset(struct drm_device *dev, u32 engine_mask);
-extern bool intel_has_gpu_reset(struct drm_device *dev);
-extern int i915_reset(struct drm_device *dev);
+extern int intel_gpu_reset(struct drm_i915_private *dev_priv, u32 engine_mask);
+extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);
+extern int i915_reset(struct drm_i915_private *dev_priv);
 extern int intel_guc_reset(struct drm_i915_private *dev_priv);
 extern void intel_engine_init_hangcheck(struct intel_engine_cs *engine);
 extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);
@@ -2772,30 +2920,33 @@ extern void i915_update_gfx_val(struct drm_i915_private *dev_priv);
 int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);
 
 /* intel_hotplug.c */
-void intel_hpd_irq_handler(struct drm_device *dev, u32 pin_mask, u32 long_mask);
+void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
+                           u32 pin_mask, u32 long_mask);
 void intel_hpd_init(struct drm_i915_private *dev_priv);
 void intel_hpd_init_work(struct drm_i915_private *dev_priv);
 void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
 bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port);
 
 /* i915_irq.c */
-void i915_queue_hangcheck(struct drm_device *dev);
+void i915_queue_hangcheck(struct drm_i915_private *dev_priv);
 __printf(3, 4)
-void i915_handle_error(struct drm_device *dev, u32 engine_mask,
+void i915_handle_error(struct drm_i915_private *dev_priv,
+                       u32 engine_mask,
                        const char *fmt, ...);
 
 extern void intel_irq_init(struct drm_i915_private *dev_priv);
 int intel_irq_install(struct drm_i915_private *dev_priv);
 void intel_irq_uninstall(struct drm_i915_private *dev_priv);
 
-extern void intel_uncore_sanitize(struct drm_device *dev);
-extern void intel_uncore_early_sanitize(struct drm_device *dev,
+extern void intel_uncore_sanitize(struct drm_i915_private *dev_priv);
+extern void intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,
                                         bool restore_forcewake);
-extern void intel_uncore_init(struct drm_device *dev);
+extern void intel_uncore_init(struct drm_i915_private *dev_priv);
 extern bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv);
 extern bool intel_uncore_arm_unclaimed_mmio_detection(struct drm_i915_private *dev_priv);
-extern void intel_uncore_fini(struct drm_device *dev);
-extern void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore);
+extern void intel_uncore_fini(struct drm_i915_private *dev_priv);
+extern void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv,
+                                         bool restore);
 const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id);
 void intel_uncore_forcewake_get(struct drm_i915_private *dev_priv,
                                 enum forcewake_domains domains);
@@ -2811,9 +2962,15 @@ void intel_uncore_forcewake_put__locked(struct drm_i915_private *dev_priv,
 u64 intel_uncore_edram_size(struct drm_i915_private *dev_priv);
 
 void assert_forcewakes_inactive(struct drm_i915_private *dev_priv);
-static inline bool intel_vgpu_active(struct drm_device *dev)
+
+static inline bool intel_gvt_active(struct drm_i915_private *dev_priv)
 {
-        return to_i915(dev)->vgpu.active;
+        return dev_priv->gvt.initialized;
+}
+
+static inline bool intel_vgpu_active(struct drm_i915_private *dev_priv)
+{
+        return dev_priv->vgpu.active;
 }
 
 void
@@ -2909,7 +3066,7 @@ int i915_gem_set_tiling(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
 int i915_gem_get_tiling(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
-int i915_gem_init_userptr(struct drm_device *dev);
+void i915_gem_init_userptr(struct drm_i915_private *dev_priv);
 int i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
                            struct drm_file *file);
 int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
@@ -2919,11 +3076,13 @@ int i915_gem_wait_ioctl(struct drm_device *dev, void *data,
 void i915_gem_load_init(struct drm_device *dev);
 void i915_gem_load_cleanup(struct drm_device *dev);
 void i915_gem_load_init_fences(struct drm_i915_private *dev_priv);
+int i915_gem_freeze_late(struct drm_i915_private *dev_priv);
+
 void *i915_gem_object_alloc(struct drm_device *dev);
 void i915_gem_object_free(struct drm_i915_gem_object *obj);
 void i915_gem_object_init(struct drm_i915_gem_object *obj,
                          const struct drm_i915_gem_object_ops *ops);
-struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
+struct drm_i915_gem_object *i915_gem_object_create(struct drm_device *dev,
                                                   size_t size);
 struct drm_i915_gem_object *i915_gem_object_create_from_data(
                 struct drm_device *dev, const void *data, size_t size);
@@ -2978,6 +3137,23 @@ static inline int __sg_page_count(struct scatterlist *sg)
 struct page *
 i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj, int n);
 
+static inline dma_addr_t
+i915_gem_object_get_dma_address(struct drm_i915_gem_object *obj, int n)
+{
+        if (n < obj->get_page.last) {
+                obj->get_page.sg = obj->pages->sgl;
+                obj->get_page.last = 0;
+        }
+
+        while (obj->get_page.last + __sg_page_count(obj->get_page.sg) <= n) {
+                obj->get_page.last += __sg_page_count(obj->get_page.sg++);
+                if (unlikely(sg_is_chain(obj->get_page.sg)))
+                        obj->get_page.sg = sg_chain_ptr(obj->get_page.sg);
+        }
+
+        return sg_dma_address(obj->get_page.sg) + ((n - obj->get_page.last) << PAGE_SHIFT);
+}
+
 static inline struct page *
 i915_gem_object_get_page(struct drm_i915_gem_object *obj, int n)
 {
@@ -3054,6 +3230,11 @@ int i915_gem_dumb_create(struct drm_file *file_priv,
                          struct drm_mode_create_dumb *args);
 int i915_gem_mmap_gtt(struct drm_file *file_priv, struct drm_device *dev,
                       uint32_t handle, uint64_t *offset);
+
+void i915_gem_track_fb(struct drm_i915_gem_object *old,
+                       struct drm_i915_gem_object *new,
+                       unsigned frontbuffer_bits);
+
 /**
  * Returns true if seq1 is later than seq2.
  */
@@ -3081,13 +3262,13 @@ static inline bool i915_gem_request_completed(struct drm_i915_gem_request *req,
                                  req->seqno);
 }
 
-int __must_check i915_gem_get_seqno(struct drm_device *dev, u32 *seqno);
+int __must_check i915_gem_get_seqno(struct drm_i915_private *dev_priv, u32 *seqno);
 int __must_check i915_gem_set_seqno(struct drm_device *dev, u32 seqno);
 
 struct drm_i915_gem_request *
 i915_gem_find_active_request(struct intel_engine_cs *engine);
 
-bool i915_gem_retire_requests(struct drm_device *dev);
+bool i915_gem_retire_requests(struct drm_i915_private *dev_priv);
 void i915_gem_retire_requests_ring(struct intel_engine_cs *engine);
 
 static inline u32 i915_reset_counter(struct i915_gpu_error *error)
@@ -3147,7 +3328,6 @@ bool i915_gem_clflush_object(struct drm_i915_gem_object *obj, bool force);
 int __must_check i915_gem_init(struct drm_device *dev);
 int i915_gem_init_engines(struct drm_device *dev);
 int __must_check i915_gem_init_hw(struct drm_device *dev);
-int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice);
 void i915_gem_init_swizzling(struct drm_device *dev);
 void i915_gem_cleanup_engines(struct drm_device *dev);
 int __must_check i915_gpu_idle(struct drm_device *dev);
@@ -3215,8 +3395,6 @@ bool i915_gem_obj_ggtt_bound_view(struct drm_i915_gem_object *o,
 bool i915_gem_obj_bound(struct drm_i915_gem_object *o,
                         struct i915_address_space *vm);
 
-unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o,
-                                struct i915_address_space *vm);
 struct i915_vma *
 i915_gem_obj_to_vma(struct drm_i915_gem_object *obj,
                     struct i915_address_space *vm);
@@ -3251,14 +3429,8 @@ static inline bool i915_gem_obj_ggtt_bound(struct drm_i915_gem_object *obj)
         return i915_gem_obj_ggtt_bound_view(obj, &i915_ggtt_view_normal);
 }
 
-static inline unsigned long
-i915_gem_obj_ggtt_size(struct drm_i915_gem_object *obj)
-{
-        struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
-
-        return i915_gem_obj_size(obj, &ggtt->base);
-}
+unsigned long
+i915_gem_obj_ggtt_size(struct drm_i915_gem_object *obj);
 
 static inline int __must_check
 i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj,
@@ -3272,12 +3444,6 @@ i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj,
                                    alignment, flags | PIN_GLOBAL);
 }
 
-static inline int
-i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj)
-{
-        return i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
-}
-
 void i915_gem_object_ggtt_unpin_view(struct drm_i915_gem_object *obj,
                                      const struct i915_ggtt_view *view);
 static inline void
@@ -3301,28 +3467,44 @@ void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj);
 
 /* i915_gem_context.c */
 int __must_check i915_gem_context_init(struct drm_device *dev);
+void i915_gem_context_lost(struct drm_i915_private *dev_priv);
 void i915_gem_context_fini(struct drm_device *dev);
 void i915_gem_context_reset(struct drm_device *dev);
 int i915_gem_context_open(struct drm_device *dev, struct drm_file *file);
-int i915_gem_context_enable(struct drm_i915_gem_request *req);
 void i915_gem_context_close(struct drm_device *dev, struct drm_file *file);
 int i915_switch_context(struct drm_i915_gem_request *req);
-struct intel_context *
-i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id);
 void i915_gem_context_free(struct kref *ctx_ref);
 struct drm_i915_gem_object *
 i915_gem_alloc_context_obj(struct drm_device *dev, size_t size);
-static inline void i915_gem_context_reference(struct intel_context *ctx)
+struct i915_gem_context *
+i915_gem_context_create_gvt(struct drm_device *dev);
+
+static inline struct i915_gem_context *
+i915_gem_context_lookup(struct drm_i915_file_private *file_priv, u32 id)
+{
+        struct i915_gem_context *ctx;
+
+        lockdep_assert_held(&file_priv->dev_priv->dev->struct_mutex);
+
+        ctx = idr_find(&file_priv->context_idr, id);
+        if (!ctx)
+                return ERR_PTR(-ENOENT);
+
+        return ctx;
+}
+
+static inline void i915_gem_context_reference(struct i915_gem_context *ctx)
 {
         kref_get(&ctx->ref);
 }
 
-static inline void i915_gem_context_unreference(struct intel_context *ctx)
+static inline void i915_gem_context_unreference(struct i915_gem_context *ctx)
 {
+        lockdep_assert_held(&ctx->i915->dev->struct_mutex);
         kref_put(&ctx->ref, i915_gem_context_free);
 }
 
-static inline bool i915_gem_context_is_default(const struct intel_context *c)
+static inline bool i915_gem_context_is_default(const struct i915_gem_context *c)
 {
         return c->user_handle == DEFAULT_CONTEXT_HANDLE;
 }
@@ -3335,6 +3517,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
                                     struct drm_file *file_priv);
 int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
                                     struct drm_file *file_priv);
+int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, void *data,
+                                       struct drm_file *file);
 
 /* i915_gem_evict.c */
 int __must_check i915_gem_evict_something(struct drm_device *dev,
@@ -3349,9 +3533,9 @@ int __must_check i915_gem_evict_for_vma(struct i915_vma *target);
 int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle);
 
 /* belongs in i915_gem_gtt.h */
-static inline void i915_gem_chipset_flush(struct drm_device *dev)
+static inline void i915_gem_chipset_flush(struct drm_i915_private *dev_priv)
 {
-        if (INTEL_INFO(dev)->gen < 6)
+        if (INTEL_GEN(dev_priv) < 6)
                 intel_gtt_chipset_flush();
 }
 
@@ -3430,18 +3614,19 @@ static inline void i915_error_state_buf_release(
 {
         kfree(eb->buf);
 }
-void i915_capture_error_state(struct drm_device *dev, u32 engine_mask,
+void i915_capture_error_state(struct drm_i915_private *dev_priv,
+                              u32 engine_mask,
                               const char *error_msg);
 void i915_error_state_get(struct drm_device *dev,
                           struct i915_error_state_file_priv *error_priv);
 void i915_error_state_put(struct i915_error_state_file_priv *error_priv);
 void i915_destroy_error_state(struct drm_device *dev);
 
-void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone);
+void i915_get_extra_instdone(struct drm_i915_private *dev_priv, uint32_t *instdone);
 const char *i915_cache_level_str(struct drm_i915_private *i915, int type);
 
 /* i915_cmd_parser.c */
-int i915_cmd_parser_get_version(void);
+int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv);
 int i915_cmd_parser_init_ring(struct intel_engine_cs *engine);
 void i915_cmd_parser_fini_ring(struct intel_engine_cs *engine);
 bool i915_needs_cmd_parser(struct intel_engine_cs *engine);
@@ -3481,6 +3666,7 @@ int intel_bios_init(struct drm_i915_private *dev_priv);
 bool intel_bios_is_valid_vbt(const void *buf, size_t size);
 bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
 bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port);
 bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
 bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port);
 bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
@@ -3489,31 +3675,33 @@ bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv,
 
 /* intel_opregion.c */
 #ifdef CONFIG_ACPI
-extern int intel_opregion_setup(struct drm_device *dev);
-extern void intel_opregion_init(struct drm_device *dev);
-extern void intel_opregion_fini(struct drm_device *dev);
-extern void intel_opregion_asle_intr(struct drm_device *dev);
+extern int intel_opregion_setup(struct drm_i915_private *dev_priv);
+extern void intel_opregion_register(struct drm_i915_private *dev_priv);
+extern void intel_opregion_unregister(struct drm_i915_private *dev_priv);
+extern void intel_opregion_asle_intr(struct drm_i915_private *dev_priv);
 extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
                                          bool enable);
-extern int intel_opregion_notify_adapter(struct drm_device *dev,
+extern int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,
                                          pci_power_t state);
-extern int intel_opregion_get_panel_type(struct drm_device *dev);
+extern int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
 #else
-static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
-static inline void intel_opregion_init(struct drm_device *dev) { return; }
-static inline void intel_opregion_fini(struct drm_device *dev) { return; }
-static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
+static inline int intel_opregion_setup(struct drm_i915_private *dev) { return 0; }
+static inline void intel_opregion_init(struct drm_i915_private *dev) { }
+static inline void intel_opregion_fini(struct drm_i915_private *dev) { }
+static inline void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
+{
+}
 static inline int
 intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, bool enable)
 {
         return 0;
 }
 static inline int
-intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
+intel_opregion_notify_adapter(struct drm_i915_private *dev, pci_power_t state)
 {
         return 0;
 }
-static inline int intel_opregion_get_panel_type(struct drm_device *dev)
+static inline int intel_opregion_get_panel_type(struct drm_i915_private *dev)
 {
         return -ENODEV;
 }
@@ -3533,31 +3721,30 @@ extern void intel_modeset_init_hw(struct drm_device *dev);
 extern void intel_modeset_init(struct drm_device *dev);
 extern void intel_modeset_gem_init(struct drm_device *dev);
 extern void intel_modeset_cleanup(struct drm_device *dev);
-extern void intel_connector_unregister(struct intel_connector *);
+extern void intel_connector_unregister(struct drm_connector *);
 extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 extern void intel_display_resume(struct drm_device *dev);
 extern void i915_redisable_vga(struct drm_device *dev);
 extern void i915_redisable_vga_power_on(struct drm_device *dev);
-extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
+extern bool ironlake_set_drps(struct drm_i915_private *dev_priv, u8 val);
 extern void intel_init_pch_refclk(struct drm_device *dev);
-extern void intel_set_rps(struct drm_device *dev, u8 val);
+extern void intel_set_rps(struct drm_i915_private *dev_priv, u8 val);
 extern void intel_set_memory_cxsr(struct drm_i915_private *dev_priv,
                                   bool enable);
 extern void intel_detect_pch(struct drm_device *dev);
-extern int intel_enable_rc6(const struct drm_device *dev);
 
-extern bool i915_semaphore_is_enabled(struct drm_device *dev);
+extern bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv);
 int i915_reg_read_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file);
-int i915_get_reset_stats_ioctl(struct drm_device *dev, void *data,
-                               struct drm_file *file);
 
 /* overlay */
-extern struct intel_overlay_error_state *intel_overlay_capture_error_state(struct drm_device *dev);
+extern struct intel_overlay_error_state *
+intel_overlay_capture_error_state(struct drm_i915_private *dev_priv);
 extern void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,
                                             struct intel_overlay_error_state *error);
 
-extern struct intel_display_error_state *intel_display_capture_error_state(struct drm_device *dev);
+extern struct intel_display_error_state *
+intel_display_capture_error_state(struct drm_i915_private *dev_priv);
 extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,
                                             struct drm_device *dev,
                                             struct intel_display_error_state *error);
@@ -3586,6 +3773,24 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,
 u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
+/* intel_dpio_phy.c */
+void chv_set_phy_signal_level(struct intel_encoder *encoder,
+                              u32 deemph_reg_value, u32 margin_reg_value,
+                              bool uniq_trans_scale);
+void chv_data_lane_soft_reset(struct intel_encoder *encoder,
+                              bool reset);
+void chv_phy_pre_pll_enable(struct intel_encoder *encoder);
+void chv_phy_pre_encoder_enable(struct intel_encoder *encoder);
+void chv_phy_release_cl2_override(struct intel_encoder *encoder);
+void chv_phy_post_pll_disable(struct intel_encoder *encoder);
+
+void vlv_set_phy_signal_level(struct intel_encoder *encoder,
+                              u32 demph_reg_value, u32 preemph_reg_value,
+                              u32 uniqtranscale_reg_value, u32 tx3_demph);
+void vlv_phy_pre_pll_enable(struct intel_encoder *encoder);
+void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder);
+void vlv_phy_reset_lanes(struct intel_encoder *encoder);
+
 int intel_gpu_freq(struct drm_i915_private *dev_priv, int val);
 int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index aad26851cee3..21d0dea57312 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -54,12 +54,33 @@ static bool cpu_cache_is_coherent(struct drm_device *dev,
 
 static bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
 {
+        if (obj->base.write_domain == I915_GEM_DOMAIN_CPU)
+                return false;
+
         if (!cpu_cache_is_coherent(obj->base.dev, obj->cache_level))
                 return true;
 
         return obj->pin_display;
 }
 
+static int
+insert_mappable_node(struct drm_i915_private *i915,
+                     struct drm_mm_node *node, u32 size)
+{
+        memset(node, 0, sizeof(*node));
+        return drm_mm_insert_node_in_range_generic(&i915->ggtt.base.mm, node,
+                                                   size, 0, 0, 0,
+                                                   i915->ggtt.mappable_end,
+                                                   DRM_MM_SEARCH_DEFAULT,
+                                                   DRM_MM_CREATE_DEFAULT);
+}
+
+static void
+remove_mappable_node(struct drm_mm_node *node)
+{
+        drm_mm_remove_node(node);
+}
+
 /* some bookkeeping */
 static void i915_gem_info_add_obj(struct drm_i915_private *dev_priv,
                                   size_t size)
@@ -177,7 +198,7 @@ i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
                 vaddr += PAGE_SIZE;
         }
 
-        i915_gem_chipset_flush(obj->base.dev);
+        i915_gem_chipset_flush(to_i915(obj->base.dev));
 
         st = kmalloc(sizeof(*st), GFP_KERNEL);
         if (st == NULL)
@@ -347,7 +368,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,
         }
 
         drm_clflush_virt_range(vaddr, args->size);
-        i915_gem_chipset_flush(dev);
+        i915_gem_chipset_flush(to_i915(dev));
 
 out:
         intel_fb_obj_flush(obj, false, ORIGIN_CPU);
@@ -381,9 +402,9 @@ i915_gem_create(struct drm_file *file,
                 return -EINVAL;
 
         /* Allocate the new object */
-        obj = i915_gem_alloc_object(dev, size);
-        if (obj == NULL)
-                return -ENOMEM;
+        obj = i915_gem_object_create(dev, size);
+        if (IS_ERR(obj))
+                return PTR_ERR(obj);
 
         ret = drm_gem_handle_create(file, &obj->base, &handle);
         /* drop reference from allocate - handle holds it now */
@@ -409,6 +430,9 @@ i915_gem_dumb_create(struct drm_file *file,
 
 /**
  * Creates a new mm object and returns a handle to it.
+ * @dev: drm device pointer
+ * @data: ioctl data blob
+ * @file: drm file pointer
  */
 int
 i915_gem_create_ioctl(struct drm_device *dev, void *data,
@@ -585,6 +609,142 @@ shmem_pread_slow(struct page *page, int shmem_page_offset, int page_length,
         return ret ? - EFAULT : 0;
 }
 
+static inline unsigned long
+slow_user_access(struct io_mapping *mapping,
+                 uint64_t page_base, int page_offset,
+                 char __user *user_data,
+                 unsigned long length, bool pwrite)
+{
+        void __iomem *ioaddr;
+        void *vaddr;
+        uint64_t unwritten;
+
+        ioaddr = io_mapping_map_wc(mapping, page_base, PAGE_SIZE);
+        /* We can use the cpu mem copy function because this is X86. */
+        vaddr = (void __force *)ioaddr + page_offset;
+        if (pwrite)
+                unwritten = __copy_from_user(vaddr, user_data, length);
+        else
+                unwritten = __copy_to_user(user_data, vaddr, length);
+
+        io_mapping_unmap(ioaddr);
+        return unwritten;
+}
+
+static int
+i915_gem_gtt_pread(struct drm_device *dev,
+                   struct drm_i915_gem_object *obj, uint64_t size,
+                   uint64_t data_offset, uint64_t data_ptr)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct drm_mm_node node;
+        char __user *user_data;
+        uint64_t remain;
+        uint64_t offset;
+        int ret;
+
+        ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE);
+        if (ret) {
+                ret = insert_mappable_node(dev_priv, &node, PAGE_SIZE);
+                if (ret)
+                        goto out;
+
+                ret = i915_gem_object_get_pages(obj);
+                if (ret) {
+                        remove_mappable_node(&node);
+                        goto out;
+                }
+
+                i915_gem_object_pin_pages(obj);
+        } else {
+                node.start = i915_gem_obj_ggtt_offset(obj);
+                node.allocated = false;
+                ret = i915_gem_object_put_fence(obj);
+                if (ret)
+                        goto out_unpin;
+        }
+
+        ret = i915_gem_object_set_to_gtt_domain(obj, false);
+        if (ret)
+                goto out_unpin;
+
+        user_data = u64_to_user_ptr(data_ptr);
+        remain = size;
+        offset = data_offset;
+
+        mutex_unlock(&dev->struct_mutex);
+        if (likely(!i915.prefault_disable)) {
+                ret = fault_in_multipages_writeable(user_data, remain);
+                if (ret) {
+                        mutex_lock(&dev->struct_mutex);
+                        goto out_unpin;
+                }
+        }
+
+        while (remain > 0) {
+                /* Operation in this page
+                 *
+                 * page_base = page offset within aperture
+                 * page_offset = offset within page
+                 * page_length = bytes to copy for this page
+                 */
+                u32 page_base = node.start;
+                unsigned page_offset = offset_in_page(offset);
+                unsigned page_length = PAGE_SIZE - page_offset;
+                page_length = remain < page_length ? remain : page_length;
+                if (node.allocated) {
+                        wmb();
+                        ggtt->base.insert_page(&ggtt->base,
+                                               i915_gem_object_get_dma_address(obj, offset >> PAGE_SHIFT),
+                                               node.start,
+                                               I915_CACHE_NONE, 0);
+                        wmb();
+                } else {
+                        page_base += offset & PAGE_MASK;
+                }
+                /* This is a slow read/write as it tries to read from
+                 * and write to user memory which may result into page
+                 * faults, and so we cannot perform this under struct_mutex.
+                 */
+                if (slow_user_access(ggtt->mappable, page_base,
+                                     page_offset, user_data,
+                                     page_length, false)) {
+                        ret = -EFAULT;
+                        break;
+                }
+
+                remain -= page_length;
+                user_data += page_length;
+                offset += page_length;
+        }
+
+        mutex_lock(&dev->struct_mutex);
+        if (ret == 0 && (obj->base.read_domains & I915_GEM_DOMAIN_GTT) == 0) {
+                /* The user has modified the object whilst we tried
+                 * reading from it, and we now have no idea what domain
+                 * the pages should be in. As we have just been touching
+                 * them directly, flush everything back to the GTT
+                 * domain.
+                 */
+                ret = i915_gem_object_set_to_gtt_domain(obj, false);
+        }
+
+out_unpin:
+        if (node.allocated) {
+                wmb();
+                ggtt->base.clear_range(&ggtt->base,
+                                       node.start, node.size,
+                                       true);
+                i915_gem_object_unpin_pages(obj);
+                remove_mappable_node(&node);
+        } else {
+                i915_gem_object_ggtt_unpin(obj);
+        }
+out:
+        return ret;
+}
+
 static int
 i915_gem_shmem_pread(struct drm_device *dev,
                      struct drm_i915_gem_object *obj,
@@ -600,6 +760,9 @@ i915_gem_shmem_pread(struct drm_device *dev,
         int needs_clflush = 0;
         struct sg_page_iter sg_iter;
 
+        if (!obj->base.filp)
+                return -ENODEV;
+
         user_data = u64_to_user_ptr(args->data_ptr);
         remain = args->size;
 
@@ -672,6 +835,9 @@ out:
 
 /**
  * Reads data from the object referenced by handle.
+ * @dev: drm device pointer
+ * @data: ioctl data blob
+ * @file: drm file pointer
  *
  * On error, the contents of *data are undefined.
  */
@@ -708,18 +874,15 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
                 goto out;
         }
 
-        /* prime objects have no backing filp to GEM pread/pwrite
-         * pages from.
-         */
-        if (!obj->base.filp) {
-                ret = -EINVAL;
-                goto out;
-        }
-
         trace_i915_gem_object_pread(obj, args->offset, args->size);
 
         ret = i915_gem_shmem_pread(dev, obj, args, file);
 
+        /* pread for non shmem backed objects */
+        if (ret == -EFAULT || ret == -ENODEV)
+                ret = i915_gem_gtt_pread(dev, obj, args->size,
+                                        args->offset, args->data_ptr);
+
 out:
         drm_gem_object_unreference(&obj->base);
 unlock:
@@ -753,60 +916,99 @@ fast_user_write(struct io_mapping *mapping,
 /**
  * This is the fast pwrite path, where we copy the data directly from the
  * user into the GTT, uncached.
+ * @dev: drm device pointer
+ * @obj: i915 gem object
+ * @args: pwrite arguments structure
+ * @file: drm file pointer
  */
 static int
-i915_gem_gtt_pwrite_fast(struct drm_device *dev,
+i915_gem_gtt_pwrite_fast(struct drm_i915_private *i915,
                          struct drm_i915_gem_object *obj,
                          struct drm_i915_gem_pwrite *args,
                          struct drm_file *file)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
-        ssize_t remain;
-        loff_t offset, page_base;
+        struct i915_ggtt *ggtt = &i915->ggtt;
+        struct drm_device *dev = obj->base.dev;
+        struct drm_mm_node node;
+        uint64_t remain, offset;
         char __user *user_data;
-        int page_offset, page_length, ret;
+        int ret;
+        bool hit_slow_path = false;
+
+        if (obj->tiling_mode != I915_TILING_NONE)
+                return -EFAULT;
 
         ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE | PIN_NONBLOCK);
-        if (ret)
-                goto out;
+        if (ret) {
+                ret = insert_mappable_node(i915, &node, PAGE_SIZE);
+                if (ret)
+                        goto out;
+
+                ret = i915_gem_object_get_pages(obj);
+                if (ret) {
+                        remove_mappable_node(&node);
+                        goto out;
+                }
+
+                i915_gem_object_pin_pages(obj);
+        } else {
+                node.start = i915_gem_obj_ggtt_offset(obj);
+                node.allocated = false;
+                ret = i915_gem_object_put_fence(obj);
+                if (ret)
+                        goto out_unpin;
+        }
 
         ret = i915_gem_object_set_to_gtt_domain(obj, true);
         if (ret)
                 goto out_unpin;
 
-        ret = i915_gem_object_put_fence(obj);
-        if (ret)
-                goto out_unpin;
+        intel_fb_obj_invalidate(obj, ORIGIN_GTT);
+        obj->dirty = true;
 
         user_data = u64_to_user_ptr(args->data_ptr);
+        offset = args->offset;
         remain = args->size;
-
-        offset = i915_gem_obj_ggtt_offset(obj) + args->offset;
-
-        intel_fb_obj_invalidate(obj, ORIGIN_GTT);
-
-        while (remain > 0) {
+        while (remain) {
                 /* Operation in this page
                  *
                  * page_base = page offset within aperture
                  * page_offset = offset within page
                  * page_length = bytes to copy for this page
                  */
-                page_base = offset & PAGE_MASK;
-                page_offset = offset_in_page(offset);
-                page_length = remain;
-                if ((page_offset + remain) > PAGE_SIZE)
-                        page_length = PAGE_SIZE - page_offset;
-
+                u32 page_base = node.start;
+                unsigned page_offset = offset_in_page(offset);
+                unsigned page_length = PAGE_SIZE - page_offset;
+                page_length = remain < page_length ? remain : page_length;
+                if (node.allocated) {
+                        wmb(); /* flush the write before we modify the GGTT */
+                        ggtt->base.insert_page(&ggtt->base,
+                                               i915_gem_object_get_dma_address(obj, offset >> PAGE_SHIFT),
+                                               node.start, I915_CACHE_NONE, 0);
+                        wmb(); /* flush modifications to the GGTT (insert_page) */
+                } else {
+                        page_base += offset & PAGE_MASK;
+                }
                 /* If we get a fault while copying data, then (presumably) our
                  * source page isn't available.  Return the error and we'll
                  * retry in the slow path.
+                 * If the object is non-shmem backed, we retry again with the
+                 * path that handles page fault.
                  */
                 if (fast_user_write(ggtt->mappable, page_base,
                                     page_offset, user_data, page_length)) {
-                        ret = -EFAULT;
-                        goto out_flush;
+                        hit_slow_path = true;
+                        mutex_unlock(&dev->struct_mutex);
+                        if (slow_user_access(ggtt->mappable,
+                                             page_base,
+                                             page_offset, user_data,
+                                             page_length, true)) {
+                                ret = -EFAULT;
+                                mutex_lock(&dev->struct_mutex);
+                                goto out_flush;
+                        }
+
+                        mutex_lock(&dev->struct_mutex);
                 }
 
                 remain -= page_length;
@@ -815,9 +1017,31 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev,
         }
 
 out_flush:
+        if (hit_slow_path) {
+                if (ret == 0 &&
+                    (obj->base.read_domains & I915_GEM_DOMAIN_GTT) == 0) {
+                        /* The user has modified the object whilst we tried
+                         * reading from it, and we now have no idea what domain
+                         * the pages should be in. As we have just been touching
+                         * them directly, flush everything back to the GTT
+                         * domain.
+                         */
+                        ret = i915_gem_object_set_to_gtt_domain(obj, false);
+                }
+        }
+
         intel_fb_obj_flush(obj, false, ORIGIN_GTT);
 out_unpin:
-        i915_gem_object_ggtt_unpin(obj);
+        if (node.allocated) {
+                wmb();
+                ggtt->base.clear_range(&ggtt->base,
+                                       node.start, node.size,
+                                       true);
+                i915_gem_object_unpin_pages(obj);
+                remove_mappable_node(&node);
+        } else {
+                i915_gem_object_ggtt_unpin(obj);
+        }
 out:
         return ret;
 }
@@ -1006,7 +1230,7 @@ out:
         }
 
         if (needs_clflush_after)
-                i915_gem_chipset_flush(dev);
+                i915_gem_chipset_flush(to_i915(dev));
         else
                 obj->cache_dirty = true;
 
@@ -1016,6 +1240,9 @@ out:
 
 /**
  * Writes data to the object referenced by handle.
+ * @dev: drm device
+ * @data: ioctl data blob
+ * @file: drm file
  *
  * On error, the contents of the buffer that were to be modified are undefined.
  */
@@ -1062,14 +1289,6 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
                 goto out;
         }
 
-        /* prime objects have no backing filp to GEM pread/pwrite
-         * pages from.
-         */
-        if (!obj->base.filp) {
-                ret = -EINVAL;
-                goto out;
-        }
-
         trace_i915_gem_object_pwrite(obj, args->offset, args->size);
 
         ret = -EFAULT;
@@ -1079,20 +1298,20 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
          * pread/pwrite currently are reading and writing from the CPU
          * perspective, requiring manual detiling by the client.
          */
-        if (obj->tiling_mode == I915_TILING_NONE &&
-            obj->base.write_domain != I915_GEM_DOMAIN_CPU &&
-            cpu_write_needs_clflush(obj)) {
-                ret = i915_gem_gtt_pwrite_fast(dev, obj, args, file);
+        if (!obj->base.filp || cpu_write_needs_clflush(obj)) {
+                ret = i915_gem_gtt_pwrite_fast(dev_priv, obj, args, file);
                 /* Note that the gtt paths might fail with non-page-backed user
                  * pointers (e.g. gtt mappings when moving data between
                  * textures). Fallback to the shmem path in that case. */
         }
 
-        if (ret == -EFAULT || ret == -ENOSPC) {
+        if (ret == -EFAULT) {
                 if (obj->phys_handle)
                         ret = i915_gem_phys_pwrite(obj, args, file);
-                else
+                else if (obj->base.filp)
                         ret = i915_gem_shmem_pwrite(dev, obj, args, file);
+                else
+                        ret = -ENODEV;
         }
 
 out:
@@ -1213,6 +1432,7 @@ static int __i915_spin_request(struct drm_i915_gem_request *req, int state)
  * @req: duh!
  * @interruptible: do an interruptible wait (normally yes)
  * @timeout: in - how long to wait (NULL forever); out - how much time remaining
+ * @rps: RPS client
  *
  * Note: It is of utmost importance that the passed in seqno and reset_counter
  * values have been read by the caller in an smp safe manner. Where read-side
@@ -1230,8 +1450,7 @@ int __i915_wait_request(struct drm_i915_gem_request *req,
                         struct intel_rps_client *rps)
 {
         struct intel_engine_cs *engine = i915_gem_request_get_engine(req);
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = req->i915;
         const bool irq_test_in_progress =
                 ACCESS_ONCE(dev_priv->gpu_error.test_irq_rings) & intel_engine_flag(engine);
         int state = interruptible ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;
@@ -1413,6 +1632,13 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)
         list_del_init(&request->list);
         i915_gem_request_remove_from_client(request);
 
+        if (request->previous_context) {
+                if (i915.enable_execlists)
+                        intel_lr_context_unpin(request->previous_context,
+                                               request->engine);
+        }
+
+        i915_gem_context_unreference(request->ctx);
         i915_gem_request_unreference(request);
 }
 
@@ -1422,7 +1648,7 @@ __i915_gem_request_retire__upto(struct drm_i915_gem_request *req)
         struct intel_engine_cs *engine = req->engine;
         struct drm_i915_gem_request *tmp;
 
-        lockdep_assert_held(&engine->dev->struct_mutex);
+        lockdep_assert_held(&engine->i915->dev->struct_mutex);
 
         if (list_empty(&req->list))
                 return;
@@ -1440,6 +1666,7 @@ __i915_gem_request_retire__upto(struct drm_i915_gem_request *req)
 /**
  * Waits for a request to be signaled, and cleans up the
  * request and object lists appropriately for that event.
+ * @req: request to wait on
  */
 int
 i915_wait_request(struct drm_i915_gem_request *req)
@@ -1466,6 +1693,8 @@ i915_wait_request(struct drm_i915_gem_request *req)
 /**
  * Ensures that all rendering to the object has completed and the object is
  * safe to unbind from the GTT or access from the CPU.
+ * @obj: i915 gem object
+ * @readonly: waiting for read access or write
  */
 int
 i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj,
@@ -1583,6 +1812,9 @@ static struct intel_rps_client *to_rps_client(struct drm_file *file)
 /**
  * Called when user space prepares to use an object with the CPU, either
  * through the mmap ioctl's mapping or a GTT mapping.
+ * @dev: drm device
+ * @data: ioctl data blob
+ * @file: drm file
  */
 int
 i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
@@ -1646,6 +1878,9 @@ unlock:
 
 /**
  * Called when user space has done writes to this buffer
+ * @dev: drm device
+ * @data: ioctl data blob
+ * @file: drm file
  */
 int
 i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
@@ -1676,8 +1911,11 @@ unlock:
 }
 
 /**
- * Maps the contents of an object, returning the address it is mapped
- * into.
+ * i915_gem_mmap_ioctl - Maps the contents of an object, returning the address
+ *                       it is mapped to.
+ * @dev: drm device
+ * @data: ioctl data blob
+ * @file: drm file
  *
  * While the mapping holds a reference on the contents of the object, it doesn't
  * imply a ref on the object itself.
@@ -1982,7 +2220,7 @@ i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode)
                 return size;
 
         /* Previous chips need a power-of-two fence region when tiling */
-        if (INTEL_INFO(dev)->gen == 3)
+        if (IS_GEN3(dev))
                 gtt_size = 1024*1024;
         else
                 gtt_size = 512*1024;
@@ -1995,7 +2233,10 @@ i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode)
 
 /**
  * i915_gem_get_gtt_alignment - return required GTT alignment for an object
- * @obj: object to check
+ * @dev: drm device
+ * @size: object size
+ * @tiling_mode: tiling mode
+ * @fenced: is fenced alignemned required or not
  *
  * Return the required GTT alignment for an object, taking into account
  * potential fence register mapping.
@@ -2162,7 +2403,8 @@ i915_gem_object_invalidate(struct drm_i915_gem_object *obj)
 static void
 i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
 {
-        struct sg_page_iter sg_iter;
+        struct sgt_iter sgt_iter;
+        struct page *page;
         int ret;
 
         BUG_ON(obj->madv == __I915_MADV_PURGED);
@@ -2184,9 +2426,7 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
         if (obj->madv == I915_MADV_DONTNEED)
                 obj->dirty = 0;
 
-        for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
-                struct page *page = sg_page_iter_page(&sg_iter);
-
+        for_each_sgt_page(page, sgt_iter, obj->pages) {
                 if (obj->dirty)
                         set_page_dirty(page);
 
@@ -2243,7 +2483,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
         struct address_space *mapping;
         struct sg_table *st;
         struct scatterlist *sg;
-        struct sg_page_iter sg_iter;
+        struct sgt_iter sgt_iter;
         struct page *page;
         unsigned long last_pfn = 0;     /* suppress gcc warning */
         int ret;
@@ -2340,8 +2580,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
 
 err_pages:
         sg_mark_end(sg);
-        for_each_sg_page(st->sgl, &sg_iter, st->nents, 0)
-                put_page(sg_page_iter_page(&sg_iter));
+        for_each_sgt_page(page, sgt_iter, st)
+                put_page(page);
         sg_free_table(st);
         kfree(st);
 
@@ -2395,6 +2635,44 @@ i915_gem_object_get_pages(struct drm_i915_gem_object *obj)
         return 0;
 }
 
+/* The 'mapping' part of i915_gem_object_pin_map() below */
+static void *i915_gem_object_map(const struct drm_i915_gem_object *obj)
+{
+        unsigned long n_pages = obj->base.size >> PAGE_SHIFT;
+        struct sg_table *sgt = obj->pages;
+        struct sgt_iter sgt_iter;
+        struct page *page;
+        struct page *stack_pages[32];
+        struct page **pages = stack_pages;
+        unsigned long i = 0;
+        void *addr;
+
+        /* A single page can always be kmapped */
+        if (n_pages == 1)
+                return kmap(sg_page(sgt->sgl));
+
+        if (n_pages > ARRAY_SIZE(stack_pages)) {
+                /* Too big for stack -- allocate temporary array instead */
+                pages = drm_malloc_gfp(n_pages, sizeof(*pages), GFP_TEMPORARY);
+                if (!pages)
+                        return NULL;
+        }
+
+        for_each_sgt_page(page, sgt_iter, sgt)
+                pages[i++] = page;
+
+        /* Check that we have the expected number of pages */
+        GEM_BUG_ON(i != n_pages);
+
+        addr = vmap(pages, n_pages, 0, PAGE_KERNEL);
+
+        if (pages != stack_pages)
+                drm_free_large(pages);
+
+        return addr;
+}
+
+/* get, pin, and map the pages of the object into kernel space */
 void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj)
 {
         int ret;
@@ -2407,29 +2685,9 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj)
 
         i915_gem_object_pin_pages(obj);
 
-        if (obj->mapping == NULL) {
-                struct page **pages;
-
-                pages = NULL;
-                if (obj->base.size == PAGE_SIZE)
-                        obj->mapping = kmap(sg_page(obj->pages->sgl));
-                else
-                        pages = drm_malloc_gfp(obj->base.size >> PAGE_SHIFT,
-                                               sizeof(*pages),
-                                               GFP_TEMPORARY);
-                if (pages != NULL) {
-                        struct sg_page_iter sg_iter;
-                        int n;
-
-                        n = 0;
-                        for_each_sg_page(obj->pages->sgl, &sg_iter,
-                                         obj->pages->nents, 0)
-                                pages[n++] = sg_page_iter_page(&sg_iter);
-
-                        obj->mapping = vmap(pages, n, 0, PAGE_KERNEL);
-                        drm_free_large(pages);
-                }
-                if (obj->mapping == NULL) {
+        if (!obj->mapping) {
+                obj->mapping = i915_gem_object_map(obj);
+                if (!obj->mapping) {
                         i915_gem_object_unpin_pages(obj);
                         return ERR_PTR(-ENOMEM);
                 }
@@ -2502,9 +2760,8 @@ i915_gem_object_retire__read(struct drm_i915_gem_object *obj, int ring)
 }
 
 static int
-i915_gem_init_seqno(struct drm_device *dev, u32 seqno)
+i915_gem_init_seqno(struct drm_i915_private *dev_priv, u32 seqno)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         int ret;
 
@@ -2514,7 +2771,7 @@ i915_gem_init_seqno(struct drm_device *dev, u32 seqno)
                 if (ret)
                         return ret;
         }
-        i915_gem_retire_requests(dev);
+        i915_gem_retire_requests(dev_priv);
 
         /* Finally reset hw state */
         for_each_engine(engine, dev_priv)
@@ -2534,7 +2791,7 @@ int i915_gem_set_seqno(struct drm_device *dev, u32 seqno)
         /* HWS page needs to be set less than what we
          * will inject to ring
          */
-        ret = i915_gem_init_seqno(dev, seqno - 1);
+        ret = i915_gem_init_seqno(dev_priv, seqno - 1);
         if (ret)
                 return ret;
 
@@ -2550,13 +2807,11 @@ int i915_gem_set_seqno(struct drm_device *dev, u32 seqno)
 }
 
 int
-i915_gem_get_seqno(struct drm_device *dev, u32 *seqno)
+i915_gem_get_seqno(struct drm_i915_private *dev_priv, u32 *seqno)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         /* reserve 0 for non-seqno */
         if (dev_priv->next_seqno == 0) {
-                int ret = i915_gem_init_seqno(dev, 0);
+                int ret = i915_gem_init_seqno(dev_priv, 0);
                 if (ret)
                         return ret;
 
@@ -2580,6 +2835,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,
         struct drm_i915_private *dev_priv;
         struct intel_ringbuffer *ringbuf;
         u32 request_start;
+        u32 reserved_tail;
         int ret;
 
         if (WARN_ON(request == NULL))
@@ -2594,9 +2850,10 @@ void __i915_add_request(struct drm_i915_gem_request *request,
          * should already have been reserved in the ring buffer. Let the ring
          * know that it is time to use that space up.
          */
-        intel_ring_reserved_space_use(ringbuf);
-
         request_start = intel_ring_get_tail(ringbuf);
+        reserved_tail = request->reserved_space;
+        request->reserved_space = 0;
+
         /*
          * Emit any outstanding flushes - execbuf can fail to emit the flush
          * after having emitted the batchbuffer command. Hence we need to fix
@@ -2652,19 +2909,25 @@ void __i915_add_request(struct drm_i915_gem_request *request,
         /* Not allowed to fail! */
         WARN(ret, "emit|add_request failed: %d!\n", ret);
 
-        i915_queue_hangcheck(engine->dev);
+        i915_queue_hangcheck(engine->i915);
 
         queue_delayed_work(dev_priv->wq,
                            &dev_priv->mm.retire_work,
                            round_jiffies_up_relative(HZ));
-        intel_mark_busy(dev_priv->dev);
+        intel_mark_busy(dev_priv);
 
         /* Sanity check that the reserved size was large enough. */
-        intel_ring_reserved_space_end(ringbuf);
+        ret = intel_ring_get_tail(ringbuf) - request_start;
+        if (ret < 0)
+                ret += ringbuf->size;
+        WARN_ONCE(ret > reserved_tail,
+                  "Not enough space reserved (%d bytes) "
+                  "for adding the request (%d bytes)\n",
+                  reserved_tail, ret);
 }
 
 static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
-                                   const struct intel_context *ctx)
+                                   const struct i915_gem_context *ctx)
 {
         unsigned long elapsed;
 
@@ -2689,7 +2952,7 @@ static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
 }
 
 static void i915_set_reset_status(struct drm_i915_private *dev_priv,
-                                  struct intel_context *ctx,
+                                  struct i915_gem_context *ctx,
                                   const bool guilty)
 {
         struct i915_ctx_hang_stats *hs;
@@ -2712,27 +2975,15 @@ void i915_gem_request_free(struct kref *req_ref)
 {
         struct drm_i915_gem_request *req = container_of(req_ref,
                                                  typeof(*req), ref);
-        struct intel_context *ctx = req->ctx;
-
-        if (req->file_priv)
-                i915_gem_request_remove_from_client(req);
-
-        if (ctx) {
-                if (i915.enable_execlists && ctx != req->i915->kernel_context)
-                        intel_lr_context_unpin(ctx, req->engine);
-
-                i915_gem_context_unreference(ctx);
-        }
-
         kmem_cache_free(req->i915->requests, req);
 }
 
 static inline int
 __i915_gem_request_alloc(struct intel_engine_cs *engine,
-                         struct intel_context *ctx,
+                         struct i915_gem_context *ctx,
                          struct drm_i915_gem_request **req_out)
 {
-        struct drm_i915_private *dev_priv = to_i915(engine->dev);
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned reset_counter = i915_reset_counter(&dev_priv->gpu_error);
         struct drm_i915_gem_request *req;
         int ret;
@@ -2754,7 +3005,7 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine,
         if (req == NULL)
                 return -ENOMEM;
 
-        ret = i915_gem_get_seqno(engine->dev, &req->seqno);
+        ret = i915_gem_get_seqno(engine->i915, &req->seqno);
         if (ret)
                 goto err;
 
@@ -2765,15 +3016,6 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine,
         req->ctx  = ctx;
         i915_gem_context_reference(req->ctx);
 
-        if (i915.enable_execlists)
-                ret = intel_logical_ring_alloc_request_extras(req);
-        else
-                ret = intel_ring_alloc_request_extras(req);
-        if (ret) {
-                i915_gem_context_unreference(req->ctx);
-                goto err;
-        }
-
         /*
          * Reserve space in the ring buffer for all the commands required to
          * eventually emit this request. This is to guarantee that the
@@ -2781,24 +3023,20 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine,
          * to be redone if the request is not actually submitted straight
          * away, e.g. because a GPU scheduler has deferred it.
          */
+        req->reserved_space = MIN_SPACE_FOR_ADD_REQUEST;
+
         if (i915.enable_execlists)
-                ret = intel_logical_ring_reserve_space(req);
+                ret = intel_logical_ring_alloc_request_extras(req);
         else
-                ret = intel_ring_reserve_space(req);
-        if (ret) {
-                /*
-                 * At this point, the request is fully allocated even if not
-                 * fully prepared. Thus it can be cleaned up using the proper
-                 * free code.
-                 */
-                intel_ring_reserved_space_cancel(req->ringbuf);
-                i915_gem_request_unreference(req);
-                return ret;
-        }
+                ret = intel_ring_alloc_request_extras(req);
+        if (ret)
+                goto err_ctx;
 
         *req_out = req;
         return 0;
 
+err_ctx:
+        i915_gem_context_unreference(ctx);
 err:
         kmem_cache_free(dev_priv->requests, req);
         return ret;
@@ -2818,13 +3056,13 @@ err:
  */
 struct drm_i915_gem_request *
 i915_gem_request_alloc(struct intel_engine_cs *engine,
-                       struct intel_context *ctx)
+                       struct i915_gem_context *ctx)
 {
         struct drm_i915_gem_request *req;
         int err;
 
         if (ctx == NULL)
-                ctx = to_i915(engine->dev)->kernel_context;
+                ctx = engine->i915->kernel_context;
         err = __i915_gem_request_alloc(engine, ctx, &req);
         return err ? ERR_PTR(err) : req;
 }
@@ -2888,13 +3126,7 @@ static void i915_gem_reset_engine_cleanup(struct drm_i915_private *dev_priv,
                 /* Ensure irq handler finishes or is cancelled. */
                 tasklet_kill(&engine->irq_tasklet);
 
-                spin_lock_bh(&engine->execlist_lock);
-                /* list_splice_tail_init checks for empty lists */
-                list_splice_tail_init(&engine->execlist_queue,
-                                      &engine->execlist_retired_req_list);
-                spin_unlock_bh(&engine->execlist_lock);
-
-                intel_execlists_retire_requests(engine);
+                intel_execlists_cancel_requests(engine);
         }
 
         /*
@@ -2954,6 +3186,7 @@ void i915_gem_reset(struct drm_device *dev)
 
 /**
  * This function clears the request list as sequence numbers are passed.
+ * @engine: engine to retire requests on
  */
 void
 i915_gem_retire_requests_ring(struct intel_engine_cs *engine)
@@ -3005,9 +3238,8 @@ i915_gem_retire_requests_ring(struct intel_engine_cs *engine)
 }
 
 bool
-i915_gem_retire_requests(struct drm_device *dev)
+i915_gem_retire_requests(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         bool idle = true;
 
@@ -3018,8 +3250,6 @@ i915_gem_retire_requests(struct drm_device *dev)
                         spin_lock_bh(&engine->execlist_lock);
                         idle &= list_empty(&engine->execlist_queue);
                         spin_unlock_bh(&engine->execlist_lock);
-
-                        intel_execlists_retire_requests(engine);
                 }
         }
 
@@ -3042,7 +3272,7 @@ i915_gem_retire_work_handler(struct work_struct *work)
         /* Come back later if the device is busy... */
         idle = false;
         if (mutex_trylock(&dev->struct_mutex)) {
-                idle = i915_gem_retire_requests(dev);
+                idle = i915_gem_retire_requests(dev_priv);
                 mutex_unlock(&dev->struct_mutex);
         }
         if (!idle)
@@ -3066,7 +3296,7 @@ i915_gem_idle_work_handler(struct work_struct *work)
          * Also locking seems to be fubar here, engine->request_list is protected
          * by dev->struct_mutex. */
 
-        intel_mark_idle(dev);
+        intel_mark_idle(dev_priv);
 
         if (mutex_trylock(&dev->struct_mutex)) {
                 for_each_engine(engine, dev_priv)
@@ -3080,6 +3310,7 @@ i915_gem_idle_work_handler(struct work_struct *work)
  * Ensures that an object will eventually get non-busy by flushing any required
  * write domains, emitting any outstanding lazy request and retiring and
  * completed requests.
+ * @obj: object to flush
  */
 static int
 i915_gem_object_flush_active(struct drm_i915_gem_object *obj)
@@ -3096,14 +3327,8 @@ i915_gem_object_flush_active(struct drm_i915_gem_object *obj)
                 if (req == NULL)
                         continue;
 
-                if (list_empty(&req->list))
-                        goto retire;
-
-                if (i915_gem_request_completed(req, true)) {
-                        __i915_gem_request_retire__upto(req);
-retire:
+                if (i915_gem_request_completed(req, true))
                         i915_gem_object_retire__read(obj, i);
-                }
         }
 
         return 0;
@@ -3111,7 +3336,9 @@ retire:
 
 /**
  * i915_gem_wait_ioctl - implements DRM_IOCTL_I915_GEM_WAIT
- * @DRM_IOCTL_ARGS: standard ioctl arguments
+ * @dev: drm device pointer
+ * @data: ioctl data blob
+ * @file: drm file pointer
  *
  * Returns 0 if successful, else an error is returned with the remaining time in
  * the timeout parameter.
@@ -3185,7 +3412,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
                         ret = __i915_wait_request(req[i], true,
                                                   args->timeout_ns > 0 ? &args->timeout_ns : NULL,
                                                   to_rps_client(file));
-                i915_gem_request_unreference__unlocked(req[i]);
+                i915_gem_request_unreference(req[i]);
         }
         return ret;
 
@@ -3211,7 +3438,7 @@ __i915_gem_object_sync(struct drm_i915_gem_object *obj,
         if (i915_gem_request_completed(from_req, true))
                 return 0;
 
-        if (!i915_semaphore_is_enabled(obj->base.dev)) {
+        if (!i915_semaphore_is_enabled(to_i915(obj->base.dev))) {
                 struct drm_i915_private *i915 = to_i915(obj->base.dev);
                 ret = __i915_wait_request(from_req,
                                           i915->mm.interruptible,
@@ -3345,6 +3572,17 @@ static void i915_gem_object_finish_gtt(struct drm_i915_gem_object *obj)
                                             old_write_domain);
 }
 
+static void __i915_vma_iounmap(struct i915_vma *vma)
+{
+        GEM_BUG_ON(vma->pin_count);
+
+        if (vma->iomap == NULL)
+                return;
+
+        io_mapping_unmap(vma->iomap);
+        vma->iomap = NULL;
+}
+
 static int __i915_vma_unbind(struct i915_vma *vma, bool wait)
 {
         struct drm_i915_gem_object *obj = vma->obj;
@@ -3377,6 +3615,8 @@ static int __i915_vma_unbind(struct i915_vma *vma, bool wait)
                 ret = i915_gem_object_put_fence(obj);
                 if (ret)
                         return ret;
+
+                __i915_vma_iounmap(vma);
         }
 
         trace_i915_vma_unbind(vma);
@@ -3488,6 +3728,11 @@ static bool i915_gem_valid_gtt_space(struct i915_vma *vma,
 /**
  * Finds free space in the GTT aperture and binds the object or a view of it
  * there.
+ * @obj: object to bind
+ * @vm: address space to bind into
+ * @ggtt_view: global gtt view if applicable
+ * @alignment: requested alignment
+ * @flags: mask of PIN_* flags to use
  */
 static struct i915_vma *
 i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
@@ -3731,7 +3976,7 @@ i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj)
                 return;
 
         if (i915_gem_clflush_object(obj, obj->pin_display))
-                i915_gem_chipset_flush(obj->base.dev);
+                i915_gem_chipset_flush(to_i915(obj->base.dev));
 
         old_write_domain = obj->base.write_domain;
         obj->base.write_domain = 0;
@@ -3745,6 +3990,8 @@ i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj)
 
 /**
  * Moves a single object to the GTT read, and possibly write domain.
+ * @obj: object to act on
+ * @write: ask for write access or read only
  *
  * This function returns when the move is complete, including waiting on
  * flushes to occur.
@@ -3816,6 +4063,8 @@ i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, bool write)
 
 /**
  * Changes the cache-level of an object across all VMA.
+ * @obj: object to act on
+ * @cache_level: new cache level to set for the object
  *
  * After this function returns, the object will be in the new cache-level
  * across all GTT and the contents of the backing storage will be coherent,
@@ -3925,11 +4174,9 @@ out:
          * object is now coherent at its new cache level (with respect
          * to the access domain).
          */
-        if (obj->cache_dirty &&
-            obj->base.write_domain != I915_GEM_DOMAIN_CPU &&
-            cpu_write_needs_clflush(obj)) {
+        if (obj->cache_dirty && cpu_write_needs_clflush(obj)) {
                 if (i915_gem_clflush_object(obj, true))
-                        i915_gem_chipset_flush(obj->base.dev);
+                        i915_gem_chipset_flush(to_i915(obj->base.dev));
         }
 
         return 0;
@@ -4097,6 +4344,8 @@ i915_gem_object_unpin_from_display_plane(struct drm_i915_gem_object *obj,
 
 /**
  * Moves a single object to the CPU read, and possibly write domain.
+ * @obj: object to act on
+ * @write: requesting write or read-only access
  *
  * This function returns when the move is complete, including waiting on
  * flushes to occur.
@@ -4198,7 +4447,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
         if (ret == 0)
                 queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, 0);
 
-        i915_gem_request_unreference__unlocked(target);
+        i915_gem_request_unreference(target);
 
         return ret;
 }
@@ -4499,21 +4748,21 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = {
         .put_pages = i915_gem_object_put_pages_gtt,
 };
 
-struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
+struct drm_i915_gem_object *i915_gem_object_create(struct drm_device *dev,
                                                   size_t size)
 {
         struct drm_i915_gem_object *obj;
         struct address_space *mapping;
         gfp_t mask;
+        int ret;
 
         obj = i915_gem_object_alloc(dev);
         if (obj == NULL)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
-        if (drm_gem_object_init(dev, &obj->base, size) != 0) {
-                i915_gem_object_free(obj);
-                return NULL;
-        }
+        ret = drm_gem_object_init(dev, &obj->base, size);
+        if (ret)
+                goto fail;
 
         mask = GFP_HIGHUSER | __GFP_RECLAIMABLE;
         if (IS_CRESTLINE(dev) || IS_BROADWATER(dev)) {
@@ -4550,6 +4799,11 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
         trace_i915_gem_object_create(obj);
 
         return obj;
+
+fail:
+        i915_gem_object_free(obj);
+
+        return ERR_PTR(ret);
 }
 
 static bool discard_backing_storage(struct drm_i915_gem_object *obj)
@@ -4655,16 +4909,12 @@ struct i915_vma *i915_gem_obj_to_vma(struct drm_i915_gem_object *obj,
 struct i915_vma *i915_gem_obj_to_ggtt_view(struct drm_i915_gem_object *obj,
                                            const struct i915_ggtt_view *view)
 {
-        struct drm_device *dev = obj->base.dev;
-        struct drm_i915_private *dev_priv = to_i915(dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct i915_vma *vma;
 
-        BUG_ON(!view);
+        GEM_BUG_ON(!view);
 
         list_for_each_entry(vma, &obj->vma_list, obj_link)
-                if (vma->vm == &ggtt->base &&
-                    i915_ggtt_view_equal(&vma->ggtt_view, view))
+                if (vma->is_ggtt && i915_ggtt_view_equal(&vma->ggtt_view, view))
                         return vma;
         return NULL;
 }
@@ -4706,9 +4956,10 @@ i915_gem_suspend(struct drm_device *dev)
         if (ret)
                 goto err;
 
-        i915_gem_retire_requests(dev);
+        i915_gem_retire_requests(dev_priv);
 
         i915_gem_stop_engines(dev);
+        i915_gem_context_lost(dev_priv);
         mutex_unlock(&dev->struct_mutex);
 
         cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
@@ -4727,37 +4978,6 @@ err:
         return ret;
 }
 
-int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice)
-{
-        struct intel_engine_cs *engine = req->engine;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        u32 *remap_info = dev_priv->l3_parity.remap_info[slice];
-        int i, ret;
-
-        if (!HAS_L3_DPF(dev) || !remap_info)
-                return 0;
-
-        ret = intel_ring_begin(req, GEN7_L3LOG_SIZE / 4 * 3);
-        if (ret)
-                return ret;
-
-        /*
-         * Note: We do not worry about the concurrent register cacheline hang
-         * here because no other code should access these registers other than
-         * at initialization time.
-         */
-        for (i = 0; i < GEN7_L3LOG_SIZE / 4; i++) {
-                intel_ring_emit(engine, MI_LOAD_REGISTER_IMM(1));
-                intel_ring_emit_reg(engine, GEN7_L3LOG(slice, i));
-                intel_ring_emit(engine, remap_info[i]);
-        }
-
-        intel_ring_advance(engine);
-
-        return ret;
-}
-
 void i915_gem_init_swizzling(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -4862,7 +5082,7 @@ i915_gem_init_hw(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
-        int ret, j;
+        int ret;
 
         /* Double layer security blanket, see i915_gem_init() */
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
@@ -4914,58 +5134,15 @@ i915_gem_init_hw(struct drm_device *dev)
         intel_mocs_init_l3cc_table(dev);
 
         /* We can't enable contexts until all firmware is loaded */
-        if (HAS_GUC_UCODE(dev)) {
-                ret = intel_guc_ucode_load(dev);
-                if (ret) {
-                        DRM_ERROR("Failed to initialize GuC, error %d\n", ret);
-                        ret = -EIO;
-                        goto out;
-                }
-        }
+        ret = intel_guc_setup(dev);
+        if (ret)
+                goto out;
 
         /*
          * Increment the next seqno by 0x100 so we have a visible break
          * on re-initialisation
          */
         ret = i915_gem_set_seqno(dev, dev_priv->next_seqno+0x100);
-        if (ret)
-                goto out;
-
-        /* Now it is safe to go back round and do everything else: */
-        for_each_engine(engine, dev_priv) {
-                struct drm_i915_gem_request *req;
-
-                req = i915_gem_request_alloc(engine, NULL);
-                if (IS_ERR(req)) {
-                        ret = PTR_ERR(req);
-                        break;
-                }
-
-                if (engine->id == RCS) {
-                        for (j = 0; j < NUM_L3_SLICES(dev); j++) {
-                                ret = i915_gem_l3_remap(req, j);
-                                if (ret)
-                                        goto err_request;
-                        }
-                }
-
-                ret = i915_ppgtt_init_ring(req);
-                if (ret)
-                        goto err_request;
-
-                ret = i915_gem_context_enable(req);
-                if (ret)
-                        goto err_request;
-
-err_request:
-                i915_add_request_no_flush(req);
-                if (ret) {
-                        DRM_ERROR("Failed to enable %s, error=%d\n",
-                                  engine->name, ret);
-                        i915_gem_cleanup_engines(dev);
-                        break;
-                }
-        }
 
 out:
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
@@ -4977,9 +5154,6 @@ int i915_gem_init(struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
         int ret;
 
-        i915.enable_execlists = intel_sanitize_enable_execlists(dev,
-                        i915.enable_execlists);
-
         mutex_lock(&dev->struct_mutex);
 
         if (!i915.enable_execlists) {
@@ -5002,10 +5176,7 @@ int i915_gem_init(struct drm_device *dev)
          */
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
-        ret = i915_gem_init_userptr(dev);
-        if (ret)
-                goto out_unlock;
-
+        i915_gem_init_userptr(dev_priv);
         i915_gem_init_ggtt(dev);
 
         ret = i915_gem_context_init(dev);
@@ -5042,14 +5213,6 @@ i915_gem_cleanup_engines(struct drm_device *dev)
 
         for_each_engine(engine, dev_priv)
                 dev_priv->gt.cleanup_engine(engine);
-
-        if (i915.enable_execlists)
-                /*
-                 * Neither the BIOS, ourselves or any other kernel
-                 * expects the system to be in execlists mode on startup,
-                 * so we need to reset the GPU back to legacy mode.
-                 */
-                intel_gpu_reset(dev, ALL_ENGINES);
 }
 
 static void
@@ -5073,7 +5236,7 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv)
         else
                 dev_priv->num_fence_regs = 8;
 
-        if (intel_vgpu_active(dev))
+        if (intel_vgpu_active(dev_priv))
                 dev_priv->num_fence_regs =
                                 I915_READ(vgtif_reg(avail_rs.fence_num));
 
@@ -5148,6 +5311,34 @@ void i915_gem_load_cleanup(struct drm_device *dev)
         kmem_cache_destroy(dev_priv->objects);
 }
 
+int i915_gem_freeze_late(struct drm_i915_private *dev_priv)
+{
+        struct drm_i915_gem_object *obj;
+
+        /* Called just before we write the hibernation image.
+         *
+         * We need to update the domain tracking to reflect that the CPU
+         * will be accessing all the pages to create and restore from the
+         * hibernation, and so upon restoration those pages will be in the
+         * CPU domain.
+         *
+         * To make sure the hibernation image contains the latest state,
+         * we update that state just before writing out the image.
+         */
+
+        list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) {
+                obj->base.read_domains = I915_GEM_DOMAIN_CPU;
+                obj->base.write_domain = I915_GEM_DOMAIN_CPU;
+        }
+
+        list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
+                obj->base.read_domains = I915_GEM_DOMAIN_CPU;
+                obj->base.write_domain = I915_GEM_DOMAIN_CPU;
+        }
+
+        return 0;
+}
+
 void i915_gem_release(struct drm_device *dev, struct drm_file *file)
 {
         struct drm_i915_file_private *file_priv = file->driver_priv;
@@ -5254,13 +5445,10 @@ u64 i915_gem_obj_offset(struct drm_i915_gem_object *o,
 u64 i915_gem_obj_ggtt_offset_view(struct drm_i915_gem_object *o,
                                   const struct i915_ggtt_view *view)
 {
-        struct drm_i915_private *dev_priv = to_i915(o->base.dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct i915_vma *vma;
 
         list_for_each_entry(vma, &o->vma_list, obj_link)
-                if (vma->vm == &ggtt->base &&
-                    i915_ggtt_view_equal(&vma->ggtt_view, view))
+                if (vma->is_ggtt && i915_ggtt_view_equal(&vma->ggtt_view, view))
                         return vma->node.start;
 
         WARN(1, "global vma for this object not found. (view=%u)\n", view->type);
@@ -5286,12 +5474,10 @@ bool i915_gem_obj_bound(struct drm_i915_gem_object *o,
 bool i915_gem_obj_ggtt_bound_view(struct drm_i915_gem_object *o,
                                   const struct i915_ggtt_view *view)
 {
-        struct drm_i915_private *dev_priv = to_i915(o->base.dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct i915_vma *vma;
 
         list_for_each_entry(vma, &o->vma_list, obj_link)
-                if (vma->vm == &ggtt->base &&
+                if (vma->is_ggtt &&
                     i915_ggtt_view_equal(&vma->ggtt_view, view) &&
                     drm_mm_node_allocated(&vma->node))
                         return true;
@@ -5310,23 +5496,18 @@ bool i915_gem_obj_bound_any(struct drm_i915_gem_object *o)
         return false;
 }
 
-unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o,
-                                struct i915_address_space *vm)
+unsigned long i915_gem_obj_ggtt_size(struct drm_i915_gem_object *o)
 {
-        struct drm_i915_private *dev_priv = o->base.dev->dev_private;
         struct i915_vma *vma;
 
-        WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base);
-
-        BUG_ON(list_empty(&o->vma_list));
+        GEM_BUG_ON(list_empty(&o->vma_list));
 
         list_for_each_entry(vma, &o->vma_list, obj_link) {
                 if (vma->is_ggtt &&
-                    vma->ggtt_view.type != I915_GGTT_VIEW_NORMAL)
-                        continue;
-                if (vma->vm == vm)
+                    vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL)
                         return vma->node.size;
         }
+
         return 0;
 }
 
@@ -5365,8 +5546,8 @@ i915_gem_object_create_from_data(struct drm_device *dev,
         size_t bytes;
         int ret;
 
-        obj = i915_gem_alloc_object(dev, round_up(size, PAGE_SIZE));
-        if (IS_ERR_OR_NULL(obj))
+        obj = i915_gem_object_create(dev, round_up(size, PAGE_SIZE));
+        if (IS_ERR(obj))
                 return obj;
 
         ret = i915_gem_object_set_to_cpu_domain(obj, true);
diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
index 7bf2f3f2968e..3752d5daa4b2 100644
--- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c
+++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
@@ -134,9 +134,9 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool,
         if (obj == NULL) {
                 int ret;
 
-                obj = i915_gem_alloc_object(pool->dev, size);
-                if (obj == NULL)
-                        return ERR_PTR(-ENOMEM);
+                obj = i915_gem_object_create(pool->dev, size);
+                if (IS_ERR(obj))
+                        return obj;
 
                 ret = i915_gem_object_get_pages(obj);
                 if (ret)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index e5acc3916f75..30d9b4fd30f3 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -90,6 +90,8 @@
 #include "i915_drv.h"
 #include "i915_trace.h"
 
+#define ALL_L3_SLICES(dev) (1 << NUM_L3_SLICES(dev)) - 1
+
 /* This is a HW constraint. The value below is the largest known requirement
  * I've seen in a spec to date, and that was a workaround for a non-shipping
  * part. It should be safe to decrease this, but it's more future proof as is.
@@ -97,28 +99,27 @@
 #define GEN6_CONTEXT_ALIGN (64<<10)
 #define GEN7_CONTEXT_ALIGN 4096
 
-static size_t get_context_alignment(struct drm_device *dev)
+static size_t get_context_alignment(struct drm_i915_private *dev_priv)
 {
-        if (IS_GEN6(dev))
+        if (IS_GEN6(dev_priv))
                 return GEN6_CONTEXT_ALIGN;
 
         return GEN7_CONTEXT_ALIGN;
 }
 
-static int get_context_size(struct drm_device *dev)
+static int get_context_size(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int ret;
         u32 reg;
 
-        switch (INTEL_INFO(dev)->gen) {
+        switch (INTEL_GEN(dev_priv)) {
         case 6:
                 reg = I915_READ(CXT_SIZE);
                 ret = GEN6_CXT_TOTAL_SIZE(reg) * 64;
                 break;
         case 7:
                 reg = I915_READ(GEN7_CXT_SIZE);
-                if (IS_HASWELL(dev))
+                if (IS_HASWELL(dev_priv))
                         ret = HSW_CXT_TOTAL_SIZE;
                 else
                         ret = GEN7_CXT_TOTAL_SIZE(reg) * 64;
@@ -133,7 +134,7 @@ static int get_context_size(struct drm_device *dev)
         return ret;
 }
 
-static void i915_gem_context_clean(struct intel_context *ctx)
+static void i915_gem_context_clean(struct i915_gem_context *ctx)
 {
         struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
         struct i915_vma *vma, *next;
@@ -150,13 +151,12 @@ static void i915_gem_context_clean(struct intel_context *ctx)
 
 void i915_gem_context_free(struct kref *ctx_ref)
 {
-        struct intel_context *ctx = container_of(ctx_ref, typeof(*ctx), ref);
+        struct i915_gem_context *ctx = container_of(ctx_ref, typeof(*ctx), ref);
+        int i;
 
+        lockdep_assert_held(&ctx->i915->dev->struct_mutex);
         trace_i915_context_free(ctx);
 
-        if (i915.enable_execlists)
-                intel_lr_context_free(ctx);
-
         /*
          * This context is going away and we need to remove all VMAs still
          * around. This is to handle imported shared objects for which
@@ -166,9 +166,22 @@ void i915_gem_context_free(struct kref *ctx_ref)
 
         i915_ppgtt_put(ctx->ppgtt);
 
-        if (ctx->legacy_hw_ctx.rcs_state)
-                drm_gem_object_unreference(&ctx->legacy_hw_ctx.rcs_state->base);
+        for (i = 0; i < I915_NUM_ENGINES; i++) {
+                struct intel_context *ce = &ctx->engine[i];
+
+                if (!ce->state)
+                        continue;
+
+                WARN_ON(ce->pin_count);
+                if (ce->ringbuf)
+                        intel_ringbuffer_free(ce->ringbuf);
+
+                drm_gem_object_unreference(&ce->state->base);
+        }
+
         list_del(&ctx->link);
+
+        ida_simple_remove(&ctx->i915->context_hw_ida, ctx->hw_id);
         kfree(ctx);
 }
 
@@ -178,9 +191,11 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)
         struct drm_i915_gem_object *obj;
         int ret;
 
-        obj = i915_gem_alloc_object(dev, size);
-        if (obj == NULL)
-                return ERR_PTR(-ENOMEM);
+        lockdep_assert_held(&dev->struct_mutex);
+
+        obj = i915_gem_object_create(dev, size);
+        if (IS_ERR(obj))
+                return obj;
 
         /*
          * Try to make the context utilize L3 as well as LLC.
@@ -209,18 +224,46 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)
         return obj;
 }
 
-static struct intel_context *
+static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out)
+{
+        int ret;
+
+        ret = ida_simple_get(&dev_priv->context_hw_ida,
+                             0, MAX_CONTEXT_HW_ID, GFP_KERNEL);
+        if (ret < 0) {
+                /* Contexts are only released when no longer active.
+                 * Flush any pending retires to hopefully release some
+                 * stale contexts and try again.
+                 */
+                i915_gem_retire_requests(dev_priv);
+                ret = ida_simple_get(&dev_priv->context_hw_ida,
+                                     0, MAX_CONTEXT_HW_ID, GFP_KERNEL);
+                if (ret < 0)
+                        return ret;
+        }
+
+        *out = ret;
+        return 0;
+}
+
+static struct i915_gem_context *
 __create_hw_context(struct drm_device *dev,
                     struct drm_i915_file_private *file_priv)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         int ret;
 
         ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
         if (ctx == NULL)
                 return ERR_PTR(-ENOMEM);
 
+        ret = assign_hw_id(dev_priv, &ctx->hw_id);
+        if (ret) {
+                kfree(ctx);
+                return ERR_PTR(ret);
+        }
+
         kref_init(&ctx->ref);
         list_add_tail(&ctx->link, &dev_priv->context_list);
         ctx->i915 = dev_priv;
@@ -232,7 +275,7 @@ __create_hw_context(struct drm_device *dev,
                         ret = PTR_ERR(obj);
                         goto err_out;
                 }
-                ctx->legacy_hw_ctx.rcs_state = obj;
+                ctx->engine[RCS].state = obj;
         }
 
         /* Default context will never have a file_priv */
@@ -249,9 +292,13 @@ __create_hw_context(struct drm_device *dev,
         /* NB: Mark all slices as needing a remap so that when the context first
          * loads it will restore whatever remap state already exists. If there
          * is no remap info, it will be a NOP. */
-        ctx->remap_slice = (1 << NUM_L3_SLICES(dev)) - 1;
+        ctx->remap_slice = ALL_L3_SLICES(dev_priv);
 
         ctx->hang_stats.ban_period_seconds = DRM_I915_CTX_BAN_PERIOD;
+        ctx->ring_size = 4 * PAGE_SIZE;
+        ctx->desc_template = GEN8_CTX_ADDRESSING_MODE(dev_priv) <<
+                             GEN8_CTX_ADDRESSING_MODE_SHIFT;
+        ATOMIC_INIT_NOTIFIER_HEAD(&ctx->status_notifier);
 
         return ctx;
 
@@ -265,44 +312,27 @@ err_out:
  * context state of the GPU for applications that don't utilize HW contexts, as
  * well as an idle case.
  */
-static struct intel_context *
+static struct i915_gem_context *
 i915_gem_create_context(struct drm_device *dev,
                         struct drm_i915_file_private *file_priv)
 {
-        const bool is_global_default_ctx = file_priv == NULL;
-        struct intel_context *ctx;
-        int ret = 0;
+        struct i915_gem_context *ctx;
 
-        BUG_ON(!mutex_is_locked(&dev->struct_mutex));
+        lockdep_assert_held(&dev->struct_mutex);
 
         ctx = __create_hw_context(dev, file_priv);
         if (IS_ERR(ctx))
                 return ctx;
 
-        if (is_global_default_ctx && ctx->legacy_hw_ctx.rcs_state) {
-                /* We may need to do things with the shrinker which
-                 * require us to immediately switch back to the default
-                 * context. This can cause a problem as pinning the
-                 * default context also requires GTT space which may not
-                 * be available. To avoid this we always pin the default
-                 * context.
-                 */
-                ret = i915_gem_obj_ggtt_pin(ctx->legacy_hw_ctx.rcs_state,
-                                            get_context_alignment(dev), 0);
-                if (ret) {
-                        DRM_DEBUG_DRIVER("Couldn't pin %d\n", ret);
-                        goto err_destroy;
-                }
-        }
-
         if (USES_FULL_PPGTT(dev)) {
                 struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev, file_priv);
 
-                if (IS_ERR_OR_NULL(ppgtt)) {
+                if (IS_ERR(ppgtt)) {
                         DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",
                                          PTR_ERR(ppgtt));
-                        ret = PTR_ERR(ppgtt);
-                        goto err_unpin;
+                        idr_remove(&file_priv->context_idr, ctx->user_handle);
+                        i915_gem_context_unreference(ctx);
+                        return ERR_CAST(ppgtt);
                 }
 
                 ctx->ppgtt = ppgtt;
@@ -311,24 +341,53 @@ i915_gem_create_context(struct drm_device *dev,
         trace_i915_context_create(ctx);
 
         return ctx;
+}
 
-err_unpin:
-        if (is_global_default_ctx && ctx->legacy_hw_ctx.rcs_state)
-                i915_gem_object_ggtt_unpin(ctx->legacy_hw_ctx.rcs_state);
-err_destroy:
-        idr_remove(&file_priv->context_idr, ctx->user_handle);
-        i915_gem_context_unreference(ctx);
-        return ERR_PTR(ret);
+/**
+ * i915_gem_context_create_gvt - create a GVT GEM context
+ * @dev: drm device *
+ *
+ * This function is used to create a GVT specific GEM context.
+ *
+ * Returns:
+ * pointer to i915_gem_context on success, error pointer if failed
+ *
+ */
+struct i915_gem_context *
+i915_gem_context_create_gvt(struct drm_device *dev)
+{
+        struct i915_gem_context *ctx;
+        int ret;
+
+        if (!IS_ENABLED(CONFIG_DRM_I915_GVT))
+                return ERR_PTR(-ENODEV);
+
+        ret = i915_mutex_lock_interruptible(dev);
+        if (ret)
+                return ERR_PTR(ret);
+
+        ctx = i915_gem_create_context(dev, NULL);
+        if (IS_ERR(ctx))
+                goto out;
+
+        ctx->execlists_force_single_submission = true;
+        ctx->ring_size = 512 * PAGE_SIZE; /* Max ring buffer size */
+out:
+        mutex_unlock(&dev->struct_mutex);
+        return ctx;
 }
 
-static void i915_gem_context_unpin(struct intel_context *ctx,
+static void i915_gem_context_unpin(struct i915_gem_context *ctx,
                                    struct intel_engine_cs *engine)
 {
         if (i915.enable_execlists) {
                 intel_lr_context_unpin(ctx, engine);
         } else {
-                if (engine->id == RCS && ctx->legacy_hw_ctx.rcs_state)
-                        i915_gem_object_ggtt_unpin(ctx->legacy_hw_ctx.rcs_state);
+                struct intel_context *ce = &ctx->engine[engine->id];
+
+                if (ce->state)
+                        i915_gem_object_ggtt_unpin(ce->state);
+
                 i915_gem_context_unreference(ctx);
         }
 }
@@ -336,51 +395,48 @@ static void i915_gem_context_unpin(struct intel_context *ctx,
 void i915_gem_context_reset(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        int i;
+
+        lockdep_assert_held(&dev->struct_mutex);
 
         if (i915.enable_execlists) {
-                struct intel_context *ctx;
+                struct i915_gem_context *ctx;
 
                 list_for_each_entry(ctx, &dev_priv->context_list, link)
                         intel_lr_context_reset(dev_priv, ctx);
         }
 
-        for (i = 0; i < I915_NUM_ENGINES; i++) {
-                struct intel_engine_cs *engine = &dev_priv->engine[i];
-
-                if (engine->last_context) {
-                        i915_gem_context_unpin(engine->last_context, engine);
-                        engine->last_context = NULL;
-                }
-        }
-
-        /* Force the GPU state to be reinitialised on enabling */
-        dev_priv->kernel_context->legacy_hw_ctx.initialized = false;
+        i915_gem_context_lost(dev_priv);
 }
 
 int i915_gem_context_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
 
         /* Init should only be called once per module load. Eventually the
          * restriction on the context_disabled check can be loosened. */
         if (WARN_ON(dev_priv->kernel_context))
                 return 0;
 
-        if (intel_vgpu_active(dev) && HAS_LOGICAL_RING_CONTEXTS(dev)) {
+        if (intel_vgpu_active(dev_priv) &&
+            HAS_LOGICAL_RING_CONTEXTS(dev_priv)) {
                 if (!i915.enable_execlists) {
                         DRM_INFO("Only EXECLIST mode is supported in vgpu.\n");
                         return -EINVAL;
                 }
         }
 
+        /* Using the simple ida interface, the max is limited by sizeof(int) */
+        BUILD_BUG_ON(MAX_CONTEXT_HW_ID > INT_MAX);
+        ida_init(&dev_priv->context_hw_ida);
+
         if (i915.enable_execlists) {
                 /* NB: intentionally left blank. We will allocate our own
                  * backing objects as we need them, thank you very much */
                 dev_priv->hw_context_size = 0;
-        } else if (HAS_HW_CONTEXTS(dev)) {
-                dev_priv->hw_context_size = round_up(get_context_size(dev), 4096);
+        } else if (HAS_HW_CONTEXTS(dev_priv)) {
+                dev_priv->hw_context_size =
+                        round_up(get_context_size(dev_priv), 4096);
                 if (dev_priv->hw_context_size > (1<<20)) {
                         DRM_DEBUG_DRIVER("Disabling HW Contexts; invalid size %d\n",
                                          dev_priv->hw_context_size);
@@ -395,6 +451,26 @@ int i915_gem_context_init(struct drm_device *dev)
                 return PTR_ERR(ctx);
         }
 
+        if (!i915.enable_execlists && ctx->engine[RCS].state) {
+                int ret;
+
+                /* We may need to do things with the shrinker which
+                 * require us to immediately switch back to the default
+                 * context. This can cause a problem as pinning the
+                 * default context also requires GTT space which may not
+                 * be available. To avoid this we always pin the default
+                 * context.
+                 */
+                ret = i915_gem_obj_ggtt_pin(ctx->engine[RCS].state,
+                                            get_context_alignment(dev_priv), 0);
+                if (ret) {
+                        DRM_ERROR("Failed to pinned default global context (error %d)\n",
+                                  ret);
+                        i915_gem_context_unreference(ctx);
+                        return ret;
+                }
+        }
+
         dev_priv->kernel_context = ctx;
 
         DRM_DEBUG_DRIVER("%s context support initialized\n",
@@ -403,67 +479,48 @@ int i915_gem_context_init(struct drm_device *dev)
         return 0;
 }
 
-void i915_gem_context_fini(struct drm_device *dev)
+void i915_gem_context_lost(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_context *dctx = dev_priv->kernel_context;
-        int i;
-
-        if (dctx->legacy_hw_ctx.rcs_state) {
-                /* The only known way to stop the gpu from accessing the hw context is
-                 * to reset it. Do this as the very last operation to avoid confusing
-                 * other code, leading to spurious errors. */
-                intel_gpu_reset(dev, ALL_ENGINES);
-
-                /* When default context is created and switched to, base object refcount
-                 * will be 2 (+1 from object creation and +1 from do_switch()).
-                 * i915_gem_context_fini() will be called after gpu_idle() has switched
-                 * to default context. So we need to unreference the base object once
-                 * to offset the do_switch part, so that i915_gem_context_unreference()
-                 * can then free the base object correctly. */
-                WARN_ON(!dev_priv->engine[RCS].last_context);
-
-                i915_gem_object_ggtt_unpin(dctx->legacy_hw_ctx.rcs_state);
-        }
+        struct intel_engine_cs *engine;
 
-        for (i = I915_NUM_ENGINES; --i >= 0;) {
-                struct intel_engine_cs *engine = &dev_priv->engine[i];
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
 
+        for_each_engine(engine, dev_priv) {
                 if (engine->last_context) {
                         i915_gem_context_unpin(engine->last_context, engine);
                         engine->last_context = NULL;
                 }
+
+                /* Force the GPU state to be reinitialised on enabling */
+                dev_priv->kernel_context->engine[engine->id].initialised =
+                        engine->init_context == NULL;
         }
 
-        i915_gem_context_unreference(dctx);
-        dev_priv->kernel_context = NULL;
+        /* Force the GPU state to be reinitialised on enabling */
+        dev_priv->kernel_context->remap_slice = ALL_L3_SLICES(dev_priv);
 }
 
-int i915_gem_context_enable(struct drm_i915_gem_request *req)
+void i915_gem_context_fini(struct drm_device *dev)
 {
-        struct intel_engine_cs *engine = req->engine;
-        int ret;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct i915_gem_context *dctx = dev_priv->kernel_context;
 
-        if (i915.enable_execlists) {
-                if (engine->init_context == NULL)
-                        return 0;
+        lockdep_assert_held(&dev->struct_mutex);
 
-                ret = engine->init_context(req);
-        } else
-                ret = i915_switch_context(req);
+        if (!i915.enable_execlists && dctx->engine[RCS].state)
+                i915_gem_object_ggtt_unpin(dctx->engine[RCS].state);
 
-        if (ret) {
-                DRM_ERROR("ring init context: %d\n", ret);
-                return ret;
-        }
+        i915_gem_context_unreference(dctx);
+        dev_priv->kernel_context = NULL;
 
-        return 0;
+        ida_destroy(&dev_priv->context_hw_ida);
 }
 
 static int context_idr_cleanup(int id, void *p, void *data)
 {
-        struct intel_context *ctx = p;
+        struct i915_gem_context *ctx = p;
 
+        ctx->file_priv = ERR_PTR(-EBADF);
         i915_gem_context_unreference(ctx);
         return 0;
 }
@@ -471,7 +528,7 @@ static int context_idr_cleanup(int id, void *p, void *data)
 int i915_gem_context_open(struct drm_device *dev, struct drm_file *file)
 {
         struct drm_i915_file_private *file_priv = file->driver_priv;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
 
         idr_init(&file_priv->context_idr);
 
@@ -491,31 +548,22 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file)
 {
         struct drm_i915_file_private *file_priv = file->driver_priv;
 
+        lockdep_assert_held(&dev->struct_mutex);
+
         idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);
         idr_destroy(&file_priv->context_idr);
 }
 
-struct intel_context *
-i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)
-{
-        struct intel_context *ctx;
-
-        ctx = (struct intel_context *)idr_find(&file_priv->context_idr, id);
-        if (!ctx)
-                return ERR_PTR(-ENOENT);
-
-        return ctx;
-}
-
 static inline int
 mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
 {
+        struct drm_i915_private *dev_priv = req->i915;
         struct intel_engine_cs *engine = req->engine;
         u32 flags = hw_flags | MI_MM_SPACE_GTT;
         const int num_rings =
                 /* Use an extended w/a on ivb+ if signalling from other rings */
-                i915_semaphore_is_enabled(engine->dev) ?
-                hweight32(INTEL_INFO(engine->dev)->ring_mask) - 1 :
+                i915_semaphore_is_enabled(dev_priv) ?
+                hweight32(INTEL_INFO(dev_priv)->ring_mask) - 1 :
                 0;
         int len, ret;
 
@@ -524,21 +572,21 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
          * explicitly, so we rely on the value at ring init, stored in
          * itlb_before_ctx_switch.
          */
-        if (IS_GEN6(engine->dev)) {
+        if (IS_GEN6(dev_priv)) {
                 ret = engine->flush(req, I915_GEM_GPU_DOMAINS, 0);
                 if (ret)
                         return ret;
         }
 
         /* These flags are for resource streamer on HSW+ */
-        if (IS_HASWELL(engine->dev) || INTEL_INFO(engine->dev)->gen >= 8)
+        if (IS_HASWELL(dev_priv) || INTEL_GEN(dev_priv) >= 8)
                 flags |= (HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN);
-        else if (INTEL_INFO(engine->dev)->gen < 8)
+        else if (INTEL_GEN(dev_priv) < 8)
                 flags |= (MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN);
 
 
         len = 4;
-        if (INTEL_INFO(engine->dev)->gen >= 7)
+        if (INTEL_GEN(dev_priv) >= 7)
                 len += 2 + (num_rings ? 4*num_rings + 6 : 0);
 
         ret = intel_ring_begin(req, len);
@@ -546,14 +594,14 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
                 return ret;
 
         /* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw,chv */
-        if (INTEL_INFO(engine->dev)->gen >= 7) {
+        if (INTEL_GEN(dev_priv) >= 7) {
                 intel_ring_emit(engine, MI_ARB_ON_OFF | MI_ARB_DISABLE);
                 if (num_rings) {
                         struct intel_engine_cs *signaller;
 
                         intel_ring_emit(engine,
                                         MI_LOAD_REGISTER_IMM(num_rings));
-                        for_each_engine(signaller, to_i915(engine->dev)) {
+                        for_each_engine(signaller, dev_priv) {
                                 if (signaller == engine)
                                         continue;
 
@@ -568,7 +616,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
         intel_ring_emit(engine, MI_NOOP);
         intel_ring_emit(engine, MI_SET_CONTEXT);
         intel_ring_emit(engine,
-                        i915_gem_obj_ggtt_offset(req->ctx->legacy_hw_ctx.rcs_state) |
+                        i915_gem_obj_ggtt_offset(req->ctx->engine[RCS].state) |
                         flags);
         /*
          * w/a: MI_SET_CONTEXT must always be followed by MI_NOOP
@@ -576,14 +624,14 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
          */
         intel_ring_emit(engine, MI_NOOP);
 
-        if (INTEL_INFO(engine->dev)->gen >= 7) {
+        if (INTEL_GEN(dev_priv) >= 7) {
                 if (num_rings) {
                         struct intel_engine_cs *signaller;
                         i915_reg_t last_reg = {}; /* keep gcc quiet */
 
                         intel_ring_emit(engine,
                                         MI_LOAD_REGISTER_IMM(num_rings));
-                        for_each_engine(signaller, to_i915(engine->dev)) {
+                        for_each_engine(signaller, dev_priv) {
                                 if (signaller == engine)
                                         continue;
 
@@ -609,45 +657,83 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
         return ret;
 }
 
-static inline bool skip_rcs_switch(struct intel_engine_cs *engine,
-                                   struct intel_context *to)
+static int remap_l3(struct drm_i915_gem_request *req, int slice)
+{
+        u32 *remap_info = req->i915->l3_parity.remap_info[slice];
+        struct intel_engine_cs *engine = req->engine;
+        int i, ret;
+
+        if (!remap_info)
+                return 0;
+
+        ret = intel_ring_begin(req, GEN7_L3LOG_SIZE/4 * 2 + 2);
+        if (ret)
+                return ret;
+
+        /*
+         * Note: We do not worry about the concurrent register cacheline hang
+         * here because no other code should access these registers other than
+         * at initialization time.
+         */
+        intel_ring_emit(engine, MI_LOAD_REGISTER_IMM(GEN7_L3LOG_SIZE/4));
+        for (i = 0; i < GEN7_L3LOG_SIZE/4; i++) {
+                intel_ring_emit_reg(engine, GEN7_L3LOG(slice, i));
+                intel_ring_emit(engine, remap_info[i]);
+        }
+        intel_ring_emit(engine, MI_NOOP);
+        intel_ring_advance(engine);
+
+        return 0;
+}
+
+static inline bool skip_rcs_switch(struct i915_hw_ppgtt *ppgtt,
+                                   struct intel_engine_cs *engine,
+                                   struct i915_gem_context *to)
 {
         if (to->remap_slice)
                 return false;
 
-        if (!to->legacy_hw_ctx.initialized)
+        if (!to->engine[RCS].initialised)
                 return false;
 
-        if (to->ppgtt &&
-            !(intel_engine_flag(engine) & to->ppgtt->pd_dirty_rings))
+        if (ppgtt && (intel_engine_flag(engine) & ppgtt->pd_dirty_rings))
                 return false;
 
         return to == engine->last_context;
 }
 
 static bool
-needs_pd_load_pre(struct intel_engine_cs *engine, struct intel_context *to)
+needs_pd_load_pre(struct i915_hw_ppgtt *ppgtt,
+                  struct intel_engine_cs *engine,
+                  struct i915_gem_context *to)
 {
-        if (!to->ppgtt)
+        if (!ppgtt)
                 return false;
 
+        /* Always load the ppgtt on first use */
+        if (!engine->last_context)
+                return true;
+
+        /* Same context without new entries, skip */
         if (engine->last_context == to &&
-            !(intel_engine_flag(engine) & to->ppgtt->pd_dirty_rings))
+            !(intel_engine_flag(engine) & ppgtt->pd_dirty_rings))
                 return false;
 
         if (engine->id != RCS)
                 return true;
 
-        if (INTEL_INFO(engine->dev)->gen < 8)
+        if (INTEL_GEN(engine->i915) < 8)
                 return true;
 
         return false;
 }
 
 static bool
-needs_pd_load_post(struct intel_context *to, u32 hw_flags)
+needs_pd_load_post(struct i915_hw_ppgtt *ppgtt,
+                   struct i915_gem_context *to,
+                   u32 hw_flags)
 {
-        if (!to->ppgtt)
+        if (!ppgtt)
                 return false;
 
         if (!IS_GEN8(to->i915))
@@ -661,18 +747,19 @@ needs_pd_load_post(struct intel_context *to, u32 hw_flags)
 
 static int do_rcs_switch(struct drm_i915_gem_request *req)
 {
-        struct intel_context *to = req->ctx;
+        struct i915_gem_context *to = req->ctx;
         struct intel_engine_cs *engine = req->engine;
-        struct intel_context *from;
+        struct i915_hw_ppgtt *ppgtt = to->ppgtt ?: req->i915->mm.aliasing_ppgtt;
+        struct i915_gem_context *from;
         u32 hw_flags;
         int ret, i;
 
-        if (skip_rcs_switch(engine, to))
+        if (skip_rcs_switch(ppgtt, engine, to))
                 return 0;
 
         /* Trying to pin first makes error handling easier. */
-        ret = i915_gem_obj_ggtt_pin(to->legacy_hw_ctx.rcs_state,
-                                    get_context_alignment(engine->dev),
+        ret = i915_gem_obj_ggtt_pin(to->engine[RCS].state,
+                                    get_context_alignment(engine->i915),
                                     0);
         if (ret)
                 return ret;
@@ -694,37 +781,32 @@ static int do_rcs_switch(struct drm_i915_gem_request *req)
          *
          * XXX: We need a real interface to do this instead of trickery.
          */
-        ret = i915_gem_object_set_to_gtt_domain(to->legacy_hw_ctx.rcs_state, false);
+        ret = i915_gem_object_set_to_gtt_domain(to->engine[RCS].state, false);
         if (ret)
                 goto unpin_out;
 
-        if (needs_pd_load_pre(engine, to)) {
+        if (needs_pd_load_pre(ppgtt, engine, to)) {
                 /* Older GENs and non render rings still want the load first,
                  * "PP_DCLV followed by PP_DIR_BASE register through Load
                  * Register Immediate commands in Ring Buffer before submitting
                  * a context."*/
                 trace_switch_mm(engine, to);
-                ret = to->ppgtt->switch_mm(to->ppgtt, req);
+                ret = ppgtt->switch_mm(ppgtt, req);
                 if (ret)
                         goto unpin_out;
         }
 
-        if (!to->legacy_hw_ctx.initialized || i915_gem_context_is_default(to))
+        if (!to->engine[RCS].initialised || i915_gem_context_is_default(to))
                 /* NB: If we inhibit the restore, the context is not allowed to
                  * die because future work may end up depending on valid address
                  * space. This means we must enforce that a page table load
                  * occur when this occurs. */
                 hw_flags = MI_RESTORE_INHIBIT;
-        else if (to->ppgtt &&
-                 intel_engine_flag(engine) & to->ppgtt->pd_dirty_rings)
+        else if (ppgtt && intel_engine_flag(engine) & ppgtt->pd_dirty_rings)
                 hw_flags = MI_FORCE_RESTORE;
         else
                 hw_flags = 0;
 
-        /* We should never emit switch_mm more than once */
-        WARN_ON(needs_pd_load_pre(engine, to) &&
-                needs_pd_load_post(to, hw_flags));
-
         if (to != from || (hw_flags & MI_FORCE_RESTORE)) {
                 ret = mi_set_context(req, hw_flags);
                 if (ret)
@@ -738,8 +820,8 @@ static int do_rcs_switch(struct drm_i915_gem_request *req)
          * MI_SET_CONTEXT instead of when the next seqno has completed.
          */
         if (from != NULL) {
-                from->legacy_hw_ctx.rcs_state->base.read_domains = I915_GEM_DOMAIN_INSTRUCTION;
-                i915_vma_move_to_active(i915_gem_obj_to_ggtt(from->legacy_hw_ctx.rcs_state), req);
+                from->engine[RCS].state->base.read_domains = I915_GEM_DOMAIN_INSTRUCTION;
+                i915_vma_move_to_active(i915_gem_obj_to_ggtt(from->engine[RCS].state), req);
                 /* As long as MI_SET_CONTEXT is serializing, ie. it flushes the
                  * whole damn pipeline, we don't need to explicitly mark the
                  * object dirty. The only exception is that the context must be
@@ -747,10 +829,10 @@ static int do_rcs_switch(struct drm_i915_gem_request *req)
                  * able to defer doing this until we know the object would be
                  * swapped, but there is no way to do that yet.
                  */
-                from->legacy_hw_ctx.rcs_state->dirty = 1;
+                from->engine[RCS].state->dirty = 1;
 
                 /* obj is kept alive until the next request by its active ref */
-                i915_gem_object_ggtt_unpin(from->legacy_hw_ctx.rcs_state);
+                i915_gem_object_ggtt_unpin(from->engine[RCS].state);
                 i915_gem_context_unreference(from);
         }
         i915_gem_context_reference(to);
@@ -759,9 +841,9 @@ static int do_rcs_switch(struct drm_i915_gem_request *req)
         /* GEN8 does *not* require an explicit reload if the PDPs have been
          * setup, and we do not wish to move them.
          */
-        if (needs_pd_load_post(to, hw_flags)) {
+        if (needs_pd_load_post(ppgtt, to, hw_flags)) {
                 trace_switch_mm(engine, to);
-                ret = to->ppgtt->switch_mm(to->ppgtt, req);
+                ret = ppgtt->switch_mm(ppgtt, req);
                 /* The hardware context switch is emitted, but we haven't
                  * actually changed the state - so it's probably safe to bail
                  * here. Still, let the user know something dangerous has
@@ -771,33 +853,33 @@ static int do_rcs_switch(struct drm_i915_gem_request *req)
                         return ret;
         }
 
-        if (to->ppgtt)
-                to->ppgtt->pd_dirty_rings &= ~intel_engine_flag(engine);
+        if (ppgtt)
+                ppgtt->pd_dirty_rings &= ~intel_engine_flag(engine);
 
         for (i = 0; i < MAX_L3_SLICES; i++) {
                 if (!(to->remap_slice & (1<<i)))
                         continue;
 
-                ret = i915_gem_l3_remap(req, i);
+                ret = remap_l3(req, i);
                 if (ret)
                         return ret;
 
                 to->remap_slice &= ~(1<<i);
         }
 
-        if (!to->legacy_hw_ctx.initialized) {
+        if (!to->engine[RCS].initialised) {
                 if (engine->init_context) {
                         ret = engine->init_context(req);
                         if (ret)
                                 return ret;
                 }
-                to->legacy_hw_ctx.initialized = true;
+                to->engine[RCS].initialised = true;
         }
 
         return 0;
 
 unpin_out:
-        i915_gem_object_ggtt_unpin(to->legacy_hw_ctx.rcs_state);
+        i915_gem_object_ggtt_unpin(to->engine[RCS].state);
         return ret;
 }
 
@@ -817,25 +899,24 @@ unpin_out:
 int i915_switch_context(struct drm_i915_gem_request *req)
 {
         struct intel_engine_cs *engine = req->engine;
-        struct drm_i915_private *dev_priv = req->i915;
 
         WARN_ON(i915.enable_execlists);
-        WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
+        lockdep_assert_held(&req->i915->dev->struct_mutex);
 
-        if (engine->id != RCS ||
-            req->ctx->legacy_hw_ctx.rcs_state == NULL) {
-                struct intel_context *to = req->ctx;
+        if (!req->ctx->engine[engine->id].state) {
+                struct i915_gem_context *to = req->ctx;
+                struct i915_hw_ppgtt *ppgtt =
+                        to->ppgtt ?: req->i915->mm.aliasing_ppgtt;
 
-                if (needs_pd_load_pre(engine, to)) {
+                if (needs_pd_load_pre(ppgtt, engine, to)) {
                         int ret;
 
                         trace_switch_mm(engine, to);
-                        ret = to->ppgtt->switch_mm(to->ppgtt, req);
+                        ret = ppgtt->switch_mm(ppgtt, req);
                         if (ret)
                                 return ret;
 
-                        /* Doing a PD load always reloads the page dirs */
-                        to->ppgtt->pd_dirty_rings &= ~intel_engine_flag(engine);
+                        ppgtt->pd_dirty_rings &= ~intel_engine_flag(engine);
                 }
 
                 if (to != engine->last_context) {
@@ -861,7 +942,7 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
 {
         struct drm_i915_gem_context_create *args = data;
         struct drm_i915_file_private *file_priv = file->driver_priv;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         int ret;
 
         if (!contexts_enabled(dev))
@@ -890,7 +971,7 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
 {
         struct drm_i915_gem_context_destroy *args = data;
         struct drm_i915_file_private *file_priv = file->driver_priv;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         int ret;
 
         if (args->pad != 0)
@@ -903,13 +984,13 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        ctx = i915_gem_context_get(file_priv, args->ctx_id);
+        ctx = i915_gem_context_lookup(file_priv, args->ctx_id);
         if (IS_ERR(ctx)) {
                 mutex_unlock(&dev->struct_mutex);
                 return PTR_ERR(ctx);
         }
 
-        idr_remove(&ctx->file_priv->context_idr, ctx->user_handle);
+        idr_remove(&file_priv->context_idr, ctx->user_handle);
         i915_gem_context_unreference(ctx);
         mutex_unlock(&dev->struct_mutex);
 
@@ -922,14 +1003,14 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
 {
         struct drm_i915_file_private *file_priv = file->driver_priv;
         struct drm_i915_gem_context_param *args = data;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         int ret;
 
         ret = i915_mutex_lock_interruptible(dev);
         if (ret)
                 return ret;
 
-        ctx = i915_gem_context_get(file_priv, args->ctx_id);
+        ctx = i915_gem_context_lookup(file_priv, args->ctx_id);
         if (IS_ERR(ctx)) {
                 mutex_unlock(&dev->struct_mutex);
                 return PTR_ERR(ctx);
@@ -965,14 +1046,14 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
 {
         struct drm_i915_file_private *file_priv = file->driver_priv;
         struct drm_i915_gem_context_param *args = data;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         int ret;
 
         ret = i915_mutex_lock_interruptible(dev);
         if (ret)
                 return ret;
 
-        ctx = i915_gem_context_get(file_priv, args->ctx_id);
+        ctx = i915_gem_context_lookup(file_priv, args->ctx_id);
         if (IS_ERR(ctx)) {
                 mutex_unlock(&dev->struct_mutex);
                 return PTR_ERR(ctx);
@@ -1004,3 +1085,42 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
 
         return ret;
 }
+
+int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,
+                                       void *data, struct drm_file *file)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_reset_stats *args = data;
+        struct i915_ctx_hang_stats *hs;
+        struct i915_gem_context *ctx;
+        int ret;
+
+        if (args->flags || args->pad)
+                return -EINVAL;
+
+        if (args->ctx_id == DEFAULT_CONTEXT_HANDLE && !capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        ret = i915_mutex_lock_interruptible(dev);
+        if (ret)
+                return ret;
+
+        ctx = i915_gem_context_lookup(file->driver_priv, args->ctx_id);
+        if (IS_ERR(ctx)) {
+                mutex_unlock(&dev->struct_mutex);
+                return PTR_ERR(ctx);
+        }
+        hs = &ctx->hang_stats;
+
+        if (capable(CAP_SYS_ADMIN))
+                args->reset_count = i915_reset_count(&dev_priv->gpu_error);
+        else
+                args->reset_count = 0;
+
+        args->batch_active = hs->batch_active;
+        args->batch_pending = hs->batch_pending;
+
+        mutex_unlock(&dev->struct_mutex);
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.h b/drivers/gpu/drm/i915/i915_gem_dmabuf.h
new file mode 100644
index 000000000000..91315557e421
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2016 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.
+ *
+ */
+
+#ifndef _I915_GEM_DMABUF_H_
+#define _I915_GEM_DMABUF_H_
+
+#include <linux/dma-buf.h>
+
+static inline struct reservation_object *
+i915_gem_object_get_dmabuf_resv(struct drm_i915_gem_object *obj)
+{
+        struct dma_buf *dma_buf;
+
+        if (obj->base.dma_buf)
+                dma_buf = obj->base.dma_buf;
+        else if (obj->base.import_attach)
+                dma_buf = obj->base.import_attach->dmabuf;
+        else
+                return NULL;
+
+        return dma_buf->resv;
+}
+
+#endif
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index ea1f8d1bd228..b144c3f5c650 100644
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -154,7 +154,7 @@ none:
                 if (ret)
                         return ret;
 
-                i915_gem_retire_requests(dev);
+                i915_gem_retire_requests(to_i915(dev));
                 goto search_again;
         }
 
@@ -265,7 +265,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
                 if (ret)
                         return ret;
 
-                i915_gem_retire_requests(vm->dev);
+                i915_gem_retire_requests(to_i915(vm->dev));
 
                 WARN_ON(!list_empty(&vm->active_list));
         }
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 33df74d98269..7941f1fe9cd2 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -714,7 +714,7 @@ eb_vma_misplaced(struct i915_vma *vma)
 static int
 i915_gem_execbuffer_reserve(struct intel_engine_cs *engine,
                             struct list_head *vmas,
-                            struct intel_context *ctx,
+                            struct i915_gem_context *ctx,
                             bool *need_relocs)
 {
         struct drm_i915_gem_object *obj;
@@ -722,7 +722,7 @@ i915_gem_execbuffer_reserve(struct intel_engine_cs *engine,
         struct i915_address_space *vm;
         struct list_head ordered_vmas;
         struct list_head pinned_vmas;
-        bool has_fenced_gpu_access = INTEL_INFO(engine->dev)->gen < 4;
+        bool has_fenced_gpu_access = INTEL_GEN(engine->i915) < 4;
         int retry;
 
         i915_gem_retire_requests_ring(engine);
@@ -826,7 +826,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
                                   struct intel_engine_cs *engine,
                                   struct eb_vmas *eb,
                                   struct drm_i915_gem_exec_object2 *exec,
-                                  struct intel_context *ctx)
+                                  struct i915_gem_context *ctx)
 {
         struct drm_i915_gem_relocation_entry *reloc;
         struct i915_address_space *vm;
@@ -963,7 +963,7 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req,
         }
 
         if (flush_chipset)
-                i915_gem_chipset_flush(req->engine->dev);
+                i915_gem_chipset_flush(req->engine->i915);
 
         if (flush_domains & I915_GEM_DOMAIN_GTT)
                 wmb();
@@ -1063,17 +1063,17 @@ validate_exec_list(struct drm_device *dev,
         return 0;
 }
 
-static struct intel_context *
+static struct i915_gem_context *
 i915_gem_validate_context(struct drm_device *dev, struct drm_file *file,
                           struct intel_engine_cs *engine, const u32 ctx_id)
 {
-        struct intel_context *ctx = NULL;
+        struct i915_gem_context *ctx = NULL;
         struct i915_ctx_hang_stats *hs;
 
         if (engine->id != RCS && ctx_id != DEFAULT_CONTEXT_HANDLE)
                 return ERR_PTR(-EINVAL);
 
-        ctx = i915_gem_context_get(file->driver_priv, ctx_id);
+        ctx = i915_gem_context_lookup(file->driver_priv, ctx_id);
         if (IS_ERR(ctx))
                 return ctx;
 
@@ -1083,14 +1083,6 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file,
                 return ERR_PTR(-EIO);
         }
 
-        if (i915.enable_execlists && !ctx->engine[engine->id].state) {
-                int ret = intel_lr_context_deferred_alloc(ctx, engine);
-                if (ret) {
-                        DRM_DEBUG("Could not create LRC %u: %d\n", ctx_id, ret);
-                        return ERR_PTR(ret);
-                }
-        }
-
         return ctx;
 }
 
@@ -1125,7 +1117,7 @@ i915_gem_execbuffer_move_to_active(struct list_head *vmas,
                 if (entry->flags & EXEC_OBJECT_NEEDS_FENCE) {
                         i915_gem_request_assign(&obj->last_fenced_req, req);
                         if (entry->flags & __EXEC_OBJECT_HAS_FENCE) {
-                                struct drm_i915_private *dev_priv = to_i915(engine->dev);
+                                struct drm_i915_private *dev_priv = engine->i915;
                                 list_move_tail(&dev_priv->fence_regs[obj->fence_reg].lru_list,
                                                &dev_priv->mm.fence_list);
                         }
@@ -1436,7 +1428,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
         struct drm_i915_gem_object *batch_obj;
         struct drm_i915_gem_exec_object2 shadow_exec_entry;
         struct intel_engine_cs *engine;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         struct i915_address_space *vm;
         struct i915_execbuffer_params params_master; /* XXX: will be removed later */
         struct i915_execbuffer_params *params = &params_master;
@@ -1454,7 +1446,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 
         dispatch_flags = 0;
         if (args->flags & I915_EXEC_SECURE) {
-                if (!file->is_master || !capable(CAP_SYS_ADMIN))
+                if (!drm_is_current_master(file) || !capable(CAP_SYS_ADMIN))
                     return -EPERM;
 
                 dispatch_flags |= I915_DISPATCH_SECURE;
@@ -1561,7 +1553,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                                                              batch_obj,
                                                              args->batch_start_offset,
                                                              args->batch_len,
-                                                             file->is_master);
+                                                             drm_is_current_master(file));
                 if (IS_ERR(parsed_batch_obj)) {
                         ret = PTR_ERR(parsed_batch_obj);
                         goto err;
diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c
index a2b938ec01a7..2b6bdc267fb5 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence.c
@@ -745,15 +745,15 @@ i915_gem_swizzle_page(struct page *page)
 void
 i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj)
 {
-        struct sg_page_iter sg_iter;
+        struct sgt_iter sgt_iter;
+        struct page *page;
         int i;
 
         if (obj->bit_17 == NULL)
                 return;
 
         i = 0;
-        for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
-                struct page *page = sg_page_iter_page(&sg_iter);
+        for_each_sgt_page(page, sgt_iter, obj->pages) {
                 char new_bit_17 = page_to_phys(page) >> 17;
                 if ((new_bit_17 & 0x1) !=
                     (test_bit(i, obj->bit_17) != 0)) {
@@ -775,7 +775,8 @@ i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj)
 void
 i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj)
 {
-        struct sg_page_iter sg_iter;
+        struct sgt_iter sgt_iter;
+        struct page *page;
         int page_count = obj->base.size >> PAGE_SHIFT;
         int i;
 
@@ -790,8 +791,9 @@ i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj)
         }
 
         i = 0;
-        for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
-                if (page_to_phys(sg_page_iter_page(&sg_iter)) & (1 << 17))
+
+        for_each_sgt_page(page, sgt_iter, obj->pages) {
+                if (page_to_phys(page) & (1 << 17))
                         __set_bit(i, obj->bit_17);
                 else
                         __clear_bit(i, obj->bit_17);
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 92acdff9dad3..5890017b9832 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -93,6 +93,13 @@
  *
  */
 
+static inline struct i915_ggtt *
+i915_vm_to_ggtt(struct i915_address_space *vm)
+{
+        GEM_BUG_ON(!i915_is_ggtt(vm));
+        return container_of(vm, struct i915_ggtt, base);
+}
+
 static int
 i915_get_ggtt_vma_pages(struct i915_vma *vma);
 
@@ -103,25 +110,29 @@ const struct i915_ggtt_view i915_ggtt_view_rotated = {
         .type = I915_GGTT_VIEW_ROTATED,
 };
 
-static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
+int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
+                                int enable_ppgtt)
 {
         bool has_aliasing_ppgtt;
         bool has_full_ppgtt;
         bool has_full_48bit_ppgtt;
 
-        has_aliasing_ppgtt = INTEL_INFO(dev)->gen >= 6;
-        has_full_ppgtt = INTEL_INFO(dev)->gen >= 7;
-        has_full_48bit_ppgtt = IS_BROADWELL(dev) || INTEL_INFO(dev)->gen >= 9;
+        has_aliasing_ppgtt = INTEL_GEN(dev_priv) >= 6;
+        has_full_ppgtt = INTEL_GEN(dev_priv) >= 7;
+        has_full_48bit_ppgtt =
+                IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9;
 
-        if (intel_vgpu_active(dev))
+        if (intel_vgpu_active(dev_priv))
                 has_full_ppgtt = false; /* emulation is too hard */
 
+        if (!has_aliasing_ppgtt)
+                return 0;
+
         /*
          * We don't allow disabling PPGTT for gen9+ as it's a requirement for
          * execlists, the sole mechanism available to submit work.
          */
-        if (INTEL_INFO(dev)->gen < 9 &&
-            (enable_ppgtt == 0 || !has_aliasing_ppgtt))
+        if (enable_ppgtt == 0 && INTEL_GEN(dev_priv) < 9)
                 return 0;
 
         if (enable_ppgtt == 1)
@@ -135,19 +146,19 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
 
 #ifdef CONFIG_INTEL_IOMMU
         /* Disable ppgtt on SNB if VT-d is on. */
-        if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped) {
+        if (IS_GEN6(dev_priv) && intel_iommu_gfx_mapped) {
                 DRM_INFO("Disabling PPGTT because VT-d is on\n");
                 return 0;
         }
 #endif
 
         /* Early VLV doesn't have this */
-        if (IS_VALLEYVIEW(dev) && dev->pdev->revision < 0xb) {
+        if (IS_VALLEYVIEW(dev_priv) && dev_priv->dev->pdev->revision < 0xb) {
                 DRM_DEBUG_DRIVER("disabling PPGTT on pre-B3 step VLV\n");
                 return 0;
         }
 
-        if (INTEL_INFO(dev)->gen >= 8 && i915.enable_execlists)
+        if (INTEL_GEN(dev_priv) >= 8 && i915.enable_execlists)
                 return has_full_48bit_ppgtt ? 3 : 2;
         else
                 return has_aliasing_ppgtt ? 1 : 0;
@@ -866,6 +877,7 @@ static void gen8_free_page_tables(struct drm_device *dev,
 static int gen8_init_scratch(struct i915_address_space *vm)
 {
         struct drm_device *dev = vm->dev;
+        int ret;
 
         vm->scratch_page = alloc_scratch_page(dev);
         if (IS_ERR(vm->scratch_page))
@@ -873,24 +885,21 @@ static int gen8_init_scratch(struct i915_address_space *vm)
 
         vm->scratch_pt = alloc_pt(dev);
         if (IS_ERR(vm->scratch_pt)) {
-                free_scratch_page(dev, vm->scratch_page);
-                return PTR_ERR(vm->scratch_pt);
+                ret = PTR_ERR(vm->scratch_pt);
+                goto free_scratch_page;
         }
 
         vm->scratch_pd = alloc_pd(dev);
         if (IS_ERR(vm->scratch_pd)) {
-                free_pt(dev, vm->scratch_pt);
-                free_scratch_page(dev, vm->scratch_page);
-                return PTR_ERR(vm->scratch_pd);
+                ret = PTR_ERR(vm->scratch_pd);
+                goto free_pt;
         }
 
         if (USES_FULL_48BIT_PPGTT(dev)) {
                 vm->scratch_pdp = alloc_pdp(dev);
                 if (IS_ERR(vm->scratch_pdp)) {
-                        free_pd(dev, vm->scratch_pd);
-                        free_pt(dev, vm->scratch_pt);
-                        free_scratch_page(dev, vm->scratch_page);
-                        return PTR_ERR(vm->scratch_pdp);
+                        ret = PTR_ERR(vm->scratch_pdp);
+                        goto free_pd;
                 }
         }
 
@@ -900,6 +909,15 @@ static int gen8_init_scratch(struct i915_address_space *vm)
                 gen8_initialize_pdp(vm, vm->scratch_pdp);
 
         return 0;
+
+free_pd:
+        free_pd(dev, vm->scratch_pd);
+free_pt:
+        free_pt(dev, vm->scratch_pt);
+free_scratch_page:
+        free_scratch_page(dev, vm->scratch_page);
+
+        return ret;
 }
 
 static int gen8_ppgtt_notify_vgt(struct i915_hw_ppgtt *ppgtt, bool create)
@@ -978,7 +996,7 @@ static void gen8_ppgtt_cleanup(struct i915_address_space *vm)
 {
         struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
 
-        if (intel_vgpu_active(vm->dev))
+        if (intel_vgpu_active(to_i915(vm->dev)))
                 gen8_ppgtt_notify_vgt(ppgtt, false);
 
         if (!USES_FULL_48BIT_PPGTT(ppgtt->base.dev))
@@ -1529,14 +1547,14 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
                                                               0, 0,
                                                               GEN8_PML4E_SHIFT);
 
-                if (intel_vgpu_active(ppgtt->base.dev)) {
+                if (intel_vgpu_active(to_i915(ppgtt->base.dev))) {
                         ret = gen8_preallocate_top_level_pdps(ppgtt);
                         if (ret)
                                 goto free_scratch;
                 }
         }
 
-        if (intel_vgpu_active(ppgtt->base.dev))
+        if (intel_vgpu_active(to_i915(ppgtt->base.dev)))
                 gen8_ppgtt_notify_vgt(ppgtt, true);
 
         return 0;
@@ -1821,20 +1839,19 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
                                       enum i915_cache_level cache_level, u32 flags)
 {
         struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
-        gen6_pte_t *pt_vaddr;
         unsigned first_entry = start >> PAGE_SHIFT;
         unsigned act_pt = first_entry / GEN6_PTES;
         unsigned act_pte = first_entry % GEN6_PTES;
-        struct sg_page_iter sg_iter;
+        gen6_pte_t *pt_vaddr = NULL;
+        struct sgt_iter sgt_iter;
+        dma_addr_t addr;
 
-        pt_vaddr = NULL;
-        for_each_sg_page(pages->sgl, &sg_iter, pages->nents, 0) {
+        for_each_sgt_dma(addr, sgt_iter, pages) {
                 if (pt_vaddr == NULL)
                         pt_vaddr = kmap_px(ppgtt->pd.page_table[act_pt]);
 
                 pt_vaddr[act_pte] =
-                        vm->pte_encode(sg_page_iter_dma_address(&sg_iter),
-                                       cache_level, true, flags);
+                        vm->pte_encode(addr, cache_level, true, flags);
 
                 if (++act_pte == GEN6_PTES) {
                         kunmap_px(ppgtt, pt_vaddr);
@@ -1843,6 +1860,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
                         act_pte = 0;
                 }
         }
+
         if (pt_vaddr)
                 kunmap_px(ppgtt, pt_vaddr);
 }
@@ -2064,7 +2082,7 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
         } else
                 BUG();
 
-        if (intel_vgpu_active(dev))
+        if (intel_vgpu_active(dev_priv))
                 ppgtt->switch_mm = vgpu_mm_switch;
 
         ret = gen6_ppgtt_alloc(ppgtt);
@@ -2140,7 +2158,7 @@ static void gtt_write_workarounds(struct drm_device *dev)
                 I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT);
 }
 
-int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt)
+static int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         int ret = 0;
@@ -2179,20 +2197,6 @@ int i915_ppgtt_init_hw(struct drm_device *dev)
         return 0;
 }
 
-int i915_ppgtt_init_ring(struct drm_i915_gem_request *req)
-{
-        struct drm_i915_private *dev_priv = req->i915;
-        struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
-
-        if (i915.enable_execlists)
-                return 0;
-
-        if (!ppgtt)
-                return 0;
-
-        return ppgtt->switch_mm(ppgtt, req);
-}
-
 struct i915_hw_ppgtt *
 i915_ppgtt_create(struct drm_device *dev, struct drm_i915_file_private *fpriv)
 {
@@ -2275,12 +2279,11 @@ static void undo_idling(struct drm_i915_private *dev_priv, bool interruptible)
                 dev_priv->mm.interruptible = interruptible;
 }
 
-void i915_check_and_clear_faults(struct drm_device *dev)
+void i915_check_and_clear_faults(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
 
-        if (INTEL_INFO(dev)->gen < 6)
+        if (INTEL_INFO(dev_priv)->gen < 6)
                 return;
 
         for_each_engine(engine, dev_priv) {
@@ -2324,7 +2327,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev)
         if (INTEL_INFO(dev)->gen < 6)
                 return;
 
-        i915_check_and_clear_faults(dev);
+        i915_check_and_clear_faults(dev_priv);
 
         ggtt->base.clear_range(&ggtt->base, ggtt->base.start, ggtt->base.total,
                              true);
@@ -2352,29 +2355,49 @@ static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte)
 #endif
 }
 
+static void gen8_ggtt_insert_page(struct i915_address_space *vm,
+                                  dma_addr_t addr,
+                                  uint64_t offset,
+                                  enum i915_cache_level level,
+                                  u32 unused)
+{
+        struct drm_i915_private *dev_priv = to_i915(vm->dev);
+        gen8_pte_t __iomem *pte =
+                (gen8_pte_t __iomem *)dev_priv->ggtt.gsm +
+                (offset >> PAGE_SHIFT);
+        int rpm_atomic_seq;
+
+        rpm_atomic_seq = assert_rpm_atomic_begin(dev_priv);
+
+        gen8_set_pte(pte, gen8_pte_encode(addr, level, true));
+
+        I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);
+        POSTING_READ(GFX_FLSH_CNTL_GEN6);
+
+        assert_rpm_atomic_end(dev_priv, rpm_atomic_seq);
+}
+
 static void gen8_ggtt_insert_entries(struct i915_address_space *vm,
                                      struct sg_table *st,
                                      uint64_t start,
                                      enum i915_cache_level level, u32 unused)
 {
         struct drm_i915_private *dev_priv = to_i915(vm->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
-        unsigned first_entry = start >> PAGE_SHIFT;
-        gen8_pte_t __iomem *gtt_entries =
-                (gen8_pte_t __iomem *)ggtt->gsm + first_entry;
-        int i = 0;
-        struct sg_page_iter sg_iter;
-        dma_addr_t addr = 0; /* shut up gcc */
+        struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
+        struct sgt_iter sgt_iter;
+        gen8_pte_t __iomem *gtt_entries;
+        gen8_pte_t gtt_entry;
+        dma_addr_t addr;
         int rpm_atomic_seq;
+        int i = 0;
 
         rpm_atomic_seq = assert_rpm_atomic_begin(dev_priv);
 
-        for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) {
-                addr = sg_dma_address(sg_iter.sg) +
-                        (sg_iter.sg_pgoffset << PAGE_SHIFT);
-                gen8_set_pte(&gtt_entries[i],
-                             gen8_pte_encode(addr, level, true));
-                i++;
+        gtt_entries = (gen8_pte_t __iomem *)ggtt->gsm + (start >> PAGE_SHIFT);
+
+        for_each_sgt_dma(addr, sgt_iter, st) {
+                gtt_entry = gen8_pte_encode(addr, level, true);
+                gen8_set_pte(&gtt_entries[i++], gtt_entry);
         }
 
         /*
@@ -2385,8 +2408,7 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm,
          * hardware should work, we must keep this posting read for paranoia.
          */
         if (i != 0)
-                WARN_ON(readq(&gtt_entries[i-1])
-                        != gen8_pte_encode(addr, level, true));
+                WARN_ON(readq(&gtt_entries[i-1]) != gtt_entry);
 
         /* This next bit makes the above posting read even more important. We
          * want to flush the TLBs only after we're certain all the PTE updates
@@ -2424,6 +2446,28 @@ static void gen8_ggtt_insert_entries__BKL(struct i915_address_space *vm,
         stop_machine(gen8_ggtt_insert_entries__cb, &arg, NULL);
 }
 
+static void gen6_ggtt_insert_page(struct i915_address_space *vm,
+                                  dma_addr_t addr,
+                                  uint64_t offset,
+                                  enum i915_cache_level level,
+                                  u32 flags)
+{
+        struct drm_i915_private *dev_priv = to_i915(vm->dev);
+        gen6_pte_t __iomem *pte =
+                (gen6_pte_t __iomem *)dev_priv->ggtt.gsm +
+                (offset >> PAGE_SHIFT);
+        int rpm_atomic_seq;
+
+        rpm_atomic_seq = assert_rpm_atomic_begin(dev_priv);
+
+        iowrite32(vm->pte_encode(addr, level, true, flags), pte);
+
+        I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);
+        POSTING_READ(GFX_FLSH_CNTL_GEN6);
+
+        assert_rpm_atomic_end(dev_priv, rpm_atomic_seq);
+}
+
 /*
  * Binds an object into the global gtt with the specified cache level. The object
  * will be accessible to the GPU via commands whose operands reference offsets
@@ -2436,21 +2480,21 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
                                      enum i915_cache_level level, u32 flags)
 {
         struct drm_i915_private *dev_priv = to_i915(vm->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
-        unsigned first_entry = start >> PAGE_SHIFT;
-        gen6_pte_t __iomem *gtt_entries =
-                (gen6_pte_t __iomem *)ggtt->gsm + first_entry;
-        int i = 0;
-        struct sg_page_iter sg_iter;
-        dma_addr_t addr = 0;
+        struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
+        struct sgt_iter sgt_iter;
+        gen6_pte_t __iomem *gtt_entries;
+        gen6_pte_t gtt_entry;
+        dma_addr_t addr;
         int rpm_atomic_seq;
+        int i = 0;
 
         rpm_atomic_seq = assert_rpm_atomic_begin(dev_priv);
 
-        for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) {
-                addr = sg_page_iter_dma_address(&sg_iter);
-                iowrite32(vm->pte_encode(addr, level, true, flags), &gtt_entries[i]);
-                i++;
+        gtt_entries = (gen6_pte_t __iomem *)ggtt->gsm + (start >> PAGE_SHIFT);
+
+        for_each_sgt_dma(addr, sgt_iter, st) {
+                gtt_entry = vm->pte_encode(addr, level, true, flags);
+                iowrite32(gtt_entry, &gtt_entries[i++]);
         }
 
         /* XXX: This serves as a posting read to make sure that the PTE has
@@ -2459,10 +2503,8 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
          * of NUMA access patterns. Therefore, even with the way we assume
          * hardware should work, we must keep this posting read for paranoia.
          */
-        if (i != 0) {
-                unsigned long gtt = readl(&gtt_entries[i-1]);
-                WARN_ON(gtt != vm->pte_encode(addr, level, true, flags));
-        }
+        if (i != 0)
+                WARN_ON(readl(&gtt_entries[i-1]) != gtt_entry);
 
         /* This next bit makes the above posting read even more important. We
          * want to flush the TLBs only after we're certain all the PTE updates
@@ -2474,13 +2516,20 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
         assert_rpm_atomic_end(dev_priv, rpm_atomic_seq);
 }
 
+static void nop_clear_range(struct i915_address_space *vm,
+                            uint64_t start,
+                            uint64_t length,
+                            bool use_scratch)
+{
+}
+
 static void gen8_ggtt_clear_range(struct i915_address_space *vm,
                                   uint64_t start,
                                   uint64_t length,
                                   bool use_scratch)
 {
         struct drm_i915_private *dev_priv = to_i915(vm->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
         unsigned first_entry = start >> PAGE_SHIFT;
         unsigned num_entries = length >> PAGE_SHIFT;
         gen8_pte_t scratch_pte, __iomem *gtt_base =
@@ -2512,7 +2561,7 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm,
                                   bool use_scratch)
 {
         struct drm_i915_private *dev_priv = to_i915(vm->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
         unsigned first_entry = start >> PAGE_SHIFT;
         unsigned num_entries = length >> PAGE_SHIFT;
         gen6_pte_t scratch_pte, __iomem *gtt_base =
@@ -2538,6 +2587,24 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm,
         assert_rpm_atomic_end(dev_priv, rpm_atomic_seq);
 }
 
+static void i915_ggtt_insert_page(struct i915_address_space *vm,
+                                  dma_addr_t addr,
+                                  uint64_t offset,
+                                  enum i915_cache_level cache_level,
+                                  u32 unused)
+{
+        struct drm_i915_private *dev_priv = to_i915(vm->dev);
+        unsigned int flags = (cache_level == I915_CACHE_NONE) ?
+                AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
+        int rpm_atomic_seq;
+
+        rpm_atomic_seq = assert_rpm_atomic_begin(dev_priv);
+
+        intel_gtt_insert_page(addr, offset >> PAGE_SHIFT, flags);
+
+        assert_rpm_atomic_end(dev_priv, rpm_atomic_seq);
+}
+
 static void i915_ggtt_insert_entries(struct i915_address_space *vm,
                                      struct sg_table *pages,
                                      uint64_t start,
@@ -2727,11 +2794,9 @@ static int i915_gem_setup_global_gtt(struct drm_device *dev,
         i915_address_space_init(&ggtt->base, dev_priv);
         ggtt->base.total += PAGE_SIZE;
 
-        if (intel_vgpu_active(dev)) {
-                ret = intel_vgt_balloon(dev);
-                if (ret)
-                        return ret;
-        }
+        ret = intel_vgt_balloon(dev_priv);
+        if (ret)
+                return ret;
 
         if (!HAS_LLC(dev))
                 ggtt->base.mm.color_adjust = i915_gtt_color_adjust;
@@ -2831,8 +2896,7 @@ void i915_ggtt_cleanup_hw(struct drm_device *dev)
         i915_gem_cleanup_stolen(dev);
 
         if (drm_mm_initialized(&ggtt->base.mm)) {
-                if (intel_vgpu_active(dev))
-                        intel_vgt_deballoon();
+                intel_vgt_deballoon(dev_priv);
 
                 drm_mm_takedown(&ggtt->base.mm);
                 list_del(&ggtt->base.global_link);
@@ -3069,13 +3133,16 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
 
         ret = ggtt_probe_common(dev, ggtt->size);
 
-        ggtt->base.clear_range = gen8_ggtt_clear_range;
-        if (IS_CHERRYVIEW(dev_priv))
-                ggtt->base.insert_entries = gen8_ggtt_insert_entries__BKL;
-        else
-                ggtt->base.insert_entries = gen8_ggtt_insert_entries;
         ggtt->base.bind_vma = ggtt_bind_vma;
         ggtt->base.unbind_vma = ggtt_unbind_vma;
+        ggtt->base.insert_page = gen8_ggtt_insert_page;
+        ggtt->base.clear_range = nop_clear_range;
+        if (!USES_FULL_PPGTT(dev_priv))
+                ggtt->base.clear_range = gen8_ggtt_clear_range;
+
+        ggtt->base.insert_entries = gen8_ggtt_insert_entries;
+        if (IS_CHERRYVIEW(dev_priv))
+                ggtt->base.insert_entries = gen8_ggtt_insert_entries__BKL;
 
         return ret;
 }
@@ -3108,6 +3175,7 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
         ret = ggtt_probe_common(dev, ggtt->size);
 
         ggtt->base.clear_range = gen6_ggtt_clear_range;
+        ggtt->base.insert_page = gen6_ggtt_insert_page;
         ggtt->base.insert_entries = gen6_ggtt_insert_entries;
         ggtt->base.bind_vma = ggtt_bind_vma;
         ggtt->base.unbind_vma = ggtt_unbind_vma;
@@ -3139,6 +3207,7 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt)
                       &ggtt->mappable_base, &ggtt->mappable_end);
 
         ggtt->do_idle_maps = needs_idle_maps(dev_priv->dev);
+        ggtt->base.insert_page = i915_ggtt_insert_page;
         ggtt->base.insert_entries = i915_ggtt_insert_entries;
         ggtt->base.clear_range = i915_ggtt_clear_range;
         ggtt->base.bind_vma = ggtt_bind_vma;
@@ -3219,14 +3288,6 @@ int i915_ggtt_init_hw(struct drm_device *dev)
         if (intel_iommu_gfx_mapped)
                 DRM_INFO("VT-d active for gfx access\n");
 #endif
-        /*
-         * i915.enable_ppgtt is read-only, so do an early pass to validate the
-         * user's requested state against the hardware/driver capabilities.  We
-         * do this now so that we can print out any log messages once rather
-         * than every time we check intel_enable_ppgtt().
-         */
-        i915.enable_ppgtt = sanitize_enable_ppgtt(dev, i915.enable_ppgtt);
-        DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915.enable_ppgtt);
 
         return 0;
 
@@ -3250,9 +3311,8 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct drm_i915_gem_object *obj;
         struct i915_vma *vma;
-        bool flush;
 
-        i915_check_and_clear_faults(dev);
+        i915_check_and_clear_faults(dev_priv);
 
         /* First fill our portion of the GTT with scratch pages */
         ggtt->base.clear_range(&ggtt->base, ggtt->base.start, ggtt->base.total,
@@ -3260,19 +3320,16 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
 
         /* Cache flush objects bound into GGTT and rebind them. */
         list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
-                flush = false;
                 list_for_each_entry(vma, &obj->vma_list, obj_link) {
                         if (vma->vm != &ggtt->base)
                                 continue;
 
                         WARN_ON(i915_vma_bind(vma, obj->cache_level,
                                               PIN_UPDATE));
-
-                        flush = true;
                 }
 
-                if (flush)
-                        i915_gem_clflush_object(obj, obj->pin_display);
+                if (obj->pin_display)
+                        WARN_ON(i915_gem_object_set_to_gtt_domain(obj, false));
         }
 
         if (INTEL_INFO(dev)->gen >= 8) {
@@ -3398,9 +3455,11 @@ static struct sg_table *
 intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,
                           struct drm_i915_gem_object *obj)
 {
+        const size_t n_pages = obj->base.size / PAGE_SIZE;
         unsigned int size_pages = rot_info->plane[0].width * rot_info->plane[0].height;
         unsigned int size_pages_uv;
-        struct sg_page_iter sg_iter;
+        struct sgt_iter sgt_iter;
+        dma_addr_t dma_addr;
         unsigned long i;
         dma_addr_t *page_addr_list;
         struct sg_table *st;
@@ -3409,7 +3468,7 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,
         int ret = -ENOMEM;
 
         /* Allocate a temporary list of source pages for random access. */
-        page_addr_list = drm_malloc_gfp(obj->base.size / PAGE_SIZE,
+        page_addr_list = drm_malloc_gfp(n_pages,
                                         sizeof(dma_addr_t),
                                         GFP_TEMPORARY);
         if (!page_addr_list)
@@ -3432,11 +3491,10 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,
 
         /* Populate source page list from the object. */
         i = 0;
-        for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
-                page_addr_list[i] = sg_page_iter_dma_address(&sg_iter);
-                i++;
-        }
+        for_each_sgt_dma(dma_addr, sgt_iter, obj->pages)
+                page_addr_list[i++] = dma_addr;
 
+        GEM_BUG_ON(i != n_pages);
         st->nents = 0;
         sg = st->sgl;
 
@@ -3634,3 +3692,29 @@ i915_ggtt_view_size(struct drm_i915_gem_object *obj,
                 return obj->base.size;
         }
 }
+
+void __iomem *i915_vma_pin_iomap(struct i915_vma *vma)
+{
+        void __iomem *ptr;
+
+        lockdep_assert_held(&vma->vm->dev->struct_mutex);
+        if (WARN_ON(!vma->obj->map_and_fenceable))
+                return ERR_PTR(-ENODEV);
+
+        GEM_BUG_ON(!vma->is_ggtt);
+        GEM_BUG_ON((vma->bound & GLOBAL_BIND) == 0);
+
+        ptr = vma->iomap;
+        if (ptr == NULL) {
+                ptr = io_mapping_map_wc(i915_vm_to_ggtt(vma->vm)->mappable,
+                                        vma->node.start,
+                                        vma->node.size);
+                if (ptr == NULL)
+                        return ERR_PTR(-ENOMEM);
+
+                vma->iomap = ptr;
+        }
+
+        vma->pin_count++;
+        return ptr;
+}
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 0008543d55f6..163b564fb87d 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -34,6 +34,8 @@
 #ifndef __I915_GEM_GTT_H__
 #define __I915_GEM_GTT_H__
 
+#include <linux/io-mapping.h>
+
 struct drm_i915_file_private;
 
 typedef uint32_t gen6_pte_t;
@@ -175,6 +177,7 @@ struct i915_vma {
         struct drm_mm_node node;
         struct drm_i915_gem_object *obj;
         struct i915_address_space *vm;
+        void __iomem *iomap;
 
         /** Flags and address space this VMA is bound to */
 #define GLOBAL_BIND     (1<<0)
@@ -316,6 +319,11 @@ struct i915_address_space {
                             uint64_t start,
                             uint64_t length,
                             bool use_scratch);
+        void (*insert_page)(struct i915_address_space *vm,
+                            dma_addr_t addr,
+                            uint64_t offset,
+                            enum i915_cache_level cache_level,
+                            u32 flags);
         void (*insert_entries)(struct i915_address_space *vm,
                                struct sg_table *st,
                                uint64_t start,
@@ -518,9 +526,7 @@ int i915_ggtt_enable_hw(struct drm_device *dev);
 void i915_gem_init_ggtt(struct drm_device *dev);
 void i915_ggtt_cleanup_hw(struct drm_device *dev);
 
-int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt);
 int i915_ppgtt_init_hw(struct drm_device *dev);
-int i915_ppgtt_init_ring(struct drm_i915_gem_request *req);
 void i915_ppgtt_release(struct kref *kref);
 struct i915_hw_ppgtt *i915_ppgtt_create(struct drm_device *dev,
                                         struct drm_i915_file_private *fpriv);
@@ -535,7 +541,7 @@ static inline void i915_ppgtt_put(struct i915_hw_ppgtt *ppgtt)
                 kref_put(&ppgtt->ref, i915_ppgtt_release);
 }
 
-void i915_check_and_clear_faults(struct drm_device *dev);
+void i915_check_and_clear_faults(struct drm_i915_private *dev_priv);
 void i915_gem_suspend_gtt_mappings(struct drm_device *dev);
 void i915_gem_restore_gtt_mappings(struct drm_device *dev);
 
@@ -560,4 +566,36 @@ size_t
 i915_ggtt_view_size(struct drm_i915_gem_object *obj,
                     const struct i915_ggtt_view *view);
 
+/**
+ * i915_vma_pin_iomap - calls ioremap_wc to map the GGTT VMA via the aperture
+ * @vma: VMA to iomap
+ *
+ * The passed in VMA has to be pinned in the global GTT mappable region.
+ * An extra pinning of the VMA is acquired for the return iomapping,
+ * the caller must call i915_vma_unpin_iomap to relinquish the pinning
+ * after the iomapping is no longer required.
+ *
+ * Callers must hold the struct_mutex.
+ *
+ * Returns a valid iomapped pointer or ERR_PTR.
+ */
+void __iomem *i915_vma_pin_iomap(struct i915_vma *vma);
+
+/**
+ * i915_vma_unpin_iomap - unpins the mapping returned from i915_vma_iomap
+ * @vma: VMA to unpin
+ *
+ * Unpins the previously iomapped VMA from i915_vma_pin_iomap().
+ *
+ * Callers must hold the struct_mutex. This function is only valid to be
+ * called on a VMA previously iomapped by the caller with i915_vma_pin_iomap().
+ */
+static inline void i915_vma_unpin_iomap(struct i915_vma *vma)
+{
+        lockdep_assert_held(&vma->vm->dev->struct_mutex);
+        GEM_BUG_ON(vma->pin_count == 0);
+        GEM_BUG_ON(vma->iomap == NULL);
+        vma->pin_count--;
+}
+
 #endif
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
index 71611bf21fca..b7c1b5fb61ea 100644
--- a/drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
@@ -29,7 +29,7 @@
 #include "intel_renderstate.h"
 
 static const struct intel_renderstate_rodata *
-render_state_get_rodata(struct drm_device *dev, const int gen)
+render_state_get_rodata(const int gen)
 {
         switch (gen) {
         case 6:
@@ -45,21 +45,22 @@ render_state_get_rodata(struct drm_device *dev, const int gen)
         return NULL;
 }
 
-static int render_state_init(struct render_state *so, struct drm_device *dev)
+static int render_state_init(struct render_state *so,
+                             struct drm_i915_private *dev_priv)
 {
         int ret;
 
-        so->gen = INTEL_INFO(dev)->gen;
-        so->rodata = render_state_get_rodata(dev, so->gen);
+        so->gen = INTEL_GEN(dev_priv);
+        so->rodata = render_state_get_rodata(so->gen);
         if (so->rodata == NULL)
                 return 0;
 
         if (so->rodata->batch_items * 4 > 4096)
                 return -EINVAL;
 
-        so->obj = i915_gem_alloc_object(dev, 4096);
-        if (so->obj == NULL)
-                return -ENOMEM;
+        so->obj = i915_gem_object_create(dev_priv->dev, 4096);
+        if (IS_ERR(so->obj))
+                return PTR_ERR(so->obj);
 
         ret = i915_gem_obj_ggtt_pin(so->obj, 4096, 0);
         if (ret)
@@ -93,6 +94,7 @@ free_gem:
 
 static int render_state_setup(struct render_state *so)
 {
+        struct drm_device *dev = so->obj->base.dev;
         const struct intel_renderstate_rodata *rodata = so->rodata;
         unsigned int i = 0, reloc_index = 0;
         struct page *page;
@@ -134,6 +136,33 @@ static int render_state_setup(struct render_state *so)
 
         so->aux_batch_offset = i * sizeof(u32);
 
+        if (HAS_POOLED_EU(dev)) {
+                /*
+                 * We always program 3x6 pool config but depending upon which
+                 * subslice is disabled HW drops down to appropriate config
+                 * shown below.
+                 *
+                 * In the below table 2x6 config always refers to
+                 * fused-down version, native 2x6 is not available and can
+                 * be ignored
+                 *
+                 * SNo  subslices config                eu pool configuration
+                 * -----------------------------------------------------------
+                 * 1    3 subslices enabled (3x6)  -    0x00777000  (9+9)
+                 * 2    ss0 disabled (2x6)         -    0x00777000  (3+9)
+                 * 3    ss1 disabled (2x6)         -    0x00770000  (6+6)
+                 * 4    ss2 disabled (2x6)         -    0x00007000  (9+3)
+                 */
+                u32 eu_pool_config = 0x00777000;
+
+                OUT_BATCH(d, i, GEN9_MEDIA_POOL_STATE);
+                OUT_BATCH(d, i, GEN9_MEDIA_POOL_ENABLE);
+                OUT_BATCH(d, i, eu_pool_config);
+                OUT_BATCH(d, i, 0);
+                OUT_BATCH(d, i, 0);
+                OUT_BATCH(d, i, 0);
+        }
+
         OUT_BATCH(d, i, MI_BATCH_BUFFER_END);
         so->aux_batch_size = (i * sizeof(u32)) - so->aux_batch_offset;
 
@@ -177,7 +206,7 @@ int i915_gem_render_state_prepare(struct intel_engine_cs *engine,
         if (WARN_ON(engine->id != RCS))
                 return -ENOENT;
 
-        ret = render_state_init(so, engine->dev);
+        ret = render_state_init(so, engine->i915);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
index 425e721aac58..538c30499848 100644
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@ -131,7 +131,16 @@ i915_gem_shrink(struct drm_i915_private *dev_priv,
         unsigned long count = 0;
 
         trace_i915_gem_shrink(dev_priv, target, flags);
-        i915_gem_retire_requests(dev_priv->dev);
+        i915_gem_retire_requests(dev_priv);
+
+        /*
+         * Unbinding of objects will require HW access; Let us not wake the
+         * device just to recover a little memory. If absolutely necessary,
+         * we will force the wake during oom-notifier.
+         */
+        if ((flags & I915_SHRINK_BOUND) &&
+            !intel_runtime_pm_get_if_in_use(dev_priv))
+                flags &= ~I915_SHRINK_BOUND;
 
         /*
          * As we may completely rewrite the (un)bound list whilst unbinding
@@ -197,7 +206,10 @@ i915_gem_shrink(struct drm_i915_private *dev_priv,
                 list_splice(&still_in_list, phase->list);
         }
 
-        i915_gem_retire_requests(dev_priv->dev);
+        if (flags & I915_SHRINK_BOUND)
+                intel_runtime_pm_put(dev_priv);
+
+        i915_gem_retire_requests(dev_priv);
 
         return count;
 }
@@ -345,7 +357,9 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)
         if (!i915_gem_shrinker_lock_uninterruptible(dev_priv, &slu, 5000))
                 return NOTIFY_DONE;
 
+        intel_runtime_pm_get(dev_priv);
         freed_pages = i915_gem_shrink_all(dev_priv);
+        intel_runtime_pm_put(dev_priv);
 
         /* Because we may be allocating inside our own driver, we cannot
          * assert that there are no objects with pinned pages that are not
@@ -386,17 +400,35 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
         struct drm_i915_private *dev_priv =
                 container_of(nb, struct drm_i915_private, mm.vmap_notifier);
         struct shrinker_lock_uninterruptible slu;
-        unsigned long freed_pages;
+        struct i915_vma *vma, *next;
+        unsigned long freed_pages = 0;
+        int ret;
 
         if (!i915_gem_shrinker_lock_uninterruptible(dev_priv, &slu, 5000))
                 return NOTIFY_DONE;
 
-        freed_pages = i915_gem_shrink(dev_priv, -1UL,
-                                      I915_SHRINK_BOUND |
-                                      I915_SHRINK_UNBOUND |
-                                      I915_SHRINK_ACTIVE |
-                                      I915_SHRINK_VMAPS);
+        /* Force everything onto the inactive lists */
+        ret = i915_gpu_idle(dev_priv->dev);
+        if (ret)
+                goto out;
+
+        intel_runtime_pm_get(dev_priv);
+        freed_pages += i915_gem_shrink(dev_priv, -1UL,
+                                       I915_SHRINK_BOUND |
+                                       I915_SHRINK_UNBOUND |
+                                       I915_SHRINK_ACTIVE |
+                                       I915_SHRINK_VMAPS);
+        intel_runtime_pm_put(dev_priv);
+
+        /* We also want to clear any cached iomaps as they wrap vmap */
+        list_for_each_entry_safe(vma, next,
+                                 &dev_priv->ggtt.base.inactive_list, vm_link) {
+                unsigned long count = vma->node.size >> PAGE_SHIFT;
+                if (vma->iomap && i915_vma_unbind(vma) == 0)
+                        freed_pages += count;
+        }
 
+out:
         i915_gem_shrinker_unlock_uninterruptible(dev_priv, &slu);
 
         *(unsigned long *)ptr += freed_pages;
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index b7ce963fb8f8..e9cd82290408 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -55,8 +55,10 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,
                 return -ENODEV;
 
         /* See the comment at the drm_mm_init() call for more about this check.
-         * WaSkipStolenMemoryFirstPage:bdw,chv (incomplete) */
-        if (INTEL_INFO(dev_priv)->gen == 8 && start < 4096)
+         * WaSkipStolenMemoryFirstPage:bdw,chv,kbl (incomplete)
+         */
+        if (start < 4096 && (IS_GEN8(dev_priv) ||
+                             IS_KBL_REVID(dev_priv, 0, KBL_REVID_A0)))
                 start = 4096;
 
         mutex_lock(&dev_priv->mm.stolen_lock);
@@ -109,9 +111,9 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
         if (INTEL_INFO(dev)->gen >= 3) {
                 u32 bsm;
 
-                pci_read_config_dword(dev->pdev, BSM, &bsm);
+                pci_read_config_dword(dev->pdev, INTEL_BSM, &bsm);
 
-                base = bsm & BSM_MASK;
+                base = bsm & INTEL_BSM_MASK;
         } else if (IS_I865G(dev)) {
                 u16 toud = 0;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index b9bdb34032cd..a6eb5c47a49c 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -125,7 +125,7 @@ i915_gem_object_fence_ok(struct drm_i915_gem_object *obj, int tiling_mode)
         if (INTEL_INFO(obj->base.dev)->gen >= 4)
                 return true;
 
-        if (INTEL_INFO(obj->base.dev)->gen == 3) {
+        if (IS_GEN3(obj->base.dev)) {
                 if (i915_gem_obj_ggtt_offset(obj) & ~I915_FENCE_START_MASK)
                         return false;
         } else {
@@ -229,7 +229,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
                  */
                 if (obj->map_and_fenceable &&
                     !i915_gem_object_fence_ok(obj, args->tiling_mode))
-                        ret = i915_gem_object_ggtt_unbind(obj);
+                        ret = i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
 
                 if (ret == 0) {
                         if (obj->pages &&
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 32d9726e38b1..2314c88323e3 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -706,7 +706,8 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
 static void
 i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)
 {
-        struct sg_page_iter sg_iter;
+        struct sgt_iter sgt_iter;
+        struct page *page;
 
         BUG_ON(obj->userptr.work != NULL);
         __i915_gem_userptr_set_active(obj, false);
@@ -716,9 +717,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)
 
         i915_gem_gtt_finish_object(obj);
 
-        for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
-                struct page *page = sg_page_iter_page(&sg_iter);
-
+        for_each_sgt_page(page, sgt_iter, obj->pages) {
                 if (obj->dirty)
                         set_page_dirty(page);
 
@@ -855,11 +854,8 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *file
         return 0;
 }
 
-int
-i915_gem_init_userptr(struct drm_device *dev)
+void i915_gem_init_userptr(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         mutex_init(&dev_priv->mm_lock);
         hash_init(dev_priv->mm_structs);
-        return 0;
 }
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 89725c9efc25..34ff2459ceea 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -411,7 +411,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                 err_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);
         }
 
-        if (INTEL_INFO(dev)->gen == 7)
+        if (IS_GEN7(dev))
                 err_printf(m, "ERR_INT: 0x%08x\n", error->err_int);
 
         for (i = 0; i < ARRAY_SIZE(error->ring); i++)
@@ -824,19 +824,18 @@ static uint32_t i915_error_generate_code(struct drm_i915_private *dev_priv,
         return error_code;
 }
 
-static void i915_gem_record_fences(struct drm_device *dev,
+static void i915_gem_record_fences(struct drm_i915_private *dev_priv,
                                    struct drm_i915_error_state *error)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int i;
 
-        if (IS_GEN3(dev) || IS_GEN2(dev)) {
+        if (IS_GEN3(dev_priv) || IS_GEN2(dev_priv)) {
                 for (i = 0; i < dev_priv->num_fence_regs; i++)
                         error->fence[i] = I915_READ(FENCE_REG(i));
-        } else if (IS_GEN5(dev) || IS_GEN4(dev)) {
+        } else if (IS_GEN5(dev_priv) || IS_GEN4(dev_priv)) {
                 for (i = 0; i < dev_priv->num_fence_regs; i++)
                         error->fence[i] = I915_READ64(FENCE_REG_965_LO(i));
-        } else if (INTEL_INFO(dev)->gen >= 6) {
+        } else if (INTEL_GEN(dev_priv) >= 6) {
                 for (i = 0; i < dev_priv->num_fence_regs; i++)
                         error->fence[i] = I915_READ64(FENCE_REG_GEN6_LO(i));
         }
@@ -851,7 +850,7 @@ static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv,
         struct intel_engine_cs *to;
         enum intel_engine_id id;
 
-        if (!i915_semaphore_is_enabled(dev_priv->dev))
+        if (!i915_semaphore_is_enabled(dev_priv))
                 return;
 
         if (!error->semaphore_obj)
@@ -893,31 +892,29 @@ static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
         }
 }
 
-static void i915_record_ring_state(struct drm_device *dev,
+static void i915_record_ring_state(struct drm_i915_private *dev_priv,
                                    struct drm_i915_error_state *error,
                                    struct intel_engine_cs *engine,
                                    struct drm_i915_error_ring *ering)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (INTEL_INFO(dev)->gen >= 6) {
+        if (INTEL_GEN(dev_priv) >= 6) {
                 ering->rc_psmi = I915_READ(RING_PSMI_CTL(engine->mmio_base));
                 ering->fault_reg = I915_READ(RING_FAULT_REG(engine));
-                if (INTEL_INFO(dev)->gen >= 8)
+                if (INTEL_GEN(dev_priv) >= 8)
                         gen8_record_semaphore_state(dev_priv, error, engine,
                                                     ering);
                 else
                         gen6_record_semaphore_state(dev_priv, engine, ering);
         }
 
-        if (INTEL_INFO(dev)->gen >= 4) {
+        if (INTEL_GEN(dev_priv) >= 4) {
                 ering->faddr = I915_READ(RING_DMA_FADD(engine->mmio_base));
                 ering->ipeir = I915_READ(RING_IPEIR(engine->mmio_base));
                 ering->ipehr = I915_READ(RING_IPEHR(engine->mmio_base));
                 ering->instdone = I915_READ(RING_INSTDONE(engine->mmio_base));
                 ering->instps = I915_READ(RING_INSTPS(engine->mmio_base));
                 ering->bbaddr = I915_READ(RING_BBADDR(engine->mmio_base));
-                if (INTEL_INFO(dev)->gen >= 8) {
+                if (INTEL_GEN(dev_priv) >= 8) {
                         ering->faddr |= (u64) I915_READ(RING_DMA_FADD_UDW(engine->mmio_base)) << 32;
                         ering->bbaddr |= (u64) I915_READ(RING_BBADDR_UDW(engine->mmio_base)) << 32;
                 }
@@ -939,10 +936,10 @@ static void i915_record_ring_state(struct drm_device *dev,
         ering->tail = I915_READ_TAIL(engine);
         ering->ctl = I915_READ_CTL(engine);
 
-        if (I915_NEED_GFX_HWS(dev)) {
+        if (I915_NEED_GFX_HWS(dev_priv)) {
                 i915_reg_t mmio;
 
-                if (IS_GEN7(dev)) {
+                if (IS_GEN7(dev_priv)) {
                         switch (engine->id) {
                         default:
                         case RCS:
@@ -958,7 +955,7 @@ static void i915_record_ring_state(struct drm_device *dev,
                                 mmio = VEBOX_HWS_PGA_GEN7;
                                 break;
                         }
-                } else if (IS_GEN6(engine->dev)) {
+                } else if (IS_GEN6(engine->i915)) {
                         mmio = RING_HWS_PGA_GEN6(engine->mmio_base);
                 } else {
                         /* XXX: gen8 returns to sanity */
@@ -971,18 +968,18 @@ static void i915_record_ring_state(struct drm_device *dev,
         ering->hangcheck_score = engine->hangcheck.score;
         ering->hangcheck_action = engine->hangcheck.action;
 
-        if (USES_PPGTT(dev)) {
+        if (USES_PPGTT(dev_priv)) {
                 int i;
 
                 ering->vm_info.gfx_mode = I915_READ(RING_MODE_GEN7(engine));
 
-                if (IS_GEN6(dev))
+                if (IS_GEN6(dev_priv))
                         ering->vm_info.pp_dir_base =
                                 I915_READ(RING_PP_DIR_BASE_READ(engine));
-                else if (IS_GEN7(dev))
+                else if (IS_GEN7(dev_priv))
                         ering->vm_info.pp_dir_base =
                                 I915_READ(RING_PP_DIR_BASE(engine));
-                else if (INTEL_INFO(dev)->gen >= 8)
+                else if (INTEL_GEN(dev_priv) >= 8)
                         for (i = 0; i < 4; i++) {
                                 ering->vm_info.pdp[i] =
                                         I915_READ(GEN8_RING_PDP_UDW(engine, i));
@@ -998,7 +995,7 @@ static void i915_gem_record_active_context(struct intel_engine_cs *engine,
                                            struct drm_i915_error_state *error,
                                            struct drm_i915_error_ring *ering)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         struct drm_i915_gem_object *obj;
 
         /* Currently render ring is the only HW context user */
@@ -1016,10 +1013,9 @@ static void i915_gem_record_active_context(struct intel_engine_cs *engine,
         }
 }
 
-static void i915_gem_record_rings(struct drm_device *dev,
+static void i915_gem_record_rings(struct drm_i915_private *dev_priv,
                                   struct drm_i915_error_state *error)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct drm_i915_gem_request *request;
         int i, count;
@@ -1030,12 +1026,12 @@ static void i915_gem_record_rings(struct drm_device *dev,
 
                 error->ring[i].pid = -1;
 
-                if (engine->dev == NULL)
+                if (!intel_engine_initialized(engine))
                         continue;
 
                 error->ring[i].valid = true;
 
-                i915_record_ring_state(dev, error, engine, &error->ring[i]);
+                i915_record_ring_state(dev_priv, error, engine, &error->ring[i]);
 
                 request = i915_gem_find_active_request(engine);
                 if (request) {
@@ -1301,15 +1297,14 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
         error->eir = I915_READ(EIR);
         error->pgtbl_er = I915_READ(PGTBL_ER);
 
-        i915_get_extra_instdone(dev, error->extra_instdone);
+        i915_get_extra_instdone(dev_priv, error->extra_instdone);
 }
 
-static void i915_error_capture_msg(struct drm_device *dev,
+static void i915_error_capture_msg(struct drm_i915_private *dev_priv,
                                    struct drm_i915_error_state *error,
                                    u32 engine_mask,
                                    const char *error_msg)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 ecode;
         int ring_id = -1, len;
 
@@ -1317,7 +1312,7 @@ static void i915_error_capture_msg(struct drm_device *dev,
 
         len = scnprintf(error->error_msg, sizeof(error->error_msg),
                         "GPU HANG: ecode %d:%d:0x%08x",
-                        INTEL_INFO(dev)->gen, ring_id, ecode);
+                        INTEL_GEN(dev_priv), ring_id, ecode);
 
         if (ring_id != -1 && error->ring[ring_id].pid != -1)
                 len += scnprintf(error->error_msg + len,
@@ -1352,11 +1347,11 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv,
  * out a structure which becomes available in debugfs for user level tools
  * to pick up.
  */
-void i915_capture_error_state(struct drm_device *dev, u32 engine_mask,
+void i915_capture_error_state(struct drm_i915_private *dev_priv,
+                              u32 engine_mask,
                               const char *error_msg)
 {
         static bool warned;
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_error_state *error;
         unsigned long flags;
 
@@ -1372,15 +1367,15 @@ void i915_capture_error_state(struct drm_device *dev, u32 engine_mask,
         i915_capture_gen_state(dev_priv, error);
         i915_capture_reg_state(dev_priv, error);
         i915_gem_capture_buffers(dev_priv, error);
-        i915_gem_record_fences(dev, error);
-        i915_gem_record_rings(dev, error);
+        i915_gem_record_fences(dev_priv, error);
+        i915_gem_record_rings(dev_priv, error);
 
         do_gettimeofday(&error->time);
 
-        error->overlay = intel_overlay_capture_error_state(dev);
-        error->display = intel_display_capture_error_state(dev);
+        error->overlay = intel_overlay_capture_error_state(dev_priv);
+        error->display = intel_display_capture_error_state(dev_priv);
 
-        i915_error_capture_msg(dev, error, engine_mask, error_msg);
+        i915_error_capture_msg(dev_priv, error, engine_mask, error_msg);
         DRM_INFO("%s\n", error->error_msg);
 
         spin_lock_irqsave(&dev_priv->gpu_error.lock, flags);
@@ -1400,7 +1395,7 @@ void i915_capture_error_state(struct drm_device *dev, u32 engine_mask,
                 DRM_INFO("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
                 DRM_INFO("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
                 DRM_INFO("The gpu crash dump is required to analyze gpu hangs, so please always attach it.\n");
-                DRM_INFO("GPU crash dump saved to /sys/class/drm/card%d/error\n", dev->primary->index);
+                DRM_INFO("GPU crash dump saved to /sys/class/drm/card%d/error\n", dev_priv->dev->primary->index);
                 warned = true;
         }
 }
@@ -1450,17 +1445,17 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type)
 }
 
 /* NB: please notice the memset */
-void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone)
+void i915_get_extra_instdone(struct drm_i915_private *dev_priv,
+                             uint32_t *instdone)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         memset(instdone, 0, sizeof(*instdone) * I915_NUM_INSTDONE_REG);
 
-        if (IS_GEN2(dev) || IS_GEN3(dev))
+        if (IS_GEN2(dev_priv) || IS_GEN3(dev_priv))
                 instdone[0] = I915_READ(GEN2_INSTDONE);
-        else if (IS_GEN4(dev) || IS_GEN5(dev) || IS_GEN6(dev)) {
+        else if (IS_GEN4(dev_priv) || IS_GEN5(dev_priv) || IS_GEN6(dev_priv)) {
                 instdone[0] = I915_READ(RING_INSTDONE(RENDER_RING_BASE));
                 instdone[1] = I915_READ(GEN4_INSTDONE1);
-        } else if (INTEL_INFO(dev)->gen >= 7) {
+        } else if (INTEL_GEN(dev_priv) >= 7) {
                 instdone[0] = I915_READ(RING_INSTDONE(RENDER_RING_BASE));
                 instdone[1] = I915_READ(GEN7_SC_INSTDONE);
                 instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE);
diff --git a/drivers/gpu/drm/i915/i915_guc_reg.h b/drivers/gpu/drm/i915/i915_guc_reg.h
index 80786d9f9ad3..cf5a65be4fe0 100644
--- a/drivers/gpu/drm/i915/i915_guc_reg.h
+++ b/drivers/gpu/drm/i915/i915_guc_reg.h
@@ -67,11 +67,11 @@
 #define   GUC_WOPCM_OFFSET_VALUE          0x80000       /* 512KB */
 #define GUC_MAX_IDLE_COUNT              _MMIO(0xC3E4)
 
+/* Defines WOPCM space available to GuC firmware */
 #define GUC_WOPCM_SIZE                  _MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE            (0x80 << 12)  /* 512KB */
-
 /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
-#define GUC_WOPCM_TOP                   (GUC_WOPCM_SIZE_VALUE)
+#define   GUC_WOPCM_TOP                   (0x80 << 12)  /* 512KB */
+#define   BXT_GUC_WOPCM_RC6_RESERVED      (0x10 << 12)  /* 64KB  */
 
 #define GEN8_GT_PM_CONFIG               _MMIO(0x138140)
 #define GEN9LP_GT_PM_CONFIG             _MMIO(0x138140)
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index d40c13fb6643..22a55ac4e51c 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -158,8 +158,7 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
 
         data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;
         /* WaRsDisableCoarsePowerGating:skl,bxt */
-        if (!intel_enable_rc6(dev) ||
-            NEEDS_WaRsDisableCoarsePowerGating(dev))
+        if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev))
                 data[1] = 0;
         else
                 /* bit 0 and 1 are for Render and Media domain separately */
@@ -175,94 +174,88 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
  * client object which contains the page being used for the doorbell
  */
 
-static void guc_init_doorbell(struct intel_guc *guc,
-                              struct i915_guc_client *client)
+static int guc_update_doorbell_id(struct intel_guc *guc,
+                                  struct i915_guc_client *client,
+                                  u16 new_id)
 {
+        struct sg_table *sg = guc->ctx_pool_obj->pages;
+        void *doorbell_bitmap = guc->doorbell_bitmap;
         struct guc_doorbell_info *doorbell;
+        struct guc_context_desc desc;
+        size_t len;
 
         doorbell = client->client_base + client->doorbell_offset;
 
-        doorbell->db_status = GUC_DOORBELL_ENABLED;
-        doorbell->cookie = 0;
-}
-
-static int guc_ring_doorbell(struct i915_guc_client *gc)
-{
-        struct guc_process_desc *desc;
-        union guc_doorbell_qw db_cmp, db_exc, db_ret;
-        union guc_doorbell_qw *db;
-        int attempt = 2, ret = -EAGAIN;
-
-        desc = gc->client_base + gc->proc_desc_offset;
-
-        /* Update the tail so it is visible to GuC */
-        desc->tail = gc->wq_tail;
-
-        /* current cookie */
-        db_cmp.db_status = GUC_DOORBELL_ENABLED;
-        db_cmp.cookie = gc->cookie;
-
-        /* cookie to be updated */
-        db_exc.db_status = GUC_DOORBELL_ENABLED;
-        db_exc.cookie = gc->cookie + 1;
-        if (db_exc.cookie == 0)
-                db_exc.cookie = 1;
-
-        /* pointer of current doorbell cacheline */
-        db = gc->client_base + gc->doorbell_offset;
-
-        while (attempt--) {
-                /* lets ring the doorbell */
-                db_ret.value_qw = atomic64_cmpxchg((atomic64_t *)db,
-                        db_cmp.value_qw, db_exc.value_qw);
-
-                /* if the exchange was successfully executed */
-                if (db_ret.value_qw == db_cmp.value_qw) {
-                        /* db was successfully rung */
-                        gc->cookie = db_exc.cookie;
-                        ret = 0;
-                        break;
-                }
+        if (client->doorbell_id != GUC_INVALID_DOORBELL_ID &&
+            test_bit(client->doorbell_id, doorbell_bitmap)) {
+                /* Deactivate the old doorbell */
+                doorbell->db_status = GUC_DOORBELL_DISABLED;
+                (void)host2guc_release_doorbell(guc, client);
+                __clear_bit(client->doorbell_id, doorbell_bitmap);
+        }
 
-                /* XXX: doorbell was lost and need to acquire it again */
-                if (db_ret.db_status == GUC_DOORBELL_DISABLED)
-                        break;
+        /* Update the GuC's idea of the doorbell ID */
+        len = sg_pcopy_to_buffer(sg->sgl, sg->nents, &desc, sizeof(desc),
+                             sizeof(desc) * client->ctx_index);
+        if (len != sizeof(desc))
+                return -EFAULT;
+        desc.db_id = new_id;
+        len = sg_pcopy_from_buffer(sg->sgl, sg->nents, &desc, sizeof(desc),
+                             sizeof(desc) * client->ctx_index);
+        if (len != sizeof(desc))
+                return -EFAULT;
 
-                DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n",
-                          db_cmp.cookie, db_ret.cookie);
+        client->doorbell_id = new_id;
+        if (new_id == GUC_INVALID_DOORBELL_ID)
+                return 0;
 
-                /* update the cookie to newly read cookie from GuC */
-                db_cmp.cookie = db_ret.cookie;
-                db_exc.cookie = db_ret.cookie + 1;
-                if (db_exc.cookie == 0)
-                        db_exc.cookie = 1;
-        }
+        /* Activate the new doorbell */
+        __set_bit(new_id, doorbell_bitmap);
+        doorbell->cookie = 0;
+        doorbell->db_status = GUC_DOORBELL_ENABLED;
+        return host2guc_allocate_doorbell(guc, client);
+}
 
-        return ret;
+static int guc_init_doorbell(struct intel_guc *guc,
+                              struct i915_guc_client *client,
+                              uint16_t db_id)
+{
+        return guc_update_doorbell_id(guc, client, db_id);
 }
 
 static void guc_disable_doorbell(struct intel_guc *guc,
                                  struct i915_guc_client *client)
 {
-        struct drm_i915_private *dev_priv = guc_to_i915(guc);
-        struct guc_doorbell_info *doorbell;
-        i915_reg_t drbreg = GEN8_DRBREGL(client->doorbell_id);
-        int value;
-
-        doorbell = client->client_base + client->doorbell_offset;
+        (void)guc_update_doorbell_id(guc, client, GUC_INVALID_DOORBELL_ID);
 
-        doorbell->db_status = GUC_DOORBELL_DISABLED;
+        /* XXX: wait for any interrupts */
+        /* XXX: wait for workqueue to drain */
+}
 
-        I915_WRITE(drbreg, I915_READ(drbreg) & ~GEN8_DRB_VALID);
+static uint16_t
+select_doorbell_register(struct intel_guc *guc, uint32_t priority)
+{
+        /*
+         * The bitmap tracks which doorbell registers are currently in use.
+         * It is split into two halves; the first half is used for normal
+         * priority contexts, the second half for high-priority ones.
+         * Note that logically higher priorities are numerically less than
+         * normal ones, so the test below means "is it high-priority?"
+         */
+        const bool hi_pri = (priority <= GUC_CTX_PRIORITY_HIGH);
+        const uint16_t half = GUC_MAX_DOORBELLS / 2;
+        const uint16_t start = hi_pri ? half : 0;
+        const uint16_t end = start + half;
+        uint16_t id;
 
-        value = I915_READ(drbreg);
-        WARN_ON((value & GEN8_DRB_VALID) != 0);
+        id = find_next_zero_bit(guc->doorbell_bitmap, end, start);
+        if (id == end)
+                id = GUC_INVALID_DOORBELL_ID;
 
-        I915_WRITE(GEN8_DRBREGU(client->doorbell_id), 0);
-        I915_WRITE(drbreg, 0);
+        DRM_DEBUG_DRIVER("assigned %s priority doorbell id 0x%x\n",
+                        hi_pri ? "high" : "normal", id);
 
-        /* XXX: wait for any interrupts */
-        /* XXX: wait for workqueue to drain */
+        return id;
 }
 
 /*
@@ -289,37 +282,6 @@ static uint32_t select_doorbell_cacheline(struct intel_guc *guc)
         return offset;
 }
 
-static uint16_t assign_doorbell(struct intel_guc *guc, uint32_t priority)
-{
-        /*
-         * The bitmap is split into two halves; the first half is used for
-         * normal priority contexts, the second half for high-priority ones.
-         * Note that logically higher priorities are numerically less than
-         * normal ones, so the test below means "is it high-priority?"
-         */
-        const bool hi_pri = (priority <= GUC_CTX_PRIORITY_HIGH);
-        const uint16_t half = GUC_MAX_DOORBELLS / 2;
-        const uint16_t start = hi_pri ? half : 0;
-        const uint16_t end = start + half;
-        uint16_t id;
-
-        id = find_next_zero_bit(guc->doorbell_bitmap, end, start);
-        if (id == end)
-                id = GUC_INVALID_DOORBELL_ID;
-        else
-                bitmap_set(guc->doorbell_bitmap, id, 1);
-
-        DRM_DEBUG_DRIVER("assigned %s priority doorbell id 0x%x\n",
-                        hi_pri ? "high" : "normal", id);
-
-        return id;
-}
-
-static void release_doorbell(struct intel_guc *guc, uint16_t id)
-{
-        bitmap_clear(guc->doorbell_bitmap, id, 1);
-}
-
 /*
  * Initialise the process descriptor shared with the GuC firmware.
  */
@@ -361,10 +323,9 @@ static void guc_init_ctx_desc(struct intel_guc *guc,
         struct drm_i915_gem_object *client_obj = client->client_obj;
         struct drm_i915_private *dev_priv = guc_to_i915(guc);
         struct intel_engine_cs *engine;
-        struct intel_context *ctx = client->owner;
+        struct i915_gem_context *ctx = client->owner;
         struct guc_context_desc desc;
         struct sg_table *sg;
-        enum intel_engine_id id;
         u32 gfx_addr;
 
         memset(&desc, 0, sizeof(desc));
@@ -374,10 +335,10 @@ static void guc_init_ctx_desc(struct intel_guc *guc,
         desc.priority = client->priority;
         desc.db_id = client->doorbell_id;
 
-        for_each_engine_id(engine, dev_priv, id) {
+        for_each_engine(engine, dev_priv) {
+                struct intel_context *ce = &ctx->engine[engine->id];
                 struct guc_execlist_context *lrc = &desc.lrc[engine->guc_id];
                 struct drm_i915_gem_object *obj;
-                uint64_t ctx_desc;
 
                 /* TODO: We have a design issue to be solved here. Only when we
                  * receive the first batch, we know which engine is used by the
@@ -386,20 +347,18 @@ static void guc_init_ctx_desc(struct intel_guc *guc,
                  * for now who owns a GuC client. But for future owner of GuC
                  * client, need to make sure lrc is pinned prior to enter here.
                  */
-                obj = ctx->engine[id].state;
-                if (!obj)
+                if (!ce->state)
                         break;  /* XXX: continue? */
 
-                ctx_desc = intel_lr_context_descriptor(ctx, engine);
-                lrc->context_desc = (u32)ctx_desc;
+                lrc->context_desc = lower_32_bits(ce->lrc_desc);
 
                 /* The state page is after PPHWSP */
-                gfx_addr = i915_gem_obj_ggtt_offset(obj);
+                gfx_addr = i915_gem_obj_ggtt_offset(ce->state);
                 lrc->ring_lcra = gfx_addr + LRC_STATE_PN * PAGE_SIZE;
                 lrc->context_id = (client->ctx_index << GUC_ELC_CTXID_OFFSET) |
                                 (engine->guc_id << GUC_ELC_ENGINE_OFFSET);
 
-                obj = ctx->engine[id].ringbuf->obj;
+                obj = ce->ringbuf->obj;
                 gfx_addr = i915_gem_obj_ggtt_offset(obj);
 
                 lrc->ring_begin = gfx_addr;
@@ -427,7 +386,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc,
         desc.wq_size = client->wq_size;
 
         /*
-         * XXX: Take LRCs from an existing intel_context if this is not an
+         * XXX: Take LRCs from an existing context if this is not an
          * IsKMDCreatedContext client
          */
         desc.desc_private = (uintptr_t)client;
@@ -451,47 +410,64 @@ static void guc_fini_ctx_desc(struct intel_guc *guc,
                              sizeof(desc) * client->ctx_index);
 }
 
-int i915_guc_wq_check_space(struct i915_guc_client *gc)
+/**
+ * i915_guc_wq_check_space() - check that the GuC can accept a request
+ * @request:    request associated with the commands
+ *
+ * Return:      0 if space is available
+ *              -EAGAIN if space is not currently available
+ *
+ * This function must be called (and must return 0) before a request
+ * is submitted to the GuC via i915_guc_submit() below. Once a result
+ * of 0 has been returned, it remains valid until (but only until)
+ * the next call to submit().
+ *
+ * This precheck allows the caller to determine in advance that space
+ * will be available for the next submission before committing resources
+ * to it, and helps avoid late failures with complicated recovery paths.
+ */
+int i915_guc_wq_check_space(struct drm_i915_gem_request *request)
 {
+        const size_t wqi_size = sizeof(struct guc_wq_item);
+        struct i915_guc_client *gc = request->i915->guc.execbuf_client;
         struct guc_process_desc *desc;
-        u32 size = sizeof(struct guc_wq_item);
-        int ret = -ETIMEDOUT, timeout_counter = 200;
+        u32 freespace;
 
-        if (!gc)
-                return 0;
+        GEM_BUG_ON(gc == NULL);
 
         desc = gc->client_base + gc->proc_desc_offset;
 
-        while (timeout_counter-- > 0) {
-                if (CIRC_SPACE(gc->wq_tail, desc->head, gc->wq_size) >= size) {
-                        ret = 0;
-                        break;
-                }
+        freespace = CIRC_SPACE(gc->wq_tail, desc->head, gc->wq_size);
+        if (likely(freespace >= wqi_size))
+                return 0;
 
-                if (timeout_counter)
-                        usleep_range(1000, 2000);
-        };
+        gc->no_wq_space += 1;
 
-        return ret;
+        return -EAGAIN;
 }
 
-static int guc_add_workqueue_item(struct i915_guc_client *gc,
-                                  struct drm_i915_gem_request *rq)
+static void guc_add_workqueue_item(struct i915_guc_client *gc,
+                                   struct drm_i915_gem_request *rq)
 {
+        /* wqi_len is in DWords, and does not include the one-word header */
+        const size_t wqi_size = sizeof(struct guc_wq_item);
+        const u32 wqi_len = wqi_size/sizeof(u32) - 1;
         struct guc_process_desc *desc;
         struct guc_wq_item *wqi;
         void *base;
-        u32 tail, wq_len, wq_off, space;
+        u32 freespace, tail, wq_off, wq_page;
 
         desc = gc->client_base + gc->proc_desc_offset;
-        space = CIRC_SPACE(gc->wq_tail, desc->head, gc->wq_size);
-        if (WARN_ON(space < sizeof(struct guc_wq_item)))
-                return -ENOSPC; /* shouldn't happen */
 
-        /* postincrement WQ tail for next time */
-        wq_off = gc->wq_tail;
-        gc->wq_tail += sizeof(struct guc_wq_item);
-        gc->wq_tail &= gc->wq_size - 1;
+        /* Free space is guaranteed, see i915_guc_wq_check_space() above */
+        freespace = CIRC_SPACE(gc->wq_tail, desc->head, gc->wq_size);
+        GEM_BUG_ON(freespace < wqi_size);
+
+        /* The GuC firmware wants the tail index in QWords, not bytes */
+        tail = rq->tail;
+        GEM_BUG_ON(tail & 7);
+        tail >>= 3;
+        GEM_BUG_ON(tail > WQ_RING_TAIL_MAX);
 
         /* For now workqueue item is 4 DWs; workqueue buffer is 2 pages. So we
          * should not have the case where structure wqi is across page, neither
@@ -500,19 +476,23 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc,
          * XXX: if not the case, we need save data to a temp wqi and copy it to
          * workqueue buffer dw by dw.
          */
-        WARN_ON(sizeof(struct guc_wq_item) != 16);
-        WARN_ON(wq_off & 3);
+        BUILD_BUG_ON(wqi_size != 16);
+
+        /* postincrement WQ tail for next time */
+        wq_off = gc->wq_tail;
+        gc->wq_tail += wqi_size;
+        gc->wq_tail &= gc->wq_size - 1;
+        GEM_BUG_ON(wq_off & (wqi_size - 1));
 
-        /* wq starts from the page after doorbell / process_desc */
-        base = kmap_atomic(i915_gem_object_get_page(gc->client_obj,
-                        (wq_off + GUC_DB_SIZE) >> PAGE_SHIFT));
+        /* WQ starts from the page after doorbell / process_desc */
+        wq_page = (wq_off + GUC_DB_SIZE) >> PAGE_SHIFT;
         wq_off &= PAGE_SIZE - 1;
+        base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, wq_page));
         wqi = (struct guc_wq_item *)((char *)base + wq_off);
 
-        /* len does not include the header */
-        wq_len = sizeof(struct guc_wq_item) / sizeof(u32) - 1;
+        /* Now fill in the 4-word work queue item */
         wqi->header = WQ_TYPE_INORDER |
-                        (wq_len << WQ_LEN_SHIFT) |
+                        (wqi_len << WQ_LEN_SHIFT) |
                         (rq->engine->guc_id << WQ_TARGET_SHIFT) |
                         WQ_NO_WCFLUSH_WAIT;
 
@@ -520,48 +500,105 @@ static int guc_add_workqueue_item(struct i915_guc_client *gc,
         wqi->context_desc = (u32)intel_lr_context_descriptor(rq->ctx,
                                                              rq->engine);
 
-        /* The GuC firmware wants the tail index in QWords, not bytes */
-        tail = rq->ringbuf->tail >> 3;
         wqi->ring_tail = tail << WQ_RING_TAIL_SHIFT;
-        wqi->fence_id = 0; /*XXX: what fence to be here */
+        wqi->fence_id = rq->seqno;
 
         kunmap_atomic(base);
+}
 
-        return 0;
+static int guc_ring_doorbell(struct i915_guc_client *gc)
+{
+        struct guc_process_desc *desc;
+        union guc_doorbell_qw db_cmp, db_exc, db_ret;
+        union guc_doorbell_qw *db;
+        int attempt = 2, ret = -EAGAIN;
+
+        desc = gc->client_base + gc->proc_desc_offset;
+
+        /* Update the tail so it is visible to GuC */
+        desc->tail = gc->wq_tail;
+
+        /* current cookie */
+        db_cmp.db_status = GUC_DOORBELL_ENABLED;
+        db_cmp.cookie = gc->cookie;
+
+        /* cookie to be updated */
+        db_exc.db_status = GUC_DOORBELL_ENABLED;
+        db_exc.cookie = gc->cookie + 1;
+        if (db_exc.cookie == 0)
+                db_exc.cookie = 1;
+
+        /* pointer of current doorbell cacheline */
+        db = gc->client_base + gc->doorbell_offset;
+
+        while (attempt--) {
+                /* lets ring the doorbell */
+                db_ret.value_qw = atomic64_cmpxchg((atomic64_t *)db,
+                        db_cmp.value_qw, db_exc.value_qw);
+
+                /* if the exchange was successfully executed */
+                if (db_ret.value_qw == db_cmp.value_qw) {
+                        /* db was successfully rung */
+                        gc->cookie = db_exc.cookie;
+                        ret = 0;
+                        break;
+                }
+
+                /* XXX: doorbell was lost and need to acquire it again */
+                if (db_ret.db_status == GUC_DOORBELL_DISABLED)
+                        break;
+
+                DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n",
+                          db_cmp.cookie, db_ret.cookie);
+
+                /* update the cookie to newly read cookie from GuC */
+                db_cmp.cookie = db_ret.cookie;
+                db_exc.cookie = db_ret.cookie + 1;
+                if (db_exc.cookie == 0)
+                        db_exc.cookie = 1;
+        }
+
+        return ret;
 }
 
 /**
  * i915_guc_submit() - Submit commands through GuC
- * @client:     the guc client where commands will go through
  * @rq:         request associated with the commands
  *
- * Return:      0 if succeed
+ * Return:      0 on success, otherwise an errno.
+ *              (Note: nonzero really shouldn't happen!)
+ *
+ * The caller must have already called i915_guc_wq_check_space() above
+ * with a result of 0 (success) since the last request submission. This
+ * guarantees that there is space in the work queue for the new request,
+ * so enqueuing the item cannot fail.
+ *
+ * Bad Things Will Happen if the caller violates this protocol e.g. calls
+ * submit() when check() says there's no space, or calls submit() multiple
+ * times with no intervening check().
+ *
+ * The only error here arises if the doorbell hardware isn't functioning
+ * as expected, which really shouln't happen.
  */
-int i915_guc_submit(struct i915_guc_client *client,
-                    struct drm_i915_gem_request *rq)
+int i915_guc_submit(struct drm_i915_gem_request *rq)
 {
-        struct intel_guc *guc = client->guc;
         unsigned int engine_id = rq->engine->guc_id;
-        int q_ret, b_ret;
+        struct intel_guc *guc = &rq->i915->guc;
+        struct i915_guc_client *client = guc->execbuf_client;
+        int b_ret;
 
-        q_ret = guc_add_workqueue_item(client, rq);
-        if (q_ret == 0)
-                b_ret = guc_ring_doorbell(client);
+        guc_add_workqueue_item(client, rq);
+        b_ret = guc_ring_doorbell(client);
 
         client->submissions[engine_id] += 1;
-        if (q_ret) {
-                client->q_fail += 1;
-                client->retcode = q_ret;
-        } else if (b_ret) {
+        client->retcode = b_ret;
+        if (b_ret)
                 client->b_fail += 1;
-                client->retcode = q_ret = b_ret;
-        } else {
-                client->retcode = 0;
-        }
+
         guc->submissions[engine_id] += 1;
         guc->last_seqno[engine_id] = rq->seqno;
 
-        return q_ret;
+        return b_ret;
 }
 
 /*
@@ -572,7 +609,7 @@ int i915_guc_submit(struct i915_guc_client *client,
 
 /**
  * gem_allocate_guc_obj() - Allocate gem object for GuC usage
- * @dev:        drm device
+ * @dev_priv:   driver private data structure
  * @size:       size of object
  *
  * This is a wrapper to create a gem obj. In order to use it inside GuC, the
@@ -581,14 +618,13 @@ int i915_guc_submit(struct i915_guc_client *client,
  *
  * Return:      A drm_i915_gem_object if successful, otherwise NULL.
  */
-static struct drm_i915_gem_object *gem_allocate_guc_obj(struct drm_device *dev,
-                                                        u32 size)
+static struct drm_i915_gem_object *
+gem_allocate_guc_obj(struct drm_i915_private *dev_priv, u32 size)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
 
-        obj = i915_gem_alloc_object(dev, size);
-        if (!obj)
+        obj = i915_gem_object_create(dev_priv->dev, size);
+        if (IS_ERR(obj))
                 return NULL;
 
         if (i915_gem_object_get_pages(obj)) {
@@ -623,10 +659,10 @@ static void gem_release_guc_obj(struct drm_i915_gem_object *obj)
         drm_gem_object_unreference(&obj->base);
 }
 
-static void guc_client_free(struct drm_device *dev,
-                            struct i915_guc_client *client)
+static void
+guc_client_free(struct drm_i915_private *dev_priv,
+                struct i915_guc_client *client)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
 
         if (!client)
@@ -639,17 +675,10 @@ static void guc_client_free(struct drm_device *dev,
 
         if (client->client_base) {
                 /*
-                 * If we got as far as setting up a doorbell, make sure
-                 * we shut it down before unmapping & deallocating the
-                 * memory. So first disable the doorbell, then tell the
-                 * GuC that we've finished with it, finally deallocate
-                 * it in our bitmap
+                 * If we got as far as setting up a doorbell, make sure we
+                 * shut it down before unmapping & deallocating the memory.
                  */
-                if (client->doorbell_id != GUC_INVALID_DOORBELL_ID) {
-                        guc_disable_doorbell(guc, client);
-                        host2guc_release_doorbell(guc, client);
-                        release_doorbell(guc, client->doorbell_id);
-                }
+                guc_disable_doorbell(guc, client);
 
                 kunmap(kmap_to_page(client->client_base));
         }
@@ -664,9 +693,51 @@ static void guc_client_free(struct drm_device *dev,
         kfree(client);
 }
 
+/*
+ * Borrow the first client to set up & tear down every doorbell
+ * in turn, to ensure that all doorbell h/w is (re)initialised.
+ */
+static void guc_init_doorbell_hw(struct intel_guc *guc)
+{
+        struct drm_i915_private *dev_priv = guc_to_i915(guc);
+        struct i915_guc_client *client = guc->execbuf_client;
+        uint16_t db_id, i;
+        int err;
+
+        db_id = client->doorbell_id;
+
+        for (i = 0; i < GUC_MAX_DOORBELLS; ++i) {
+                i915_reg_t drbreg = GEN8_DRBREGL(i);
+                u32 value = I915_READ(drbreg);
+
+                err = guc_update_doorbell_id(guc, client, i);
+
+                /* Report update failure or unexpectedly active doorbell */
+                if (err || (i != db_id && (value & GUC_DOORBELL_ENABLED)))
+                        DRM_DEBUG_DRIVER("Doorbell %d (reg 0x%x) was 0x%x, err %d\n",
+                                          i, drbreg.reg, value, err);
+        }
+
+        /* Restore to original value */
+        err = guc_update_doorbell_id(guc, client, db_id);
+        if (err)
+                DRM_ERROR("Failed to restore doorbell to %d, err %d\n",
+                        db_id, err);
+
+        for (i = 0; i < GUC_MAX_DOORBELLS; ++i) {
+                i915_reg_t drbreg = GEN8_DRBREGL(i);
+                u32 value = I915_READ(drbreg);
+
+                if (i != db_id && (value & GUC_DOORBELL_ENABLED))
+                        DRM_DEBUG_DRIVER("Doorbell %d (reg 0x%x) finally 0x%x\n",
+                                          i, drbreg.reg, value);
+
+        }
+}
+
 /**
  * guc_client_alloc() - Allocate an i915_guc_client
- * @dev:        drm device
+ * @dev_priv:   driver private data structure
  * @priority:   four levels priority _CRITICAL, _HIGH, _NORMAL and _LOW
  *              The kernel client to replace ExecList submission is created with
  *              NORMAL priority. Priority of a client for scheduler can be HIGH,
@@ -676,14 +747,15 @@ static void guc_client_free(struct drm_device *dev,
  *
  * Return:      An i915_guc_client object if success, else NULL.
  */
-static struct i915_guc_client *guc_client_alloc(struct drm_device *dev,
-                                                uint32_t priority,
-                                                struct intel_context *ctx)
+static struct i915_guc_client *
+guc_client_alloc(struct drm_i915_private *dev_priv,
+                 uint32_t priority,
+                 struct i915_gem_context *ctx)
 {
         struct i915_guc_client *client;
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
         struct drm_i915_gem_object *obj;
+        uint16_t db_id;
 
         client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (!client)
@@ -702,7 +774,7 @@ static struct i915_guc_client *guc_client_alloc(struct drm_device *dev,
         }
 
         /* The first page is doorbell/proc_desc. Two followed pages are wq. */
-        obj = gem_allocate_guc_obj(dev, GUC_DB_SIZE + GUC_WQ_SIZE);
+        obj = gem_allocate_guc_obj(dev_priv, GUC_DB_SIZE + GUC_WQ_SIZE);
         if (!obj)
                 goto err;
 
@@ -712,6 +784,11 @@ static struct i915_guc_client *guc_client_alloc(struct drm_device *dev,
         client->wq_offset = GUC_DB_SIZE;
         client->wq_size = GUC_WQ_SIZE;
 
+        db_id = select_doorbell_register(guc, client->priority);
+        if (db_id == GUC_INVALID_DOORBELL_ID)
+                /* XXX: evict a doorbell instead? */
+                goto err;
+
         client->doorbell_offset = select_doorbell_cacheline(guc);
 
         /*
@@ -724,29 +801,22 @@ static struct i915_guc_client *guc_client_alloc(struct drm_device *dev,
         else
                 client->proc_desc_offset = (GUC_DB_SIZE / 2);
 
-        client->doorbell_id = assign_doorbell(guc, client->priority);
-        if (client->doorbell_id == GUC_INVALID_DOORBELL_ID)
-                /* XXX: evict a doorbell instead */
-                goto err;
-
         guc_init_proc_desc(guc, client);
         guc_init_ctx_desc(guc, client);
-        guc_init_doorbell(guc, client);
-
-        /* XXX: Any cache flushes needed? General domain mgmt calls? */
-
-        if (host2guc_allocate_doorbell(guc, client))
+        if (guc_init_doorbell(guc, client, db_id))
                 goto err;
 
-        DRM_DEBUG_DRIVER("new priority %u client %p: ctx_index %u db_id %u\n",
-                priority, client, client->ctx_index, client->doorbell_id);
+        DRM_DEBUG_DRIVER("new priority %u client %p: ctx_index %u\n",
+                priority, client, client->ctx_index);
+        DRM_DEBUG_DRIVER("doorbell id %u, cacheline offset 0x%x\n",
+                client->doorbell_id, client->doorbell_offset);
 
         return client;
 
 err:
         DRM_ERROR("FAILED to create priority %u GuC client!\n", priority);
 
-        guc_client_free(dev, client);
+        guc_client_free(dev_priv, client);
         return NULL;
 }
 
@@ -771,7 +841,7 @@ static void guc_create_log(struct intel_guc *guc)
 
         obj = guc->log_obj;
         if (!obj) {
-                obj = gem_allocate_guc_obj(dev_priv->dev, size);
+                obj = gem_allocate_guc_obj(dev_priv, size);
                 if (!obj) {
                         /* logging will be off */
                         i915.guc_log_level = -1;
@@ -831,7 +901,7 @@ static void guc_create_ads(struct intel_guc *guc)
 
         obj = guc->ads_obj;
         if (!obj) {
-                obj = gem_allocate_guc_obj(dev_priv->dev, PAGE_ALIGN(size));
+                obj = gem_allocate_guc_obj(dev_priv, PAGE_ALIGN(size));
                 if (!obj)
                         return;
 
@@ -885,66 +955,65 @@ static void guc_create_ads(struct intel_guc *guc)
  * Set up the memory resources to be shared with the GuC.  At this point,
  * we require just one object that can be mapped through the GGTT.
  */
-int i915_guc_submission_init(struct drm_device *dev)
+int i915_guc_submission_init(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         const size_t ctxsize = sizeof(struct guc_context_desc);
         const size_t poolsize = GUC_MAX_GPU_CONTEXTS * ctxsize;
         const size_t gemsize = round_up(poolsize, PAGE_SIZE);
         struct intel_guc *guc = &dev_priv->guc;
 
+        /* Wipe bitmap & delete client in case of reinitialisation */
+        bitmap_clear(guc->doorbell_bitmap, 0, GUC_MAX_DOORBELLS);
+        i915_guc_submission_disable(dev_priv);
+
         if (!i915.enable_guc_submission)
                 return 0; /* not enabled  */
 
         if (guc->ctx_pool_obj)
                 return 0; /* already allocated */
 
-        guc->ctx_pool_obj = gem_allocate_guc_obj(dev_priv->dev, gemsize);
+        guc->ctx_pool_obj = gem_allocate_guc_obj(dev_priv, gemsize);
         if (!guc->ctx_pool_obj)
                 return -ENOMEM;
 
         ida_init(&guc->ctx_ids);
-
         guc_create_log(guc);
-
         guc_create_ads(guc);
 
         return 0;
 }
 
-int i915_guc_submission_enable(struct drm_device *dev)
+int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
-        struct intel_context *ctx = dev_priv->kernel_context;
         struct i915_guc_client *client;
 
         /* client for execbuf submission */
-        client = guc_client_alloc(dev, GUC_CTX_PRIORITY_KMD_NORMAL, ctx);
+        client = guc_client_alloc(dev_priv,
+                                  GUC_CTX_PRIORITY_KMD_NORMAL,
+                                  dev_priv->kernel_context);
         if (!client) {
                 DRM_ERROR("Failed to create execbuf guc_client\n");
                 return -ENOMEM;
         }
 
         guc->execbuf_client = client;
-
         host2guc_sample_forcewake(guc, client);
+        guc_init_doorbell_hw(guc);
 
         return 0;
 }
 
-void i915_guc_submission_disable(struct drm_device *dev)
+void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
 
-        guc_client_free(dev, guc->execbuf_client);
+        guc_client_free(dev_priv, guc->execbuf_client);
         guc->execbuf_client = NULL;
 }
 
-void i915_guc_submission_fini(struct drm_device *dev)
+void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
 
         gem_release_guc_obj(dev_priv->guc.ads_obj);
@@ -967,10 +1036,10 @@ int intel_guc_suspend(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         u32 data[3];
 
-        if (!i915.enable_guc_submission)
+        if (guc->guc_fw.guc_fw_load_status != GUC_FIRMWARE_SUCCESS)
                 return 0;
 
         ctx = dev_priv->kernel_context;
@@ -993,10 +1062,10 @@ int intel_guc_resume(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc *guc = &dev_priv->guc;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         u32 data[3];
 
-        if (!i915.enable_guc_submission)
+        if (guc->guc_fw.guc_fw_load_status != GUC_FIRMWARE_SUCCESS)
                 return 0;
 
         ctx = dev_priv->kernel_context;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2f6fd33c07ba..4378a659d962 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -336,9 +336,8 @@ void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask)
         __gen6_disable_pm_irq(dev_priv, mask);
 }
 
-void gen6_reset_rps_interrupts(struct drm_device *dev)
+void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         i915_reg_t reg = gen6_pm_iir(dev_priv);
 
         spin_lock_irq(&dev_priv->irq_lock);
@@ -349,10 +348,8 @@ void gen6_reset_rps_interrupts(struct drm_device *dev)
         spin_unlock_irq(&dev_priv->irq_lock);
 }
 
-void gen6_enable_rps_interrupts(struct drm_device *dev)
+void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         spin_lock_irq(&dev_priv->irq_lock);
 
         WARN_ON(dev_priv->rps.pm_iir);
@@ -367,25 +364,11 @@ void gen6_enable_rps_interrupts(struct drm_device *dev)
 
 u32 gen6_sanitize_rps_pm_mask(struct drm_i915_private *dev_priv, u32 mask)
 {
-        /*
-         * SNB,IVB can while VLV,CHV may hard hang on looping batchbuffer
-         * if GEN6_PM_UP_EI_EXPIRED is masked.
-         *
-         * TODO: verify if this can be reproduced on VLV,CHV.
-         */
-        if (INTEL_INFO(dev_priv)->gen <= 7 && !IS_HASWELL(dev_priv))
-                mask &= ~GEN6_PM_RP_UP_EI_EXPIRED;
-
-        if (INTEL_INFO(dev_priv)->gen >= 8)
-                mask &= ~GEN8_PMINTR_REDIRECT_TO_NON_DISP;
-
-        return mask;
+        return (mask & ~dev_priv->rps.pm_intr_keep);
 }
 
-void gen6_disable_rps_interrupts(struct drm_device *dev)
+void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         spin_lock_irq(&dev_priv->irq_lock);
         dev_priv->rps.interrupts_enabled = false;
         spin_unlock_irq(&dev_priv->irq_lock);
@@ -402,7 +385,7 @@ void gen6_disable_rps_interrupts(struct drm_device *dev)
 
         spin_unlock_irq(&dev_priv->irq_lock);
 
-        synchronize_irq(dev->irq);
+        synchronize_irq(dev_priv->dev->irq);
 }
 
 /**
@@ -605,19 +588,17 @@ i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
 
 /**
  * i915_enable_asle_pipestat - enable ASLE pipestat for OpRegion
- * @dev: drm device
+ * @dev_priv: i915 device private
  */
-static void i915_enable_asle_pipestat(struct drm_device *dev)
+static void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->opregion.asle || !IS_MOBILE(dev))
+        if (!dev_priv->opregion.asle || !IS_MOBILE(dev_priv))
                 return;
 
         spin_lock_irq(&dev_priv->irq_lock);
 
         i915_enable_pipestat(dev_priv, PIPE_B, PIPE_LEGACY_BLC_EVENT_STATUS);
-        if (INTEL_INFO(dev)->gen >= 4)
+        if (INTEL_GEN(dev_priv) >= 4)
                 i915_enable_pipestat(dev_priv, PIPE_A,
                                      PIPE_LEGACY_BLC_EVENT_STATUS);
 
@@ -750,7 +731,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
         if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                 vtotal /= 2;
 
-        if (IS_GEN2(dev))
+        if (IS_GEN2(dev_priv))
                 position = I915_READ_FW(PIPEDSL(pipe)) & DSL_LINEMASK_GEN2;
         else
                 position = I915_READ_FW(PIPEDSL(pipe)) & DSL_LINEMASK_GEN3;
@@ -767,7 +748,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
          * problem.  We may need to extend this to include other platforms,
          * but so far testing only shows the problem on HSW.
          */
-        if (HAS_DDI(dev) && !position) {
+        if (HAS_DDI(dev_priv) && !position) {
                 int i, temp;
 
                 for (i = 0; i < 100; i++) {
@@ -835,7 +816,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
         if (stime)
                 *stime = ktime_get();
 
-        if (IS_GEN2(dev) || IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) {
+        if (IS_GEN2(dev_priv) || IS_G4X(dev_priv) || INTEL_GEN(dev_priv) >= 5) {
                 /* No obvious pixelcount register. Only query vertical
                  * scanout position from Display scan line register.
                  */
@@ -897,7 +878,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
         else
                 position += vtotal - vbl_end;
 
-        if (IS_GEN2(dev) || IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) {
+        if (IS_GEN2(dev_priv) || IS_G4X(dev_priv) || INTEL_GEN(dev_priv) >= 5) {
                 *vpos = position;
                 *hpos = 0;
         } else {
@@ -955,9 +936,8 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe,
                                                      &crtc->hwmode);
 }
 
-static void ironlake_rps_change_irq_handler(struct drm_device *dev)
+static void ironlake_rps_change_irq_handler(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 busy_up, busy_down, max_avg, min_avg;
         u8 new_delay;
 
@@ -986,7 +966,7 @@ static void ironlake_rps_change_irq_handler(struct drm_device *dev)
                         new_delay = dev_priv->ips.min_delay;
         }
 
-        if (ironlake_set_drps(dev, new_delay))
+        if (ironlake_set_drps(dev_priv, new_delay))
                 dev_priv->ips.cur_delay = new_delay;
 
         spin_unlock(&mchdev_lock);
@@ -1175,7 +1155,7 @@ static void gen6_pm_rps_work(struct work_struct *work)
         new_delay += adj;
         new_delay = clamp_t(int, new_delay, min, max);
 
-        intel_set_rps(dev_priv->dev, new_delay);
+        intel_set_rps(dev_priv, new_delay);
 
         mutex_unlock(&dev_priv->rps.hw_lock);
 out:
@@ -1506,27 +1486,23 @@ static void intel_get_hpd_pins(u32 *pin_mask, u32 *long_mask,
 
 }
 
-static void gmbus_irq_handler(struct drm_device *dev)
+static void gmbus_irq_handler(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         wake_up_all(&dev_priv->gmbus_wait_queue);
 }
 
-static void dp_aux_irq_handler(struct drm_device *dev)
+static void dp_aux_irq_handler(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         wake_up_all(&dev_priv->gmbus_wait_queue);
 }
 
 #if defined(CONFIG_DEBUG_FS)
-static void display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe,
+static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+                                         enum pipe pipe,
                                          uint32_t crc0, uint32_t crc1,
                                          uint32_t crc2, uint32_t crc3,
                                          uint32_t crc4)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
         struct intel_pipe_crc_entry *entry;
         int head, tail;
@@ -1550,7 +1526,8 @@ static void display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe,
 
         entry = &pipe_crc->entries[head];
 
-        entry->frame = dev->driver->get_vblank_counter(dev, pipe);
+        entry->frame = dev_priv->dev->driver->get_vblank_counter(dev_priv->dev,
+                                                                 pipe);
         entry->crc[0] = crc0;
         entry->crc[1] = crc1;
         entry->crc[2] = crc2;
@@ -1566,27 +1543,26 @@ static void display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe,
 }
 #else
 static inline void
-display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe,
+display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+                             enum pipe pipe,
                              uint32_t crc0, uint32_t crc1,
                              uint32_t crc2, uint32_t crc3,
                              uint32_t crc4) {}
 #endif
 
 
-static void hsw_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)
+static void hsw_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+                                     enum pipe pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        display_pipe_crc_irq_handler(dev, pipe,
+        display_pipe_crc_irq_handler(dev_priv, pipe,
                                      I915_READ(PIPE_CRC_RES_1_IVB(pipe)),
                                      0, 0, 0, 0);
 }
 
-static void ivb_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)
+static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+                                     enum pipe pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        display_pipe_crc_irq_handler(dev, pipe,
+        display_pipe_crc_irq_handler(dev_priv, pipe,
                                      I915_READ(PIPE_CRC_RES_1_IVB(pipe)),
                                      I915_READ(PIPE_CRC_RES_2_IVB(pipe)),
                                      I915_READ(PIPE_CRC_RES_3_IVB(pipe)),
@@ -1594,22 +1570,22 @@ static void ivb_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)
                                      I915_READ(PIPE_CRC_RES_5_IVB(pipe)));
 }
 
-static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)
+static void i9xx_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+                                      enum pipe pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         uint32_t res1, res2;
 
-        if (INTEL_INFO(dev)->gen >= 3)
+        if (INTEL_GEN(dev_priv) >= 3)
                 res1 = I915_READ(PIPE_CRC_RES_RES1_I915(pipe));
         else
                 res1 = 0;
 
-        if (INTEL_INFO(dev)->gen >= 5 || IS_G4X(dev))
+        if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
                 res2 = I915_READ(PIPE_CRC_RES_RES2_G4X(pipe));
         else
                 res2 = 0;
 
-        display_pipe_crc_irq_handler(dev, pipe,
+        display_pipe_crc_irq_handler(dev_priv, pipe,
                                      I915_READ(PIPE_CRC_RES_RED(pipe)),
                                      I915_READ(PIPE_CRC_RES_GREEN(pipe)),
                                      I915_READ(PIPE_CRC_RES_BLUE(pipe)),
@@ -1643,18 +1619,21 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)
         }
 }
 
-static bool intel_pipe_handle_vblank(struct drm_device *dev, enum pipe pipe)
+static bool intel_pipe_handle_vblank(struct drm_i915_private *dev_priv,
+                                     enum pipe pipe)
 {
-        if (!drm_handle_vblank(dev, pipe))
-                return false;
+        bool ret;
 
-        return true;
+        ret = drm_handle_vblank(dev_priv->dev, pipe);
+        if (ret)
+                intel_finish_page_flip_mmio(dev_priv, pipe);
+
+        return ret;
 }
 
-static void valleyview_pipestat_irq_ack(struct drm_device *dev, u32 iir,
-                                        u32 pipe_stats[I915_MAX_PIPES])
+static void valleyview_pipestat_irq_ack(struct drm_i915_private *dev_priv,
+                                        u32 iir, u32 pipe_stats[I915_MAX_PIPES])
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe;
 
         spin_lock(&dev_priv->irq_lock);
@@ -1710,31 +1689,28 @@ static void valleyview_pipestat_irq_ack(struct drm_device *dev, u32 iir,
         spin_unlock(&dev_priv->irq_lock);
 }
 
-static void valleyview_pipestat_irq_handler(struct drm_device *dev,
+static void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
                                             u32 pipe_stats[I915_MAX_PIPES])
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         enum pipe pipe;
 
         for_each_pipe(dev_priv, pipe) {
                 if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
-                    intel_pipe_handle_vblank(dev, pipe))
-                        intel_check_page_flip(dev, pipe);
+                    intel_pipe_handle_vblank(dev_priv, pipe))
+                        intel_check_page_flip(dev_priv, pipe);
 
-                if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV) {
-                        intel_prepare_page_flip(dev, pipe);
-                        intel_finish_page_flip(dev, pipe);
-                }
+                if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV)
+                        intel_finish_page_flip_cs(dev_priv, pipe);
 
                 if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
-                        i9xx_pipe_crc_irq_handler(dev, pipe);
+                        i9xx_pipe_crc_irq_handler(dev_priv, pipe);
 
                 if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
                         intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
         }
 
         if (pipe_stats[0] & PIPE_GMBUS_INTERRUPT_STATUS)
-                gmbus_irq_handler(dev);
+                gmbus_irq_handler(dev_priv);
 }
 
 static u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
@@ -1747,12 +1723,13 @@ static u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
         return hotplug_status;
 }
 
-static void i9xx_hpd_irq_handler(struct drm_device *dev,
+static void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv,
                                  u32 hotplug_status)
 {
         u32 pin_mask = 0, long_mask = 0;
 
-        if (IS_G4X(dev) || IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+        if (IS_G4X(dev_priv) || IS_VALLEYVIEW(dev_priv) ||
+            IS_CHERRYVIEW(dev_priv)) {
                 u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X;
 
                 if (hotplug_trigger) {
@@ -1760,11 +1737,11 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev,
                                            hotplug_trigger, hpd_status_g4x,
                                            i9xx_port_hotplug_long_detect);
 
-                        intel_hpd_irq_handler(dev, pin_mask, long_mask);
+                        intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
                 }
 
                 if (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
-                        dp_aux_irq_handler(dev);
+                        dp_aux_irq_handler(dev_priv);
         } else {
                 u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
 
@@ -1772,7 +1749,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev,
                         intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
                                            hotplug_trigger, hpd_status_i915,
                                            i9xx_port_hotplug_long_detect);
-                        intel_hpd_irq_handler(dev, pin_mask, long_mask);
+                        intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
                 }
         }
 }
@@ -1831,7 +1808,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 
                 /* Call regardless, as some status bits might not be
                  * signalled in iir */
-                valleyview_pipestat_irq_ack(dev, iir, pipe_stats);
+                valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                 /*
                  * VLV_IIR is single buffered, and reflects the level
@@ -1850,9 +1827,9 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
                         gen6_rps_irq_handler(dev_priv, pm_iir);
 
                 if (hotplug_status)
-                        i9xx_hpd_irq_handler(dev, hotplug_status);
+                        i9xx_hpd_irq_handler(dev_priv, hotplug_status);
 
-                valleyview_pipestat_irq_handler(dev, pipe_stats);
+                valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
         } while (0);
 
         enable_rpm_wakeref_asserts(dev_priv);
@@ -1911,7 +1888,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
 
                 /* Call regardless, as some status bits might not be
                  * signalled in iir */
-                valleyview_pipestat_irq_ack(dev, iir, pipe_stats);
+                valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                 /*
                  * VLV_IIR is single buffered, and reflects the level
@@ -1927,9 +1904,9 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
                 gen8_gt_irq_handler(dev_priv, gt_iir);
 
                 if (hotplug_status)
-                        i9xx_hpd_irq_handler(dev, hotplug_status);
+                        i9xx_hpd_irq_handler(dev_priv, hotplug_status);
 
-                valleyview_pipestat_irq_handler(dev, pipe_stats);
+                valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
         } while (0);
 
         enable_rpm_wakeref_asserts(dev_priv);
@@ -1937,10 +1914,10 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
         return ret;
 }
 
-static void ibx_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger,
+static void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv,
+                                u32 hotplug_trigger,
                                 const u32 hpd[HPD_NUM_PINS])
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
 
         /*
@@ -1966,16 +1943,15 @@ static void ibx_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger,
                            dig_hotplug_reg, hpd,
                            pch_port_hotplug_long_detect);
 
-        intel_hpd_irq_handler(dev, pin_mask, long_mask);
+        intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
 }
 
-static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir)
+static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe;
         u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
 
-        ibx_hpd_irq_handler(dev, hotplug_trigger, hpd_ibx);
+        ibx_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ibx);
 
         if (pch_iir & SDE_AUDIO_POWER_MASK) {
                 int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >>
@@ -1985,10 +1961,10 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir)
         }
 
         if (pch_iir & SDE_AUX_MASK)
-                dp_aux_irq_handler(dev);
+                dp_aux_irq_handler(dev_priv);
 
         if (pch_iir & SDE_GMBUS)
-                gmbus_irq_handler(dev);
+                gmbus_irq_handler(dev_priv);
 
         if (pch_iir & SDE_AUDIO_HDCP_MASK)
                 DRM_DEBUG_DRIVER("PCH HDCP audio interrupt\n");
@@ -2018,9 +1994,8 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir)
                 intel_pch_fifo_underrun_irq_handler(dev_priv, TRANSCODER_B);
 }
 
-static void ivb_err_int_handler(struct drm_device *dev)
+static void ivb_err_int_handler(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 err_int = I915_READ(GEN7_ERR_INT);
         enum pipe pipe;
 
@@ -2032,19 +2007,18 @@ static void ivb_err_int_handler(struct drm_device *dev)
                         intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
 
                 if (err_int & ERR_INT_PIPE_CRC_DONE(pipe)) {
-                        if (IS_IVYBRIDGE(dev))
-                                ivb_pipe_crc_irq_handler(dev, pipe);
+                        if (IS_IVYBRIDGE(dev_priv))
+                                ivb_pipe_crc_irq_handler(dev_priv, pipe);
                         else
-                                hsw_pipe_crc_irq_handler(dev, pipe);
+                                hsw_pipe_crc_irq_handler(dev_priv, pipe);
                 }
         }
 
         I915_WRITE(GEN7_ERR_INT, err_int);
 }
 
-static void cpt_serr_int_handler(struct drm_device *dev)
+static void cpt_serr_int_handler(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 serr_int = I915_READ(SERR_INT);
 
         if (serr_int & SERR_INT_POISON)
@@ -2062,13 +2036,12 @@ static void cpt_serr_int_handler(struct drm_device *dev)
         I915_WRITE(SERR_INT, serr_int);
 }
 
-static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir)
+static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe;
         u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
 
-        ibx_hpd_irq_handler(dev, hotplug_trigger, hpd_cpt);
+        ibx_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_cpt);
 
         if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) {
                 int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
@@ -2078,10 +2051,10 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir)
         }
 
         if (pch_iir & SDE_AUX_MASK_CPT)
-                dp_aux_irq_handler(dev);
+                dp_aux_irq_handler(dev_priv);
 
         if (pch_iir & SDE_GMBUS_CPT)
-                gmbus_irq_handler(dev);
+                gmbus_irq_handler(dev_priv);
 
         if (pch_iir & SDE_AUDIO_CP_REQ_CPT)
                 DRM_DEBUG_DRIVER("Audio CP request interrupt\n");
@@ -2096,12 +2069,11 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir)
                                          I915_READ(FDI_RX_IIR(pipe)));
 
         if (pch_iir & SDE_ERROR_CPT)
-                cpt_serr_int_handler(dev);
+                cpt_serr_int_handler(dev_priv);
 }
 
-static void spt_irq_handler(struct drm_device *dev, u32 pch_iir)
+static void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_SPT &
                 ~SDE_PORTE_HOTPLUG_SPT;
         u32 hotplug2_trigger = pch_iir & SDE_PORTE_HOTPLUG_SPT;
@@ -2130,16 +2102,16 @@ static void spt_irq_handler(struct drm_device *dev, u32 pch_iir)
         }
 
         if (pin_mask)
-                intel_hpd_irq_handler(dev, pin_mask, long_mask);
+                intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
 
         if (pch_iir & SDE_GMBUS_CPT)
-                gmbus_irq_handler(dev);
+                gmbus_irq_handler(dev_priv);
 }
 
-static void ilk_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger,
+static void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv,
+                                u32 hotplug_trigger,
                                 const u32 hpd[HPD_NUM_PINS])
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
 
         dig_hotplug_reg = I915_READ(DIGITAL_PORT_HOTPLUG_CNTRL);
@@ -2149,97 +2121,93 @@ static void ilk_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger,
                            dig_hotplug_reg, hpd,
                            ilk_port_hotplug_long_detect);
 
-        intel_hpd_irq_handler(dev, pin_mask, long_mask);
+        intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
 }
 
-static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)
+static void ilk_display_irq_handler(struct drm_i915_private *dev_priv,
+                                    u32 de_iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         enum pipe pipe;
         u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
 
         if (hotplug_trigger)
-                ilk_hpd_irq_handler(dev, hotplug_trigger, hpd_ilk);
+                ilk_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ilk);
 
         if (de_iir & DE_AUX_CHANNEL_A)
-                dp_aux_irq_handler(dev);
+                dp_aux_irq_handler(dev_priv);
 
         if (de_iir & DE_GSE)
-                intel_opregion_asle_intr(dev);
+                intel_opregion_asle_intr(dev_priv);
 
         if (de_iir & DE_POISON)
                 DRM_ERROR("Poison interrupt\n");
 
         for_each_pipe(dev_priv, pipe) {
                 if (de_iir & DE_PIPE_VBLANK(pipe) &&
-                    intel_pipe_handle_vblank(dev, pipe))
-                        intel_check_page_flip(dev, pipe);
+                    intel_pipe_handle_vblank(dev_priv, pipe))
+                        intel_check_page_flip(dev_priv, pipe);
 
                 if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe))
                         intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
 
                 if (de_iir & DE_PIPE_CRC_DONE(pipe))
-                        i9xx_pipe_crc_irq_handler(dev, pipe);
+                        i9xx_pipe_crc_irq_handler(dev_priv, pipe);
 
                 /* plane/pipes map 1:1 on ilk+ */
-                if (de_iir & DE_PLANE_FLIP_DONE(pipe)) {
-                        intel_prepare_page_flip(dev, pipe);
-                        intel_finish_page_flip_plane(dev, pipe);
-                }
+                if (de_iir & DE_PLANE_FLIP_DONE(pipe))
+                        intel_finish_page_flip_cs(dev_priv, pipe);
         }
 
         /* check event from PCH */
         if (de_iir & DE_PCH_EVENT) {
                 u32 pch_iir = I915_READ(SDEIIR);
 
-                if (HAS_PCH_CPT(dev))
-                        cpt_irq_handler(dev, pch_iir);
+                if (HAS_PCH_CPT(dev_priv))
+                        cpt_irq_handler(dev_priv, pch_iir);
                 else
-                        ibx_irq_handler(dev, pch_iir);
+                        ibx_irq_handler(dev_priv, pch_iir);
 
                 /* should clear PCH hotplug event before clear CPU irq */
                 I915_WRITE(SDEIIR, pch_iir);
         }
 
-        if (IS_GEN5(dev) && de_iir & DE_PCU_EVENT)
-                ironlake_rps_change_irq_handler(dev);
+        if (IS_GEN5(dev_priv) && de_iir & DE_PCU_EVENT)
+                ironlake_rps_change_irq_handler(dev_priv);
 }
 
-static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)
+static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
+                                    u32 de_iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         enum pipe pipe;
         u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
 
         if (hotplug_trigger)
-                ilk_hpd_irq_handler(dev, hotplug_trigger, hpd_ivb);
+                ilk_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ivb);
 
         if (de_iir & DE_ERR_INT_IVB)
-                ivb_err_int_handler(dev);
+                ivb_err_int_handler(dev_priv);
 
         if (de_iir & DE_AUX_CHANNEL_A_IVB)
-                dp_aux_irq_handler(dev);
+                dp_aux_irq_handler(dev_priv);
 
         if (de_iir & DE_GSE_IVB)
-                intel_opregion_asle_intr(dev);
+                intel_opregion_asle_intr(dev_priv);
 
         for_each_pipe(dev_priv, pipe) {
                 if (de_iir & (DE_PIPE_VBLANK_IVB(pipe)) &&
-                    intel_pipe_handle_vblank(dev, pipe))
-                        intel_check_page_flip(dev, pipe);
+                    intel_pipe_handle_vblank(dev_priv, pipe))
+                        intel_check_page_flip(dev_priv, pipe);
 
                 /* plane/pipes map 1:1 on ilk+ */
-                if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe)) {
-                        intel_prepare_page_flip(dev, pipe);
-                        intel_finish_page_flip_plane(dev, pipe);
-                }
+                if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe))
+                        intel_finish_page_flip_cs(dev_priv, pipe);
         }
 
         /* check event from PCH */
-        if (!HAS_PCH_NOP(dev) && (de_iir & DE_PCH_EVENT_IVB)) {
+        if (!HAS_PCH_NOP(dev_priv) && (de_iir & DE_PCH_EVENT_IVB)) {
                 u32 pch_iir = I915_READ(SDEIIR);
 
-                cpt_irq_handler(dev, pch_iir);
+                cpt_irq_handler(dev_priv, pch_iir);
 
                 /* clear PCH hotplug event before clear CPU irq */
                 I915_WRITE(SDEIIR, pch_iir);
@@ -2277,7 +2245,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
          * able to process them after we restore SDEIER (as soon as we restore
          * it, we'll get an interrupt if SDEIIR still has something to process
          * due to its back queue). */
-        if (!HAS_PCH_NOP(dev)) {
+        if (!HAS_PCH_NOP(dev_priv)) {
                 sde_ier = I915_READ(SDEIER);
                 I915_WRITE(SDEIER, 0);
                 POSTING_READ(SDEIER);
@@ -2289,7 +2257,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
         if (gt_iir) {
                 I915_WRITE(GTIIR, gt_iir);
                 ret = IRQ_HANDLED;
-                if (INTEL_INFO(dev)->gen >= 6)
+                if (INTEL_GEN(dev_priv) >= 6)
                         snb_gt_irq_handler(dev_priv, gt_iir);
                 else
                         ilk_gt_irq_handler(dev_priv, gt_iir);
@@ -2299,13 +2267,13 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
         if (de_iir) {
                 I915_WRITE(DEIIR, de_iir);
                 ret = IRQ_HANDLED;
-                if (INTEL_INFO(dev)->gen >= 7)
-                        ivb_display_irq_handler(dev, de_iir);
+                if (INTEL_GEN(dev_priv) >= 7)
+                        ivb_display_irq_handler(dev_priv, de_iir);
                 else
-                        ilk_display_irq_handler(dev, de_iir);
+                        ilk_display_irq_handler(dev_priv, de_iir);
         }
 
-        if (INTEL_INFO(dev)->gen >= 6) {
+        if (INTEL_GEN(dev_priv) >= 6) {
                 u32 pm_iir = I915_READ(GEN6_PMIIR);
                 if (pm_iir) {
                         I915_WRITE(GEN6_PMIIR, pm_iir);
@@ -2316,7 +2284,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
 
         I915_WRITE(DEIER, de_ier);
         POSTING_READ(DEIER);
-        if (!HAS_PCH_NOP(dev)) {
+        if (!HAS_PCH_NOP(dev_priv)) {
                 I915_WRITE(SDEIER, sde_ier);
                 POSTING_READ(SDEIER);
         }
@@ -2327,10 +2295,10 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
         return ret;
 }
 
-static void bxt_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger,
+static void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv,
+                                u32 hotplug_trigger,
                                 const u32 hpd[HPD_NUM_PINS])
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
 
         dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG);
@@ -2340,13 +2308,12 @@ static void bxt_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger,
                            dig_hotplug_reg, hpd,
                            bxt_port_hotplug_long_detect);
 
-        intel_hpd_irq_handler(dev, pin_mask, long_mask);
+        intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
 }
 
 static irqreturn_t
 gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
 {
-        struct drm_device *dev = dev_priv->dev;
         irqreturn_t ret = IRQ_NONE;
         u32 iir;
         enum pipe pipe;
@@ -2357,7 +2324,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
                         I915_WRITE(GEN8_DE_MISC_IIR, iir);
                         ret = IRQ_HANDLED;
                         if (iir & GEN8_DE_MISC_GSE)
-                                intel_opregion_asle_intr(dev);
+                                intel_opregion_asle_intr(dev_priv);
                         else
                                 DRM_ERROR("Unexpected DE Misc interrupt\n");
                 }
@@ -2381,26 +2348,28 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
                                             GEN9_AUX_CHANNEL_D;
 
                         if (iir & tmp_mask) {
-                                dp_aux_irq_handler(dev);
+                                dp_aux_irq_handler(dev_priv);
                                 found = true;
                         }
 
                         if (IS_BROXTON(dev_priv)) {
                                 tmp_mask = iir & BXT_DE_PORT_HOTPLUG_MASK;
                                 if (tmp_mask) {
-                                        bxt_hpd_irq_handler(dev, tmp_mask, hpd_bxt);
+                                        bxt_hpd_irq_handler(dev_priv, tmp_mask,
+                                                            hpd_bxt);
                                         found = true;
                                 }
                         } else if (IS_BROADWELL(dev_priv)) {
                                 tmp_mask = iir & GEN8_PORT_DP_A_HOTPLUG;
                                 if (tmp_mask) {
-                                        ilk_hpd_irq_handler(dev, tmp_mask, hpd_bdw);
+                                        ilk_hpd_irq_handler(dev_priv,
+                                                            tmp_mask, hpd_bdw);
                                         found = true;
                                 }
                         }
 
-                        if (IS_BROXTON(dev) && (iir & BXT_DE_PORT_GMBUS)) {
-                                gmbus_irq_handler(dev);
+                        if (IS_BROXTON(dev_priv) && (iir & BXT_DE_PORT_GMBUS)) {
+                                gmbus_irq_handler(dev_priv);
                                 found = true;
                         }
 
@@ -2427,8 +2396,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
                 I915_WRITE(GEN8_DE_PIPE_IIR(pipe), iir);
 
                 if (iir & GEN8_PIPE_VBLANK &&
-                    intel_pipe_handle_vblank(dev, pipe))
-                        intel_check_page_flip(dev, pipe);
+                    intel_pipe_handle_vblank(dev_priv, pipe))
+                        intel_check_page_flip(dev_priv, pipe);
 
                 flip_done = iir;
                 if (INTEL_INFO(dev_priv)->gen >= 9)
@@ -2436,13 +2405,11 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
                 else
                         flip_done &= GEN8_PIPE_PRIMARY_FLIP_DONE;
 
-                if (flip_done) {
-                        intel_prepare_page_flip(dev, pipe);
-                        intel_finish_page_flip_plane(dev, pipe);
-                }
+                if (flip_done)
+                        intel_finish_page_flip_cs(dev_priv, pipe);
 
                 if (iir & GEN8_PIPE_CDCLK_CRC_DONE)
-                        hsw_pipe_crc_irq_handler(dev, pipe);
+                        hsw_pipe_crc_irq_handler(dev_priv, pipe);
 
                 if (iir & GEN8_PIPE_FIFO_UNDERRUN)
                         intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
@@ -2459,7 +2426,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
                                   fault_errors);
         }
 
-        if (HAS_PCH_SPLIT(dev) && !HAS_PCH_NOP(dev) &&
+        if (HAS_PCH_SPLIT(dev_priv) && !HAS_PCH_NOP(dev_priv) &&
             master_ctl & GEN8_DE_PCH_IRQ) {
                 /*
                  * FIXME(BDW): Assume for now that the new interrupt handling
@@ -2472,9 +2439,9 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
                         ret = IRQ_HANDLED;
 
                         if (HAS_PCH_SPT(dev_priv))
-                                spt_irq_handler(dev, iir);
+                                spt_irq_handler(dev_priv, iir);
                         else
-                                cpt_irq_handler(dev, iir);
+                                cpt_irq_handler(dev_priv, iir);
                 } else {
                         /*
                          * Like on previous PCH there seems to be something
@@ -2550,20 +2517,20 @@ static void i915_error_wake_up(struct drm_i915_private *dev_priv,
 
 /**
  * i915_reset_and_wakeup - do process context error handling work
- * @dev: drm device
+ * @dev_priv: i915 device private
  *
  * Fire an error uevent so userspace can see that a hang or error
  * was detected.
  */
-static void i915_reset_and_wakeup(struct drm_device *dev)
+static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct kobject *kobj = &dev_priv->dev->primary->kdev->kobj;
         char *error_event[] = { I915_ERROR_UEVENT "=1", NULL };
         char *reset_event[] = { I915_RESET_UEVENT "=1", NULL };
         char *reset_done_event[] = { I915_ERROR_UEVENT "=0", NULL };
         int ret;
 
-        kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, error_event);
+        kobject_uevent_env(kobj, KOBJ_CHANGE, error_event);
 
         /*
          * Note that there's only one work item which does gpu resets, so we
@@ -2577,8 +2544,7 @@ static void i915_reset_and_wakeup(struct drm_device *dev)
          */
         if (i915_reset_in_progress(&dev_priv->gpu_error)) {
                 DRM_DEBUG_DRIVER("resetting chip\n");
-                kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE,
-                                   reset_event);
+                kobject_uevent_env(kobj, KOBJ_CHANGE, reset_event);
 
                 /*
                  * In most cases it's guaranteed that we get here with an RPM
@@ -2589,7 +2555,7 @@ static void i915_reset_and_wakeup(struct drm_device *dev)
                  */
                 intel_runtime_pm_get(dev_priv);
 
-                intel_prepare_reset(dev);
+                intel_prepare_reset(dev_priv);
 
                 /*
                  * All state reset _must_ be completed before we update the
@@ -2597,14 +2563,14 @@ static void i915_reset_and_wakeup(struct drm_device *dev)
                  * pending state and not properly drop locks, resulting in
                  * deadlocks with the reset work.
                  */
-                ret = i915_reset(dev);
+                ret = i915_reset(dev_priv);
 
-                intel_finish_reset(dev);
+                intel_finish_reset(dev_priv);
 
                 intel_runtime_pm_put(dev_priv);
 
                 if (ret == 0)
-                        kobject_uevent_env(&dev->primary->kdev->kobj,
+                        kobject_uevent_env(kobj,
                                            KOBJ_CHANGE, reset_done_event);
 
                 /*
@@ -2615,9 +2581,8 @@ static void i915_reset_and_wakeup(struct drm_device *dev)
         }
 }
 
-static void i915_report_and_clear_eir(struct drm_device *dev)
+static void i915_report_and_clear_eir(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         uint32_t instdone[I915_NUM_INSTDONE_REG];
         u32 eir = I915_READ(EIR);
         int pipe, i;
@@ -2627,9 +2592,9 @@ static void i915_report_and_clear_eir(struct drm_device *dev)
 
         pr_err("render error detected, EIR: 0x%08x\n", eir);
 
-        i915_get_extra_instdone(dev, instdone);
+        i915_get_extra_instdone(dev_priv, instdone);
 
-        if (IS_G4X(dev)) {
+        if (IS_G4X(dev_priv)) {
                 if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
                         u32 ipeir = I915_READ(IPEIR_I965);
 
@@ -2651,7 +2616,7 @@ static void i915_report_and_clear_eir(struct drm_device *dev)
                 }
         }
 
-        if (!IS_GEN2(dev)) {
+        if (!IS_GEN2(dev_priv)) {
                 if (eir & I915_ERROR_PAGE_TABLE) {
                         u32 pgtbl_err = I915_READ(PGTBL_ER);
                         pr_err("page table error\n");
@@ -2673,7 +2638,7 @@ static void i915_report_and_clear_eir(struct drm_device *dev)
                 pr_err("  INSTPM: 0x%08x\n", I915_READ(INSTPM));
                 for (i = 0; i < ARRAY_SIZE(instdone); i++)
                         pr_err("  INSTDONE_%d: 0x%08x\n", i, instdone[i]);
-                if (INTEL_INFO(dev)->gen < 4) {
+                if (INTEL_GEN(dev_priv) < 4) {
                         u32 ipeir = I915_READ(IPEIR);
 
                         pr_err("  IPEIR: 0x%08x\n", I915_READ(IPEIR));
@@ -2709,18 +2674,19 @@ static void i915_report_and_clear_eir(struct drm_device *dev)
 
 /**
  * i915_handle_error - handle a gpu error
- * @dev: drm device
+ * @dev_priv: i915 device private
  * @engine_mask: mask representing engines that are hung
  * Do some basic checking of register state at error time and
  * dump it to the syslog.  Also call i915_capture_error_state() to make
  * sure we get a record and make it available in debugfs.  Fire a uevent
  * so userspace knows something bad happened (should trigger collection
  * of a ring dump etc.).
+ * @fmt: Error message format string
  */
-void i915_handle_error(struct drm_device *dev, u32 engine_mask,
+void i915_handle_error(struct drm_i915_private *dev_priv,
+                       u32 engine_mask,
                        const char *fmt, ...)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         va_list args;
         char error_msg[80];
 
@@ -2728,8 +2694,8 @@ void i915_handle_error(struct drm_device *dev, u32 engine_mask,
         vscnprintf(error_msg, sizeof(error_msg), fmt, args);
         va_end(args);
 
-        i915_capture_error_state(dev, engine_mask, error_msg);
-        i915_report_and_clear_eir(dev);
+        i915_capture_error_state(dev_priv, engine_mask, error_msg);
+        i915_report_and_clear_eir(dev_priv);
 
         if (engine_mask) {
                 atomic_or(I915_RESET_IN_PROGRESS_FLAG,
@@ -2751,7 +2717,7 @@ void i915_handle_error(struct drm_device *dev, u32 engine_mask,
                 i915_error_wake_up(dev_priv, false);
         }
 
-        i915_reset_and_wakeup(dev);
+        i915_reset_and_wakeup(dev_priv);
 }
 
 /* Called from drm generic code, passed 'crtc' which
@@ -2869,9 +2835,9 @@ ring_idle(struct intel_engine_cs *engine, u32 seqno)
 }
 
 static bool
-ipehr_is_semaphore_wait(struct drm_device *dev, u32 ipehr)
+ipehr_is_semaphore_wait(struct drm_i915_private *dev_priv, u32 ipehr)
 {
-        if (INTEL_INFO(dev)->gen >= 8) {
+        if (INTEL_GEN(dev_priv) >= 8) {
                 return (ipehr >> 23) == 0x1c;
         } else {
                 ipehr &= ~MI_SEMAPHORE_SYNC_MASK;
@@ -2884,10 +2850,10 @@ static struct intel_engine_cs *
 semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,
                                  u64 offset)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         struct intel_engine_cs *signaller;
 
-        if (INTEL_INFO(dev_priv)->gen >= 8) {
+        if (INTEL_GEN(dev_priv) >= 8) {
                 for_each_engine(signaller, dev_priv) {
                         if (engine == signaller)
                                 continue;
@@ -2916,7 +2882,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,
 static struct intel_engine_cs *
 semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         u32 cmd, ipehr, head;
         u64 offset = 0;
         int i, backwards;
@@ -2942,7 +2908,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
                 return NULL;
 
         ipehr = I915_READ(RING_IPEHR(engine->mmio_base));
-        if (!ipehr_is_semaphore_wait(engine->dev, ipehr))
+        if (!ipehr_is_semaphore_wait(engine->i915, ipehr))
                 return NULL;
 
         /*
@@ -2954,7 +2920,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
          * ringbuffer itself.
          */
         head = I915_READ_HEAD(engine) & HEAD_ADDR;
-        backwards = (INTEL_INFO(engine->dev)->gen >= 8) ? 5 : 4;
+        backwards = (INTEL_GEN(dev_priv) >= 8) ? 5 : 4;
 
         for (i = backwards; i; --i) {
                 /*
@@ -2976,7 +2942,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
                 return NULL;
 
         *seqno = ioread32(engine->buffer->virtual_start + head + 4) + 1;
-        if (INTEL_INFO(engine->dev)->gen >= 8) {
+        if (INTEL_GEN(dev_priv) >= 8) {
                 offset = ioread32(engine->buffer->virtual_start + head + 12);
                 offset <<= 32;
                 offset = ioread32(engine->buffer->virtual_start + head + 8);
@@ -2986,7 +2952,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
 
 static int semaphore_passed(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         struct intel_engine_cs *signaller;
         u32 seqno;
 
@@ -3028,7 +2994,7 @@ static bool subunits_stuck(struct intel_engine_cs *engine)
         if (engine->id != RCS)
                 return true;
 
-        i915_get_extra_instdone(engine->dev, instdone);
+        i915_get_extra_instdone(engine->i915, instdone);
 
         /* There might be unstable subunit states even when
          * actual head is not moving. Filter out the unstable ones by
@@ -3069,8 +3035,7 @@ head_stuck(struct intel_engine_cs *engine, u64 acthd)
 static enum intel_ring_hangcheck_action
 ring_stuck(struct intel_engine_cs *engine, u64 acthd)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         enum intel_ring_hangcheck_action ha;
         u32 tmp;
 
@@ -3078,7 +3043,7 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)
         if (ha != HANGCHECK_HUNG)
                 return ha;
 
-        if (IS_GEN2(dev))
+        if (IS_GEN2(dev_priv))
                 return HANGCHECK_HUNG;
 
         /* Is the chip hanging on a WAIT_FOR_EVENT?
@@ -3088,19 +3053,19 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)
          */
         tmp = I915_READ_CTL(engine);
         if (tmp & RING_WAIT) {
-                i915_handle_error(dev, 0,
+                i915_handle_error(dev_priv, 0,
                                   "Kicking stuck wait on %s",
                                   engine->name);
                 I915_WRITE_CTL(engine, tmp);
                 return HANGCHECK_KICK;
         }
 
-        if (INTEL_INFO(dev)->gen >= 6 && tmp & RING_WAIT_SEMAPHORE) {
+        if (INTEL_GEN(dev_priv) >= 6 && tmp & RING_WAIT_SEMAPHORE) {
                 switch (semaphore_passed(engine)) {
                 default:
                         return HANGCHECK_HUNG;
                 case 1:
-                        i915_handle_error(dev, 0,
+                        i915_handle_error(dev_priv, 0,
                                           "Kicking stuck semaphore on %s",
                                           engine->name);
                         I915_WRITE_CTL(engine, tmp);
@@ -3115,7 +3080,7 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)
 
 static unsigned kick_waiters(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *i915 = to_i915(engine->dev);
+        struct drm_i915_private *i915 = engine->i915;
         unsigned user_interrupts = READ_ONCE(engine->user_interrupts);
 
         if (engine->hangcheck.user_interrupts == user_interrupts &&
@@ -3144,7 +3109,6 @@ static void i915_hangcheck_elapsed(struct work_struct *work)
         struct drm_i915_private *dev_priv =
                 container_of(work, typeof(*dev_priv),
                              gpu_error.hangcheck_work.work);
-        struct drm_device *dev = dev_priv->dev;
         struct intel_engine_cs *engine;
         enum intel_engine_id id;
         int busy_count = 0, rings_hung = 0;
@@ -3272,22 +3236,22 @@ static void i915_hangcheck_elapsed(struct work_struct *work)
         }
 
         if (rings_hung) {
-                i915_handle_error(dev, rings_hung, "Engine(s) hung");
+                i915_handle_error(dev_priv, rings_hung, "Engine(s) hung");
                 goto out;
         }
 
         if (busy_count)
                 /* Reset timer case chip hangs without another request
                  * being added */
-                i915_queue_hangcheck(dev);
+                i915_queue_hangcheck(dev_priv);
 
 out:
         ENABLE_RPM_WAKEREF_ASSERTS(dev_priv);
 }
 
-void i915_queue_hangcheck(struct drm_device *dev)
+void i915_queue_hangcheck(struct drm_i915_private *dev_priv)
 {
-        struct i915_gpu_error *e = &to_i915(dev)->gpu_error;
+        struct i915_gpu_error *e = &dev_priv->gpu_error;
 
         if (!i915.enable_hangcheck)
                 return;
@@ -3500,31 +3464,29 @@ static void cherryview_irq_preinstall(struct drm_device *dev)
         spin_unlock_irq(&dev_priv->irq_lock);
 }
 
-static u32 intel_hpd_enabled_irqs(struct drm_device *dev,
+static u32 intel_hpd_enabled_irqs(struct drm_i915_private *dev_priv,
                                   const u32 hpd[HPD_NUM_PINS])
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_encoder *encoder;
         u32 enabled_irqs = 0;
 
-        for_each_intel_encoder(dev, encoder)
+        for_each_intel_encoder(dev_priv->dev, encoder)
                 if (dev_priv->hotplug.stats[encoder->hpd_pin].state == HPD_ENABLED)
                         enabled_irqs |= hpd[encoder->hpd_pin];
 
         return enabled_irqs;
 }
 
-static void ibx_hpd_irq_setup(struct drm_device *dev)
+static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 hotplug_irqs, hotplug, enabled_irqs;
 
-        if (HAS_PCH_IBX(dev)) {
+        if (HAS_PCH_IBX(dev_priv)) {
                 hotplug_irqs = SDE_HOTPLUG_MASK;
-                enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_ibx);
+                enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_ibx);
         } else {
                 hotplug_irqs = SDE_HOTPLUG_MASK_CPT;
-                enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_cpt);
+                enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_cpt);
         }
 
         ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
@@ -3543,18 +3505,17 @@ static void ibx_hpd_irq_setup(struct drm_device *dev)
          * When CPU and PCH are on the same package, port A
          * HPD must be enabled in both north and south.
          */
-        if (HAS_PCH_LPT_LP(dev))
+        if (HAS_PCH_LPT_LP(dev_priv))
                 hotplug |= PORTA_HOTPLUG_ENABLE;
         I915_WRITE(PCH_PORT_HOTPLUG, hotplug);
 }
 
-static void spt_hpd_irq_setup(struct drm_device *dev)
+static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 hotplug_irqs, hotplug, enabled_irqs;
 
         hotplug_irqs = SDE_HOTPLUG_MASK_SPT;
-        enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_spt);
+        enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_spt);
 
         ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
 
@@ -3569,24 +3530,23 @@ static void spt_hpd_irq_setup(struct drm_device *dev)
         I915_WRITE(PCH_PORT_HOTPLUG2, hotplug);
 }
 
-static void ilk_hpd_irq_setup(struct drm_device *dev)
+static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 hotplug_irqs, hotplug, enabled_irqs;
 
-        if (INTEL_INFO(dev)->gen >= 8) {
+        if (INTEL_GEN(dev_priv) >= 8) {
                 hotplug_irqs = GEN8_PORT_DP_A_HOTPLUG;
-                enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_bdw);
+                enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_bdw);
 
                 bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
-        } else if (INTEL_INFO(dev)->gen >= 7) {
+        } else if (INTEL_GEN(dev_priv) >= 7) {
                 hotplug_irqs = DE_DP_A_HOTPLUG_IVB;
-                enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_ivb);
+                enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_ivb);
 
                 ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
         } else {
                 hotplug_irqs = DE_DP_A_HOTPLUG;
-                enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_ilk);
+                enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_ilk);
 
                 ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
         }
@@ -3601,15 +3561,14 @@ static void ilk_hpd_irq_setup(struct drm_device *dev)
         hotplug |= DIGITAL_PORTA_HOTPLUG_ENABLE | DIGITAL_PORTA_PULSE_DURATION_2ms;
         I915_WRITE(DIGITAL_PORT_HOTPLUG_CNTRL, hotplug);
 
-        ibx_hpd_irq_setup(dev);
+        ibx_hpd_irq_setup(dev_priv);
 }
 
-static void bxt_hpd_irq_setup(struct drm_device *dev)
+static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 hotplug_irqs, hotplug, enabled_irqs;
 
-        enabled_irqs = intel_hpd_enabled_irqs(dev, hpd_bxt);
+        enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_bxt);
         hotplug_irqs = BXT_DE_PORT_HOTPLUG_MASK;
 
         bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
@@ -3827,6 +3786,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
         uint32_t de_pipe_enables;
         u32 de_port_masked = GEN8_AUX_CHANNEL_A;
         u32 de_port_enables;
+        u32 de_misc_masked = GEN8_DE_MISC_GSE;
         enum pipe pipe;
 
         if (INTEL_INFO(dev_priv)->gen >= 9) {
@@ -3862,6 +3822,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
                                           de_pipe_enables);
 
         GEN5_IRQ_INIT(GEN8_DE_PORT_, ~de_port_masked, de_port_enables);
+        GEN5_IRQ_INIT(GEN8_DE_MISC_, ~de_misc_masked, de_misc_masked);
 }
 
 static int gen8_irq_postinstall(struct drm_device *dev)
@@ -4006,13 +3967,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev)
 /*
  * Returns true when a page flip has completed.
  */
-static bool i8xx_handle_vblank(struct drm_device *dev,
+static bool i8xx_handle_vblank(struct drm_i915_private *dev_priv,
                                int plane, int pipe, u32 iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u16 flip_pending = DISPLAY_PLANE_FLIP_PENDING(plane);
 
-        if (!intel_pipe_handle_vblank(dev, pipe))
+        if (!intel_pipe_handle_vblank(dev_priv, pipe))
                 return false;
 
         if ((iir & flip_pending) == 0)
@@ -4027,12 +3987,11 @@ static bool i8xx_handle_vblank(struct drm_device *dev,
         if (I915_READ16(ISR) & flip_pending)
                 goto check_page_flip;
 
-        intel_prepare_page_flip(dev, plane);
-        intel_finish_page_flip(dev, pipe);
+        intel_finish_page_flip_cs(dev_priv, pipe);
         return true;
 
 check_page_flip:
-        intel_check_page_flip(dev, pipe);
+        intel_check_page_flip(dev_priv, pipe);
         return false;
 }
 
@@ -4089,15 +4048,15 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
 
                 for_each_pipe(dev_priv, pipe) {
                         int plane = pipe;
-                        if (HAS_FBC(dev))
+                        if (HAS_FBC(dev_priv))
                                 plane = !plane;
 
                         if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS &&
-                            i8xx_handle_vblank(dev, plane, pipe, iir))
+                            i8xx_handle_vblank(dev_priv, plane, pipe, iir))
                                 flip_mask &= ~DISPLAY_PLANE_FLIP_PENDING(plane);
 
                         if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
-                                i9xx_pipe_crc_irq_handler(dev, pipe);
+                                i9xx_pipe_crc_irq_handler(dev_priv, pipe);
 
                         if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
                                 intel_cpu_fifo_underrun_irq_handler(dev_priv,
@@ -4182,7 +4141,7 @@ static int i915_irq_postinstall(struct drm_device *dev)
         I915_WRITE(IER, enable_mask);
         POSTING_READ(IER);
 
-        i915_enable_asle_pipestat(dev);
+        i915_enable_asle_pipestat(dev_priv);
 
         /* Interrupt setup is already guaranteed to be single-threaded, this is
          * just to make the assert_spin_locked check happy. */
@@ -4197,13 +4156,12 @@ static int i915_irq_postinstall(struct drm_device *dev)
 /*
  * Returns true when a page flip has completed.
  */
-static bool i915_handle_vblank(struct drm_device *dev,
+static bool i915_handle_vblank(struct drm_i915_private *dev_priv,
                                int plane, int pipe, u32 iir)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 flip_pending = DISPLAY_PLANE_FLIP_PENDING(plane);
 
-        if (!intel_pipe_handle_vblank(dev, pipe))
+        if (!intel_pipe_handle_vblank(dev_priv, pipe))
                 return false;
 
         if ((iir & flip_pending) == 0)
@@ -4218,12 +4176,11 @@ static bool i915_handle_vblank(struct drm_device *dev,
         if (I915_READ(ISR) & flip_pending)
                 goto check_page_flip;
 
-        intel_prepare_page_flip(dev, plane);
-        intel_finish_page_flip(dev, pipe);
+        intel_finish_page_flip_cs(dev_priv, pipe);
         return true;
 
 check_page_flip:
-        intel_check_page_flip(dev, pipe);
+        intel_check_page_flip(dev_priv, pipe);
         return false;
 }
 
@@ -4273,11 +4230,11 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
                         break;
 
                 /* Consume port.  Then clear IIR or we'll miss events */
-                if (I915_HAS_HOTPLUG(dev) &&
+                if (I915_HAS_HOTPLUG(dev_priv) &&
                     iir & I915_DISPLAY_PORT_INTERRUPT) {
                         u32 hotplug_status = i9xx_hpd_irq_ack(dev_priv);
                         if (hotplug_status)
-                                i9xx_hpd_irq_handler(dev, hotplug_status);
+                                i9xx_hpd_irq_handler(dev_priv, hotplug_status);
                 }
 
                 I915_WRITE(IIR, iir & ~flip_mask);
@@ -4288,18 +4245,18 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
 
                 for_each_pipe(dev_priv, pipe) {
                         int plane = pipe;
-                        if (HAS_FBC(dev))
+                        if (HAS_FBC(dev_priv))
                                 plane = !plane;
 
                         if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS &&
-                            i915_handle_vblank(dev, plane, pipe, iir))
+                            i915_handle_vblank(dev_priv, plane, pipe, iir))
                                 flip_mask &= ~DISPLAY_PLANE_FLIP_PENDING(plane);
 
                         if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
                                 blc_event = true;
 
                         if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
-                                i9xx_pipe_crc_irq_handler(dev, pipe);
+                                i9xx_pipe_crc_irq_handler(dev_priv, pipe);
 
                         if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
                                 intel_cpu_fifo_underrun_irq_handler(dev_priv,
@@ -4307,7 +4264,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
                 }
 
                 if (blc_event || (iir & I915_ASLE_INTERRUPT))
-                        intel_opregion_asle_intr(dev);
+                        intel_opregion_asle_intr(dev_priv);
 
                 /* With MSI, interrupts are only generated when iir
                  * transitions from zero to nonzero.  If another bit got
@@ -4391,7 +4348,7 @@ static int i965_irq_postinstall(struct drm_device *dev)
                          I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
         enable_mask |= I915_USER_INTERRUPT;
 
-        if (IS_G4X(dev))
+        if (IS_G4X(dev_priv))
                 enable_mask |= I915_BSD_USER_INTERRUPT;
 
         /* Interrupt setup is already guaranteed to be single-threaded, this is
@@ -4406,7 +4363,7 @@ static int i965_irq_postinstall(struct drm_device *dev)
          * Enable some error detection, note the instruction error mask
          * bit is reserved, so we leave it masked.
          */
-        if (IS_G4X(dev)) {
+        if (IS_G4X(dev_priv)) {
                 error_mask = ~(GM45_ERROR_PAGE_TABLE |
                                GM45_ERROR_MEM_PRIV |
                                GM45_ERROR_CP_PRIV |
@@ -4424,26 +4381,25 @@ static int i965_irq_postinstall(struct drm_device *dev)
         i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
         POSTING_READ(PORT_HOTPLUG_EN);
 
-        i915_enable_asle_pipestat(dev);
+        i915_enable_asle_pipestat(dev_priv);
 
         return 0;
 }
 
-static void i915_hpd_irq_setup(struct drm_device *dev)
+static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 hotplug_en;
 
         assert_spin_locked(&dev_priv->irq_lock);
 
         /* Note HDMI and DP share hotplug bits */
         /* enable bits are the same for all generations */
-        hotplug_en = intel_hpd_enabled_irqs(dev, hpd_mask_i915);
+        hotplug_en = intel_hpd_enabled_irqs(dev_priv, hpd_mask_i915);
         /* Programming the CRT detection parameters tends
            to generate a spurious hotplug event about three
            seconds later.  So just do it once.
         */
-        if (IS_G4X(dev))
+        if (IS_G4X(dev_priv))
                 hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
         hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
 
@@ -4510,7 +4466,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
                 if (iir & I915_DISPLAY_PORT_INTERRUPT) {
                         u32 hotplug_status = i9xx_hpd_irq_ack(dev_priv);
                         if (hotplug_status)
-                                i9xx_hpd_irq_handler(dev, hotplug_status);
+                                i9xx_hpd_irq_handler(dev_priv, hotplug_status);
                 }
 
                 I915_WRITE(IIR, iir & ~flip_mask);
@@ -4523,24 +4479,24 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
 
                 for_each_pipe(dev_priv, pipe) {
                         if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
-                            i915_handle_vblank(dev, pipe, pipe, iir))
+                            i915_handle_vblank(dev_priv, pipe, pipe, iir))
                                 flip_mask &= ~DISPLAY_PLANE_FLIP_PENDING(pipe);
 
                         if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
                                 blc_event = true;
 
                         if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
-                                i9xx_pipe_crc_irq_handler(dev, pipe);
+                                i9xx_pipe_crc_irq_handler(dev_priv, pipe);
 
                         if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
                                 intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
                 }
 
                 if (blc_event || (iir & I915_ASLE_INTERRUPT))
-                        intel_opregion_asle_intr(dev);
+                        intel_opregion_asle_intr(dev_priv);
 
                 if (pipe_stats[0] & PIPE_GMBUS_INTERRUPT_STATUS)
-                        gmbus_irq_handler(dev);
+                        gmbus_irq_handler(dev_priv);
 
                 /* With MSI, interrupts are only generated when iir
                  * transitions from zero to nonzero.  If another bit got
@@ -4611,6 +4567,20 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
         else
                 dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
 
+        dev_priv->rps.pm_intr_keep = 0;
+
+        /*
+         * SNB,IVB can while VLV,CHV may hard hang on looping batchbuffer
+         * if GEN6_PM_UP_EI_EXPIRED is masked.
+         *
+         * TODO: verify if this can be reproduced on VLV,CHV.
+         */
+        if (INTEL_INFO(dev_priv)->gen <= 7 && !IS_HASWELL(dev_priv))
+                dev_priv->rps.pm_intr_keep |= GEN6_PM_RP_UP_EI_EXPIRED;
+
+        if (INTEL_INFO(dev_priv)->gen >= 8)
+                dev_priv->rps.pm_intr_keep |= GEN8_PMINTR_REDIRECT_TO_NON_DISP;
+
         INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
                           i915_hangcheck_elapsed);
 
@@ -4674,12 +4644,12 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
                 dev->driver->disable_vblank = ironlake_disable_vblank;
                 dev_priv->display.hpd_irq_setup = ilk_hpd_irq_setup;
         } else {
-                if (INTEL_INFO(dev_priv)->gen == 2) {
+                if (IS_GEN2(dev_priv)) {
                         dev->driver->irq_preinstall = i8xx_irq_preinstall;
                         dev->driver->irq_postinstall = i8xx_irq_postinstall;
                         dev->driver->irq_handler = i8xx_irq_handler;
                         dev->driver->irq_uninstall = i8xx_irq_uninstall;
-                } else if (INTEL_INFO(dev_priv)->gen == 3) {
+                } else if (IS_GEN3(dev_priv)) {
                         dev->driver->irq_preinstall = i915_irq_preinstall;
                         dev->driver->irq_postinstall = i915_irq_postinstall;
                         dev->driver->irq_uninstall = i915_irq_uninstall;
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 1779f02e6df8..7effe68d552c 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -54,10 +54,13 @@ struct i915_params i915 __read_mostly = {
         .verbose_state_checks = 1,
         .nuclear_pageflip = 0,
         .edp_vswing = 0,
-        .enable_guc_submission = false,
+        .enable_guc_loading = -1,
+        .enable_guc_submission = -1,
         .guc_log_level = -1,
         .enable_dp_mst = true,
         .inject_load_failure = 0,
+        .enable_dpcd_backlight = false,
+        .enable_gvt = false,
 };
 
 module_param_named(modeset, i915.modeset, int, 0400);
@@ -197,8 +200,15 @@ MODULE_PARM_DESC(edp_vswing,
                  "(0=use value from vbt [default], 1=low power swing(200mV),"
                  "2=default swing(400mV))");
 
-module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, bool, 0400);
-MODULE_PARM_DESC(enable_guc_submission, "Enable GuC submission (default:false)");
+module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading, int, 0400);
+MODULE_PARM_DESC(enable_guc_loading,
+                "Enable GuC firmware loading "
+                "(-1=auto [default], 0=never, 1=if available, 2=required)");
+
+module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, int, 0400);
+MODULE_PARM_DESC(enable_guc_submission,
+                "Enable GuC submission "
+                "(-1=auto [default], 0=never, 1=if available, 2=required)");
 
 module_param_named(guc_log_level, i915.guc_log_level, int, 0400);
 MODULE_PARM_DESC(guc_log_level,
@@ -210,3 +220,10 @@ MODULE_PARM_DESC(enable_dp_mst,
 module_param_named_unsafe(inject_load_failure, i915.inject_load_failure, uint, 0400);
 MODULE_PARM_DESC(inject_load_failure,
         "Force an error after a number of failure check points (0:disabled (default), N:force failure at the Nth failure check point)");
+module_param_named(enable_dpcd_backlight, i915.enable_dpcd_backlight, bool, 0600);
+MODULE_PARM_DESC(enable_dpcd_backlight,
+        "Enable support for DPCD backlight control (default:false)");
+
+module_param_named(enable_gvt, i915.enable_gvt, bool, 0600);
+MODULE_PARM_DESC(enable_gvt,
+        "Enable support for Intel GVT-g graphics virtualization host support(default:false)");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 02bc27804291..0ad020b4a925 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -45,6 +45,8 @@ struct i915_params {
         int enable_ips;
         int invert_brightness;
         int enable_cmd_parser;
+        int enable_guc_loading;
+        int enable_guc_submission;
         int guc_log_level;
         int use_mmio_flip;
         int mmio_debug;
@@ -57,10 +59,11 @@ struct i915_params {
         bool load_detect_test;
         bool reset;
         bool disable_display;
-        bool enable_guc_submission;
         bool verbose_state_checks;
         bool nuclear_pageflip;
         bool enable_dp_mst;
+        bool enable_dpcd_backlight;
+        bool enable_gvt;
 };
 
 extern struct i915_params i915 __read_mostly;
diff --git a/drivers/gpu/drm/i915/i915_pvinfo.h b/drivers/gpu/drm/i915/i915_pvinfo.h
new file mode 100644
index 000000000000..c0cb2974caac
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_pvinfo.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef _I915_PVINFO_H_
+#define _I915_PVINFO_H_
+
+/* The MMIO offset of the shared info between guest and host emulator */
+#define VGT_PVINFO_PAGE 0x78000
+#define VGT_PVINFO_SIZE 0x1000
+
+/*
+ * The following structure pages are defined in GEN MMIO space
+ * for virtualization. (One page for now)
+ */
+#define VGT_MAGIC         0x4776544776544776ULL /* 'vGTvGTvG' */
+#define VGT_VERSION_MAJOR 1
+#define VGT_VERSION_MINOR 0
+
+#define INTEL_VGT_IF_VERSION_ENCODE(major, minor) ((major) << 16 | (minor))
+#define INTEL_VGT_IF_VERSION \
+        INTEL_VGT_IF_VERSION_ENCODE(VGT_VERSION_MAJOR, VGT_VERSION_MINOR)
+
+/*
+ * notifications from guest to vgpu device model
+ */
+enum vgt_g2v_type {
+        VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE = 2,
+        VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY,
+        VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE,
+        VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY,
+        VGT_G2V_EXECLIST_CONTEXT_CREATE,
+        VGT_G2V_EXECLIST_CONTEXT_DESTROY,
+        VGT_G2V_MAX,
+};
+
+struct vgt_if {
+        u64 magic;              /* VGT_MAGIC */
+        uint16_t version_major;
+        uint16_t version_minor;
+        u32 vgt_id;             /* ID of vGT instance */
+        u32 rsv1[12];           /* pad to offset 0x40 */
+        /*
+         *  Data structure to describe the balooning info of resources.
+         *  Each VM can only have one portion of continuous area for now.
+         *  (May support scattered resource in future)
+         *  (starting from offset 0x40)
+         */
+        struct {
+                /* Aperture register balooning */
+                struct {
+                        u32 base;
+                        u32 size;
+                } mappable_gmadr;       /* aperture */
+                /* GMADR register balooning */
+                struct {
+                        u32 base;
+                        u32 size;
+                } nonmappable_gmadr;    /* non aperture */
+                /* allowed fence registers */
+                u32 fence_num;
+                u32 rsv2[3];
+        } avail_rs;             /* available/assigned resource */
+        u32 rsv3[0x200 - 24];   /* pad to half page */
+        /*
+         * The bottom half page is for response from Gfx driver to hypervisor.
+         */
+        u32 rsv4;
+        u32 display_ready;      /* ready for display owner switch */
+
+        u32 rsv5[4];
+
+        u32 g2v_notify;
+        u32 rsv6[7];
+
+        struct {
+                u32 lo;
+                u32 hi;
+        } pdp[4];
+
+        u32 execlist_context_descriptor_lo;
+        u32 execlist_context_descriptor_hi;
+
+        u32  rsv7[0x200 - 24];    /* pad to one page */
+} __packed;
+
+#define vgtif_reg(x) \
+        _MMIO((VGT_PVINFO_PAGE + offsetof(struct vgt_if, x)))
+
+/* vGPU display status to be used by the host side */
+#define VGT_DRV_DISPLAY_NOT_READY 0
+#define VGT_DRV_DISPLAY_READY     1  /* ready for display switch */
+
+#endif /* _I915_PVINFO_H_ */
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b407411e31ba..c6bfbf8d7cca 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -220,6 +220,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
 #define   ECOCHK_PPGTT_WT_HSW           (0x2<<3)
 #define   ECOCHK_PPGTT_WB_HSW           (0x3<<3)
 
+#define GEN8_CONFIG0                    _MMIO(0xD00)
+#define  GEN9_DEFAULT_FIXES             (1 << 3 | 1 << 2 | 1 << 1)
+
 #define GAC_ECO_BITS                    _MMIO(0x14090)
 #define   ECOBITS_SNB_BIT               (1<<13)
 #define   ECOBITS_PPGTT_CACHE64B        (3<<8)
@@ -442,6 +445,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
  */
 #define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags))
 
+#define GEN9_MEDIA_POOL_STATE     ((0x3 << 29) | (0x2 << 27) | (0x5 << 16) | 4)
+#define   GEN9_MEDIA_POOL_ENABLE  (1 << 31)
 #define GFX_OP_RASTER_RULES    ((0x3<<29)|(0x7<<24))
 #define GFX_OP_SCISSOR         ((0x3<<29)|(0x1c<<24)|(0x10<<19))
 #define   SC_UPDATE_SCISSOR       (0x1<<1)
@@ -713,6 +718,9 @@ enum skl_disp_power_wells {
         /* Not actual bit groups. Used as IDs for lookup_power_well() */
         SKL_DISP_PW_ALWAYS_ON,
         SKL_DISP_PW_DC_OFF,
+
+        BXT_DPIO_CMN_A,
+        BXT_DPIO_CMN_BC,
 };
 
 #define SKL_POWER_WELL_STATE(pw) (1 << ((pw) * 2))
@@ -886,7 +894,7 @@ enum skl_disp_power_wells {
  * PLLs can be routed to any transcoder A/B/C.
  *
  * Note: DDI0 is digital port B, DD1 is digital port C, and DDI2 is
- * digital port D (CHV) or port A (BXT).
+ * digital port D (CHV) or port A (BXT). ::
  *
  *
  *     Dual channel PHY (VLV/CHV/BXT)
@@ -1273,6 +1281,15 @@ enum skl_disp_power_wells {
 #define BXT_P_CR_GT_DISP_PWRON          _MMIO(0x138090)
 #define   GT_DISPLAY_POWER_ON(phy)      (1 << (phy))
 
+#define _BXT_PHY_CTL_DDI_A              0x64C00
+#define _BXT_PHY_CTL_DDI_B              0x64C10
+#define _BXT_PHY_CTL_DDI_C              0x64C20
+#define   BXT_PHY_CMNLANE_POWERDOWN_ACK (1 << 10)
+#define   BXT_PHY_LANE_POWERDOWN_ACK    (1 << 9)
+#define   BXT_PHY_LANE_ENABLED          (1 << 8)
+#define BXT_PHY_CTL(port)               _MMIO_PORT(port, _BXT_PHY_CTL_DDI_A, \
+                                                         _BXT_PHY_CTL_DDI_B)
+
 #define _PHY_CTL_FAMILY_EDP             0x64C80
 #define _PHY_CTL_FAMILY_DDI             0x64C90
 #define   COMMON_RESET_DIS              (1 << 31)
@@ -1669,6 +1686,9 @@ enum skl_disp_power_wells {
 
 #define GEN7_TLB_RD_ADDR        _MMIO(0x4700)
 
+#define GAMT_CHKN_BIT_REG       _MMIO(0x4ab8)
+#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING      (1<<28)
+
 #if 0
 #define PRB0_TAIL       _MMIO(0x2030)
 #define PRB0_HEAD       _MMIO(0x2034)
@@ -1804,6 +1824,10 @@ enum skl_disp_power_wells {
 #define   GEN9_IZ_HASHING_MASK(slice)                   (0x3 << ((slice) * 2))
 #define   GEN9_IZ_HASHING(slice, val)                   ((val) << ((slice) * 2))
 
+/* chicken reg for WaConextSwitchWithConcurrentTLBInvalidate */
+#define GEN9_CSFE_CHICKEN1_RCS _MMIO(0x20D4)
+#define   GEN9_PREEMPT_GPGPU_SYNC_SWITCH_DISABLE (1 << 2)
+
 /* WaClearTdlStateAckDirtyBits */
 #define GEN8_STATE_ACK          _MMIO(0x20F0)
 #define GEN9_STATE_ACK_SLICE1   _MMIO(0x20F8)
@@ -2161,6 +2185,9 @@ enum skl_disp_power_wells {
 
 #define FBC_LL_SIZE             (1536)
 
+#define FBC_LLC_READ_CTRL       _MMIO(0x9044)
+#define   FBC_LLC_FULLY_OPEN    (1<<30)
+
 /* Framebuffer compression for GM45+ */
 #define DPFC_CB_BASE            _MMIO(0x3200)
 #define DPFC_CONTROL            _MMIO(0x3208)
@@ -2200,6 +2227,8 @@ enum skl_disp_power_wells {
 #define ILK_DPFC_STATUS         _MMIO(0x43210)
 #define ILK_DPFC_FENCE_YOFF     _MMIO(0x43218)
 #define ILK_DPFC_CHICKEN        _MMIO(0x43224)
+#define   ILK_DPFC_DISABLE_DUMMY0 (1<<8)
+#define   ILK_DPFC_NUKE_ON_ANY_MODIFICATION     (1<<23)
 #define ILK_FBC_RT_BASE         _MMIO(0x2128)
 #define   ILK_FBC_RT_VALID      (1<<0)
 #define   SNB_FBC_FRONT_BUFFER  (1<<1)
@@ -2449,6 +2478,8 @@ enum skl_disp_power_wells {
 #define   DPLL_MD_VGA_UDI_MULTIPLIER_MASK       0x0000003f
 #define   DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT      0
 
+#define RAWCLK_FREQ_VLV         _MMIO(VLV_DISPLAY_BASE + 0x6024)
+
 #define _FPA0   0x6040
 #define _FPA1   0x6044
 #define _FPB0   0x6048
@@ -3020,6 +3051,18 @@ enum skl_disp_power_wells {
 /* Same as Haswell, but 72064 bytes now. */
 #define GEN8_CXT_TOTAL_SIZE             (18 * PAGE_SIZE)
 
+enum {
+        INTEL_ADVANCED_CONTEXT = 0,
+        INTEL_LEGACY_32B_CONTEXT,
+        INTEL_ADVANCED_AD_CONTEXT,
+        INTEL_LEGACY_64B_CONTEXT
+};
+
+#define GEN8_CTX_ADDRESSING_MODE_SHIFT 3
+#define GEN8_CTX_ADDRESSING_MODE(dev_priv) (USES_FULL_48BIT_PPGTT(dev_priv) ?\
+                                INTEL_LEGACY_64B_CONTEXT : \
+                                INTEL_LEGACY_32B_CONTEXT)
+
 #define CHV_CLK_CTL1                    _MMIO(0x101100)
 #define VLV_CLK_CTL2                    _MMIO(0x101104)
 #define   CLK_CTL2_CZCOUNT_30NS_SHIFT   28
@@ -6031,6 +6074,10 @@ enum skl_disp_power_wells {
 #define CHICKEN_PAR1_1          _MMIO(0x42080)
 #define  DPA_MASK_VBLANK_SRD    (1 << 15)
 #define  FORCE_ARB_IDLE_PLANES  (1 << 14)
+#define  SKL_EDP_PSR_FIX_RDWRAP (1 << 3)
+
+#define CHICKEN_PAR2_1          _MMIO(0x42090)
+#define  KVM_CONFIG_CHANGE_NOTIFICATION_SELECT  (1 << 14)
 
 #define _CHICKEN_PIPESL_1_A     0x420b0
 #define _CHICKEN_PIPESL_1_B     0x420b4
@@ -6039,6 +6086,7 @@ enum skl_disp_power_wells {
 #define CHICKEN_PIPESL_1(pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B)
 
 #define DISP_ARB_CTL    _MMIO(0x45000)
+#define  DISP_FBC_MEMORY_WAKE           (1<<31)
 #define  DISP_TILE_SURFACE_SWIZZLING    (1<<13)
 #define  DISP_FBC_WM_DIS                (1<<15)
 #define DISP_ARB_CTL2   _MMIO(0x45004)
@@ -6052,6 +6100,9 @@ enum skl_disp_power_wells {
 #define HSW_NDE_RSTWRN_OPT      _MMIO(0x46408)
 #define  RESET_PCH_HANDSHAKE_ENABLE     (1<<4)
 
+#define GEN8_CHICKEN_DCPR_1             _MMIO(0x46430)
+#define   MASK_WAKEMEM                  (1<<13)
+
 #define SKL_DFSM                        _MMIO(0x51000)
 #define SKL_DFSM_CDCLK_LIMIT_MASK       (3 << 23)
 #define SKL_DFSM_CDCLK_LIMIT_675        (0 << 23)
@@ -6067,8 +6118,10 @@ enum skl_disp_power_wells {
 
 #define FF_SLICE_CS_CHICKEN2                    _MMIO(0x20e4)
 #define  GEN9_TSG_BARRIER_ACK_DISABLE           (1<<8)
+#define  GEN9_POOLED_EU_LOAD_BALANCING_FIX_DISABLE  (1<<10)
 
 #define GEN9_CS_DEBUG_MODE1             _MMIO(0x20ec)
+#define GEN9_CTX_PREEMPT_REG            _MMIO(0x2248)
 #define GEN8_CS_CHICKEN1                _MMIO(0x2580)
 
 /* GEN7 chicken */
@@ -6076,6 +6129,7 @@ enum skl_disp_power_wells {
 # define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC      ((1<<10) | (1<<26))
 # define GEN9_RHWO_OPTIMIZATION_DISABLE         (1<<14)
 #define COMMON_SLICE_CHICKEN2                   _MMIO(0x7014)
+# define GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION (1<<8)
 # define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE   (1<<0)
 
 #define HIZ_CHICKEN                                     _MMIO(0x7018)
@@ -6089,7 +6143,14 @@ enum skl_disp_power_wells {
 #define  VLV_B0_WA_L3SQCREG1_VALUE              0x00D30000
 
 #define GEN8_L3SQCREG1                          _MMIO(0xB100)
-#define  BDW_WA_L3SQCREG1_DEFAULT               0x784000
+/*
+ * Note that on CHV the following has an off-by-one error wrt. to BSpec.
+ * Using the formula in BSpec leads to a hang, while the formula here works
+ * fine and matches the formulas for all other platforms. A BSpec change
+ * request has been filed to clarify this.
+ */
+#define  L3_GENERAL_PRIO_CREDITS(x)             (((x) >> 1) << 19)
+#define  L3_HIGH_PRIO_CREDITS(x)                (((x) >> 1) << 14)
 
 #define GEN7_L3CNTLREG1                         _MMIO(0xB01C)
 #define  GEN7_WA_FOR_GEN7_L3_CONTROL                    0x3C47FF8C
@@ -6921,6 +6982,7 @@ enum skl_disp_power_wells {
 #define    EDRAM_SETS_IDX(cap)                  (((cap) >> 8) & 0x3)
 
 #define GEN6_UCGCTL1                            _MMIO(0x9400)
+# define GEN6_GAMUNIT_CLOCK_GATE_DISABLE                (1 << 22)
 # define GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE              (1 << 16)
 # define GEN6_BLBUNIT_CLOCK_GATE_DISABLE                (1 << 5)
 # define GEN6_CSUNIT_CLOCK_GATE_DISABLE                 (1 << 7)
@@ -6937,6 +6999,7 @@ enum skl_disp_power_wells {
 
 #define GEN7_UCGCTL4                            _MMIO(0x940c)
 #define  GEN7_L3BANK2X_CLOCK_GATE_DISABLE       (1<<25)
+#define  GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE      (1<<14)
 
 #define GEN6_RCGCTL1                            _MMIO(0x9410)
 #define GEN6_RCGCTL2                            _MMIO(0x9414)
@@ -7021,7 +7084,7 @@ enum skl_disp_power_wells {
 #define VLV_RCEDATA                             _MMIO(0xA0BC)
 #define GEN6_RC6pp_THRESHOLD                    _MMIO(0xA0C0)
 #define GEN6_PMINTRMSK                          _MMIO(0xA168)
-#define GEN8_PMINTR_REDIRECT_TO_NON_DISP        (1<<31)
+#define   GEN8_PMINTR_REDIRECT_TO_NON_DISP      (1<<31)
 #define VLV_PWRDWNUPCTL                         _MMIO(0xA294)
 #define GEN9_MEDIA_PG_IDLE_HYSTERESIS           _MMIO(0xA0C4)
 #define GEN9_RENDER_PG_IDLE_HYSTERESIS          _MMIO(0xA0C8)
@@ -7557,14 +7620,15 @@ enum skl_disp_power_wells {
 #define  CDCLK_FREQ_540                 (1<<26)
 #define  CDCLK_FREQ_337_308             (2<<26)
 #define  CDCLK_FREQ_675_617             (3<<26)
-#define  CDCLK_FREQ_DECIMAL_MASK        (0x7ff)
-
 #define  BXT_CDCLK_CD2X_DIV_SEL_MASK    (3<<22)
 #define  BXT_CDCLK_CD2X_DIV_SEL_1       (0<<22)
 #define  BXT_CDCLK_CD2X_DIV_SEL_1_5     (1<<22)
 #define  BXT_CDCLK_CD2X_DIV_SEL_2       (2<<22)
 #define  BXT_CDCLK_CD2X_DIV_SEL_4       (3<<22)
+#define  BXT_CDCLK_CD2X_PIPE(pipe)      ((pipe)<<20)
+#define  BXT_CDCLK_CD2X_PIPE_NONE       BXT_CDCLK_CD2X_PIPE(3)
 #define  BXT_CDCLK_SSA_PRECHARGE_ENABLE (1<<16)
+#define  CDCLK_FREQ_DECIMAL_MASK        (0x7ff)
 
 /* LCPLL_CTL */
 #define LCPLL1_CTL              _MMIO(0x46010)
@@ -8140,6 +8204,8 @@ enum skl_disp_power_wells {
 #define _MIPIA_EOT_DISABLE              (dev_priv->mipi_mmio_base + 0xb05c)
 #define _MIPIC_EOT_DISABLE              (dev_priv->mipi_mmio_base + 0xb85c)
 #define MIPI_EOT_DISABLE(port)          _MMIO_MIPI(port, _MIPIA_EOT_DISABLE, _MIPIC_EOT_DISABLE)
+#define  BXT_DEFEATURE_DPI_FIFO_CTR                     (1 << 9)
+#define  BXT_DPHY_DEFEATURE_EN                          (1 << 8)
 #define  LP_RX_TIMEOUT_ERROR_RECOVERY_DISABLE           (1 << 7)
 #define  HS_RX_TIMEOUT_ERROR_RECOVERY_DISABLE           (1 << 6)
 #define  LOW_CONTENTION_RECOVERY_DISABLE                (1 << 5)
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 2d576b7ff299..02507bfc8def 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -43,7 +43,7 @@ static u32 calc_residency(struct drm_device *dev,
         u64 units = 128ULL, div = 100000ULL;
         u32 ret;
 
-        if (!intel_enable_rc6(dev))
+        if (!intel_enable_rc6())
                 return 0;
 
         intel_runtime_pm_get(dev_priv);
@@ -70,8 +70,7 @@ static u32 calc_residency(struct drm_device *dev,
 static ssize_t
 show_rc6_mask(struct device *kdev, struct device_attribute *attr, char *buf)
 {
-        struct drm_minor *dminor = dev_to_drm_minor(kdev);
-        return snprintf(buf, PAGE_SIZE, "%x\n", intel_enable_rc6(dminor->dev));
+        return snprintf(buf, PAGE_SIZE, "%x\n", intel_enable_rc6());
 }
 
 static ssize_t
@@ -204,7 +203,7 @@ i915_l3_write(struct file *filp, struct kobject *kobj,
         struct drm_minor *dminor = dev_to_drm_minor(dev);
         struct drm_device *drm_dev = dminor->dev;
         struct drm_i915_private *dev_priv = drm_dev->dev_private;
-        struct intel_context *ctx;
+        struct i915_gem_context *ctx;
         u32 *temp = NULL; /* Just here to make handling failures easy */
         int slice = (int)(uintptr_t)attr->private;
         int ret;
@@ -397,7 +396,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,
         /* We still need *_set_rps to process the new max_delay and
          * update the interrupt limits and PMINTRMSK even though
          * frequency request may be unchanged. */
-        intel_set_rps(dev, val);
+        intel_set_rps(dev_priv, val);
 
         mutex_unlock(&dev_priv->rps.hw_lock);
 
@@ -461,7 +460,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,
         /* We still need *_set_rps to process the new min_delay and
          * update the interrupt limits and PMINTRMSK even though
          * frequency request may be unchanged. */
-        intel_set_rps(dev, val);
+        intel_set_rps(dev_priv, val);
 
         mutex_unlock(&dev_priv->rps.hw_lock);
 
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index dc0def210097..6768db032f84 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -462,7 +462,7 @@ TRACE_EVENT(i915_gem_ring_sync_to,
                              ),
 
             TP_fast_assign(
-                           __entry->dev = from->dev->primary->index;
+                           __entry->dev = from->i915->dev->primary->index;
                            __entry->sync_from = from->id;
                            __entry->sync_to = to_req->engine->id;
                            __entry->seqno = i915_gem_request_get_seqno(req);
@@ -486,13 +486,11 @@ TRACE_EVENT(i915_gem_ring_dispatch,
                              ),
 
             TP_fast_assign(
-                           struct intel_engine_cs *engine =
-                                                i915_gem_request_get_engine(req);
-                           __entry->dev = engine->dev->primary->index;
-                           __entry->ring = engine->id;
-                           __entry->seqno = i915_gem_request_get_seqno(req);
+                           __entry->dev = req->i915->dev->primary->index;
+                           __entry->ring = req->engine->id;
+                           __entry->seqno = req->seqno;
                            __entry->flags = flags;
-                           i915_trace_irq_get(engine, req);
+                           i915_trace_irq_get(req->engine, req);
                            ),
 
             TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x",
@@ -511,7 +509,7 @@ TRACE_EVENT(i915_gem_ring_flush,
                              ),
 
             TP_fast_assign(
-                           __entry->dev = req->engine->dev->primary->index;
+                           __entry->dev = req->i915->dev->primary->index;
                            __entry->ring = req->engine->id;
                            __entry->invalidate = invalidate;
                            __entry->flush = flush;
@@ -533,11 +531,9 @@ DECLARE_EVENT_CLASS(i915_gem_request,
                              ),
 
             TP_fast_assign(
-                           struct intel_engine_cs *engine =
-                                                i915_gem_request_get_engine(req);
-                           __entry->dev = engine->dev->primary->index;
-                           __entry->ring = engine->id;
-                           __entry->seqno = i915_gem_request_get_seqno(req);
+                           __entry->dev = req->i915->dev->primary->index;
+                           __entry->ring = req->engine->id;
+                           __entry->seqno = req->seqno;
                            ),
 
             TP_printk("dev=%u, ring=%u, seqno=%u",
@@ -560,7 +556,7 @@ TRACE_EVENT(i915_gem_request_notify,
                              ),
 
             TP_fast_assign(
-                           __entry->dev = engine->dev->primary->index;
+                           __entry->dev = engine->i915->dev->primary->index;
                            __entry->ring = engine->id;
                            __entry->seqno = engine->get_seqno(engine);
                            ),
@@ -597,13 +593,11 @@ TRACE_EVENT(i915_gem_request_wait_begin,
              * less desirable.
              */
             TP_fast_assign(
-                           struct intel_engine_cs *engine =
-                                                i915_gem_request_get_engine(req);
-                           __entry->dev = engine->dev->primary->index;
-                           __entry->ring = engine->id;
-                           __entry->seqno = i915_gem_request_get_seqno(req);
+                           __entry->dev = req->i915->dev->primary->index;
+                           __entry->ring = req->engine->id;
+                           __entry->seqno = req->seqno;
                            __entry->blocking =
-                                     mutex_is_locked(&engine->dev->struct_mutex);
+                                     mutex_is_locked(&req->i915->dev->struct_mutex);
                            ),
 
             TP_printk("dev=%u, ring=%u, seqno=%u, blocking=%s",
@@ -740,12 +734,12 @@ DEFINE_EVENT(i915_ppgtt, i915_ppgtt_release,
  * the context.
  */
 DECLARE_EVENT_CLASS(i915_context,
-        TP_PROTO(struct intel_context *ctx),
+        TP_PROTO(struct i915_gem_context *ctx),
         TP_ARGS(ctx),
 
         TP_STRUCT__entry(
                         __field(u32, dev)
-                        __field(struct intel_context *, ctx)
+                        __field(struct i915_gem_context *, ctx)
                         __field(struct i915_address_space *, vm)
         ),
 
@@ -760,12 +754,12 @@ DECLARE_EVENT_CLASS(i915_context,
 )
 
 DEFINE_EVENT(i915_context, i915_context_create,
-        TP_PROTO(struct intel_context *ctx),
+        TP_PROTO(struct i915_gem_context *ctx),
         TP_ARGS(ctx)
 );
 
 DEFINE_EVENT(i915_context, i915_context_free,
-        TP_PROTO(struct intel_context *ctx),
+        TP_PROTO(struct i915_gem_context *ctx),
         TP_ARGS(ctx)
 );
 
@@ -777,13 +771,13 @@ DEFINE_EVENT(i915_context, i915_context_free,
  * called only if full ppgtt is enabled.
  */
 TRACE_EVENT(switch_mm,
-        TP_PROTO(struct intel_engine_cs *engine, struct intel_context *to),
+        TP_PROTO(struct intel_engine_cs *engine, struct i915_gem_context *to),
 
         TP_ARGS(engine, to),
 
         TP_STRUCT__entry(
                         __field(u32, ring)
-                        __field(struct intel_context *, to)
+                        __field(struct i915_gem_context *, to)
                         __field(struct i915_address_space *, vm)
                         __field(u32, dev)
         ),
@@ -792,7 +786,7 @@ TRACE_EVENT(switch_mm,
                         __entry->ring = engine->id;
                         __entry->to = to;
                         __entry->vm = to->ppgtt? &to->ppgtt->base : NULL;
-                        __entry->dev = engine->dev->primary->index;
+                        __entry->dev = engine->i915->dev->primary->index;
         ),
 
         TP_printk("dev=%u, ring=%u, ctx=%p, ctx_vm=%p",
diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915_vgpu.c
index d02efb8cad4d..f6acb5a0e701 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.c
+++ b/drivers/gpu/drm/i915/i915_vgpu.c
@@ -53,20 +53,19 @@
 
 /**
  * i915_check_vgpu - detect virtual GPU
- * @dev: drm device *
+ * @dev_priv: i915 device private
  *
  * This function is called at the initialization stage, to detect whether
  * running on a vGPU.
  */
-void i915_check_vgpu(struct drm_device *dev)
+void i915_check_vgpu(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         uint64_t magic;
         uint32_t version;
 
         BUILD_BUG_ON(sizeof(struct vgt_if) != VGT_PVINFO_SIZE);
 
-        if (!IS_HASWELL(dev))
+        if (!IS_HASWELL(dev_priv))
                 return;
 
         magic = __raw_i915_read64(dev_priv, vgtif_reg(magic));
@@ -102,10 +101,13 @@ static struct _balloon_info_ bl_info;
  * This function is called to deallocate the ballooned-out graphic memory, when
  * driver is unloaded or when ballooning fails.
  */
-void intel_vgt_deballoon(void)
+void intel_vgt_deballoon(struct drm_i915_private *dev_priv)
 {
         int i;
 
+        if (!intel_vgpu_active(dev_priv))
+                return;
+
         DRM_DEBUG("VGT deballoon.\n");
 
         for (i = 0; i < 4; i++) {
@@ -151,36 +153,35 @@ static int vgt_balloon_space(struct drm_mm *mm,
  * of its graphic space being zero. Yet there are some portions ballooned out(
  * the shadow part, which are marked as reserved by drm allocator). From the
  * host point of view, the graphic address space is partitioned by multiple
- * vGPUs in different VMs.
+ * vGPUs in different VMs. ::
  *
  *                        vGPU1 view         Host view
  *             0 ------> +-----------+     +-----------+
- *               ^       |///////////|     |   vGPU3   |
- *               |       |///////////|     +-----------+
- *               |       |///////////|     |   vGPU2   |
+ *               ^       |###########|     |   vGPU3   |
+ *               |       |###########|     +-----------+
+ *               |       |###########|     |   vGPU2   |
  *               |       +-----------+     +-----------+
  *        mappable GM    | available | ==> |   vGPU1   |
  *               |       +-----------+     +-----------+
- *               |       |///////////|     |           |
- *               v       |///////////|     |   Host    |
+ *               |       |###########|     |           |
+ *               v       |###########|     |   Host    |
  *               +=======+===========+     +===========+
- *               ^       |///////////|     |   vGPU3   |
- *               |       |///////////|     +-----------+
- *               |       |///////////|     |   vGPU2   |
+ *               ^       |###########|     |   vGPU3   |
+ *               |       |###########|     +-----------+
+ *               |       |###########|     |   vGPU2   |
  *               |       +-----------+     +-----------+
  *      unmappable GM    | available | ==> |   vGPU1   |
  *               |       +-----------+     +-----------+
- *               |       |///////////|     |           |
- *               |       |///////////|     |   Host    |
- *               v       |///////////|     |           |
+ *               |       |###########|     |           |
+ *               |       |###########|     |   Host    |
+ *               v       |###########|     |           |
  * total GM size ------> +-----------+     +-----------+
  *
  * Returns:
  * zero on success, non-zero if configuration invalid or ballooning failed
  */
-int intel_vgt_balloon(struct drm_device *dev)
+int intel_vgt_balloon(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         unsigned long ggtt_end = ggtt->base.start + ggtt->base.total;
 
@@ -188,6 +189,9 @@ int intel_vgt_balloon(struct drm_device *dev)
         unsigned long unmappable_base, unmappable_size, unmappable_end;
         int ret;
 
+        if (!intel_vgpu_active(dev_priv))
+                return 0;
+
         mappable_base = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.base));
         mappable_size = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.size));
         unmappable_base = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.base));
@@ -259,6 +263,6 @@ int intel_vgt_balloon(struct drm_device *dev)
 
 err:
         DRM_ERROR("VGT balloon fail\n");
-        intel_vgt_deballoon();
+        intel_vgt_deballoon(dev_priv);
         return ret;
 }
diff --git a/drivers/gpu/drm/i915/i915_vgpu.h b/drivers/gpu/drm/i915/i915_vgpu.h
index 3c83b47b5f69..3c3b2d24e830 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.h
+++ b/drivers/gpu/drm/i915/i915_vgpu.h
@@ -24,94 +24,10 @@
 #ifndef _I915_VGPU_H_
 #define _I915_VGPU_H_
 
-/* The MMIO offset of the shared info between guest and host emulator */
-#define VGT_PVINFO_PAGE 0x78000
-#define VGT_PVINFO_SIZE 0x1000
+#include "i915_pvinfo.h"
 
-/*
- * The following structure pages are defined in GEN MMIO space
- * for virtualization. (One page for now)
- */
-#define VGT_MAGIC         0x4776544776544776ULL /* 'vGTvGTvG' */
-#define VGT_VERSION_MAJOR 1
-#define VGT_VERSION_MINOR 0
-
-#define INTEL_VGT_IF_VERSION_ENCODE(major, minor) ((major) << 16 | (minor))
-#define INTEL_VGT_IF_VERSION \
-        INTEL_VGT_IF_VERSION_ENCODE(VGT_VERSION_MAJOR, VGT_VERSION_MINOR)
-
-/*
- * notifications from guest to vgpu device model
- */
-enum vgt_g2v_type {
-        VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE = 2,
-        VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY,
-        VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE,
-        VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY,
-        VGT_G2V_EXECLIST_CONTEXT_CREATE,
-        VGT_G2V_EXECLIST_CONTEXT_DESTROY,
-        VGT_G2V_MAX,
-};
-
-struct vgt_if {
-        uint64_t magic;         /* VGT_MAGIC */
-        uint16_t version_major;
-        uint16_t version_minor;
-        uint32_t vgt_id;        /* ID of vGT instance */
-        uint32_t rsv1[12];      /* pad to offset 0x40 */
-        /*
-         *  Data structure to describe the balooning info of resources.
-         *  Each VM can only have one portion of continuous area for now.
-         *  (May support scattered resource in future)
-         *  (starting from offset 0x40)
-         */
-        struct {
-                /* Aperture register balooning */
-                struct {
-                        uint32_t base;
-                        uint32_t size;
-                } mappable_gmadr;       /* aperture */
-                /* GMADR register balooning */
-                struct {
-                        uint32_t base;
-                        uint32_t size;
-                } nonmappable_gmadr;    /* non aperture */
-                /* allowed fence registers */
-                uint32_t fence_num;
-                uint32_t rsv2[3];
-        } avail_rs;             /* available/assigned resource */
-        uint32_t rsv3[0x200 - 24];      /* pad to half page */
-        /*
-         * The bottom half page is for response from Gfx driver to hypervisor.
-         */
-        uint32_t rsv4;
-        uint32_t display_ready; /* ready for display owner switch */
-
-        uint32_t rsv5[4];
-
-        uint32_t g2v_notify;
-        uint32_t rsv6[7];
-
-        struct {
-                uint32_t lo;
-                uint32_t hi;
-        } pdp[4];
-
-        uint32_t execlist_context_descriptor_lo;
-        uint32_t execlist_context_descriptor_hi;
-
-        uint32_t  rsv7[0x200 - 24];    /* pad to one page */
-} __packed;
-
-#define vgtif_reg(x) \
-        _MMIO((VGT_PVINFO_PAGE + (long)&((struct vgt_if *)NULL)->x))
-
-/* vGPU display status to be used by the host side */
-#define VGT_DRV_DISPLAY_NOT_READY 0
-#define VGT_DRV_DISPLAY_READY     1  /* ready for display switch */
-
-extern void i915_check_vgpu(struct drm_device *dev);
-extern int intel_vgt_balloon(struct drm_device *dev);
-extern void intel_vgt_deballoon(void);
+void i915_check_vgpu(struct drm_i915_private *dev_priv);
+int intel_vgt_balloon(struct drm_i915_private *dev_priv);
+void intel_vgt_deballoon(struct drm_i915_private *dev_priv);
 
 #endif /* _I915_VGPU_H_ */
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 50ff90aea721..c5a166752eda 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -191,7 +191,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
 
                         /* plane scaler case: assign as a plane scaler */
                         /* find the plane that set the bit as scaler_user */
-                        plane = drm_state->planes[i];
+                        plane = drm_state->planes[i].ptr;
 
                         /*
                          * to enable/disable hq mode, add planes that are using scaler
@@ -223,7 +223,8 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
                                 continue;
                         }
 
-                        plane_state = to_intel_plane_state(drm_state->plane_states[i]);
+                        plane_state = intel_atomic_get_existing_plane_state(drm_state,
+                                                                            intel_plane);
                         scaler_id = &plane_state->scaler_id;
                 }
 
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 02a7527ce7bb..b9329c2a670a 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -621,17 +621,11 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 static int i915_audio_component_get_cdclk_freq(struct device *dev)
 {
         struct drm_i915_private *dev_priv = dev_to_i915(dev);
-        int ret;
 
         if (WARN_ON_ONCE(!HAS_DDI(dev_priv)))
                 return -ENODEV;
 
-        intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
-        ret = dev_priv->display.get_display_clock_speed(dev_priv->dev);
-
-        intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
-
-        return ret;
+        return dev_priv->cdclk_freq;
 }
 
 static int i915_audio_component_sync_audio_rate(struct device *dev,
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b235b6e88ead..da5ed4a850b9 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -139,6 +139,11 @@ fill_detail_timing_data(struct drm_display_mode *panel_fixed_mode,
         else
                 panel_fixed_mode->flags |= DRM_MODE_FLAG_NVSYNC;
 
+        panel_fixed_mode->width_mm = (dvo_timing->himage_hi << 8) |
+                dvo_timing->himage_lo;
+        panel_fixed_mode->height_mm = (dvo_timing->vimage_hi << 8) |
+                dvo_timing->vimage_lo;
+
         /* Some VBTs have bogus h/vtotal values */
         if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal)
                 panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1;
@@ -213,7 +218,7 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
 
         dev_priv->vbt.lvds_dither = lvds_options->pixel_dither;
 
-        ret = intel_opregion_get_panel_type(dev_priv->dev);
+        ret = intel_opregion_get_panel_type(dev_priv);
         if (ret >= 0) {
                 WARN_ON(ret > 0xf);
                 panel_type = ret;
@@ -318,6 +323,15 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,
                 return;
         }
 
+        dev_priv->vbt.backlight.type = INTEL_BACKLIGHT_DISPLAY_DDI;
+        if (bdb->version >= 191 &&
+            get_blocksize(backlight_data) >= sizeof(*backlight_data)) {
+                const struct bdb_lfp_backlight_control_method *method;
+
+                method = &backlight_data->backlight_control[panel_type];
+                dev_priv->vbt.backlight.type = method->type;
+        }
+
         dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
         dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm;
         dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
@@ -763,6 +777,16 @@ parse_mipi_config(struct drm_i915_private *dev_priv,
                 return;
         }
 
+        /*
+         * These fields are introduced from the VBT version 197 onwards,
+         * so making sure that these bits are set zero in the previous
+         * versions.
+         */
+        if (dev_priv->vbt.dsi.config->dual_link && bdb->version < 197) {
+                dev_priv->vbt.dsi.config->dl_dcs_cabc_ports = 0;
+                dev_priv->vbt.dsi.config->dl_dcs_backlight_ports = 0;
+        }
+
         /* We have mandatory mipi config blocks. Initialize as generic panel */
         dev_priv->vbt.dsi.panel_id = MIPI_DSI_GENERIC_PANEL_ID;
 }
@@ -1187,7 +1211,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
         }
         if (bdb->version < 106) {
                 expected_size = 22;
-        } else if (bdb->version < 109) {
+        } else if (bdb->version < 111) {
                 expected_size = 27;
         } else if (bdb->version < 195) {
                 BUILD_BUG_ON(sizeof(struct old_child_dev_config) != 33);
@@ -1546,6 +1570,45 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin)
 }
 
 /**
+ * intel_bios_is_port_present - is the specified digital port present
+ * @dev_priv:   i915 device instance
+ * @port:       port to check
+ *
+ * Return true if the device in %port is present.
+ */
+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port)
+{
+        static const struct {
+                u16 dp, hdmi;
+        } port_mapping[] = {
+                [PORT_B] = { DVO_PORT_DPB, DVO_PORT_HDMIB, },
+                [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, },
+                [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
+                [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
+        };
+        int i;
+
+        /* FIXME maybe deal with port A as well? */
+        if (WARN_ON(port == PORT_A) || port >= ARRAY_SIZE(port_mapping))
+                return false;
+
+        if (!dev_priv->vbt.child_dev_num)
+                return false;
+
+        for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
+                const union child_device_config *p_child =
+                        &dev_priv->vbt.child_dev[i];
+                if ((p_child->common.dvo_port == port_mapping[port].dp ||
+                     p_child->common.dvo_port == port_mapping[port].hdmi) &&
+                    (p_child->common.device_type & (DEVICE_TYPE_TMDS_DVI_SIGNALING |
+                                                    DEVICE_TYPE_DISPLAYPORT_OUTPUT)))
+                        return true;
+        }
+
+        return false;
+}
+
+/**
  * intel_bios_is_port_edp - is the device in given port eDP
  * @dev_priv:   i915 device instance
  * @port:       port to check
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index ab0ea315eddb..8405b5a367d7 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -30,6 +30,14 @@
 #ifndef _INTEL_BIOS_H_
 #define _INTEL_BIOS_H_
 
+enum intel_backlight_type {
+        INTEL_BACKLIGHT_PMIC,
+        INTEL_BACKLIGHT_LPSS,
+        INTEL_BACKLIGHT_DISPLAY_DDI,
+        INTEL_BACKLIGHT_DSI_DCS,
+        INTEL_BACKLIGHT_PANEL_DRIVER_INTERFACE,
+};
+
 struct edp_power_seq {
         u16 t1_t3;
         u16 t8;
@@ -113,7 +121,13 @@ struct mipi_config {
         u16 dual_link:2;
         u16 lane_cnt:2;
         u16 pixel_overlap:3;
-        u16 rsvd3:9;
+        u16 rgb_flip:1;
+#define DL_DCS_PORT_A                   0x00
+#define DL_DCS_PORT_C                   0x01
+#define DL_DCS_PORT_A_AND_C             0x02
+        u16 dl_dcs_cabc_ports:2;
+        u16 dl_dcs_backlight_ports:2;
+        u16 rsvd3:4;
 
         u16 rsvd4;
 
diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
index 1b3f97449395..522f5a2de015 100644
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i915/intel_color.c
@@ -547,7 +547,8 @@ void intel_color_init(struct drm_crtc *crtc)
         /* Enable color management support when we have degamma & gamma LUTs. */
         if (INTEL_INFO(dev)->color.degamma_lut_size != 0 &&
             INTEL_INFO(dev)->color.gamma_lut_size != 0)
-                drm_helper_crtc_enable_color_mgmt(crtc,
+                drm_crtc_enable_color_mgmt(crtc,
                                         INTEL_INFO(dev)->color.degamma_lut_size,
+                                        true,
                                         INTEL_INFO(dev)->color.gamma_lut_size);
 }
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 3fbb6fc66451..e115bcc6766f 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -743,6 +743,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_crt_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_crt_destroy,
         .set_property = intel_crt_set_property,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -753,7 +754,6 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {
         .mode_valid = intel_crt_mode_valid,
         .get_modes = intel_crt_get_modes,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_encoder_funcs intel_crt_enc_funcs = {
@@ -839,7 +839,7 @@ void intel_crt_init(struct drm_device *dev)
                            &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
 
         drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,
-                         DRM_MODE_ENCODER_DAC, NULL);
+                         DRM_MODE_ENCODER_DAC, "CRT");
 
         intel_connector_attach_encoder(intel_connector, &crt->base);
 
@@ -876,7 +876,6 @@ void intel_crt_init(struct drm_device *dev)
                 crt->base.get_hw_state = intel_crt_get_hw_state;
         }
         intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
 
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index a34c23eceba0..2b3b428d9cd2 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -41,16 +41,22 @@
  * be moved to FW_FAILED.
  */
 
+#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
+MODULE_FIRMWARE(I915_CSR_KBL);
+#define KBL_CSR_VERSION_REQUIRED        CSR_VERSION(1, 1)
+
 #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
+MODULE_FIRMWARE(I915_CSR_SKL);
+#define SKL_CSR_VERSION_REQUIRED        CSR_VERSION(1, 23)
+
 #define I915_CSR_BXT "i915/bxt_dmc_ver1.bin"
+MODULE_FIRMWARE(I915_CSR_BXT);
+#define BXT_CSR_VERSION_REQUIRED        CSR_VERSION(1, 7)
 
 #define FIRMWARE_URL  "https://01.org/linuxgraphics/intel-linux-graphics-firmwares"
 
-MODULE_FIRMWARE(I915_CSR_SKL);
-MODULE_FIRMWARE(I915_CSR_BXT);
 
-#define SKL_CSR_VERSION_REQUIRED        CSR_VERSION(1, 23)
-#define BXT_CSR_VERSION_REQUIRED        CSR_VERSION(1, 7)
+
 
 #define CSR_MAX_FW_SIZE                 0x2FFF
 #define CSR_DEFAULT_FW_OFFSET           0xFFFFFFFF
@@ -169,12 +175,10 @@ struct stepping_info {
         char substepping;
 };
 
-/*
- * Kabylake derivated from Skylake H0, so SKL H0
- * is the right firmware for KBL A0 (revid 0).
- */
 static const struct stepping_info kbl_stepping_info[] = {
-        {'H', '0'}, {'I', '0'}
+        {'A', '0'}, {'B', '0'}, {'C', '0'},
+        {'D', '0'}, {'E', '0'}, {'F', '0'},
+        {'G', '0'}, {'H', '0'}, {'I', '0'},
 };
 
 static const struct stepping_info skl_stepping_info[] = {
@@ -298,7 +302,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
         csr->version = css_header->version;
 
-        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
+        if (IS_KABYLAKE(dev_priv)) {
+                required_min_version = KBL_CSR_VERSION_REQUIRED;
+        } else if (IS_SKYLAKE(dev_priv)) {
                 required_min_version = SKL_CSR_VERSION_REQUIRED;
         } else if (IS_BROXTON(dev_priv)) {
                 required_min_version = BXT_CSR_VERSION_REQUIRED;
@@ -446,7 +452,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
         if (!HAS_CSR(dev_priv))
                 return;
 
-        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+        if (IS_KABYLAKE(dev_priv))
+                csr->fw_path = I915_CSR_KBL;
+        else if (IS_SKYLAKE(dev_priv))
                 csr->fw_path = I915_CSR_SKL;
         else if (IS_BROXTON(dev_priv))
                 csr->fw_path = I915_CSR_BXT;
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 01e523df363b..ad3b0ee5e55b 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -948,7 +948,7 @@ static int bxt_calc_pll_link(struct drm_i915_private *dev_priv,
 {
         struct intel_shared_dpll *pll;
         struct intel_dpll_hw_state *state;
-        intel_clock_t clock;
+        struct dpll clock;
 
         /* For DDI ports we always use a shared PLL. */
         if (WARN_ON(dpll == DPLL_ID_PRIVATE))
@@ -1342,6 +1342,14 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
         DRM_DEBUG_KMS("No pipe for ddi port %c found\n", port_name(port));
 
 out:
+        if (ret && IS_BROXTON(dev_priv)) {
+                tmp = I915_READ(BXT_PHY_CTL(port));
+                if ((tmp & (BXT_PHY_LANE_POWERDOWN_ACK |
+                            BXT_PHY_LANE_ENABLED)) != BXT_PHY_LANE_ENABLED)
+                        DRM_ERROR("Port %c enabled but PHY powered down? "
+                                  "(PHY_CTL %08x)\n", port_name(port), tmp);
+        }
+
         intel_display_power_put(dev_priv, power_domain);
 
         return ret;
@@ -1742,9 +1750,11 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
         }
 }
 
-static bool broxton_phy_is_enabled(struct drm_i915_private *dev_priv,
-                                   enum dpio_phy phy)
+bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
+                            enum dpio_phy phy)
 {
+        enum port port;
+
         if (!(I915_READ(BXT_P_CR_GT_DISP_PWRON) & GT_DISPLAY_POWER_ON(phy)))
                 return false;
 
@@ -1770,38 +1780,48 @@ static bool broxton_phy_is_enabled(struct drm_i915_private *dev_priv,
                 return false;
         }
 
+        for_each_port_masked(port,
+                             phy == DPIO_PHY0 ? BIT(PORT_B) | BIT(PORT_C) :
+                                                BIT(PORT_A)) {
+                u32 tmp = I915_READ(BXT_PHY_CTL(port));
+
+                if (tmp & BXT_PHY_CMNLANE_POWERDOWN_ACK) {
+                        DRM_DEBUG_DRIVER("DDI PHY %d powered, but common lane "
+                                         "for port %c powered down "
+                                         "(PHY_CTL %08x)\n",
+                                         phy, port_name(port), tmp);
+
+                        return false;
+                }
+        }
+
         return true;
 }
 
-static u32 broxton_get_grc(struct drm_i915_private *dev_priv, enum dpio_phy phy)
+static u32 bxt_get_grc(struct drm_i915_private *dev_priv, enum dpio_phy phy)
 {
         u32 val = I915_READ(BXT_PORT_REF_DW6(phy));
 
         return (val & GRC_CODE_MASK) >> GRC_CODE_SHIFT;
 }
 
-static void broxton_phy_wait_grc_done(struct drm_i915_private *dev_priv,
-                                      enum dpio_phy phy)
+static void bxt_phy_wait_grc_done(struct drm_i915_private *dev_priv,
+                                  enum dpio_phy phy)
 {
         if (wait_for(I915_READ(BXT_PORT_REF_DW3(phy)) & GRC_DONE, 10))
                 DRM_ERROR("timeout waiting for PHY%d GRC\n", phy);
 }
 
-static bool broxton_phy_verify_state(struct drm_i915_private *dev_priv,
-                                     enum dpio_phy phy);
-
-static void broxton_phy_init(struct drm_i915_private *dev_priv,
-                             enum dpio_phy phy)
+void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy)
 {
-        enum port port;
-        u32 ports, val;
+        u32 val;
 
-        if (broxton_phy_is_enabled(dev_priv, phy)) {
+        if (bxt_ddi_phy_is_enabled(dev_priv, phy)) {
                 /* Still read out the GRC value for state verification */
                 if (phy == DPIO_PHY0)
-                        dev_priv->bxt_phy_grc = broxton_get_grc(dev_priv, phy);
+                        dev_priv->bxt_phy_grc = bxt_get_grc(dev_priv, phy);
 
-                if (broxton_phy_verify_state(dev_priv, phy)) {
+                if (bxt_ddi_phy_verify_state(dev_priv, phy)) {
                         DRM_DEBUG_DRIVER("DDI PHY %d already enabled, "
                                          "won't reprogram it\n", phy);
 
@@ -1810,8 +1830,6 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
 
                 DRM_DEBUG_DRIVER("DDI PHY %d enabled with invalid state, "
                                  "force reprogramming it\n", phy);
-        } else {
-                DRM_DEBUG_DRIVER("DDI PHY %d not enabled, enabling it\n", phy);
         }
 
         val = I915_READ(BXT_P_CR_GT_DISP_PWRON);
@@ -1831,28 +1849,6 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
                 DRM_ERROR("timeout during PHY%d power on\n", phy);
         }
 
-        if (phy == DPIO_PHY0)
-                ports = BIT(PORT_B) | BIT(PORT_C);
-        else
-                ports = BIT(PORT_A);
-
-        for_each_port_masked(port, ports) {
-                int lane;
-
-                for (lane = 0; lane < 4; lane++) {
-                        val = I915_READ(BXT_PORT_TX_DW14_LN(port, lane));
-                        /*
-                         * Note that on CHV this flag is called UPAR, but has
-                         * the same function.
-                         */
-                        val &= ~LATENCY_OPTIM;
-                        if (lane != 1)
-                                val |= LATENCY_OPTIM;
-
-                        I915_WRITE(BXT_PORT_TX_DW14_LN(port, lane), val);
-                }
-        }
-
         /* Program PLL Rcomp code offset */
         val = I915_READ(BXT_PORT_CL1CM_DW9(phy));
         val &= ~IREF0RC_OFFSET_MASK;
@@ -1899,10 +1895,7 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
                  * the corresponding calibrated value from PHY1, and disable
                  * the automatic calibration on PHY0.
                  */
-                broxton_phy_wait_grc_done(dev_priv, DPIO_PHY1);
-
-                val = dev_priv->bxt_phy_grc = broxton_get_grc(dev_priv,
-                                                              DPIO_PHY1);
+                val = dev_priv->bxt_phy_grc = bxt_get_grc(dev_priv, DPIO_PHY1);
                 grc_code = val << GRC_CODE_FAST_SHIFT |
                            val << GRC_CODE_SLOW_SHIFT |
                            val;
@@ -1912,31 +1905,16 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
                 val |= GRC_DIS | GRC_RDY_OVRD;
                 I915_WRITE(BXT_PORT_REF_DW8(DPIO_PHY0), val);
         }
-        /*
-         * During PHY1 init delay waiting for GRC calibration to finish, since
-         * it can happen in parallel with the subsequent PHY0 init.
-         */
 
         val = I915_READ(BXT_PHY_CTL_FAMILY(phy));
         val |= COMMON_RESET_DIS;
         I915_WRITE(BXT_PHY_CTL_FAMILY(phy), val);
-}
 
-void broxton_ddi_phy_init(struct drm_i915_private *dev_priv)
-{
-        /* Enable PHY1 first since it provides Rcomp for PHY0 */
-        broxton_phy_init(dev_priv, DPIO_PHY1);
-        broxton_phy_init(dev_priv, DPIO_PHY0);
-
-        /*
-         * If BIOS enabled only PHY0 and not PHY1, we skipped waiting for the
-         * PHY1 GRC calibration to finish, so wait for it here.
-         */
-        broxton_phy_wait_grc_done(dev_priv, DPIO_PHY1);
+        if (phy == DPIO_PHY1)
+                bxt_phy_wait_grc_done(dev_priv, DPIO_PHY1);
 }
 
-static void broxton_phy_uninit(struct drm_i915_private *dev_priv,
-                               enum dpio_phy phy)
+void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy)
 {
         uint32_t val;
 
@@ -1949,12 +1927,6 @@ static void broxton_phy_uninit(struct drm_i915_private *dev_priv,
         I915_WRITE(BXT_P_CR_GT_DISP_PWRON, val);
 }
 
-void broxton_ddi_phy_uninit(struct drm_i915_private *dev_priv)
-{
-        broxton_phy_uninit(dev_priv, DPIO_PHY1);
-        broxton_phy_uninit(dev_priv, DPIO_PHY0);
-}
-
 static bool __printf(6, 7)
 __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,
                        i915_reg_t reg, u32 mask, u32 expected,
@@ -1982,11 +1954,9 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,
         return false;
 }
 
-static bool broxton_phy_verify_state(struct drm_i915_private *dev_priv,
-                                     enum dpio_phy phy)
+bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
+                              enum dpio_phy phy)
 {
-        enum port port;
-        u32 ports;
         uint32_t mask;
         bool ok;
 
@@ -1994,27 +1964,11 @@ static bool broxton_phy_verify_state(struct drm_i915_private *dev_priv,
         __phy_reg_verify_state(dev_priv, phy, reg, mask, exp, fmt,      \
                                ## __VA_ARGS__)
 
-        /* We expect the PHY to be always enabled */
-        if (!broxton_phy_is_enabled(dev_priv, phy))
+        if (!bxt_ddi_phy_is_enabled(dev_priv, phy))
                 return false;
 
         ok = true;
 
-        if (phy == DPIO_PHY0)
-                ports = BIT(PORT_B) | BIT(PORT_C);
-        else
-                ports = BIT(PORT_A);
-
-        for_each_port_masked(port, ports) {
-                int lane;
-
-                for (lane = 0; lane < 4; lane++)
-                        ok &= _CHK(BXT_PORT_TX_DW14_LN(port, lane),
-                                    LATENCY_OPTIM,
-                                    lane != 1 ? LATENCY_OPTIM : 0,
-                                    "BXT_PORT_TX_DW14_LN(%d, %d)", port, lane);
-        }
-
         /* PLL Rcomp code offset */
         ok &= _CHK(BXT_PORT_CL1CM_DW9(phy),
                     IREF0RC_OFFSET_MASK, 0xe4 << IREF0RC_OFFSET_SHIFT,
@@ -2058,11 +2012,65 @@ static bool broxton_phy_verify_state(struct drm_i915_private *dev_priv,
 #undef _CHK
 }
 
-void broxton_ddi_phy_verify_state(struct drm_i915_private *dev_priv)
+static uint8_t
+bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder,
+                                     struct intel_crtc_state *pipe_config)
 {
-        if (!broxton_phy_verify_state(dev_priv, DPIO_PHY0) ||
-            !broxton_phy_verify_state(dev_priv, DPIO_PHY1))
-                i915_report_error(dev_priv, "DDI PHY state mismatch\n");
+        switch (pipe_config->lane_count) {
+        case 1:
+                return 0;
+        case 2:
+                return BIT(2) | BIT(0);
+        case 4:
+                return BIT(3) | BIT(2) | BIT(0);
+        default:
+                MISSING_CASE(pipe_config->lane_count);
+
+                return 0;
+        }
+}
+
+static void bxt_ddi_pre_pll_enable(struct intel_encoder *encoder)
+{
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct drm_i915_private *dev_priv = to_i915(dport->base.base.dev);
+        enum port port = dport->port;
+        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
+        int lane;
+
+        for (lane = 0; lane < 4; lane++) {
+                u32 val = I915_READ(BXT_PORT_TX_DW14_LN(port, lane));
+
+                /*
+                 * Note that on CHV this flag is called UPAR, but has
+                 * the same function.
+                 */
+                val &= ~LATENCY_OPTIM;
+                if (intel_crtc->config->lane_lat_optim_mask & BIT(lane))
+                        val |= LATENCY_OPTIM;
+
+                I915_WRITE(BXT_PORT_TX_DW14_LN(port, lane), val);
+        }
+}
+
+static uint8_t
+bxt_ddi_phy_get_lane_lat_optim_mask(struct intel_encoder *encoder)
+{
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct drm_i915_private *dev_priv = to_i915(dport->base.base.dev);
+        enum port port = dport->port;
+        int lane;
+        uint8_t mask;
+
+        mask = 0;
+        for (lane = 0; lane < 4; lane++) {
+                u32 val = I915_READ(BXT_PORT_TX_DW14_LN(port, lane));
+
+                if (val & LATENCY_OPTIM)
+                        mask |= BIT(lane);
+        }
+
+        return mask;
 }
 
 void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
@@ -2236,13 +2244,19 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
         }
 
         intel_ddi_clock_get(encoder, pipe_config);
+
+        if (IS_BROXTON(dev_priv))
+                pipe_config->lane_lat_optim_mask =
+                        bxt_ddi_phy_get_lane_lat_optim_mask(encoder);
 }
 
 static bool intel_ddi_compute_config(struct intel_encoder *encoder,
                                      struct intel_crtc_state *pipe_config)
 {
+        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
         int type = encoder->type;
         int port = intel_ddi_get_encoder_port(encoder);
+        int ret;
 
         WARN(type == INTEL_OUTPUT_UNKNOWN, "compute_config() on unknown output!\n");
 
@@ -2250,9 +2264,17 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder,
                 pipe_config->cpu_transcoder = TRANSCODER_EDP;
 
         if (type == INTEL_OUTPUT_HDMI)
-                return intel_hdmi_compute_config(encoder, pipe_config);
+                ret = intel_hdmi_compute_config(encoder, pipe_config);
         else
-                return intel_dp_compute_config(encoder, pipe_config);
+                ret = intel_dp_compute_config(encoder, pipe_config);
+
+        if (IS_BROXTON(dev_priv) && ret)
+                pipe_config->lane_lat_optim_mask =
+                        bxt_ddi_phy_calc_lane_lat_optim_mask(encoder,
+                                                             pipe_config);
+
+        return ret;
+
 }
 
 static const struct drm_encoder_funcs intel_ddi_funcs = {
@@ -2347,10 +2369,12 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
         encoder = &intel_encoder->base;
 
         drm_encoder_init(dev, encoder, &intel_ddi_funcs,
-                         DRM_MODE_ENCODER_TMDS, NULL);
+                         DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));
 
         intel_encoder->compute_config = intel_ddi_compute_config;
         intel_encoder->enable = intel_enable_ddi;
+        if (IS_BROXTON(dev_priv))
+                intel_encoder->pre_pll_enable = bxt_ddi_pre_pll_enable;
         intel_encoder->pre_enable = intel_ddi_pre_enable;
         intel_encoder->disable = intel_disable_ddi;
         intel_encoder->post_disable = intel_ddi_post_disable;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2113f401f0ba..0b2cd669ac05 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -36,6 +36,7 @@
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
+#include "i915_gem_dmabuf.h"
 #include "intel_dsi.h"
 #include "i915_trace.h"
 #include <drm/drm_atomic.h>
@@ -46,7 +47,11 @@
 #include <drm/drm_rect.h>
 #include <linux/dma_remapping.h>
 #include <linux/reservation.h>
-#include <linux/dma-buf.h>
+
+static bool is_mmio_work(struct intel_flip_work *work)
+{
+        return work->mmio_work.func;
+}
 
 /* Primary plane formats for gen <= 3 */
 static const uint32_t i8xx_primary_formats[] = {
@@ -117,20 +122,18 @@ static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force);
 static void ironlake_pfit_enable(struct intel_crtc *crtc);
 static void intel_modeset_setup_hw_state(struct drm_device *dev);
 static void intel_pre_disable_primary_noatomic(struct drm_crtc *crtc);
+static int ilk_max_pixel_rate(struct drm_atomic_state *state);
+static int bxt_calc_cdclk(int max_pixclk);
 
-typedef struct {
-        int     min, max;
-} intel_range_t;
-
-typedef struct {
-        int     dot_limit;
-        int     p2_slow, p2_fast;
-} intel_p2_t;
-
-typedef struct intel_limit intel_limit_t;
 struct intel_limit {
-        intel_range_t   dot, vco, n, m, m1, m2, p, p1;
-        intel_p2_t          p2;
+        struct {
+                int min, max;
+        } dot, vco, n, m, m1, m2, p, p1;
+
+        struct {
+                int dot_limit;
+                int p2_slow, p2_fast;
+        } p2;
 };
 
 /* returns HPLL frequency in kHz */
@@ -185,6 +188,7 @@ intel_pch_rawclk(struct drm_i915_private *dev_priv)
 static int
 intel_vlv_hrawclk(struct drm_i915_private *dev_priv)
 {
+        /* RAWCLK_FREQ_VLV register updated from power well code */
         return vlv_get_cck_clock_hpll(dev_priv, "hrawclk",
                                       CCK_DISPLAY_REF_CLOCK_CONTROL);
 }
@@ -218,7 +222,7 @@ intel_g4x_hrawclk(struct drm_i915_private *dev_priv)
         }
 }
 
-static void intel_update_rawclk(struct drm_i915_private *dev_priv)
+void intel_update_rawclk(struct drm_i915_private *dev_priv)
 {
         if (HAS_PCH_SPLIT(dev_priv))
                 dev_priv->rawclk_freq = intel_pch_rawclk(dev_priv);
@@ -255,7 +259,7 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
                 return 270000;
 }
 
-static const intel_limit_t intel_limits_i8xx_dac = {
+static const struct intel_limit intel_limits_i8xx_dac = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 908000, .max = 1512000 },
         .n = { .min = 2, .max = 16 },
@@ -268,7 +272,7 @@ static const intel_limit_t intel_limits_i8xx_dac = {
                 .p2_slow = 4, .p2_fast = 2 },
 };
 
-static const intel_limit_t intel_limits_i8xx_dvo = {
+static const struct intel_limit intel_limits_i8xx_dvo = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 908000, .max = 1512000 },
         .n = { .min = 2, .max = 16 },
@@ -281,7 +285,7 @@ static const intel_limit_t intel_limits_i8xx_dvo = {
                 .p2_slow = 4, .p2_fast = 4 },
 };
 
-static const intel_limit_t intel_limits_i8xx_lvds = {
+static const struct intel_limit intel_limits_i8xx_lvds = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 908000, .max = 1512000 },
         .n = { .min = 2, .max = 16 },
@@ -294,7 +298,7 @@ static const intel_limit_t intel_limits_i8xx_lvds = {
                 .p2_slow = 14, .p2_fast = 7 },
 };
 
-static const intel_limit_t intel_limits_i9xx_sdvo = {
+static const struct intel_limit intel_limits_i9xx_sdvo = {
         .dot = { .min = 20000, .max = 400000 },
         .vco = { .min = 1400000, .max = 2800000 },
         .n = { .min = 1, .max = 6 },
@@ -307,7 +311,7 @@ static const intel_limit_t intel_limits_i9xx_sdvo = {
                 .p2_slow = 10, .p2_fast = 5 },
 };
 
-static const intel_limit_t intel_limits_i9xx_lvds = {
+static const struct intel_limit intel_limits_i9xx_lvds = {
         .dot = { .min = 20000, .max = 400000 },
         .vco = { .min = 1400000, .max = 2800000 },
         .n = { .min = 1, .max = 6 },
@@ -321,7 +325,7 @@ static const intel_limit_t intel_limits_i9xx_lvds = {
 };
 
 
-static const intel_limit_t intel_limits_g4x_sdvo = {
+static const struct intel_limit intel_limits_g4x_sdvo = {
         .dot = { .min = 25000, .max = 270000 },
         .vco = { .min = 1750000, .max = 3500000},
         .n = { .min = 1, .max = 4 },
@@ -336,7 +340,7 @@ static const intel_limit_t intel_limits_g4x_sdvo = {
         },
 };
 
-static const intel_limit_t intel_limits_g4x_hdmi = {
+static const struct intel_limit intel_limits_g4x_hdmi = {
         .dot = { .min = 22000, .max = 400000 },
         .vco = { .min = 1750000, .max = 3500000},
         .n = { .min = 1, .max = 4 },
@@ -349,7 +353,7 @@ static const intel_limit_t intel_limits_g4x_hdmi = {
                 .p2_slow = 10, .p2_fast = 5 },
 };
 
-static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
+static const struct intel_limit intel_limits_g4x_single_channel_lvds = {
         .dot = { .min = 20000, .max = 115000 },
         .vco = { .min = 1750000, .max = 3500000 },
         .n = { .min = 1, .max = 3 },
@@ -363,7 +367,7 @@ static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
         },
 };
 
-static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
+static const struct intel_limit intel_limits_g4x_dual_channel_lvds = {
         .dot = { .min = 80000, .max = 224000 },
         .vco = { .min = 1750000, .max = 3500000 },
         .n = { .min = 1, .max = 3 },
@@ -377,7 +381,7 @@ static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
         },
 };
 
-static const intel_limit_t intel_limits_pineview_sdvo = {
+static const struct intel_limit intel_limits_pineview_sdvo = {
         .dot = { .min = 20000, .max = 400000},
         .vco = { .min = 1700000, .max = 3500000 },
         /* Pineview's Ncounter is a ring counter */
@@ -392,7 +396,7 @@ static const intel_limit_t intel_limits_pineview_sdvo = {
                 .p2_slow = 10, .p2_fast = 5 },
 };
 
-static const intel_limit_t intel_limits_pineview_lvds = {
+static const struct intel_limit intel_limits_pineview_lvds = {
         .dot = { .min = 20000, .max = 400000 },
         .vco = { .min = 1700000, .max = 3500000 },
         .n = { .min = 3, .max = 6 },
@@ -410,7 +414,7 @@ static const intel_limit_t intel_limits_pineview_lvds = {
  * We calculate clock using (register_value + 2) for N/M1/M2, so here
  * the range value for them is (actual_value - 2).
  */
-static const intel_limit_t intel_limits_ironlake_dac = {
+static const struct intel_limit intel_limits_ironlake_dac = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 1760000, .max = 3510000 },
         .n = { .min = 1, .max = 5 },
@@ -423,7 +427,7 @@ static const intel_limit_t intel_limits_ironlake_dac = {
                 .p2_slow = 10, .p2_fast = 5 },
 };
 
-static const intel_limit_t intel_limits_ironlake_single_lvds = {
+static const struct intel_limit intel_limits_ironlake_single_lvds = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 1760000, .max = 3510000 },
         .n = { .min = 1, .max = 3 },
@@ -436,7 +440,7 @@ static const intel_limit_t intel_limits_ironlake_single_lvds = {
                 .p2_slow = 14, .p2_fast = 14 },
 };
 
-static const intel_limit_t intel_limits_ironlake_dual_lvds = {
+static const struct intel_limit intel_limits_ironlake_dual_lvds = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 1760000, .max = 3510000 },
         .n = { .min = 1, .max = 3 },
@@ -450,7 +454,7 @@ static const intel_limit_t intel_limits_ironlake_dual_lvds = {
 };
 
 /* LVDS 100mhz refclk limits. */
-static const intel_limit_t intel_limits_ironlake_single_lvds_100m = {
+static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 1760000, .max = 3510000 },
         .n = { .min = 1, .max = 2 },
@@ -463,7 +467,7 @@ static const intel_limit_t intel_limits_ironlake_single_lvds_100m = {
                 .p2_slow = 14, .p2_fast = 14 },
 };
 
-static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = {
+static const struct intel_limit intel_limits_ironlake_dual_lvds_100m = {
         .dot = { .min = 25000, .max = 350000 },
         .vco = { .min = 1760000, .max = 3510000 },
         .n = { .min = 1, .max = 3 },
@@ -476,7 +480,7 @@ static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = {
                 .p2_slow = 7, .p2_fast = 7 },
 };
 
-static const intel_limit_t intel_limits_vlv = {
+static const struct intel_limit intel_limits_vlv = {
          /*
           * These are the data rate limits (measured in fast clocks)
           * since those are the strictest limits we have. The fast
@@ -492,7 +496,7 @@ static const intel_limit_t intel_limits_vlv = {
         .p2 = { .p2_slow = 2, .p2_fast = 20 }, /* slow=min, fast=max */
 };
 
-static const intel_limit_t intel_limits_chv = {
+static const struct intel_limit intel_limits_chv = {
         /*
          * These are the data rate limits (measured in fast clocks)
          * since those are the strictest limits we have.  The fast
@@ -508,7 +512,7 @@ static const intel_limit_t intel_limits_chv = {
         .p2 = { .p2_slow = 1, .p2_fast = 14 },
 };
 
-static const intel_limit_t intel_limits_bxt = {
+static const struct intel_limit intel_limits_bxt = {
         /* FIXME: find real dot limits */
         .dot = { .min = 0, .max = INT_MAX },
         .vco = { .min = 4800000, .max = 6700000 },
@@ -581,7 +585,7 @@ static bool intel_pipe_will_have_type(const struct intel_crtc_state *crtc_state,
  * divided-down version of it.
  */
 /* m1 is reserved as 0 in Pineview, n is a ring counter */
-static int pnv_calc_dpll_params(int refclk, intel_clock_t *clock)
+static int pnv_calc_dpll_params(int refclk, struct dpll *clock)
 {
         clock->m = clock->m2 + 2;
         clock->p = clock->p1 * clock->p2;
@@ -598,7 +602,7 @@ static uint32_t i9xx_dpll_compute_m(struct dpll *dpll)
         return 5 * (dpll->m1 + 2) + (dpll->m2 + 2);
 }
 
-static int i9xx_calc_dpll_params(int refclk, intel_clock_t *clock)
+static int i9xx_calc_dpll_params(int refclk, struct dpll *clock)
 {
         clock->m = i9xx_dpll_compute_m(clock);
         clock->p = clock->p1 * clock->p2;
@@ -610,7 +614,7 @@ static int i9xx_calc_dpll_params(int refclk, intel_clock_t *clock)
         return clock->dot;
 }
 
-static int vlv_calc_dpll_params(int refclk, intel_clock_t *clock)
+static int vlv_calc_dpll_params(int refclk, struct dpll *clock)
 {
         clock->m = clock->m1 * clock->m2;
         clock->p = clock->p1 * clock->p2;
@@ -622,7 +626,7 @@ static int vlv_calc_dpll_params(int refclk, intel_clock_t *clock)
         return clock->dot / 5;
 }
 
-int chv_calc_dpll_params(int refclk, intel_clock_t *clock)
+int chv_calc_dpll_params(int refclk, struct dpll *clock)
 {
         clock->m = clock->m1 * clock->m2;
         clock->p = clock->p1 * clock->p2;
@@ -642,8 +646,8 @@ int chv_calc_dpll_params(int refclk, intel_clock_t *clock)
  */
 
 static bool intel_PLL_is_valid(struct drm_device *dev,
-                               const intel_limit_t *limit,
-                               const intel_clock_t *clock)
+                               const struct intel_limit *limit,
+                               const struct dpll *clock)
 {
         if (clock->n   < limit->n.min   || limit->n.max   < clock->n)
                 INTELPllInvalid("n out of range\n");
@@ -678,7 +682,7 @@ static bool intel_PLL_is_valid(struct drm_device *dev,
 }
 
 static int
-i9xx_select_p2_div(const intel_limit_t *limit,
+i9xx_select_p2_div(const struct intel_limit *limit,
                    const struct intel_crtc_state *crtc_state,
                    int target)
 {
@@ -713,13 +717,13 @@ i9xx_select_p2_div(const intel_limit_t *limit,
  * divider from @match_clock used for LVDS downclocking.
  */
 static bool
-i9xx_find_best_dpll(const intel_limit_t *limit,
+i9xx_find_best_dpll(const struct intel_limit *limit,
                     struct intel_crtc_state *crtc_state,
-                    int target, int refclk, intel_clock_t *match_clock,
-                    intel_clock_t *best_clock)
+                    int target, int refclk, struct dpll *match_clock,
+                    struct dpll *best_clock)
 {
         struct drm_device *dev = crtc_state->base.crtc->dev;
-        intel_clock_t clock;
+        struct dpll clock;
         int err = target;
 
         memset(best_clock, 0, sizeof(*best_clock));
@@ -770,13 +774,13 @@ i9xx_find_best_dpll(const intel_limit_t *limit,
  * divider from @match_clock used for LVDS downclocking.
  */
 static bool
-pnv_find_best_dpll(const intel_limit_t *limit,
+pnv_find_best_dpll(const struct intel_limit *limit,
                    struct intel_crtc_state *crtc_state,
-                   int target, int refclk, intel_clock_t *match_clock,
-                   intel_clock_t *best_clock)
+                   int target, int refclk, struct dpll *match_clock,
+                   struct dpll *best_clock)
 {
         struct drm_device *dev = crtc_state->base.crtc->dev;
-        intel_clock_t clock;
+        struct dpll clock;
         int err = target;
 
         memset(best_clock, 0, sizeof(*best_clock));
@@ -825,13 +829,13 @@ pnv_find_best_dpll(const intel_limit_t *limit,
  * divider from @match_clock used for LVDS downclocking.
  */
 static bool
-g4x_find_best_dpll(const intel_limit_t *limit,
+g4x_find_best_dpll(const struct intel_limit *limit,
                    struct intel_crtc_state *crtc_state,
-                   int target, int refclk, intel_clock_t *match_clock,
-                   intel_clock_t *best_clock)
+                   int target, int refclk, struct dpll *match_clock,
+                   struct dpll *best_clock)
 {
         struct drm_device *dev = crtc_state->base.crtc->dev;
-        intel_clock_t clock;
+        struct dpll clock;
         int max_n;
         bool found = false;
         /* approximately equals target * 0.00585 */
@@ -877,8 +881,8 @@ g4x_find_best_dpll(const intel_limit_t *limit,
  * best configuration and error found so far. Return the calculated error.
  */
 static bool vlv_PLL_is_optimal(struct drm_device *dev, int target_freq,
-                               const intel_clock_t *calculated_clock,
-                               const intel_clock_t *best_clock,
+                               const struct dpll *calculated_clock,
+                               const struct dpll *best_clock,
                                unsigned int best_error_ppm,
                                unsigned int *error_ppm)
 {
@@ -918,14 +922,14 @@ static bool vlv_PLL_is_optimal(struct drm_device *dev, int target_freq,
  * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2.
  */
 static bool
-vlv_find_best_dpll(const intel_limit_t *limit,
+vlv_find_best_dpll(const struct intel_limit *limit,
                    struct intel_crtc_state *crtc_state,
-                   int target, int refclk, intel_clock_t *match_clock,
-                   intel_clock_t *best_clock)
+                   int target, int refclk, struct dpll *match_clock,
+                   struct dpll *best_clock)
 {
         struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
         struct drm_device *dev = crtc->base.dev;
-        intel_clock_t clock;
+        struct dpll clock;
         unsigned int bestppm = 1000000;
         /* min update 19.2 MHz */
         int max_n = min(limit->n.max, refclk / 19200);
@@ -977,15 +981,15 @@ vlv_find_best_dpll(const intel_limit_t *limit,
  * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2.
  */
 static bool
-chv_find_best_dpll(const intel_limit_t *limit,
+chv_find_best_dpll(const struct intel_limit *limit,
                    struct intel_crtc_state *crtc_state,
-                   int target, int refclk, intel_clock_t *match_clock,
-                   intel_clock_t *best_clock)
+                   int target, int refclk, struct dpll *match_clock,
+                   struct dpll *best_clock)
 {
         struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
         struct drm_device *dev = crtc->base.dev;
         unsigned int best_error_ppm;
-        intel_clock_t clock;
+        struct dpll clock;
         uint64_t m2;
         int found = false;
 
@@ -1035,10 +1039,10 @@ chv_find_best_dpll(const intel_limit_t *limit,
 }
 
 bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock,
-                        intel_clock_t *best_clock)
+                        struct dpll *best_clock)
 {
         int refclk = 100000;
-        const intel_limit_t *limit = &intel_limits_bxt;
+        const struct intel_limit *limit = &intel_limits_bxt;
 
         return chv_find_best_dpll(limit, crtc_state,
                                   target_clock, refclk, NULL, best_clock);
@@ -1203,7 +1207,7 @@ static void assert_fdi_tx_pll_enabled(struct drm_i915_private *dev_priv,
         u32 val;
 
         /* ILK FDI PLL is always enabled */
-        if (INTEL_INFO(dev_priv)->gen == 5)
+        if (IS_GEN5(dev_priv))
                 return;
 
         /* On Haswell, DDI ports are responsible for the FDI PLL setup */
@@ -2309,7 +2313,7 @@ err_pm:
         return ret;
 }
 
-static void intel_unpin_fb_obj(struct drm_framebuffer *fb, unsigned int rotation)
+void intel_unpin_fb_obj(struct drm_framebuffer *fb, unsigned int rotation)
 {
         struct drm_i915_gem_object *obj = intel_fb_obj(fb);
         struct i915_ggtt_view view;
@@ -3110,17 +3114,12 @@ intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,
         return -ENODEV;
 }
 
-static void intel_complete_page_flips(struct drm_device *dev)
+static void intel_complete_page_flips(struct drm_i915_private *dev_priv)
 {
-        struct drm_crtc *crtc;
-
-        for_each_crtc(dev, crtc) {
-                struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-                enum plane plane = intel_crtc->plane;
+        struct intel_crtc *crtc;
 
-                intel_prepare_page_flip(dev, plane);
-                intel_finish_page_flip_plane(dev, plane);
-        }
+        for_each_intel_crtc(dev_priv->dev, crtc)
+                intel_finish_page_flip_cs(dev_priv, crtc->pipe);
 }
 
 static void intel_update_primary_planes(struct drm_device *dev)
@@ -3143,41 +3142,39 @@ static void intel_update_primary_planes(struct drm_device *dev)
         }
 }
 
-void intel_prepare_reset(struct drm_device *dev)
+void intel_prepare_reset(struct drm_i915_private *dev_priv)
 {
         /* no reset support for gen2 */
-        if (IS_GEN2(dev))
+        if (IS_GEN2(dev_priv))
                 return;
 
         /* reset doesn't touch the display */
-        if (INTEL_INFO(dev)->gen >= 5 || IS_G4X(dev))
+        if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
                 return;
 
-        drm_modeset_lock_all(dev);
+        drm_modeset_lock_all(dev_priv->dev);
         /*
          * Disabling the crtcs gracefully seems nicer. Also the
          * g33 docs say we should at least disable all the planes.
          */
-        intel_display_suspend(dev);
+        intel_display_suspend(dev_priv->dev);
 }
 
-void intel_finish_reset(struct drm_device *dev)
+void intel_finish_reset(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
-
         /*
          * Flips in the rings will be nuked by the reset,
          * so complete all pending flips so that user space
          * will get its events and not get stuck.
          */
-        intel_complete_page_flips(dev);
+        intel_complete_page_flips(dev_priv);
 
         /* no reset support for gen2 */
-        if (IS_GEN2(dev))
+        if (IS_GEN2(dev_priv))
                 return;
 
         /* reset doesn't touch the display */
-        if (INTEL_INFO(dev)->gen >= 5 || IS_G4X(dev)) {
+        if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv)) {
                 /*
                  * Flips in the rings have been nuked by the reset,
                  * so update the base address of all primary
@@ -3187,7 +3184,7 @@ void intel_finish_reset(struct drm_device *dev)
                  * FIXME: Atomic will make this obsolete since we won't schedule
                  * CS-based flips (which might get lost in gpu resets) any more.
                  */
-                intel_update_primary_planes(dev);
+                intel_update_primary_planes(dev_priv->dev);
                 return;
         }
 
@@ -3198,18 +3195,18 @@ void intel_finish_reset(struct drm_device *dev)
         intel_runtime_pm_disable_interrupts(dev_priv);
         intel_runtime_pm_enable_interrupts(dev_priv);
 
-        intel_modeset_init_hw(dev);
+        intel_modeset_init_hw(dev_priv->dev);
 
         spin_lock_irq(&dev_priv->irq_lock);
         if (dev_priv->display.hpd_irq_setup)
-                dev_priv->display.hpd_irq_setup(dev);
+                dev_priv->display.hpd_irq_setup(dev_priv);
         spin_unlock_irq(&dev_priv->irq_lock);
 
-        intel_display_resume(dev);
+        intel_display_resume(dev_priv->dev);
 
         intel_hpd_init(dev_priv);
 
-        drm_modeset_unlock_all(dev);
+        drm_modeset_unlock_all(dev_priv->dev);
 }
 
 static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc)
@@ -3224,7 +3221,7 @@ static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc)
                 return false;
 
         spin_lock_irq(&dev->event_lock);
-        pending = to_intel_crtc(crtc)->unpin_work != NULL;
+        pending = to_intel_crtc(crtc)->flip_work != NULL;
         spin_unlock_irq(&dev->event_lock);
 
         return pending;
@@ -3803,7 +3800,7 @@ bool intel_has_pending_fb_unpin(struct drm_device *dev)
                 if (atomic_read(&crtc->unpin_work_count) == 0)
                         continue;
 
-                if (crtc->unpin_work)
+                if (crtc->flip_work)
                         intel_wait_for_vblank(dev, crtc->pipe);
 
                 return true;
@@ -3815,11 +3812,9 @@ bool intel_has_pending_fb_unpin(struct drm_device *dev)
 static void page_flip_completed(struct intel_crtc *intel_crtc)
 {
         struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
-        struct intel_unpin_work *work = intel_crtc->unpin_work;
+        struct intel_flip_work *work = intel_crtc->flip_work;
 
-        /* ensure that the unpin work is consistent wrt ->pending. */
-        smp_rmb();
-        intel_crtc->unpin_work = NULL;
+        intel_crtc->flip_work = NULL;
 
         if (work->event)
                 drm_crtc_send_vblank_event(&intel_crtc->base, work->event);
@@ -3827,7 +3822,7 @@ static void page_flip_completed(struct intel_crtc *intel_crtc)
         drm_crtc_vblank_put(&intel_crtc->base);
 
         wake_up_all(&dev_priv->pending_flip_queue);
-        queue_work(dev_priv->wq, &work->work);
+        queue_work(dev_priv->wq, &work->unpin_work);
 
         trace_i915_flip_complete(intel_crtc->plane,
                                  work->pending_flip_obj);
@@ -3851,9 +3846,11 @@ static int intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
 
         if (ret == 0) {
                 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+                struct intel_flip_work *work;
 
                 spin_lock_irq(&dev->event_lock);
-                if (intel_crtc->unpin_work) {
+                work = intel_crtc->flip_work;
+                if (work && !is_mmio_work(work)) {
                         WARN_ONCE(1, "Removing stuck page flip\n");
                         page_flip_completed(intel_crtc);
                 }
@@ -4281,8 +4278,9 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)
         struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc);
         const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;
 
-        DRM_DEBUG_KMS("Updating scaler for [CRTC:%i] scaler_user index %u.%u\n",
-                      intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX);
+        DRM_DEBUG_KMS("Updating scaler for [CRTC:%d:%s] scaler_user index %u.%u\n",
+                      intel_crtc->base.base.id, intel_crtc->base.name,
+                      intel_crtc->pipe, SKL_CRTC_INDEX);
 
         return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,
                 &state->scaler_state.scaler_id, BIT(DRM_ROTATE_0),
@@ -4312,9 +4310,9 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
 
         bool force_detach = !fb || !plane_state->visible;
 
-        DRM_DEBUG_KMS("Updating scaler for [PLANE:%d] scaler_user index %u.%u\n",
-                      intel_plane->base.base.id, intel_crtc->pipe,
-                      drm_plane_index(&intel_plane->base));
+        DRM_DEBUG_KMS("Updating scaler for [PLANE:%d:%s] scaler_user index %u.%u\n",
+                      intel_plane->base.base.id, intel_plane->base.name,
+                      intel_crtc->pipe, drm_plane_index(&intel_plane->base));
 
         ret = skl_update_scaler(crtc_state, force_detach,
                                 drm_plane_index(&intel_plane->base),
@@ -4330,8 +4328,9 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
 
         /* check colorkey */
         if (plane_state->ckey.flags != I915_SET_COLORKEY_NONE) {
-                DRM_DEBUG_KMS("[PLANE:%d] scaling with color key not allowed",
-                              intel_plane->base.base.id);
+                DRM_DEBUG_KMS("[PLANE:%d:%s] scaling with color key not allowed",
+                              intel_plane->base.base.id,
+                              intel_plane->base.name);
                 return -EINVAL;
         }
 
@@ -4350,8 +4349,9 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
         case DRM_FORMAT_VYUY:
                 break;
         default:
-                DRM_DEBUG_KMS("[PLANE:%d] FB:%d unsupported scaling format 0x%x\n",
-                        intel_plane->base.base.id, fb->base.id, fb->pixel_format);
+                DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
+                              intel_plane->base.base.id, intel_plane->base.name,
+                              fb->base.id, fb->pixel_format);
                 return -EINVAL;
         }
 
@@ -4641,14 +4641,14 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)
                 struct intel_plane_state *old_primary_state =
                         to_intel_plane_state(old_pri_state);
 
-                intel_fbc_pre_update(crtc);
+                intel_fbc_pre_update(crtc, pipe_config, primary_state);
 
                 if (old_primary_state->visible &&
                     (modeset || !primary_state->visible))
                         intel_pre_disable_primary(&crtc->base);
         }
 
-        if (pipe_config->disable_cxsr) {
+        if (pipe_config->disable_cxsr && HAS_GMCH_DISPLAY(dev)) {
                 crtc->wm.cxsr_allowed = false;
 
                 /*
@@ -4841,6 +4841,10 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
                 intel_set_pch_fifo_underrun_reporting(dev_priv, TRANSCODER_A,
                                                       false);
 
+        for_each_encoder_on_crtc(dev, crtc, encoder)
+                if (encoder->pre_pll_enable)
+                        encoder->pre_pll_enable(encoder);
+
         if (intel_crtc->config->shared_dpll)
                 intel_enable_shared_dpll(intel_crtc);
 
@@ -5269,21 +5273,34 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv)
                 return max_cdclk_freq*90/100;
 }
 
+static int skl_calc_cdclk(int max_pixclk, int vco);
+
 static void intel_update_max_cdclk(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
                 u32 limit = I915_READ(SKL_DFSM) & SKL_DFSM_CDCLK_LIMIT_MASK;
+                int max_cdclk, vco;
 
+                vco = dev_priv->skl_preferred_vco_freq;
+                WARN_ON(vco != 8100000 && vco != 8640000);
+
+                /*
+                 * Use the lower (vco 8640) cdclk values as a
+                 * first guess. skl_calc_cdclk() will correct it
+                 * if the preferred vco is 8100 instead.
+                 */
                 if (limit == SKL_DFSM_CDCLK_LIMIT_675)
-                        dev_priv->max_cdclk_freq = 675000;
+                        max_cdclk = 617143;
                 else if (limit == SKL_DFSM_CDCLK_LIMIT_540)
-                        dev_priv->max_cdclk_freq = 540000;
+                        max_cdclk = 540000;
                 else if (limit == SKL_DFSM_CDCLK_LIMIT_450)
-                        dev_priv->max_cdclk_freq = 450000;
+                        max_cdclk = 432000;
                 else
-                        dev_priv->max_cdclk_freq = 337500;
+                        max_cdclk = 308571;
+
+                dev_priv->max_cdclk_freq = skl_calc_cdclk(max_cdclk, vco);
         } else if (IS_BROXTON(dev)) {
                 dev_priv->max_cdclk_freq = 624000;
         } else if (IS_BROADWELL(dev))  {
@@ -5324,264 +5341,313 @@ static void intel_update_cdclk(struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         dev_priv->cdclk_freq = dev_priv->display.get_display_clock_speed(dev);
-        DRM_DEBUG_DRIVER("Current CD clock rate: %d kHz\n",
-                         dev_priv->cdclk_freq);
+
+        if (INTEL_GEN(dev_priv) >= 9)
+                DRM_DEBUG_DRIVER("Current CD clock rate: %d kHz, VCO: %d kHz, ref: %d kHz\n",
+                                 dev_priv->cdclk_freq, dev_priv->cdclk_pll.vco,
+                                 dev_priv->cdclk_pll.ref);
+        else
+                DRM_DEBUG_DRIVER("Current CD clock rate: %d kHz\n",
+                                 dev_priv->cdclk_freq);
 
         /*
-         * Program the gmbus_freq based on the cdclk frequency.
-         * BSpec erroneously claims we should aim for 4MHz, but
-         * in fact 1MHz is the correct frequency.
+         * 9:0 CMBUS [sic] CDCLK frequency (cdfreq):
+         * Programmng [sic] note: bit[9:2] should be programmed to the number
+         * of cdclk that generates 4MHz reference clock freq which is used to
+         * generate GMBus clock. This will vary with the cdclk freq.
          */
-        if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
-                /*
-                 * Program the gmbus_freq based on the cdclk frequency.
-                 * BSpec erroneously claims we should aim for 4MHz, but
-                 * in fact 1MHz is the correct frequency.
-                 */
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
                 I915_WRITE(GMBUSFREQ_VLV, DIV_ROUND_UP(dev_priv->cdclk_freq, 1000));
-        }
+}
 
-        if (dev_priv->max_cdclk_freq == 0)
-                intel_update_max_cdclk(dev);
+/* convert from kHz to .1 fixpoint MHz with -1MHz offset */
+static int skl_cdclk_decimal(int cdclk)
+{
+        return DIV_ROUND_CLOSEST(cdclk - 1000, 500);
 }
 
-static void broxton_set_cdclk(struct drm_i915_private *dev_priv, int frequency)
+static int bxt_de_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
 {
-        uint32_t divider;
-        uint32_t ratio;
-        uint32_t current_freq;
-        int ret;
+        int ratio;
+
+        if (cdclk == dev_priv->cdclk_pll.ref)
+                return 0;
 
-        /* frequency = 19.2MHz * ratio / 2 / div{1,1.5,2,4} */
-        switch (frequency) {
+        switch (cdclk) {
+        default:
+                MISSING_CASE(cdclk);
         case 144000:
+        case 288000:
+        case 384000:
+        case 576000:
+                ratio = 60;
+                break;
+        case 624000:
+                ratio = 65;
+                break;
+        }
+
+        return dev_priv->cdclk_pll.ref * ratio;
+}
+
+static void bxt_de_pll_disable(struct drm_i915_private *dev_priv)
+{
+        I915_WRITE(BXT_DE_PLL_ENABLE, 0);
+
+        /* Timeout 200us */
+        if (wait_for((I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_LOCK) == 0, 1))
+                DRM_ERROR("timeout waiting for DE PLL unlock\n");
+
+        dev_priv->cdclk_pll.vco = 0;
+}
+
+static void bxt_de_pll_enable(struct drm_i915_private *dev_priv, int vco)
+{
+        int ratio = DIV_ROUND_CLOSEST(vco, dev_priv->cdclk_pll.ref);
+        u32 val;
+
+        val = I915_READ(BXT_DE_PLL_CTL);
+        val &= ~BXT_DE_PLL_RATIO_MASK;
+        val |= BXT_DE_PLL_RATIO(ratio);
+        I915_WRITE(BXT_DE_PLL_CTL, val);
+
+        I915_WRITE(BXT_DE_PLL_ENABLE, BXT_DE_PLL_PLL_ENABLE);
+
+        /* Timeout 200us */
+        if (wait_for((I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_LOCK) != 0, 1))
+                DRM_ERROR("timeout waiting for DE PLL lock\n");
+
+        dev_priv->cdclk_pll.vco = vco;
+}
+
+static void bxt_set_cdclk(struct drm_i915_private *dev_priv, int cdclk)
+{
+        u32 val, divider;
+        int vco, ret;
+
+        vco = bxt_de_pll_vco(dev_priv, cdclk);
+
+        DRM_DEBUG_DRIVER("Changing CDCLK to %d kHz (VCO %d kHz)\n", cdclk, vco);
+
+        /* cdclk = vco / 2 / div{1,1.5,2,4} */
+        switch (DIV_ROUND_CLOSEST(vco, cdclk)) {
+        case 8:
                 divider = BXT_CDCLK_CD2X_DIV_SEL_4;
-                ratio = BXT_DE_PLL_RATIO(60);
                 break;
-        case 288000:
+        case 4:
                 divider = BXT_CDCLK_CD2X_DIV_SEL_2;
-                ratio = BXT_DE_PLL_RATIO(60);
                 break;
-        case 384000:
+        case 3:
                 divider = BXT_CDCLK_CD2X_DIV_SEL_1_5;
-                ratio = BXT_DE_PLL_RATIO(60);
                 break;
-        case 576000:
-                divider = BXT_CDCLK_CD2X_DIV_SEL_1;
-                ratio = BXT_DE_PLL_RATIO(60);
-                break;
-        case 624000:
+        case 2:
                 divider = BXT_CDCLK_CD2X_DIV_SEL_1;
-                ratio = BXT_DE_PLL_RATIO(65);
-                break;
-        case 19200:
-                /*
-                 * Bypass frequency with DE PLL disabled. Init ratio, divider
-                 * to suppress GCC warning.
-                 */
-                ratio = 0;
-                divider = 0;
                 break;
         default:
-                DRM_ERROR("unsupported CDCLK freq %d", frequency);
+                WARN_ON(cdclk != dev_priv->cdclk_pll.ref);
+                WARN_ON(vco != 0);
 
-                return;
+                divider = BXT_CDCLK_CD2X_DIV_SEL_1;
+                break;
         }
 
-        mutex_lock(&dev_priv->rps.hw_lock);
         /* Inform power controller of upcoming frequency change */
+        mutex_lock(&dev_priv->rps.hw_lock);
         ret = sandybridge_pcode_write(dev_priv, HSW_PCODE_DE_WRITE_FREQ_REQ,
                                       0x80000000);
         mutex_unlock(&dev_priv->rps.hw_lock);
 
         if (ret) {
                 DRM_ERROR("PCode CDCLK freq change notify failed (err %d, freq %d)\n",
-                          ret, frequency);
+                          ret, cdclk);
                 return;
         }
 
-        current_freq = I915_READ(CDCLK_CTL) & CDCLK_FREQ_DECIMAL_MASK;
-        /* convert from .1 fixpoint MHz with -1MHz offset to kHz */
-        current_freq = current_freq * 500 + 1000;
+        if (dev_priv->cdclk_pll.vco != 0 &&
+            dev_priv->cdclk_pll.vco != vco)
+                bxt_de_pll_disable(dev_priv);
 
-        /*
-         * DE PLL has to be disabled when
-         * - setting to 19.2MHz (bypass, PLL isn't used)
-         * - before setting to 624MHz (PLL needs toggling)
-         * - before setting to any frequency from 624MHz (PLL needs toggling)
-         */
-        if (frequency == 19200 || frequency == 624000 ||
-            current_freq == 624000) {
-                I915_WRITE(BXT_DE_PLL_ENABLE, ~BXT_DE_PLL_PLL_ENABLE);
-                /* Timeout 200us */
-                if (wait_for(!(I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_LOCK),
-                             1))
-                        DRM_ERROR("timout waiting for DE PLL unlock\n");
-        }
-
-        if (frequency != 19200) {
-                uint32_t val;
-
-                val = I915_READ(BXT_DE_PLL_CTL);
-                val &= ~BXT_DE_PLL_RATIO_MASK;
-                val |= ratio;
-                I915_WRITE(BXT_DE_PLL_CTL, val);
-
-                I915_WRITE(BXT_DE_PLL_ENABLE, BXT_DE_PLL_PLL_ENABLE);
-                /* Timeout 200us */
-                if (wait_for(I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_LOCK, 1))
-                        DRM_ERROR("timeout waiting for DE PLL lock\n");
-
-                val = I915_READ(CDCLK_CTL);
-                val &= ~BXT_CDCLK_CD2X_DIV_SEL_MASK;
-                val |= divider;
-                /*
-                 * Disable SSA Precharge when CD clock frequency < 500 MHz,
-                 * enable otherwise.
-                 */
-                val &= ~BXT_CDCLK_SSA_PRECHARGE_ENABLE;
-                if (frequency >= 500000)
-                        val |= BXT_CDCLK_SSA_PRECHARGE_ENABLE;
+        if (dev_priv->cdclk_pll.vco != vco)
+                bxt_de_pll_enable(dev_priv, vco);
 
-                val &= ~CDCLK_FREQ_DECIMAL_MASK;
-                /* convert from kHz to .1 fixpoint MHz with -1MHz offset */
-                val |= (frequency - 1000) / 500;
-                I915_WRITE(CDCLK_CTL, val);
-        }
+        val = divider | skl_cdclk_decimal(cdclk);
+        /*
+         * FIXME if only the cd2x divider needs changing, it could be done
+         * without shutting off the pipe (if only one pipe is active).
+         */
+        val |= BXT_CDCLK_CD2X_PIPE_NONE;
+        /*
+         * Disable SSA Precharge when CD clock frequency < 500 MHz,
+         * enable otherwise.
+         */
+        if (cdclk >= 500000)
+                val |= BXT_CDCLK_SSA_PRECHARGE_ENABLE;
+        I915_WRITE(CDCLK_CTL, val);
 
         mutex_lock(&dev_priv->rps.hw_lock);
         ret = sandybridge_pcode_write(dev_priv, HSW_PCODE_DE_WRITE_FREQ_REQ,
-                                      DIV_ROUND_UP(frequency, 25000));
+                                      DIV_ROUND_UP(cdclk, 25000));
         mutex_unlock(&dev_priv->rps.hw_lock);
 
         if (ret) {
                 DRM_ERROR("PCode CDCLK freq set failed, (err %d, freq %d)\n",
-                          ret, frequency);
+                          ret, cdclk);
                 return;
         }
 
         intel_update_cdclk(dev_priv->dev);
 }
 
-static bool broxton_cdclk_is_enabled(struct drm_i915_private *dev_priv)
+static void bxt_sanitize_cdclk(struct drm_i915_private *dev_priv)
 {
-        if (!(I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_PLL_ENABLE))
-                return false;
+        u32 cdctl, expected;
 
-        /* TODO: Check for a valid CDCLK rate */
+        intel_update_cdclk(dev_priv->dev);
 
-        if (!(I915_READ(DBUF_CTL) & DBUF_POWER_REQUEST)) {
-                DRM_DEBUG_DRIVER("CDCLK enabled, but DBUF power not requested\n");
+        if (dev_priv->cdclk_pll.vco == 0 ||
+            dev_priv->cdclk_freq == dev_priv->cdclk_pll.ref)
+                goto sanitize;
 
-                return false;
-        }
+        /* DPLL okay; verify the cdclock
+         *
+         * Some BIOS versions leave an incorrect decimal frequency value and
+         * set reserved MBZ bits in CDCLK_CTL at least during exiting from S4,
+         * so sanitize this register.
+         */
+        cdctl = I915_READ(CDCLK_CTL);
+        /*
+         * Let's ignore the pipe field, since BIOS could have configured the
+         * dividers both synching to an active pipe, or asynchronously
+         * (PIPE_NONE).
+         */
+        cdctl &= ~BXT_CDCLK_CD2X_PIPE_NONE;
 
-        if (!(I915_READ(DBUF_CTL) & DBUF_POWER_STATE)) {
-                DRM_DEBUG_DRIVER("CDCLK enabled, but DBUF power hasn't settled\n");
+        expected = (cdctl & BXT_CDCLK_CD2X_DIV_SEL_MASK) |
+                   skl_cdclk_decimal(dev_priv->cdclk_freq);
+        /*
+         * Disable SSA Precharge when CD clock frequency < 500 MHz,
+         * enable otherwise.
+         */
+        if (dev_priv->cdclk_freq >= 500000)
+                expected |= BXT_CDCLK_SSA_PRECHARGE_ENABLE;
 
-                return false;
-        }
+        if (cdctl == expected)
+                /* All well; nothing to sanitize */
+                return;
 
-        return true;
-}
+sanitize:
+        DRM_DEBUG_KMS("Sanitizing cdclk programmed by pre-os\n");
 
-bool broxton_cdclk_verify_state(struct drm_i915_private *dev_priv)
-{
-        return broxton_cdclk_is_enabled(dev_priv);
+        /* force cdclk programming */
+        dev_priv->cdclk_freq = 0;
+
+        /* force full PLL disable + enable */
+        dev_priv->cdclk_pll.vco = -1;
 }
 
-void broxton_init_cdclk(struct drm_i915_private *dev_priv)
+void bxt_init_cdclk(struct drm_i915_private *dev_priv)
 {
-        /* check if cd clock is enabled */
-        if (broxton_cdclk_is_enabled(dev_priv)) {
-                DRM_DEBUG_KMS("CDCLK already enabled, won't reprogram it\n");
-                return;
-        }
+        bxt_sanitize_cdclk(dev_priv);
 
-        DRM_DEBUG_KMS("CDCLK not enabled, enabling it\n");
+        if (dev_priv->cdclk_freq != 0 && dev_priv->cdclk_pll.vco != 0)
+                return;
 
         /*
          * FIXME:
          * - The initial CDCLK needs to be read from VBT.
          *   Need to make this change after VBT has changes for BXT.
-         * - check if setting the max (or any) cdclk freq is really necessary
-         *   here, it belongs to modeset time
          */
-        broxton_set_cdclk(dev_priv, 624000);
-
-        I915_WRITE(DBUF_CTL, I915_READ(DBUF_CTL) | DBUF_POWER_REQUEST);
-        POSTING_READ(DBUF_CTL);
+        bxt_set_cdclk(dev_priv, bxt_calc_cdclk(0));
+}
 
-        udelay(10);
+void bxt_uninit_cdclk(struct drm_i915_private *dev_priv)
+{
+        bxt_set_cdclk(dev_priv, dev_priv->cdclk_pll.ref);
+}
 
-        if (!(I915_READ(DBUF_CTL) & DBUF_POWER_STATE))
-                DRM_ERROR("DBuf power enable timeout!\n");
+static int skl_calc_cdclk(int max_pixclk, int vco)
+{
+        if (vco == 8640000) {
+                if (max_pixclk > 540000)
+                        return 617143;
+                else if (max_pixclk > 432000)
+                        return 540000;
+                else if (max_pixclk > 308571)
+                        return 432000;
+                else
+                        return 308571;
+        } else {
+                if (max_pixclk > 540000)
+                        return 675000;
+                else if (max_pixclk > 450000)
+                        return 540000;
+                else if (max_pixclk > 337500)
+                        return 450000;
+                else
+                        return 337500;
+        }
 }
 
-void broxton_uninit_cdclk(struct drm_i915_private *dev_priv)
+static void
+skl_dpll0_update(struct drm_i915_private *dev_priv)
 {
-        I915_WRITE(DBUF_CTL, I915_READ(DBUF_CTL) & ~DBUF_POWER_REQUEST);
-        POSTING_READ(DBUF_CTL);
+        u32 val;
 
-        udelay(10);
+        dev_priv->cdclk_pll.ref = 24000;
+        dev_priv->cdclk_pll.vco = 0;
 
-        if (I915_READ(DBUF_CTL) & DBUF_POWER_STATE)
-                DRM_ERROR("DBuf power disable timeout!\n");
+        val = I915_READ(LCPLL1_CTL);
+        if ((val & LCPLL_PLL_ENABLE) == 0)
+                return;
 
-        /* Set minimum (bypass) frequency, in effect turning off the DE PLL */
-        broxton_set_cdclk(dev_priv, 19200);
-}
+        if (WARN_ON((val & LCPLL_PLL_LOCK) == 0))
+                return;
 
-static const struct skl_cdclk_entry {
-        unsigned int freq;
-        unsigned int vco;
-} skl_cdclk_frequencies[] = {
-        { .freq = 308570, .vco = 8640 },
-        { .freq = 337500, .vco = 8100 },
-        { .freq = 432000, .vco = 8640 },
-        { .freq = 450000, .vco = 8100 },
-        { .freq = 540000, .vco = 8100 },
-        { .freq = 617140, .vco = 8640 },
-        { .freq = 675000, .vco = 8100 },
-};
+        val = I915_READ(DPLL_CTRL1);
 
-static unsigned int skl_cdclk_decimal(unsigned int freq)
-{
-        return (freq - 1000) / 500;
+        if (WARN_ON((val & (DPLL_CTRL1_HDMI_MODE(SKL_DPLL0) |
+                            DPLL_CTRL1_SSC(SKL_DPLL0) |
+                            DPLL_CTRL1_OVERRIDE(SKL_DPLL0))) !=
+                    DPLL_CTRL1_OVERRIDE(SKL_DPLL0)))
+                return;
+
+        switch (val & DPLL_CTRL1_LINK_RATE_MASK(SKL_DPLL0)) {
+        case DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_810, SKL_DPLL0):
+        case DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1350, SKL_DPLL0):
+        case DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1620, SKL_DPLL0):
+        case DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_2700, SKL_DPLL0):
+                dev_priv->cdclk_pll.vco = 8100000;
+                break;
+        case DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1080, SKL_DPLL0):
+        case DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_2160, SKL_DPLL0):
+                dev_priv->cdclk_pll.vco = 8640000;
+                break;
+        default:
+                MISSING_CASE(val & DPLL_CTRL1_LINK_RATE_MASK(SKL_DPLL0));
+                break;
+        }
 }
 
-static unsigned int skl_cdclk_get_vco(unsigned int freq)
+void skl_set_preferred_cdclk_vco(struct drm_i915_private *dev_priv, int vco)
 {
-        unsigned int i;
-
-        for (i = 0; i < ARRAY_SIZE(skl_cdclk_frequencies); i++) {
-                const struct skl_cdclk_entry *e = &skl_cdclk_frequencies[i];
+        bool changed = dev_priv->skl_preferred_vco_freq != vco;
 
-                if (e->freq == freq)
-                        return e->vco;
-        }
+        dev_priv->skl_preferred_vco_freq = vco;
 
-        return 8100;
+        if (changed)
+                intel_update_max_cdclk(dev_priv->dev);
 }
 
 static void
-skl_dpll0_enable(struct drm_i915_private *dev_priv, unsigned int required_vco)
+skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco)
 {
-        unsigned int min_freq;
+        int min_cdclk = skl_calc_cdclk(0, vco);
         u32 val;
 
-        /* select the minimum CDCLK before enabling DPLL 0 */
-        val = I915_READ(CDCLK_CTL);
-        val &= ~CDCLK_FREQ_SEL_MASK | ~CDCLK_FREQ_DECIMAL_MASK;
-        val |= CDCLK_FREQ_337_308;
-
-        if (required_vco == 8640)
-                min_freq = 308570;
-        else
-                min_freq = 337500;
-
-        val = CDCLK_FREQ_337_308 | skl_cdclk_decimal(min_freq);
+        WARN_ON(vco != 8100000 && vco != 8640000);
 
+        /* select the minimum CDCLK before enabling DPLL 0 */
+        val = CDCLK_FREQ_337_308 | skl_cdclk_decimal(min_cdclk);
         I915_WRITE(CDCLK_CTL, val);
         POSTING_READ(CDCLK_CTL);
 
@@ -5592,14 +5658,14 @@ skl_dpll0_enable(struct drm_i915_private *dev_priv, unsigned int required_vco)
          * 8100 while the eDP 1.4 alternate link rates need a VCO of 8640.
          * The modeset code is responsible for the selection of the exact link
          * rate later on, with the constraint of choosing a frequency that
-         * works with required_vco.
+         * works with vco.
          */
         val = I915_READ(DPLL_CTRL1);
 
         val &= ~(DPLL_CTRL1_HDMI_MODE(SKL_DPLL0) | DPLL_CTRL1_SSC(SKL_DPLL0) |
                  DPLL_CTRL1_LINK_RATE_MASK(SKL_DPLL0));
         val |= DPLL_CTRL1_OVERRIDE(SKL_DPLL0);
-        if (required_vco == 8640)
+        if (vco == 8640000)
                 val |= DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1080,
                                             SKL_DPLL0);
         else
@@ -5613,6 +5679,21 @@ skl_dpll0_enable(struct drm_i915_private *dev_priv, unsigned int required_vco)
 
         if (wait_for(I915_READ(LCPLL1_CTL) & LCPLL_PLL_LOCK, 5))
                 DRM_ERROR("DPLL0 not locked\n");
+
+        dev_priv->cdclk_pll.vco = vco;
+
+        /* We'll want to keep using the current vco from now on. */
+        skl_set_preferred_cdclk_vco(dev_priv, vco);
+}
+
+static void
+skl_dpll0_disable(struct drm_i915_private *dev_priv)
+{
+        I915_WRITE(LCPLL1_CTL, I915_READ(LCPLL1_CTL) & ~LCPLL_PLL_ENABLE);
+        if (wait_for(!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_LOCK), 1))
+                DRM_ERROR("Couldn't disable DPLL0\n");
+
+        dev_priv->cdclk_pll.vco = 0;
 }
 
 static bool skl_cdclk_pcu_ready(struct drm_i915_private *dev_priv)
@@ -5642,12 +5723,14 @@ static bool skl_cdclk_wait_for_pcu_ready(struct drm_i915_private *dev_priv)
         return false;
 }
 
-static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq)
+static void skl_set_cdclk(struct drm_i915_private *dev_priv, int cdclk, int vco)
 {
         struct drm_device *dev = dev_priv->dev;
         u32 freq_select, pcu_ack;
 
-        DRM_DEBUG_DRIVER("Changing CDCLK to %dKHz\n", freq);
+        WARN_ON((cdclk == 24000) != (vco == 0));
+
+        DRM_DEBUG_DRIVER("Changing CDCLK to %d kHz (VCO %d kHz)\n", cdclk, vco);
 
         if (!skl_cdclk_wait_for_pcu_ready(dev_priv)) {
                 DRM_ERROR("failed to inform PCU about cdclk change\n");
@@ -5655,7 +5738,7 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq)
         }
 
         /* set CDCLK_CTL */
-        switch(freq) {
+        switch (cdclk) {
         case 450000:
         case 432000:
                 freq_select = CDCLK_FREQ_450_432;
@@ -5665,20 +5748,27 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq)
                 freq_select = CDCLK_FREQ_540;
                 pcu_ack = 2;
                 break;
-        case 308570:
+        case 308571:
         case 337500:
         default:
                 freq_select = CDCLK_FREQ_337_308;
                 pcu_ack = 0;
                 break;
-        case 617140:
+        case 617143:
         case 675000:
                 freq_select = CDCLK_FREQ_675_617;
                 pcu_ack = 3;
                 break;
         }
 
-        I915_WRITE(CDCLK_CTL, freq_select | skl_cdclk_decimal(freq));
+        if (dev_priv->cdclk_pll.vco != 0 &&
+            dev_priv->cdclk_pll.vco != vco)
+                skl_dpll0_disable(dev_priv);
+
+        if (dev_priv->cdclk_pll.vco != vco)
+                skl_dpll0_enable(dev_priv, vco);
+
+        I915_WRITE(CDCLK_CTL, freq_select | skl_cdclk_decimal(cdclk));
         POSTING_READ(CDCLK_CTL);
 
         /* inform PCU of the change */
@@ -5689,52 +5779,41 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq)
         intel_update_cdclk(dev);
 }
 
+static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv);
+
 void skl_uninit_cdclk(struct drm_i915_private *dev_priv)
 {
-        /* disable DBUF power */
-        I915_WRITE(DBUF_CTL, I915_READ(DBUF_CTL) & ~DBUF_POWER_REQUEST);
-        POSTING_READ(DBUF_CTL);
-
-        udelay(10);
-
-        if (I915_READ(DBUF_CTL) & DBUF_POWER_STATE)
-                DRM_ERROR("DBuf power disable timeout\n");
-
-        /* disable DPLL0 */
-        I915_WRITE(LCPLL1_CTL, I915_READ(LCPLL1_CTL) & ~LCPLL_PLL_ENABLE);
-        if (wait_for(!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_LOCK), 1))
-                DRM_ERROR("Couldn't disable DPLL0\n");
+        skl_set_cdclk(dev_priv, dev_priv->cdclk_pll.ref, 0);
 }
 
 void skl_init_cdclk(struct drm_i915_private *dev_priv)
 {
-        unsigned int required_vco;
+        int cdclk, vco;
 
-        /* DPLL0 not enabled (happens on early BIOS versions) */
-        if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE)) {
-                /* enable DPLL0 */
-                required_vco = skl_cdclk_get_vco(dev_priv->skl_boot_cdclk);
-                skl_dpll0_enable(dev_priv, required_vco);
-        }
-
-        /* set CDCLK to the frequency the BIOS chose */
-        skl_set_cdclk(dev_priv, dev_priv->skl_boot_cdclk);
+        skl_sanitize_cdclk(dev_priv);
 
-        /* enable DBUF power */
-        I915_WRITE(DBUF_CTL, I915_READ(DBUF_CTL) | DBUF_POWER_REQUEST);
-        POSTING_READ(DBUF_CTL);
+        if (dev_priv->cdclk_freq != 0 && dev_priv->cdclk_pll.vco != 0) {
+                /*
+                 * Use the current vco as our initial
+                 * guess as to what the preferred vco is.
+                 */
+                if (dev_priv->skl_preferred_vco_freq == 0)
+                        skl_set_preferred_cdclk_vco(dev_priv,
+                                                    dev_priv->cdclk_pll.vco);
+                return;
+        }
 
-        udelay(10);
+        vco = dev_priv->skl_preferred_vco_freq;
+        if (vco == 0)
+                vco = 8100000;
+        cdclk = skl_calc_cdclk(0, vco);
 
-        if (!(I915_READ(DBUF_CTL) & DBUF_POWER_STATE))
-                DRM_ERROR("DBuf power enable timeout\n");
+        skl_set_cdclk(dev_priv, cdclk, vco);
 }
 
-int skl_sanitize_cdclk(struct drm_i915_private *dev_priv)
+static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv)
 {
-        uint32_t lcpll1 = I915_READ(LCPLL1_CTL);
-        uint32_t cdctl = I915_READ(CDCLK_CTL);
-        int freq = dev_priv->skl_boot_cdclk;
+        uint32_t cdctl, expected;
 
         /*
          * check if the pre-os intialized the display
@@ -5744,8 +5823,10 @@ int skl_sanitize_cdclk(struct drm_i915_private *dev_priv)
         if ((I915_READ(SWF_ILK(0x18)) & 0x00FFFFFF) == 0)
                 goto sanitize;
 
+        intel_update_cdclk(dev_priv->dev);
         /* Is PLL enabled and locked ? */
-        if (!((lcpll1 & LCPLL_PLL_ENABLE) && (lcpll1 & LCPLL_PLL_LOCK)))
+        if (dev_priv->cdclk_pll.vco == 0 ||
+            dev_priv->cdclk_freq == dev_priv->cdclk_pll.ref)
                 goto sanitize;
 
         /* DPLL okay; verify the cdclock
@@ -5754,19 +5835,20 @@ int skl_sanitize_cdclk(struct drm_i915_private *dev_priv)
          * decimal part is programmed wrong from BIOS where pre-os does not
          * enable display. Verify the same as well.
          */
-        if (cdctl == ((cdctl & CDCLK_FREQ_SEL_MASK) | skl_cdclk_decimal(freq)))
+        cdctl = I915_READ(CDCLK_CTL);
+        expected = (cdctl & CDCLK_FREQ_SEL_MASK) |
+                skl_cdclk_decimal(dev_priv->cdclk_freq);
+        if (cdctl == expected)
                 /* All well; nothing to sanitize */
-                return false;
+                return;
+
 sanitize:
-        /*
-         * As of now initialize with max cdclk till
-         * we get dynamic cdclk support
-         * */
-        dev_priv->skl_boot_cdclk = dev_priv->max_cdclk_freq;
-        skl_init_cdclk(dev_priv);
+        DRM_DEBUG_KMS("Sanitizing cdclk programmed by pre-os\n");
 
-        /* we did have to sanitize */
-        return true;
+        /* force cdclk programming */
+        dev_priv->cdclk_freq = 0;
+        /* force full PLL disable + enable */
+        dev_priv->cdclk_pll.vco = -1;
 }
 
 /* Adjust CDclk dividers to allow high res or save power if possible */
@@ -5906,21 +5988,15 @@ static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv,
                 return 200000;
 }
 
-static int broxton_calc_cdclk(struct drm_i915_private *dev_priv,
-                              int max_pixclk)
+static int bxt_calc_cdclk(int max_pixclk)
 {
-        /*
-         * FIXME:
-         * - remove the guardband, it's not needed on BXT
-         * - set 19.2MHz bypass frequency if there are no active pipes
-         */
-        if (max_pixclk > 576000*9/10)
+        if (max_pixclk > 576000)
                 return 624000;
-        else if (max_pixclk > 384000*9/10)
+        else if (max_pixclk > 384000)
                 return 576000;
-        else if (max_pixclk > 288000*9/10)
+        else if (max_pixclk > 288000)
                 return 384000;
-        else if (max_pixclk > 144000*9/10)
+        else if (max_pixclk > 144000)
                 return 288000;
         else
                 return 144000;
@@ -5963,9 +6039,6 @@ static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state)
         struct intel_atomic_state *intel_state =
                 to_intel_atomic_state(state);
 
-        if (max_pixclk < 0)
-                return max_pixclk;
-
         intel_state->cdclk = intel_state->dev_cdclk =
                 valleyview_calc_cdclk(dev_priv, max_pixclk);
 
@@ -5975,22 +6048,17 @@ static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state)
         return 0;
 }
 
-static int broxton_modeset_calc_cdclk(struct drm_atomic_state *state)
+static int bxt_modeset_calc_cdclk(struct drm_atomic_state *state)
 {
-        struct drm_device *dev = state->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        int max_pixclk = intel_mode_max_pixclk(dev, state);
+        int max_pixclk = ilk_max_pixel_rate(state);
         struct intel_atomic_state *intel_state =
                 to_intel_atomic_state(state);
 
-        if (max_pixclk < 0)
-                return max_pixclk;
-
         intel_state->cdclk = intel_state->dev_cdclk =
-                broxton_calc_cdclk(dev_priv, max_pixclk);
+                bxt_calc_cdclk(max_pixclk);
 
         if (!intel_state->active_crtcs)
-                intel_state->dev_cdclk = broxton_calc_cdclk(dev_priv, 0);
+                intel_state->dev_cdclk = bxt_calc_cdclk(0);
 
         return 0;
 }
@@ -6252,7 +6320,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
                 return;
 
         if (to_intel_plane_state(crtc->primary->state)->visible) {
-                WARN_ON(intel_crtc->unpin_work);
+                WARN_ON(intel_crtc->flip_work);
 
                 intel_pre_disable_primary_noatomic(crtc);
 
@@ -6262,8 +6330,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
 
         dev_priv->display.crtc_disable(crtc);
 
-        DRM_DEBUG_KMS("[CRTC:%d] hw state adjusted, was enabled, now disabled\n",
-                      crtc->base.id);
+        DRM_DEBUG_KMS("[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n",
+                      crtc->base.id, crtc->name);
 
         WARN_ON(drm_atomic_set_mode_for_crtc(crtc->state, NULL) < 0);
         crtc->state->active = false;
@@ -6563,10 +6631,10 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
+        int clock_limit = dev_priv->max_dotclk_freq;
 
-        /* FIXME should check pixel clock limits on all platforms */
         if (INTEL_INFO(dev)->gen < 4) {
-                int clock_limit = dev_priv->max_cdclk_freq * 9 / 10;
+                clock_limit = dev_priv->max_cdclk_freq * 9 / 10;
 
                 /*
                  * Enable double wide mode when the dot clock
@@ -6574,16 +6642,16 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
                  */
                 if (intel_crtc_supports_double_wide(crtc) &&
                     adjusted_mode->crtc_clock > clock_limit) {
-                        clock_limit *= 2;
+                        clock_limit = dev_priv->max_dotclk_freq;
                         pipe_config->double_wide = true;
                 }
+        }
 
-                if (adjusted_mode->crtc_clock > clock_limit) {
-                        DRM_DEBUG_KMS("requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",
-                                      adjusted_mode->crtc_clock, clock_limit,
-                                      yesno(pipe_config->double_wide));
-                        return -EINVAL;
-                }
+        if (adjusted_mode->crtc_clock > clock_limit) {
+                DRM_DEBUG_KMS("requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",
+                              adjusted_mode->crtc_clock, clock_limit,
+                              yesno(pipe_config->double_wide));
+                return -EINVAL;
         }
 
         /*
@@ -6615,76 +6683,98 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
 static int skylake_get_display_clock_speed(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
-        uint32_t lcpll1 = I915_READ(LCPLL1_CTL);
-        uint32_t cdctl = I915_READ(CDCLK_CTL);
-        uint32_t linkrate;
+        uint32_t cdctl;
 
-        if (!(lcpll1 & LCPLL_PLL_ENABLE))
-                return 24000; /* 24MHz is the cd freq with NSSC ref */
+        skl_dpll0_update(dev_priv);
 
-        if ((cdctl & CDCLK_FREQ_SEL_MASK) == CDCLK_FREQ_540)
-                return 540000;
+        if (dev_priv->cdclk_pll.vco == 0)
+                return dev_priv->cdclk_pll.ref;
 
-        linkrate = (I915_READ(DPLL_CTRL1) &
-                    DPLL_CTRL1_LINK_RATE_MASK(SKL_DPLL0)) >> 1;
+        cdctl = I915_READ(CDCLK_CTL);
 
-        if (linkrate == DPLL_CTRL1_LINK_RATE_2160 ||
-            linkrate == DPLL_CTRL1_LINK_RATE_1080) {
-                /* vco 8640 */
+        if (dev_priv->cdclk_pll.vco == 8640000) {
                 switch (cdctl & CDCLK_FREQ_SEL_MASK) {
                 case CDCLK_FREQ_450_432:
                         return 432000;
                 case CDCLK_FREQ_337_308:
-                        return 308570;
+                        return 308571;
+                case CDCLK_FREQ_540:
+                        return 540000;
                 case CDCLK_FREQ_675_617:
-                        return 617140;
+                        return 617143;
                 default:
-                        WARN(1, "Unknown cd freq selection\n");
+                        MISSING_CASE(cdctl & CDCLK_FREQ_SEL_MASK);
                 }
         } else {
-                /* vco 8100 */
                 switch (cdctl & CDCLK_FREQ_SEL_MASK) {
                 case CDCLK_FREQ_450_432:
                         return 450000;
                 case CDCLK_FREQ_337_308:
                         return 337500;
+                case CDCLK_FREQ_540:
+                        return 540000;
                 case CDCLK_FREQ_675_617:
                         return 675000;
                 default:
-                        WARN(1, "Unknown cd freq selection\n");
+                        MISSING_CASE(cdctl & CDCLK_FREQ_SEL_MASK);
                 }
         }
 
-        /* error case, do as if DPLL0 isn't enabled */
-        return 24000;
+        return dev_priv->cdclk_pll.ref;
+}
+
+static void bxt_de_pll_update(struct drm_i915_private *dev_priv)
+{
+        u32 val;
+
+        dev_priv->cdclk_pll.ref = 19200;
+        dev_priv->cdclk_pll.vco = 0;
+
+        val = I915_READ(BXT_DE_PLL_ENABLE);
+        if ((val & BXT_DE_PLL_PLL_ENABLE) == 0)
+                return;
+
+        if (WARN_ON((val & BXT_DE_PLL_LOCK) == 0))
+                return;
+
+        val = I915_READ(BXT_DE_PLL_CTL);
+        dev_priv->cdclk_pll.vco = (val & BXT_DE_PLL_RATIO_MASK) *
+                dev_priv->cdclk_pll.ref;
 }
 
 static int broxton_get_display_clock_speed(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
-        uint32_t cdctl = I915_READ(CDCLK_CTL);
-        uint32_t pll_ratio = I915_READ(BXT_DE_PLL_CTL) & BXT_DE_PLL_RATIO_MASK;
-        uint32_t pll_enab = I915_READ(BXT_DE_PLL_ENABLE);
-        int cdclk;
+        u32 divider;
+        int div, vco;
 
-        if (!(pll_enab & BXT_DE_PLL_PLL_ENABLE))
-                return 19200;
+        bxt_de_pll_update(dev_priv);
+
+        vco = dev_priv->cdclk_pll.vco;
+        if (vco == 0)
+                return dev_priv->cdclk_pll.ref;
 
-        cdclk = 19200 * pll_ratio / 2;
+        divider = I915_READ(CDCLK_CTL) & BXT_CDCLK_CD2X_DIV_SEL_MASK;
 
-        switch (cdctl & BXT_CDCLK_CD2X_DIV_SEL_MASK) {
+        switch (divider) {
         case BXT_CDCLK_CD2X_DIV_SEL_1:
-                return cdclk;  /* 576MHz or 624MHz */
+                div = 2;
+                break;
         case BXT_CDCLK_CD2X_DIV_SEL_1_5:
-                return cdclk * 2 / 3; /* 384MHz */
+                div = 3;
+                break;
         case BXT_CDCLK_CD2X_DIV_SEL_2:
-                return cdclk / 2; /* 288MHz */
+                div = 4;
+                break;
         case BXT_CDCLK_CD2X_DIV_SEL_4:
-                return cdclk / 4; /* 144MHz */
+                div = 8;
+                break;
+        default:
+                MISSING_CASE(divider);
+                return dev_priv->cdclk_pll.ref;
         }
 
-        /* error case, do as if DE PLL isn't enabled */
-        return 19200;
+        return DIV_ROUND_CLOSEST(vco, div);
 }
 
 static int broadwell_get_display_clock_speed(struct drm_device *dev)
@@ -7063,7 +7153,7 @@ static uint32_t i9xx_dpll_compute_fp(struct dpll *dpll)
 
 static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
                                      struct intel_crtc_state *crtc_state,
-                                     intel_clock_t *reduced_clock)
+                                     struct dpll *reduced_clock)
 {
         struct drm_device *dev = crtc->base.dev;
         u32 fp, fp2 = 0;
@@ -7487,7 +7577,7 @@ void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe)
 
 static void i9xx_compute_dpll(struct intel_crtc *crtc,
                               struct intel_crtc_state *crtc_state,
-                              intel_clock_t *reduced_clock)
+                              struct dpll *reduced_clock)
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -7563,7 +7653,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc,
 
 static void i8xx_compute_dpll(struct intel_crtc *crtc,
                               struct intel_crtc_state *crtc_state,
-                              intel_clock_t *reduced_clock)
+                              struct dpll *reduced_clock)
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -7817,7 +7907,7 @@ static int i8xx_crtc_compute_clock(struct intel_crtc *crtc,
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        const intel_limit_t *limit;
+        const struct intel_limit *limit;
         int refclk = 48000;
 
         memset(&crtc_state->dpll_hw_state, 0,
@@ -7853,7 +7943,7 @@ static int g4x_crtc_compute_clock(struct intel_crtc *crtc,
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        const intel_limit_t *limit;
+        const struct intel_limit *limit;
         int refclk = 96000;
 
         memset(&crtc_state->dpll_hw_state, 0,
@@ -7896,7 +7986,7 @@ static int pnv_crtc_compute_clock(struct intel_crtc *crtc,
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        const intel_limit_t *limit;
+        const struct intel_limit *limit;
         int refclk = 96000;
 
         memset(&crtc_state->dpll_hw_state, 0,
@@ -7930,7 +8020,7 @@ static int i9xx_crtc_compute_clock(struct intel_crtc *crtc,
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        const intel_limit_t *limit;
+        const struct intel_limit *limit;
         int refclk = 96000;
 
         memset(&crtc_state->dpll_hw_state, 0,
@@ -7963,7 +8053,7 @@ static int chv_crtc_compute_clock(struct intel_crtc *crtc,
                                   struct intel_crtc_state *crtc_state)
 {
         int refclk = 100000;
-        const intel_limit_t *limit = &intel_limits_chv;
+        const struct intel_limit *limit = &intel_limits_chv;
 
         memset(&crtc_state->dpll_hw_state, 0,
                sizeof(crtc_state->dpll_hw_state));
@@ -7984,7 +8074,7 @@ static int vlv_crtc_compute_clock(struct intel_crtc *crtc,
                                   struct intel_crtc_state *crtc_state)
 {
         int refclk = 100000;
-        const intel_limit_t *limit = &intel_limits_vlv;
+        const struct intel_limit *limit = &intel_limits_vlv;
 
         memset(&crtc_state->dpll_hw_state, 0,
                sizeof(crtc_state->dpll_hw_state));
@@ -8034,7 +8124,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe = pipe_config->cpu_transcoder;
-        intel_clock_t clock;
+        struct dpll clock;
         u32 mdiv;
         int refclk = 100000;
 
@@ -8131,7 +8221,7 @@ static void chv_crtc_clock_get(struct intel_crtc *crtc,
         struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe = pipe_config->cpu_transcoder;
         enum dpio_channel port = vlv_pipe_to_channel(pipe);
-        intel_clock_t clock;
+        struct dpll clock;
         u32 cmn_dw13, pll_dw0, pll_dw1, pll_dw2, pll_dw3;
         int refclk = 100000;
 
@@ -8275,12 +8365,14 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_encoder *encoder;
+        int i;
         u32 val, final;
         bool has_lvds = false;
         bool has_cpu_edp = false;
         bool has_panel = false;
         bool has_ck505 = false;
         bool can_ssc = false;
+        bool using_ssc_source = false;
 
         /* We need to take the global config into account */
         for_each_intel_encoder(dev, encoder) {
@@ -8307,8 +8399,22 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                 can_ssc = true;
         }
 
-        DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d\n",
-                      has_panel, has_lvds, has_ck505);
+        /* Check if any DPLLs are using the SSC source */
+        for (i = 0; i < dev_priv->num_shared_dpll; i++) {
+                u32 temp = I915_READ(PCH_DPLL(i));
+
+                if (!(temp & DPLL_VCO_ENABLE))
+                        continue;
+
+                if ((temp & PLL_REF_INPUT_MASK) ==
+                    PLLB_REF_INPUT_SPREADSPECTRUMIN) {
+                        using_ssc_source = true;
+                        break;
+                }
+        }
+
+        DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d using_ssc_source %d\n",
+                      has_panel, has_lvds, has_ck505, using_ssc_source);
 
         /* Ironlake: try to setup display ref clock before DPLL
          * enabling. This is only under driver's control after
@@ -8345,9 +8451,9 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                                 final |= DREF_CPU_SOURCE_OUTPUT_NONSPREAD;
                 } else
                         final |= DREF_CPU_SOURCE_OUTPUT_DISABLE;
-        } else {
-                final |= DREF_SSC_SOURCE_DISABLE;
-                final |= DREF_CPU_SOURCE_OUTPUT_DISABLE;
+        } else if (using_ssc_source) {
+                final |= DREF_SSC_SOURCE_ENABLE;
+                final |= DREF_SSC1_ENABLE;
         }
 
         if (final == val)
@@ -8393,7 +8499,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                 POSTING_READ(PCH_DREF_CONTROL);
                 udelay(200);
         } else {
-                DRM_DEBUG_KMS("Disabling SSC entirely\n");
+                DRM_DEBUG_KMS("Disabling CPU source output\n");
 
                 val &= ~DREF_CPU_SOURCE_OUTPUT_MASK;
 
@@ -8404,16 +8510,20 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                 POSTING_READ(PCH_DREF_CONTROL);
                 udelay(200);
 
-                /* Turn off the SSC source */
-                val &= ~DREF_SSC_SOURCE_MASK;
-                val |= DREF_SSC_SOURCE_DISABLE;
+                if (!using_ssc_source) {
+                        DRM_DEBUG_KMS("Disabling SSC source\n");
 
-                /* Turn off SSC1 */
-                val &= ~DREF_SSC1_ENABLE;
+                        /* Turn off the SSC source */
+                        val &= ~DREF_SSC_SOURCE_MASK;
+                        val |= DREF_SSC_SOURCE_DISABLE;
 
-                I915_WRITE(PCH_DREF_CONTROL, val);
-                POSTING_READ(PCH_DREF_CONTROL);
-                udelay(200);
+                        /* Turn off SSC1 */
+                        val &= ~DREF_SSC1_ENABLE;
+
+                        I915_WRITE(PCH_DREF_CONTROL, val);
+                        POSTING_READ(PCH_DREF_CONTROL);
+                        udelay(200);
+                }
         }
 
         BUG_ON(val != final);
@@ -8794,7 +8904,7 @@ static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)
 
 static void ironlake_compute_dpll(struct intel_crtc *intel_crtc,
                                   struct intel_crtc_state *crtc_state,
-                                  intel_clock_t *reduced_clock)
+                                  struct dpll *reduced_clock)
 {
         struct drm_crtc *crtc = &intel_crtc->base;
         struct drm_device *dev = crtc->dev;
@@ -8902,10 +9012,10 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        intel_clock_t reduced_clock;
+        struct dpll reduced_clock;
         bool has_reduced_clock = false;
         struct intel_shared_dpll *pll;
-        const intel_limit_t *limit;
+        const struct intel_limit *limit;
         int refclk = 120000;
 
         memset(&crtc_state->dpll_hw_state, 0,
@@ -9300,6 +9410,10 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
                 ironlake_get_fdi_m_n_config(crtc, pipe_config);
 
                 if (HAS_PCH_IBX(dev_priv)) {
+                        /*
+                         * The pipe->pch transcoder and pch transcoder->pll
+                         * mapping is fixed.
+                         */
                         pll_id = (enum intel_dpll_id) crtc->pipe;
                 } else {
                         tmp = I915_READ(PCH_DPLL_SEL);
@@ -9560,14 +9674,14 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)
         }
 }
 
-static void broxton_modeset_commit_cdclk(struct drm_atomic_state *old_state)
+static void bxt_modeset_commit_cdclk(struct drm_atomic_state *old_state)
 {
         struct drm_device *dev = old_state->dev;
         struct intel_atomic_state *old_intel_state =
                 to_intel_atomic_state(old_state);
         unsigned int req_cdclk = old_intel_state->dev_cdclk;
 
-        broxton_set_cdclk(to_i915(dev), req_cdclk);
+        bxt_set_cdclk(to_i915(dev), req_cdclk);
 }
 
 /* compute the max rate for new configuration */
@@ -9687,6 +9801,18 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
              cdclk, dev_priv->cdclk_freq);
 }
 
+static int broadwell_calc_cdclk(int max_pixclk)
+{
+        if (max_pixclk > 540000)
+                return 675000;
+        else if (max_pixclk > 450000)
+                return 540000;
+        else if (max_pixclk > 337500)
+                return 450000;
+        else
+                return 337500;
+}
+
 static int broadwell_modeset_calc_cdclk(struct drm_atomic_state *state)
 {
         struct drm_i915_private *dev_priv = to_i915(state->dev);
@@ -9698,14 +9824,7 @@ static int broadwell_modeset_calc_cdclk(struct drm_atomic_state *state)
          * FIXME should also account for plane ratio
          * once 64bpp pixel formats are supported.
          */
-        if (max_pixclk > 540000)
-                cdclk = 675000;
-        else if (max_pixclk > 450000)
-                cdclk = 540000;
-        else if (max_pixclk > 337500)
-                cdclk = 450000;
-        else
-                cdclk = 337500;
+        cdclk = broadwell_calc_cdclk(max_pixclk);
 
         if (cdclk > dev_priv->max_cdclk_freq) {
                 DRM_DEBUG_KMS("requested cdclk (%d kHz) exceeds max (%d kHz)\n",
@@ -9715,7 +9834,7 @@ static int broadwell_modeset_calc_cdclk(struct drm_atomic_state *state)
 
         intel_state->cdclk = intel_state->dev_cdclk = cdclk;
         if (!intel_state->active_crtcs)
-                intel_state->dev_cdclk = 337500;
+                intel_state->dev_cdclk = broadwell_calc_cdclk(0);
 
         return 0;
 }
@@ -9730,6 +9849,47 @@ static void broadwell_modeset_commit_cdclk(struct drm_atomic_state *old_state)
         broadwell_set_cdclk(dev, req_cdclk);
 }
 
+static int skl_modeset_calc_cdclk(struct drm_atomic_state *state)
+{
+        struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
+        struct drm_i915_private *dev_priv = to_i915(state->dev);
+        const int max_pixclk = ilk_max_pixel_rate(state);
+        int vco = intel_state->cdclk_pll_vco;
+        int cdclk;
+
+        /*
+         * FIXME should also account for plane ratio
+         * once 64bpp pixel formats are supported.
+         */
+        cdclk = skl_calc_cdclk(max_pixclk, vco);
+
+        /*
+         * FIXME move the cdclk caclulation to
+         * compute_config() so we can fail gracegully.
+         */
+        if (cdclk > dev_priv->max_cdclk_freq) {
+                DRM_ERROR("requested cdclk (%d kHz) exceeds max (%d kHz)\n",
+                          cdclk, dev_priv->max_cdclk_freq);
+                cdclk = dev_priv->max_cdclk_freq;
+        }
+
+        intel_state->cdclk = intel_state->dev_cdclk = cdclk;
+        if (!intel_state->active_crtcs)
+                intel_state->dev_cdclk = skl_calc_cdclk(0, vco);
+
+        return 0;
+}
+
+static void skl_modeset_commit_cdclk(struct drm_atomic_state *old_state)
+{
+        struct drm_i915_private *dev_priv = to_i915(old_state->dev);
+        struct intel_atomic_state *intel_state = to_intel_atomic_state(old_state);
+        unsigned int req_cdclk = intel_state->dev_cdclk;
+        unsigned int req_vco = intel_state->cdclk_pll_vco;
+
+        skl_set_cdclk(dev_priv, req_cdclk, req_vco);
+}
+
 static int haswell_crtc_compute_clock(struct intel_crtc *crtc,
                                       struct intel_crtc_state *crtc_state)
 {
@@ -9850,6 +10010,10 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,
         enum intel_display_power_domain power_domain;
         u32 tmp;
 
+        /*
+         * The pipe->transcoder mapping is fixed with the exception of the eDP
+         * transcoder handled below.
+         */
         pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe;
 
         /*
@@ -10317,10 +10481,10 @@ intel_framebuffer_create_for_mode(struct drm_device *dev,
         struct drm_i915_gem_object *obj;
         struct drm_mode_fb_cmd2 mode_cmd = { 0 };
 
-        obj = i915_gem_alloc_object(dev,
+        obj = i915_gem_object_create(dev,
                                     intel_framebuffer_size_for_mode(mode, bpp));
-        if (obj == NULL)
-                return ERR_PTR(-ENOMEM);
+        if (IS_ERR(obj))
+                return ERR_CAST(obj);
 
         mode_cmd.width = mode->hdisplay;
         mode_cmd.height = mode->vdisplay;
@@ -10632,7 +10796,7 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
         int pipe = pipe_config->cpu_transcoder;
         u32 dpll = pipe_config->dpll_hw_state.dpll;
         u32 fp;
-        intel_clock_t clock;
+        struct dpll clock;
         int port_clock;
         int refclk = i9xx_pll_refclk(dev, pipe_config);
 
@@ -10806,31 +10970,27 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
         return mode;
 }
 
-void intel_mark_busy(struct drm_device *dev)
+void intel_mark_busy(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (dev_priv->mm.busy)
                 return;
 
         intel_runtime_pm_get(dev_priv);
         i915_update_gfx_val(dev_priv);
-        if (INTEL_INFO(dev)->gen >= 6)
+        if (INTEL_GEN(dev_priv) >= 6)
                 gen6_rps_busy(dev_priv);
         dev_priv->mm.busy = true;
 }
 
-void intel_mark_idle(struct drm_device *dev)
+void intel_mark_idle(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (!dev_priv->mm.busy)
                 return;
 
         dev_priv->mm.busy = false;
 
-        if (INTEL_INFO(dev)->gen >= 6)
-                gen6_rps_idle(dev->dev_private);
+        if (INTEL_GEN(dev_priv) >= 6)
+                gen6_rps_idle(dev_priv);
 
         intel_runtime_pm_put(dev_priv);
 }
@@ -10839,15 +10999,16 @@ static void intel_crtc_destroy(struct drm_crtc *crtc)
 {
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct drm_device *dev = crtc->dev;
-        struct intel_unpin_work *work;
+        struct intel_flip_work *work;
 
         spin_lock_irq(&dev->event_lock);
-        work = intel_crtc->unpin_work;
-        intel_crtc->unpin_work = NULL;
+        work = intel_crtc->flip_work;
+        intel_crtc->flip_work = NULL;
         spin_unlock_irq(&dev->event_lock);
 
         if (work) {
-                cancel_work_sync(&work->work);
+                cancel_work_sync(&work->mmio_work);
+                cancel_work_sync(&work->unpin_work);
                 kfree(work);
         }
 
@@ -10858,12 +11019,15 @@ static void intel_crtc_destroy(struct drm_crtc *crtc)
 
 static void intel_unpin_work_fn(struct work_struct *__work)
 {
-        struct intel_unpin_work *work =
-                container_of(__work, struct intel_unpin_work, work);
+        struct intel_flip_work *work =
+                container_of(__work, struct intel_flip_work, unpin_work);
         struct intel_crtc *crtc = to_intel_crtc(work->crtc);
         struct drm_device *dev = crtc->base.dev;
         struct drm_plane *primary = crtc->base.primary;
 
+        if (is_mmio_work(work))
+                flush_work(&work->mmio_work);
+
         mutex_lock(&dev->struct_mutex);
         intel_unpin_fb_obj(work->old_fb, primary->state->rotation);
         drm_gem_object_unreference(&work->pending_flip_obj->base);
@@ -10882,60 +11046,14 @@ static void intel_unpin_work_fn(struct work_struct *__work)
         kfree(work);
 }
 
-static void do_intel_finish_page_flip(struct drm_device *dev,
-                                      struct drm_crtc *crtc)
-{
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct intel_unpin_work *work;
-        unsigned long flags;
-
-        /* Ignore early vblank irqs */
-        if (intel_crtc == NULL)
-                return;
-
-        /*
-         * This is called both by irq handlers and the reset code (to complete
-         * lost pageflips) so needs the full irqsave spinlocks.
-         */
-        spin_lock_irqsave(&dev->event_lock, flags);
-        work = intel_crtc->unpin_work;
-
-        /* Ensure we don't miss a work->pending update ... */
-        smp_rmb();
-
-        if (work == NULL || atomic_read(&work->pending) < INTEL_FLIP_COMPLETE) {
-                spin_unlock_irqrestore(&dev->event_lock, flags);
-                return;
-        }
-
-        page_flip_completed(intel_crtc);
-
-        spin_unlock_irqrestore(&dev->event_lock, flags);
-}
-
-void intel_finish_page_flip(struct drm_device *dev, int pipe)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
-
-        do_intel_finish_page_flip(dev, crtc);
-}
-
-void intel_finish_page_flip_plane(struct drm_device *dev, int plane)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane];
-
-        do_intel_finish_page_flip(dev, crtc);
-}
-
 /* Is 'a' after or equal to 'b'? */
 static bool g4x_flip_count_after_eq(u32 a, u32 b)
 {
         return !((a - b) & 0x80000000);
 }
 
-static bool page_flip_finished(struct intel_crtc *crtc)
+static bool __pageflip_finished_cs(struct intel_crtc *crtc,
+                                   struct intel_flip_work *work)
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -10977,40 +11095,103 @@ static bool page_flip_finished(struct intel_crtc *crtc)
          * anyway, we don't really care.
          */
         return (I915_READ(DSPSURFLIVE(crtc->plane)) & ~0xfff) ==
-                crtc->unpin_work->gtt_offset &&
+                crtc->flip_work->gtt_offset &&
                 g4x_flip_count_after_eq(I915_READ(PIPE_FLIPCOUNT_G4X(crtc->pipe)),
-                                    crtc->unpin_work->flip_count);
+                                    crtc->flip_work->flip_count);
 }
 
-void intel_prepare_page_flip(struct drm_device *dev, int plane)
+static bool
+__pageflip_finished_mmio(struct intel_crtc *crtc,
+                               struct intel_flip_work *work)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(dev_priv->plane_to_crtc_mapping[plane]);
+        /*
+         * MMIO work completes when vblank is different from
+         * flip_queued_vblank.
+         *
+         * Reset counter value doesn't matter, this is handled by
+         * i915_wait_request finishing early, so no need to handle
+         * reset here.
+         */
+        return intel_crtc_get_vblank_counter(crtc) != work->flip_queued_vblank;
+}
+
+
+static bool pageflip_finished(struct intel_crtc *crtc,
+                              struct intel_flip_work *work)
+{
+        if (!atomic_read(&work->pending))
+                return false;
+
+        smp_rmb();
+
+        if (is_mmio_work(work))
+                return __pageflip_finished_mmio(crtc, work);
+        else
+                return __pageflip_finished_cs(crtc, work);
+}
+
+void intel_finish_page_flip_cs(struct drm_i915_private *dev_priv, int pipe)
+{
+        struct drm_device *dev = dev_priv->dev;
+        struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        struct intel_flip_work *work;
         unsigned long flags;
 
+        /* Ignore early vblank irqs */
+        if (!crtc)
+                return;
 
         /*
          * This is called both by irq handlers and the reset code (to complete
          * lost pageflips) so needs the full irqsave spinlocks.
-         *
-         * NB: An MMIO update of the plane base pointer will also
-         * generate a page-flip completion irq, i.e. every modeset
-         * is also accompanied by a spurious intel_prepare_page_flip().
          */
         spin_lock_irqsave(&dev->event_lock, flags);
-        if (intel_crtc->unpin_work && page_flip_finished(intel_crtc))
-                atomic_inc_not_zero(&intel_crtc->unpin_work->pending);
+        work = intel_crtc->flip_work;
+
+        if (work != NULL &&
+            !is_mmio_work(work) &&
+            pageflip_finished(intel_crtc, work))
+                page_flip_completed(intel_crtc);
+
         spin_unlock_irqrestore(&dev->event_lock, flags);
 }
 
-static inline void intel_mark_page_flip_active(struct intel_unpin_work *work)
+void intel_finish_page_flip_mmio(struct drm_i915_private *dev_priv, int pipe)
 {
+        struct drm_device *dev = dev_priv->dev;
+        struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        struct intel_flip_work *work;
+        unsigned long flags;
+
+        /* Ignore early vblank irqs */
+        if (!crtc)
+                return;
+
+        /*
+         * This is called both by irq handlers and the reset code (to complete
+         * lost pageflips) so needs the full irqsave spinlocks.
+         */
+        spin_lock_irqsave(&dev->event_lock, flags);
+        work = intel_crtc->flip_work;
+
+        if (work != NULL &&
+            is_mmio_work(work) &&
+            pageflip_finished(intel_crtc, work))
+                page_flip_completed(intel_crtc);
+
+        spin_unlock_irqrestore(&dev->event_lock, flags);
+}
+
+static inline void intel_mark_page_flip_active(struct intel_crtc *crtc,
+                                               struct intel_flip_work *work)
+{
+        work->flip_queued_vblank = intel_crtc_get_vblank_counter(crtc);
+
         /* Ensure that the work item is consistent when activating it ... */
-        smp_wmb();
-        atomic_set(&work->pending, INTEL_FLIP_PENDING);
-        /* and that it is marked active as soon as the irq could fire. */
-        smp_wmb();
+        smp_mb__before_atomic();
+        atomic_set(&work->pending, 1);
 }
 
 static int intel_gen2_queue_flip(struct drm_device *dev,
@@ -11041,10 +11222,9 @@ static int intel_gen2_queue_flip(struct drm_device *dev,
         intel_ring_emit(engine, MI_DISPLAY_FLIP |
                         MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
         intel_ring_emit(engine, fb->pitches[0]);
-        intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset);
+        intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset);
         intel_ring_emit(engine, 0); /* aux display base address, unused */
 
-        intel_mark_page_flip_active(intel_crtc->unpin_work);
         return 0;
 }
 
@@ -11073,10 +11253,9 @@ static int intel_gen3_queue_flip(struct drm_device *dev,
         intel_ring_emit(engine, MI_DISPLAY_FLIP_I915 |
                         MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
         intel_ring_emit(engine, fb->pitches[0]);
-        intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset);
+        intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset);
         intel_ring_emit(engine, MI_NOOP);
 
-        intel_mark_page_flip_active(intel_crtc->unpin_work);
         return 0;
 }
 
@@ -11104,7 +11283,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev,
         intel_ring_emit(engine, MI_DISPLAY_FLIP |
                         MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
         intel_ring_emit(engine, fb->pitches[0]);
-        intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset |
+        intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset |
                         obj->tiling_mode);
 
         /* XXX Enabling the panel-fitter across page-flip is so far
@@ -11115,7 +11294,6 @@ static int intel_gen4_queue_flip(struct drm_device *dev,
         pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
         intel_ring_emit(engine, pf | pipesrc);
 
-        intel_mark_page_flip_active(intel_crtc->unpin_work);
         return 0;
 }
 
@@ -11139,7 +11317,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
         intel_ring_emit(engine, MI_DISPLAY_FLIP |
                         MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
         intel_ring_emit(engine, fb->pitches[0] | obj->tiling_mode);
-        intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset);
+        intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset);
 
         /* Contrary to the suggestions in the documentation,
          * "Enable Panel Fitter" does not seem to be required when page
@@ -11151,7 +11329,6 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
         pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
         intel_ring_emit(engine, pf | pipesrc);
 
-        intel_mark_page_flip_active(intel_crtc->unpin_work);
         return 0;
 }
 
@@ -11243,16 +11420,17 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
 
         intel_ring_emit(engine, MI_DISPLAY_FLIP_I915 | plane_bit);
         intel_ring_emit(engine, (fb->pitches[0] | obj->tiling_mode));
-        intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset);
+        intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset);
         intel_ring_emit(engine, (MI_NOOP));
 
-        intel_mark_page_flip_active(intel_crtc->unpin_work);
         return 0;
 }
 
 static bool use_mmio_flip(struct intel_engine_cs *engine,
                           struct drm_i915_gem_object *obj)
 {
+        struct reservation_object *resv;
+
         /*
          * This is not being used for older platforms, because
          * non-availability of flip done interrupt forces us to use
@@ -11264,7 +11442,7 @@ static bool use_mmio_flip(struct intel_engine_cs *engine,
         if (engine == NULL)
                 return true;
 
-        if (INTEL_INFO(engine->dev)->gen < 5)
+        if (INTEL_GEN(engine->i915) < 5)
                 return false;
 
         if (i915.use_mmio_flip < 0)
@@ -11273,17 +11451,17 @@ static bool use_mmio_flip(struct intel_engine_cs *engine,
                 return true;
         else if (i915.enable_execlists)
                 return true;
-        else if (obj->base.dma_buf &&
-                 !reservation_object_test_signaled_rcu(obj->base.dma_buf->resv,
-                                                       false))
+
+        resv = i915_gem_object_get_dmabuf_resv(obj);
+        if (resv && !reservation_object_test_signaled_rcu(resv, false))
                 return true;
-        else
-                return engine != i915_gem_request_get_engine(obj->last_write_req);
+
+        return engine != i915_gem_request_get_engine(obj->last_write_req);
 }
 
 static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
                              unsigned int rotation,
-                             struct intel_unpin_work *work)
+                             struct intel_flip_work *work)
 {
         struct drm_device *dev = intel_crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11335,7 +11513,7 @@ static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
 }
 
 static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc,
-                             struct intel_unpin_work *work)
+                             struct intel_flip_work *work)
 {
         struct drm_device *dev = intel_crtc->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11358,78 +11536,37 @@ static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc,
         POSTING_READ(DSPSURF(intel_crtc->plane));
 }
 
-/*
- * XXX: This is the temporary way to update the plane registers until we get
- * around to using the usual plane update functions for MMIO flips
- */
-static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)
-{
-        struct intel_crtc *crtc = mmio_flip->crtc;
-        struct intel_unpin_work *work;
-
-        spin_lock_irq(&crtc->base.dev->event_lock);
-        work = crtc->unpin_work;
-        spin_unlock_irq(&crtc->base.dev->event_lock);
-        if (work == NULL)
-                return;
-
-        intel_mark_page_flip_active(work);
-
-        intel_pipe_update_start(crtc);
-
-        if (INTEL_INFO(mmio_flip->i915)->gen >= 9)
-                skl_do_mmio_flip(crtc, mmio_flip->rotation, work);
-        else
-                /* use_mmio_flip() retricts MMIO flips to ilk+ */
-                ilk_do_mmio_flip(crtc, work);
-
-        intel_pipe_update_end(crtc);
-}
-
-static void intel_mmio_flip_work_func(struct work_struct *work)
+static void intel_mmio_flip_work_func(struct work_struct *w)
 {
-        struct intel_mmio_flip *mmio_flip =
-                container_of(work, struct intel_mmio_flip, work);
+        struct intel_flip_work *work =
+                container_of(w, struct intel_flip_work, mmio_work);
+        struct intel_crtc *crtc = to_intel_crtc(work->crtc);
+        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
         struct intel_framebuffer *intel_fb =
-                to_intel_framebuffer(mmio_flip->crtc->base.primary->fb);
+                to_intel_framebuffer(crtc->base.primary->fb);
         struct drm_i915_gem_object *obj = intel_fb->obj;
+        struct reservation_object *resv;
 
-        if (mmio_flip->req) {
-                WARN_ON(__i915_wait_request(mmio_flip->req,
+        if (work->flip_queued_req)
+                WARN_ON(__i915_wait_request(work->flip_queued_req,
                                             false, NULL,
-                                            &mmio_flip->i915->rps.mmioflips));
-                i915_gem_request_unreference__unlocked(mmio_flip->req);
-        }
+                                            &dev_priv->rps.mmioflips));
 
         /* For framebuffer backed by dmabuf, wait for fence */
-        if (obj->base.dma_buf)
-                WARN_ON(reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
-                                                            false, false,
+        resv = i915_gem_object_get_dmabuf_resv(obj);
+        if (resv)
+                WARN_ON(reservation_object_wait_timeout_rcu(resv, false, false,
                                                             MAX_SCHEDULE_TIMEOUT) < 0);
 
-        intel_do_mmio_flip(mmio_flip);
-        kfree(mmio_flip);
-}
-
-static int intel_queue_mmio_flip(struct drm_device *dev,
-                                 struct drm_crtc *crtc,
-                                 struct drm_i915_gem_object *obj)
-{
-        struct intel_mmio_flip *mmio_flip;
-
-        mmio_flip = kmalloc(sizeof(*mmio_flip), GFP_KERNEL);
-        if (mmio_flip == NULL)
-                return -ENOMEM;
-
-        mmio_flip->i915 = to_i915(dev);
-        mmio_flip->req = i915_gem_request_reference(obj->last_write_req);
-        mmio_flip->crtc = to_intel_crtc(crtc);
-        mmio_flip->rotation = crtc->primary->state->rotation;
+        intel_pipe_update_start(crtc);
 
-        INIT_WORK(&mmio_flip->work, intel_mmio_flip_work_func);
-        schedule_work(&mmio_flip->work);
+        if (INTEL_GEN(dev_priv) >= 9)
+                skl_do_mmio_flip(crtc, work->rotation, work);
+        else
+                /* use_mmio_flip() retricts MMIO flips to ilk+ */
+                ilk_do_mmio_flip(crtc, work);
 
-        return 0;
+        intel_pipe_update_end(crtc, work);
 }
 
 static int intel_default_queue_flip(struct drm_device *dev,
@@ -11442,37 +11579,32 @@ static int intel_default_queue_flip(struct drm_device *dev,
         return -ENODEV;
 }
 
-static bool __intel_pageflip_stall_check(struct drm_device *dev,
-                                         struct drm_crtc *crtc)
+static bool __pageflip_stall_check_cs(struct drm_i915_private *dev_priv,
+                                      struct intel_crtc *intel_crtc,
+                                      struct intel_flip_work *work)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct intel_unpin_work *work = intel_crtc->unpin_work;
-        u32 addr;
-
-        if (atomic_read(&work->pending) >= INTEL_FLIP_COMPLETE)
-                return true;
+        u32 addr, vblank;
 
-        if (atomic_read(&work->pending) < INTEL_FLIP_PENDING)
+        if (!atomic_read(&work->pending))
                 return false;
 
-        if (!work->enable_stall_check)
-                return false;
+        smp_rmb();
 
+        vblank = intel_crtc_get_vblank_counter(intel_crtc);
         if (work->flip_ready_vblank == 0) {
                 if (work->flip_queued_req &&
                     !i915_gem_request_completed(work->flip_queued_req, true))
                         return false;
 
-                work->flip_ready_vblank = drm_crtc_vblank_count(crtc);
+                work->flip_ready_vblank = vblank;
         }
 
-        if (drm_crtc_vblank_count(crtc) - work->flip_ready_vblank < 3)
+        if (vblank - work->flip_ready_vblank < 3)
                 return false;
 
         /* Potential stall - if we see that the flip has happened,
          * assume a missed interrupt. */
-        if (INTEL_INFO(dev)->gen >= 4)
+        if (INTEL_GEN(dev_priv) >= 4)
                 addr = I915_HI_DISPBASE(I915_READ(DSPSURF(intel_crtc->plane)));
         else
                 addr = I915_READ(DSPADDR(intel_crtc->plane));
@@ -11484,12 +11616,12 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev,
         return addr == work->gtt_offset;
 }
 
-void intel_check_page_flip(struct drm_device *dev, int pipe)
+void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_device *dev = dev_priv->dev;
         struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct intel_unpin_work *work;
+        struct intel_flip_work *work;
 
         WARN_ON(!in_interrupt());
 
@@ -11497,19 +11629,24 @@ void intel_check_page_flip(struct drm_device *dev, int pipe)
                 return;
 
         spin_lock(&dev->event_lock);
-        work = intel_crtc->unpin_work;
-        if (work != NULL && __intel_pageflip_stall_check(dev, crtc)) {
-                WARN_ONCE(1, "Kicking stuck page flip: queued at %d, now %d\n",
-                         work->flip_queued_vblank, drm_vblank_count(dev, pipe));
+        work = intel_crtc->flip_work;
+
+        if (work != NULL && !is_mmio_work(work) &&
+            __pageflip_stall_check_cs(dev_priv, intel_crtc, work)) {
+                WARN_ONCE(1,
+                          "Kicking stuck page flip: queued at %d, now %d\n",
+                        work->flip_queued_vblank, intel_crtc_get_vblank_counter(intel_crtc));
                 page_flip_completed(intel_crtc);
                 work = NULL;
         }
-        if (work != NULL &&
-            drm_vblank_count(dev, pipe) - work->flip_queued_vblank > 1)
-                intel_queue_rps_boost_for_request(dev, work->flip_queued_req);
+
+        if (work != NULL && !is_mmio_work(work) &&
+            intel_crtc_get_vblank_counter(intel_crtc) - work->flip_queued_vblank > 1)
+                intel_queue_rps_boost_for_request(work->flip_queued_req);
         spin_unlock(&dev->event_lock);
 }
 
+__maybe_unused
 static int intel_crtc_page_flip(struct drm_crtc *crtc,
                                 struct drm_framebuffer *fb,
                                 struct drm_pending_vblank_event *event,
@@ -11522,7 +11659,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct drm_plane *primary = crtc->primary;
         enum pipe pipe = intel_crtc->pipe;
-        struct intel_unpin_work *work;
+        struct intel_flip_work *work;
         struct intel_engine_cs *engine;
         bool mmio_flip;
         struct drm_i915_gem_request *request = NULL;
@@ -11559,19 +11696,19 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         work->event = event;
         work->crtc = crtc;
         work->old_fb = old_fb;
-        INIT_WORK(&work->work, intel_unpin_work_fn);
+        INIT_WORK(&work->unpin_work, intel_unpin_work_fn);
 
         ret = drm_crtc_vblank_get(crtc);
         if (ret)
                 goto free_work;
 
-        /* We borrow the event spin lock for protecting unpin_work */
+        /* We borrow the event spin lock for protecting flip_work */
         spin_lock_irq(&dev->event_lock);
-        if (intel_crtc->unpin_work) {
+        if (intel_crtc->flip_work) {
                 /* Before declaring the flip queue wedged, check if
                  * the hardware completed the operation behind our backs.
                  */
-                if (__intel_pageflip_stall_check(dev, crtc)) {
+                if (pageflip_finished(intel_crtc, intel_crtc->flip_work)) {
                         DRM_DEBUG_DRIVER("flip queue: previous flip completed, continuing\n");
                         page_flip_completed(intel_crtc);
                 } else {
@@ -11583,7 +11720,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
                         return -EBUSY;
                 }
         }
-        intel_crtc->unpin_work = work;
+        intel_crtc->flip_work = work;
         spin_unlock_irq(&dev->event_lock);
 
         if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
@@ -11595,7 +11732,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
 
         crtc->primary->fb = fb;
         update_state_fb(crtc->primary);
-        intel_fbc_pre_update(intel_crtc);
+
+        intel_fbc_pre_update(intel_crtc, intel_crtc->config,
+                             to_intel_plane_state(primary->state));
 
         work->pending_flip_obj = obj;
 
@@ -11638,6 +11777,11 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
          */
         if (!mmio_flip) {
                 ret = i915_gem_object_sync(obj, engine, &request);
+                if (!ret && !request) {
+                        request = i915_gem_request_alloc(engine, NULL);
+                        ret = PTR_ERR_OR_ZERO(request);
+                }
+
                 if (ret)
                         goto cleanup_pending;
         }
@@ -11649,38 +11793,28 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         work->gtt_offset = intel_plane_obj_offset(to_intel_plane(primary),
                                                   obj, 0);
         work->gtt_offset += intel_crtc->dspaddr_offset;
+        work->rotation = crtc->primary->state->rotation;
 
         if (mmio_flip) {
-                ret = intel_queue_mmio_flip(dev, crtc, obj);
-                if (ret)
-                        goto cleanup_unpin;
+                INIT_WORK(&work->mmio_work, intel_mmio_flip_work_func);
 
                 i915_gem_request_assign(&work->flip_queued_req,
                                         obj->last_write_req);
-        } else {
-                if (!request) {
-                        request = i915_gem_request_alloc(engine, NULL);
-                        if (IS_ERR(request)) {
-                                ret = PTR_ERR(request);
-                                goto cleanup_unpin;
-                        }
-                }
 
+                schedule_work(&work->mmio_work);
+        } else {
+                i915_gem_request_assign(&work->flip_queued_req, request);
                 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request,
                                                    page_flip_flags);
                 if (ret)
                         goto cleanup_unpin;
 
-                i915_gem_request_assign(&work->flip_queued_req, request);
-        }
+                intel_mark_page_flip_active(intel_crtc, work);
 
-        if (request)
                 i915_add_request_no_flush(request);
+        }
 
-        work->flip_queued_vblank = drm_crtc_vblank_count(crtc);
-        work->enable_stall_check = true;
-
-        i915_gem_track_fb(intel_fb_obj(work->old_fb), obj,
+        i915_gem_track_fb(intel_fb_obj(old_fb), obj,
                           to_intel_plane(primary)->frontbuffer_bit);
         mutex_unlock(&dev->struct_mutex);
 
@@ -11706,7 +11840,7 @@ cleanup:
         drm_framebuffer_unreference(work->old_fb);
 
         spin_lock_irq(&dev->event_lock);
-        intel_crtc->unpin_work = NULL;
+        intel_crtc->flip_work = NULL;
         spin_unlock_irq(&dev->event_lock);
 
         drm_crtc_vblank_put(crtc);
@@ -11808,12 +11942,12 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
         struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_plane_state *old_plane_state =
                 to_intel_plane_state(plane->state);
-        int idx = intel_crtc->base.base.id, ret;
         bool mode_changed = needs_modeset(crtc_state);
         bool was_crtc_enabled = crtc->state->active;
         bool is_crtc_enabled = crtc_state->active;
         bool turn_off, turn_on, visible, was_visible;
         struct drm_framebuffer *fb = plane_state->fb;
+        int ret;
 
         if (crtc_state && INTEL_INFO(dev)->gen >= 9 &&
             plane->type != DRM_PLANE_TYPE_CURSOR) {
@@ -11834,6 +11968,11 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
          * Visibility is calculated as if the crtc was on, but
          * after scaler setup everything depends on it being off
          * when the crtc isn't active.
+         *
+         * FIXME this is wrong for watermarks. Watermarks should also
+         * be computed as if the pipe would be active. Perhaps move
+         * per-plane wm computation to the .check_plane() hook, and
+         * only combine the results from all planes in the current place?
          */
         if (!is_crtc_enabled)
                 to_intel_plane_state(plane_state)->visible = visible = false;
@@ -11847,11 +11986,15 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
         turn_off = was_visible && (!visible || mode_changed);
         turn_on = visible && (!was_visible || mode_changed);
 
-        DRM_DEBUG_ATOMIC("[CRTC:%i] has [PLANE:%i] with fb %i\n", idx,
-                         plane->base.id, fb ? fb->base.id : -1);
+        DRM_DEBUG_ATOMIC("[CRTC:%d:%s] has [PLANE:%d:%s] with fb %i\n",
+                         intel_crtc->base.base.id,
+                         intel_crtc->base.name,
+                         plane->base.id, plane->name,
+                         fb ? fb->base.id : -1);
 
-        DRM_DEBUG_ATOMIC("[PLANE:%i] visible %i -> %i, off %i, on %i, ms %i\n",
-                         plane->base.id, was_visible, visible,
+        DRM_DEBUG_ATOMIC("[PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n",
+                         plane->base.id, plane->name,
+                         was_visible, visible,
                          turn_off, turn_on, mode_changed);
 
         if (turn_on) {
@@ -12007,7 +12150,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
                 }
         } else if (dev_priv->display.compute_intermediate_wm) {
                 if (HAS_PCH_SPLIT(dev_priv) && INTEL_GEN(dev_priv) < 9)
-                        pipe_config->wm.intermediate = pipe_config->wm.optimal.ilk;
+                        pipe_config->wm.ilk.intermediate = pipe_config->wm.ilk.optimal;
         }
 
         if (INTEL_INFO(dev)->gen >= 9) {
@@ -12142,7 +12285,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
         struct intel_plane_state *state;
         struct drm_framebuffer *fb;
 
-        DRM_DEBUG_KMS("[CRTC:%d]%s config %p for pipe %c\n", crtc->base.base.id,
+        DRM_DEBUG_KMS("[CRTC:%d:%s]%s config %p for pipe %c\n",
+                      crtc->base.base.id, crtc->base.name,
                       context, pipe_config, pipe_name(crtc->pipe));
 
         DRM_DEBUG_KMS("cpu_transcoder: %s\n", transcoder_name(pipe_config->cpu_transcoder));
@@ -12243,29 +12387,24 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
                 state = to_intel_plane_state(plane->state);
                 fb = state->base.fb;
                 if (!fb) {
-                        DRM_DEBUG_KMS("%s PLANE:%d plane: %u.%u idx: %d "
-                                "disabled, scaler_id = %d\n",
-                                plane->type == DRM_PLANE_TYPE_CURSOR ? "CURSOR" : "STANDARD",
-                                plane->base.id, intel_plane->pipe,
-                                (crtc->base.primary == plane) ? 0 : intel_plane->plane + 1,
-                                drm_plane_index(plane), state->scaler_id);
+                        DRM_DEBUG_KMS("[PLANE:%d:%s] disabled, scaler_id = %d\n",
+                                      plane->base.id, plane->name, state->scaler_id);
                         continue;
                 }
 
-                DRM_DEBUG_KMS("%s PLANE:%d plane: %u.%u idx: %d enabled",
-                        plane->type == DRM_PLANE_TYPE_CURSOR ? "CURSOR" : "STANDARD",
-                        plane->base.id, intel_plane->pipe,
-                        crtc->base.primary == plane ? 0 : intel_plane->plane + 1,
-                        drm_plane_index(plane));
-                DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = 0x%x",
-                        fb->base.id, fb->width, fb->height, fb->pixel_format);
-                DRM_DEBUG_KMS("\tscaler:%d src (%u, %u) %ux%u dst (%u, %u) %ux%u\n",
-                        state->scaler_id,
-                        state->src.x1 >> 16, state->src.y1 >> 16,
-                        drm_rect_width(&state->src) >> 16,
-                        drm_rect_height(&state->src) >> 16,
-                        state->dst.x1, state->dst.y1,
-                        drm_rect_width(&state->dst), drm_rect_height(&state->dst));
+                DRM_DEBUG_KMS("[PLANE:%d:%s] enabled",
+                              plane->base.id, plane->name);
+                DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = %s",
+                              fb->base.id, fb->width, fb->height,
+                              drm_get_format_name(fb->pixel_format));
+                DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n",
+                              state->scaler_id,
+                              state->src.x1 >> 16, state->src.y1 >> 16,
+                              drm_rect_width(&state->src) >> 16,
+                              drm_rect_height(&state->src) >> 16,
+                              state->dst.x1, state->dst.y1,
+                              drm_rect_width(&state->dst),
+                              drm_rect_height(&state->dst));
         }
 }
 
@@ -12684,6 +12823,7 @@ intel_pipe_config_compare(struct drm_device *dev,
 
         PIPE_CONF_CHECK_I(has_dp_encoder);
         PIPE_CONF_CHECK_I(lane_count);
+        PIPE_CONF_CHECK_X(lane_lat_optim_mask);
 
         if (INTEL_INFO(dev)->gen < 8) {
                 PIPE_CONF_CHECK_M_N(dp_m_n);
@@ -12932,7 +13072,7 @@ verify_crtc_state(struct drm_crtc *crtc,
         pipe_config->base.crtc = crtc;
         pipe_config->base.state = old_state;
 
-        DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
+        DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
 
         active = dev_priv->display.get_pipe_config(intel_crtc, pipe_config);
 
@@ -13280,6 +13420,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
                         intel_state->active_crtcs |= 1 << i;
                 else
                         intel_state->active_crtcs &= ~(1 << i);
+
+                if (crtc_state->active != crtc->state->active)
+                        intel_state->active_pipe_changes |= drm_crtc_mask(crtc);
         }
 
         /*
@@ -13290,9 +13433,17 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
          * adjusted_mode bits in the crtc directly.
          */
         if (dev_priv->display.modeset_calc_cdclk) {
+                if (!intel_state->cdclk_pll_vco)
+                        intel_state->cdclk_pll_vco = dev_priv->cdclk_pll.vco;
+                if (!intel_state->cdclk_pll_vco)
+                        intel_state->cdclk_pll_vco = dev_priv->skl_preferred_vco_freq;
+
                 ret = dev_priv->display.modeset_calc_cdclk(state);
+                if (ret < 0)
+                        return ret;
 
-                if (!ret && intel_state->dev_cdclk != dev_priv->cdclk_freq)
+                if (intel_state->dev_cdclk != dev_priv->cdclk_freq ||
+                    intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco)
                         ret = intel_modeset_all_pipes(state);
 
                 if (ret < 0)
@@ -13316,38 +13467,16 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
  * phase.  The code here should be run after the per-crtc and per-plane 'check'
  * handlers to ensure that all derived state has been updated.
  */
-static void calc_watermark_data(struct drm_atomic_state *state)
+static int calc_watermark_data(struct drm_atomic_state *state)
 {
         struct drm_device *dev = state->dev;
-        struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
-        struct drm_crtc *crtc;
-        struct drm_crtc_state *cstate;
-        struct drm_plane *plane;
-        struct drm_plane_state *pstate;
-
-        /*
-         * Calculate watermark configuration details now that derived
-         * plane/crtc state is all properly updated.
-         */
-        drm_for_each_crtc(crtc, dev) {
-                cstate = drm_atomic_get_existing_crtc_state(state, crtc) ?:
-                        crtc->state;
-
-                if (cstate->active)
-                        intel_state->wm_config.num_pipes_active++;
-        }
-        drm_for_each_legacy_plane(plane, dev) {
-                pstate = drm_atomic_get_existing_plane_state(state, plane) ?:
-                        plane->state;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
-                if (!to_intel_plane_state(pstate)->visible)
-                        continue;
+        /* Is there platform-specific watermark information to calculate? */
+        if (dev_priv->display.compute_global_watermarks)
+                return dev_priv->display.compute_global_watermarks(state);
 
-                intel_state->wm_config.sprites_enabled = true;
-                if (pstate->crtc_w != pstate->src_w >> 16 ||
-                    pstate->crtc_h != pstate->src_h >> 16)
-                        intel_state->wm_config.sprites_scaled = true;
-        }
+        return 0;
 }
 
 /**
@@ -13377,14 +13506,13 @@ static int intel_atomic_check(struct drm_device *dev,
                 if (crtc_state->mode.private_flags != crtc->state->mode.private_flags)
                         crtc_state->mode_changed = true;
 
-                if (!crtc_state->enable) {
-                        if (needs_modeset(crtc_state))
-                                any_ms = true;
+                if (!needs_modeset(crtc_state))
                         continue;
-                }
 
-                if (!needs_modeset(crtc_state))
+                if (!crtc_state->enable) {
+                        any_ms = true;
                         continue;
+                }
 
                 /* FIXME: For only active_changed we shouldn't need to do any
                  * state recomputation at all. */
@@ -13394,8 +13522,11 @@ static int intel_atomic_check(struct drm_device *dev,
                         return ret;
 
                 ret = intel_modeset_pipe_config(crtc, pipe_config);
-                if (ret)
+                if (ret) {
+                        intel_dump_pipe_config(to_intel_crtc(crtc),
+                                               pipe_config, "[failed]");
                         return ret;
+                }
 
                 if (i915.fastboot &&
                     intel_pipe_config_compare(dev,
@@ -13405,13 +13536,12 @@ static int intel_atomic_check(struct drm_device *dev,
                         to_intel_crtc_state(crtc_state)->update_pipe = true;
                 }
 
-                if (needs_modeset(crtc_state)) {
+                if (needs_modeset(crtc_state))
                         any_ms = true;
 
-                        ret = drm_atomic_add_affected_planes(state, crtc);
-                        if (ret)
-                                return ret;
-                }
+                ret = drm_atomic_add_affected_planes(state, crtc);
+                if (ret)
+                        return ret;
 
                 intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,
                                        needs_modeset(crtc_state) ?
@@ -13431,9 +13561,7 @@ static int intel_atomic_check(struct drm_device *dev,
                 return ret;
 
         intel_fbc_choose_crtc(dev_priv, state);
-        calc_watermark_data(state);
-
-        return 0;
+        return calc_watermark_data(state);
 }
 
 static int intel_atomic_prepare_commit(struct drm_device *dev,
@@ -13447,11 +13575,6 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
         struct drm_crtc *crtc;
         int i, ret;
 
-        if (nonblock) {
-                DRM_DEBUG_KMS("i915 does not yet support nonblocking commit\n");
-                return -EINVAL;
-        }
-
         for_each_crtc_in_state(state, crtc, crtc_state, i) {
                 if (state->legacy_cursor_update)
                         continue;
@@ -13495,6 +13618,16 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
         return ret;
 }
 
+u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)
+{
+        struct drm_device *dev = crtc->base.dev;
+
+        if (!dev->max_vblank_count)
+                return drm_accurate_vblank_count(&crtc->base);
+
+        return dev->driver->get_vblank_counter(dev, crtc->pipe);
+}
+
 static void intel_atomic_wait_for_vblanks(struct drm_device *dev,
                                           struct drm_i915_private *dev_priv,
                                           unsigned crtc_mask)
@@ -13560,45 +13693,36 @@ static bool needs_vblank_wait(struct intel_crtc_state *crtc_state)
         return false;
 }
 
-/**
- * intel_atomic_commit - commit validated state object
- * @dev: DRM device
- * @state: the top-level driver state object
- * @nonblock: nonblocking commit
- *
- * This function commits a top-level state object that has been validated
- * with drm_atomic_helper_check().
- *
- * FIXME:  Atomic modeset support for i915 is not yet complete.  At the moment
- * we can only handle plane-related operations and do not yet support
- * nonblocking commit.
- *
- * RETURNS
- * Zero for success or -errno.
- */
-static int intel_atomic_commit(struct drm_device *dev,
-                               struct drm_atomic_state *state,
-                               bool nonblock)
+static void intel_atomic_commit_tail(struct drm_atomic_state *state)
 {
+        struct drm_device *dev = state->dev;
         struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_crtc_state *old_crtc_state;
         struct drm_crtc *crtc;
         struct intel_crtc_state *intel_cstate;
-        int ret = 0, i;
+        struct drm_plane *plane;
+        struct drm_plane_state *plane_state;
         bool hw_check = intel_state->modeset;
         unsigned long put_domains[I915_MAX_PIPES] = {};
         unsigned crtc_vblank_mask = 0;
+        int i, ret;
 
-        ret = intel_atomic_prepare_commit(dev, state, nonblock);
-        if (ret) {
-                DRM_DEBUG_ATOMIC("Preparing state failed with %i\n", ret);
-                return ret;
+        for_each_plane_in_state(state, plane, plane_state, i) {
+                struct intel_plane_state *intel_plane_state =
+                        to_intel_plane_state(plane_state);
+
+                if (!intel_plane_state->wait_req)
+                        continue;
+
+                ret = __i915_wait_request(intel_plane_state->wait_req,
+                                          true, NULL, NULL);
+                /* EIO should be eaten, and we can't get interrupted in the
+                 * worker, and blocking commits have waited already. */
+                WARN_ON(ret);
         }
 
-        drm_atomic_helper_swap_state(dev, state);
-        dev_priv->wm.config = intel_state->wm_config;
-        intel_shared_dpll_commit(state);
+        drm_atomic_helper_wait_for_dependencies(state);
 
         if (intel_state->modeset) {
                 memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
@@ -13653,7 +13777,8 @@ static int intel_atomic_commit(struct drm_device *dev,
                 drm_atomic_helper_update_legacy_modeset_state(state->dev, state);
 
                 if (dev_priv->display.modeset_commit_cdclk &&
-                    intel_state->dev_cdclk != dev_priv->cdclk_freq)
+                    (intel_state->dev_cdclk != dev_priv->cdclk_freq ||
+                     intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco))
                         dev_priv->display.modeset_commit_cdclk(state);
 
                 intel_modeset_verify_disabled(dev);
@@ -13665,30 +13790,44 @@ static int intel_atomic_commit(struct drm_device *dev,
                 bool modeset = needs_modeset(crtc->state);
                 struct intel_crtc_state *pipe_config =
                         to_intel_crtc_state(crtc->state);
-                bool update_pipe = !modeset && pipe_config->update_pipe;
 
                 if (modeset && crtc->state->active) {
                         update_scanline_offset(to_intel_crtc(crtc));
                         dev_priv->display.crtc_enable(crtc);
                 }
 
+                /* Complete events for now disable pipes here. */
+                if (modeset && !crtc->state->active && crtc->state->event) {
+                        spin_lock_irq(&dev->event_lock);
+                        drm_crtc_send_vblank_event(crtc, crtc->state->event);
+                        spin_unlock_irq(&dev->event_lock);
+
+                        crtc->state->event = NULL;
+                }
+
                 if (!modeset)
                         intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
 
                 if (crtc->state->active &&
                     drm_atomic_get_existing_plane_state(state, crtc->primary))
-                        intel_fbc_enable(intel_crtc);
+                        intel_fbc_enable(intel_crtc, pipe_config, to_intel_plane_state(crtc->primary->state));
 
-                if (crtc->state->active &&
-                    (crtc->state->planes_changed || update_pipe))
+                if (crtc->state->active)
                         drm_atomic_helper_commit_planes_on_crtc(old_crtc_state);
 
                 if (pipe_config->base.active && needs_vblank_wait(pipe_config))
                         crtc_vblank_mask |= 1 << i;
         }
 
-        /* FIXME: add subpixel order */
-
+        /* FIXME: We should call drm_atomic_helper_commit_hw_done() here
+         * already, but still need the state for the delayed optimization. To
+         * fix this:
+         * - wrap the optimization/post_plane_update stuff into a per-crtc work.
+         * - schedule that vblank worker _before_ calling hw_done
+         * - at the start of commit_tail, cancel it _synchrously
+         * - switch over to the vblank wait helper in the core after that since
+         *   we don't need out special handling any more.
+         */
         if (!state->legacy_cursor_update)
                 intel_atomic_wait_for_vblanks(dev, dev_priv, crtc_vblank_mask);
 
@@ -13715,6 +13854,8 @@ static int intel_atomic_commit(struct drm_device *dev,
                 intel_modeset_verify_crtc(crtc, old_crtc_state, crtc->state);
         }
 
+        drm_atomic_helper_commit_hw_done(state);
+
         if (intel_state->modeset)
                 intel_display_power_put(dev_priv, POWER_DOMAIN_MODESET);
 
@@ -13722,6 +13863,8 @@ static int intel_atomic_commit(struct drm_device *dev,
         drm_atomic_helper_cleanup_planes(dev, state);
         mutex_unlock(&dev->struct_mutex);
 
+        drm_atomic_helper_commit_cleanup_done(state);
+
         drm_atomic_state_free(state);
 
         /* As one of the primary mmio accessors, KMS has a high likelihood
@@ -13736,6 +13879,86 @@ static int intel_atomic_commit(struct drm_device *dev,
          * can happen also when the device is completely off.
          */
         intel_uncore_arm_unclaimed_mmio_detection(dev_priv);
+}
+
+static void intel_atomic_commit_work(struct work_struct *work)
+{
+        struct drm_atomic_state *state = container_of(work,
+                                                      struct drm_atomic_state,
+                                                      commit_work);
+        intel_atomic_commit_tail(state);
+}
+
+static void intel_atomic_track_fbs(struct drm_atomic_state *state)
+{
+        struct drm_plane_state *old_plane_state;
+        struct drm_plane *plane;
+        struct drm_i915_gem_object *obj, *old_obj;
+        struct intel_plane *intel_plane;
+        int i;
+
+        mutex_lock(&state->dev->struct_mutex);
+        for_each_plane_in_state(state, plane, old_plane_state, i) {
+                obj = intel_fb_obj(plane->state->fb);
+                old_obj = intel_fb_obj(old_plane_state->fb);
+                intel_plane = to_intel_plane(plane);
+
+                i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit);
+        }
+        mutex_unlock(&state->dev->struct_mutex);
+}
+
+/**
+ * intel_atomic_commit - commit validated state object
+ * @dev: DRM device
+ * @state: the top-level driver state object
+ * @nonblock: nonblocking commit
+ *
+ * This function commits a top-level state object that has been validated
+ * with drm_atomic_helper_check().
+ *
+ * FIXME:  Atomic modeset support for i915 is not yet complete.  At the moment
+ * nonblocking commits are only safe for pure plane updates. Everything else
+ * should work though.
+ *
+ * RETURNS
+ * Zero for success or -errno.
+ */
+static int intel_atomic_commit(struct drm_device *dev,
+                               struct drm_atomic_state *state,
+                               bool nonblock)
+{
+        struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        int ret = 0;
+
+        if (intel_state->modeset && nonblock) {
+                DRM_DEBUG_KMS("nonblocking commit for modeset not yet implemented.\n");
+                return -EINVAL;
+        }
+
+        ret = drm_atomic_helper_setup_commit(state, nonblock);
+        if (ret)
+                return ret;
+
+        INIT_WORK(&state->commit_work, intel_atomic_commit_work);
+
+        ret = intel_atomic_prepare_commit(dev, state, nonblock);
+        if (ret) {
+                DRM_DEBUG_ATOMIC("Preparing state failed with %i\n", ret);
+                return ret;
+        }
+
+        drm_atomic_helper_swap_state(state, true);
+        dev_priv->wm.distrust_bios_wm = false;
+        dev_priv->wm.skl_results = intel_state->wm_results;
+        intel_shared_dpll_commit(state);
+        intel_atomic_track_fbs(state);
+
+        if (nonblock)
+                queue_work(system_unbound_wq, &state->commit_work);
+        else
+                intel_atomic_commit_tail(state);
 
         return 0;
 }
@@ -13749,8 +13972,8 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc)
 
         state = drm_atomic_state_alloc(dev);
         if (!state) {
-                DRM_DEBUG_KMS("[CRTC:%d] crtc restore failed, out of memory",
-                              crtc->base.id);
+                DRM_DEBUG_KMS("[CRTC:%d:%s] crtc restore failed, out of memory",
+                              crtc->base.id, crtc->name);
                 return;
         }
 
@@ -13785,7 +14008,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
         .set_config = drm_atomic_helper_set_config,
         .set_property = drm_atomic_helper_crtc_set_property,
         .destroy = intel_crtc_destroy,
-        .page_flip = intel_crtc_page_flip,
+        .page_flip = drm_atomic_helper_page_flip,
         .atomic_duplicate_state = intel_crtc_duplicate_state,
         .atomic_destroy_state = intel_crtc_destroy_state,
 };
@@ -13810,9 +14033,9 @@ intel_prepare_plane_fb(struct drm_plane *plane,
 {
         struct drm_device *dev = plane->dev;
         struct drm_framebuffer *fb = new_state->fb;
-        struct intel_plane *intel_plane = to_intel_plane(plane);
         struct drm_i915_gem_object *obj = intel_fb_obj(fb);
         struct drm_i915_gem_object *old_obj = intel_fb_obj(plane->state->fb);
+        struct reservation_object *resv;
         int ret = 0;
 
         if (!obj && !old_obj)
@@ -13842,12 +14065,15 @@ intel_prepare_plane_fb(struct drm_plane *plane,
                 }
         }
 
+        if (!obj)
+                return 0;
+
         /* For framebuffer backed by dmabuf, wait for fence */
-        if (obj && obj->base.dma_buf) {
+        resv = i915_gem_object_get_dmabuf_resv(obj);
+        if (resv) {
                 long lret;
 
-                lret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
-                                                           false, true,
+                lret = reservation_object_wait_timeout_rcu(resv, false, true,
                                                            MAX_SCHEDULE_TIMEOUT);
                 if (lret == -ERESTARTSYS)
                         return lret;
@@ -13855,9 +14081,7 @@ intel_prepare_plane_fb(struct drm_plane *plane,
                 WARN(lret < 0, "waiting returns %li\n", lret);
         }
 
-        if (!obj) {
-                ret = 0;
-        } else if (plane->type == DRM_PLANE_TYPE_CURSOR &&
+        if (plane->type == DRM_PLANE_TYPE_CURSOR &&
             INTEL_INFO(dev)->cursor_needs_physical) {
                 int align = IS_I830(dev) ? 16 * 1024 : 256;
                 ret = i915_gem_object_attach_phys(obj, align);
@@ -13868,15 +14092,11 @@ intel_prepare_plane_fb(struct drm_plane *plane,
         }
 
         if (ret == 0) {
-                if (obj) {
-                        struct intel_plane_state *plane_state =
-                                to_intel_plane_state(new_state);
-
-                        i915_gem_request_assign(&plane_state->wait_req,
-                                                obj->last_write_req);
-                }
+                struct intel_plane_state *plane_state =
+                        to_intel_plane_state(new_state);
 
-                i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit);
+                i915_gem_request_assign(&plane_state->wait_req,
+                                        obj->last_write_req);
         }
 
         return ret;
@@ -13896,7 +14116,6 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
                        const struct drm_plane_state *old_state)
 {
         struct drm_device *dev = plane->dev;
-        struct intel_plane *intel_plane = to_intel_plane(plane);
         struct intel_plane_state *old_intel_state;
         struct drm_i915_gem_object *old_obj = intel_fb_obj(old_state->fb);
         struct drm_i915_gem_object *obj = intel_fb_obj(plane->state->fb);
@@ -13910,11 +14129,6 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
             !INTEL_INFO(dev)->cursor_needs_physical))
                 intel_unpin_fb_obj(old_state->fb, old_state->rotation);
 
-        /* prepare_fb aborted? */
-        if ((old_obj && (old_obj->frontbuffer_bits & intel_plane->frontbuffer_bit)) ||
-            (obj && !(obj->frontbuffer_bits & intel_plane->frontbuffer_bit)))
-                i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit);
-
         i915_gem_request_assign(&old_intel_state->wait_req, NULL);
 }
 
@@ -13970,6 +14184,7 @@ intel_check_primary_plane(struct drm_plane *plane,
 
         return drm_plane_helper_check_update(plane, crtc, fb, &state->src,
                                              &state->dst, &state->clip,
+                                             state->base.rotation,
                                              min_scale, max_scale,
                                              can_position, true,
                                              &state->visible);
@@ -14006,7 +14221,7 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 {
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 
-        intel_pipe_update_end(intel_crtc);
+        intel_pipe_update_end(intel_crtc, NULL);
 }
 
 /**
@@ -14018,9 +14233,11 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc,
  */
 void intel_plane_destroy(struct drm_plane *plane)
 {
-        struct intel_plane *intel_plane = to_intel_plane(plane);
+        if (!plane)
+                return;
+
         drm_plane_cleanup(plane);
-        kfree(intel_plane);
+        kfree(to_intel_plane(plane));
 }
 
 const struct drm_plane_funcs intel_plane_funcs = {
@@ -14092,10 +14309,24 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
                 primary->disable_plane = i9xx_disable_primary_plane;
         }
 
-        ret = drm_universal_plane_init(dev, &primary->base, 0,
-                                       &intel_plane_funcs,
-                                       intel_primary_formats, num_formats,
-                                       DRM_PLANE_TYPE_PRIMARY, NULL);
+        if (INTEL_INFO(dev)->gen >= 9)
+                ret = drm_universal_plane_init(dev, &primary->base, 0,
+                                               &intel_plane_funcs,
+                                               intel_primary_formats, num_formats,
+                                               DRM_PLANE_TYPE_PRIMARY,
+                                               "plane 1%c", pipe_name(pipe));
+        else if (INTEL_INFO(dev)->gen >= 5 || IS_G4X(dev))
+                ret = drm_universal_plane_init(dev, &primary->base, 0,
+                                               &intel_plane_funcs,
+                                               intel_primary_formats, num_formats,
+                                               DRM_PLANE_TYPE_PRIMARY,
+                                               "primary %c", pipe_name(pipe));
+        else
+                ret = drm_universal_plane_init(dev, &primary->base, 0,
+                                               &intel_plane_funcs,
+                                               intel_primary_formats, num_formats,
+                                               DRM_PLANE_TYPE_PRIMARY,
+                                               "plane %c", plane_name(primary->plane));
         if (ret)
                 goto fail;
 
@@ -14145,6 +14376,7 @@ intel_check_cursor_plane(struct drm_plane *plane,
 
         ret = drm_plane_helper_check_update(plane, crtc, fb, &state->src,
                                             &state->dst, &state->clip,
+                                            state->base.rotation,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             true, true, &state->visible);
@@ -14253,7 +14485,8 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
                                        &intel_plane_funcs,
                                        intel_cursor_formats,
                                        ARRAY_SIZE(intel_cursor_formats),
-                                       DRM_PLANE_TYPE_CURSOR, NULL);
+                                       DRM_PLANE_TYPE_CURSOR,
+                                       "cursor %c", pipe_name(pipe));
         if (ret)
                 goto fail;
 
@@ -14338,7 +14571,8 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
                 goto fail;
 
         ret = drm_crtc_init_with_planes(dev, &intel_crtc->base, primary,
-                                        cursor, &intel_crtc_funcs, NULL);
+                                        cursor, &intel_crtc_funcs,
+                                        "pipe %c", pipe_name(pipe));
         if (ret)
                 goto fail;
 
@@ -14372,10 +14606,8 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
         return;
 
 fail:
-        if (primary)
-                drm_plane_cleanup(primary);
-        if (cursor)
-                drm_plane_cleanup(cursor);
+        intel_plane_destroy(primary);
+        intel_plane_destroy(cursor);
         kfree(crtc_state);
         kfree(intel_crtc);
 }
@@ -14554,6 +14786,8 @@ static void intel_setup_outputs(struct drm_device *dev)
                 if (I915_READ(PCH_DP_D) & DP_DETECTED)
                         intel_dp_init(dev, PCH_DP_D, PORT_D);
         } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+                bool has_edp, has_port;
+
                 /*
                  * The DP_DETECTED bit is the latched state of the DDC
                  * SDA pin at boot. However since eDP doesn't require DDC
@@ -14562,27 +14796,37 @@ static void intel_setup_outputs(struct drm_device *dev)
                  * Thus we can't rely on the DP_DETECTED bit alone to detect
                  * eDP ports. Consult the VBT as well as DP_DETECTED to
                  * detect eDP ports.
+                 *
+                 * Sadly the straps seem to be missing sometimes even for HDMI
+                 * ports (eg. on Voyo V3 - CHT x7-Z8700), so check both strap
+                 * and VBT for the presence of the port. Additionally we can't
+                 * trust the port type the VBT declares as we've seen at least
+                 * HDMI ports that the VBT claim are DP or eDP.
                  */
-                if (I915_READ(VLV_HDMIB) & SDVO_DETECTED &&
-                    !intel_dp_is_edp(dev, PORT_B))
+                has_edp = intel_dp_is_edp(dev, PORT_B);
+                has_port = intel_bios_is_port_present(dev_priv, PORT_B);
+                if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port)
+                        has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B);
+                if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp)
                         intel_hdmi_init(dev, VLV_HDMIB, PORT_B);
-                if (I915_READ(VLV_DP_B) & DP_DETECTED ||
-                    intel_dp_is_edp(dev, PORT_B))
-                        intel_dp_init(dev, VLV_DP_B, PORT_B);
 
-                if (I915_READ(VLV_HDMIC) & SDVO_DETECTED &&
-                    !intel_dp_is_edp(dev, PORT_C))
+                has_edp = intel_dp_is_edp(dev, PORT_C);
+                has_port = intel_bios_is_port_present(dev_priv, PORT_C);
+                if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port)
+                        has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C);
+                if ((I915_READ(VLV_HDMIC) & SDVO_DETECTED || has_port) && !has_edp)
                         intel_hdmi_init(dev, VLV_HDMIC, PORT_C);
-                if (I915_READ(VLV_DP_C) & DP_DETECTED ||
-                    intel_dp_is_edp(dev, PORT_C))
-                        intel_dp_init(dev, VLV_DP_C, PORT_C);
 
                 if (IS_CHERRYVIEW(dev)) {
-                        /* eDP not supported on port D, so don't check VBT */
-                        if (I915_READ(CHV_HDMID) & SDVO_DETECTED)
-                                intel_hdmi_init(dev, CHV_HDMID, PORT_D);
-                        if (I915_READ(CHV_DP_D) & DP_DETECTED)
+                        /*
+                         * eDP not supported on port D,
+                         * so no need to worry about it
+                         */
+                        has_port = intel_bios_is_port_present(dev_priv, PORT_D);
+                        if (I915_READ(CHV_DP_D) & DP_DETECTED || has_port)
                                 intel_dp_init(dev, CHV_DP_D, PORT_D);
+                        if (I915_READ(CHV_HDMID) & SDVO_DETECTED || has_port)
+                                intel_hdmi_init(dev, CHV_HDMID, PORT_D);
                 }
 
                 intel_dsi_init(dev);
@@ -15050,12 +15294,13 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
                 dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train;
         } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {
                 dev_priv->display.fdi_link_train = hsw_fdi_link_train;
-                if (IS_BROADWELL(dev_priv)) {
-                        dev_priv->display.modeset_commit_cdclk =
-                                broadwell_modeset_commit_cdclk;
-                        dev_priv->display.modeset_calc_cdclk =
-                                broadwell_modeset_calc_cdclk;
-                }
+        }
+
+        if (IS_BROADWELL(dev_priv)) {
+                dev_priv->display.modeset_commit_cdclk =
+                        broadwell_modeset_commit_cdclk;
+                dev_priv->display.modeset_calc_cdclk =
+                        broadwell_modeset_calc_cdclk;
         } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                 dev_priv->display.modeset_commit_cdclk =
                         valleyview_modeset_commit_cdclk;
@@ -15063,9 +15308,14 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
                         valleyview_modeset_calc_cdclk;
         } else if (IS_BROXTON(dev_priv)) {
                 dev_priv->display.modeset_commit_cdclk =
-                        broxton_modeset_commit_cdclk;
+                        bxt_modeset_commit_cdclk;
+                dev_priv->display.modeset_calc_cdclk =
+                        bxt_modeset_calc_cdclk;
+        } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
+                dev_priv->display.modeset_commit_cdclk =
+                        skl_modeset_commit_cdclk;
                 dev_priv->display.modeset_calc_cdclk =
-                        broxton_modeset_calc_cdclk;
+                        skl_modeset_calc_cdclk;
         }
 
         switch (INTEL_INFO(dev_priv)->gen) {
@@ -15293,7 +15543,7 @@ void intel_modeset_init_hw(struct drm_device *dev)
         dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq;
 
         intel_init_clock_gating(dev);
-        intel_enable_gt_powersave(dev);
+        intel_enable_gt_powersave(dev_priv);
 }
 
 /*
@@ -15363,7 +15613,6 @@ retry:
         }
 
         /* Write calculated watermark values back */
-        to_i915(dev)->wm.config = to_intel_atomic_state(state)->wm_config;
         for_each_crtc_in_state(state, crtc, cstate, i) {
                 struct intel_crtc_state *cs = to_intel_crtc_state(cstate);
 
@@ -15461,11 +15710,13 @@ void intel_modeset_init(struct drm_device *dev)
         }
 
         intel_update_czclk(dev_priv);
-        intel_update_rawclk(dev_priv);
         intel_update_cdclk(dev);
 
         intel_shared_dpll_init(dev);
 
+        if (dev_priv->max_cdclk_freq == 0)
+                intel_update_max_cdclk(dev);
+
         /* Just disable it once at startup */
         i915_disable_vga(dev);
         intel_setup_outputs(dev);
@@ -15606,8 +15857,8 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
         if (INTEL_INFO(dev)->gen < 4 && !intel_check_plane_mapping(crtc)) {
                 bool plane;
 
-                DRM_DEBUG_KMS("[CRTC:%d] wrong plane connection detected!\n",
-                              crtc->base.base.id);
+                DRM_DEBUG_KMS("[CRTC:%d:%s] wrong plane connection detected!\n",
+                              crtc->base.base.id, crtc->base.name);
 
                 /* Pipe has the wrong plane attached and the plane is active.
                  * Temporarily change the plane mapping and disable everything
@@ -15775,26 +16026,24 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                 if (crtc_state->base.active) {
                         dev_priv->active_crtcs |= 1 << crtc->pipe;
 
-                        if (IS_BROADWELL(dev_priv)) {
+                        if (INTEL_GEN(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
                                 pixclk = ilk_pipe_pixel_rate(crtc_state);
-
-                                /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
-                                if (crtc_state->ips_enabled)
-                                        pixclk = DIV_ROUND_UP(pixclk * 100, 95);
-                        } else if (IS_VALLEYVIEW(dev_priv) ||
-                                   IS_CHERRYVIEW(dev_priv) ||
-                                   IS_BROXTON(dev_priv))
+                        else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
                                 pixclk = crtc_state->base.adjusted_mode.crtc_clock;
                         else
                                 WARN_ON(dev_priv->display.modeset_calc_cdclk);
+
+                        /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
+                        if (IS_BROADWELL(dev_priv) && crtc_state->ips_enabled)
+                                pixclk = DIV_ROUND_UP(pixclk * 100, 95);
                 }
 
                 dev_priv->min_pixclk[crtc->pipe] = pixclk;
 
                 readout_plane_state(crtc);
 
-                DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",
-                              crtc->base.base.id,
+                DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n",
+                              crtc->base.base.id, crtc->base.name,
                               crtc->active ? "enabled" : "disabled");
         }
 
@@ -16025,15 +16274,16 @@ retry:
 
 void intel_modeset_gem_init(struct drm_device *dev)
 {
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_crtc *c;
         struct drm_i915_gem_object *obj;
         int ret;
 
-        intel_init_gt_powersave(dev);
+        intel_init_gt_powersave(dev_priv);
 
         intel_modeset_init_hw(dev);
 
-        intel_setup_overlay(dev);
+        intel_setup_overlay(dev_priv);
 
         /*
          * Make sure any fbs we allocated at startup are properly
@@ -16063,22 +16313,19 @@ void intel_modeset_gem_init(struct drm_device *dev)
         intel_backlight_register(dev);
 }
 
-void intel_connector_unregister(struct intel_connector *intel_connector)
+void intel_connector_unregister(struct drm_connector *connector)
 {
-        struct drm_connector *connector = &intel_connector->base;
+        struct intel_connector *intel_connector = to_intel_connector(connector);
 
+        intel_backlight_device_unregister(intel_connector);
         intel_panel_destroy_backlight(connector);
-        drm_connector_unregister(connector);
 }
 
 void intel_modeset_cleanup(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_connector *connector;
-
-        intel_disable_gt_powersave(dev);
 
-        intel_backlight_unregister(dev);
+        intel_disable_gt_powersave(dev_priv);
 
         /*
          * Interrupts and polling as the first thing to avoid creating havoc.
@@ -16100,27 +16347,17 @@ void intel_modeset_cleanup(struct drm_device *dev)
         /* flush any delayed tasks or pending work */
         flush_scheduled_work();
 
-        /* destroy the backlight and sysfs files before encoders/connectors */
-        for_each_intel_connector(dev, connector)
-                connector->unregister(connector);
+        drm_connector_unregister_all(dev);
 
         drm_mode_config_cleanup(dev);
 
-        intel_cleanup_overlay(dev);
+        intel_cleanup_overlay(dev_priv);
 
-        intel_cleanup_gt_powersave(dev);
+        intel_cleanup_gt_powersave(dev_priv);
 
         intel_teardown_gmbus(dev);
 }
 
-/*
- * Return which encoder is currently attached for connector.
- */
-struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
-{
-        return &intel_attached_encoder(connector)->base;
-}
-
 void intel_connector_attach_encoder(struct intel_connector *connector,
                                     struct intel_encoder *encoder)
 {
@@ -16204,9 +16441,8 @@ struct intel_display_error_state {
 };
 
 struct intel_display_error_state *
-intel_display_capture_error_state(struct drm_device *dev)
+intel_display_capture_error_state(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_display_error_state *error;
         int transcoders[] = {
                 TRANSCODER_A,
@@ -16216,14 +16452,14 @@ intel_display_capture_error_state(struct drm_device *dev)
         };
         int i;
 
-        if (INTEL_INFO(dev)->num_pipes == 0)
+        if (INTEL_INFO(dev_priv)->num_pipes == 0)
                 return NULL;
 
         error = kzalloc(sizeof(*error), GFP_ATOMIC);
         if (error == NULL)
                 return NULL;
 
-        if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+        if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
                 error->power_well_driver = I915_READ(HSW_PWR_WELL_DRIVER);
 
         for_each_pipe(dev_priv, i) {
@@ -16239,25 +16475,25 @@ intel_display_capture_error_state(struct drm_device *dev)
 
                 error->plane[i].control = I915_READ(DSPCNTR(i));
                 error->plane[i].stride = I915_READ(DSPSTRIDE(i));
-                if (INTEL_INFO(dev)->gen <= 3) {
+                if (INTEL_GEN(dev_priv) <= 3) {
                         error->plane[i].size = I915_READ(DSPSIZE(i));
                         error->plane[i].pos = I915_READ(DSPPOS(i));
                 }
-                if (INTEL_INFO(dev)->gen <= 7 && !IS_HASWELL(dev))
+                if (INTEL_GEN(dev_priv) <= 7 && !IS_HASWELL(dev_priv))
                         error->plane[i].addr = I915_READ(DSPADDR(i));
-                if (INTEL_INFO(dev)->gen >= 4) {
+                if (INTEL_GEN(dev_priv) >= 4) {
                         error->plane[i].surface = I915_READ(DSPSURF(i));
                         error->plane[i].tile_offset = I915_READ(DSPTILEOFF(i));
                 }
 
                 error->pipe[i].source = I915_READ(PIPESRC(i));
 
-                if (HAS_GMCH_DISPLAY(dev))
+                if (HAS_GMCH_DISPLAY(dev_priv))
                         error->pipe[i].stat = I915_READ(PIPESTAT(i));
         }
 
         /* Note: this does not include DSI transcoders. */
-        error->num_transcoders = INTEL_INFO(dev)->num_pipes;
+        error->num_transcoders = INTEL_INFO(dev_priv)->num_pipes;
         if (HAS_DDI(dev_priv))
                 error->num_transcoders++; /* Account for eDP. */
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f192f58708c2..ffa43eca14d3 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -131,11 +131,6 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,
                                       enum pipe pipe);
 static void intel_dp_unset_edid(struct intel_dp *intel_dp);
 
-static unsigned int intel_dp_unused_lane_mask(int lane_count)
-{
-        return ~((1 << lane_count) - 1) & 0xf;
-}
-
 static int
 intel_dp_max_link_bw(struct intel_dp  *intel_dp)
 {
@@ -775,6 +770,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,
                DP_AUX_CH_CTL_TIME_OUT_1600us |
                DP_AUX_CH_CTL_RECEIVE_ERROR |
                (send_bytes << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |
+               DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
                DP_AUX_CH_CTL_SYNC_PULSE_SKL(32);
 }
 
@@ -1181,7 +1177,6 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp)
 static void
 intel_dp_aux_fini(struct intel_dp *intel_dp)
 {
-        drm_dp_aux_unregister(&intel_dp->aux);
         kfree(intel_dp->aux.name);
 }
 
@@ -1216,15 +1211,6 @@ intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector)
         return 0;
 }
 
-static void
-intel_dp_connector_unregister(struct intel_connector *intel_connector)
-{
-        struct intel_dp *intel_dp = intel_attached_dp(&intel_connector->base);
-
-        intel_dp_aux_fini(intel_dp);
-        intel_connector_unregister(intel_connector);
-}
-
 static int
 intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)
 {
@@ -1582,6 +1568,27 @@ found:
                                 &pipe_config->dp_m2_n2);
         }
 
+        /*
+         * DPLL0 VCO may need to be adjusted to get the correct
+         * clock for eDP. This will affect cdclk as well.
+         */
+        if (is_edp(intel_dp) &&
+            (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))) {
+                int vco;
+
+                switch (pipe_config->port_clock / 2) {
+                case 108000:
+                case 216000:
+                        vco = 8640000;
+                        break;
+                default:
+                        vco = 8100000;
+                        break;
+                }
+
+                to_intel_atomic_state(pipe_config->base.state)->cdclk_pll_vco = vco;
+        }
+
         if (!HAS_DDI(dev))
                 intel_dp_set_clock(encoder, pipe_config);
 
@@ -2460,50 +2467,6 @@ static void vlv_post_disable_dp(struct intel_encoder *encoder)
         intel_dp_link_down(intel_dp);
 }
 
-static void chv_data_lane_soft_reset(struct intel_encoder *encoder,
-                                     bool reset)
-{
-        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base));
-        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
-        enum pipe pipe = crtc->pipe;
-        uint32_t val;
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW0(ch));
-        if (reset)
-                val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
-        else
-                val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW0(ch), val);
-
-        if (crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW0(ch));
-                if (reset)
-                        val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
-                else
-                        val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW0(ch), val);
-        }
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW1(ch));
-        val |= CHV_PCS_REQ_SOFTRESET_EN;
-        if (reset)
-                val &= ~DPIO_PCS_CLK_SOFT_RESET;
-        else
-                val |= DPIO_PCS_CLK_SOFT_RESET;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW1(ch), val);
-
-        if (crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW1(ch));
-                val |= CHV_PCS_REQ_SOFTRESET_EN;
-                if (reset)
-                        val &= ~DPIO_PCS_CLK_SOFT_RESET;
-                else
-                        val |= DPIO_PCS_CLK_SOFT_RESET;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW1(ch), val);
-        }
-}
-
 static void chv_post_disable_dp(struct intel_encoder *encoder)
 {
         struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
@@ -2811,266 +2774,38 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp)
 
 static void vlv_pre_enable_dp(struct intel_encoder *encoder)
 {
-        struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
-        struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel port = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-        u32 val;
-
-        mutex_lock(&dev_priv->sb_lock);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW8(port));
-        val = 0;
-        if (pipe)
-                val |= (1<<21);
-        else
-                val &= ~(1<<21);
-        val |= 0x001000c4;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW8(port), val);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW14(port), 0x00760018);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW23(port), 0x00400888);
-
-        mutex_unlock(&dev_priv->sb_lock);
+        vlv_phy_pre_encoder_enable(encoder);
 
         intel_enable_dp(encoder);
 }
 
 static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)
 {
-        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel port = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-
         intel_dp_prepare(encoder);
 
-        /* Program Tx lane resets to default */
-        mutex_lock(&dev_priv->sb_lock);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port),
-                         DPIO_PCS_TX_LANE2_RESET |
-                         DPIO_PCS_TX_LANE1_RESET);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port),
-                         DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |
-                         DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN |
-                         (1<<DPIO_PCS_CLK_DATAWIDTH_SHIFT) |
-                                 DPIO_PCS_CLK_SOFT_RESET);
-
-        /* Fix up inter-pair skew failure */
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW12(port), 0x00750f00);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW11(port), 0x00001500);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW14(port), 0x40400000);
-        mutex_unlock(&dev_priv->sb_lock);
+        vlv_phy_pre_pll_enable(encoder);
 }
 
 static void chv_pre_enable_dp(struct intel_encoder *encoder)
 {
-        struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
-        struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel ch = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-        int data, i, stagger;
-        u32 val;
-
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* allow hardware to manage TX FIFO reset source */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW11(ch));
-        val &= ~DPIO_LANEDESKEW_STRAP_OVRD;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW11(ch), val);
-
-        if (intel_crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW11(ch));
-                val &= ~DPIO_LANEDESKEW_STRAP_OVRD;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW11(ch), val);
-        }
-
-        /* Program Tx lane latency optimal setting*/
-        for (i = 0; i < intel_crtc->config->lane_count; i++) {
-                /* Set the upar bit */
-                if (intel_crtc->config->lane_count == 1)
-                        data = 0x0;
-                else
-                        data = (i == 1) ? 0x0 : 0x1;
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW14(ch, i),
-                                data << DPIO_UPAR_SHIFT);
-        }
-
-        /* Data lane stagger programming */
-        if (intel_crtc->config->port_clock > 270000)
-                stagger = 0x18;
-        else if (intel_crtc->config->port_clock > 135000)
-                stagger = 0xd;
-        else if (intel_crtc->config->port_clock > 67500)
-                stagger = 0x7;
-        else if (intel_crtc->config->port_clock > 33750)
-                stagger = 0x4;
-        else
-                stagger = 0x2;
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW11(ch));
-        val |= DPIO_TX2_STAGGER_MASK(0x1f);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW11(ch), val);
-
-        if (intel_crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW11(ch));
-                val |= DPIO_TX2_STAGGER_MASK(0x1f);
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW11(ch), val);
-        }
-
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW12(ch),
-                       DPIO_LANESTAGGER_STRAP(stagger) |
-                       DPIO_LANESTAGGER_STRAP_OVRD |
-                       DPIO_TX1_STAGGER_MASK(0x1f) |
-                       DPIO_TX1_STAGGER_MULT(6) |
-                       DPIO_TX2_STAGGER_MULT(0));
-
-        if (intel_crtc->config->lane_count > 2) {
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW12(ch),
-                               DPIO_LANESTAGGER_STRAP(stagger) |
-                               DPIO_LANESTAGGER_STRAP_OVRD |
-                               DPIO_TX1_STAGGER_MASK(0x1f) |
-                               DPIO_TX1_STAGGER_MULT(7) |
-                               DPIO_TX2_STAGGER_MULT(5));
-        }
-
-        /* Deassert data lane reset */
-        chv_data_lane_soft_reset(encoder, false);
-
-        mutex_unlock(&dev_priv->sb_lock);
+        chv_phy_pre_encoder_enable(encoder);
 
         intel_enable_dp(encoder);
 
         /* Second common lane will stay alive on its own now */
-        if (dport->release_cl2_override) {
-                chv_phy_powergate_ch(dev_priv, DPIO_PHY0, DPIO_CH1, false);
-                dport->release_cl2_override = false;
-        }
+        chv_phy_release_cl2_override(encoder);
 }
 
 static void chv_dp_pre_pll_enable(struct intel_encoder *encoder)
 {
-        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel ch = vlv_dport_to_channel(dport);
-        enum pipe pipe = intel_crtc->pipe;
-        unsigned int lane_mask =
-                intel_dp_unused_lane_mask(intel_crtc->config->lane_count);
-        u32 val;
-
         intel_dp_prepare(encoder);
 
-        /*
-         * Must trick the second common lane into life.
-         * Otherwise we can't even access the PLL.
-         */
-        if (ch == DPIO_CH0 && pipe == PIPE_B)
-                dport->release_cl2_override =
-                        !chv_phy_powergate_ch(dev_priv, DPIO_PHY0, DPIO_CH1, true);
-
-        chv_phy_powergate_lanes(encoder, true, lane_mask);
-
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* Assert data lane reset */
-        chv_data_lane_soft_reset(encoder, true);
-
-        /* program left/right clock distribution */
-        if (pipe != PIPE_B) {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW5_CH0);
-                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
-                if (ch == DPIO_CH0)
-                        val |= CHV_BUFLEFTENA1_FORCE;
-                if (ch == DPIO_CH1)
-                        val |= CHV_BUFRIGHTENA1_FORCE;
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW5_CH0, val);
-        } else {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW1_CH1);
-                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
-                if (ch == DPIO_CH0)
-                        val |= CHV_BUFLEFTENA2_FORCE;
-                if (ch == DPIO_CH1)
-                        val |= CHV_BUFRIGHTENA2_FORCE;
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW1_CH1, val);
-        }
-
-        /* program clock channel usage */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW8(ch));
-        val |= CHV_PCS_USEDCLKCHANNEL_OVRRIDE;
-        if (pipe != PIPE_B)
-                val &= ~CHV_PCS_USEDCLKCHANNEL;
-        else
-                val |= CHV_PCS_USEDCLKCHANNEL;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW8(ch), val);
-
-        if (intel_crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW8(ch));
-                val |= CHV_PCS_USEDCLKCHANNEL_OVRRIDE;
-                if (pipe != PIPE_B)
-                        val &= ~CHV_PCS_USEDCLKCHANNEL;
-                else
-                        val |= CHV_PCS_USEDCLKCHANNEL;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW8(ch), val);
-        }
-
-        /*
-         * This a a bit weird since generally CL
-         * matches the pipe, but here we need to
-         * pick the CL based on the port.
-         */
-        val = vlv_dpio_read(dev_priv, pipe, CHV_CMN_DW19(ch));
-        if (pipe != PIPE_B)
-                val &= ~CHV_CMN_USEDCLKCHANNEL;
-        else
-                val |= CHV_CMN_USEDCLKCHANNEL;
-        vlv_dpio_write(dev_priv, pipe, CHV_CMN_DW19(ch), val);
-
-        mutex_unlock(&dev_priv->sb_lock);
+        chv_phy_pre_pll_enable(encoder);
 }
 
 static void chv_dp_post_pll_disable(struct intel_encoder *encoder)
 {
-        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe;
-        u32 val;
-
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* disable left/right clock distribution */
-        if (pipe != PIPE_B) {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW5_CH0);
-                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW5_CH0, val);
-        } else {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW1_CH1);
-                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW1_CH1, val);
-        }
-
-        mutex_unlock(&dev_priv->sb_lock);
-
-        /*
-         * Leave the power down bit cleared for at least one
-         * lane so that chv_powergate_phy_ch() will power
-         * on something when the channel is otherwise unused.
-         * When the port is off and the override is removed
-         * the lanes power down anyway, so otherwise it doesn't
-         * really matter what the state of power down bits is
-         * after this.
-         */
-        chv_phy_powergate_lanes(encoder, false, 0x0);
+        chv_phy_post_pll_disable(encoder);
 }
 
 /*
@@ -3178,16 +2913,10 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)
 
 static uint32_t vlv_signal_levels(struct intel_dp *intel_dp)
 {
-        struct drm_device *dev = intel_dp_to_dev(intel_dp);
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(dport->base.base.crtc);
+        struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
         unsigned long demph_reg_value, preemph_reg_value,
                 uniqtranscale_reg_value;
         uint8_t train_set = intel_dp->train_set[0];
-        enum dpio_channel port = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
 
         switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
         case DP_TRAIN_PRE_EMPH_LEVEL_0:
@@ -3262,37 +2991,18 @@ static uint32_t vlv_signal_levels(struct intel_dp *intel_dp)
                 return 0;
         }
 
-        mutex_lock(&dev_priv->sb_lock);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), 0x00000000);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW4(port), demph_reg_value);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW2(port),
-                         uniqtranscale_reg_value);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW3(port), 0x0C782040);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW11(port), 0x00030000);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW9(port), preemph_reg_value);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), 0x80000000);
-        mutex_unlock(&dev_priv->sb_lock);
+        vlv_set_phy_signal_level(encoder, demph_reg_value, preemph_reg_value,
+                                 uniqtranscale_reg_value, 0);
 
         return 0;
 }
 
-static bool chv_need_uniq_trans_scale(uint8_t train_set)
-{
-        return (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) == DP_TRAIN_PRE_EMPH_LEVEL_0 &&
-                (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) == DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
-}
-
 static uint32_t chv_signal_levels(struct intel_dp *intel_dp)
 {
-        struct drm_device *dev = intel_dp_to_dev(intel_dp);
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
-        struct intel_crtc *intel_crtc = to_intel_crtc(dport->base.base.crtc);
-        u32 deemph_reg_value, margin_reg_value, val;
+        struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
+        u32 deemph_reg_value, margin_reg_value;
+        bool uniq_trans_scale = false;
         uint8_t train_set = intel_dp->train_set[0];
-        enum dpio_channel ch = vlv_dport_to_channel(dport);
-        enum pipe pipe = intel_crtc->pipe;
-        int i;
 
         switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
         case DP_TRAIN_PRE_EMPH_LEVEL_0:
@@ -3312,7 +3022,7 @@ static uint32_t chv_signal_levels(struct intel_dp *intel_dp)
                 case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
                         deemph_reg_value = 128;
                         margin_reg_value = 154;
-                        /* FIXME extra to set for 1200 */
+                        uniq_trans_scale = true;
                         break;
                 default:
                         return 0;
@@ -3364,88 +3074,8 @@ static uint32_t chv_signal_levels(struct intel_dp *intel_dp)
                 return 0;
         }
 
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* Clear calc init */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW10(ch));
-        val &= ~(DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3);
-        val &= ~(DPIO_PCS_TX1DEEMP_MASK | DPIO_PCS_TX2DEEMP_MASK);
-        val |= DPIO_PCS_TX1DEEMP_9P5 | DPIO_PCS_TX2DEEMP_9P5;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW10(ch), val);
-
-        if (intel_crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW10(ch));
-                val &= ~(DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3);
-                val &= ~(DPIO_PCS_TX1DEEMP_MASK | DPIO_PCS_TX2DEEMP_MASK);
-                val |= DPIO_PCS_TX1DEEMP_9P5 | DPIO_PCS_TX2DEEMP_9P5;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW10(ch), val);
-        }
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW9(ch));
-        val &= ~(DPIO_PCS_TX1MARGIN_MASK | DPIO_PCS_TX2MARGIN_MASK);
-        val |= DPIO_PCS_TX1MARGIN_000 | DPIO_PCS_TX2MARGIN_000;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW9(ch), val);
-
-        if (intel_crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW9(ch));
-                val &= ~(DPIO_PCS_TX1MARGIN_MASK | DPIO_PCS_TX2MARGIN_MASK);
-                val |= DPIO_PCS_TX1MARGIN_000 | DPIO_PCS_TX2MARGIN_000;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW9(ch), val);
-        }
-
-        /* Program swing deemph */
-        for (i = 0; i < intel_crtc->config->lane_count; i++) {
-                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW4(ch, i));
-                val &= ~DPIO_SWING_DEEMPH9P5_MASK;
-                val |= deemph_reg_value << DPIO_SWING_DEEMPH9P5_SHIFT;
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW4(ch, i), val);
-        }
-
-        /* Program swing margin */
-        for (i = 0; i < intel_crtc->config->lane_count; i++) {
-                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW2(ch, i));
-
-                val &= ~DPIO_SWING_MARGIN000_MASK;
-                val |= margin_reg_value << DPIO_SWING_MARGIN000_SHIFT;
-
-                /*
-                 * Supposedly this value shouldn't matter when unique transition
-                 * scale is disabled, but in fact it does matter. Let's just
-                 * always program the same value and hope it's OK.
-                 */
-                val &= ~(0xff << DPIO_UNIQ_TRANS_SCALE_SHIFT);
-                val |= 0x9a << DPIO_UNIQ_TRANS_SCALE_SHIFT;
-
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW2(ch, i), val);
-        }
-
-        /*
-         * The document said it needs to set bit 27 for ch0 and bit 26
-         * for ch1. Might be a typo in the doc.
-         * For now, for this unique transition scale selection, set bit
-         * 27 for ch0 and ch1.
-         */
-        for (i = 0; i < intel_crtc->config->lane_count; i++) {
-                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW3(ch, i));
-                if (chv_need_uniq_trans_scale(train_set))
-                        val |= DPIO_TX_UNIQ_TRANS_SCALE_EN;
-                else
-                        val &= ~DPIO_TX_UNIQ_TRANS_SCALE_EN;
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW3(ch, i), val);
-        }
-
-        /* Start swing calculation */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW10(ch));
-        val |= DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW10(ch), val);
-
-        if (intel_crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW10(ch));
-                val |= DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW10(ch), val);
-        }
-
-        mutex_unlock(&dev_priv->sb_lock);
+        chv_set_phy_signal_level(encoder, deemph_reg_value,
+                                 margin_reg_value, uniq_trans_scale);
 
         return 0;
 }
@@ -3714,7 +3344,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
         struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
         struct drm_device *dev = dig_port->base.base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        uint8_t rev;
 
         if (drm_dp_dpcd_read(&intel_dp->aux, 0x000, intel_dp->dpcd,
                              sizeof(intel_dp->dpcd)) < 0)
@@ -3771,6 +3400,15 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
                         DRM_DEBUG_KMS("PSR2 %s on sink",
                                 dev_priv->psr.psr2_support ? "supported" : "not supported");
                 }
+
+                /* Read the eDP Display control capabilities registers */
+                memset(intel_dp->edp_dpcd, 0, sizeof(intel_dp->edp_dpcd));
+                if ((intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) &&
+                                (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,
+                                                intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) ==
+                                                                sizeof(intel_dp->edp_dpcd)))
+                        DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd),
+                                        intel_dp->edp_dpcd);
         }
 
         DRM_DEBUG_KMS("Display Port TPS3 support: source %s, sink %s\n",
@@ -3778,10 +3416,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
                       yesno(drm_dp_tps3_supported(intel_dp->dpcd)));
 
         /* Intermediate frequency support */
-        if (is_edp(intel_dp) &&
-            (intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) &&
-            (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, &rev, 1) == 1) &&
-            (rev >= 0x03)) { /* eDp v1.4 or higher */
+        if (is_edp(intel_dp) && (intel_dp->edp_dpcd[0] >= 0x03)) { /* eDp v1.4 or higher */
                 __le16 sink_rates[DP_MAX_SUPPORTED_RATES];
                 int i;
 
@@ -4812,6 +4447,13 @@ done:
 }
 
 static void
+intel_dp_connector_unregister(struct drm_connector *connector)
+{
+        drm_dp_aux_unregister(&intel_attached_dp(connector)->aux);
+        intel_connector_unregister(connector);
+}
+
+static void
 intel_dp_connector_destroy(struct drm_connector *connector)
 {
         struct intel_connector *intel_connector = to_intel_connector(connector);
@@ -4851,6 +4493,9 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
                         intel_dp->edp_notifier.notifier_call = NULL;
                 }
         }
+
+        intel_dp_aux_fini(intel_dp);
+
         drm_encoder_cleanup(encoder);
         kfree(intel_dig_port);
 }
@@ -4927,6 +4572,7 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_dp_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
+        .early_unregister = intel_dp_connector_unregister,
         .destroy = intel_dp_connector_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -4935,7 +4581,6 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = {
         .get_modes = intel_dp_get_modes,
         .mode_valid = intel_dp_mode_valid,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_encoder_funcs intel_dp_enc_funcs = {
@@ -4977,9 +4622,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
         intel_display_power_get(dev_priv, power_domain);
 
         if (long_hpd) {
-                /* indicate that we need to restart link training */
-                intel_dp->train_set_valid = false;
-
                 intel_dp_long_pulse(intel_dp->attached_connector);
                 if (intel_dp->is_mst)
                         ret = IRQ_HANDLED;
@@ -5590,14 +5232,14 @@ void intel_edp_drrs_flush(struct drm_device *dev,
  *
  * DRRS saves power by switching to low RR based on usage scenarios.
  *
- * eDP DRRS:-
- *        The implementation is based on frontbuffer tracking implementation.
- * When there is a disturbance on the screen triggered by user activity or a
- * periodic system activity, DRRS is disabled (RR is changed to high RR).
- * When there is no movement on screen, after a timeout of 1 second, a switch
- * to low RR is made.
- *        For integration with frontbuffer tracking code,
- * intel_edp_drrs_invalidate() and intel_edp_drrs_flush() are called.
+ * The implementation is based on frontbuffer tracking implementation.  When
+ * there is a disturbance on the screen triggered by user activity or a periodic
+ * system activity, DRRS is disabled (RR is changed to high RR).  When there is
+ * no movement on screen, after a timeout of 1 second, a switch to low RR is
+ * made.
+ *
+ * For integration with frontbuffer tracking code, intel_edp_drrs_invalidate()
+ * and intel_edp_drrs_flush() are called.
  *
  * DRRS can be further extended to support other internal panels and also
  * the scenario of video playback wherein RR is set based on the rate
@@ -5725,8 +5367,11 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
         if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) {
                 fixed_mode = drm_mode_duplicate(dev,
                                         dev_priv->vbt.lfp_lvds_vbt_mode);
-                if (fixed_mode)
+                if (fixed_mode) {
                         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
+                        connector->display_info.width_mm = fixed_mode->width_mm;
+                        connector->display_info.height_mm = fixed_mode->height_mm;
+                }
         }
         mutex_unlock(&dev->mode_config.mutex);
 
@@ -5840,7 +5485,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                 intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
         else
                 intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_dp_connector_unregister;
 
         /* Set up the hotplug pin. */
         switch (port) {
@@ -5923,9 +5567,9 @@ fail:
         return false;
 }
 
-void
-intel_dp_init(struct drm_device *dev,
-              i915_reg_t output_reg, enum port port)
+bool intel_dp_init(struct drm_device *dev,
+                   i915_reg_t output_reg,
+                   enum port port)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_digital_port *intel_dig_port;
@@ -5935,7 +5579,7 @@ intel_dp_init(struct drm_device *dev,
 
         intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
         if (!intel_dig_port)
-                return;
+                return false;
 
         intel_connector = intel_connector_alloc();
         if (!intel_connector)
@@ -5945,7 +5589,7 @@ intel_dp_init(struct drm_device *dev,
         encoder = &intel_encoder->base;
 
         if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
-                             DRM_MODE_ENCODER_TMDS, NULL))
+                             DRM_MODE_ENCODER_TMDS, "DP %c", port_name(port)))
                 goto err_encoder_init;
 
         intel_encoder->compute_config = intel_dp_compute_config;
@@ -5992,7 +5636,7 @@ intel_dp_init(struct drm_device *dev,
         if (!intel_dp_init_connector(intel_dig_port, intel_connector))
                 goto err_init_connector;
 
-        return;
+        return true;
 
 err_init_connector:
         drm_encoder_cleanup(encoder);
@@ -6000,8 +5644,7 @@ err_encoder_init:
         kfree(intel_connector);
 err_connector_alloc:
         kfree(intel_dig_port);
-
-        return;
+        return false;
 }
 
 void intel_dp_mst_suspend(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
new file mode 100644
index 000000000000..6532e226db29
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
@@ -0,0 +1,172 @@
+/*
+ * Copyright © 2015 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.
+ *
+ */
+
+#include "intel_drv.h"
+
+static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
+{
+        uint8_t reg_val = 0;
+
+        if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
+                              &reg_val) < 0) {
+                DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
+                              DP_EDP_DISPLAY_CONTROL_REGISTER);
+                return;
+        }
+        if (enable)
+                reg_val |= DP_EDP_BACKLIGHT_ENABLE;
+        else
+                reg_val &= ~(DP_EDP_BACKLIGHT_ENABLE);
+
+        if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
+                               reg_val) != 1) {
+                DRM_DEBUG_KMS("Failed to %s aux backlight\n",
+                              enable ? "enable" : "disable");
+        }
+}
+
+/*
+ * Read the current backlight value from DPCD register(s) based
+ * on if 8-bit(MSB) or 16-bit(MSB and LSB) values are supported
+ */
+static uint32_t intel_dp_aux_get_backlight(struct intel_connector *connector)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+        uint8_t read_val[2] = { 0x0 };
+        uint16_t level = 0;
+
+        if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_BACKLIGHT_BRIGHTNESS_MSB,
+                             &read_val, sizeof(read_val)) < 0) {
+                DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
+                              DP_EDP_BACKLIGHT_BRIGHTNESS_MSB);
+                return 0;
+        }
+        level = read_val[0];
+        if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)
+                level = (read_val[0] << 8 | read_val[1]);
+
+        return level;
+}
+
+/*
+ * Sends the current backlight level over the aux channel, checking if its using
+ * 8-bit or 16 bit value (MSB and LSB)
+ */
+static void
+intel_dp_aux_set_backlight(struct intel_connector *connector, u32 level)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+        uint8_t vals[2] = { 0x0 };
+
+        vals[0] = level;
+
+        /* Write the MSB and/or LSB */
+        if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT) {
+                vals[0] = (level & 0xFF00) >> 8;
+                vals[1] = (level & 0xFF);
+        }
+        if (drm_dp_dpcd_write(&intel_dp->aux, DP_EDP_BACKLIGHT_BRIGHTNESS_MSB,
+                              vals, sizeof(vals)) < 0) {
+                DRM_DEBUG_KMS("Failed to write aux backlight level\n");
+                return;
+        }
+}
+
+static void intel_dp_aux_enable_backlight(struct intel_connector *connector)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+        uint8_t dpcd_buf = 0;
+
+        set_aux_backlight_enable(intel_dp, true);
+
+        if ((drm_dp_dpcd_readb(&intel_dp->aux,
+                               DP_EDP_BACKLIGHT_MODE_SET_REGISTER, &dpcd_buf) == 1) &&
+            ((dpcd_buf & DP_EDP_BACKLIGHT_CONTROL_MODE_MASK) ==
+             DP_EDP_BACKLIGHT_CONTROL_MODE_PRESET))
+                drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_BACKLIGHT_MODE_SET_REGISTER,
+                                   (dpcd_buf | DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD));
+}
+
+static void intel_dp_aux_disable_backlight(struct intel_connector *connector)
+{
+        set_aux_backlight_enable(enc_to_intel_dp(&connector->encoder->base), false);
+}
+
+static int intel_dp_aux_setup_backlight(struct intel_connector *connector,
+                                        enum pipe pipe)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+        struct intel_panel *panel = &connector->panel;
+
+        intel_dp_aux_enable_backlight(connector);
+
+        if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)
+                panel->backlight.max = 0xFFFF;
+        else
+                panel->backlight.max = 0xFF;
+
+        panel->backlight.min = 0;
+        panel->backlight.level = intel_dp_aux_get_backlight(connector);
+
+        panel->backlight.enabled = panel->backlight.level != 0;
+
+        return 0;
+}
+
+static bool
+intel_dp_aux_display_control_capable(struct intel_connector *connector)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+
+        /* Check the  eDP Display control capabilities registers to determine if
+         * the panel can support backlight control over the aux channel
+         */
+        if (intel_dp->edp_dpcd[1] & DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP &&
+            (intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_AUX_ENABLE_CAP) &&
+            !((intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_PIN_ENABLE_CAP) ||
+              (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_PWM_PIN_CAP))) {
+                DRM_DEBUG_KMS("AUX Backlight Control Supported!\n");
+                return true;
+        }
+        return false;
+}
+
+int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
+{
+        struct intel_panel *panel = &intel_connector->panel;
+
+        if (!i915.enable_dpcd_backlight)
+                return -ENODEV;
+
+        if (!intel_dp_aux_display_control_capable(intel_connector))
+                return -ENODEV;
+
+        panel->backlight.setup = intel_dp_aux_setup_backlight;
+        panel->backlight.enable = intel_dp_aux_enable_backlight;
+        panel->backlight.disable = intel_dp_aux_disable_backlight;
+        panel->backlight.set = intel_dp_aux_set_backlight;
+        panel->backlight.get = intel_dp_aux_get_backlight;
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
index 0b8eefc2acc5..60fb39cd220b 100644
--- a/drivers/gpu/drm/i915/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
@@ -85,8 +85,7 @@ static bool
 intel_dp_reset_link_train(struct intel_dp *intel_dp,
                         uint8_t dp_train_pat)
 {
-        if (!intel_dp->train_set_valid)
-                memset(intel_dp->train_set, 0, sizeof(intel_dp->train_set));
+        memset(intel_dp->train_set, 0, sizeof(intel_dp->train_set));
         intel_dp_set_signal_levels(intel_dp);
         return intel_dp_set_link_train(intel_dp, dp_train_pat);
 }
@@ -161,23 +160,6 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
                         break;
                 }
 
-                /*
-                 * if we used previously trained voltage and pre-emphasis values
-                 * and we don't get clock recovery, reset link training values
-                 */
-                if (intel_dp->train_set_valid) {
-                        DRM_DEBUG_KMS("clock recovery not ok, reset");
-                        /* clear the flag as we are not reusing train set */
-                        intel_dp->train_set_valid = false;
-                        if (!intel_dp_reset_link_train(intel_dp,
-                                                       DP_TRAINING_PATTERN_1 |
-                                                       DP_LINK_SCRAMBLING_DISABLE)) {
-                                DRM_ERROR("failed to enable link training\n");
-                                return;
-                        }
-                        continue;
-                }
-
                 /* Check to see if we've tried the max voltage */
                 for (i = 0; i < intel_dp->lane_count; i++)
                         if ((intel_dp->train_set[i] & DP_TRAIN_MAX_SWING_REACHED) == 0)
@@ -284,7 +266,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
                 /* Make sure clock is still ok */
                 if (!drm_dp_clock_recovery_ok(link_status,
                                               intel_dp->lane_count)) {
-                        intel_dp->train_set_valid = false;
                         intel_dp_link_training_clock_recovery(intel_dp);
                         intel_dp_set_link_train(intel_dp,
                                                 training_pattern |
@@ -301,7 +282,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
                 /* Try 5 times, then try clock recovery if that fails */
                 if (tries > 5) {
-                        intel_dp->train_set_valid = false;
                         intel_dp_link_training_clock_recovery(intel_dp);
                         intel_dp_set_link_train(intel_dp,
                                                 training_pattern |
@@ -322,10 +302,8 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
         intel_dp_set_idle_link_train(intel_dp);
 
-        if (channel_eq) {
-                intel_dp->train_set_valid = true;
+        if (channel_eq)
                 DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n");
-        }
 }
 
 void intel_dp_stop_link_train(struct intel_dp *intel_dp)
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 7a34090cef34..9646816604be 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -336,6 +336,7 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_dp_mst_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_dp_mst_connector_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -455,7 +456,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
         drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs, DRM_MODE_CONNECTOR_DisplayPort);
         drm_connector_helper_add(connector, &intel_dp_mst_connector_helper_funcs);
 
-        intel_connector->unregister = intel_connector_unregister;
         intel_connector->get_hw_state = intel_dp_mst_get_hw_state;
         intel_connector->mst_port = intel_dp;
         intel_connector->port = port;
@@ -489,7 +489,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         struct intel_connector *intel_connector = to_intel_connector(connector);
         struct drm_device *dev = connector->dev;
 
-        intel_connector->unregister(intel_connector);
+        drm_connector_unregister(connector);
 
         /* need to nuke the connector */
         drm_modeset_lock_all(dev);
@@ -534,7 +534,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
         intel_mst->primary = intel_dig_port;
 
         drm_encoder_init(dev, &intel_encoder->base, &intel_dp_mst_enc_funcs,
-                         DRM_MODE_ENCODER_DPMST, NULL);
+                         DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));
 
         intel_encoder->type = INTEL_OUTPUT_DP_MST;
         intel_encoder->crtc_mask = 0x7;
diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/intel_dpio_phy.c
new file mode 100644
index 000000000000..288da35572b4
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dpio_phy.c
@@ -0,0 +1,470 @@
+/*
+ * Copyright © 2014-2016 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.
+ */
+
+#include "intel_drv.h"
+
+void chv_set_phy_signal_level(struct intel_encoder *encoder,
+                              u32 deemph_reg_value, u32 margin_reg_value,
+                              bool uniq_trans_scale)
+{
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct intel_crtc *intel_crtc = to_intel_crtc(dport->base.base.crtc);
+        enum dpio_channel ch = vlv_dport_to_channel(dport);
+        enum pipe pipe = intel_crtc->pipe;
+        u32 val;
+        int i;
+
+        mutex_lock(&dev_priv->sb_lock);
+
+        /* Clear calc init */
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW10(ch));
+        val &= ~(DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3);
+        val &= ~(DPIO_PCS_TX1DEEMP_MASK | DPIO_PCS_TX2DEEMP_MASK);
+        val |= DPIO_PCS_TX1DEEMP_9P5 | DPIO_PCS_TX2DEEMP_9P5;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW10(ch), val);
+
+        if (intel_crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW10(ch));
+                val &= ~(DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3);
+                val &= ~(DPIO_PCS_TX1DEEMP_MASK | DPIO_PCS_TX2DEEMP_MASK);
+                val |= DPIO_PCS_TX1DEEMP_9P5 | DPIO_PCS_TX2DEEMP_9P5;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW10(ch), val);
+        }
+
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW9(ch));
+        val &= ~(DPIO_PCS_TX1MARGIN_MASK | DPIO_PCS_TX2MARGIN_MASK);
+        val |= DPIO_PCS_TX1MARGIN_000 | DPIO_PCS_TX2MARGIN_000;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW9(ch), val);
+
+        if (intel_crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW9(ch));
+                val &= ~(DPIO_PCS_TX1MARGIN_MASK | DPIO_PCS_TX2MARGIN_MASK);
+                val |= DPIO_PCS_TX1MARGIN_000 | DPIO_PCS_TX2MARGIN_000;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW9(ch), val);
+        }
+
+        /* Program swing deemph */
+        for (i = 0; i < intel_crtc->config->lane_count; i++) {
+                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW4(ch, i));
+                val &= ~DPIO_SWING_DEEMPH9P5_MASK;
+                val |= deemph_reg_value << DPIO_SWING_DEEMPH9P5_SHIFT;
+                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW4(ch, i), val);
+        }
+
+        /* Program swing margin */
+        for (i = 0; i < intel_crtc->config->lane_count; i++) {
+                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW2(ch, i));
+
+                val &= ~DPIO_SWING_MARGIN000_MASK;
+                val |= margin_reg_value << DPIO_SWING_MARGIN000_SHIFT;
+
+                /*
+                 * Supposedly this value shouldn't matter when unique transition
+                 * scale is disabled, but in fact it does matter. Let's just
+                 * always program the same value and hope it's OK.
+                 */
+                val &= ~(0xff << DPIO_UNIQ_TRANS_SCALE_SHIFT);
+                val |= 0x9a << DPIO_UNIQ_TRANS_SCALE_SHIFT;
+
+                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW2(ch, i), val);
+        }
+
+        /*
+         * The document said it needs to set bit 27 for ch0 and bit 26
+         * for ch1. Might be a typo in the doc.
+         * For now, for this unique transition scale selection, set bit
+         * 27 for ch0 and ch1.
+         */
+        for (i = 0; i < intel_crtc->config->lane_count; i++) {
+                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW3(ch, i));
+                if (uniq_trans_scale)
+                        val |= DPIO_TX_UNIQ_TRANS_SCALE_EN;
+                else
+                        val &= ~DPIO_TX_UNIQ_TRANS_SCALE_EN;
+                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW3(ch, i), val);
+        }
+
+        /* Start swing calculation */
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW10(ch));
+        val |= DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW10(ch), val);
+
+        if (intel_crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW10(ch));
+                val |= DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW10(ch), val);
+        }
+
+        mutex_unlock(&dev_priv->sb_lock);
+
+}
+
+void chv_data_lane_soft_reset(struct intel_encoder *encoder,
+                              bool reset)
+{
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+        enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base));
+        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
+        enum pipe pipe = crtc->pipe;
+        uint32_t val;
+
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW0(ch));
+        if (reset)
+                val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
+        else
+                val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW0(ch), val);
+
+        if (crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW0(ch));
+                if (reset)
+                        val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
+                else
+                        val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW0(ch), val);
+        }
+
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW1(ch));
+        val |= CHV_PCS_REQ_SOFTRESET_EN;
+        if (reset)
+                val &= ~DPIO_PCS_CLK_SOFT_RESET;
+        else
+                val |= DPIO_PCS_CLK_SOFT_RESET;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW1(ch), val);
+
+        if (crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW1(ch));
+                val |= CHV_PCS_REQ_SOFTRESET_EN;
+                if (reset)
+                        val &= ~DPIO_PCS_CLK_SOFT_RESET;
+                else
+                        val |= DPIO_PCS_CLK_SOFT_RESET;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW1(ch), val);
+        }
+}
+
+void chv_phy_pre_pll_enable(struct intel_encoder *encoder)
+{
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct drm_device *dev = encoder->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc =
+                to_intel_crtc(encoder->base.crtc);
+        enum dpio_channel ch = vlv_dport_to_channel(dport);
+        enum pipe pipe = intel_crtc->pipe;
+        unsigned int lane_mask =
+                intel_dp_unused_lane_mask(intel_crtc->config->lane_count);
+        u32 val;
+
+        /*
+         * Must trick the second common lane into life.
+         * Otherwise we can't even access the PLL.
+         */
+        if (ch == DPIO_CH0 && pipe == PIPE_B)
+                dport->release_cl2_override =
+                        !chv_phy_powergate_ch(dev_priv, DPIO_PHY0, DPIO_CH1, true);
+
+        chv_phy_powergate_lanes(encoder, true, lane_mask);
+
+        mutex_lock(&dev_priv->sb_lock);
+
+        /* Assert data lane reset */
+        chv_data_lane_soft_reset(encoder, true);
+
+        /* program left/right clock distribution */
+        if (pipe != PIPE_B) {
+                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW5_CH0);
+                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
+                if (ch == DPIO_CH0)
+                        val |= CHV_BUFLEFTENA1_FORCE;
+                if (ch == DPIO_CH1)
+                        val |= CHV_BUFRIGHTENA1_FORCE;
+                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW5_CH0, val);
+        } else {
+                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW1_CH1);
+                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
+                if (ch == DPIO_CH0)
+                        val |= CHV_BUFLEFTENA2_FORCE;
+                if (ch == DPIO_CH1)
+                        val |= CHV_BUFRIGHTENA2_FORCE;
+                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW1_CH1, val);
+        }
+
+        /* program clock channel usage */
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW8(ch));
+        val |= CHV_PCS_USEDCLKCHANNEL_OVRRIDE;
+        if (pipe != PIPE_B)
+                val &= ~CHV_PCS_USEDCLKCHANNEL;
+        else
+                val |= CHV_PCS_USEDCLKCHANNEL;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW8(ch), val);
+
+        if (intel_crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW8(ch));
+                val |= CHV_PCS_USEDCLKCHANNEL_OVRRIDE;
+                if (pipe != PIPE_B)
+                        val &= ~CHV_PCS_USEDCLKCHANNEL;
+                else
+                        val |= CHV_PCS_USEDCLKCHANNEL;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW8(ch), val);
+        }
+
+        /*
+         * This a a bit weird since generally CL
+         * matches the pipe, but here we need to
+         * pick the CL based on the port.
+         */
+        val = vlv_dpio_read(dev_priv, pipe, CHV_CMN_DW19(ch));
+        if (pipe != PIPE_B)
+                val &= ~CHV_CMN_USEDCLKCHANNEL;
+        else
+                val |= CHV_CMN_USEDCLKCHANNEL;
+        vlv_dpio_write(dev_priv, pipe, CHV_CMN_DW19(ch), val);
+
+        mutex_unlock(&dev_priv->sb_lock);
+}
+
+void chv_phy_pre_encoder_enable(struct intel_encoder *encoder)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+        struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
+        struct drm_device *dev = encoder->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc =
+                to_intel_crtc(encoder->base.crtc);
+        enum dpio_channel ch = vlv_dport_to_channel(dport);
+        int pipe = intel_crtc->pipe;
+        int data, i, stagger;
+        u32 val;
+
+        mutex_lock(&dev_priv->sb_lock);
+
+        /* allow hardware to manage TX FIFO reset source */
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW11(ch));
+        val &= ~DPIO_LANEDESKEW_STRAP_OVRD;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW11(ch), val);
+
+        if (intel_crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW11(ch));
+                val &= ~DPIO_LANEDESKEW_STRAP_OVRD;
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW11(ch), val);
+        }
+
+        /* Program Tx lane latency optimal setting*/
+        for (i = 0; i < intel_crtc->config->lane_count; i++) {
+                /* Set the upar bit */
+                if (intel_crtc->config->lane_count == 1)
+                        data = 0x0;
+                else
+                        data = (i == 1) ? 0x0 : 0x1;
+                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW14(ch, i),
+                                data << DPIO_UPAR_SHIFT);
+        }
+
+        /* Data lane stagger programming */
+        if (intel_crtc->config->port_clock > 270000)
+                stagger = 0x18;
+        else if (intel_crtc->config->port_clock > 135000)
+                stagger = 0xd;
+        else if (intel_crtc->config->port_clock > 67500)
+                stagger = 0x7;
+        else if (intel_crtc->config->port_clock > 33750)
+                stagger = 0x4;
+        else
+                stagger = 0x2;
+
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW11(ch));
+        val |= DPIO_TX2_STAGGER_MASK(0x1f);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW11(ch), val);
+
+        if (intel_crtc->config->lane_count > 2) {
+                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW11(ch));
+                val |= DPIO_TX2_STAGGER_MASK(0x1f);
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW11(ch), val);
+        }
+
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW12(ch),
+                       DPIO_LANESTAGGER_STRAP(stagger) |
+                       DPIO_LANESTAGGER_STRAP_OVRD |
+                       DPIO_TX1_STAGGER_MASK(0x1f) |
+                       DPIO_TX1_STAGGER_MULT(6) |
+                       DPIO_TX2_STAGGER_MULT(0));
+
+        if (intel_crtc->config->lane_count > 2) {
+                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW12(ch),
+                               DPIO_LANESTAGGER_STRAP(stagger) |
+                               DPIO_LANESTAGGER_STRAP_OVRD |
+                               DPIO_TX1_STAGGER_MASK(0x1f) |
+                               DPIO_TX1_STAGGER_MULT(7) |
+                               DPIO_TX2_STAGGER_MULT(5));
+        }
+
+        /* Deassert data lane reset */
+        chv_data_lane_soft_reset(encoder, false);
+
+        mutex_unlock(&dev_priv->sb_lock);
+}
+
+void chv_phy_release_cl2_override(struct intel_encoder *encoder)
+{
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+
+        if (dport->release_cl2_override) {
+                chv_phy_powergate_ch(dev_priv, DPIO_PHY0, DPIO_CH1, false);
+                dport->release_cl2_override = false;
+        }
+}
+
+void chv_phy_post_pll_disable(struct intel_encoder *encoder)
+{
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+        enum pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe;
+        u32 val;
+
+        mutex_lock(&dev_priv->sb_lock);
+
+        /* disable left/right clock distribution */
+        if (pipe != PIPE_B) {
+                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW5_CH0);
+                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
+                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW5_CH0, val);
+        } else {
+                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW1_CH1);
+                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
+                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW1_CH1, val);
+        }
+
+        mutex_unlock(&dev_priv->sb_lock);
+
+        /*
+         * Leave the power down bit cleared for at least one
+         * lane so that chv_powergate_phy_ch() will power
+         * on something when the channel is otherwise unused.
+         * When the port is off and the override is removed
+         * the lanes power down anyway, so otherwise it doesn't
+         * really matter what the state of power down bits is
+         * after this.
+         */
+        chv_phy_powergate_lanes(encoder, false, 0x0);
+}
+
+void vlv_set_phy_signal_level(struct intel_encoder *encoder,
+                              u32 demph_reg_value, u32 preemph_reg_value,
+                              u32 uniqtranscale_reg_value, u32 tx3_demph)
+{
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        enum dpio_channel port = vlv_dport_to_channel(dport);
+        int pipe = intel_crtc->pipe;
+
+        mutex_lock(&dev_priv->sb_lock);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), 0x00000000);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW4(port), demph_reg_value);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW2(port),
+                         uniqtranscale_reg_value);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW3(port), 0x0C782040);
+
+        if (tx3_demph)
+                vlv_dpio_write(dev_priv, pipe, VLV_TX3_DW4(port), tx3_demph);
+
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW11(port), 0x00030000);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW9(port), preemph_reg_value);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), DPIO_TX_OCALINIT_EN);
+        mutex_unlock(&dev_priv->sb_lock);
+}
+
+void vlv_phy_pre_pll_enable(struct intel_encoder *encoder)
+{
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct drm_device *dev = encoder->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc =
+                to_intel_crtc(encoder->base.crtc);
+        enum dpio_channel port = vlv_dport_to_channel(dport);
+        int pipe = intel_crtc->pipe;
+
+        /* Program Tx lane resets to default */
+        mutex_lock(&dev_priv->sb_lock);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port),
+                         DPIO_PCS_TX_LANE2_RESET |
+                         DPIO_PCS_TX_LANE1_RESET);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port),
+                         DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |
+                         DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN |
+                         (1<<DPIO_PCS_CLK_DATAWIDTH_SHIFT) |
+                                 DPIO_PCS_CLK_SOFT_RESET);
+
+        /* Fix up inter-pair skew failure */
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW12(port), 0x00750f00);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW11(port), 0x00001500);
+        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW14(port), 0x40400000);
+        mutex_unlock(&dev_priv->sb_lock);
+}
+
+void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+        struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
+        struct drm_device *dev = encoder->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
+        enum dpio_channel port = vlv_dport_to_channel(dport);
+        int pipe = intel_crtc->pipe;
+        u32 val;
+
+        mutex_lock(&dev_priv->sb_lock);
+
+        /* Enable clock channels for this port */
+        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW8(port));
+        val = 0;
+        if (pipe)
+                val |= (1<<21);
+        else
+                val &= ~(1<<21);
+        val |= 0x001000c4;
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW8(port), val);
+
+        /* Program lane clock */
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW14(port), 0x00760018);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW23(port), 0x00400888);
+
+        mutex_unlock(&dev_priv->sb_lock);
+}
+
+void vlv_phy_reset_lanes(struct intel_encoder *encoder)
+{
+        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
+        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct intel_crtc *intel_crtc =
+                to_intel_crtc(encoder->base.crtc);
+        enum dpio_channel port = vlv_dport_to_channel(dport);
+        int pipe = intel_crtc->pipe;
+
+        mutex_lock(&dev_priv->sb_lock);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port), 0x00000000);
+        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port), 0x00e00060);
+        mutex_unlock(&dev_priv->sb_lock);
+}
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index 3ac705936b04..c0eff1571731 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -208,8 +208,8 @@ intel_find_shared_dpll(struct intel_crtc *crtc,
                 if (memcmp(&crtc_state->dpll_hw_state,
                            &shared_dpll[i].hw_state,
                            sizeof(crtc_state->dpll_hw_state)) == 0) {
-                        DRM_DEBUG_KMS("CRTC:%d sharing existing %s (crtc mask 0x%08x, active %x)\n",
-                                      crtc->base.base.id, pll->name,
+                        DRM_DEBUG_KMS("[CRTC:%d:%s] sharing existing %s (crtc mask 0x%08x, active %x)\n",
+                                      crtc->base.base.id, crtc->base.name, pll->name,
                                       shared_dpll[i].crtc_mask,
                                       pll->active_mask);
                         return pll;
@@ -220,8 +220,8 @@ intel_find_shared_dpll(struct intel_crtc *crtc,
         for (i = range_min; i <= range_max; i++) {
                 pll = &dev_priv->shared_dplls[i];
                 if (shared_dpll[i].crtc_mask == 0) {
-                        DRM_DEBUG_KMS("CRTC:%d allocated %s\n",
-                                      crtc->base.base.id, pll->name);
+                        DRM_DEBUG_KMS("[CRTC:%d:%s] allocated %s\n",
+                                      crtc->base.base.id, crtc->base.name, pll->name);
                         return pll;
                 }
         }
@@ -358,14 +358,17 @@ ibx_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
                 i = (enum intel_dpll_id) crtc->pipe;
                 pll = &dev_priv->shared_dplls[i];
 
-                DRM_DEBUG_KMS("CRTC:%d using pre-allocated %s\n",
-                              crtc->base.base.id, pll->name);
+                DRM_DEBUG_KMS("[CRTC:%d:%s] using pre-allocated %s\n",
+                              crtc->base.base.id, crtc->base.name, pll->name);
         } else {
                 pll = intel_find_shared_dpll(crtc, crtc_state,
                                              DPLL_ID_PCH_PLL_A,
                                              DPLL_ID_PCH_PLL_B);
         }
 
+        if (!pll)
+                return NULL;
+
         /* reference the pll */
         intel_reference_shared_dpll(pll, crtc_state);
 
@@ -1236,9 +1239,6 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
                 case 162000:
                         ctrl1 |= DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1620, 0);
                         break;
-                /* TBD: For DP link rates 2.16 GHz and 4.32 GHz, VCO is 8640 which
-                results in CDCLK change. Need to handle the change of CDCLK by
-                disabling pipes and re-enabling them */
                 case 108000:
                         ctrl1 |= DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1080, 0);
                         break;
@@ -1508,7 +1508,7 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
         int clock = crtc_state->port_clock;
 
         if (encoder->type == INTEL_OUTPUT_HDMI) {
-                intel_clock_t best_clock;
+                struct dpll best_clock;
 
                 /* Calculate HDMI div */
                 /*
@@ -1613,8 +1613,8 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
         i = (enum intel_dpll_id) intel_dig_port->port;
         pll = intel_get_shared_dpll_by_id(dev_priv, i);
 
-        DRM_DEBUG_KMS("CRTC:%d using pre-allocated %s\n",
-                crtc->base.base.id, pll->name);
+        DRM_DEBUG_KMS("[CRTC:%d:%s] using pre-allocated %s\n",
+                      crtc->base.base.id, crtc->base.name, pll->name);
 
         intel_reference_shared_dpll(pll, crtc_state);
 
@@ -1633,18 +1633,10 @@ static const struct intel_shared_dpll_funcs bxt_ddi_pll_funcs = {
 static void intel_ddi_pll_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        uint32_t val = I915_READ(LCPLL_CTL);
-
-        if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
-                int cdclk_freq;
-
-                cdclk_freq = dev_priv->display.get_display_clock_speed(dev);
-                dev_priv->skl_boot_cdclk = cdclk_freq;
-                if (skl_sanitize_cdclk(dev_priv))
-                        DRM_DEBUG_KMS("Sanitized cdclk programmed by pre-os\n");
-                if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE))
-                        DRM_ERROR("LCPLL1 is disabled\n");
-        } else if (!IS_BROXTON(dev_priv)) {
+
+        if (INTEL_GEN(dev_priv) < 9) {
+                uint32_t val = I915_READ(LCPLL_CTL);
+
                 /*
                  * The LCPLL register should be turned on by the BIOS. For now
                  * let's just check its state and print errors in case
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a28b4aac1e02..089a42577ea3 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -242,14 +242,6 @@ struct intel_connector {
          * and active (i.e. dpms ON state). */
         bool (*get_hw_state)(struct intel_connector *);
 
-        /*
-         * Removes all interfaces through which the connector is accessible
-         * - like sysfs, debugfs entries -, so that no new operations can be
-         * started on the connector. Also makes sure all currently pending
-         * operations finish before returing.
-         */
-        void (*unregister)(struct intel_connector *);
-
         /* Panel info for eDP and LVDS */
         struct intel_panel panel;
 
@@ -266,7 +258,7 @@ struct intel_connector {
         struct intel_dp *mst_port;
 };
 
-typedef struct dpll {
+struct dpll {
         /* given values */
         int n;
         int m1, m2;
@@ -276,7 +268,7 @@ typedef struct dpll {
         int     vco;
         int     m;
         int     p;
-} intel_clock_t;
+};
 
 struct intel_atomic_state {
         struct drm_atomic_state base;
@@ -291,17 +283,32 @@ struct intel_atomic_state {
 
         bool dpll_set, modeset;
 
+        /*
+         * Does this transaction change the pipes that are active?  This mask
+         * tracks which CRTC's have changed their active state at the end of
+         * the transaction (not counting the temporary disable during modesets).
+         * This mask should only be non-zero when intel_state->modeset is true,
+         * but the converse is not necessarily true; simply changing a mode may
+         * not flip the final active status of any CRTC's
+         */
+        unsigned int active_pipe_changes;
+
         unsigned int active_crtcs;
         unsigned int min_pixclk[I915_MAX_PIPES];
 
+        /* SKL/KBL Only */
+        unsigned int cdclk_pll_vco;
+
         struct intel_shared_dpll_config shared_dpll[I915_NUM_PLLS];
-        struct intel_wm_config wm_config;
 
         /*
          * Current watermarks can't be trusted during hardware readout, so
          * don't bother calculating intermediate watermarks.
          */
         bool skip_intermediate_wm;
+
+        /* Gen9+ only */
+        struct skl_wm_values wm_results;
 };
 
 struct intel_plane_state {
@@ -405,6 +412,48 @@ struct skl_pipe_wm {
         uint32_t linetime;
 };
 
+struct intel_crtc_wm_state {
+        union {
+                struct {
+                        /*
+                         * Intermediate watermarks; these can be
+                         * programmed immediately since they satisfy
+                         * both the current configuration we're
+                         * switching away from and the new
+                         * configuration we're switching to.
+                         */
+                        struct intel_pipe_wm intermediate;
+
+                        /*
+                         * Optimal watermarks, programmed post-vblank
+                         * when this state is committed.
+                         */
+                        struct intel_pipe_wm optimal;
+                } ilk;
+
+                struct {
+                        /* gen9+ only needs 1-step wm programming */
+                        struct skl_pipe_wm optimal;
+
+                        /* cached plane data rate */
+                        unsigned plane_data_rate[I915_MAX_PLANES];
+                        unsigned plane_y_data_rate[I915_MAX_PLANES];
+
+                        /* minimum block allocation */
+                        uint16_t minimum_blocks[I915_MAX_PLANES];
+                        uint16_t minimum_y_blocks[I915_MAX_PLANES];
+                } skl;
+        };
+
+        /*
+         * Platforms with two-step watermark programming will need to
+         * update watermark programming post-vblank to switch from the
+         * safe intermediate watermarks to the optimal final
+         * watermarks.
+         */
+        bool need_postvbl_update;
+};
+
 struct intel_crtc_state {
         struct drm_crtc_state base;
 
@@ -522,6 +571,12 @@ struct intel_crtc_state {
 
         uint8_t lane_count;
 
+        /*
+         * Used by platforms having DP/HDMI PHY with programmable lane
+         * latency optimization.
+         */
+        uint8_t lane_lat_optim_mask;
+
         /* Panel fitter controls for gen2-gen4 + VLV */
         struct {
                 u32 control;
@@ -558,32 +613,7 @@ struct intel_crtc_state {
         /* IVB sprite scaling w/a (WaCxSRDisabledForSpriteScaling:ivb) */
         bool disable_lp_wm;
 
-        struct {
-                /*
-                 * Optimal watermarks, programmed post-vblank when this state
-                 * is committed.
-                 */
-                union {
-                        struct intel_pipe_wm ilk;
-                        struct skl_pipe_wm skl;
-                } optimal;
-
-                /*
-                 * Intermediate watermarks; these can be programmed immediately
-                 * since they satisfy both the current configuration we're
-                 * switching away from and the new configuration we're switching
-                 * to.
-                 */
-                struct intel_pipe_wm intermediate;
-
-                /*
-                 * Platforms with two-step watermark programming will need to
-                 * update watermark programming post-vblank to switch from the
-                 * safe intermediate watermarks to the optimal final
-                 * watermarks.
-                 */
-                bool need_postvbl_update;
-        } wm;
+        struct intel_crtc_wm_state wm;
 
         /* Gamma mode programmed on the pipe */
         uint32_t gamma_mode;
@@ -598,14 +628,6 @@ struct vlv_wm_state {
         bool cxsr;
 };
 
-struct intel_mmio_flip {
-        struct work_struct work;
-        struct drm_i915_private *i915;
-        struct drm_i915_gem_request *req;
-        struct intel_crtc *crtc;
-        unsigned int rotation;
-};
-
 struct intel_crtc {
         struct drm_crtc base;
         enum pipe pipe;
@@ -620,7 +642,7 @@ struct intel_crtc {
         unsigned long enabled_power_domains;
         bool lowfreq_avail;
         struct intel_overlay *overlay;
-        struct intel_unpin_work *unpin_work;
+        struct intel_flip_work *flip_work;
 
         atomic_t unpin_work_count;
 
@@ -815,6 +837,7 @@ struct intel_dp {
         uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
         uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
         uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
+        uint8_t edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE];
         /* sink rates as reported by DP_SUPPORTED_LINK_RATES */
         uint8_t num_sink_rates;
         int sink_rates[DP_MAX_SUPPORTED_RATES];
@@ -863,8 +886,6 @@ struct intel_dp {
         /* This is called before a link training is starterd */
         void (*prepare_link_retrain)(struct intel_dp *intel_dp);
 
-        bool train_set_valid;
-
         /* Displayport compliance testing */
         unsigned long compliance_test_type;
         unsigned long compliance_test_data;
@@ -947,22 +968,21 @@ intel_get_crtc_for_plane(struct drm_device *dev, int plane)
         return dev_priv->plane_to_crtc_mapping[plane];
 }
 
-struct intel_unpin_work {
-        struct work_struct work;
+struct intel_flip_work {
+        struct work_struct unpin_work;
+        struct work_struct mmio_work;
+
         struct drm_crtc *crtc;
         struct drm_framebuffer *old_fb;
         struct drm_i915_gem_object *pending_flip_obj;
         struct drm_pending_vblank_event *event;
         atomic_t pending;
-#define INTEL_FLIP_INACTIVE     0
-#define INTEL_FLIP_PENDING      1
-#define INTEL_FLIP_COMPLETE     2
         u32 flip_count;
         u32 gtt_offset;
         struct drm_i915_gem_request *flip_queued_req;
         u32 flip_queued_vblank;
         u32 flip_ready_vblank;
-        bool enable_stall_check;
+        unsigned int rotation;
 };
 
 struct intel_load_detect_pipe {
@@ -1031,9 +1051,9 @@ void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask);
 void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask);
 void gen6_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask);
 void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask);
-void gen6_reset_rps_interrupts(struct drm_device *dev);
-void gen6_enable_rps_interrupts(struct drm_device *dev);
-void gen6_disable_rps_interrupts(struct drm_device *dev);
+void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv);
+void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv);
+void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv);
 u32 gen6_sanitize_rps_pm_mask(struct drm_i915_private *dev_priv, u32 mask);
 void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv);
 void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv);
@@ -1112,14 +1132,16 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv);
 void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);
 
 /* intel_display.c */
+void skl_set_preferred_cdclk_vco(struct drm_i915_private *dev_priv, int vco);
+void intel_update_rawclk(struct drm_i915_private *dev_priv);
 int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
                       const char *name, u32 reg, int ref_freq);
 extern const struct drm_plane_funcs intel_plane_funcs;
 void intel_init_display_hooks(struct drm_i915_private *dev_priv);
 unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_info);
 bool intel_has_pending_fb_unpin(struct drm_device *dev);
-void intel_mark_busy(struct drm_device *dev);
-void intel_mark_idle(struct drm_device *dev);
+void intel_mark_busy(struct drm_i915_private *dev_priv);
+void intel_mark_idle(struct drm_i915_private *dev_priv);
 void intel_crtc_restore_mode(struct drm_crtc *crtc);
 int intel_display_suspend(struct drm_device *dev);
 void intel_encoder_destroy(struct drm_encoder *encoder);
@@ -1128,7 +1150,6 @@ struct intel_connector *intel_connector_alloc(void);
 bool intel_connector_get_hw_state(struct intel_connector *connector);
 void intel_connector_attach_encoder(struct intel_connector *connector,
                                     struct intel_encoder *encoder);
-struct drm_encoder *intel_best_encoder(struct drm_connector *connector);
 struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
                                              struct drm_crtc *crtc);
 enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
@@ -1151,6 +1172,9 @@ intel_wait_for_vblank_if_active(struct drm_device *dev, int pipe)
         if (crtc->active)
                 intel_wait_for_vblank(dev, pipe);
 }
+
+u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
+
 int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp);
 void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
                          struct intel_digital_port *dport,
@@ -1164,14 +1188,14 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
                                     struct drm_modeset_acquire_ctx *ctx);
 int intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
                                unsigned int rotation);
+void intel_unpin_fb_obj(struct drm_framebuffer *fb, unsigned int rotation);
 struct drm_framebuffer *
 __intel_framebuffer_create(struct drm_device *dev,
                            struct drm_mode_fb_cmd2 *mode_cmd,
                            struct drm_i915_gem_object *obj);
-void intel_prepare_page_flip(struct drm_device *dev, int plane);
-void intel_finish_page_flip(struct drm_device *dev, int pipe);
-void intel_finish_page_flip_plane(struct drm_device *dev, int plane);
-void intel_check_page_flip(struct drm_device *dev, int pipe);
+void intel_finish_page_flip_cs(struct drm_i915_private *dev_priv, int pipe);
+void intel_finish_page_flip_mmio(struct drm_i915_private *dev_priv, int pipe);
+void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe);
 int intel_prepare_plane_fb(struct drm_plane *plane,
                            const struct drm_plane_state *new_state);
 void intel_cleanup_plane_fb(struct drm_plane *plane,
@@ -1228,23 +1252,25 @@ u32 intel_compute_tile_offset(int *x, int *y,
                               const struct drm_framebuffer *fb, int plane,
                               unsigned int pitch,
                               unsigned int rotation);
-void intel_prepare_reset(struct drm_device *dev);
-void intel_finish_reset(struct drm_device *dev);
+void intel_prepare_reset(struct drm_i915_private *dev_priv);
+void intel_finish_reset(struct drm_i915_private *dev_priv);
 void hsw_enable_pc8(struct drm_i915_private *dev_priv);
 void hsw_disable_pc8(struct drm_i915_private *dev_priv);
-void broxton_init_cdclk(struct drm_i915_private *dev_priv);
-void broxton_uninit_cdclk(struct drm_i915_private *dev_priv);
-bool broxton_cdclk_verify_state(struct drm_i915_private *dev_priv);
-void broxton_ddi_phy_init(struct drm_i915_private *dev_priv);
-void broxton_ddi_phy_uninit(struct drm_i915_private *dev_priv);
-void broxton_ddi_phy_verify_state(struct drm_i915_private *dev_priv);
+void bxt_init_cdclk(struct drm_i915_private *dev_priv);
+void bxt_uninit_cdclk(struct drm_i915_private *dev_priv);
+void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy);
+void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy);
+bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
+                            enum dpio_phy phy);
+bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
+                              enum dpio_phy phy);
 void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv);
 void bxt_enable_dc9(struct drm_i915_private *dev_priv);
 void bxt_disable_dc9(struct drm_i915_private *dev_priv);
 void gen9_enable_dc5(struct drm_i915_private *dev_priv);
 void skl_init_cdclk(struct drm_i915_private *dev_priv);
-int skl_sanitize_cdclk(struct drm_i915_private *dev_priv);
 void skl_uninit_cdclk(struct drm_i915_private *dev_priv);
+unsigned int skl_cdclk_get_vco(unsigned int freq);
 void skl_enable_dc6(struct drm_i915_private *dev_priv);
 void skl_disable_dc6(struct drm_i915_private *dev_priv);
 void intel_dp_get_m_n(struct intel_crtc *crtc,
@@ -1252,8 +1278,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,
 void intel_dp_set_m_n(struct intel_crtc *crtc, enum link_m_n_set m_n);
 int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n);
 bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock,
-                        intel_clock_t *best_clock);
-int chv_calc_dpll_params(int refclk, intel_clock_t *pll_clock);
+                        struct dpll *best_clock);
+int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
 
 bool intel_crtc_active(struct drm_crtc *crtc);
 void hsw_enable_ips(struct intel_crtc *crtc);
@@ -1284,7 +1310,7 @@ void intel_csr_ucode_suspend(struct drm_i915_private *);
 void intel_csr_ucode_resume(struct drm_i915_private *);
 
 /* intel_dp.c */
-void intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
+bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
 bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                              struct intel_connector *intel_connector);
 void intel_dp_set_link_params(struct intel_dp *intel_dp,
@@ -1339,12 +1365,22 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);
 bool
 intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE]);
 
+static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
+{
+        return ~((1 << lane_count) - 1) & 0xf;
+}
+
+/* intel_dp_aux_backlight.c */
+int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
+
 /* intel_dp_mst.c */
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
 void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
 /* intel_dsi.c */
 void intel_dsi_init(struct drm_device *dev);
 
+/* intel_dsi_dcs_backlight.c */
+int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
 
 /* intel_dvo.c */
 void intel_dvo_init(struct drm_device *dev);
@@ -1385,11 +1421,15 @@ static inline void intel_fbdev_restore_mode(struct drm_device *dev)
 void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,
                            struct drm_atomic_state *state);
 bool intel_fbc_is_active(struct drm_i915_private *dev_priv);
-void intel_fbc_pre_update(struct intel_crtc *crtc);
+void intel_fbc_pre_update(struct intel_crtc *crtc,
+                          struct intel_crtc_state *crtc_state,
+                          struct intel_plane_state *plane_state);
 void intel_fbc_post_update(struct intel_crtc *crtc);
 void intel_fbc_init(struct drm_i915_private *dev_priv);
 void intel_fbc_init_pipe_state(struct drm_i915_private *dev_priv);
-void intel_fbc_enable(struct intel_crtc *crtc);
+void intel_fbc_enable(struct intel_crtc *crtc,
+                      struct intel_crtc_state *crtc_state,
+                      struct intel_plane_state *plane_state);
 void intel_fbc_disable(struct intel_crtc *crtc);
 void intel_fbc_global_disable(struct drm_i915_private *dev_priv);
 void intel_fbc_invalidate(struct drm_i915_private *dev_priv,
@@ -1424,13 +1464,13 @@ void intel_attach_aspect_ratio_property(struct drm_connector *connector);
 
 
 /* intel_overlay.c */
-void intel_setup_overlay(struct drm_device *dev);
-void intel_cleanup_overlay(struct drm_device *dev);
+void intel_setup_overlay(struct drm_i915_private *dev_priv);
+void intel_cleanup_overlay(struct drm_i915_private *dev_priv);
 int intel_overlay_switch_off(struct intel_overlay *overlay);
-int intel_overlay_put_image(struct drm_device *dev, void *data,
-                            struct drm_file *file_priv);
-int intel_overlay_attrs(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
+int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
+                                  struct drm_file *file_priv);
+int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
+                              struct drm_file *file_priv);
 void intel_overlay_reset(struct drm_i915_private *dev_priv);
 
 
@@ -1459,7 +1499,14 @@ extern struct drm_display_mode *intel_find_panel_downclock(
                                 struct drm_display_mode *fixed_mode,
                                 struct drm_connector *connector);
 void intel_backlight_register(struct drm_device *dev);
-void intel_backlight_unregister(struct drm_device *dev);
+
+#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+void intel_backlight_device_unregister(struct intel_connector *connector);
+#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
+static inline void intel_backlight_device_unregister(struct intel_connector *connector)
+{
+}
+#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
 
 
 /* intel_psr.c */
@@ -1601,21 +1648,20 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv);
 void intel_pm_setup(struct drm_device *dev);
 void intel_gpu_ips_init(struct drm_i915_private *dev_priv);
 void intel_gpu_ips_teardown(void);
-void intel_init_gt_powersave(struct drm_device *dev);
-void intel_cleanup_gt_powersave(struct drm_device *dev);
-void intel_enable_gt_powersave(struct drm_device *dev);
-void intel_disable_gt_powersave(struct drm_device *dev);
-void intel_suspend_gt_powersave(struct drm_device *dev);
-void intel_reset_gt_powersave(struct drm_device *dev);
-void gen6_update_ring_freq(struct drm_device *dev);
+void intel_init_gt_powersave(struct drm_i915_private *dev_priv);
+void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv);
+void intel_enable_gt_powersave(struct drm_i915_private *dev_priv);
+void intel_disable_gt_powersave(struct drm_i915_private *dev_priv);
+void intel_suspend_gt_powersave(struct drm_i915_private *dev_priv);
+void intel_reset_gt_powersave(struct drm_i915_private *dev_priv);
+void gen6_update_ring_freq(struct drm_i915_private *dev_priv);
 void gen6_rps_busy(struct drm_i915_private *dev_priv);
 void gen6_rps_reset_ei(struct drm_i915_private *dev_priv);
 void gen6_rps_idle(struct drm_i915_private *dev_priv);
 void gen6_rps_boost(struct drm_i915_private *dev_priv,
                     struct intel_rps_client *rps,
                     unsigned long submitted);
-void intel_queue_rps_boost_for_request(struct drm_device *dev,
-                                       struct drm_i915_gem_request *req);
+void intel_queue_rps_boost_for_request(struct drm_i915_gem_request *req);
 void vlv_wm_get_hw_state(struct drm_device *dev);
 void ilk_wm_get_hw_state(struct drm_device *dev);
 void skl_wm_get_hw_state(struct drm_device *dev);
@@ -1623,7 +1669,11 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,
                           struct skl_ddb_allocation *ddb /* out */);
 uint32_t ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config);
 bool ilk_disable_lp_wm(struct drm_device *dev);
-int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6);
+int sanitize_rc6_option(struct drm_i915_private *dev_priv, int enable_rc6);
+static inline int intel_enable_rc6(void)
+{
+        return i915.enable_rc6;
+}
 
 /* intel_sdvo.c */
 bool intel_sdvo_init(struct drm_device *dev,
@@ -1635,7 +1685,7 @@ int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane);
 int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
                               struct drm_file *file_priv);
 void intel_pipe_update_start(struct intel_crtc *crtc);
-void intel_pipe_update_end(struct intel_crtc *crtc);
+void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work);
 
 /* intel_tv.c */
 void intel_tv_init(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 366ad6c67ce4..b444d0e35a98 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -532,7 +532,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
         enum port port;
-        u32 tmp;
 
         DRM_DEBUG_KMS("\n");
 
@@ -551,11 +550,13 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
 
         msleep(intel_dsi->panel_on_delay);
 
-        if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+                u32 val;
+
                 /* Disable DPOunit clock gating, can stall pipe */
-                tmp = I915_READ(DSPCLK_GATE_D);
-                tmp |= DPOUNIT_CLOCK_GATE_DISABLE;
-                I915_WRITE(DSPCLK_GATE_D, tmp);
+                val = I915_READ(DSPCLK_GATE_D);
+                val |= DPOUNIT_CLOCK_GATE_DISABLE;
+                I915_WRITE(DSPCLK_GATE_D, val);
         }
 
         /* put device in ready state */
@@ -693,7 +694,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
 
         intel_dsi_clear_device_ready(encoder);
 
-        if (!IS_BROXTON(dev_priv)) {
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                 u32 val;
 
                 val = I915_READ(DSPCLK_GATE_D);
@@ -1171,6 +1172,12 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
         if (intel_dsi->clock_stop)
                 tmp |= CLOCKSTOP;
 
+        if (IS_BROXTON(dev_priv)) {
+                tmp |= BXT_DPHY_DEFEATURE_EN;
+                if (!is_cmd_mode(intel_dsi))
+                        tmp |= BXT_DEFEATURE_DPI_FIFO_CTR;
+        }
+
         for_each_dsi_port(port, intel_dsi->ports) {
                 I915_WRITE(MIPI_DSI_FUNC_PRG(port), val);
 
@@ -1378,12 +1385,12 @@ static const struct drm_encoder_funcs intel_dsi_funcs = {
 static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {
         .get_modes = intel_dsi_get_modes,
         .mode_valid = intel_dsi_mode_valid,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_connector_funcs intel_dsi_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_dsi_detect,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_dsi_connector_destroy,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_dsi_set_property,
@@ -1449,7 +1456,7 @@ void intel_dsi_init(struct drm_device *dev)
         connector = &intel_connector->base;
 
         drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
-                         NULL);
+                         "DSI %c", port_name(port));
 
         intel_encoder->compute_config = intel_dsi_compute_config;
         intel_encoder->pre_enable = intel_dsi_pre_enable;
@@ -1460,7 +1467,6 @@ void intel_dsi_init(struct drm_device *dev)
         intel_encoder->get_config = intel_dsi_get_config;
 
         intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         /*
          * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI
@@ -1473,10 +1479,42 @@ void intel_dsi_init(struct drm_device *dev)
         else
                 intel_encoder->crtc_mask = BIT(PIPE_B);
 
-        if (dev_priv->vbt.dsi.config->dual_link)
+        if (dev_priv->vbt.dsi.config->dual_link) {
                 intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);
-        else
+
+                switch (dev_priv->vbt.dsi.config->dl_dcs_backlight_ports) {
+                case DL_DCS_PORT_A:
+                        intel_dsi->dcs_backlight_ports = BIT(PORT_A);
+                        break;
+                case DL_DCS_PORT_C:
+                        intel_dsi->dcs_backlight_ports = BIT(PORT_C);
+                        break;
+                default:
+                case DL_DCS_PORT_A_AND_C:
+                        intel_dsi->dcs_backlight_ports = BIT(PORT_A) | BIT(PORT_C);
+                        break;
+                }
+
+                switch (dev_priv->vbt.dsi.config->dl_dcs_cabc_ports) {
+                case DL_DCS_PORT_A:
+                        intel_dsi->dcs_cabc_ports = BIT(PORT_A);
+                        break;
+                case DL_DCS_PORT_C:
+                        intel_dsi->dcs_cabc_ports = BIT(PORT_C);
+                        break;
+                default:
+                case DL_DCS_PORT_A_AND_C:
+                        intel_dsi->dcs_cabc_ports = BIT(PORT_A) | BIT(PORT_C);
+                        break;
+                }
+        } else {
                 intel_dsi->ports = BIT(port);
+                intel_dsi->dcs_backlight_ports = BIT(port);
+                intel_dsi->dcs_cabc_ports = BIT(port);
+        }
+
+        if (!dev_priv->vbt.dsi.config->cabc_supported)
+                intel_dsi->dcs_cabc_ports = 0;
 
         /* Create a DSI host (and a device) for each port. */
         for_each_dsi_port(port, intel_dsi->ports) {
@@ -1545,6 +1583,9 @@ void intel_dsi_init(struct drm_device *dev)
                 goto err;
         }
 
+        connector->display_info.width_mm = fixed_mode->width_mm;
+        connector->display_info.height_mm = fixed_mode->height_mm;
+
         intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
 
         intel_dsi_add_properties(intel_connector);
diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h
index 61a6957fc6c2..5967ea6d6045 100644
--- a/drivers/gpu/drm/i915/intel_dsi.h
+++ b/drivers/gpu/drm/i915/intel_dsi.h
@@ -78,6 +78,10 @@ struct intel_dsi {
 
         u8 escape_clk_div;
         u8 dual_link;
+
+        u16 dcs_backlight_ports;
+        u16 dcs_cabc_ports;
+
         u8 pixel_overlap;
         u32 port_bits;
         u32 bw_timer;
diff --git a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
new file mode 100644
index 000000000000..f0dc427743f8
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright © 2016 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.
+ *
+ * Author: Deepak M <m.deepak at intel.com>
+ */
+
+#include "intel_drv.h"
+#include "intel_dsi.h"
+#include "i915_drv.h"
+#include <video/mipi_display.h>
+#include <drm/drm_mipi_dsi.h>
+
+#define CONTROL_DISPLAY_BCTRL           (1 << 5)
+#define CONTROL_DISPLAY_DD              (1 << 3)
+#define CONTROL_DISPLAY_BL              (1 << 2)
+
+#define POWER_SAVE_OFF                  (0 << 0)
+#define POWER_SAVE_LOW                  (1 << 0)
+#define POWER_SAVE_MEDIUM               (2 << 0)
+#define POWER_SAVE_HIGH                 (3 << 0)
+#define POWER_SAVE_OUTDOOR_MODE         (4 << 0)
+
+#define PANEL_PWM_MAX_VALUE             0xFF
+
+static u32 dcs_get_backlight(struct intel_connector *connector)
+{
+        struct intel_encoder *encoder = connector->encoder;
+        struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
+        struct mipi_dsi_device *dsi_device;
+        u8 data;
+        enum port port;
+
+        /* FIXME: Need to take care of 16 bit brightness level */
+        for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {
+                dsi_device = intel_dsi->dsi_hosts[port]->device;
+                mipi_dsi_dcs_read(dsi_device, MIPI_DCS_GET_DISPLAY_BRIGHTNESS,
+                                  &data, sizeof(data));
+                break;
+        }
+
+        return data;
+}
+
+static void dcs_set_backlight(struct intel_connector *connector, u32 level)
+{
+        struct intel_encoder *encoder = connector->encoder;
+        struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
+        struct mipi_dsi_device *dsi_device;
+        u8 data = level;
+        enum port port;
+
+        /* FIXME: Need to take care of 16 bit brightness level */
+        for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {
+                dsi_device = intel_dsi->dsi_hosts[port]->device;
+                mipi_dsi_dcs_write(dsi_device, MIPI_DCS_SET_DISPLAY_BRIGHTNESS,
+                                   &data, sizeof(data));
+        }
+}
+
+static void dcs_disable_backlight(struct intel_connector *connector)
+{
+        struct intel_encoder *encoder = connector->encoder;
+        struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
+        struct mipi_dsi_device *dsi_device;
+        enum port port;
+
+        dcs_set_backlight(connector, 0);
+
+        for_each_dsi_port(port, intel_dsi->dcs_cabc_ports) {
+                u8 cabc = POWER_SAVE_OFF;
+
+                dsi_device = intel_dsi->dsi_hosts[port]->device;
+                mipi_dsi_dcs_write(dsi_device, MIPI_DCS_WRITE_POWER_SAVE,
+                                   &cabc, sizeof(cabc));
+        }
+
+        for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {
+                u8 ctrl = 0;
+
+                dsi_device = intel_dsi->dsi_hosts[port]->device;
+
+                mipi_dsi_dcs_read(dsi_device, MIPI_DCS_GET_CONTROL_DISPLAY,
+                                  &ctrl, sizeof(ctrl));
+
+                ctrl &= ~CONTROL_DISPLAY_BL;
+                ctrl &= ~CONTROL_DISPLAY_DD;
+                ctrl &= ~CONTROL_DISPLAY_BCTRL;
+
+                mipi_dsi_dcs_write(dsi_device, MIPI_DCS_WRITE_CONTROL_DISPLAY,
+                                   &ctrl, sizeof(ctrl));
+        }
+}
+
+static void dcs_enable_backlight(struct intel_connector *connector)
+{
+        struct intel_encoder *encoder = connector->encoder;
+        struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
+        struct intel_panel *panel = &connector->panel;
+        struct mipi_dsi_device *dsi_device;
+        enum port port;
+
+        for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {
+                u8 ctrl = 0;
+
+                dsi_device = intel_dsi->dsi_hosts[port]->device;
+
+                mipi_dsi_dcs_read(dsi_device, MIPI_DCS_GET_CONTROL_DISPLAY,
+                                  &ctrl, sizeof(ctrl));
+
+                ctrl |= CONTROL_DISPLAY_BL;
+                ctrl |= CONTROL_DISPLAY_DD;
+                ctrl |= CONTROL_DISPLAY_BCTRL;
+
+                mipi_dsi_dcs_write(dsi_device, MIPI_DCS_WRITE_CONTROL_DISPLAY,
+                                   &ctrl, sizeof(ctrl));
+        }
+
+        for_each_dsi_port(port, intel_dsi->dcs_cabc_ports) {
+                u8 cabc = POWER_SAVE_MEDIUM;
+
+                dsi_device = intel_dsi->dsi_hosts[port]->device;
+                mipi_dsi_dcs_write(dsi_device, MIPI_DCS_WRITE_POWER_SAVE,
+                                   &cabc, sizeof(cabc));
+        }
+
+        dcs_set_backlight(connector, panel->backlight.level);
+}
+
+static int dcs_setup_backlight(struct intel_connector *connector,
+                               enum pipe unused)
+{
+        struct intel_panel *panel = &connector->panel;
+
+        panel->backlight.max = PANEL_PWM_MAX_VALUE;
+        panel->backlight.level = PANEL_PWM_MAX_VALUE;
+
+        return 0;
+}
+
+int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector)
+{
+        struct drm_device *dev = intel_connector->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_encoder *encoder = intel_connector->encoder;
+        struct intel_panel *panel = &intel_connector->panel;
+
+        if (dev_priv->vbt.backlight.type != INTEL_BACKLIGHT_DSI_DCS)
+                return -ENODEV;
+
+        if (WARN_ON(encoder->type != INTEL_OUTPUT_DSI))
+                return -EINVAL;
+
+        panel->backlight.setup = dcs_setup_backlight;
+        panel->backlight.enable = dcs_enable_backlight;
+        panel->backlight.disable = dcs_disable_backlight;
+        panel->backlight.set = dcs_set_backlight;
+        panel->backlight.get = dcs_get_backlight;
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index e498f1c3221e..f122484bedfc 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -95,6 +95,24 @@ static struct gpio_map vlv_gpio_table[] = {
         { VLV_GPIO_NC_11_PANEL1_BKLTCTL },
 };
 
+#define CHV_GPIO_IDX_START_N            0
+#define CHV_GPIO_IDX_START_E            73
+#define CHV_GPIO_IDX_START_SW           100
+#define CHV_GPIO_IDX_START_SE           198
+
+#define CHV_VBT_MAX_PINS_PER_FMLY       15
+
+#define CHV_GPIO_PAD_CFG0(f, i)         (0x4400 + (f) * 0x400 + (i) * 8)
+#define  CHV_GPIO_GPIOEN                (1 << 15)
+#define  CHV_GPIO_GPIOCFG_GPIO          (0 << 8)
+#define  CHV_GPIO_GPIOCFG_GPO           (1 << 8)
+#define  CHV_GPIO_GPIOCFG_GPI           (2 << 8)
+#define  CHV_GPIO_GPIOCFG_HIZ           (3 << 8)
+#define  CHV_GPIO_GPIOTXSTATE(state)    ((!!(state)) << 1)
+
+#define CHV_GPIO_PAD_CFG1(f, i)         (0x4400 + (f) * 0x400 + (i) * 8 + 4)
+#define  CHV_GPIO_CFGLOCK               (1 << 31)
+
 static inline enum port intel_dsi_seq_port_to_port(u8 port)
 {
         return port ? PORT_C : PORT_A;
@@ -203,13 +221,14 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
         map = &vlv_gpio_table[gpio_index];
 
         if (dev_priv->vbt.dsi.seq_version >= 3) {
-                DRM_DEBUG_KMS("GPIO element v3 not supported\n");
-                return;
+                /* XXX: this assumes vlv_gpio_table only has NC GPIOs. */
+                port = IOSF_PORT_GPIO_NC;
         } else {
                 if (gpio_source == 0) {
                         port = IOSF_PORT_GPIO_NC;
                 } else if (gpio_source == 1) {
-                        port = IOSF_PORT_GPIO_SC;
+                        DRM_DEBUG_KMS("SC gpio not supported\n");
+                        return;
                 } else {
                         DRM_DEBUG_KMS("unknown gpio source %u\n", gpio_source);
                         return;
@@ -231,6 +250,56 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
         mutex_unlock(&dev_priv->sb_lock);
 }
 
+static void chv_exec_gpio(struct drm_i915_private *dev_priv,
+                          u8 gpio_source, u8 gpio_index, bool value)
+{
+        u16 cfg0, cfg1;
+        u16 family_num;
+        u8 port;
+
+        if (dev_priv->vbt.dsi.seq_version >= 3) {
+                if (gpio_index >= CHV_GPIO_IDX_START_SE) {
+                        /* XXX: it's unclear whether 255->57 is part of SE. */
+                        gpio_index -= CHV_GPIO_IDX_START_SE;
+                        port = CHV_IOSF_PORT_GPIO_SE;
+                } else if (gpio_index >= CHV_GPIO_IDX_START_SW) {
+                        gpio_index -= CHV_GPIO_IDX_START_SW;
+                        port = CHV_IOSF_PORT_GPIO_SW;
+                } else if (gpio_index >= CHV_GPIO_IDX_START_E) {
+                        gpio_index -= CHV_GPIO_IDX_START_E;
+                        port = CHV_IOSF_PORT_GPIO_E;
+                } else {
+                        port = CHV_IOSF_PORT_GPIO_N;
+                }
+        } else {
+                /* XXX: The spec is unclear about CHV GPIO on seq v2 */
+                if (gpio_source != 0) {
+                        DRM_DEBUG_KMS("unknown gpio source %u\n", gpio_source);
+                        return;
+                }
+
+                if (gpio_index >= CHV_GPIO_IDX_START_E) {
+                        DRM_DEBUG_KMS("invalid gpio index %u for GPIO N\n",
+                                      gpio_index);
+                        return;
+                }
+
+                port = CHV_IOSF_PORT_GPIO_N;
+        }
+
+        family_num = gpio_index / CHV_VBT_MAX_PINS_PER_FMLY;
+        gpio_index = gpio_index % CHV_VBT_MAX_PINS_PER_FMLY;
+
+        cfg0 = CHV_GPIO_PAD_CFG0(family_num, gpio_index);
+        cfg1 = CHV_GPIO_PAD_CFG1(family_num, gpio_index);
+
+        mutex_lock(&dev_priv->sb_lock);
+        vlv_iosf_sb_write(dev_priv, port, cfg1, 0);
+        vlv_iosf_sb_write(dev_priv, port, cfg0,
+                          CHV_GPIO_GPIOCFG_GPO | CHV_GPIO_GPIOTXSTATE(value));
+        mutex_unlock(&dev_priv->sb_lock);
+}
+
 static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
 {
         struct drm_device *dev = intel_dsi->base.base.dev;
@@ -254,6 +323,8 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
 
         if (IS_VALLEYVIEW(dev_priv))
                 vlv_exec_gpio(dev_priv, gpio_source, gpio_index, value);
+        else if (IS_CHERRYVIEW(dev_priv))
+                chv_exec_gpio(dev_priv, gpio_source, gpio_index, value);
         else
                 DRM_DEBUG_KMS("GPIO element not supported on this platform\n");
 
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 286baec979c8..60e4ddf2ec6d 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -341,6 +341,7 @@ static void intel_dvo_destroy(struct drm_connector *connector)
 static const struct drm_connector_funcs intel_dvo_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_dvo_detect,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_dvo_destroy,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .atomic_get_property = intel_connector_atomic_get_property,
@@ -351,7 +352,6 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = {
         .mode_valid = intel_dvo_mode_valid,
         .get_modes = intel_dvo_get_modes,
-        .best_encoder = intel_best_encoder,
 };
 
 static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
@@ -406,6 +406,18 @@ intel_dvo_get_current_mode(struct drm_connector *connector)
         return mode;
 }
 
+static char intel_dvo_port_name(i915_reg_t dvo_reg)
+{
+        if (i915_mmio_reg_equal(dvo_reg, DVOA))
+                return 'A';
+        else if (i915_mmio_reg_equal(dvo_reg, DVOB))
+                return 'B';
+        else if (i915_mmio_reg_equal(dvo_reg, DVOC))
+                return 'C';
+        else
+                return '?';
+}
+
 void intel_dvo_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -428,8 +440,6 @@ void intel_dvo_init(struct drm_device *dev)
         intel_dvo->attached_connector = intel_connector;
 
         intel_encoder = &intel_dvo->base;
-        drm_encoder_init(dev, &intel_encoder->base,
-                         &intel_dvo_enc_funcs, encoder_type, NULL);
 
         intel_encoder->disable = intel_disable_dvo;
         intel_encoder->enable = intel_enable_dvo;
@@ -438,7 +448,6 @@ void intel_dvo_init(struct drm_device *dev)
         intel_encoder->compute_config = intel_dvo_compute_config;
         intel_encoder->pre_enable = intel_dvo_pre_enable;
         intel_connector->get_hw_state = intel_dvo_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         /* Now, try to find a controller */
         for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) {
@@ -496,6 +505,10 @@ void intel_dvo_init(struct drm_device *dev)
                 if (!dvoinit)
                         continue;
 
+                drm_encoder_init(dev, &intel_encoder->base,
+                                 &intel_dvo_enc_funcs, encoder_type,
+                                 "DVO %c", intel_dvo_port_name(dvo->dvo_reg));
+
                 intel_encoder->type = INTEL_OUTPUT_DVO;
                 intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
                 switch (dvo->type) {
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index d5a7cfec589b..a19944b6dc25 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -374,8 +374,9 @@ static void intel_fbc_hw_deactivate(struct drm_i915_private *dev_priv)
  * @dev_priv: i915 device instance
  *
  * This function is used to verify the current state of FBC.
+ *
  * FIXME: This should be tracked in the plane config eventually
- *        instead of queried at runtime for most callers.
+ * instead of queried at runtime for most callers.
  */
 bool intel_fbc_is_active(struct drm_i915_private *dev_priv)
 {
@@ -480,10 +481,10 @@ static void intel_fbc_deactivate(struct drm_i915_private *dev_priv)
                 intel_fbc_hw_deactivate(dev_priv);
 }
 
-static bool multiple_pipes_ok(struct intel_crtc *crtc)
+static bool multiple_pipes_ok(struct intel_crtc *crtc,
+                              struct intel_plane_state *plane_state)
 {
-        struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
-        struct drm_plane *primary = crtc->base.primary;
+        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
         struct intel_fbc *fbc = &dev_priv->fbc;
         enum pipe pipe = crtc->pipe;
 
@@ -491,9 +492,7 @@ static bool multiple_pipes_ok(struct intel_crtc *crtc)
         if (!no_fbc_on_multiple_pipes(dev_priv))
                 return true;
 
-        WARN_ON(!drm_modeset_is_locked(&primary->mutex));
-
-        if (to_intel_plane_state(primary->state)->visible)
+        if (plane_state->visible)
                 fbc->visible_pipes_mask |= (1 << pipe);
         else
                 fbc->visible_pipes_mask &= ~(1 << pipe);
@@ -708,21 +707,16 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)
         return effective_w <= max_w && effective_h <= max_h;
 }
 
-static void intel_fbc_update_state_cache(struct intel_crtc *crtc)
+static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
+                                         struct intel_crtc_state *crtc_state,
+                                         struct intel_plane_state *plane_state)
 {
         struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
         struct intel_fbc *fbc = &dev_priv->fbc;
         struct intel_fbc_state_cache *cache = &fbc->state_cache;
-        struct intel_crtc_state *crtc_state =
-                to_intel_crtc_state(crtc->base.state);
-        struct intel_plane_state *plane_state =
-                to_intel_plane_state(crtc->base.primary->state);
         struct drm_framebuffer *fb = plane_state->base.fb;
         struct drm_i915_gem_object *obj;
 
-        WARN_ON(!drm_modeset_is_locked(&crtc->base.mutex));
-        WARN_ON(!drm_modeset_is_locked(&crtc->base.primary->mutex));
-
         cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags;
         if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
                 cache->crtc.hsw_bdw_pixel_rate =
@@ -740,7 +734,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc)
 
         /* FIXME: We lack the proper locking here, so only run this on the
          * platforms that need. */
-        if (INTEL_INFO(dev_priv)->gen >= 5 && INTEL_INFO(dev_priv)->gen < 7)
+        if (IS_GEN(dev_priv, 5, 6))
                 cache->fb.ilk_ggtt_offset = i915_gem_obj_ggtt_offset(obj);
         cache->fb.pixel_format = fb->pixel_format;
         cache->fb.stride = fb->pitches[0];
@@ -824,10 +818,9 @@ static bool intel_fbc_can_choose(struct intel_crtc *crtc)
 {
         struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
         struct intel_fbc *fbc = &dev_priv->fbc;
-        bool enable_by_default = IS_HASWELL(dev_priv) ||
-                                 IS_BROADWELL(dev_priv);
+        bool enable_by_default = IS_BROADWELL(dev_priv);
 
-        if (intel_vgpu_active(dev_priv->dev)) {
+        if (intel_vgpu_active(dev_priv)) {
                 fbc->no_fbc_reason = "VGPU is active";
                 return false;
         }
@@ -887,7 +880,9 @@ static bool intel_fbc_reg_params_equal(struct intel_fbc_reg_params *params1,
         return memcmp(params1, params2, sizeof(*params1)) == 0;
 }
 
-void intel_fbc_pre_update(struct intel_crtc *crtc)
+void intel_fbc_pre_update(struct intel_crtc *crtc,
+                          struct intel_crtc_state *crtc_state,
+                          struct intel_plane_state *plane_state)
 {
         struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
         struct intel_fbc *fbc = &dev_priv->fbc;
@@ -897,7 +892,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc)
 
         mutex_lock(&fbc->lock);
 
-        if (!multiple_pipes_ok(crtc)) {
+        if (!multiple_pipes_ok(crtc, plane_state)) {
                 fbc->no_fbc_reason = "more than one pipe active";
                 goto deactivate;
         }
@@ -905,7 +900,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc)
         if (!fbc->enabled || fbc->crtc != crtc)
                 goto unlock;
 
-        intel_fbc_update_state_cache(crtc);
+        intel_fbc_update_state_cache(crtc, crtc_state, plane_state);
 
 deactivate:
         intel_fbc_deactivate(dev_priv);
@@ -1089,7 +1084,9 @@ out:
  * intel_fbc_enable multiple times for the same pipe without an
  * intel_fbc_disable in the middle, as long as it is deactivated.
  */
-void intel_fbc_enable(struct intel_crtc *crtc)
+void intel_fbc_enable(struct intel_crtc *crtc,
+                      struct intel_crtc_state *crtc_state,
+                      struct intel_plane_state *plane_state)
 {
         struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
         struct intel_fbc *fbc = &dev_priv->fbc;
@@ -1102,19 +1099,19 @@ void intel_fbc_enable(struct intel_crtc *crtc)
         if (fbc->enabled) {
                 WARN_ON(fbc->crtc == NULL);
                 if (fbc->crtc == crtc) {
-                        WARN_ON(!crtc->config->enable_fbc);
+                        WARN_ON(!crtc_state->enable_fbc);
                         WARN_ON(fbc->active);
                 }
                 goto out;
         }
 
-        if (!crtc->config->enable_fbc)
+        if (!crtc_state->enable_fbc)
                 goto out;
 
         WARN_ON(fbc->active);
         WARN_ON(fbc->crtc != NULL);
 
-        intel_fbc_update_state_cache(crtc);
+        intel_fbc_update_state_cache(crtc, crtc_state, plane_state);
         if (intel_fbc_alloc_cfb(crtc)) {
                 fbc->no_fbc_reason = "not enough stolen memory";
                 goto out;
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index ab8d09a81f14..4babefc51eb2 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -150,10 +150,10 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
         if (size * 2 < ggtt->stolen_usable_size)
                 obj = i915_gem_object_create_stolen(dev, size);
         if (obj == NULL)
-                obj = i915_gem_alloc_object(dev, size);
-        if (!obj) {
+                obj = i915_gem_object_create(dev, size);
+        if (IS_ERR(obj)) {
                 DRM_ERROR("failed to allocate framebuffer\n");
-                ret = -ENOMEM;
+                ret = PTR_ERR(obj);
                 goto out;
         }
 
@@ -186,9 +186,11 @@ static int intelfb_create(struct drm_fb_helper *helper,
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct fb_info *info;
         struct drm_framebuffer *fb;
+        struct i915_vma *vma;
         struct drm_i915_gem_object *obj;
-        int size, ret;
         bool prealloc = false;
+        void *vaddr;
+        int ret;
 
         if (intel_fb &&
             (sizes->fb_width > intel_fb->base.width ||
@@ -214,7 +216,6 @@ static int intelfb_create(struct drm_fb_helper *helper,
         }
 
         obj = intel_fb->obj;
-        size = obj->base.size;
 
         mutex_lock(&dev->struct_mutex);
 
@@ -244,22 +245,23 @@ static int intelfb_create(struct drm_fb_helper *helper,
         info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
         info->fbops = &intelfb_ops;
 
+        vma = i915_gem_obj_to_ggtt(obj);
+
         /* setup aperture base/size for vesafb takeover */
         info->apertures->ranges[0].base = dev->mode_config.fb_base;
         info->apertures->ranges[0].size = ggtt->mappable_end;
 
-        info->fix.smem_start = dev->mode_config.fb_base + i915_gem_obj_ggtt_offset(obj);
-        info->fix.smem_len = size;
+        info->fix.smem_start = dev->mode_config.fb_base + vma->node.start;
+        info->fix.smem_len = vma->node.size;
 
-        info->screen_base =
-                ioremap_wc(ggtt->mappable_base + i915_gem_obj_ggtt_offset(obj),
-                           size);
-        if (!info->screen_base) {
+        vaddr = i915_vma_pin_iomap(vma);
+        if (IS_ERR(vaddr)) {
                 DRM_ERROR("Failed to remap framebuffer into virtual memory\n");
-                ret = -ENOSPC;
+                ret = PTR_ERR(vaddr);
                 goto out_destroy_fbi;
         }
-        info->screen_size = size;
+        info->screen_base = vaddr;
+        info->screen_size = vma->node.size;
 
         /* This driver doesn't need a VT switch to restore the mode on resume */
         info->skip_vt_switch = true;
@@ -287,7 +289,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
 out_destroy_fbi:
         drm_fb_helper_release_fbi(helper);
 out_unpin:
-        i915_gem_object_ggtt_unpin(obj);
+        intel_unpin_fb_obj(&ifbdev->fb->base, BIT(DRM_ROTATE_0));
 out_unlock:
         mutex_unlock(&dev->struct_mutex);
         return ret;
@@ -488,10 +490,10 @@ retry:
                 }
                 crtcs[i] = new_crtc;
 
-                DRM_DEBUG_KMS("connector %s on pipe %c [CRTC:%d]: %dx%d%s\n",
+                DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",
                               connector->name,
-                              pipe_name(to_intel_crtc(connector->state->crtc)->pipe),
                               connector->state->crtc->base.id,
+                              connector->state->crtc->name,
                               modes[i]->hdisplay, modes[i]->vdisplay,
                               modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" :"");
 
@@ -550,7 +552,10 @@ static void intel_fbdev_destroy(struct drm_device *dev,
         drm_fb_helper_fini(&ifbdev->helper);
 
         if (ifbdev->fb) {
-                drm_framebuffer_unregister_private(&ifbdev->fb->base);
+                mutex_lock(&dev->struct_mutex);
+                intel_unpin_fb_obj(&ifbdev->fb->base, BIT(DRM_ROTATE_0));
+                mutex_unlock(&dev->struct_mutex);
+
                 drm_framebuffer_remove(&ifbdev->fb->base);
         }
 }
@@ -717,8 +722,6 @@ int intel_fbdev_init(struct drm_device *dev)
                 return ret;
         }
 
-        ifbdev->helper.atomic = true;
-
         dev_priv->fbdev = ifbdev;
         INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker);
 
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 9d79c4c3e256..4df80cc9a291 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -48,14 +48,23 @@ struct drm_i915_gem_request;
  * queue (a circular array of work items), again described in the process
  * descriptor. Work queue pages are mapped momentarily as required.
  *
- * Finally, we also keep a few statistics here, including the number of
- * submissions to each engine, and a record of the last submission failure
- * (if any).
+ * We also keep a few statistics on failures. Ideally, these should all
+ * be zero!
+ *   no_wq_space: times that the submission pre-check found no space was
+ *                available in the work queue (note, the queue is shared,
+ *                not per-engine). It is OK for this to be nonzero, but
+ *                it should not be huge!
+ *   q_fail: failed to enqueue a work item. This should never happen,
+ *           because we check for space beforehand.
+ *   b_fail: failed to ring the doorbell. This should never happen, unless
+ *           somehow the hardware misbehaves, or maybe if the GuC firmware
+ *           crashes? We probably need to reset the GPU to recover.
+ *   retcode: errno from last guc_submit()
  */
 struct i915_guc_client {
         struct drm_i915_gem_object *client_obj;
         void *client_base;              /* first page (only) of above   */
-        struct intel_context *owner;
+        struct i915_gem_context *owner;
         struct intel_guc *guc;
         uint32_t priority;
         uint32_t ctx_index;
@@ -71,12 +80,13 @@ struct i915_guc_client {
         uint32_t wq_tail;
         uint32_t unused;                /* Was 'wq_head'                */
 
-        /* GuC submission statistics & status */
-        uint64_t submissions[GUC_MAX_ENGINES_NUM];
-        uint32_t q_fail;
+        uint32_t no_wq_space;
+        uint32_t q_fail;                /* No longer used               */
         uint32_t b_fail;
         int retcode;
-        int spare;                      /* pad to 32 DWords             */
+
+        /* Per-engine counts of GuC submissions */
+        uint64_t submissions[GUC_MAX_ENGINES_NUM];
 };
 
 enum intel_guc_fw_status {
@@ -138,20 +148,19 @@ struct intel_guc {
 };
 
 /* intel_guc_loader.c */
-extern void intel_guc_ucode_init(struct drm_device *dev);
-extern int intel_guc_ucode_load(struct drm_device *dev);
-extern void intel_guc_ucode_fini(struct drm_device *dev);
+extern void intel_guc_init(struct drm_device *dev);
+extern int intel_guc_setup(struct drm_device *dev);
+extern void intel_guc_fini(struct drm_device *dev);
 extern const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status);
 extern int intel_guc_suspend(struct drm_device *dev);
 extern int intel_guc_resume(struct drm_device *dev);
 
 /* i915_guc_submission.c */
-int i915_guc_submission_init(struct drm_device *dev);
-int i915_guc_submission_enable(struct drm_device *dev);
-int i915_guc_submit(struct i915_guc_client *client,
-                    struct drm_i915_gem_request *rq);
-void i915_guc_submission_disable(struct drm_device *dev);
-void i915_guc_submission_fini(struct drm_device *dev);
-int i915_guc_wq_check_space(struct i915_guc_client *client);
+int i915_guc_submission_init(struct drm_i915_private *dev_priv);
+int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
+int i915_guc_wq_check_space(struct drm_i915_gem_request *rq);
+int i915_guc_submit(struct drm_i915_gem_request *rq);
+void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
+void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
 
 #endif
diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
index 2de57ffe5e18..944786d7075b 100644
--- a/drivers/gpu/drm/i915/intel_guc_fwif.h
+++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
@@ -71,7 +71,8 @@
 #define   WQ_WORKLOAD_TOUCH             (2 << WQ_WORKLOAD_SHIFT)
 
 #define WQ_RING_TAIL_SHIFT              20
-#define WQ_RING_TAIL_MASK               (0x7FF << WQ_RING_TAIL_SHIFT)
+#define WQ_RING_TAIL_MAX                0x7FF   /* 2^11 QWords */
+#define WQ_RING_TAIL_MASK               (WQ_RING_TAIL_MAX << WQ_RING_TAIL_SHIFT)
 
 #define GUC_DOORBELL_ENABLED            1
 #define GUC_DOORBELL_DISABLED           0
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 876e5da44c4e..8fe96a2d989e 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -59,9 +59,12 @@
  *
  */
 
-#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin"
+#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
+#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"
+MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
+
 /* User-friendly representation of an enum */
 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
 {
@@ -100,6 +103,7 @@ static void direct_interrupts_to_guc(struct drm_i915_private *dev_priv)
 {
         struct intel_engine_cs *engine;
         int irqs;
+        u32 tmp;
 
         /* tell all command streamers to forward interrupts and vblank to GuC */
         irqs = _MASKED_FIELD(GFX_FORWARD_VBLANK_MASK, GFX_FORWARD_VBLANK_ALWAYS);
@@ -114,6 +118,16 @@ static void direct_interrupts_to_guc(struct drm_i915_private *dev_priv)
         I915_WRITE(GUC_BCS_RCS_IER, ~irqs);
         I915_WRITE(GUC_VCS2_VCS1_IER, ~irqs);
         I915_WRITE(GUC_WD_VECS_IER, ~irqs);
+
+        /*
+         * If GuC has routed PM interrupts to itself, don't keep it.
+         * and keep other interrupts those are unmasked by GuC.
+        */
+        tmp = I915_READ(GEN6_PMINTRMSK);
+        if (tmp & GEN8_PMINTR_REDIRECT_TO_NON_DISP) {
+                dev_priv->rps.pm_intr_keep |= ~(tmp & ~GEN8_PMINTR_REDIRECT_TO_NON_DISP);
+                dev_priv->rps.pm_intr_keep &= ~GEN8_PMINTR_REDIRECT_TO_NON_DISP;
+        }
 }
 
 static u32 get_gttype(struct drm_i915_private *dev_priv)
@@ -281,6 +295,17 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv)
         return ret;
 }
 
+static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
+{
+        u32 wopcm_size = GUC_WOPCM_TOP;
+
+        /* On BXT, the top of WOPCM is reserved for RC6 context */
+        if (IS_BROXTON(dev_priv))
+                wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;
+
+        return wopcm_size;
+}
+
 /*
  * Load the GuC firmware blob into the MinuteIA.
  */
@@ -308,7 +333,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
         /* init WOPCM */
-        I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+        I915_WRITE(GUC_WOPCM_SIZE, guc_wopcm_size(dev_priv));
         I915_WRITE(DMA_GUC_WOPCM_OFFSET, GUC_WOPCM_OFFSET_VALUE);
 
         /* Enable MIA caching. GuC clock gating is disabled. */
@@ -372,66 +397,63 @@ static int i915_reset_guc(struct drm_i915_private *dev_priv)
 }
 
 /**
- * intel_guc_ucode_load() - load GuC uCode into the device
+ * intel_guc_setup() - finish preparing the GuC for activity
  * @dev:        drm device
  *
  * Called from gem_init_hw() during driver loading and also after a GPU reset.
  *
+ * The main action required here it to load the GuC uCode into the device.
  * The firmware image should have already been fetched into memory by the
- * earlier call to intel_guc_ucode_init(), so here we need only check that
- * is succeeded, and then transfer the image to the h/w.
+ * earlier call to intel_guc_init(), so here we need only check that worked,
+ * and then transfer the image to the h/w.
  *
  * Return:      non-zero code on error
  */
-int intel_guc_ucode_load(struct drm_device *dev)
+int intel_guc_setup(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
-        int retries, err = 0;
-
-        if (!i915.enable_guc_submission)
-                return 0;
+        const char *fw_path = guc_fw->guc_fw_path;
+        int retries, ret, err;
 
-        DRM_DEBUG_DRIVER("GuC fw status: fetch %s, load %s\n",
+        DRM_DEBUG_DRIVER("GuC fw status: path %s, fetch %s, load %s\n",
+                fw_path,
                 intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),
                 intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
 
-        direct_interrupts_to_host(dev_priv);
-
-        if (guc_fw->guc_fw_fetch_status == GUC_FIRMWARE_NONE)
-                return 0;
-
-        if (guc_fw->guc_fw_fetch_status == GUC_FIRMWARE_SUCCESS &&
-            guc_fw->guc_fw_load_status == GUC_FIRMWARE_FAIL)
-                return -ENOEXEC;
-
-        guc_fw->guc_fw_load_status = GUC_FIRMWARE_PENDING;
-
-        DRM_DEBUG_DRIVER("GuC fw fetch status %s\n",
-                intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status));
-
-        switch (guc_fw->guc_fw_fetch_status) {
-        case GUC_FIRMWARE_FAIL:
-                /* something went wrong :( */
-                err = -EIO;
+        /* Loading forbidden, or no firmware to load? */
+        if (!i915.enable_guc_loading) {
+                err = 0;
                 goto fail;
-
-        case GUC_FIRMWARE_NONE:
-        case GUC_FIRMWARE_PENDING:
-        default:
-                /* "can't happen" */
-                WARN_ONCE(1, "GuC fw %s invalid guc_fw_fetch_status %s [%d]\n",
-                        guc_fw->guc_fw_path,
-                        intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),
-                        guc_fw->guc_fw_fetch_status);
+        } else if (fw_path == NULL) {
+                /* Device is known to have no uCode (e.g. no GuC) */
                 err = -ENXIO;
                 goto fail;
+        } else if (*fw_path == '\0') {
+                /* Device has a GuC but we don't know what f/w to load? */
+                DRM_INFO("No GuC firmware known for this platform\n");
+                err = -ENODEV;
+                goto fail;
+        }
 
-        case GUC_FIRMWARE_SUCCESS:
-                break;
+        /* Fetch failed, or already fetched but failed to load? */
+        if (guc_fw->guc_fw_fetch_status != GUC_FIRMWARE_SUCCESS) {
+                err = -EIO;
+                goto fail;
+        } else if (guc_fw->guc_fw_load_status == GUC_FIRMWARE_FAIL) {
+                err = -ENOEXEC;
+                goto fail;
         }
 
-        err = i915_guc_submission_init(dev);
+        direct_interrupts_to_host(dev_priv);
+
+        guc_fw->guc_fw_load_status = GUC_FIRMWARE_PENDING;
+
+        DRM_DEBUG_DRIVER("GuC fw status: fetch %s, load %s\n",
+                intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),
+                intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
+
+        err = i915_guc_submission_init(dev_priv);
         if (err)
                 goto fail;
 
@@ -448,7 +470,7 @@ int intel_guc_ucode_load(struct drm_device *dev)
                  */
                 err = i915_reset_guc(dev_priv);
                 if (err) {
-                        DRM_ERROR("GuC reset failed, err %d\n", err);
+                        DRM_ERROR("GuC reset failed: %d\n", err);
                         goto fail;
                 }
 
@@ -459,8 +481,8 @@ int intel_guc_ucode_load(struct drm_device *dev)
                 if (--retries == 0)
                         goto fail;
 
-                DRM_INFO("GuC fw load failed, err %d; will reset and "
-                        "retry %d more time(s)\n", err, retries);
+                DRM_INFO("GuC fw load failed: %d; will reset and "
+                         "retry %d more time(s)\n", err, retries);
         }
 
         guc_fw->guc_fw_load_status = GUC_FIRMWARE_SUCCESS;
@@ -470,10 +492,7 @@ int intel_guc_ucode_load(struct drm_device *dev)
                 intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
 
         if (i915.enable_guc_submission) {
-                /* The execbuf_client will be recreated. Release it first. */
-                i915_guc_submission_disable(dev);
-
-                err = i915_guc_submission_enable(dev);
+                err = i915_guc_submission_enable(dev_priv);
                 if (err)
                         goto fail;
                 direct_interrupts_to_guc(dev_priv);
@@ -482,15 +501,50 @@ int intel_guc_ucode_load(struct drm_device *dev)
         return 0;
 
 fail:
-        DRM_ERROR("GuC firmware load failed, err %d\n", err);
         if (guc_fw->guc_fw_load_status == GUC_FIRMWARE_PENDING)
                 guc_fw->guc_fw_load_status = GUC_FIRMWARE_FAIL;
 
         direct_interrupts_to_host(dev_priv);
-        i915_guc_submission_disable(dev);
-        i915_guc_submission_fini(dev);
+        i915_guc_submission_disable(dev_priv);
+        i915_guc_submission_fini(dev_priv);
 
-        return err;
+        /*
+         * We've failed to load the firmware :(
+         *
+         * Decide whether to disable GuC submission and fall back to
+         * execlist mode, and whether to hide the error by returning
+         * zero or to return -EIO, which the caller will treat as a
+         * nonfatal error (i.e. it doesn't prevent driver load, but
+         * marks the GPU as wedged until reset).
+         */
+        if (i915.enable_guc_loading > 1) {
+                ret = -EIO;
+        } else if (i915.enable_guc_submission > 1) {
+                ret = -EIO;
+        } else {
+                ret = 0;
+        }
+
+        if (err == 0 && !HAS_GUC_UCODE(dev))
+                ;       /* Don't mention the GuC! */
+        else if (err == 0)
+                DRM_INFO("GuC firmware load skipped\n");
+        else if (ret != -EIO)
+                DRM_INFO("GuC firmware load failed: %d\n", err);
+        else
+                DRM_ERROR("GuC firmware load failed: %d\n", err);
+
+        if (i915.enable_guc_submission) {
+                if (fw_path == NULL)
+                        DRM_INFO("GuC submission without firmware not supported\n");
+                if (ret == 0)
+                        DRM_INFO("Falling back from GuC submission to execlist mode\n");
+                else
+                        DRM_ERROR("GuC init failed: %d\n", ret);
+        }
+        i915.enable_guc_submission = 0;
+
+        return ret;
 }
 
 static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
@@ -552,9 +606,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
 
         /* Header and uCode will be loaded to WOPCM. Size of the two. */
         size = guc_fw->header_size + guc_fw->ucode_size;
-
-        /* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
-        if (size > GUC_WOPCM_SIZE_VALUE - 0x8000) {
+        if (size > guc_wopcm_size(dev->dev_private)) {
                 DRM_ERROR("Firmware is too large to fit in WOPCM\n");
                 goto fail;
         }
@@ -617,22 +669,25 @@ fail:
 }
 
 /**
- * intel_guc_ucode_init() - define parameters and fetch firmware
+ * intel_guc_init() - define parameters and fetch firmware
  * @dev:        drm device
  *
  * Called early during driver load, but after GEM is initialised.
  *
  * The firmware will be transferred to the GuC's memory later,
- * when intel_guc_ucode_load() is called.
+ * when intel_guc_setup() is called.
  */
-void intel_guc_ucode_init(struct drm_device *dev)
+void intel_guc_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
         const char *fw_path;
 
-        if (!HAS_GUC_SCHED(dev))
-                i915.enable_guc_submission = false;
+        /* A negative value means "use platform default" */
+        if (i915.enable_guc_loading < 0)
+                i915.enable_guc_loading = HAS_GUC_UCODE(dev);
+        if (i915.enable_guc_submission < 0)
+                i915.enable_guc_submission = HAS_GUC_SCHED(dev);
 
         if (!HAS_GUC_UCODE(dev)) {
                 fw_path = NULL;
@@ -640,27 +695,26 @@ void intel_guc_ucode_init(struct drm_device *dev)
                 fw_path = I915_SKL_GUC_UCODE;
                 guc_fw->guc_fw_major_wanted = 6;
                 guc_fw->guc_fw_minor_wanted = 1;
+        } else if (IS_BROXTON(dev)) {
+                fw_path = I915_BXT_GUC_UCODE;
+                guc_fw->guc_fw_major_wanted = 8;
+                guc_fw->guc_fw_minor_wanted = 7;
         } else {
-                i915.enable_guc_submission = false;
                 fw_path = "";   /* unknown device */
         }
 
-        if (!i915.enable_guc_submission)
-                return;
-
         guc_fw->guc_dev = dev;
         guc_fw->guc_fw_path = fw_path;
         guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_NONE;
         guc_fw->guc_fw_load_status = GUC_FIRMWARE_NONE;
 
+        /* Early (and silent) return if GuC loading is disabled */
+        if (!i915.enable_guc_loading)
+                return;
         if (fw_path == NULL)
                 return;
-
-        if (*fw_path == '\0') {
-                DRM_ERROR("No GuC firmware known for this platform\n");
-                guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_FAIL;
+        if (*fw_path == '\0')
                 return;
-        }
 
         guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_PENDING;
         DRM_DEBUG_DRIVER("GuC firmware pending, path %s\n", fw_path);
@@ -669,18 +723,18 @@ void intel_guc_ucode_init(struct drm_device *dev)
 }
 
 /**
- * intel_guc_ucode_fini() - clean up all allocated resources
+ * intel_guc_fini() - clean up all allocated resources
  * @dev:        drm device
  */
-void intel_guc_ucode_fini(struct drm_device *dev)
+void intel_guc_fini(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
 
         mutex_lock(&dev->struct_mutex);
         direct_interrupts_to_host(dev_priv);
-        i915_guc_submission_disable(dev);
-        i915_guc_submission_fini(dev);
+        i915_guc_submission_disable(dev_priv);
+        i915_guc_submission_fini(dev_priv);
 
         if (guc_fw->guc_fw_obj)
                 drm_gem_object_unreference(&guc_fw->guc_fw_obj->base);
diff --git a/drivers/gpu/drm/i915/intel_gvt.c b/drivers/gpu/drm/i915/intel_gvt.c
new file mode 100644
index 000000000000..9fa458ce40a6
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_gvt.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#include "i915_drv.h"
+#include "intel_gvt.h"
+
+/**
+ * DOC: Intel GVT-g host support
+ *
+ * Intel GVT-g is a graphics virtualization technology which shares the
+ * GPU among multiple virtual machines on a time-sharing basis. Each
+ * virtual machine is presented a virtual GPU (vGPU), which has equivalent
+ * features as the underlying physical GPU (pGPU), so i915 driver can run
+ * seamlessly in a virtual machine. This file provides the englightments
+ * of GVT and the necessary components used by GVT in i915 driver.
+ */
+
+static bool is_supported_device(struct drm_i915_private *dev_priv)
+{
+        if (IS_BROADWELL(dev_priv))
+                return true;
+        return false;
+}
+
+/**
+ * intel_gvt_init - initialize GVT components
+ * @dev_priv: drm i915 private data
+ *
+ * This function is called at the initialization stage to create a GVT device.
+ *
+ * Returns:
+ * Zero on success, negative error code if failed.
+ *
+ */
+int intel_gvt_init(struct drm_i915_private *dev_priv)
+{
+        int ret;
+
+        if (!i915.enable_gvt) {
+                DRM_DEBUG_DRIVER("GVT-g is disabled by kernel params\n");
+                return 0;
+        }
+
+        if (!is_supported_device(dev_priv)) {
+                DRM_DEBUG_DRIVER("Unsupported device. GVT-g is disabled\n");
+                return 0;
+        }
+
+        /*
+         * We're not in host or fail to find a MPT module, disable GVT-g
+         */
+        ret = intel_gvt_init_host();
+        if (ret) {
+                DRM_DEBUG_DRIVER("Not in host or MPT modules not found\n");
+                return 0;
+        }
+
+        ret = intel_gvt_init_device(dev_priv);
+        if (ret) {
+                DRM_DEBUG_DRIVER("Fail to init GVT device\n");
+                return 0;
+        }
+
+        return 0;
+}
+
+/**
+ * intel_gvt_cleanup - cleanup GVT components when i915 driver is unloading
+ * @dev_priv: drm i915 private *
+ *
+ * This function is called at the i915 driver unloading stage, to shutdown
+ * GVT components and release the related resources.
+ */
+void intel_gvt_cleanup(struct drm_i915_private *dev_priv)
+{
+        if (!intel_gvt_active(dev_priv))
+                return;
+
+        intel_gvt_clean_device(dev_priv);
+}
diff --git a/drivers/gpu/drm/i915/intel_gvt.h b/drivers/gpu/drm/i915/intel_gvt.h
new file mode 100644
index 000000000000..960211df74db
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_gvt.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef _INTEL_GVT_H_
+#define _INTEL_GVT_H_
+
+#include "gvt/gvt.h"
+
+#ifdef CONFIG_DRM_I915_GVT
+int intel_gvt_init(struct drm_i915_private *dev_priv);
+void intel_gvt_cleanup(struct drm_i915_private *dev_priv);
+int intel_gvt_init_device(struct drm_i915_private *dev_priv);
+void intel_gvt_clean_device(struct drm_i915_private *dev_priv);
+int intel_gvt_init_host(void);
+#else
+static inline int intel_gvt_init(struct drm_i915_private *dev_priv)
+{
+        return 0;
+}
+static inline void intel_gvt_cleanup(struct drm_i915_private *dev_priv)
+{
+}
+#endif
+
+#endif /* _INTEL_GVT_H_ */
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2c3bd9c2573e..fb21626ada64 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1678,35 +1678,12 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
         struct intel_crtc *intel_crtc =
                 to_intel_crtc(encoder->base.crtc);
         const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
-        enum dpio_channel port = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-        u32 val;
 
-        /* Enable clock channels for this port */
-        mutex_lock(&dev_priv->sb_lock);
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW8(port));
-        val = 0;
-        if (pipe)
-                val |= (1<<21);
-        else
-                val &= ~(1<<21);
-        val |= 0x001000c4;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW8(port), val);
+        vlv_phy_pre_encoder_enable(encoder);
 
         /* HDMI 1.0V-2dB */
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), 0);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW4(port), 0x2b245f5f);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW2(port), 0x5578b83a);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW3(port), 0x0c782040);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX3_DW4(port), 0x2b247878);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW11(port), 0x00030000);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW9(port), 0x00002000);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), DPIO_TX_OCALINIT_EN);
-
-        /* Program lane clock */
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW14(port), 0x00760018);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW23(port), 0x00400888);
-        mutex_unlock(&dev_priv->sb_lock);
+        vlv_set_phy_signal_level(encoder, 0x2b245f5f, 0x00002000, 0x5578b83a,
+                                 0x2b247878);
 
         intel_hdmi->set_infoframes(&encoder->base,
                                    intel_crtc->config->has_hdmi_sink,
@@ -1719,207 +1696,27 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
 
 static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)
 {
-        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel port = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-
         intel_hdmi_prepare(encoder);
 
-        /* Program Tx lane resets to default */
-        mutex_lock(&dev_priv->sb_lock);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port),
-                         DPIO_PCS_TX_LANE2_RESET |
-                         DPIO_PCS_TX_LANE1_RESET);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port),
-                         DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |
-                         DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN |
-                         (1<<DPIO_PCS_CLK_DATAWIDTH_SHIFT) |
-                         DPIO_PCS_CLK_SOFT_RESET);
-
-        /* Fix up inter-pair skew failure */
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW12(port), 0x00750f00);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW11(port), 0x00001500);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW14(port), 0x40400000);
-
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW9(port), 0x00002000);
-        vlv_dpio_write(dev_priv, pipe, VLV_TX_DW5(port), DPIO_TX_OCALINIT_EN);
-        mutex_unlock(&dev_priv->sb_lock);
-}
-
-static void chv_data_lane_soft_reset(struct intel_encoder *encoder,
-                                     bool reset)
-{
-        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base));
-        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
-        enum pipe pipe = crtc->pipe;
-        uint32_t val;
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW0(ch));
-        if (reset)
-                val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
-        else
-                val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW0(ch), val);
-
-        if (crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW0(ch));
-                if (reset)
-                        val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
-                else
-                        val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW0(ch), val);
-        }
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW1(ch));
-        val |= CHV_PCS_REQ_SOFTRESET_EN;
-        if (reset)
-                val &= ~DPIO_PCS_CLK_SOFT_RESET;
-        else
-                val |= DPIO_PCS_CLK_SOFT_RESET;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW1(ch), val);
-
-        if (crtc->config->lane_count > 2) {
-                val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW1(ch));
-                val |= CHV_PCS_REQ_SOFTRESET_EN;
-                if (reset)
-                        val &= ~DPIO_PCS_CLK_SOFT_RESET;
-                else
-                        val |= DPIO_PCS_CLK_SOFT_RESET;
-                vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW1(ch), val);
-        }
+        vlv_phy_pre_pll_enable(encoder);
 }
 
 static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder)
 {
-        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel ch = vlv_dport_to_channel(dport);
-        enum pipe pipe = intel_crtc->pipe;
-        u32 val;
-
         intel_hdmi_prepare(encoder);
 
-        /*
-         * Must trick the second common lane into life.
-         * Otherwise we can't even access the PLL.
-         */
-        if (ch == DPIO_CH0 && pipe == PIPE_B)
-                dport->release_cl2_override =
-                        !chv_phy_powergate_ch(dev_priv, DPIO_PHY0, DPIO_CH1, true);
-
-        chv_phy_powergate_lanes(encoder, true, 0x0);
-
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* Assert data lane reset */
-        chv_data_lane_soft_reset(encoder, true);
-
-        /* program left/right clock distribution */
-        if (pipe != PIPE_B) {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW5_CH0);
-                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
-                if (ch == DPIO_CH0)
-                        val |= CHV_BUFLEFTENA1_FORCE;
-                if (ch == DPIO_CH1)
-                        val |= CHV_BUFRIGHTENA1_FORCE;
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW5_CH0, val);
-        } else {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW1_CH1);
-                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
-                if (ch == DPIO_CH0)
-                        val |= CHV_BUFLEFTENA2_FORCE;
-                if (ch == DPIO_CH1)
-                        val |= CHV_BUFRIGHTENA2_FORCE;
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW1_CH1, val);
-        }
-
-        /* program clock channel usage */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW8(ch));
-        val |= CHV_PCS_USEDCLKCHANNEL_OVRRIDE;
-        if (pipe != PIPE_B)
-                val &= ~CHV_PCS_USEDCLKCHANNEL;
-        else
-                val |= CHV_PCS_USEDCLKCHANNEL;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW8(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW8(ch));
-        val |= CHV_PCS_USEDCLKCHANNEL_OVRRIDE;
-        if (pipe != PIPE_B)
-                val &= ~CHV_PCS_USEDCLKCHANNEL;
-        else
-                val |= CHV_PCS_USEDCLKCHANNEL;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW8(ch), val);
-
-        /*
-         * This a a bit weird since generally CL
-         * matches the pipe, but here we need to
-         * pick the CL based on the port.
-         */
-        val = vlv_dpio_read(dev_priv, pipe, CHV_CMN_DW19(ch));
-        if (pipe != PIPE_B)
-                val &= ~CHV_CMN_USEDCLKCHANNEL;
-        else
-                val |= CHV_CMN_USEDCLKCHANNEL;
-        vlv_dpio_write(dev_priv, pipe, CHV_CMN_DW19(ch), val);
-
-        mutex_unlock(&dev_priv->sb_lock);
+        chv_phy_pre_pll_enable(encoder);
 }
 
 static void chv_hdmi_post_pll_disable(struct intel_encoder *encoder)
 {
-        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe;
-        u32 val;
-
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* disable left/right clock distribution */
-        if (pipe != PIPE_B) {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW5_CH0);
-                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW5_CH0, val);
-        } else {
-                val = vlv_dpio_read(dev_priv, pipe, _CHV_CMN_DW1_CH1);
-                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
-                vlv_dpio_write(dev_priv, pipe, _CHV_CMN_DW1_CH1, val);
-        }
-
-        mutex_unlock(&dev_priv->sb_lock);
-
-        /*
-         * Leave the power down bit cleared for at least one
-         * lane so that chv_powergate_phy_ch() will power
-         * on something when the channel is otherwise unused.
-         * When the port is off and the override is removed
-         * the lanes power down anyway, so otherwise it doesn't
-         * really matter what the state of power down bits is
-         * after this.
-         */
-        chv_phy_powergate_lanes(encoder, false, 0x0);
+        chv_phy_post_pll_disable(encoder);
 }
 
 static void vlv_hdmi_post_disable(struct intel_encoder *encoder)
 {
-        struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(encoder->base.crtc);
-        enum dpio_channel port = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-
         /* Reset lanes to avoid HDMI flicker (VLV w/a) */
-        mutex_lock(&dev_priv->sb_lock);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port), 0x00000000);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port), 0x00e00060);
-        mutex_unlock(&dev_priv->sb_lock);
+        vlv_phy_reset_lanes(encoder);
 }
 
 static void chv_hdmi_post_disable(struct intel_encoder *encoder)
@@ -1944,138 +1741,12 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
         struct intel_crtc *intel_crtc =
                 to_intel_crtc(encoder->base.crtc);
         const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
-        enum dpio_channel ch = vlv_dport_to_channel(dport);
-        int pipe = intel_crtc->pipe;
-        int data, i, stagger;
-        u32 val;
 
-        mutex_lock(&dev_priv->sb_lock);
-
-        /* allow hardware to manage TX FIFO reset source */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW11(ch));
-        val &= ~DPIO_LANEDESKEW_STRAP_OVRD;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW11(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW11(ch));
-        val &= ~DPIO_LANEDESKEW_STRAP_OVRD;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW11(ch), val);
-
-        /* Program Tx latency optimal setting */
-        for (i = 0; i < 4; i++) {
-                /* Set the upar bit */
-                data = (i == 1) ? 0x0 : 0x1;
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW14(ch, i),
-                                data << DPIO_UPAR_SHIFT);
-        }
-
-        /* Data lane stagger programming */
-        if (intel_crtc->config->port_clock > 270000)
-                stagger = 0x18;
-        else if (intel_crtc->config->port_clock > 135000)
-                stagger = 0xd;
-        else if (intel_crtc->config->port_clock > 67500)
-                stagger = 0x7;
-        else if (intel_crtc->config->port_clock > 33750)
-                stagger = 0x4;
-        else
-                stagger = 0x2;
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW11(ch));
-        val |= DPIO_TX2_STAGGER_MASK(0x1f);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW11(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW11(ch));
-        val |= DPIO_TX2_STAGGER_MASK(0x1f);
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW11(ch), val);
-
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW12(ch),
-                       DPIO_LANESTAGGER_STRAP(stagger) |
-                       DPIO_LANESTAGGER_STRAP_OVRD |
-                       DPIO_TX1_STAGGER_MASK(0x1f) |
-                       DPIO_TX1_STAGGER_MULT(6) |
-                       DPIO_TX2_STAGGER_MULT(0));
-
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW12(ch),
-                       DPIO_LANESTAGGER_STRAP(stagger) |
-                       DPIO_LANESTAGGER_STRAP_OVRD |
-                       DPIO_TX1_STAGGER_MASK(0x1f) |
-                       DPIO_TX1_STAGGER_MULT(7) |
-                       DPIO_TX2_STAGGER_MULT(5));
-
-        /* Deassert data lane reset */
-        chv_data_lane_soft_reset(encoder, false);
-
-        /* Clear calc init */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW10(ch));
-        val &= ~(DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3);
-        val &= ~(DPIO_PCS_TX1DEEMP_MASK | DPIO_PCS_TX2DEEMP_MASK);
-        val |= DPIO_PCS_TX1DEEMP_9P5 | DPIO_PCS_TX2DEEMP_9P5;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW10(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW10(ch));
-        val &= ~(DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3);
-        val &= ~(DPIO_PCS_TX1DEEMP_MASK | DPIO_PCS_TX2DEEMP_MASK);
-        val |= DPIO_PCS_TX1DEEMP_9P5 | DPIO_PCS_TX2DEEMP_9P5;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW10(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW9(ch));
-        val &= ~(DPIO_PCS_TX1MARGIN_MASK | DPIO_PCS_TX2MARGIN_MASK);
-        val |= DPIO_PCS_TX1MARGIN_000 | DPIO_PCS_TX2MARGIN_000;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW9(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW9(ch));
-        val &= ~(DPIO_PCS_TX1MARGIN_MASK | DPIO_PCS_TX2MARGIN_MASK);
-        val |= DPIO_PCS_TX1MARGIN_000 | DPIO_PCS_TX2MARGIN_000;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW9(ch), val);
+        chv_phy_pre_encoder_enable(encoder);
 
         /* FIXME: Program the support xxx V-dB */
         /* Use 800mV-0dB */
-        for (i = 0; i < 4; i++) {
-                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW4(ch, i));
-                val &= ~DPIO_SWING_DEEMPH9P5_MASK;
-                val |= 128 << DPIO_SWING_DEEMPH9P5_SHIFT;
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW4(ch, i), val);
-        }
-
-        for (i = 0; i < 4; i++) {
-                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW2(ch, i));
-
-                val &= ~DPIO_SWING_MARGIN000_MASK;
-                val |= 102 << DPIO_SWING_MARGIN000_SHIFT;
-
-                /*
-                 * Supposedly this value shouldn't matter when unique transition
-                 * scale is disabled, but in fact it does matter. Let's just
-                 * always program the same value and hope it's OK.
-                 */
-                val &= ~(0xff << DPIO_UNIQ_TRANS_SCALE_SHIFT);
-                val |= 0x9a << DPIO_UNIQ_TRANS_SCALE_SHIFT;
-
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW2(ch, i), val);
-        }
-
-        /*
-         * The document said it needs to set bit 27 for ch0 and bit 26
-         * for ch1. Might be a typo in the doc.
-         * For now, for this unique transition scale selection, set bit
-         * 27 for ch0 and ch1.
-         */
-        for (i = 0; i < 4; i++) {
-                val = vlv_dpio_read(dev_priv, pipe, CHV_TX_DW3(ch, i));
-                val &= ~DPIO_TX_UNIQ_TRANS_SCALE_EN;
-                vlv_dpio_write(dev_priv, pipe, CHV_TX_DW3(ch, i), val);
-        }
-
-        /* Start swing calculation */
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW10(ch));
-        val |= DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW10(ch), val);
-
-        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW10(ch));
-        val |= DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3;
-        vlv_dpio_write(dev_priv, pipe, VLV_PCS23_DW10(ch), val);
-
-        mutex_unlock(&dev_priv->sb_lock);
+        chv_set_phy_signal_level(encoder, 128, 102, false);
 
         intel_hdmi->set_infoframes(&encoder->base,
                                    intel_crtc->config->has_hdmi_sink,
@@ -2086,10 +1757,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
         vlv_wait_port_ready(dev_priv, dport, 0x0);
 
         /* Second common lane will stay alive on its own now */
-        if (dport->release_cl2_override) {
-                chv_phy_powergate_ch(dev_priv, DPIO_PHY0, DPIO_CH1, false);
-                dport->release_cl2_override = false;
-        }
+        chv_phy_release_cl2_override(encoder);
 }
 
 static void intel_hdmi_destroy(struct drm_connector *connector)
@@ -2106,6 +1774,7 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_hdmi_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_hdmi_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -2114,7 +1783,6 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_hdmi_connector_helper_funcs = {
         .get_modes = intel_hdmi_get_modes,
         .mode_valid = intel_hdmi_mode_valid,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
@@ -2142,6 +1810,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         enum port port = intel_dig_port->port;
         uint8_t alternate_ddc_pin;
 
+        DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
+                      port_name(port));
+
         if (WARN(intel_dig_port->max_lanes < 4,
                  "Not enough lanes (%d) for HDMI on port %c\n",
                  intel_dig_port->max_lanes, port_name(port)))
@@ -2239,7 +1910,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                 intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
         else
                 intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         intel_hdmi_add_properties(intel_hdmi, connector);
 
@@ -2277,7 +1947,7 @@ void intel_hdmi_init(struct drm_device *dev,
         intel_encoder = &intel_dig_port->base;
 
         drm_encoder_init(dev, &intel_encoder->base, &intel_hdmi_enc_funcs,
-                         DRM_MODE_ENCODER_TMDS, NULL);
+                         DRM_MODE_ENCODER_TMDS, "HDMI %c", port_name(port));
 
         intel_encoder->compute_config = intel_hdmi_compute_config;
         if (HAS_PCH_SPLIT(dev)) {
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index bee673005d48..38eeca7a6e72 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -220,7 +220,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
                 }
         }
         if (dev_priv->display.hpd_irq_setup)
-                dev_priv->display.hpd_irq_setup(dev);
+                dev_priv->display.hpd_irq_setup(dev_priv);
         spin_unlock_irq(&dev_priv->irq_lock);
 
         intel_runtime_pm_put(dev_priv);
@@ -346,7 +346,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
 
 /**
  * intel_hpd_irq_handler - main hotplug irq handler
- * @dev: drm device
+ * @dev_priv: drm_i915_private
  * @pin_mask: a mask of hpd pins that have triggered the irq
  * @long_mask: a mask of hpd pins that may be long hpd pulses
  *
@@ -360,10 +360,9 @@ static void i915_hotplug_work_func(struct work_struct *work)
  * Here, we do hotplug irq storm detection and mitigation, and pass further
  * processing to appropriate bottom halves.
  */
-void intel_hpd_irq_handler(struct drm_device *dev,
+void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
                            u32 pin_mask, u32 long_mask)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int i;
         enum port port;
         bool storm_detected = false;
@@ -407,7 +406,7 @@ void intel_hpd_irq_handler(struct drm_device *dev,
                          * hotplug bits itself. So only WARN about unexpected
                          * interrupts on saner platforms.
                          */
-                        WARN_ONCE(!HAS_GMCH_DISPLAY(dev),
+                        WARN_ONCE(!HAS_GMCH_DISPLAY(dev_priv),
                                   "Received HPD interrupt on pin %d although disabled\n", i);
                         continue;
                 }
@@ -427,7 +426,7 @@ void intel_hpd_irq_handler(struct drm_device *dev,
         }
 
         if (storm_detected)
-                dev_priv->display.hpd_irq_setup(dev);
+                dev_priv->display.hpd_irq_setup(dev_priv);
         spin_unlock(&dev_priv->irq_lock);
 
         /*
@@ -485,7 +484,7 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
          */
         spin_lock_irq(&dev_priv->irq_lock);
         if (dev_priv->display.hpd_irq_setup)
-                dev_priv->display.hpd_irq_setup(dev);
+                dev_priv->display.hpd_irq_setup(dev_priv);
         spin_unlock_irq(&dev_priv->irq_lock);
 }
 
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 42eac37de047..debed011a958 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -208,31 +208,27 @@
 } while (0)
 
 enum {
-        ADVANCED_CONTEXT = 0,
-        LEGACY_32B_CONTEXT,
-        ADVANCED_AD_CONTEXT,
-        LEGACY_64B_CONTEXT
-};
-#define GEN8_CTX_ADDRESSING_MODE_SHIFT 3
-#define GEN8_CTX_ADDRESSING_MODE(dev)  (USES_FULL_48BIT_PPGTT(dev) ?\
-                LEGACY_64B_CONTEXT :\
-                LEGACY_32B_CONTEXT)
-enum {
         FAULT_AND_HANG = 0,
         FAULT_AND_HALT, /* Debug only */
         FAULT_AND_STREAM,
         FAULT_AND_CONTINUE /* Unsupported */
 };
 #define GEN8_CTX_ID_SHIFT 32
+#define GEN8_CTX_ID_WIDTH 21
 #define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT        0x17
 #define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT        0x26
 
-static int intel_lr_context_pin(struct intel_context *ctx,
+/* Typical size of the average request (2 pipecontrols and a MI_BB) */
+#define EXECLISTS_REQUEST_SIZE 64 /* bytes */
+
+static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
+                                            struct intel_engine_cs *engine);
+static int intel_lr_context_pin(struct i915_gem_context *ctx,
                                 struct intel_engine_cs *engine);
 
 /**
  * intel_sanitize_enable_execlists() - sanitize i915.enable_execlists
- * @dev: DRM device.
+ * @dev_priv: i915 device private
  * @enable_execlists: value of i915.enable_execlists module parameter.
  *
  * Only certain platforms support Execlists (the prerequisites being
@@ -240,23 +236,22 @@ static int intel_lr_context_pin(struct intel_context *ctx,
  *
  * Return: 1 if Execlists is supported and has to be enabled.
  */
-int intel_sanitize_enable_execlists(struct drm_device *dev, int enable_execlists)
+int intel_sanitize_enable_execlists(struct drm_i915_private *dev_priv, int enable_execlists)
 {
-        WARN_ON(i915.enable_ppgtt == -1);
-
         /* On platforms with execlist available, vGPU will only
          * support execlist mode, no ring buffer mode.
          */
-        if (HAS_LOGICAL_RING_CONTEXTS(dev) && intel_vgpu_active(dev))
+        if (HAS_LOGICAL_RING_CONTEXTS(dev_priv) && intel_vgpu_active(dev_priv))
                 return 1;
 
-        if (INTEL_INFO(dev)->gen >= 9)
+        if (INTEL_GEN(dev_priv) >= 9)
                 return 1;
 
         if (enable_execlists == 0)
                 return 0;
 
-        if (HAS_LOGICAL_RING_CONTEXTS(dev) && USES_PPGTT(dev) &&
+        if (HAS_LOGICAL_RING_CONTEXTS(dev_priv) &&
+            USES_PPGTT(dev_priv) &&
             i915.use_mmio_flip >= 0)
                 return 1;
 
@@ -266,19 +261,17 @@ int intel_sanitize_enable_execlists(struct drm_device *dev, int enable_execlists
 static void
 logical_ring_init_platform_invariants(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
+        struct drm_i915_private *dev_priv = engine->i915;
 
-        if (IS_GEN8(dev) || IS_GEN9(dev))
+        if (IS_GEN8(dev_priv) || IS_GEN9(dev_priv))
                 engine->idle_lite_restore_wa = ~0;
 
-        engine->disable_lite_restore_wa = (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
-                                        IS_BXT_REVID(dev, 0, BXT_REVID_A1)) &&
+        engine->disable_lite_restore_wa = (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
+                                        IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) &&
                                         (engine->id == VCS || engine->id == VCS2);
 
         engine->ctx_desc_template = GEN8_CTX_VALID;
-        engine->ctx_desc_template |= GEN8_CTX_ADDRESSING_MODE(dev) <<
-                                   GEN8_CTX_ADDRESSING_MODE_SHIFT;
-        if (IS_GEN8(dev))
+        if (IS_GEN8(dev_priv))
                 engine->ctx_desc_template |= GEN8_CTX_L3LLC_COHERENT;
         engine->ctx_desc_template |= GEN8_CTX_PRIVILEGE;
 
@@ -297,7 +290,7 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine)
  *                                        descriptor for a pinned context
  *
  * @ctx: Context to work on
- * @ring: Engine the descriptor will be used with
+ * @engine: Engine the descriptor will be used with
  *
  * The context descriptor encodes various attributes of a context,
  * including its GTT address and some flags. Because it's fairly
@@ -305,62 +298,42 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine)
  * which remains valid until the context is unpinned.
  *
  * This is what a descriptor looks like, from LSB to MSB:
- *    bits 0-11:    flags, GEN8_CTX_* (cached in ctx_desc_template)
+ *    bits  0-11:    flags, GEN8_CTX_* (cached in ctx_desc_template)
  *    bits 12-31:    LRCA, GTT address of (the HWSP of) this context
- *    bits 32-51:    ctx ID, a globally unique tag (the LRCA again!)
- *    bits 52-63:    reserved, may encode the engine ID (for GuC)
+ *    bits 32-52:    ctx ID, a globally unique tag
+ *    bits 53-54:    mbz, reserved for use by hardware
+ *    bits 55-63:    group ID, currently unused and set to 0
  */
 static void
-intel_lr_context_descriptor_update(struct intel_context *ctx,
+intel_lr_context_descriptor_update(struct i915_gem_context *ctx,
                                    struct intel_engine_cs *engine)
 {
-        uint64_t lrca, desc;
+        struct intel_context *ce = &ctx->engine[engine->id];
+        u64 desc;
 
-        lrca = ctx->engine[engine->id].lrc_vma->node.start +
-               LRC_PPHWSP_PN * PAGE_SIZE;
+        BUILD_BUG_ON(MAX_CONTEXT_HW_ID > (1<<GEN8_CTX_ID_WIDTH));
 
-        desc = engine->ctx_desc_template;                          /* bits  0-11 */
-        desc |= lrca;                                      /* bits 12-31 */
-        desc |= (lrca >> PAGE_SHIFT) << GEN8_CTX_ID_SHIFT; /* bits 32-51 */
+        desc = ctx->desc_template;                              /* bits  3-4  */
+        desc |= engine->ctx_desc_template;                      /* bits  0-11 */
+        desc |= ce->lrc_vma->node.start + LRC_PPHWSP_PN * PAGE_SIZE;
+                                                                /* bits 12-31 */
+        desc |= (u64)ctx->hw_id << GEN8_CTX_ID_SHIFT;           /* bits 32-52 */
 
-        ctx->engine[engine->id].lrc_desc = desc;
+        ce->lrc_desc = desc;
 }
 
-uint64_t intel_lr_context_descriptor(struct intel_context *ctx,
+uint64_t intel_lr_context_descriptor(struct i915_gem_context *ctx,
                                      struct intel_engine_cs *engine)
 {
         return ctx->engine[engine->id].lrc_desc;
 }
 
-/**
- * intel_execlists_ctx_id() - get the Execlists Context ID
- * @ctx: Context to get the ID for
- * @ring: Engine to get the ID for
- *
- * Do not confuse with ctx->id! Unfortunately we have a name overload
- * here: the old context ID we pass to userspace as a handler so that
- * they can refer to a context, and the new context ID we pass to the
- * ELSP so that the GPU can inform us of the context status via
- * interrupts.
- *
- * The context ID is a portion of the context descriptor, so we can
- * just extract the required part from the cached descriptor.
- *
- * Return: 20-bits globally unique context ID.
- */
-u32 intel_execlists_ctx_id(struct intel_context *ctx,
-                           struct intel_engine_cs *engine)
-{
-        return intel_lr_context_descriptor(ctx, engine) >> GEN8_CTX_ID_SHIFT;
-}
-
 static void execlists_elsp_write(struct drm_i915_gem_request *rq0,
                                  struct drm_i915_gem_request *rq1)
 {
 
         struct intel_engine_cs *engine = rq0->engine;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = rq0->i915;
         uint64_t desc[2];
 
         if (rq1) {
@@ -431,6 +404,20 @@ static void execlists_submit_requests(struct drm_i915_gem_request *rq0,
         spin_unlock_irq(&dev_priv->uncore.lock);
 }
 
+static inline void execlists_context_status_change(
+                struct drm_i915_gem_request *rq,
+                unsigned long status)
+{
+        /*
+         * Only used when GVT-g is enabled now. When GVT-g is disabled,
+         * The compiler should eliminate this function as dead-code.
+         */
+        if (!IS_ENABLED(CONFIG_DRM_I915_GVT))
+                return;
+
+        atomic_notifier_call_chain(&rq->ctx->status_notifier, status, rq);
+}
+
 static void execlists_context_unqueue(struct intel_engine_cs *engine)
 {
         struct drm_i915_gem_request *req0 = NULL, *req1 = NULL;
@@ -442,7 +429,7 @@ static void execlists_context_unqueue(struct intel_engine_cs *engine)
          * If irqs are not active generate a warning as batches that finish
          * without the irqs may get lost and a GPU Hang may occur.
          */
-        WARN_ON(!intel_irqs_enabled(engine->dev->dev_private));
+        WARN_ON(!intel_irqs_enabled(engine->i915));
 
         /* Try to read in pairs */
         list_for_each_entry_safe(cursor, tmp, &engine->execlist_queue,
@@ -453,10 +440,24 @@ static void execlists_context_unqueue(struct intel_engine_cs *engine)
                         /* Same ctx: ignore first request, as second request
                          * will update tail past first request's workload */
                         cursor->elsp_submitted = req0->elsp_submitted;
-                        list_move_tail(&req0->execlist_link,
-                                       &engine->execlist_retired_req_list);
+                        list_del(&req0->execlist_link);
+                        i915_gem_request_unreference(req0);
                         req0 = cursor;
                 } else {
+                        if (IS_ENABLED(CONFIG_DRM_I915_GVT)) {
+                                /*
+                                 * req0 (after merged) ctx requires single
+                                 * submission, stop picking
+                                 */
+                                if (req0->ctx->execlists_force_single_submission)
+                                        break;
+                                /*
+                                 * req0 ctx doesn't require single submission,
+                                 * but next req ctx requires, stop picking
+                                 */
+                                if (cursor->ctx->execlists_force_single_submission)
+                                        break;
+                        }
                         req1 = cursor;
                         WARN_ON(req1->elsp_submitted);
                         break;
@@ -466,6 +467,12 @@ static void execlists_context_unqueue(struct intel_engine_cs *engine)
         if (unlikely(!req0))
                 return;
 
+        execlists_context_status_change(req0, INTEL_CONTEXT_SCHEDULE_IN);
+
+        if (req1)
+                execlists_context_status_change(req1,
+                                                INTEL_CONTEXT_SCHEDULE_IN);
+
         if (req0->elsp_submitted & engine->idle_lite_restore_wa) {
                 /*
                  * WaIdleLiteRestore: make sure we never cause a lite restore
@@ -486,7 +493,7 @@ static void execlists_context_unqueue(struct intel_engine_cs *engine)
 }
 
 static unsigned int
-execlists_check_remove_request(struct intel_engine_cs *engine, u32 request_id)
+execlists_check_remove_request(struct intel_engine_cs *engine, u32 ctx_id)
 {
         struct drm_i915_gem_request *head_req;
 
@@ -496,19 +503,18 @@ execlists_check_remove_request(struct intel_engine_cs *engine, u32 request_id)
                                             struct drm_i915_gem_request,
                                             execlist_link);
 
-        if (!head_req)
-                return 0;
-
-        if (unlikely(intel_execlists_ctx_id(head_req->ctx, engine) != request_id))
-                return 0;
+        if (WARN_ON(!head_req || (head_req->ctx_hw_id != ctx_id)))
+               return 0;
 
         WARN(head_req->elsp_submitted == 0, "Never submitted head request\n");
 
         if (--head_req->elsp_submitted > 0)
                 return 0;
 
-        list_move_tail(&head_req->execlist_link,
-                       &engine->execlist_retired_req_list);
+        execlists_context_status_change(head_req, INTEL_CONTEXT_SCHEDULE_OUT);
+
+        list_del(&head_req->execlist_link);
+        i915_gem_request_unreference(head_req);
 
         return 1;
 }
@@ -517,7 +523,7 @@ static u32
 get_context_status(struct intel_engine_cs *engine, unsigned int read_pointer,
                    u32 *context_id)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         u32 status;
 
         read_pointer %= GEN8_CSB_ENTRIES;
@@ -535,7 +541,7 @@ get_context_status(struct intel_engine_cs *engine, unsigned int read_pointer,
 
 /**
  * intel_lrc_irq_handler() - handle Context Switch interrupts
- * @engine: Engine Command Streamer to handle.
+ * @data: tasklet handler passed in unsigned long
  *
  * Check the unread Context Status Buffers and manage the submission of new
  * contexts to the ELSP accordingly.
@@ -543,7 +549,7 @@ get_context_status(struct intel_engine_cs *engine, unsigned int read_pointer,
 static void intel_lrc_irq_handler(unsigned long data)
 {
         struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         u32 status_pointer;
         unsigned int read_pointer, write_pointer;
         u32 csb[GEN8_CSB_ENTRIES][2];
@@ -612,11 +618,6 @@ static void execlists_context_queue(struct drm_i915_gem_request *request)
         struct drm_i915_gem_request *cursor;
         int num_elements = 0;
 
-        if (request->ctx != request->i915->kernel_context)
-                intel_lr_context_pin(request->ctx, engine);
-
-        i915_gem_request_reference(request);
-
         spin_lock_bh(&engine->execlist_lock);
 
         list_for_each_entry(cursor, &engine->execlist_queue, execlist_link)
@@ -633,12 +634,14 @@ static void execlists_context_queue(struct drm_i915_gem_request *request)
                 if (request->ctx == tail_req->ctx) {
                         WARN(tail_req->elsp_submitted != 0,
                                 "More than 2 already-submitted reqs queued\n");
-                        list_move_tail(&tail_req->execlist_link,
-                                       &engine->execlist_retired_req_list);
+                        list_del(&tail_req->execlist_link);
+                        i915_gem_request_unreference(tail_req);
                 }
         }
 
+        i915_gem_request_reference(request);
         list_add_tail(&request->execlist_link, &engine->execlist_queue);
+        request->ctx_hw_id = request->ctx->hw_id;
         if (num_elements == 0)
                 execlists_context_unqueue(engine);
 
@@ -698,9 +701,23 @@ static int execlists_move_to_gpu(struct drm_i915_gem_request *req,
 
 int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request)
 {
-        int ret = 0;
+        struct intel_engine_cs *engine = request->engine;
+        struct intel_context *ce = &request->ctx->engine[engine->id];
+        int ret;
+
+        /* Flush enough space to reduce the likelihood of waiting after
+         * we start building the request - in which case we will just
+         * have to repeat work.
+         */
+        request->reserved_space += EXECLISTS_REQUEST_SIZE;
+
+        if (!ce->state) {
+                ret = execlists_context_deferred_alloc(request->ctx, engine);
+                if (ret)
+                        return ret;
+        }
 
-        request->ringbuf = request->ctx->engine[request->engine->id].ringbuf;
+        request->ringbuf = ce->ringbuf;
 
         if (i915.enable_guc_submission) {
                 /*
@@ -708,16 +725,39 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request
                  * going any further, as the i915_add_request() call
                  * later on mustn't fail ...
                  */
-                struct intel_guc *guc = &request->i915->guc;
-
-                ret = i915_guc_wq_check_space(guc->execbuf_client);
+                ret = i915_guc_wq_check_space(request);
                 if (ret)
                         return ret;
         }
 
-        if (request->ctx != request->i915->kernel_context)
-                ret = intel_lr_context_pin(request->ctx, request->engine);
+        ret = intel_lr_context_pin(request->ctx, engine);
+        if (ret)
+                return ret;
+
+        ret = intel_ring_begin(request, 0);
+        if (ret)
+                goto err_unpin;
+
+        if (!ce->initialised) {
+                ret = engine->init_context(request);
+                if (ret)
+                        goto err_unpin;
+
+                ce->initialised = true;
+        }
+
+        /* Note that after this point, we have committed to using
+         * this request as it is being used to both track the
+         * state of engine initialisation and liveness of the
+         * golden renderstate above. Think twice before you try
+         * to cancel/unwind this request now.
+         */
+
+        request->reserved_space -= EXECLISTS_REQUEST_SIZE;
+        return 0;
 
+err_unpin:
+        intel_lr_context_unpin(request->ctx, engine);
         return ret;
 }
 
@@ -734,7 +774,6 @@ static int
 intel_logical_ring_advance_and_submit(struct drm_i915_gem_request *request)
 {
         struct intel_ringbuffer *ringbuf = request->ringbuf;
-        struct drm_i915_private *dev_priv = request->i915;
         struct intel_engine_cs *engine = request->engine;
 
         intel_logical_ring_advance(ringbuf);
@@ -753,51 +792,28 @@ intel_logical_ring_advance_and_submit(struct drm_i915_gem_request *request)
         if (intel_engine_stopped(engine))
                 return 0;
 
-        if (engine->last_context != request->ctx) {
-                if (engine->last_context)
-                        intel_lr_context_unpin(engine->last_context, engine);
-                if (request->ctx != request->i915->kernel_context) {
-                        intel_lr_context_pin(request->ctx, engine);
-                        engine->last_context = request->ctx;
-                } else {
-                        engine->last_context = NULL;
-                }
-        }
+        /* We keep the previous context alive until we retire the following
+         * request. This ensures that any the context object is still pinned
+         * for any residual writes the HW makes into it on the context switch
+         * into the next object following the breadcrumb. Otherwise, we may
+         * retire the context too early.
+         */
+        request->previous_context = engine->last_context;
+        engine->last_context = request->ctx;
 
-        if (dev_priv->guc.execbuf_client)
-                i915_guc_submit(dev_priv->guc.execbuf_client, request);
+        if (i915.enable_guc_submission)
+                i915_guc_submit(request);
         else
                 execlists_context_queue(request);
 
         return 0;
 }
 
-int intel_logical_ring_reserve_space(struct drm_i915_gem_request *request)
-{
-        /*
-         * The first call merely notes the reserve request and is common for
-         * all back ends. The subsequent localised _begin() call actually
-         * ensures that the reservation is available. Without the begin, if
-         * the request creator immediately submitted the request without
-         * adding any commands to it then there might not actually be
-         * sufficient room for the submission commands.
-         */
-        intel_ring_reserved_space_reserve(request->ringbuf, MIN_SPACE_FOR_ADD_REQUEST);
-
-        return intel_ring_begin(request, 0);
-}
-
 /**
  * execlists_submission() - submit a batchbuffer for execution, Execlists style
- * @dev: DRM device.
- * @file: DRM file.
- * @ring: Engine Command Streamer to submit to.
- * @ctx: Context to employ for this submission.
+ * @params: execbuffer call parameters.
  * @args: execbuffer call arguments.
  * @vmas: list of vmas.
- * @batch_obj: the batchbuffer to submit.
- * @exec_start: batchbuffer start virtual address pointer.
- * @dispatch_flags: translated execbuffer call flags.
  *
  * This is the evil twin version of i915_gem_ringbuffer_submission. It abstracts
  * away the submission details of the execbuffer ioctl call.
@@ -881,28 +897,18 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,
         return 0;
 }
 
-void intel_execlists_retire_requests(struct intel_engine_cs *engine)
+void intel_execlists_cancel_requests(struct intel_engine_cs *engine)
 {
         struct drm_i915_gem_request *req, *tmp;
-        struct list_head retired_list;
+        LIST_HEAD(cancel_list);
 
-        WARN_ON(!mutex_is_locked(&engine->dev->struct_mutex));
-        if (list_empty(&engine->execlist_retired_req_list))
-                return;
+        WARN_ON(!mutex_is_locked(&engine->i915->dev->struct_mutex));
 
-        INIT_LIST_HEAD(&retired_list);
         spin_lock_bh(&engine->execlist_lock);
-        list_replace_init(&engine->execlist_retired_req_list, &retired_list);
+        list_replace_init(&engine->execlist_queue, &cancel_list);
         spin_unlock_bh(&engine->execlist_lock);
 
-        list_for_each_entry_safe(req, tmp, &retired_list, execlist_link) {
-                struct intel_context *ctx = req->ctx;
-                struct drm_i915_gem_object *ctx_obj =
-                                ctx->engine[engine->id].state;
-
-                if (ctx_obj && (ctx != req->i915->kernel_context))
-                        intel_lr_context_unpin(ctx, engine);
-
+        list_for_each_entry_safe(req, tmp, &cancel_list, execlist_link) {
                 list_del(&req->execlist_link);
                 i915_gem_request_unreference(req);
         }
@@ -910,7 +916,7 @@ void intel_execlists_retire_requests(struct intel_engine_cs *engine)
 
 void intel_logical_ring_stop(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
 
         if (!intel_engine_initialized(engine))
@@ -946,25 +952,26 @@ int logical_ring_flush_all_caches(struct drm_i915_gem_request *req)
         return 0;
 }
 
-static int intel_lr_context_do_pin(struct intel_context *ctx,
-                                   struct intel_engine_cs *engine)
+static int intel_lr_context_pin(struct i915_gem_context *ctx,
+                                struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state;
-        struct intel_ringbuffer *ringbuf = ctx->engine[engine->id].ringbuf;
+        struct drm_i915_private *dev_priv = ctx->i915;
+        struct intel_context *ce = &ctx->engine[engine->id];
         void *vaddr;
         u32 *lrc_reg_state;
         int ret;
 
-        WARN_ON(!mutex_is_locked(&engine->dev->struct_mutex));
+        lockdep_assert_held(&ctx->i915->dev->struct_mutex);
+
+        if (ce->pin_count++)
+                return 0;
 
-        ret = i915_gem_obj_ggtt_pin(ctx_obj, GEN8_LR_CONTEXT_ALIGN,
-                        PIN_OFFSET_BIAS | GUC_WOPCM_TOP);
+        ret = i915_gem_obj_ggtt_pin(ce->state, GEN8_LR_CONTEXT_ALIGN,
+                                    PIN_OFFSET_BIAS | GUC_WOPCM_TOP);
         if (ret)
-                return ret;
+                goto err;
 
-        vaddr = i915_gem_object_pin_map(ctx_obj);
+        vaddr = i915_gem_object_pin_map(ce->state);
         if (IS_ERR(vaddr)) {
                 ret = PTR_ERR(vaddr);
                 goto unpin_ctx_obj;
@@ -972,65 +979,54 @@ static int intel_lr_context_do_pin(struct intel_context *ctx,
 
         lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
 
-        ret = intel_pin_and_map_ringbuffer_obj(engine->dev, ringbuf);
+        ret = intel_pin_and_map_ringbuffer_obj(dev_priv, ce->ringbuf);
         if (ret)
                 goto unpin_map;
 
-        ctx->engine[engine->id].lrc_vma = i915_gem_obj_to_ggtt(ctx_obj);
+        i915_gem_context_reference(ctx);
+        ce->lrc_vma = i915_gem_obj_to_ggtt(ce->state);
         intel_lr_context_descriptor_update(ctx, engine);
-        lrc_reg_state[CTX_RING_BUFFER_START+1] = ringbuf->vma->node.start;
-        ctx->engine[engine->id].lrc_reg_state = lrc_reg_state;
-        ctx_obj->dirty = true;
+
+        lrc_reg_state[CTX_RING_BUFFER_START+1] = ce->ringbuf->vma->node.start;
+        ce->lrc_reg_state = lrc_reg_state;
+        ce->state->dirty = true;
 
         /* Invalidate GuC TLB. */
         if (i915.enable_guc_submission)
                 I915_WRITE(GEN8_GTCR, GEN8_GTCR_INVALIDATE);
 
-        return ret;
+        return 0;
 
 unpin_map:
-        i915_gem_object_unpin_map(ctx_obj);
+        i915_gem_object_unpin_map(ce->state);
 unpin_ctx_obj:
-        i915_gem_object_ggtt_unpin(ctx_obj);
-
+        i915_gem_object_ggtt_unpin(ce->state);
+err:
+        ce->pin_count = 0;
         return ret;
 }
 
-static int intel_lr_context_pin(struct intel_context *ctx,
-                                struct intel_engine_cs *engine)
+void intel_lr_context_unpin(struct i915_gem_context *ctx,
+                            struct intel_engine_cs *engine)
 {
-        int ret = 0;
+        struct intel_context *ce = &ctx->engine[engine->id];
 
-        if (ctx->engine[engine->id].pin_count++ == 0) {
-                ret = intel_lr_context_do_pin(ctx, engine);
-                if (ret)
-                        goto reset_pin_count;
+        lockdep_assert_held(&ctx->i915->dev->struct_mutex);
+        GEM_BUG_ON(ce->pin_count == 0);
 
-                i915_gem_context_reference(ctx);
-        }
-        return ret;
+        if (--ce->pin_count)
+                return;
 
-reset_pin_count:
-        ctx->engine[engine->id].pin_count = 0;
-        return ret;
-}
+        intel_unpin_ringbuffer_obj(ce->ringbuf);
 
-void intel_lr_context_unpin(struct intel_context *ctx,
-                            struct intel_engine_cs *engine)
-{
-        struct drm_i915_gem_object *ctx_obj = ctx->engine[engine->id].state;
+        i915_gem_object_unpin_map(ce->state);
+        i915_gem_object_ggtt_unpin(ce->state);
 
-        WARN_ON(!mutex_is_locked(&ctx->i915->dev->struct_mutex));
-        if (--ctx->engine[engine->id].pin_count == 0) {
-                i915_gem_object_unpin_map(ctx_obj);
-                intel_unpin_ringbuffer_obj(ctx->engine[engine->id].ringbuf);
-                i915_gem_object_ggtt_unpin(ctx_obj);
-                ctx->engine[engine->id].lrc_vma = NULL;
-                ctx->engine[engine->id].lrc_desc = 0;
-                ctx->engine[engine->id].lrc_reg_state = NULL;
+        ce->lrc_vma = NULL;
+        ce->lrc_desc = 0;
+        ce->lrc_reg_state = NULL;
 
-                i915_gem_context_unreference(ctx);
-        }
+        i915_gem_context_unreference(ctx);
 }
 
 static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req)
@@ -1038,9 +1034,7 @@ static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req)
         int ret, i;
         struct intel_engine_cs *engine = req->engine;
         struct intel_ringbuffer *ringbuf = req->ringbuf;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct i915_workarounds *w = &dev_priv->workarounds;
+        struct i915_workarounds *w = &req->i915->workarounds;
 
         if (w->count == 0)
                 return 0;
@@ -1106,12 +1100,13 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,
         uint32_t l3sqc4_flush = (0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES);
 
         /*
-         * WaDisableLSQCROPERFforOCL:skl
+         * WaDisableLSQCROPERFforOCL:skl,kbl
          * This WA is implemented in skl_init_clock_gating() but since
          * this batch updates GEN8_L3SQCREG4 with default value we need to
          * set this bit here to retain the WA during flush.
          */
-        if (IS_SKL_REVID(engine->dev, 0, SKL_REVID_E0))
+        if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_E0) ||
+            IS_KBL_REVID(engine->i915, 0, KBL_REVID_E0))
                 l3sqc4_flush |= GEN8_LQSC_RO_PERF_DIS;
 
         wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 |
@@ -1163,7 +1158,7 @@ static inline int wa_ctx_end(struct i915_wa_ctx_bb *wa_ctx,
 /**
  * gen8_init_indirectctx_bb() - initialize indirect ctx batch with WA
  *
- * @ring: only applicable for RCS
+ * @engine: only applicable for RCS
  * @wa_ctx: structure representing wa_ctx
  *  offset: specifies start of the batch, should be cache-aligned. This is updated
  *    with the offset value received as input.
@@ -1200,7 +1195,7 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *engine,
         wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_DISABLE);
 
         /* WaFlushCoherentL3CacheLinesAtContextSwitch:bdw */
-        if (IS_BROADWELL(engine->dev)) {
+        if (IS_BROADWELL(engine->i915)) {
                 int rc = gen8_emit_flush_coherentl3_wa(engine, batch, index);
                 if (rc < 0)
                         return rc;
@@ -1237,7 +1232,7 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *engine,
 /**
  * gen8_init_perctx_bb() - initialize per ctx batch with WA
  *
- * @ring: only applicable for RCS
+ * @engine: only applicable for RCS
  * @wa_ctx: structure representing wa_ctx
  *  offset: specifies start of the batch, should be cache-aligned.
  *  size: size of the batch in DWORDS but HW expects in terms of cachelines
@@ -1272,12 +1267,11 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
                                     uint32_t *offset)
 {
         int ret;
-        struct drm_device *dev = engine->dev;
         uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
         /* WaDisableCtxRestoreArbitration:skl,bxt */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_D0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+        if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_D0) ||
+            IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
                 wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_DISABLE);
 
         /* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */
@@ -1286,6 +1280,22 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
                 return ret;
         index = ret;
 
+        /* WaClearSlmSpaceAtContextSwitch:kbl */
+        /* Actual scratch location is at 128 bytes offset */
+        if (IS_KBL_REVID(engine->i915, 0, KBL_REVID_A0)) {
+                uint32_t scratch_addr
+                        = engine->scratch.gtt_offset + 2*CACHELINE_BYTES;
+
+                wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));
+                wa_ctx_emit(batch, index, (PIPE_CONTROL_FLUSH_L3 |
+                                           PIPE_CONTROL_GLOBAL_GTT_IVB |
+                                           PIPE_CONTROL_CS_STALL |
+                                           PIPE_CONTROL_QW_WRITE));
+                wa_ctx_emit(batch, index, scratch_addr);
+                wa_ctx_emit(batch, index, 0);
+                wa_ctx_emit(batch, index, 0);
+                wa_ctx_emit(batch, index, 0);
+        }
         /* Pad to end of cacheline */
         while (index % CACHELINE_DWORDS)
                 wa_ctx_emit(batch, index, MI_NOOP);
@@ -1298,12 +1308,11 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
                                uint32_t *const batch,
                                uint32_t *offset)
 {
-        struct drm_device *dev = engine->dev;
         uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
         /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_B0) ||
+            IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {
                 wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
                 wa_ctx_emit_reg(batch, index, GEN9_SLICE_COMMON_ECO_CHICKEN0);
                 wa_ctx_emit(batch, index,
@@ -1312,7 +1321,7 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
         }
 
         /* WaClearTdlStateAckDirtyBits:bxt */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_B0)) {
+        if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_B0)) {
                 wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(4));
 
                 wa_ctx_emit_reg(batch, index, GEN8_STATE_ACK);
@@ -1331,8 +1340,8 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
         }
 
         /* WaDisableCtxRestoreArbitration:skl,bxt */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_D0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+        if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_D0) ||
+            IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
                 wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_ENABLE);
 
         wa_ctx_emit(batch, index, MI_BATCH_BUFFER_END);
@@ -1344,11 +1353,13 @@ static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)
 {
         int ret;
 
-        engine->wa_ctx.obj = i915_gem_alloc_object(engine->dev,
+        engine->wa_ctx.obj = i915_gem_object_create(engine->i915->dev,
                                                    PAGE_ALIGN(size));
-        if (!engine->wa_ctx.obj) {
+        if (IS_ERR(engine->wa_ctx.obj)) {
                 DRM_DEBUG_DRIVER("alloc LRC WA ctx backing obj failed.\n");
-                return -ENOMEM;
+                ret = PTR_ERR(engine->wa_ctx.obj);
+                engine->wa_ctx.obj = NULL;
+                return ret;
         }
 
         ret = i915_gem_obj_ggtt_pin(engine->wa_ctx.obj, PAGE_SIZE, 0);
@@ -1382,9 +1393,9 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
         WARN_ON(engine->id != RCS);
 
         /* update this when WA for higher Gen are added */
-        if (INTEL_INFO(engine->dev)->gen > 9) {
+        if (INTEL_GEN(engine->i915) > 9) {
                 DRM_ERROR("WA batch buffer is not initialized for Gen%d\n",
-                          INTEL_INFO(engine->dev)->gen);
+                          INTEL_GEN(engine->i915));
                 return 0;
         }
 
@@ -1404,7 +1415,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
         batch = kmap_atomic(page);
         offset = 0;
 
-        if (INTEL_INFO(engine->dev)->gen == 8) {
+        if (IS_GEN8(engine->i915)) {
                 ret = gen8_init_indirectctx_bb(engine,
                                                &wa_ctx->indirect_ctx,
                                                batch,
@@ -1418,7 +1429,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
                                           &offset);
                 if (ret)
                         goto out;
-        } else if (INTEL_INFO(engine->dev)->gen == 9) {
+        } else if (IS_GEN9(engine->i915)) {
                 ret = gen9_init_indirectctx_bb(engine,
                                                &wa_ctx->indirect_ctx,
                                                batch,
@@ -1444,7 +1455,7 @@ out:
 
 static void lrc_init_hws(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         I915_WRITE(RING_HWS_PGA(engine->mmio_base),
                    (u32)engine->status_page.gfx_addr);
@@ -1453,8 +1464,7 @@ static void lrc_init_hws(struct intel_engine_cs *engine)
 
 static int gen8_init_common_ring(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned int next_context_status_buffer_hw;
 
         lrc_init_hws(engine);
@@ -1501,8 +1511,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine)
 
 static int gen8_init_render_ring(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
 
         ret = gen8_init_common_ring(engine);
@@ -1579,7 +1588,7 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
         if (req->ctx->ppgtt &&
             (intel_engine_flag(req->engine) & req->ctx->ppgtt->pd_dirty_rings)) {
                 if (!USES_FULL_48BIT_PPGTT(req->i915) &&
-                    !intel_vgpu_active(req->i915->dev)) {
+                    !intel_vgpu_active(req->i915)) {
                         ret = intel_logical_ring_emit_pdps(req);
                         if (ret)
                                 return ret;
@@ -1607,8 +1616,7 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
 
 static bool gen8_logical_ring_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (WARN_ON(!intel_irqs_enabled(dev_priv)))
@@ -1627,8 +1635,7 @@ static bool gen8_logical_ring_get_irq(struct intel_engine_cs *engine)
 
 static void gen8_logical_ring_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -1645,8 +1652,7 @@ static int gen8_emit_flush(struct drm_i915_gem_request *request,
 {
         struct intel_ringbuffer *ringbuf = request->ringbuf;
         struct intel_engine_cs *engine = ringbuf->engine;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = request->i915;
         uint32_t cmd;
         int ret;
 
@@ -1687,9 +1693,10 @@ static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
         struct intel_ringbuffer *ringbuf = request->ringbuf;
         struct intel_engine_cs *engine = ringbuf->engine;
         u32 scratch_addr = engine->scratch.gtt_offset + 2 * CACHELINE_BYTES;
-        bool vf_flush_wa = false;
+        bool vf_flush_wa = false, dc_flush_wa = false;
         u32 flags = 0;
         int ret;
+        int len;
 
         flags |= PIPE_CONTROL_CS_STALL;
 
@@ -1714,11 +1721,23 @@ static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
                  * On GEN9: before VF_CACHE_INVALIDATE we need to emit a NULL
                  * pipe control.
                  */
-                if (IS_GEN9(engine->dev))
+                if (IS_GEN9(request->i915))
                         vf_flush_wa = true;
+
+                /* WaForGAMHang:kbl */
+                if (IS_KBL_REVID(request->i915, 0, KBL_REVID_B0))
+                        dc_flush_wa = true;
         }
 
-        ret = intel_ring_begin(request, vf_flush_wa ? 12 : 6);
+        len = 6;
+
+        if (vf_flush_wa)
+                len += 6;
+
+        if (dc_flush_wa)
+                len += 12;
+
+        ret = intel_ring_begin(request, len);
         if (ret)
                 return ret;
 
@@ -1731,12 +1750,31 @@ static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
                 intel_logical_ring_emit(ringbuf, 0);
         }
 
+        if (dc_flush_wa) {
+                intel_logical_ring_emit(ringbuf, GFX_OP_PIPE_CONTROL(6));
+                intel_logical_ring_emit(ringbuf, PIPE_CONTROL_DC_FLUSH_ENABLE);
+                intel_logical_ring_emit(ringbuf, 0);
+                intel_logical_ring_emit(ringbuf, 0);
+                intel_logical_ring_emit(ringbuf, 0);
+                intel_logical_ring_emit(ringbuf, 0);
+        }
+
         intel_logical_ring_emit(ringbuf, GFX_OP_PIPE_CONTROL(6));
         intel_logical_ring_emit(ringbuf, flags);
         intel_logical_ring_emit(ringbuf, scratch_addr);
         intel_logical_ring_emit(ringbuf, 0);
         intel_logical_ring_emit(ringbuf, 0);
         intel_logical_ring_emit(ringbuf, 0);
+
+        if (dc_flush_wa) {
+                intel_logical_ring_emit(ringbuf, GFX_OP_PIPE_CONTROL(6));
+                intel_logical_ring_emit(ringbuf, PIPE_CONTROL_CS_STALL);
+                intel_logical_ring_emit(ringbuf, 0);
+                intel_logical_ring_emit(ringbuf, 0);
+                intel_logical_ring_emit(ringbuf, 0);
+                intel_logical_ring_emit(ringbuf, 0);
+        }
+
         intel_logical_ring_advance(ringbuf);
 
         return 0;
@@ -1782,11 +1820,6 @@ static void bxt_a_set_seqno(struct intel_engine_cs *engine, u32 seqno)
  */
 #define WA_TAIL_DWORDS 2
 
-static inline u32 hws_seqno_address(struct intel_engine_cs *engine)
-{
-        return engine->status_page.gfx_addr + I915_GEM_HWS_INDEX_ADDR;
-}
-
 static int gen8_emit_request(struct drm_i915_gem_request *request)
 {
         struct intel_ringbuffer *ringbuf = request->ringbuf;
@@ -1802,7 +1835,7 @@ static int gen8_emit_request(struct drm_i915_gem_request *request)
         intel_logical_ring_emit(ringbuf,
                                 (MI_FLUSH_DW + 1) | MI_FLUSH_DW_OP_STOREDW);
         intel_logical_ring_emit(ringbuf,
-                                hws_seqno_address(request->engine) |
+                                intel_hws_seqno_address(request->engine) |
                                 MI_FLUSH_DW_USE_GTT);
         intel_logical_ring_emit(ringbuf, 0);
         intel_logical_ring_emit(ringbuf, i915_gem_request_get_seqno(request));
@@ -1832,7 +1865,8 @@ static int gen8_emit_request_render(struct drm_i915_gem_request *request)
                                 (PIPE_CONTROL_GLOBAL_GTT_IVB |
                                  PIPE_CONTROL_CS_STALL |
                                  PIPE_CONTROL_QW_WRITE));
-        intel_logical_ring_emit(ringbuf, hws_seqno_address(request->engine));
+        intel_logical_ring_emit(ringbuf,
+                                intel_hws_seqno_address(request->engine));
         intel_logical_ring_emit(ringbuf, 0);
         intel_logical_ring_emit(ringbuf, i915_gem_request_get_seqno(request));
         /* We're thrashing one dword of HWS. */
@@ -1894,7 +1928,7 @@ static int gen8_init_rcs_context(struct drm_i915_gem_request *req)
 /**
  * intel_logical_ring_cleanup() - deallocate the Engine Command Streamer
  *
- * @ring: Engine Command Streamer.
+ * @engine: Engine Command Streamer.
  *
  */
 void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
@@ -1911,7 +1945,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
         if (WARN_ON(test_bit(TASKLET_STATE_SCHED, &engine->irq_tasklet.state)))
                 tasklet_kill(&engine->irq_tasklet);
 
-        dev_priv = engine->dev->dev_private;
+        dev_priv = engine->i915;
 
         if (engine->buffer) {
                 intel_logical_ring_stop(engine);
@@ -1928,18 +1962,18 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
                 i915_gem_object_unpin_map(engine->status_page.obj);
                 engine->status_page.obj = NULL;
         }
+        intel_lr_context_unpin(dev_priv->kernel_context, engine);
 
         engine->idle_lite_restore_wa = 0;
         engine->disable_lite_restore_wa = false;
         engine->ctx_desc_template = 0;
 
         lrc_destroy_wa_ctx_obj(engine);
-        engine->dev = NULL;
+        engine->i915 = NULL;
 }
 
 static void
-logical_ring_default_vfuncs(struct drm_device *dev,
-                            struct intel_engine_cs *engine)
+logical_ring_default_vfuncs(struct intel_engine_cs *engine)
 {
         /* Default vfuncs which can be overriden by each engine. */
         engine->init_hw = gen8_init_common_ring;
@@ -1950,7 +1984,7 @@ logical_ring_default_vfuncs(struct drm_device *dev,
         engine->emit_bb_start = gen8_emit_bb_start;
         engine->get_seqno = gen8_get_seqno;
         engine->set_seqno = gen8_set_seqno;
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {
                 engine->irq_seqno_barrier = bxt_a_seqno_barrier;
                 engine->set_seqno = bxt_a_set_seqno;
         }
@@ -1961,6 +1995,7 @@ logical_ring_default_irqs(struct intel_engine_cs *engine, unsigned shift)
 {
         engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT << shift;
         engine->irq_keep_mask = GT_CONTEXT_SWITCH_INTERRUPT << shift;
+        init_waitqueue_head(&engine->irq_queue);
 }
 
 static int
@@ -1981,32 +2016,68 @@ lrc_setup_hws(struct intel_engine_cs *engine,
         return 0;
 }
 
-static int
-logical_ring_init(struct drm_device *dev, struct intel_engine_cs *engine)
+static const struct logical_ring_info {
+        const char *name;
+        unsigned exec_id;
+        unsigned guc_id;
+        u32 mmio_base;
+        unsigned irq_shift;
+} logical_rings[] = {
+        [RCS] = {
+                .name = "render ring",
+                .exec_id = I915_EXEC_RENDER,
+                .guc_id = GUC_RENDER_ENGINE,
+                .mmio_base = RENDER_RING_BASE,
+                .irq_shift = GEN8_RCS_IRQ_SHIFT,
+        },
+        [BCS] = {
+                .name = "blitter ring",
+                .exec_id = I915_EXEC_BLT,
+                .guc_id = GUC_BLITTER_ENGINE,
+                .mmio_base = BLT_RING_BASE,
+                .irq_shift = GEN8_BCS_IRQ_SHIFT,
+        },
+        [VCS] = {
+                .name = "bsd ring",
+                .exec_id = I915_EXEC_BSD,
+                .guc_id = GUC_VIDEO_ENGINE,
+                .mmio_base = GEN6_BSD_RING_BASE,
+                .irq_shift = GEN8_VCS1_IRQ_SHIFT,
+        },
+        [VCS2] = {
+                .name = "bsd2 ring",
+                .exec_id = I915_EXEC_BSD,
+                .guc_id = GUC_VIDEO_ENGINE2,
+                .mmio_base = GEN8_BSD2_RING_BASE,
+                .irq_shift = GEN8_VCS2_IRQ_SHIFT,
+        },
+        [VECS] = {
+                .name = "video enhancement ring",
+                .exec_id = I915_EXEC_VEBOX,
+                .guc_id = GUC_VIDEOENHANCE_ENGINE,
+                .mmio_base = VEBOX_RING_BASE,
+                .irq_shift = GEN8_VECS_IRQ_SHIFT,
+        },
+};
+
+static struct intel_engine_cs *
+logical_ring_setup(struct drm_device *dev, enum intel_engine_id id)
 {
+        const struct logical_ring_info *info = &logical_rings[id];
         struct drm_i915_private *dev_priv = to_i915(dev);
-        struct intel_context *dctx = dev_priv->kernel_context;
+        struct intel_engine_cs *engine = &dev_priv->engine[id];
         enum forcewake_domains fw_domains;
-        int ret;
-
-        /* Intentionally left blank. */
-        engine->buffer = NULL;
-
-        engine->dev = dev;
-        INIT_LIST_HEAD(&engine->active_list);
-        INIT_LIST_HEAD(&engine->request_list);
-        i915_gem_batch_pool_init(dev, &engine->batch_pool);
-        init_waitqueue_head(&engine->irq_queue);
 
-        INIT_LIST_HEAD(&engine->buffers);
-        INIT_LIST_HEAD(&engine->execlist_queue);
-        INIT_LIST_HEAD(&engine->execlist_retired_req_list);
-        spin_lock_init(&engine->execlist_lock);
+        engine->id = id;
+        engine->name = info->name;
+        engine->exec_id = info->exec_id;
+        engine->guc_id = info->guc_id;
+        engine->mmio_base = info->mmio_base;
 
-        tasklet_init(&engine->irq_tasklet,
-                     intel_lrc_irq_handler, (unsigned long)engine);
+        engine->i915 = dev_priv;
 
-        logical_ring_init_platform_invariants(engine);
+        /* Intentionally left blank. */
+        engine->buffer = NULL;
 
         fw_domains = intel_uncore_forcewake_for_reg(dev_priv,
                                                     RING_ELSP(engine),
@@ -2022,20 +2093,44 @@ logical_ring_init(struct drm_device *dev, struct intel_engine_cs *engine)
 
         engine->fw_domains = fw_domains;
 
+        INIT_LIST_HEAD(&engine->active_list);
+        INIT_LIST_HEAD(&engine->request_list);
+        INIT_LIST_HEAD(&engine->buffers);
+        INIT_LIST_HEAD(&engine->execlist_queue);
+        spin_lock_init(&engine->execlist_lock);
+
+        tasklet_init(&engine->irq_tasklet,
+                     intel_lrc_irq_handler, (unsigned long)engine);
+
+        logical_ring_init_platform_invariants(engine);
+        logical_ring_default_vfuncs(engine);
+        logical_ring_default_irqs(engine, info->irq_shift);
+
+        intel_engine_init_hangcheck(engine);
+        i915_gem_batch_pool_init(dev, &engine->batch_pool);
+
+        return engine;
+}
+
+static int
+logical_ring_init(struct intel_engine_cs *engine)
+{
+        struct i915_gem_context *dctx = engine->i915->kernel_context;
+        int ret;
+
         ret = i915_cmd_parser_init_ring(engine);
         if (ret)
                 goto error;
 
-        ret = intel_lr_context_deferred_alloc(dctx, engine);
+        ret = execlists_context_deferred_alloc(dctx, engine);
         if (ret)
                 goto error;
 
         /* As this is the default context, always pin it */
-        ret = intel_lr_context_do_pin(dctx, engine);
+        ret = intel_lr_context_pin(dctx, engine);
         if (ret) {
-                DRM_ERROR(
-                        "Failed to pin and map ringbuffer %s: %d\n",
-                        engine->name, ret);
+                DRM_ERROR("Failed to pin context for %s: %d\n",
+                          engine->name, ret);
                 goto error;
         }
 
@@ -2055,22 +2150,12 @@ error:
 
 static int logical_render_ring_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_engine_cs *engine = &dev_priv->engine[RCS];
+        struct intel_engine_cs *engine = logical_ring_setup(dev, RCS);
         int ret;
 
-        engine->name = "render ring";
-        engine->id = RCS;
-        engine->exec_id = I915_EXEC_RENDER;
-        engine->guc_id = GUC_RENDER_ENGINE;
-        engine->mmio_base = RENDER_RING_BASE;
-
-        logical_ring_default_irqs(engine, GEN8_RCS_IRQ_SHIFT);
         if (HAS_L3_DPF(dev))
                 engine->irq_keep_mask |= GT_RENDER_L3_PARITY_ERROR_INTERRUPT;
 
-        logical_ring_default_vfuncs(dev, engine);
-
         /* Override some for render ring. */
         if (INTEL_INFO(dev)->gen >= 9)
                 engine->init_hw = gen9_init_render_ring;
@@ -2081,8 +2166,6 @@ static int logical_render_ring_init(struct drm_device *dev)
         engine->emit_flush = gen8_emit_flush_render;
         engine->emit_request = gen8_emit_request_render;
 
-        engine->dev = dev;
-
         ret = intel_init_pipe_control(engine);
         if (ret)
                 return ret;
@@ -2098,7 +2181,7 @@ static int logical_render_ring_init(struct drm_device *dev)
                           ret);
         }
 
-        ret = logical_ring_init(dev, engine);
+        ret = logical_ring_init(engine);
         if (ret) {
                 lrc_destroy_wa_ctx_obj(engine);
         }
@@ -2108,70 +2191,30 @@ static int logical_render_ring_init(struct drm_device *dev)
 
 static int logical_bsd_ring_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_engine_cs *engine = &dev_priv->engine[VCS];
+        struct intel_engine_cs *engine = logical_ring_setup(dev, VCS);
 
-        engine->name = "bsd ring";
-        engine->id = VCS;
-        engine->exec_id = I915_EXEC_BSD;
-        engine->guc_id = GUC_VIDEO_ENGINE;
-        engine->mmio_base = GEN6_BSD_RING_BASE;
-
-        logical_ring_default_irqs(engine, GEN8_VCS1_IRQ_SHIFT);
-        logical_ring_default_vfuncs(dev, engine);
-
-        return logical_ring_init(dev, engine);
+        return logical_ring_init(engine);
 }
 
 static int logical_bsd2_ring_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_engine_cs *engine = &dev_priv->engine[VCS2];
+        struct intel_engine_cs *engine = logical_ring_setup(dev, VCS2);
 
-        engine->name = "bsd2 ring";
-        engine->id = VCS2;
-        engine->exec_id = I915_EXEC_BSD;
-        engine->guc_id = GUC_VIDEO_ENGINE2;
-        engine->mmio_base = GEN8_BSD2_RING_BASE;
-
-        logical_ring_default_irqs(engine, GEN8_VCS2_IRQ_SHIFT);
-        logical_ring_default_vfuncs(dev, engine);
-
-        return logical_ring_init(dev, engine);
+        return logical_ring_init(engine);
 }
 
 static int logical_blt_ring_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_engine_cs *engine = &dev_priv->engine[BCS];
+        struct intel_engine_cs *engine = logical_ring_setup(dev, BCS);
 
-        engine->name = "blitter ring";
-        engine->id = BCS;
-        engine->exec_id = I915_EXEC_BLT;
-        engine->guc_id = GUC_BLITTER_ENGINE;
-        engine->mmio_base = BLT_RING_BASE;
-
-        logical_ring_default_irqs(engine, GEN8_BCS_IRQ_SHIFT);
-        logical_ring_default_vfuncs(dev, engine);
-
-        return logical_ring_init(dev, engine);
+        return logical_ring_init(engine);
 }
 
 static int logical_vebox_ring_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_engine_cs *engine = &dev_priv->engine[VECS];
-
-        engine->name = "video enhancement ring";
-        engine->id = VECS;
-        engine->exec_id = I915_EXEC_VEBOX;
-        engine->guc_id = GUC_VIDEOENHANCE_ENGINE;
-        engine->mmio_base = VEBOX_RING_BASE;
+        struct intel_engine_cs *engine = logical_ring_setup(dev, VECS);
 
-        logical_ring_default_irqs(engine, GEN8_VECS_IRQ_SHIFT);
-        logical_ring_default_vfuncs(dev, engine);
-
-        return logical_ring_init(dev, engine);
+        return logical_ring_init(engine);
 }
 
 /**
@@ -2232,7 +2275,7 @@ cleanup_render_ring:
 }
 
 static u32
-make_rpcs(struct drm_device *dev)
+make_rpcs(struct drm_i915_private *dev_priv)
 {
         u32 rpcs = 0;
 
@@ -2240,7 +2283,7 @@ make_rpcs(struct drm_device *dev)
          * No explicit RPCS request is needed to ensure full
          * slice/subslice/EU enablement prior to Gen9.
         */
-        if (INTEL_INFO(dev)->gen < 9)
+        if (INTEL_GEN(dev_priv) < 9)
                 return 0;
 
         /*
@@ -2249,24 +2292,24 @@ make_rpcs(struct drm_device *dev)
          * must make an explicit request through RPCS for full
          * enablement.
         */
-        if (INTEL_INFO(dev)->has_slice_pg) {
+        if (INTEL_INFO(dev_priv)->has_slice_pg) {
                 rpcs |= GEN8_RPCS_S_CNT_ENABLE;
-                rpcs |= INTEL_INFO(dev)->slice_total <<
+                rpcs |= INTEL_INFO(dev_priv)->slice_total <<
                         GEN8_RPCS_S_CNT_SHIFT;
                 rpcs |= GEN8_RPCS_ENABLE;
         }
 
-        if (INTEL_INFO(dev)->has_subslice_pg) {
+        if (INTEL_INFO(dev_priv)->has_subslice_pg) {
                 rpcs |= GEN8_RPCS_SS_CNT_ENABLE;
-                rpcs |= INTEL_INFO(dev)->subslice_per_slice <<
+                rpcs |= INTEL_INFO(dev_priv)->subslice_per_slice <<
                         GEN8_RPCS_SS_CNT_SHIFT;
                 rpcs |= GEN8_RPCS_ENABLE;
         }
 
-        if (INTEL_INFO(dev)->has_eu_pg) {
-                rpcs |= INTEL_INFO(dev)->eu_per_subslice <<
+        if (INTEL_INFO(dev_priv)->has_eu_pg) {
+                rpcs |= INTEL_INFO(dev_priv)->eu_per_subslice <<
                         GEN8_RPCS_EU_MIN_SHIFT;
-                rpcs |= INTEL_INFO(dev)->eu_per_subslice <<
+                rpcs |= INTEL_INFO(dev_priv)->eu_per_subslice <<
                         GEN8_RPCS_EU_MAX_SHIFT;
                 rpcs |= GEN8_RPCS_ENABLE;
         }
@@ -2278,9 +2321,9 @@ static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)
 {
         u32 indirect_ctx_offset;
 
-        switch (INTEL_INFO(engine->dev)->gen) {
+        switch (INTEL_GEN(engine->i915)) {
         default:
-                MISSING_CASE(INTEL_INFO(engine->dev)->gen);
+                MISSING_CASE(INTEL_GEN(engine->i915));
                 /* fall through */
         case 9:
                 indirect_ctx_offset =
@@ -2296,13 +2339,12 @@ static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)
 }
 
 static int
-populate_lr_context(struct intel_context *ctx,
+populate_lr_context(struct i915_gem_context *ctx,
                     struct drm_i915_gem_object *ctx_obj,
                     struct intel_engine_cs *engine,
                     struct intel_ringbuffer *ringbuf)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = ctx->i915;
         struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
         void *vaddr;
         u32 *reg_state;
@@ -2340,7 +2382,7 @@ populate_lr_context(struct intel_context *ctx,
                        RING_CONTEXT_CONTROL(engine),
                        _MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH |
                                           CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT |
-                                          (HAS_RESOURCE_STREAMER(dev) ?
+                                          (HAS_RESOURCE_STREAMER(dev_priv) ?
                                             CTX_CTRL_RS_CTX_ENABLE : 0)));
         ASSIGN_CTX_REG(reg_state, CTX_RING_HEAD, RING_HEAD(engine->mmio_base),
                        0);
@@ -2429,7 +2471,7 @@ populate_lr_context(struct intel_context *ctx,
         if (engine->id == RCS) {
                 reg_state[CTX_LRI_HEADER_2] = MI_LOAD_REGISTER_IMM(1);
                 ASSIGN_CTX_REG(reg_state, CTX_R_PWR_CLK_STATE, GEN8_R_PWR_CLK_STATE,
-                               make_rpcs(dev));
+                               make_rpcs(dev_priv));
         }
 
         i915_gem_object_unpin_map(ctx_obj);
@@ -2438,39 +2480,8 @@ populate_lr_context(struct intel_context *ctx,
 }
 
 /**
- * intel_lr_context_free() - free the LRC specific bits of a context
- * @ctx: the LR context to free.
- *
- * The real context freeing is done in i915_gem_context_free: this only
- * takes care of the bits that are LRC related: the per-engine backing
- * objects and the logical ringbuffer.
- */
-void intel_lr_context_free(struct intel_context *ctx)
-{
-        int i;
-
-        for (i = I915_NUM_ENGINES; --i >= 0; ) {
-                struct intel_ringbuffer *ringbuf = ctx->engine[i].ringbuf;
-                struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state;
-
-                if (!ctx_obj)
-                        continue;
-
-                if (ctx == ctx->i915->kernel_context) {
-                        intel_unpin_ringbuffer_obj(ringbuf);
-                        i915_gem_object_ggtt_unpin(ctx_obj);
-                        i915_gem_object_unpin_map(ctx_obj);
-                }
-
-                WARN_ON(ctx->engine[i].pin_count);
-                intel_ringbuffer_free(ringbuf);
-                drm_gem_object_unreference(&ctx_obj->base);
-        }
-}
-
-/**
  * intel_lr_context_size() - return the size of the context for an engine
- * @ring: which engine to find the context size for
+ * @engine: which engine to find the context size for
  *
  * Each engine may require a different amount of space for a context image,
  * so when allocating (or copying) an image, this function can be used to
@@ -2486,11 +2497,11 @@ uint32_t intel_lr_context_size(struct intel_engine_cs *engine)
 {
         int ret = 0;
 
-        WARN_ON(INTEL_INFO(engine->dev)->gen < 8);
+        WARN_ON(INTEL_GEN(engine->i915) < 8);
 
         switch (engine->id) {
         case RCS:
-                if (INTEL_INFO(engine->dev)->gen >= 9)
+                if (INTEL_GEN(engine->i915) >= 9)
                         ret = GEN9_LR_CONTEXT_RENDER_SIZE;
                 else
                         ret = GEN8_LR_CONTEXT_RENDER_SIZE;
@@ -2507,9 +2518,9 @@ uint32_t intel_lr_context_size(struct intel_engine_cs *engine)
 }
 
 /**
- * intel_lr_context_deferred_alloc() - create the LRC specific bits of a context
+ * execlists_context_deferred_alloc() - create the LRC specific bits of a context
  * @ctx: LR context to create.
- * @ring: engine to be used with the context.
+ * @engine: engine to be used with the context.
  *
  * This function can be called more than once, with different engines, if we plan
  * to use the context with them. The context backing objects and the ringbuffers
@@ -2519,31 +2530,29 @@ uint32_t intel_lr_context_size(struct intel_engine_cs *engine)
  *
  * Return: non-zero on error.
  */
-
-int intel_lr_context_deferred_alloc(struct intel_context *ctx,
-                                    struct intel_engine_cs *engine)
+static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
+                                            struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
         struct drm_i915_gem_object *ctx_obj;
+        struct intel_context *ce = &ctx->engine[engine->id];
         uint32_t context_size;
         struct intel_ringbuffer *ringbuf;
         int ret;
 
-        WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL);
-        WARN_ON(ctx->engine[engine->id].state);
+        WARN_ON(ce->state);
 
         context_size = round_up(intel_lr_context_size(engine), 4096);
 
         /* One extra page as the sharing data between driver and GuC */
         context_size += PAGE_SIZE * LRC_PPHWSP_PN;
 
-        ctx_obj = i915_gem_alloc_object(dev, context_size);
-        if (!ctx_obj) {
+        ctx_obj = i915_gem_object_create(ctx->i915->dev, context_size);
+        if (IS_ERR(ctx_obj)) {
                 DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n");
-                return -ENOMEM;
+                return PTR_ERR(ctx_obj);
         }
 
-        ringbuf = intel_engine_create_ringbuffer(engine, 4 * PAGE_SIZE);
+        ringbuf = intel_engine_create_ringbuffer(engine, ctx->ring_size);
         if (IS_ERR(ringbuf)) {
                 ret = PTR_ERR(ringbuf);
                 goto error_deref_obj;
@@ -2555,48 +2564,29 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
                 goto error_ringbuf;
         }
 
-        ctx->engine[engine->id].ringbuf = ringbuf;
-        ctx->engine[engine->id].state = ctx_obj;
-
-        if (ctx != ctx->i915->kernel_context && engine->init_context) {
-                struct drm_i915_gem_request *req;
-
-                req = i915_gem_request_alloc(engine, ctx);
-                if (IS_ERR(req)) {
-                        ret = PTR_ERR(req);
-                        DRM_ERROR("ring create req: %d\n", ret);
-                        goto error_ringbuf;
-                }
+        ce->ringbuf = ringbuf;
+        ce->state = ctx_obj;
+        ce->initialised = engine->init_context == NULL;
 
-                ret = engine->init_context(req);
-                i915_add_request_no_flush(req);
-                if (ret) {
-                        DRM_ERROR("ring init context: %d\n",
-                                ret);
-                        goto error_ringbuf;
-                }
-        }
         return 0;
 
 error_ringbuf:
         intel_ringbuffer_free(ringbuf);
 error_deref_obj:
         drm_gem_object_unreference(&ctx_obj->base);
-        ctx->engine[engine->id].ringbuf = NULL;
-        ctx->engine[engine->id].state = NULL;
+        ce->ringbuf = NULL;
+        ce->state = NULL;
         return ret;
 }
 
 void intel_lr_context_reset(struct drm_i915_private *dev_priv,
-                            struct intel_context *ctx)
+                            struct i915_gem_context *ctx)
 {
         struct intel_engine_cs *engine;
 
         for_each_engine(engine, dev_priv) {
-                struct drm_i915_gem_object *ctx_obj =
-                                ctx->engine[engine->id].state;
-                struct intel_ringbuffer *ringbuf =
-                                ctx->engine[engine->id].ringbuf;
+                struct intel_context *ce = &ctx->engine[engine->id];
+                struct drm_i915_gem_object *ctx_obj = ce->state;
                 void *vaddr;
                 uint32_t *reg_state;
 
@@ -2615,7 +2605,7 @@ void intel_lr_context_reset(struct drm_i915_private *dev_priv,
 
                 i915_gem_object_unpin_map(ctx_obj);
 
-                ringbuf->head = 0;
-                ringbuf->tail = 0;
+                ce->ringbuf->head = 0;
+                ce->ringbuf->tail = 0;
         }
 }
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h
index 60a7385bc531..2b8255c19dcc 100644
--- a/drivers/gpu/drm/i915/intel_lrc.h
+++ b/drivers/gpu/drm/i915/intel_lrc.h
@@ -57,6 +57,11 @@
 #define GEN8_CSB_READ_PTR(csb_status) \
         (((csb_status) & GEN8_CSB_READ_PTR_MASK) >> 8)
 
+enum {
+        INTEL_CONTEXT_SCHEDULE_IN = 0,
+        INTEL_CONTEXT_SCHEDULE_OUT,
+};
+
 /* Logical Rings */
 int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request);
 int intel_logical_ring_reserve_space(struct drm_i915_gem_request *request);
@@ -99,30 +104,27 @@ static inline void intel_logical_ring_emit_reg(struct intel_ringbuffer *ringbuf,
 #define LRC_PPHWSP_PN   (LRC_GUCSHR_PN + 1)
 #define LRC_STATE_PN    (LRC_PPHWSP_PN + 1)
 
-void intel_lr_context_free(struct intel_context *ctx);
+struct i915_gem_context;
+
 uint32_t intel_lr_context_size(struct intel_engine_cs *engine);
-int intel_lr_context_deferred_alloc(struct intel_context *ctx,
-                                    struct intel_engine_cs *engine);
-void intel_lr_context_unpin(struct intel_context *ctx,
+void intel_lr_context_unpin(struct i915_gem_context *ctx,
                             struct intel_engine_cs *engine);
 
 struct drm_i915_private;
 
 void intel_lr_context_reset(struct drm_i915_private *dev_priv,
-                            struct intel_context *ctx);
-uint64_t intel_lr_context_descriptor(struct intel_context *ctx,
+                            struct i915_gem_context *ctx);
+uint64_t intel_lr_context_descriptor(struct i915_gem_context *ctx,
                                      struct intel_engine_cs *engine);
 
-u32 intel_execlists_ctx_id(struct intel_context *ctx,
-                           struct intel_engine_cs *engine);
-
 /* Execlists */
-int intel_sanitize_enable_execlists(struct drm_device *dev, int enable_execlists);
+int intel_sanitize_enable_execlists(struct drm_i915_private *dev_priv,
+                                    int enable_execlists);
 struct i915_execbuffer_params;
 int intel_execlists_submission(struct i915_execbuffer_params *params,
                                struct drm_i915_gem_execbuffer2 *args,
                                struct list_head *vmas);
 
-void intel_execlists_retire_requests(struct intel_engine_cs *engine);
+void intel_execlists_cancel_requests(struct intel_engine_cs *engine);
 
 #endif /* _INTEL_LRC_H_ */
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index bc53c0dd34d0..e9082185a375 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -190,7 +190,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)
         /* Set the dithering flag on LVDS as needed, note that there is no
          * special lvds dither control bit on pch-split platforms, dithering is
          * only controlled through the PIPECONF reg. */
-        if (INTEL_INFO(dev)->gen == 4) {
+        if (IS_GEN4(dev_priv)) {
                 /* Bspec wording suggests that LVDS port dithering only exists
                  * for 18bpp panels. */
                 if (crtc->config->dither && crtc->config->pipe_bpp == 18)
@@ -547,7 +547,6 @@ static int intel_lvds_set_property(struct drm_connector *connector,
 static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
         .get_modes = intel_lvds_get_modes,
         .mode_valid = intel_lvds_mode_valid,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_connector_funcs intel_lvds_connector_funcs = {
@@ -556,6 +555,7 @@ static const struct drm_connector_funcs intel_lvds_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_lvds_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_lvds_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -978,7 +978,7 @@ void intel_lvds_init(struct drm_device *dev)
                            DRM_MODE_CONNECTOR_LVDS);
 
         drm_encoder_init(dev, &intel_encoder->base, &intel_lvds_enc_funcs,
-                         DRM_MODE_ENCODER_LVDS, NULL);
+                         DRM_MODE_ENCODER_LVDS, "LVDS");
 
         intel_encoder->enable = intel_enable_lvds;
         intel_encoder->pre_enable = intel_pre_enable_lvds;
@@ -992,7 +992,6 @@ void intel_lvds_init(struct drm_device *dev)
         intel_encoder->get_hw_state = intel_lvds_get_hw_state;
         intel_encoder->get_config = intel_lvds_get_config;
         intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
         intel_encoder->type = INTEL_OUTPUT_LVDS;
@@ -1082,6 +1081,8 @@ void intel_lvds_init(struct drm_device *dev)
                 fixed_mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);
                 if (fixed_mode) {
                         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
+                        connector->display_info.width_mm = fixed_mode->width_mm;
+                        connector->display_info.height_mm = fixed_mode->height_mm;
                         goto out;
                 }
         }
diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
index 6ba4bf7f2a89..3c1482b8f2f4 100644
--- a/drivers/gpu/drm/i915/intel_mocs.c
+++ b/drivers/gpu/drm/i915/intel_mocs.c
@@ -156,6 +156,16 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv,
                           "Platform that should have a MOCS table does not.\n");
         }
 
+        /* WaDisableSkipCaching:skl,bxt,kbl */
+        if (IS_GEN9(dev_priv)) {
+                int i;
+
+                for (i = 0; i < table->size; i++)
+                        if (WARN_ON(table->table[i].l3cc_value &
+                                    (L3_ESC(1) | L3_SCC(0x7))))
+                                return false;
+        }
+
         return result;
 }
 
@@ -189,7 +199,7 @@ static i915_reg_t mocs_register(enum intel_engine_id ring, int index)
  */
 int intel_mocs_init_engine(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = to_i915(engine->dev);
+        struct drm_i915_private *dev_priv = engine->i915;
         struct drm_i915_mocs_table table;
         unsigned int index;
 
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 99e26034ae8d..f6d8a21d2c49 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -240,10 +240,11 @@ struct opregion_asle_ext {
 
 #define MAX_DSLP        1500
 
-static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
+static int swsci(struct drm_i915_private *dev_priv,
+                 u32 function, u32 parm, u32 *parm_out)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct opregion_swsci *swsci = dev_priv->opregion.swsci;
+        struct pci_dev *pdev = dev_priv->dev->pdev;
         u32 main_function, sub_function, scic;
         u16 swsci_val;
         u32 dslp;
@@ -293,16 +294,16 @@ static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
         swsci->scic = scic;
 
         /* Ensure SCI event is selected and event trigger is cleared. */
-        pci_read_config_word(dev->pdev, SWSCI, &swsci_val);
+        pci_read_config_word(pdev, SWSCI, &swsci_val);
         if (!(swsci_val & SWSCI_SCISEL) || (swsci_val & SWSCI_GSSCIE)) {
                 swsci_val |= SWSCI_SCISEL;
                 swsci_val &= ~SWSCI_GSSCIE;
-                pci_write_config_word(dev->pdev, SWSCI, swsci_val);
+                pci_write_config_word(pdev, SWSCI, swsci_val);
         }
 
         /* Use event trigger to tell bios to check the mail. */
         swsci_val |= SWSCI_GSSCIE;
-        pci_write_config_word(dev->pdev, SWSCI, swsci_val);
+        pci_write_config_word(pdev, SWSCI, swsci_val);
 
         /* Poll for the result. */
 #define C (((scic = swsci->scic) & SWSCI_SCIC_INDICATOR) == 0)
@@ -336,13 +337,13 @@ static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
 int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
                                   bool enable)
 {
-        struct drm_device *dev = intel_encoder->base.dev;
+        struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);
         u32 parm = 0;
         u32 type = 0;
         u32 port;
 
         /* don't care about old stuff for now */
-        if (!HAS_DDI(dev))
+        if (!HAS_DDI(dev_priv))
                 return 0;
 
         if (intel_encoder->type == INTEL_OUTPUT_DSI)
@@ -382,7 +383,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
 
         parm |= type << (16 + port * 3);
 
-        return swsci(dev, SWSCI_SBCB_DISPLAY_POWER_STATE, parm, NULL);
+        return swsci(dev_priv, SWSCI_SBCB_DISPLAY_POWER_STATE, parm, NULL);
 }
 
 static const struct {
@@ -396,27 +397,28 @@ static const struct {
         { PCI_D3cold,   0x04 },
 };
 
-int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
+int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,
+                                  pci_power_t state)
 {
         int i;
 
-        if (!HAS_DDI(dev))
+        if (!HAS_DDI(dev_priv))
                 return 0;
 
         for (i = 0; i < ARRAY_SIZE(power_state_map); i++) {
                 if (state == power_state_map[i].pci_power_state)
-                        return swsci(dev, SWSCI_SBCB_ADAPTER_POWER_STATE,
+                        return swsci(dev_priv, SWSCI_SBCB_ADAPTER_POWER_STATE,
                                      power_state_map[i].parm, NULL);
         }
 
         return -EINVAL;
 }
 
-static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
+static u32 asle_set_backlight(struct drm_i915_private *dev_priv, u32 bclp)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_connector *connector;
         struct opregion_asle *asle = dev_priv->opregion.asle;
+        struct drm_device *dev = dev_priv->dev;
 
         DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
 
@@ -449,7 +451,7 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
         return 0;
 }
 
-static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
+static u32 asle_set_als_illum(struct drm_i915_private *dev_priv, u32 alsi)
 {
         /* alsi is the current ALS reading in lux. 0 indicates below sensor
            range, 0xffff indicates above sensor range. 1-0xfffe are valid */
@@ -457,13 +459,13 @@ static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
         return ASLC_ALS_ILLUM_FAILED;
 }
 
-static u32 asle_set_pwm_freq(struct drm_device *dev, u32 pfmb)
+static u32 asle_set_pwm_freq(struct drm_i915_private *dev_priv, u32 pfmb)
 {
         DRM_DEBUG_DRIVER("PWM freq is not supported\n");
         return ASLC_PWM_FREQ_FAILED;
 }
 
-static u32 asle_set_pfit(struct drm_device *dev, u32 pfit)
+static u32 asle_set_pfit(struct drm_i915_private *dev_priv, u32 pfit)
 {
         /* Panel fitting is currently controlled by the X code, so this is a
            noop until modesetting support works fully */
@@ -471,13 +473,13 @@ static u32 asle_set_pfit(struct drm_device *dev, u32 pfit)
         return ASLC_PFIT_FAILED;
 }
 
-static u32 asle_set_supported_rotation_angles(struct drm_device *dev, u32 srot)
+static u32 asle_set_supported_rotation_angles(struct drm_i915_private *dev_priv, u32 srot)
 {
         DRM_DEBUG_DRIVER("SROT is not supported\n");
         return ASLC_ROTATION_ANGLES_FAILED;
 }
 
-static u32 asle_set_button_array(struct drm_device *dev, u32 iuer)
+static u32 asle_set_button_array(struct drm_i915_private *dev_priv, u32 iuer)
 {
         if (!iuer)
                 DRM_DEBUG_DRIVER("Button array event is not supported (nothing)\n");
@@ -495,7 +497,7 @@ static u32 asle_set_button_array(struct drm_device *dev, u32 iuer)
         return ASLC_BUTTON_ARRAY_FAILED;
 }
 
-static u32 asle_set_convertible(struct drm_device *dev, u32 iuer)
+static u32 asle_set_convertible(struct drm_i915_private *dev_priv, u32 iuer)
 {
         if (iuer & ASLE_IUER_CONVERTIBLE)
                 DRM_DEBUG_DRIVER("Convertible is not supported (clamshell)\n");
@@ -505,7 +507,7 @@ static u32 asle_set_convertible(struct drm_device *dev, u32 iuer)
         return ASLC_CONVERTIBLE_FAILED;
 }
 
-static u32 asle_set_docking(struct drm_device *dev, u32 iuer)
+static u32 asle_set_docking(struct drm_i915_private *dev_priv, u32 iuer)
 {
         if (iuer & ASLE_IUER_DOCKING)
                 DRM_DEBUG_DRIVER("Docking is not supported (docked)\n");
@@ -515,7 +517,7 @@ static u32 asle_set_docking(struct drm_device *dev, u32 iuer)
         return ASLC_DOCKING_FAILED;
 }
 
-static u32 asle_isct_state(struct drm_device *dev)
+static u32 asle_isct_state(struct drm_i915_private *dev_priv)
 {
         DRM_DEBUG_DRIVER("ISCT is not supported\n");
         return ASLC_ISCT_STATE_FAILED;
@@ -527,7 +529,6 @@ static void asle_work(struct work_struct *work)
                 container_of(work, struct intel_opregion, asle_work);
         struct drm_i915_private *dev_priv =
                 container_of(opregion, struct drm_i915_private, opregion);
-        struct drm_device *dev = dev_priv->dev;
         struct opregion_asle *asle = dev_priv->opregion.asle;
         u32 aslc_stat = 0;
         u32 aslc_req;
@@ -544,40 +545,38 @@ static void asle_work(struct work_struct *work)
         }
 
         if (aslc_req & ASLC_SET_ALS_ILLUM)
-                aslc_stat |= asle_set_als_illum(dev, asle->alsi);
+                aslc_stat |= asle_set_als_illum(dev_priv, asle->alsi);
 
         if (aslc_req & ASLC_SET_BACKLIGHT)
-                aslc_stat |= asle_set_backlight(dev, asle->bclp);
+                aslc_stat |= asle_set_backlight(dev_priv, asle->bclp);
 
         if (aslc_req & ASLC_SET_PFIT)
-                aslc_stat |= asle_set_pfit(dev, asle->pfit);
+                aslc_stat |= asle_set_pfit(dev_priv, asle->pfit);
 
         if (aslc_req & ASLC_SET_PWM_FREQ)
-                aslc_stat |= asle_set_pwm_freq(dev, asle->pfmb);
+                aslc_stat |= asle_set_pwm_freq(dev_priv, asle->pfmb);
 
         if (aslc_req & ASLC_SUPPORTED_ROTATION_ANGLES)
-                aslc_stat |= asle_set_supported_rotation_angles(dev,
+                aslc_stat |= asle_set_supported_rotation_angles(dev_priv,
                                                         asle->srot);
 
         if (aslc_req & ASLC_BUTTON_ARRAY)
-                aslc_stat |= asle_set_button_array(dev, asle->iuer);
+                aslc_stat |= asle_set_button_array(dev_priv, asle->iuer);
 
         if (aslc_req & ASLC_CONVERTIBLE_INDICATOR)
-                aslc_stat |= asle_set_convertible(dev, asle->iuer);
+                aslc_stat |= asle_set_convertible(dev_priv, asle->iuer);
 
         if (aslc_req & ASLC_DOCKING_INDICATOR)
-                aslc_stat |= asle_set_docking(dev, asle->iuer);
+                aslc_stat |= asle_set_docking(dev_priv, asle->iuer);
 
         if (aslc_req & ASLC_ISCT_STATE_CHANGE)
-                aslc_stat |= asle_isct_state(dev);
+                aslc_stat |= asle_isct_state(dev_priv);
 
         asle->aslc = aslc_stat;
 }
 
-void intel_opregion_asle_intr(struct drm_device *dev)
+void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (dev_priv->opregion.asle)
                 schedule_work(&dev_priv->opregion.asle_work);
 }
@@ -658,10 +657,10 @@ static void set_did(struct intel_opregion *opregion, int i, u32 val)
         }
 }
 
-static void intel_didl_outputs(struct drm_device *dev)
+static void intel_didl_outputs(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
+        struct pci_dev *pdev = dev_priv->dev->pdev;
         struct drm_connector *connector;
         acpi_handle handle;
         struct acpi_device *acpi_dev, *acpi_cdev, *acpi_video_bus = NULL;
@@ -670,7 +669,7 @@ static void intel_didl_outputs(struct drm_device *dev)
         u32 temp, max_outputs;
         int i = 0;
 
-        handle = ACPI_HANDLE(&dev->pdev->dev);
+        handle = ACPI_HANDLE(&pdev->dev);
         if (!handle || acpi_bus_get_device(handle, &acpi_dev))
                 return;
 
@@ -725,7 +724,7 @@ end:
 
 blind_set:
         i = 0;
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        list_for_each_entry(connector, &dev_priv->dev->mode_config.connector_list, head) {
                 int output_type = ACPI_OTHER_OUTPUT;
                 if (i >= max_outputs) {
                         DRM_DEBUG_KMS("More than %u outputs in connector list\n",
@@ -761,9 +760,8 @@ blind_set:
         goto end;
 }
 
-static void intel_setup_cadls(struct drm_device *dev)
+static void intel_setup_cadls(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
         int i = 0;
         u32 disp_id;
@@ -780,17 +778,16 @@ static void intel_setup_cadls(struct drm_device *dev)
         } while (++i < 8 && disp_id != 0);
 }
 
-void intel_opregion_init(struct drm_device *dev)
+void intel_opregion_register(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
 
         if (!opregion->header)
                 return;
 
         if (opregion->acpi) {
-                intel_didl_outputs(dev);
-                intel_setup_cadls(dev);
+                intel_didl_outputs(dev_priv);
+                intel_setup_cadls(dev_priv);
 
                 /* Notify BIOS we are ready to handle ACPI video ext notifs.
                  * Right now, all the events are handled by the ACPI video module.
@@ -808,9 +805,8 @@ void intel_opregion_init(struct drm_device *dev)
         }
 }
 
-void intel_opregion_fini(struct drm_device *dev)
+void intel_opregion_unregister(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
 
         if (!opregion->header)
@@ -842,9 +838,8 @@ void intel_opregion_fini(struct drm_device *dev)
         opregion->lid_state = NULL;
 }
 
-static void swsci_setup(struct drm_device *dev)
+static void swsci_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
         bool requested_callbacks = false;
         u32 tmp;
@@ -854,7 +849,7 @@ static void swsci_setup(struct drm_device *dev)
         opregion->swsci_sbcb_sub_functions = 1;
 
         /* We use GBDA to ask for supported GBDA calls. */
-        if (swsci(dev, SWSCI_GBDA_SUPPORTED_CALLS, 0, &tmp) == 0) {
+        if (swsci(dev_priv, SWSCI_GBDA_SUPPORTED_CALLS, 0, &tmp) == 0) {
                 /* make the bits match the sub-function codes */
                 tmp <<= 1;
                 opregion->swsci_gbda_sub_functions |= tmp;
@@ -865,7 +860,7 @@ static void swsci_setup(struct drm_device *dev)
          * must not call interfaces that are not specifically requested by the
          * bios.
          */
-        if (swsci(dev, SWSCI_GBDA_REQUESTED_CALLBACKS, 0, &tmp) == 0) {
+        if (swsci(dev_priv, SWSCI_GBDA_REQUESTED_CALLBACKS, 0, &tmp) == 0) {
                 /* here, the bits already match sub-function codes */
                 opregion->swsci_sbcb_sub_functions |= tmp;
                 requested_callbacks = true;
@@ -876,7 +871,7 @@ static void swsci_setup(struct drm_device *dev)
          * the callback is _requested_. But we still can't call interfaces that
          * are not requested.
          */
-        if (swsci(dev, SWSCI_SBCB_SUPPORTED_CALLBACKS, 0, &tmp) == 0) {
+        if (swsci(dev_priv, SWSCI_SBCB_SUPPORTED_CALLBACKS, 0, &tmp) == 0) {
                 /* make the bits match the sub-function codes */
                 u32 low = tmp & 0x7ff;
                 u32 high = tmp & ~0xfff; /* bit 11 is reserved */
@@ -918,10 +913,10 @@ static const struct dmi_system_id intel_no_opregion_vbt[] = {
         { }
 };
 
-int intel_opregion_setup(struct drm_device *dev)
+int intel_opregion_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
+        struct pci_dev *pdev = dev_priv->dev->pdev;
         u32 asls, mboxes;
         char buf[sizeof(OPREGION_SIGNATURE)];
         int err = 0;
@@ -933,7 +928,7 @@ int intel_opregion_setup(struct drm_device *dev)
         BUILD_BUG_ON(sizeof(struct opregion_asle) != 0x100);
         BUILD_BUG_ON(sizeof(struct opregion_asle_ext) != 0x400);
 
-        pci_read_config_dword(dev->pdev, ASLS, &asls);
+        pci_read_config_dword(pdev, ASLS, &asls);
         DRM_DEBUG_DRIVER("graphic opregion physical addr: 0x%x\n", asls);
         if (asls == 0) {
                 DRM_DEBUG_DRIVER("ACPI OpRegion not supported!\n");
@@ -965,7 +960,7 @@ int intel_opregion_setup(struct drm_device *dev)
         if (mboxes & MBOX_SWSCI) {
                 DRM_DEBUG_DRIVER("SWSCI supported\n");
                 opregion->swsci = base + OPREGION_SWSCI_OFFSET;
-                swsci_setup(dev);
+                swsci_setup(dev_priv);
         }
 
         if (mboxes & MBOX_ASLE) {
@@ -1014,12 +1009,12 @@ err_out:
 }
 
 int
-intel_opregion_get_panel_type(struct drm_device *dev)
+intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
 {
         u32 panel_details;
         int ret;
 
-        ret = swsci(dev, SWSCI_GBDA_PANEL_DETAILS, 0x0, &panel_details);
+        ret = swsci(dev_priv, SWSCI_GBDA_PANEL_DETAILS, 0x0, &panel_details);
         if (ret) {
                 DRM_DEBUG_KMS("Failed to get panel details from OpRegion (%d)\n",
                               ret);
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index bd38e49f7334..eb93f90bb74d 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -168,7 +168,7 @@ struct overlay_registers {
 };
 
 struct intel_overlay {
-        struct drm_device *dev;
+        struct drm_i915_private *i915;
         struct intel_crtc *crtc;
         struct drm_i915_gem_object *vid_bo;
         struct drm_i915_gem_object *old_vid_bo;
@@ -190,15 +190,15 @@ struct intel_overlay {
 static struct overlay_registers __iomem *
 intel_overlay_map_regs(struct intel_overlay *overlay)
 {
-        struct drm_i915_private *dev_priv = to_i915(overlay->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct overlay_registers __iomem *regs;
 
-        if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (OVERLAY_NEEDS_PHYSICAL(dev_priv))
                 regs = (struct overlay_registers __iomem *)overlay->reg_bo->phys_handle->vaddr;
         else
-                regs = io_mapping_map_wc(ggtt->mappable,
-                                         i915_gem_obj_ggtt_offset(overlay->reg_bo));
+                regs = io_mapping_map_wc(dev_priv->ggtt.mappable,
+                                         overlay->flip_addr,
+                                         PAGE_SIZE);
 
         return regs;
 }
@@ -206,7 +206,7 @@ intel_overlay_map_regs(struct intel_overlay *overlay)
 static void intel_overlay_unmap_regs(struct intel_overlay *overlay,
                                      struct overlay_registers __iomem *regs)
 {
-        if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (!OVERLAY_NEEDS_PHYSICAL(overlay->i915))
                 io_mapping_unmap(regs);
 }
 
@@ -232,14 +232,13 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
 /* overlay needs to be disable in OCMD reg */
 static int intel_overlay_on(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         struct drm_i915_gem_request *req;
         int ret;
 
         WARN_ON(overlay->active);
-        WARN_ON(IS_I830(dev) && !(dev_priv->quirks & QUIRK_PIPEA_FORCE));
+        WARN_ON(IS_I830(dev_priv) && !(dev_priv->quirks & QUIRK_PIPEA_FORCE));
 
         req = i915_gem_request_alloc(engine, NULL);
         if (IS_ERR(req))
@@ -266,8 +265,7 @@ static int intel_overlay_on(struct intel_overlay *overlay)
 static int intel_overlay_continue(struct intel_overlay *overlay,
                                   bool load_polyphase_filter)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         struct drm_i915_gem_request *req;
         u32 flip_addr = overlay->flip_addr;
@@ -335,8 +333,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)
 /* overlay needs to be disabled in OCMD reg */
 static int intel_overlay_off(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         struct drm_i915_gem_request *req;
         u32 flip_addr = overlay->flip_addr;
@@ -365,7 +362,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
         intel_ring_emit(engine, flip_addr);
         intel_ring_emit(engine, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
         /* turn overlay off */
-        if (IS_I830(dev)) {
+        if (IS_I830(dev_priv)) {
                 /* Workaround: Don't disable the overlay fully, since otherwise
                  * it dies on the next OVERLAY_ON cmd. */
                 intel_ring_emit(engine, MI_NOOP);
@@ -408,12 +405,11 @@ static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay)
  */
 static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         int ret;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
 
         /* Only wait if there is actually an old frame to release to
          * guarantee forward progress.
@@ -537,10 +533,10 @@ static int uv_vsubsampling(u32 format)
         }
 }
 
-static u32 calc_swidthsw(struct drm_device *dev, u32 offset, u32 width)
+static u32 calc_swidthsw(struct drm_i915_private *dev_priv, u32 offset, u32 width)
 {
         u32 mask, shift, ret;
-        if (IS_GEN2(dev)) {
+        if (IS_GEN2(dev_priv)) {
                 mask = 0x1f;
                 shift = 5;
         } else {
@@ -548,7 +544,7 @@ static u32 calc_swidthsw(struct drm_device *dev, u32 offset, u32 width)
                 shift = 6;
         }
         ret = ((offset + width + mask) >> shift) - (offset >> shift);
-        if (!IS_GEN2(dev))
+        if (!IS_GEN2(dev_priv))
                 ret <<= 1;
         ret -= 1;
         return ret << 2;
@@ -741,12 +737,12 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         int ret, tmp_width;
         struct overlay_registers __iomem *regs;
         bool scale_changed = false;
-        struct drm_device *dev = overlay->dev;
+        struct drm_i915_private *dev_priv = overlay->i915;
         u32 swidth, swidthsw, sheight, ostride;
         enum pipe pipe = overlay->crtc->pipe;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-        WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
+        WARN_ON(!drm_modeset_is_locked(&dev_priv->dev->mode_config.connection_mutex));
 
         ret = intel_overlay_release_old_vid(overlay);
         if (ret != 0)
@@ -769,7 +765,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                         goto out_unpin;
                 }
                 oconfig = OCONF_CC_OUT_8BIT;
-                if (IS_GEN4(overlay->dev))
+                if (IS_GEN4(dev_priv))
                         oconfig |= OCONF_CSC_MODE_BT709;
                 oconfig |= pipe == 0 ?
                         OCONF_PIPE_A : OCONF_PIPE_B;
@@ -796,7 +792,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                 tmp_width = params->src_w;
 
         swidth = params->src_w;
-        swidthsw = calc_swidthsw(overlay->dev, params->offset_Y, tmp_width);
+        swidthsw = calc_swidthsw(dev_priv, params->offset_Y, tmp_width);
         sheight = params->src_h;
         iowrite32(i915_gem_obj_ggtt_offset(new_bo) + params->offset_Y, &regs->OBUF_0Y);
         ostride = params->stride_Y;
@@ -806,9 +802,9 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                 int uv_vscale = uv_vsubsampling(params->format);
                 u32 tmp_U, tmp_V;
                 swidth |= (params->src_w/uv_hscale) << 16;
-                tmp_U = calc_swidthsw(overlay->dev, params->offset_U,
+                tmp_U = calc_swidthsw(dev_priv, params->offset_U,
                                       params->src_w/uv_hscale);
-                tmp_V = calc_swidthsw(overlay->dev, params->offset_V,
+                tmp_V = calc_swidthsw(dev_priv, params->offset_V,
                                       params->src_w/uv_hscale);
                 swidthsw |= max_t(u32, tmp_U, tmp_V) << 16;
                 sheight |= (params->src_h/uv_vscale) << 16;
@@ -840,8 +836,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         overlay->old_vid_bo = overlay->vid_bo;
         overlay->vid_bo = new_bo;
 
-        intel_frontbuffer_flip(dev,
-                               INTEL_FRONTBUFFER_OVERLAY(pipe));
+        intel_frontbuffer_flip(dev_priv->dev, INTEL_FRONTBUFFER_OVERLAY(pipe));
 
         return 0;
 
@@ -852,12 +847,12 @@ out_unpin:
 
 int intel_overlay_switch_off(struct intel_overlay *overlay)
 {
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct overlay_registers __iomem *regs;
-        struct drm_device *dev = overlay->dev;
         int ret;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-        WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
+        WARN_ON(!drm_modeset_is_locked(&dev_priv->dev->mode_config.connection_mutex));
 
         ret = intel_overlay_recover_from_interrupt(overlay);
         if (ret != 0)
@@ -897,15 +892,14 @@ static int check_overlay_possible_on_crtc(struct intel_overlay *overlay,
 
 static void update_pfit_vscale_ratio(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         u32 pfit_control = I915_READ(PFIT_CONTROL);
         u32 ratio;
 
         /* XXX: This is not the same logic as in the xorg driver, but more in
          * line with the intel documentation for the i965
          */
-        if (INTEL_INFO(dev)->gen >= 4) {
+        if (INTEL_GEN(dev_priv) >= 4) {
                 /* on i965 use the PGM reg to read out the autoscaler values */
                 ratio = I915_READ(PFIT_PGM_RATIOS) >> PFIT_VERT_SCALE_SHIFT_965;
         } else {
@@ -948,7 +942,7 @@ static int check_overlay_scaling(struct put_image_params *rec)
         return 0;
 }
 
-static int check_overlay_src(struct drm_device *dev,
+static int check_overlay_src(struct drm_i915_private *dev_priv,
                              struct drm_intel_overlay_put_image *rec,
                              struct drm_i915_gem_object *new_bo)
 {
@@ -959,7 +953,7 @@ static int check_overlay_src(struct drm_device *dev,
         u32 tmp;
 
         /* check src dimensions */
-        if (IS_845G(dev) || IS_I830(dev)) {
+        if (IS_845G(dev_priv) || IS_I830(dev_priv)) {
                 if (rec->src_height > IMAGE_MAX_HEIGHT_LEGACY ||
                     rec->src_width  > IMAGE_MAX_WIDTH_LEGACY)
                         return -EINVAL;
@@ -1011,14 +1005,14 @@ static int check_overlay_src(struct drm_device *dev,
                 return -EINVAL;
 
         /* stride checking */
-        if (IS_I830(dev) || IS_845G(dev))
+        if (IS_I830(dev_priv) || IS_845G(dev_priv))
                 stride_mask = 255;
         else
                 stride_mask = 63;
 
         if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask)
                 return -EINVAL;
-        if (IS_GEN4(dev) && rec->stride_Y < 512)
+        if (IS_GEN4(dev_priv) && rec->stride_Y < 512)
                 return -EINVAL;
 
         tmp = (rec->flags & I915_OVERLAY_TYPE_MASK) == I915_OVERLAY_YUV_PLANAR ?
@@ -1063,13 +1057,13 @@ static int check_overlay_src(struct drm_device *dev,
  * Return the pipe currently connected to the panel fitter,
  * or -1 if the panel fitter is not present or not in use
  */
-static int intel_panel_fitter_pipe(struct drm_device *dev)
+static int intel_panel_fitter_pipe(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32  pfit_control;
 
         /* i830 doesn't have a panel fitter */
-        if (INTEL_INFO(dev)->gen <= 3 && (IS_I830(dev) || !IS_MOBILE(dev)))
+        if (INTEL_GEN(dev_priv) <= 3 &&
+            (IS_I830(dev_priv) || !IS_MOBILE(dev_priv)))
                 return -1;
 
         pfit_control = I915_READ(PFIT_CONTROL);
@@ -1079,15 +1073,15 @@ static int intel_panel_fitter_pipe(struct drm_device *dev)
                 return -1;
 
         /* 965 can place panel fitter on either pipe */
-        if (IS_GEN4(dev))
+        if (IS_GEN4(dev_priv))
                 return (pfit_control >> 29) & 0x3;
 
         /* older chips can only use pipe 1 */
         return 1;
 }
 
-int intel_overlay_put_image(struct drm_device *dev, void *data,
-                            struct drm_file *file_priv)
+int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
+                                  struct drm_file *file_priv)
 {
         struct drm_intel_overlay_put_image *put_image_rec = data;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1162,7 +1156,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
 
                 /* line too wide, i.e. one-line-mode */
                 if (mode->hdisplay > 1024 &&
-                    intel_panel_fitter_pipe(dev) == crtc->pipe) {
+                    intel_panel_fitter_pipe(dev_priv) == crtc->pipe) {
                         overlay->pfit_active = true;
                         update_pfit_vscale_ratio(overlay);
                 } else
@@ -1196,7 +1190,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
                 goto out_unlock;
         }
 
-        ret = check_overlay_src(dev, put_image_rec, new_bo);
+        ret = check_overlay_src(dev_priv, put_image_rec, new_bo);
         if (ret != 0)
                 goto out_unlock;
         params->format = put_image_rec->flags & ~I915_OVERLAY_FLAGS_MASK;
@@ -1284,8 +1278,8 @@ static int check_gamma(struct drm_intel_overlay_attrs *attrs)
         return 0;
 }
 
-int intel_overlay_attrs(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv)
+int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
+                              struct drm_file *file_priv)
 {
         struct drm_intel_overlay_attrs *attrs = data;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1309,7 +1303,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
                 attrs->contrast   = overlay->contrast;
                 attrs->saturation = overlay->saturation;
 
-                if (!IS_GEN2(dev)) {
+                if (!IS_GEN2(dev_priv)) {
                         attrs->gamma0 = I915_READ(OGAMC0);
                         attrs->gamma1 = I915_READ(OGAMC1);
                         attrs->gamma2 = I915_READ(OGAMC2);
@@ -1341,7 +1335,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
                 intel_overlay_unmap_regs(overlay, regs);
 
                 if (attrs->flags & I915_OVERLAY_UPDATE_GAMMA) {
-                        if (IS_GEN2(dev))
+                        if (IS_GEN2(dev_priv))
                                 goto out_unlock;
 
                         if (overlay->active) {
@@ -1371,37 +1365,36 @@ out_unlock:
         return ret;
 }
 
-void intel_setup_overlay(struct drm_device *dev)
+void intel_setup_overlay(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_overlay *overlay;
         struct drm_i915_gem_object *reg_bo;
         struct overlay_registers __iomem *regs;
         int ret;
 
-        if (!HAS_OVERLAY(dev))
+        if (!HAS_OVERLAY(dev_priv))
                 return;
 
         overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
         if (!overlay)
                 return;
 
-        mutex_lock(&dev->struct_mutex);
+        mutex_lock(&dev_priv->dev->struct_mutex);
         if (WARN_ON(dev_priv->overlay))
                 goto out_free;
 
-        overlay->dev = dev;
+        overlay->i915 = dev_priv;
 
         reg_bo = NULL;
-        if (!OVERLAY_NEEDS_PHYSICAL(dev))
-                reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE);
-        if (reg_bo == NULL)
-                reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
+        if (!OVERLAY_NEEDS_PHYSICAL(dev_priv))
+                reg_bo = i915_gem_object_create_stolen(dev_priv->dev, PAGE_SIZE);
         if (reg_bo == NULL)
+                reg_bo = i915_gem_object_create(dev_priv->dev, PAGE_SIZE);
+        if (IS_ERR(reg_bo))
                 goto out_free;
         overlay->reg_bo = reg_bo;
 
-        if (OVERLAY_NEEDS_PHYSICAL(dev)) {
+        if (OVERLAY_NEEDS_PHYSICAL(dev_priv)) {
                 ret = i915_gem_object_attach_phys(reg_bo, PAGE_SIZE);
                 if (ret) {
                         DRM_ERROR("failed to attach phys overlay regs\n");
@@ -1441,25 +1434,23 @@ void intel_setup_overlay(struct drm_device *dev)
         intel_overlay_unmap_regs(overlay, regs);
 
         dev_priv->overlay = overlay;
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev_priv->dev->struct_mutex);
         DRM_INFO("initialized overlay support\n");
         return;
 
 out_unpin_bo:
-        if (!OVERLAY_NEEDS_PHYSICAL(dev))
+        if (!OVERLAY_NEEDS_PHYSICAL(dev_priv))
                 i915_gem_object_ggtt_unpin(reg_bo);
 out_free_bo:
         drm_gem_object_unreference(&reg_bo->base);
 out_free:
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev_priv->dev->struct_mutex);
         kfree(overlay);
         return;
 }
 
-void intel_cleanup_overlay(struct drm_device *dev)
+void intel_cleanup_overlay(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (!dev_priv->overlay)
                 return;
 
@@ -1482,18 +1473,17 @@ struct intel_overlay_error_state {
 static struct overlay_registers __iomem *
 intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
 {
-        struct drm_i915_private *dev_priv = to_i915(overlay->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct overlay_registers __iomem *regs;
 
-        if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (OVERLAY_NEEDS_PHYSICAL(dev_priv))
                 /* Cast to make sparse happy, but it's wc memory anyway, so
                  * equivalent to the wc io mapping on X86. */
                 regs = (struct overlay_registers __iomem *)
                         overlay->reg_bo->phys_handle->vaddr;
         else
-                regs = io_mapping_map_atomic_wc(ggtt->mappable,
-                                                i915_gem_obj_ggtt_offset(overlay->reg_bo));
+                regs = io_mapping_map_atomic_wc(dev_priv->ggtt.mappable,
+                                                overlay->flip_addr);
 
         return regs;
 }
@@ -1501,15 +1491,13 @@ intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
 static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay,
                                         struct overlay_registers __iomem *regs)
 {
-        if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (!OVERLAY_NEEDS_PHYSICAL(overlay->i915))
                 io_mapping_unmap_atomic(regs);
 }
 
-
 struct intel_overlay_error_state *
-intel_overlay_capture_error_state(struct drm_device *dev)
+intel_overlay_capture_error_state(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_overlay *overlay = dev_priv->overlay;
         struct intel_overlay_error_state *error;
         struct overlay_registers __iomem *regs;
@@ -1523,10 +1511,7 @@ intel_overlay_capture_error_state(struct drm_device *dev)
 
         error->dovsta = I915_READ(DOVSTA);
         error->isr = I915_READ(ISR);
-        if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
-                error->base = (__force long)overlay->reg_bo->phys_handle->vaddr;
-        else
-                error->base = i915_gem_obj_ggtt_offset(overlay->reg_bo);
+        error->base = overlay->flip_addr;
 
         regs = intel_overlay_map_regs_atomic(overlay);
         if (!regs)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 8357d571553a..bf721781c259 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1216,7 +1216,7 @@ static int intel_backlight_device_register(struct intel_connector *connector)
         return 0;
 }
 
-static void intel_backlight_device_unregister(struct intel_connector *connector)
+void intel_backlight_device_unregister(struct intel_connector *connector)
 {
         struct intel_panel *panel = &connector->panel;
 
@@ -1230,9 +1230,6 @@ static int intel_backlight_device_register(struct intel_connector *connector)
 {
         return 0;
 }
-static void intel_backlight_device_unregister(struct intel_connector *connector)
-{
-}
 #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
 
 /*
@@ -1724,6 +1721,14 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
                 container_of(panel, struct intel_connector, panel);
         struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 
+        if (connector->base.connector_type == DRM_MODE_CONNECTOR_eDP &&
+            intel_dp_aux_init_backlight_funcs(connector) == 0)
+                return;
+
+        if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI &&
+            intel_dsi_dcs_init_backlight_funcs(connector) == 0)
+                return;
+
         if (IS_BROXTON(dev_priv)) {
                 panel->backlight.setup = bxt_setup_backlight;
                 panel->backlight.enable = bxt_enable_backlight;
@@ -1812,11 +1817,3 @@ void intel_backlight_register(struct drm_device *dev)
         for_each_intel_connector(dev, connector)
                 intel_backlight_device_register(connector);
 }
-
-void intel_backlight_unregister(struct drm_device *dev)
-{
-        struct intel_connector *connector;
-
-        for_each_intel_connector(dev, connector)
-                intel_backlight_device_unregister(connector);
-}
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a7ef45da0a9e..658a75659657 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -26,6 +26,7 @@
  */
 
 #include <linux/cpufreq.h>
+#include <drm/drm_plane_helper.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 #include "../../../platform/x86/intel_ips.h"
@@ -54,10 +55,38 @@
 #define INTEL_RC6p_ENABLE                       (1<<1)
 #define INTEL_RC6pp_ENABLE                      (1<<2)
 
+static void gen9_init_clock_gating(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
+        I915_WRITE(CHICKEN_PAR1_1,
+                   I915_READ(CHICKEN_PAR1_1) | SKL_EDP_PSR_FIX_RDWRAP);
+
+        I915_WRITE(GEN8_CONFIG0,
+                   I915_READ(GEN8_CONFIG0) | GEN9_DEFAULT_FIXES);
+
+        /* WaEnableChickenDCPR:skl,bxt,kbl */
+        I915_WRITE(GEN8_CHICKEN_DCPR_1,
+                   I915_READ(GEN8_CHICKEN_DCPR_1) | MASK_WAKEMEM);
+
+        /* WaFbcTurnOffFbcWatermark:skl,bxt,kbl */
+        /* WaFbcWakeMemOn:skl,bxt,kbl */
+        I915_WRITE(DISP_ARB_CTL, I915_READ(DISP_ARB_CTL) |
+                   DISP_FBC_WM_DIS |
+                   DISP_FBC_MEMORY_WAKE);
+
+        /* WaFbcHighMemBwCorruptionAvoidance:skl,bxt,kbl */
+        I915_WRITE(ILK_DPFC_CHICKEN, I915_READ(ILK_DPFC_CHICKEN) |
+                   ILK_DPFC_DISABLE_DUMMY0);
+}
+
 static void bxt_init_clock_gating(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
+        gen9_init_clock_gating(dev);
+
         /* WaDisableSDEUnitClockGating:bxt */
         I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
                    GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
@@ -2012,10 +2041,10 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv,
 }
 
 static uint32_t
-hsw_compute_linetime_wm(struct drm_device *dev,
-                        struct intel_crtc_state *cstate)
+hsw_compute_linetime_wm(const struct intel_crtc_state *cstate)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        const struct intel_atomic_state *intel_state =
+                to_intel_atomic_state(cstate->base.state);
         const struct drm_display_mode *adjusted_mode =
                 &cstate->base.adjusted_mode;
         u32 linetime, ips_linetime;
@@ -2024,7 +2053,7 @@ hsw_compute_linetime_wm(struct drm_device *dev,
                 return 0;
         if (WARN_ON(adjusted_mode->crtc_clock == 0))
                 return 0;
-        if (WARN_ON(dev_priv->cdclk_freq == 0))
+        if (WARN_ON(intel_state->cdclk == 0))
                 return 0;
 
         /* The WM are computed with base on how long it takes to fill a single
@@ -2033,7 +2062,7 @@ hsw_compute_linetime_wm(struct drm_device *dev,
         linetime = DIV_ROUND_CLOSEST(adjusted_mode->crtc_htotal * 1000 * 8,
                                      adjusted_mode->crtc_clock);
         ips_linetime = DIV_ROUND_CLOSEST(adjusted_mode->crtc_htotal * 1000 * 8,
-                                         dev_priv->cdclk_freq);
+                                         intel_state->cdclk);
 
         return PIPE_WM_LINETIME_IPS_LINETIME(ips_linetime) |
                PIPE_WM_LINETIME_TIME(linetime);
@@ -2146,14 +2175,14 @@ static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[8])
 static void intel_fixup_spr_wm_latency(struct drm_device *dev, uint16_t wm[5])
 {
         /* ILK sprite LP0 latency is 1300 ns */
-        if (INTEL_INFO(dev)->gen == 5)
+        if (IS_GEN5(dev))
                 wm[0] = 13;
 }
 
 static void intel_fixup_cur_wm_latency(struct drm_device *dev, uint16_t wm[5])
 {
         /* ILK cursor LP0 latency is 1300 ns */
-        if (INTEL_INFO(dev)->gen == 5)
+        if (IS_GEN5(dev))
                 wm[0] = 13;
 
         /* WaDoubleCursorLP3Latency:ivb */
@@ -2309,7 +2338,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
         int level, max_level = ilk_wm_max_level(dev), usable_level;
         struct ilk_wm_maximums max;
 
-        pipe_wm = &cstate->wm.optimal.ilk;
+        pipe_wm = &cstate->wm.ilk.optimal;
 
         for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
                 struct intel_plane_state *ps;
@@ -2352,7 +2381,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
         pipe_wm->wm[0] = pipe_wm->raw_wm[0];
 
         if (IS_HASWELL(dev) || IS_BROADWELL(dev))
-                pipe_wm->linetime = hsw_compute_linetime_wm(dev, cstate);
+                pipe_wm->linetime = hsw_compute_linetime_wm(cstate);
 
         if (!ilk_validate_pipe_wm(dev, pipe_wm))
                 return -EINVAL;
@@ -2391,7 +2420,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
                                        struct intel_crtc *intel_crtc,
                                        struct intel_crtc_state *newstate)
 {
-        struct intel_pipe_wm *a = &newstate->wm.intermediate;
+        struct intel_pipe_wm *a = &newstate->wm.ilk.intermediate;
         struct intel_pipe_wm *b = &intel_crtc->wm.active.ilk;
         int level, max_level = ilk_wm_max_level(dev);
 
@@ -2400,7 +2429,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
          * currently active watermarks to get values that are safe both before
          * and after the vblank.
          */
-        *a = newstate->wm.optimal.ilk;
+        *a = newstate->wm.ilk.optimal;
         a->pipe_enabled |= b->pipe_enabled;
         a->sprites_enabled |= b->sprites_enabled;
         a->sprites_scaled |= b->sprites_scaled;
@@ -2429,7 +2458,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
          * If our intermediate WM are identical to the final WM, then we can
          * omit the post-vblank programming; only update if it's different.
          */
-        if (memcmp(a, &newstate->wm.optimal.ilk, sizeof(*a)) == 0)
+        if (memcmp(a, &newstate->wm.ilk.optimal, sizeof(*a)) == 0)
                 newstate->wm.need_postvbl_update = false;
 
         return 0;
@@ -2849,20 +2878,29 @@ skl_wm_plane_id(const struct intel_plane *plane)
 static void
 skl_ddb_get_pipe_allocation_limits(struct drm_device *dev,
                                    const struct intel_crtc_state *cstate,
-                                   const struct intel_wm_config *config,
-                                   struct skl_ddb_entry *alloc /* out */)
+                                   struct skl_ddb_entry *alloc, /* out */
+                                   int *num_active /* out */)
 {
+        struct drm_atomic_state *state = cstate->base.state;
+        struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_crtc *for_crtc = cstate->base.crtc;
-        struct drm_crtc *crtc;
         unsigned int pipe_size, ddb_size;
         int nth_active_pipe;
+        int pipe = to_intel_crtc(for_crtc)->pipe;
 
-        if (!cstate->base.active) {
+        if (WARN_ON(!state) || !cstate->base.active) {
                 alloc->start = 0;
                 alloc->end = 0;
+                *num_active = hweight32(dev_priv->active_crtcs);
                 return;
         }
 
+        if (intel_state->active_pipe_changes)
+                *num_active = hweight32(intel_state->active_crtcs);
+        else
+                *num_active = hweight32(dev_priv->active_crtcs);
+
         if (IS_BROXTON(dev))
                 ddb_size = BXT_DDB_SIZE;
         else
@@ -2870,25 +2908,29 @@ skl_ddb_get_pipe_allocation_limits(struct drm_device *dev,
 
         ddb_size -= 4; /* 4 blocks for bypass path allocation */
 
-        nth_active_pipe = 0;
-        for_each_crtc(dev, crtc) {
-                if (!to_intel_crtc(crtc)->active)
-                        continue;
-
-                if (crtc == for_crtc)
-                        break;
-
-                nth_active_pipe++;
+        /*
+         * If the state doesn't change the active CRTC's, then there's
+         * no need to recalculate; the existing pipe allocation limits
+         * should remain unchanged.  Note that we're safe from racing
+         * commits since any racing commit that changes the active CRTC
+         * list would need to grab _all_ crtc locks, including the one
+         * we currently hold.
+         */
+        if (!intel_state->active_pipe_changes) {
+                *alloc = dev_priv->wm.skl_hw.ddb.pipe[pipe];
+                return;
         }
 
-        pipe_size = ddb_size / config->num_pipes_active;
-        alloc->start = nth_active_pipe * ddb_size / config->num_pipes_active;
+        nth_active_pipe = hweight32(intel_state->active_crtcs &
+                                    (drm_crtc_mask(for_crtc) - 1));
+        pipe_size = ddb_size / hweight32(intel_state->active_crtcs);
+        alloc->start = nth_active_pipe * ddb_size / *num_active;
         alloc->end = alloc->start + pipe_size;
 }
 
-static unsigned int skl_cursor_allocation(const struct intel_wm_config *config)
+static unsigned int skl_cursor_allocation(int num_active)
 {
-        if (config->num_pipes_active == 1)
+        if (num_active == 1)
                 return 32;
 
         return 8;
@@ -2932,6 +2974,46 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,
         }
 }
 
+/*
+ * Determines the downscale amount of a plane for the purposes of watermark calculations.
+ * The bspec defines downscale amount as:
+ *
+ * """
+ * Horizontal down scale amount = maximum[1, Horizontal source size /
+ *                                           Horizontal destination size]
+ * Vertical down scale amount = maximum[1, Vertical source size /
+ *                                         Vertical destination size]
+ * Total down scale amount = Horizontal down scale amount *
+ *                           Vertical down scale amount
+ * """
+ *
+ * Return value is provided in 16.16 fixed point form to retain fractional part.
+ * Caller should take care of dividing & rounding off the value.
+ */
+static uint32_t
+skl_plane_downscale_amount(const struct intel_plane_state *pstate)
+{
+        uint32_t downscale_h, downscale_w;
+        uint32_t src_w, src_h, dst_w, dst_h;
+
+        if (WARN_ON(!pstate->visible))
+                return DRM_PLANE_HELPER_NO_SCALING;
+
+        /* n.b., src is 16.16 fixed point, dst is whole integer */
+        src_w = drm_rect_width(&pstate->src);
+        src_h = drm_rect_height(&pstate->src);
+        dst_w = drm_rect_width(&pstate->dst);
+        dst_h = drm_rect_height(&pstate->dst);
+        if (intel_rotation_90_or_270(pstate->base.rotation))
+                swap(dst_w, dst_h);
+
+        downscale_h = max(src_h / dst_h, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
+        downscale_w = max(src_w / dst_w, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
+
+        /* Provide result in 16.16 fixed point */
+        return (uint64_t)downscale_w * downscale_h >> 16;
+}
+
 static unsigned int
 skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,
                              const struct drm_plane_state *pstate,
@@ -2939,7 +3021,16 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,
 {
         struct intel_plane_state *intel_pstate = to_intel_plane_state(pstate);
         struct drm_framebuffer *fb = pstate->fb;
+        uint32_t down_scale_amount, data_rate;
         uint32_t width = 0, height = 0;
+        unsigned format = fb ? fb->pixel_format : DRM_FORMAT_XRGB8888;
+
+        if (!intel_pstate->visible)
+                return 0;
+        if (pstate->plane->type == DRM_PLANE_TYPE_CURSOR)
+                return 0;
+        if (y && format != DRM_FORMAT_NV12)
+                return 0;
 
         width = drm_rect_width(&intel_pstate->src) >> 16;
         height = drm_rect_height(&intel_pstate->src) >> 16;
@@ -2948,17 +3039,21 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,
                 swap(width, height);
 
         /* for planar format */
-        if (fb->pixel_format == DRM_FORMAT_NV12) {
+        if (format == DRM_FORMAT_NV12) {
                 if (y)  /* y-plane data rate */
-                        return width * height *
-                                drm_format_plane_cpp(fb->pixel_format, 0);
+                        data_rate = width * height *
+                                drm_format_plane_cpp(format, 0);
                 else    /* uv-plane data rate */
-                        return (width / 2) * (height / 2) *
-                                drm_format_plane_cpp(fb->pixel_format, 1);
+                        data_rate = (width / 2) * (height / 2) *
+                                drm_format_plane_cpp(format, 1);
+        } else {
+                /* for packed formats */
+                data_rate = width * height * drm_format_plane_cpp(format, 0);
         }
 
-        /* for packed formats */
-        return width * height * drm_format_plane_cpp(fb->pixel_format, 0);
+        down_scale_amount = skl_plane_downscale_amount(intel_pstate);
+
+        return (uint64_t)data_rate * down_scale_amount >> 16;
 }
 
 /*
@@ -2967,86 +3062,188 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,
  *   3 * 4096 * 8192  * 4 < 2^32
  */
 static unsigned int
-skl_get_total_relative_data_rate(const struct intel_crtc_state *cstate)
+skl_get_total_relative_data_rate(struct intel_crtc_state *intel_cstate)
 {
-        struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc);
-        struct drm_device *dev = intel_crtc->base.dev;
+        struct drm_crtc_state *cstate = &intel_cstate->base;
+        struct drm_atomic_state *state = cstate->state;
+        struct drm_crtc *crtc = cstate->crtc;
+        struct drm_device *dev = crtc->dev;
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        const struct drm_plane *plane;
         const struct intel_plane *intel_plane;
-        unsigned int total_data_rate = 0;
+        struct drm_plane_state *pstate;
+        unsigned int rate, total_data_rate = 0;
+        int id;
+        int i;
 
-        for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
-                const struct drm_plane_state *pstate = intel_plane->base.state;
+        if (WARN_ON(!state))
+                return 0;
 
-                if (pstate->fb == NULL)
-                        continue;
+        /* Calculate and cache data rate for each plane */
+        for_each_plane_in_state(state, plane, pstate, i) {
+                id = skl_wm_plane_id(to_intel_plane(plane));
+                intel_plane = to_intel_plane(plane);
 
-                if (intel_plane->base.type == DRM_PLANE_TYPE_CURSOR)
+                if (intel_plane->pipe != intel_crtc->pipe)
                         continue;
 
                 /* packed/uv */
-                total_data_rate += skl_plane_relative_data_rate(cstate,
-                                                                pstate,
-                                                                0);
+                rate = skl_plane_relative_data_rate(intel_cstate,
+                                                    pstate, 0);
+                intel_cstate->wm.skl.plane_data_rate[id] = rate;
+
+                /* y-plane */
+                rate = skl_plane_relative_data_rate(intel_cstate,
+                                                    pstate, 1);
+                intel_cstate->wm.skl.plane_y_data_rate[id] = rate;
+        }
 
-                if (pstate->fb->pixel_format == DRM_FORMAT_NV12)
-                        /* y-plane */
-                        total_data_rate += skl_plane_relative_data_rate(cstate,
-                                                                        pstate,
-                                                                        1);
+        /* Calculate CRTC's total data rate from cached values */
+        for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
+                int id = skl_wm_plane_id(intel_plane);
+
+                /* packed/uv */
+                total_data_rate += intel_cstate->wm.skl.plane_data_rate[id];
+                total_data_rate += intel_cstate->wm.skl.plane_y_data_rate[id];
         }
 
+        WARN_ON(cstate->plane_mask && total_data_rate == 0);
+
         return total_data_rate;
 }
 
-static void
+static uint16_t
+skl_ddb_min_alloc(const struct drm_plane_state *pstate,
+                  const int y)
+{
+        struct drm_framebuffer *fb = pstate->fb;
+        struct intel_plane_state *intel_pstate = to_intel_plane_state(pstate);
+        uint32_t src_w, src_h;
+        uint32_t min_scanlines = 8;
+        uint8_t plane_bpp;
+
+        if (WARN_ON(!fb))
+                return 0;
+
+        /* For packed formats, no y-plane, return 0 */
+        if (y && fb->pixel_format != DRM_FORMAT_NV12)
+                return 0;
+
+        /* For Non Y-tile return 8-blocks */
+        if (fb->modifier[0] != I915_FORMAT_MOD_Y_TILED &&
+            fb->modifier[0] != I915_FORMAT_MOD_Yf_TILED)
+                return 8;
+
+        src_w = drm_rect_width(&intel_pstate->src) >> 16;
+        src_h = drm_rect_height(&intel_pstate->src) >> 16;
+
+        if (intel_rotation_90_or_270(pstate->rotation))
+                swap(src_w, src_h);
+
+        /* Halve UV plane width and height for NV12 */
+        if (fb->pixel_format == DRM_FORMAT_NV12 && !y) {
+                src_w /= 2;
+                src_h /= 2;
+        }
+
+        if (fb->pixel_format == DRM_FORMAT_NV12 && !y)
+                plane_bpp = drm_format_plane_cpp(fb->pixel_format, 1);
+        else
+                plane_bpp = drm_format_plane_cpp(fb->pixel_format, 0);
+
+        if (intel_rotation_90_or_270(pstate->rotation)) {
+                switch (plane_bpp) {
+                case 1:
+                        min_scanlines = 32;
+                        break;
+                case 2:
+                        min_scanlines = 16;
+                        break;
+                case 4:
+                        min_scanlines = 8;
+                        break;
+                case 8:
+                        min_scanlines = 4;
+                        break;
+                default:
+                        WARN(1, "Unsupported pixel depth %u for rotation",
+                             plane_bpp);
+                        min_scanlines = 32;
+                }
+        }
+
+        return DIV_ROUND_UP((4 * src_w * plane_bpp), 512) * min_scanlines/4 + 3;
+}
+
+static int
 skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
                       struct skl_ddb_allocation *ddb /* out */)
 {
+        struct drm_atomic_state *state = cstate->base.state;
         struct drm_crtc *crtc = cstate->base.crtc;
         struct drm_device *dev = crtc->dev;
-        struct drm_i915_private *dev_priv = to_i915(dev);
-        struct intel_wm_config *config = &dev_priv->wm.config;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_plane *intel_plane;
+        struct drm_plane *plane;
+        struct drm_plane_state *pstate;
         enum pipe pipe = intel_crtc->pipe;
         struct skl_ddb_entry *alloc = &ddb->pipe[pipe];
         uint16_t alloc_size, start, cursor_blocks;
-        uint16_t minimum[I915_MAX_PLANES];
-        uint16_t y_minimum[I915_MAX_PLANES];
+        uint16_t *minimum = cstate->wm.skl.minimum_blocks;
+        uint16_t *y_minimum = cstate->wm.skl.minimum_y_blocks;
         unsigned int total_data_rate;
+        int num_active;
+        int id, i;
+
+        if (WARN_ON(!state))
+                return 0;
 
-        skl_ddb_get_pipe_allocation_limits(dev, cstate, config, alloc);
+        if (!cstate->base.active) {
+                ddb->pipe[pipe].start = ddb->pipe[pipe].end = 0;
+                memset(ddb->plane[pipe], 0, sizeof(ddb->plane[pipe]));
+                memset(ddb->y_plane[pipe], 0, sizeof(ddb->y_plane[pipe]));
+                return 0;
+        }
+
+        skl_ddb_get_pipe_allocation_limits(dev, cstate, alloc, &num_active);
         alloc_size = skl_ddb_entry_size(alloc);
         if (alloc_size == 0) {
                 memset(ddb->plane[pipe], 0, sizeof(ddb->plane[pipe]));
-                memset(&ddb->plane[pipe][PLANE_CURSOR], 0,
-                       sizeof(ddb->plane[pipe][PLANE_CURSOR]));
-                return;
+                return 0;
         }
 
-        cursor_blocks = skl_cursor_allocation(config);
+        cursor_blocks = skl_cursor_allocation(num_active);
         ddb->plane[pipe][PLANE_CURSOR].start = alloc->end - cursor_blocks;
         ddb->plane[pipe][PLANE_CURSOR].end = alloc->end;
 
         alloc_size -= cursor_blocks;
-        alloc->end -= cursor_blocks;
 
         /* 1. Allocate the mininum required blocks for each active plane */
-        for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
-                struct drm_plane *plane = &intel_plane->base;
-                struct drm_framebuffer *fb = plane->state->fb;
-                int id = skl_wm_plane_id(intel_plane);
+        for_each_plane_in_state(state, plane, pstate, i) {
+                intel_plane = to_intel_plane(plane);
+                id = skl_wm_plane_id(intel_plane);
 
-                if (!to_intel_plane_state(plane->state)->visible)
+                if (intel_plane->pipe != pipe)
                         continue;
 
-                if (plane->type == DRM_PLANE_TYPE_CURSOR)
+                if (!to_intel_plane_state(pstate)->visible) {
+                        minimum[id] = 0;
+                        y_minimum[id] = 0;
+                        continue;
+                }
+                if (plane->type == DRM_PLANE_TYPE_CURSOR) {
+                        minimum[id] = 0;
+                        y_minimum[id] = 0;
                         continue;
+                }
 
-                minimum[id] = 8;
-                alloc_size -= minimum[id];
-                y_minimum[id] = (fb->pixel_format == DRM_FORMAT_NV12) ? 8 : 0;
-                alloc_size -= y_minimum[id];
+                minimum[id] = skl_ddb_min_alloc(pstate, 0);
+                y_minimum[id] = skl_ddb_min_alloc(pstate, 1);
+        }
+
+        for (i = 0; i < PLANE_CURSOR; i++) {
+                alloc_size -= minimum[i];
+                alloc_size -= y_minimum[i];
         }
 
         /*
@@ -3056,21 +3253,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
          * FIXME: we may not allocate every single block here.
          */
         total_data_rate = skl_get_total_relative_data_rate(cstate);
+        if (total_data_rate == 0)
+                return 0;
 
         start = alloc->start;
         for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
-                struct drm_plane *plane = &intel_plane->base;
-                struct drm_plane_state *pstate = intel_plane->base.state;
                 unsigned int data_rate, y_data_rate;
                 uint16_t plane_blocks, y_plane_blocks = 0;
                 int id = skl_wm_plane_id(intel_plane);
 
-                if (!to_intel_plane_state(pstate)->visible)
-                        continue;
-                if (plane->type == DRM_PLANE_TYPE_CURSOR)
-                        continue;
-
-                data_rate = skl_plane_relative_data_rate(cstate, pstate, 0);
+                data_rate = cstate->wm.skl.plane_data_rate[id];
 
                 /*
                  * allocation for (packed formats) or (uv-plane part of planar format):
@@ -3081,30 +3273,32 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
                 plane_blocks += div_u64((uint64_t)alloc_size * data_rate,
                                         total_data_rate);
 
-                ddb->plane[pipe][id].start = start;
-                ddb->plane[pipe][id].end = start + plane_blocks;
+                /* Leave disabled planes at (0,0) */
+                if (data_rate) {
+                        ddb->plane[pipe][id].start = start;
+                        ddb->plane[pipe][id].end = start + plane_blocks;
+                }
 
                 start += plane_blocks;
 
                 /*
                  * allocation for y_plane part of planar format:
                  */
-                if (pstate->fb->pixel_format == DRM_FORMAT_NV12) {
-                        y_data_rate = skl_plane_relative_data_rate(cstate,
-                                                                   pstate,
-                                                                   1);
-                        y_plane_blocks = y_minimum[id];
-                        y_plane_blocks += div_u64((uint64_t)alloc_size * y_data_rate,
-                                                total_data_rate);
+                y_data_rate = cstate->wm.skl.plane_y_data_rate[id];
+
+                y_plane_blocks = y_minimum[id];
+                y_plane_blocks += div_u64((uint64_t)alloc_size * y_data_rate,
+                                        total_data_rate);
 
+                if (y_data_rate) {
                         ddb->y_plane[pipe][id].start = start;
                         ddb->y_plane[pipe][id].end = start + y_plane_blocks;
-
-                        start += y_plane_blocks;
                 }
 
+                start += y_plane_blocks;
         }
 
+        return 0;
 }
 
 static uint32_t skl_pipe_pixel_rate(const struct intel_crtc_state *config)
@@ -3161,35 +3355,41 @@ static uint32_t skl_wm_method2(uint32_t pixel_rate, uint32_t pipe_htotal,
         return ret;
 }
 
-static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,
-                                       const struct intel_crtc *intel_crtc)
+static uint32_t skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cstate,
+                                              struct intel_plane_state *pstate)
 {
-        struct drm_device *dev = intel_crtc->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb;
+        uint64_t adjusted_pixel_rate;
+        uint64_t downscale_amount;
+        uint64_t pixel_rate;
+
+        /* Shouldn't reach here on disabled planes... */
+        if (WARN_ON(!pstate->visible))
+                return 0;
 
         /*
-         * If ddb allocation of pipes changed, it may require recalculation of
-         * watermarks
+         * Adjusted plane pixel rate is just the pipe's adjusted pixel rate
+         * with additional adjustments for plane-specific scaling.
          */
-        if (memcmp(new_ddb->pipe, cur_ddb->pipe, sizeof(new_ddb->pipe)))
-                return true;
+        adjusted_pixel_rate = skl_pipe_pixel_rate(cstate);
+        downscale_amount = skl_plane_downscale_amount(pstate);
+
+        pixel_rate = adjusted_pixel_rate * downscale_amount >> 16;
+        WARN_ON(pixel_rate != clamp_t(uint32_t, pixel_rate, 0, ~0));
 
-        return false;
+        return pixel_rate;
 }
 
-static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
-                                 struct intel_crtc_state *cstate,
-                                 struct intel_plane *intel_plane,
-                                 uint16_t ddb_allocation,
-                                 int level,
-                                 uint16_t *out_blocks, /* out */
-                                 uint8_t *out_lines /* out */)
+static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
+                                struct intel_crtc_state *cstate,
+                                struct intel_plane_state *intel_pstate,
+                                uint16_t ddb_allocation,
+                                int level,
+                                uint16_t *out_blocks, /* out */
+                                uint8_t *out_lines, /* out */
+                                bool *enabled /* out */)
 {
-        struct drm_plane *plane = &intel_plane->base;
-        struct drm_framebuffer *fb = plane->state->fb;
-        struct intel_plane_state *intel_pstate =
-                                        to_intel_plane_state(plane->state);
+        struct drm_plane_state *pstate = &intel_pstate->base;
+        struct drm_framebuffer *fb = pstate->fb;
         uint32_t latency = dev_priv->wm.skl_latency[level];
         uint32_t method1, method2;
         uint32_t plane_bytes_per_line, plane_blocks_per_line;
@@ -3197,20 +3397,24 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
         uint32_t selected_result;
         uint8_t cpp;
         uint32_t width = 0, height = 0;
+        uint32_t plane_pixel_rate;
 
-        if (latency == 0 || !cstate->base.active || !intel_pstate->visible)
-                return false;
+        if (latency == 0 || !cstate->base.active || !intel_pstate->visible) {
+                *enabled = false;
+                return 0;
+        }
 
         width = drm_rect_width(&intel_pstate->src) >> 16;
         height = drm_rect_height(&intel_pstate->src) >> 16;
 
-        if (intel_rotation_90_or_270(plane->state->rotation))
+        if (intel_rotation_90_or_270(pstate->rotation))
                 swap(width, height);
 
         cpp = drm_format_plane_cpp(fb->pixel_format, 0);
-        method1 = skl_wm_method1(skl_pipe_pixel_rate(cstate),
-                                 cpp, latency);
-        method2 = skl_wm_method2(skl_pipe_pixel_rate(cstate),
+        plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate);
+
+        method1 = skl_wm_method1(plane_pixel_rate, cpp, latency);
+        method2 = skl_wm_method2(plane_pixel_rate,
                                  cstate->base.adjusted_mode.crtc_htotal,
                                  width,
                                  cpp,
@@ -3224,7 +3428,7 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
             fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED) {
                 uint32_t min_scanlines = 4;
                 uint32_t y_tile_minimum;
-                if (intel_rotation_90_or_270(plane->state->rotation)) {
+                if (intel_rotation_90_or_270(pstate->rotation)) {
                         int cpp = (fb->pixel_format == DRM_FORMAT_NV12) ?
                                 drm_format_plane_cpp(fb->pixel_format, 1) :
                                 drm_format_plane_cpp(fb->pixel_format, 0);
@@ -3260,40 +3464,99 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
                         res_blocks++;
         }
 
-        if (res_blocks >= ddb_allocation || res_lines > 31)
-                return false;
+        if (res_blocks >= ddb_allocation || res_lines > 31) {
+                *enabled = false;
+
+                /*
+                 * If there are no valid level 0 watermarks, then we can't
+                 * support this display configuration.
+                 */
+                if (level) {
+                        return 0;
+                } else {
+                        DRM_DEBUG_KMS("Requested display configuration exceeds system watermark limitations\n");
+                        DRM_DEBUG_KMS("Plane %d.%d: blocks required = %u/%u, lines required = %u/31\n",
+                                      to_intel_crtc(cstate->base.crtc)->pipe,
+                                      skl_wm_plane_id(to_intel_plane(pstate->plane)),
+                                      res_blocks, ddb_allocation, res_lines);
+
+                        return -EINVAL;
+                }
+        }
 
         *out_blocks = res_blocks;
         *out_lines = res_lines;
+        *enabled = true;
 
-        return true;
+        return 0;
 }
 
-static void skl_compute_wm_level(const struct drm_i915_private *dev_priv,
-                                 struct skl_ddb_allocation *ddb,
-                                 struct intel_crtc_state *cstate,
-                                 int level,
-                                 struct skl_wm_level *result)
+static int
+skl_compute_wm_level(const struct drm_i915_private *dev_priv,
+                     struct skl_ddb_allocation *ddb,
+                     struct intel_crtc_state *cstate,
+                     int level,
+                     struct skl_wm_level *result)
 {
         struct drm_device *dev = dev_priv->dev;
+        struct drm_atomic_state *state = cstate->base.state;
         struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc);
+        struct drm_plane *plane;
         struct intel_plane *intel_plane;
+        struct intel_plane_state *intel_pstate;
         uint16_t ddb_blocks;
         enum pipe pipe = intel_crtc->pipe;
+        int ret;
 
-        for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
+        /*
+         * We'll only calculate watermarks for planes that are actually
+         * enabled, so make sure all other planes are set as disabled.
+         */
+        memset(result, 0, sizeof(*result));
+
+        for_each_intel_plane_mask(dev, intel_plane, cstate->base.plane_mask) {
                 int i = skl_wm_plane_id(intel_plane);
 
+                plane = &intel_plane->base;
+                intel_pstate = NULL;
+                if (state)
+                        intel_pstate =
+                                intel_atomic_get_existing_plane_state(state,
+                                                                      intel_plane);
+
+                /*
+                 * Note: If we start supporting multiple pending atomic commits
+                 * against the same planes/CRTC's in the future, plane->state
+                 * will no longer be the correct pre-state to use for the
+                 * calculations here and we'll need to change where we get the
+                 * 'unchanged' plane data from.
+                 *
+                 * For now this is fine because we only allow one queued commit
+                 * against a CRTC.  Even if the plane isn't modified by this
+                 * transaction and we don't have a plane lock, we still have
+                 * the CRTC's lock, so we know that no other transactions are
+                 * racing with us to update it.
+                 */
+                if (!intel_pstate)
+                        intel_pstate = to_intel_plane_state(plane->state);
+
+                WARN_ON(!intel_pstate->base.fb);
+
                 ddb_blocks = skl_ddb_entry_size(&ddb->plane[pipe][i]);
 
-                result->plane_en[i] = skl_compute_plane_wm(dev_priv,
-                                                cstate,
-                                                intel_plane,
-                                                ddb_blocks,
-                                                level,
-                                                &result->plane_res_b[i],
-                                                &result->plane_res_l[i]);
+                ret = skl_compute_plane_wm(dev_priv,
+                                           cstate,
+                                           intel_pstate,
+                                           ddb_blocks,
+                                           level,
+                                           &result->plane_res_b[i],
+                                           &result->plane_res_l[i],
+                                           &result->plane_en[i]);
+                if (ret)
+                        return ret;
         }
+
+        return 0;
 }
 
 static uint32_t
@@ -3327,21 +3590,26 @@ static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
         }
 }
 
-static void skl_compute_pipe_wm(struct intel_crtc_state *cstate,
-                                struct skl_ddb_allocation *ddb,
-                                struct skl_pipe_wm *pipe_wm)
+static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
+                             struct skl_ddb_allocation *ddb,
+                             struct skl_pipe_wm *pipe_wm)
 {
         struct drm_device *dev = cstate->base.crtc->dev;
         const struct drm_i915_private *dev_priv = dev->dev_private;
         int level, max_level = ilk_wm_max_level(dev);
+        int ret;
 
         for (level = 0; level <= max_level; level++) {
-                skl_compute_wm_level(dev_priv, ddb, cstate,
-                                     level, &pipe_wm->wm[level]);
+                ret = skl_compute_wm_level(dev_priv, ddb, cstate,
+                                           level, &pipe_wm->wm[level]);
+                if (ret)
+                        return ret;
         }
         pipe_wm->linetime = skl_compute_linetime_wm(cstate);
 
         skl_compute_transition_wm(cstate, &pipe_wm->trans_wm);
+
+        return 0;
 }
 
 static void skl_compute_wm_results(struct drm_device *dev,
@@ -3421,7 +3689,9 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
                 int i, level, max_level = ilk_wm_max_level(dev);
                 enum pipe pipe = crtc->pipe;
 
-                if (!new->dirty[pipe])
+                if ((new->dirty_pipes & drm_crtc_mask(&crtc->base)) == 0)
+                        continue;
+                if (!crtc->active)
                         continue;
 
                 I915_WRITE(PIPE_WM_LINETIME(pipe), new->wm_linetime[pipe]);
@@ -3588,87 +3858,144 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
         }
 }
 
-static bool skl_update_pipe_wm(struct drm_crtc *crtc,
-                               struct skl_ddb_allocation *ddb, /* out */
-                               struct skl_pipe_wm *pipe_wm /* out */)
+static int skl_update_pipe_wm(struct drm_crtc_state *cstate,
+                              struct skl_ddb_allocation *ddb, /* out */
+                              struct skl_pipe_wm *pipe_wm, /* out */
+                              bool *changed /* out */)
 {
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
+        struct intel_crtc *intel_crtc = to_intel_crtc(cstate->crtc);
+        struct intel_crtc_state *intel_cstate = to_intel_crtc_state(cstate);
+        int ret;
 
-        skl_allocate_pipe_ddb(cstate, ddb);
-        skl_compute_pipe_wm(cstate, ddb, pipe_wm);
+        ret = skl_build_pipe_wm(intel_cstate, ddb, pipe_wm);
+        if (ret)
+                return ret;
 
         if (!memcmp(&intel_crtc->wm.active.skl, pipe_wm, sizeof(*pipe_wm)))
-                return false;
-
-        intel_crtc->wm.active.skl = *pipe_wm;
+                *changed = false;
+        else
+                *changed = true;
 
-        return true;
+        return 0;
 }
 
-static void skl_update_other_pipe_wm(struct drm_device *dev,
-                                     struct drm_crtc *crtc,
-                                     struct skl_wm_values *r)
+static int
+skl_compute_ddb(struct drm_atomic_state *state)
 {
+        struct drm_device *dev = state->dev;
+        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
         struct intel_crtc *intel_crtc;
-        struct intel_crtc *this_crtc = to_intel_crtc(crtc);
+        struct skl_ddb_allocation *ddb = &intel_state->wm_results.ddb;
+        unsigned realloc_pipes = dev_priv->active_crtcs;
+        int ret;
 
         /*
-         * If the WM update hasn't changed the allocation for this_crtc (the
-         * crtc we are currently computing the new WM values for), other
-         * enabled crtcs will keep the same allocation and we don't need to
-         * recompute anything for them.
+         * If this is our first atomic update following hardware readout,
+         * we can't trust the DDB that the BIOS programmed for us.  Let's
+         * pretend that all pipes switched active status so that we'll
+         * ensure a full DDB recompute.
          */
-        if (!skl_ddb_allocation_changed(&r->ddb, this_crtc))
-                return;
+        if (dev_priv->wm.distrust_bios_wm)
+                intel_state->active_pipe_changes = ~0;
 
         /*
-         * Otherwise, because of this_crtc being freshly enabled/disabled, the
-         * other active pipes need new DDB allocation and WM values.
+         * If the modeset changes which CRTC's are active, we need to
+         * recompute the DDB allocation for *all* active pipes, even
+         * those that weren't otherwise being modified in any way by this
+         * atomic commit.  Due to the shrinking of the per-pipe allocations
+         * when new active CRTC's are added, it's possible for a pipe that
+         * we were already using and aren't changing at all here to suddenly
+         * become invalid if its DDB needs exceeds its new allocation.
+         *
+         * Note that if we wind up doing a full DDB recompute, we can't let
+         * any other display updates race with this transaction, so we need
+         * to grab the lock on *all* CRTC's.
          */
-        for_each_intel_crtc(dev, intel_crtc) {
-                struct skl_pipe_wm pipe_wm = {};
-                bool wm_changed;
-
-                if (this_crtc->pipe == intel_crtc->pipe)
-                        continue;
-
-                if (!intel_crtc->active)
-                        continue;
+        if (intel_state->active_pipe_changes) {
+                realloc_pipes = ~0;
+                intel_state->wm_results.dirty_pipes = ~0;
+        }
 
-                wm_changed = skl_update_pipe_wm(&intel_crtc->base,
-                                                &r->ddb, &pipe_wm);
+        for_each_intel_crtc_mask(dev, intel_crtc, realloc_pipes) {
+                struct intel_crtc_state *cstate;
 
-                /*
-                 * If we end up re-computing the other pipe WM values, it's
-                 * because it was really needed, so we expect the WM values to
-                 * be different.
-                 */
-                WARN_ON(!wm_changed);
+                cstate = intel_atomic_get_crtc_state(state, intel_crtc);
+                if (IS_ERR(cstate))
+                        return PTR_ERR(cstate);
 
-                skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc);
-                r->dirty[intel_crtc->pipe] = true;
+                ret = skl_allocate_pipe_ddb(cstate, ddb);
+                if (ret)
+                        return ret;
         }
+
+        return 0;
 }
 
-static void skl_clear_wm(struct skl_wm_values *watermarks, enum pipe pipe)
+static int
+skl_compute_wm(struct drm_atomic_state *state)
 {
-        watermarks->wm_linetime[pipe] = 0;
-        memset(watermarks->plane[pipe], 0,
-               sizeof(uint32_t) * 8 * I915_MAX_PLANES);
-        memset(watermarks->plane_trans[pipe],
-               0, sizeof(uint32_t) * I915_MAX_PLANES);
-        watermarks->plane_trans[pipe][PLANE_CURSOR] = 0;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *cstate;
+        struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
+        struct skl_wm_values *results = &intel_state->wm_results;
+        struct skl_pipe_wm *pipe_wm;
+        bool changed = false;
+        int ret, i;
 
-        /* Clear ddb entries for pipe */
-        memset(&watermarks->ddb.pipe[pipe], 0, sizeof(struct skl_ddb_entry));
-        memset(&watermarks->ddb.plane[pipe], 0,
-               sizeof(struct skl_ddb_entry) * I915_MAX_PLANES);
-        memset(&watermarks->ddb.y_plane[pipe], 0,
-               sizeof(struct skl_ddb_entry) * I915_MAX_PLANES);
-        memset(&watermarks->ddb.plane[pipe][PLANE_CURSOR], 0,
-               sizeof(struct skl_ddb_entry));
+        /*
+         * If this transaction isn't actually touching any CRTC's, don't
+         * bother with watermark calculation.  Note that if we pass this
+         * test, we're guaranteed to hold at least one CRTC state mutex,
+         * which means we can safely use values like dev_priv->active_crtcs
+         * since any racing commits that want to update them would need to
+         * hold _all_ CRTC state mutexes.
+         */
+        for_each_crtc_in_state(state, crtc, cstate, i)
+                changed = true;
+        if (!changed)
+                return 0;
+
+        /* Clear all dirty flags */
+        results->dirty_pipes = 0;
+
+        ret = skl_compute_ddb(state);
+        if (ret)
+                return ret;
+
+        /*
+         * Calculate WM's for all pipes that are part of this transaction.
+         * Note that the DDB allocation above may have added more CRTC's that
+         * weren't otherwise being modified (and set bits in dirty_pipes) if
+         * pipe allocations had to change.
+         *
+         * FIXME:  Now that we're doing this in the atomic check phase, we
+         * should allow skl_update_pipe_wm() to return failure in cases where
+         * no suitable watermark values can be found.
+         */
+        for_each_crtc_in_state(state, crtc, cstate, i) {
+                struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+                struct intel_crtc_state *intel_cstate =
+                        to_intel_crtc_state(cstate);
+
+                pipe_wm = &intel_cstate->wm.skl.optimal;
+                ret = skl_update_pipe_wm(cstate, &results->ddb, pipe_wm,
+                                         &changed);
+                if (ret)
+                        return ret;
 
+                if (changed)
+                        results->dirty_pipes |= drm_crtc_mask(crtc);
+
+                if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
+                        /* This pipe's WM's did not change */
+                        continue;
+
+                intel_cstate->update_wm_pre = true;
+                skl_compute_wm_results(crtc->dev, pipe_wm, results, intel_crtc);
+        }
+
+        return 0;
 }
 
 static void skl_update_wm(struct drm_crtc *crtc)
@@ -3678,26 +4005,22 @@ static void skl_update_wm(struct drm_crtc *crtc)
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct skl_wm_values *results = &dev_priv->wm.skl_results;
         struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
-        struct skl_pipe_wm *pipe_wm = &cstate->wm.optimal.skl;
-
-
-        /* Clear all dirty flags */
-        memset(results->dirty, 0, sizeof(bool) * I915_MAX_PIPES);
-
-        skl_clear_wm(results, intel_crtc->pipe);
+        struct skl_pipe_wm *pipe_wm = &cstate->wm.skl.optimal;
 
-        if (!skl_update_pipe_wm(crtc, &results->ddb, pipe_wm))
+        if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
                 return;
 
-        skl_compute_wm_results(dev, pipe_wm, results, intel_crtc);
-        results->dirty[intel_crtc->pipe] = true;
+        intel_crtc->wm.active.skl = *pipe_wm;
+
+        mutex_lock(&dev_priv->wm.wm_mutex);
 
-        skl_update_other_pipe_wm(dev, crtc, results);
         skl_write_wm_values(dev_priv, results);
         skl_flush_wm_values(dev_priv, results);
 
         /* store the new configuration */
         dev_priv->wm.skl_hw = *results;
+
+        mutex_unlock(&dev_priv->wm.wm_mutex);
 }
 
 static void ilk_compute_wm_config(struct drm_device *dev,
@@ -3757,7 +4080,7 @@ static void ilk_initial_watermarks(struct intel_crtc_state *cstate)
         struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc);
 
         mutex_lock(&dev_priv->wm.wm_mutex);
-        intel_crtc->wm.active.ilk = cstate->wm.intermediate;
+        intel_crtc->wm.active.ilk = cstate->wm.ilk.intermediate;
         ilk_program_watermarks(dev_priv);
         mutex_unlock(&dev_priv->wm.wm_mutex);
 }
@@ -3769,7 +4092,7 @@ static void ilk_optimize_watermarks(struct intel_crtc_state *cstate)
 
         mutex_lock(&dev_priv->wm.wm_mutex);
         if (cstate->wm.need_postvbl_update) {
-                intel_crtc->wm.active.ilk = cstate->wm.optimal.ilk;
+                intel_crtc->wm.active.ilk = cstate->wm.ilk.optimal;
                 ilk_program_watermarks(dev_priv);
         }
         mutex_unlock(&dev_priv->wm.wm_mutex);
@@ -3826,7 +4149,7 @@ static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
         struct skl_wm_values *hw = &dev_priv->wm.skl_hw;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
-        struct skl_pipe_wm *active = &cstate->wm.optimal.skl;
+        struct skl_pipe_wm *active = &cstate->wm.skl.optimal;
         enum pipe pipe = intel_crtc->pipe;
         int level, i, max_level;
         uint32_t temp;
@@ -3849,7 +4172,7 @@ static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
         if (!intel_crtc->active)
                 return;
 
-        hw->dirty[pipe] = true;
+        hw->dirty_pipes |= drm_crtc_mask(crtc);
 
         active->linetime = hw->wm_linetime[pipe];
 
@@ -3883,6 +4206,14 @@ void skl_wm_get_hw_state(struct drm_device *dev)
         skl_ddb_get_hw_state(dev_priv, ddb);
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                 skl_pipe_wm_get_hw_state(crtc);
+
+        if (dev_priv->active_crtcs) {
+                /* Fully recompute DDB on first atomic commit */
+                dev_priv->wm.distrust_bios_wm = true;
+        } else {
+                /* Easy/common case; just sanitize DDB now if everything off */
+                memset(ddb, 0, sizeof(*ddb));
+        }
 }
 
 static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)
@@ -3892,7 +4223,7 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)
         struct ilk_wm_values *hw = &dev_priv->wm.hw;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
-        struct intel_pipe_wm *active = &cstate->wm.optimal.ilk;
+        struct intel_pipe_wm *active = &cstate->wm.ilk.optimal;
         enum pipe pipe = intel_crtc->pipe;
         static const i915_reg_t wm0_pipe_reg[] = {
                 [PIPE_A] = WM0_PIPEA_ILK,
@@ -4169,9 +4500,8 @@ DEFINE_SPINLOCK(mchdev_lock);
  * mchdev_lock. */
 static struct drm_i915_private *i915_mch_dev;
 
-bool ironlake_set_drps(struct drm_device *dev, u8 val)
+bool ironlake_set_drps(struct drm_i915_private *dev_priv, u8 val)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u16 rgvswctl;
 
         assert_spin_locked(&mchdev_lock);
@@ -4193,9 +4523,8 @@ bool ironlake_set_drps(struct drm_device *dev, u8 val)
         return true;
 }
 
-static void ironlake_enable_drps(struct drm_device *dev)
+static void ironlake_enable_drps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 rgvmodectl;
         u8 fmax, fmin, fstart, vstart;
 
@@ -4252,7 +4581,7 @@ static void ironlake_enable_drps(struct drm_device *dev)
                 DRM_ERROR("stuck trying to change perf mode\n");
         mdelay(1);
 
-        ironlake_set_drps(dev, fstart);
+        ironlake_set_drps(dev_priv, fstart);
 
         dev_priv->ips.last_count1 = I915_READ(DMIEC) +
                 I915_READ(DDREC) + I915_READ(CSIEC);
@@ -4263,9 +4592,8 @@ static void ironlake_enable_drps(struct drm_device *dev)
         spin_unlock_irq(&mchdev_lock);
 }
 
-static void ironlake_disable_drps(struct drm_device *dev)
+static void ironlake_disable_drps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u16 rgvswctl;
 
         spin_lock_irq(&mchdev_lock);
@@ -4280,7 +4608,7 @@ static void ironlake_disable_drps(struct drm_device *dev)
         I915_WRITE(DEIMR, I915_READ(DEIMR) | DE_PCU_EVENT);
 
         /* Go back to the starting frequency */
-        ironlake_set_drps(dev, dev_priv->ips.fstart);
+        ironlake_set_drps(dev_priv, dev_priv->ips.fstart);
         mdelay(1);
         rgvswctl |= MEMCTL_CMD_STS;
         I915_WRITE(MEMSWCTL, rgvswctl);
@@ -4424,12 +4752,10 @@ static u32 gen6_rps_pm_mask(struct drm_i915_private *dev_priv, u8 val)
 /* gen6_set_rps is called to update the frequency request, but should also be
  * called when the range (min_delay and max_delay) is modified so that we can
  * update the GEN6_RP_INTERRUPT_LIMITS register accordingly. */
-static void gen6_set_rps(struct drm_device *dev, u8 val)
+static void gen6_set_rps(struct drm_i915_private *dev_priv, u8 val)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         /* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
                 return;
 
         WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
@@ -4442,10 +4768,10 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)
         if (val != dev_priv->rps.cur_freq) {
                 gen6_set_rps_thresholds(dev_priv, val);
 
-                if (IS_GEN9(dev))
+                if (IS_GEN9(dev_priv))
                         I915_WRITE(GEN6_RPNSWREQ,
                                    GEN9_FREQUENCY(val));
-                else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+                else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
                         I915_WRITE(GEN6_RPNSWREQ,
                                    HSW_FREQUENCY(val));
                 else
@@ -4467,15 +4793,13 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)
         trace_intel_gpu_freq_change(intel_gpu_freq(dev_priv, val));
 }
 
-static void valleyview_set_rps(struct drm_device *dev, u8 val)
+static void valleyview_set_rps(struct drm_i915_private *dev_priv, u8 val)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
         WARN_ON(val > dev_priv->rps.max_freq);
         WARN_ON(val < dev_priv->rps.min_freq);
 
-        if (WARN_ONCE(IS_CHERRYVIEW(dev) && (val & 1),
+        if (WARN_ONCE(IS_CHERRYVIEW(dev_priv) && (val & 1),
                       "Odd GPU freq value\n"))
                 val &= ~1;
 
@@ -4508,7 +4832,7 @@ static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)
         /* Wake up the media well, as that takes a lot less
          * power than the Render well. */
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_MEDIA);
-        valleyview_set_rps(dev_priv->dev, val);
+        valleyview_set_rps(dev_priv, val);
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_MEDIA);
 }
 
@@ -4526,14 +4850,12 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv)
 
 void gen6_rps_idle(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = dev_priv->dev;
-
         mutex_lock(&dev_priv->rps.hw_lock);
         if (dev_priv->rps.enabled) {
-                if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))
+                if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
                         vlv_set_rps_idle(dev_priv);
                 else
-                        gen6_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+                        gen6_set_rps(dev_priv, dev_priv->rps.idle_freq);
                 dev_priv->rps.last_adj = 0;
                 I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);
         }
@@ -4581,49 +4903,39 @@ void gen6_rps_boost(struct drm_i915_private *dev_priv,
         spin_unlock(&dev_priv->rps.client_lock);
 }
 
-void intel_set_rps(struct drm_device *dev, u8 val)
+void intel_set_rps(struct drm_i915_private *dev_priv, u8 val)
 {
-        if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))
-                valleyview_set_rps(dev, val);
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+                valleyview_set_rps(dev_priv, val);
         else
-                gen6_set_rps(dev, val);
+                gen6_set_rps(dev_priv, val);
 }
 
-static void gen9_disable_rc6(struct drm_device *dev)
+static void gen9_disable_rc6(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         I915_WRITE(GEN6_RC_CONTROL, 0);
         I915_WRITE(GEN9_PG_ENABLE, 0);
 }
 
-static void gen9_disable_rps(struct drm_device *dev)
+static void gen9_disable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         I915_WRITE(GEN6_RP_CONTROL, 0);
 }
 
-static void gen6_disable_rps(struct drm_device *dev)
+static void gen6_disable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         I915_WRITE(GEN6_RC_CONTROL, 0);
         I915_WRITE(GEN6_RPNSWREQ, 1 << 31);
         I915_WRITE(GEN6_RP_CONTROL, 0);
 }
 
-static void cherryview_disable_rps(struct drm_device *dev)
+static void cherryview_disable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         I915_WRITE(GEN6_RC_CONTROL, 0);
 }
 
-static void valleyview_disable_rps(struct drm_device *dev)
+static void valleyview_disable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         /* we're doing forcewake before Disabling RC6,
          * This what the BIOS expects when going into suspend */
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
@@ -4633,15 +4945,15 @@ static void valleyview_disable_rps(struct drm_device *dev)
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
 
-static void intel_print_rc6_info(struct drm_device *dev, u32 mode)
+static void intel_print_rc6_info(struct drm_i915_private *dev_priv, u32 mode)
 {
-        if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                 if (mode & (GEN7_RC_CTL_TO_MODE | GEN6_RC_CTL_EI_MODE(1)))
                         mode = GEN6_RC_CTL_RC6_ENABLE;
                 else
                         mode = 0;
         }
-        if (HAS_RC6p(dev))
+        if (HAS_RC6p(dev_priv))
                 DRM_DEBUG_KMS("Enabling RC6 states: RC6 %s RC6p %s RC6pp %s\n",
                               onoff(mode & GEN6_RC_CTL_RC6_ENABLE),
                               onoff(mode & GEN6_RC_CTL_RC6p_ENABLE),
@@ -4652,9 +4964,8 @@ static void intel_print_rc6_info(struct drm_device *dev, u32 mode)
                               onoff(mode & GEN6_RC_CTL_RC6_ENABLE));
 }
 
-static bool bxt_check_bios_rc6_setup(const struct drm_device *dev)
+static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         bool enable_rc6 = true;
         unsigned long rc6_ctx_base;
@@ -4695,16 +5006,16 @@ static bool bxt_check_bios_rc6_setup(const struct drm_device *dev)
         return enable_rc6;
 }
 
-int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
+int sanitize_rc6_option(struct drm_i915_private *dev_priv, int enable_rc6)
 {
         /* No RC6 before Ironlake and code is gone for ilk. */
-        if (INTEL_INFO(dev)->gen < 6)
+        if (INTEL_INFO(dev_priv)->gen < 6)
                 return 0;
 
         if (!enable_rc6)
                 return 0;
 
-        if (IS_BROXTON(dev) && !bxt_check_bios_rc6_setup(dev)) {
+        if (IS_BROXTON(dev_priv) && !bxt_check_bios_rc6_setup(dev_priv)) {
                 DRM_INFO("RC6 disabled by BIOS\n");
                 return 0;
         }
@@ -4713,7 +5024,7 @@ int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
         if (enable_rc6 >= 0) {
                 int mask;
 
-                if (HAS_RC6p(dev))
+                if (HAS_RC6p(dev_priv))
                         mask = INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE |
                                INTEL_RC6pp_ENABLE;
                 else
@@ -4726,20 +5037,14 @@ int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
                 return enable_rc6 & mask;
         }
 
-        if (IS_IVYBRIDGE(dev))
+        if (IS_IVYBRIDGE(dev_priv))
                 return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE);
 
         return INTEL_RC6_ENABLE;
 }
 
-int intel_enable_rc6(const struct drm_device *dev)
+static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv)
 {
-        return i915.enable_rc6;
-}
-
-static void gen6_init_rps_frequencies(struct drm_device *dev)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
         uint32_t rp_state_cap;
         u32 ddcc_status = 0;
         int ret;
@@ -4747,7 +5052,7 @@ static void gen6_init_rps_frequencies(struct drm_device *dev)
         /* All of these values are in units of 50MHz */
         dev_priv->rps.cur_freq          = 0;
         /* static values from HW: RP0 > RP1 > RPn (min_freq) */
-        if (IS_BROXTON(dev)) {
+        if (IS_BROXTON(dev_priv)) {
                 rp_state_cap = I915_READ(BXT_RP_STATE_CAP);
                 dev_priv->rps.rp0_freq = (rp_state_cap >> 16) & 0xff;
                 dev_priv->rps.rp1_freq = (rp_state_cap >>  8) & 0xff;
@@ -4763,8 +5068,8 @@ static void gen6_init_rps_frequencies(struct drm_device *dev)
         dev_priv->rps.max_freq          = dev_priv->rps.rp0_freq;
 
         dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq;
-        if (IS_HASWELL(dev) || IS_BROADWELL(dev) ||
-            IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
+        if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv) ||
+            IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
                 ret = sandybridge_pcode_read(dev_priv,
                                         HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL,
                                         &ddcc_status);
@@ -4776,7 +5081,7 @@ static void gen6_init_rps_frequencies(struct drm_device *dev)
                                         dev_priv->rps.max_freq);
         }
 
-        if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
+        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
                 /* Store the frequency values in 16.66 MHZ units, which is
                    the natural hardware unit for SKL */
                 dev_priv->rps.rp0_freq *= GEN9_FREQ_SCALER;
@@ -4793,7 +5098,7 @@ static void gen6_init_rps_frequencies(struct drm_device *dev)
                 dev_priv->rps.max_freq_softlimit = dev_priv->rps.max_freq;
 
         if (dev_priv->rps.min_freq_softlimit == 0) {
-                if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+                if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
                         dev_priv->rps.min_freq_softlimit =
                                 max_t(int, dev_priv->rps.efficient_freq,
                                       intel_freq_opcode(dev_priv, 450));
@@ -4804,16 +5109,14 @@ static void gen6_init_rps_frequencies(struct drm_device *dev)
 }
 
 /* See the Gen9_GT_PM_Programming_Guide doc for the below */
-static void gen9_enable_rps(struct drm_device *dev)
+static void gen9_enable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
-        gen6_init_rps_frequencies(dev);
+        gen6_init_rps_frequencies(dev_priv);
 
         /* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
                 /*
                  * BIOS could leave the Hw Turbo enabled, so need to explicitly
                  * clear out the Control register just to avoid inconsitency
@@ -4823,7 +5126,7 @@ static void gen9_enable_rps(struct drm_device *dev)
                  * if the Turbo is left enabled in the Control register, as the
                  * Up/Down interrupts would remain masked.
                  */
-                gen9_disable_rps(dev);
+                gen9_disable_rps(dev_priv);
                 intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
                 return;
         }
@@ -4842,14 +5145,13 @@ static void gen9_enable_rps(struct drm_device *dev)
          * Up/Down EI & threshold registers, as well as the RP_CONTROL,
          * RP_INTERRUPT_LIMITS & RPNSWREQ registers */
         dev_priv->rps.power = HIGH_POWER; /* force a reset */
-        gen6_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+        gen6_set_rps(dev_priv, dev_priv->rps.idle_freq);
 
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
 
-static void gen9_enable_rc6(struct drm_device *dev)
+static void gen9_enable_rc6(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         uint32_t rc6_mask = 0;
 
@@ -4866,7 +5168,7 @@ static void gen9_enable_rc6(struct drm_device *dev)
         /* 2b: Program RC6 thresholds.*/
 
         /* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */
-        if (IS_SKYLAKE(dev))
+        if (IS_SKYLAKE(dev_priv))
                 I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 108 << 16);
         else
                 I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
@@ -4875,7 +5177,7 @@ static void gen9_enable_rc6(struct drm_device *dev)
         for_each_engine(engine, dev_priv)
                 I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10);
 
-        if (HAS_GUC_UCODE(dev))
+        if (HAS_GUC(dev_priv))
                 I915_WRITE(GUC_MAX_IDLE_COUNT, 0xA);
 
         I915_WRITE(GEN6_RC_SLEEP, 0);
@@ -4885,12 +5187,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
         I915_WRITE(GEN9_RENDER_PG_IDLE_HYSTERESIS, 25);
 
         /* 3a: Enable RC6 */
-        if (intel_enable_rc6(dev) & INTEL_RC6_ENABLE)
+        if (intel_enable_rc6() & INTEL_RC6_ENABLE)
                 rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
         DRM_INFO("RC6 %s\n", onoff(rc6_mask & GEN6_RC_CTL_RC6_ENABLE));
         /* WaRsUseTimeoutMode */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_D0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
+            IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
                 I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                            GEN7_RC_CTL_TO_MODE |
@@ -4906,19 +5208,17 @@ static void gen9_enable_rc6(struct drm_device *dev)
          * 3b: Enable Coarse Power Gating only when RC6 is enabled.
          * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.
          */
-        if (NEEDS_WaRsDisableCoarsePowerGating(dev))
+        if (NEEDS_WaRsDisableCoarsePowerGating(dev_priv))
                 I915_WRITE(GEN9_PG_ENABLE, 0);
         else
                 I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
                                 (GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
 
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
-
 }
 
-static void gen8_enable_rps(struct drm_device *dev)
+static void gen8_enable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         uint32_t rc6_mask = 0;
 
@@ -4933,7 +5233,7 @@ static void gen8_enable_rps(struct drm_device *dev)
         I915_WRITE(GEN6_RC_CONTROL, 0);
 
         /* Initialize rps frequencies */
-        gen6_init_rps_frequencies(dev);
+        gen6_init_rps_frequencies(dev_priv);
 
         /* 2b: Program RC6 thresholds.*/
         I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 40 << 16);
@@ -4942,16 +5242,16 @@ static void gen8_enable_rps(struct drm_device *dev)
         for_each_engine(engine, dev_priv)
                 I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10);
         I915_WRITE(GEN6_RC_SLEEP, 0);
-        if (IS_BROADWELL(dev))
+        if (IS_BROADWELL(dev_priv))
                 I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us/1.28 for TO */
         else
                 I915_WRITE(GEN6_RC6_THRESHOLD, 50000); /* 50/125ms per EI */
 
         /* 3: Enable RC6 */
-        if (intel_enable_rc6(dev) & INTEL_RC6_ENABLE)
+        if (intel_enable_rc6() & INTEL_RC6_ENABLE)
                 rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
-        intel_print_rc6_info(dev, rc6_mask);
-        if (IS_BROADWELL(dev))
+        intel_print_rc6_info(dev_priv, rc6_mask);
+        if (IS_BROADWELL(dev_priv))
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN7_RC_CTL_TO_MODE |
                                 rc6_mask);
@@ -4992,14 +5292,13 @@ static void gen8_enable_rps(struct drm_device *dev)
         /* 6: Ring frequency + overclocking (our driver does this later */
 
         dev_priv->rps.power = HIGH_POWER; /* force a reset */
-        gen6_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+        gen6_set_rps(dev_priv, dev_priv->rps.idle_freq);
 
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
 
-static void gen6_enable_rps(struct drm_device *dev)
+static void gen6_enable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         u32 rc6vids, pcu_mbox = 0, rc6_mask = 0;
         u32 gtfifodbg;
@@ -5026,7 +5325,7 @@ static void gen6_enable_rps(struct drm_device *dev)
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
         /* Initialize rps frequencies */
-        gen6_init_rps_frequencies(dev);
+        gen6_init_rps_frequencies(dev_priv);
 
         /* disable the counters and set deterministic thresholds */
         I915_WRITE(GEN6_RC_CONTROL, 0);
@@ -5042,7 +5341,7 @@ static void gen6_enable_rps(struct drm_device *dev)
 
         I915_WRITE(GEN6_RC_SLEEP, 0);
         I915_WRITE(GEN6_RC1e_THRESHOLD, 1000);
-        if (IS_IVYBRIDGE(dev))
+        if (IS_IVYBRIDGE(dev_priv))
                 I915_WRITE(GEN6_RC6_THRESHOLD, 125000);
         else
                 I915_WRITE(GEN6_RC6_THRESHOLD, 50000);
@@ -5050,12 +5349,12 @@ static void gen6_enable_rps(struct drm_device *dev)
         I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */
 
         /* Check if we are enabling RC6 */
-        rc6_mode = intel_enable_rc6(dev_priv->dev);
+        rc6_mode = intel_enable_rc6();
         if (rc6_mode & INTEL_RC6_ENABLE)
                 rc6_mask |= GEN6_RC_CTL_RC6_ENABLE;
 
         /* We don't use those on Haswell */
-        if (!IS_HASWELL(dev)) {
+        if (!IS_HASWELL(dev_priv)) {
                 if (rc6_mode & INTEL_RC6p_ENABLE)
                         rc6_mask |= GEN6_RC_CTL_RC6p_ENABLE;
 
@@ -5063,7 +5362,7 @@ static void gen6_enable_rps(struct drm_device *dev)
                         rc6_mask |= GEN6_RC_CTL_RC6pp_ENABLE;
         }
 
-        intel_print_rc6_info(dev, rc6_mask);
+        intel_print_rc6_info(dev_priv, rc6_mask);
 
         I915_WRITE(GEN6_RC_CONTROL,
                    rc6_mask |
@@ -5087,13 +5386,13 @@ static void gen6_enable_rps(struct drm_device *dev)
         }
 
         dev_priv->rps.power = HIGH_POWER; /* force a reset */
-        gen6_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+        gen6_set_rps(dev_priv, dev_priv->rps.idle_freq);
 
         rc6vids = 0;
         ret = sandybridge_pcode_read(dev_priv, GEN6_PCODE_READ_RC6VIDS, &rc6vids);
-        if (IS_GEN6(dev) && ret) {
+        if (IS_GEN6(dev_priv) && ret) {
                 DRM_DEBUG_DRIVER("Couldn't check for BIOS workaround\n");
-        } else if (IS_GEN6(dev) && (GEN6_DECODE_RC6_VID(rc6vids & 0xff) < 450)) {
+        } else if (IS_GEN6(dev_priv) && (GEN6_DECODE_RC6_VID(rc6vids & 0xff) < 450)) {
                 DRM_DEBUG_DRIVER("You should update your BIOS. Correcting minimum rc6 voltage (%dmV->%dmV)\n",
                           GEN6_DECODE_RC6_VID(rc6vids & 0xff), 450);
                 rc6vids &= 0xffff00;
@@ -5106,9 +5405,8 @@ static void gen6_enable_rps(struct drm_device *dev)
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
 
-static void __gen6_update_ring_freq(struct drm_device *dev)
+static void __gen6_update_ring_freq(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int min_freq = 15;
         unsigned int gpu_freq;
         unsigned int max_ia_freq, min_ring_freq;
@@ -5137,7 +5435,7 @@ static void __gen6_update_ring_freq(struct drm_device *dev)
         /* convert DDR frequency from units of 266.6MHz to bandwidth */
         min_ring_freq = mult_frac(min_ring_freq, 8, 3);
 
-        if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
+        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
                 /* Convert GT frequency to 50 HZ units */
                 min_gpu_freq = dev_priv->rps.min_freq / GEN9_FREQ_SCALER;
                 max_gpu_freq = dev_priv->rps.max_freq / GEN9_FREQ_SCALER;
@@ -5155,16 +5453,16 @@ static void __gen6_update_ring_freq(struct drm_device *dev)
                 int diff = max_gpu_freq - gpu_freq;
                 unsigned int ia_freq = 0, ring_freq = 0;
 
-                if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
+                if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
                         /*
                          * ring_freq = 2 * GT. ring_freq is in 100MHz units
                          * No floor required for ring frequency on SKL.
                          */
                         ring_freq = gpu_freq;
-                } else if (INTEL_INFO(dev)->gen >= 8) {
+                } else if (INTEL_INFO(dev_priv)->gen >= 8) {
                         /* max(2 * GT, DDR). NB: GT is 50MHz units */
                         ring_freq = max(min_ring_freq, gpu_freq);
-                } else if (IS_HASWELL(dev)) {
+                } else if (IS_HASWELL(dev_priv)) {
                         ring_freq = mult_frac(gpu_freq, 5, 4);
                         ring_freq = max(min_ring_freq, ring_freq);
                         /* leave ia_freq as the default, chosen by cpufreq */
@@ -5191,26 +5489,23 @@ static void __gen6_update_ring_freq(struct drm_device *dev)
         }
 }
 
-void gen6_update_ring_freq(struct drm_device *dev)
+void gen6_update_ring_freq(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (!HAS_CORE_RING_FREQ(dev))
+        if (!HAS_CORE_RING_FREQ(dev_priv))
                 return;
 
         mutex_lock(&dev_priv->rps.hw_lock);
-        __gen6_update_ring_freq(dev);
+        __gen6_update_ring_freq(dev_priv);
         mutex_unlock(&dev_priv->rps.hw_lock);
 }
 
 static int cherryview_rps_max_freq(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = dev_priv->dev;
         u32 val, rp0;
 
         val = vlv_punit_read(dev_priv, FB_GFX_FMAX_AT_VMAX_FUSE);
 
-        switch (INTEL_INFO(dev)->eu_total) {
+        switch (INTEL_INFO(dev_priv)->eu_total) {
         case 8:
                 /* (2 * 4) config */
                 rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS4EU_FUSE_SHIFT);
@@ -5321,9 +5616,8 @@ static void cherryview_check_pctx(struct drm_i915_private *dev_priv)
         WARN_ON((pctx_addr >> VLV_PCBR_ADDR_SHIFT) == 0);
 }
 
-static void cherryview_setup_pctx(struct drm_device *dev)
+static void cherryview_setup_pctx(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         unsigned long pctx_paddr, paddr;
         u32 pcbr;
@@ -5342,15 +5636,14 @@ static void cherryview_setup_pctx(struct drm_device *dev)
         DRM_DEBUG_DRIVER("PCBR: 0x%08x\n", I915_READ(VLV_PCBR));
 }
 
-static void valleyview_setup_pctx(struct drm_device *dev)
+static void valleyview_setup_pctx(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *pctx;
         unsigned long pctx_paddr;
         u32 pcbr;
         int pctx_size = 24*1024;
 
-        mutex_lock(&dev->struct_mutex);
+        mutex_lock(&dev_priv->dev->struct_mutex);
 
         pcbr = I915_READ(VLV_PCBR);
         if (pcbr) {
@@ -5375,7 +5668,7 @@ static void valleyview_setup_pctx(struct drm_device *dev)
          * overlap with other ranges, such as the frame buffer, protected
          * memory, or any other relevant ranges.
          */
-        pctx = i915_gem_object_create_stolen(dev, pctx_size);
+        pctx = i915_gem_object_create_stolen(dev_priv->dev, pctx_size);
         if (!pctx) {
                 DRM_DEBUG("not enough stolen space for PCTX, disabling\n");
                 goto out;
@@ -5387,13 +5680,11 @@ static void valleyview_setup_pctx(struct drm_device *dev)
 out:
         DRM_DEBUG_DRIVER("PCBR: 0x%08x\n", I915_READ(VLV_PCBR));
         dev_priv->vlv_pctx = pctx;
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev_priv->dev->struct_mutex);
 }
 
-static void valleyview_cleanup_pctx(struct drm_device *dev)
+static void valleyview_cleanup_pctx(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (WARN_ON(!dev_priv->vlv_pctx))
                 return;
 
@@ -5412,12 +5703,11 @@ static void vlv_init_gpll_ref_freq(struct drm_i915_private *dev_priv)
                          dev_priv->rps.gpll_ref_freq);
 }
 
-static void valleyview_init_gt_powersave(struct drm_device *dev)
+static void valleyview_init_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 val;
 
-        valleyview_setup_pctx(dev);
+        valleyview_setup_pctx(dev_priv);
 
         vlv_init_gpll_ref_freq(dev_priv);
 
@@ -5471,12 +5761,11 @@ static void valleyview_init_gt_powersave(struct drm_device *dev)
         mutex_unlock(&dev_priv->rps.hw_lock);
 }
 
-static void cherryview_init_gt_powersave(struct drm_device *dev)
+static void cherryview_init_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 val;
 
-        cherryview_setup_pctx(dev);
+        cherryview_setup_pctx(dev_priv);
 
         vlv_init_gpll_ref_freq(dev_priv);
 
@@ -5536,14 +5825,13 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)
         mutex_unlock(&dev_priv->rps.hw_lock);
 }
 
-static void valleyview_cleanup_gt_powersave(struct drm_device *dev)
+static void valleyview_cleanup_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        valleyview_cleanup_pctx(dev);
+        valleyview_cleanup_pctx(dev_priv);
 }
 
-static void cherryview_enable_rps(struct drm_device *dev)
+static void cherryview_enable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         u32 gtfifodbg, val, rc6_mode = 0, pcbr;
 
@@ -5588,8 +5876,8 @@ static void cherryview_enable_rps(struct drm_device *dev)
         pcbr = I915_READ(VLV_PCBR);
 
         /* 3: Enable RC6 */
-        if ((intel_enable_rc6(dev) & INTEL_RC6_ENABLE) &&
-                                                (pcbr >> VLV_PCBR_ADDR_SHIFT))
+        if ((intel_enable_rc6() & INTEL_RC6_ENABLE) &&
+            (pcbr >> VLV_PCBR_ADDR_SHIFT))
                 rc6_mode = GEN7_RC_CTL_TO_MODE;
 
         I915_WRITE(GEN6_RC_CONTROL, rc6_mode);
@@ -5634,14 +5922,13 @@ static void cherryview_enable_rps(struct drm_device *dev)
                          intel_gpu_freq(dev_priv, dev_priv->rps.idle_freq),
                          dev_priv->rps.idle_freq);
 
-        valleyview_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+        valleyview_set_rps(dev_priv, dev_priv->rps.idle_freq);
 
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
 
-static void valleyview_enable_rps(struct drm_device *dev)
+static void valleyview_enable_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         u32 gtfifodbg, val, rc6_mode = 0;
 
@@ -5694,10 +5981,10 @@ static void valleyview_enable_rps(struct drm_device *dev)
                                       VLV_MEDIA_RC6_COUNT_EN |
                                       VLV_RENDER_RC6_COUNT_EN));
 
-        if (intel_enable_rc6(dev) & INTEL_RC6_ENABLE)
+        if (intel_enable_rc6() & INTEL_RC6_ENABLE)
                 rc6_mode = GEN7_RC_CTL_TO_MODE | VLV_RC_CTL_CTX_RST_PARALLEL;
 
-        intel_print_rc6_info(dev, rc6_mode);
+        intel_print_rc6_info(dev_priv, rc6_mode);
 
         I915_WRITE(GEN6_RC_CONTROL, rc6_mode);
 
@@ -5724,7 +6011,7 @@ static void valleyview_enable_rps(struct drm_device *dev)
                          intel_gpu_freq(dev_priv, dev_priv->rps.idle_freq),
                          dev_priv->rps.idle_freq);
 
-        valleyview_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+        valleyview_set_rps(dev_priv, dev_priv->rps.idle_freq);
 
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
@@ -5814,10 +6101,9 @@ static unsigned long __i915_chipset_val(struct drm_i915_private *dev_priv)
 
 unsigned long i915_chipset_val(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = dev_priv->dev;
         unsigned long val;
 
-        if (INTEL_INFO(dev)->gen != 5)
+        if (INTEL_INFO(dev_priv)->gen != 5)
                 return 0;
 
         spin_lock_irq(&mchdev_lock);
@@ -5857,11 +6143,10 @@ static int _pxvid_to_vd(u8 pxvid)
 
 static u32 pvid_to_extvid(struct drm_i915_private *dev_priv, u8 pxvid)
 {
-        struct drm_device *dev = dev_priv->dev;
         const int vd = _pxvid_to_vd(pxvid);
         const int vm = vd - 1125;
 
-        if (INTEL_INFO(dev)->is_mobile)
+        if (INTEL_INFO(dev_priv)->is_mobile)
                 return vm > 0 ? vm : 0;
 
         return vd;
@@ -5902,9 +6187,7 @@ static void __i915_update_gfx_val(struct drm_i915_private *dev_priv)
 
 void i915_update_gfx_val(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = dev_priv->dev;
-
-        if (INTEL_INFO(dev)->gen != 5)
+        if (INTEL_INFO(dev_priv)->gen != 5)
                 return;
 
         spin_lock_irq(&mchdev_lock);
@@ -5953,10 +6236,9 @@ static unsigned long __i915_gfx_val(struct drm_i915_private *dev_priv)
 
 unsigned long i915_gfx_val(struct drm_i915_private *dev_priv)
 {
-        struct drm_device *dev = dev_priv->dev;
         unsigned long val;
 
-        if (INTEL_INFO(dev)->gen != 5)
+        if (INTEL_INFO(dev_priv)->gen != 5)
                 return 0;
 
         spin_lock_irq(&mchdev_lock);
@@ -6097,7 +6379,7 @@ bool i915_gpu_turbo_disable(void)
 
         dev_priv->ips.max_delay = dev_priv->ips.fstart;
 
-        if (!ironlake_set_drps(dev_priv->dev, dev_priv->ips.fstart))
+        if (!ironlake_set_drps(dev_priv, dev_priv->ips.fstart))
                 ret = false;
 
 out_unlock:
@@ -6145,9 +6427,8 @@ void intel_gpu_ips_teardown(void)
         spin_unlock_irq(&mchdev_lock);
 }
 
-static void intel_init_emon(struct drm_device *dev)
+static void intel_init_emon(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 lcfuse;
         u8 pxw[16];
         int i;
@@ -6216,10 +6497,8 @@ static void intel_init_emon(struct drm_device *dev)
         dev_priv->ips.corr = (lcfuse & LCFUSE_HIV_MASK);
 }
 
-void intel_init_gt_powersave(struct drm_device *dev)
+void intel_init_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         /*
          * RPM depends on RC6 to save restore the GT HW context, so make RC6 a
          * requirement.
@@ -6229,74 +6508,66 @@ void intel_init_gt_powersave(struct drm_device *dev)
                 intel_runtime_pm_get(dev_priv);
         }
 
-        if (IS_CHERRYVIEW(dev))
-                cherryview_init_gt_powersave(dev);
-        else if (IS_VALLEYVIEW(dev))
-                valleyview_init_gt_powersave(dev);
+        if (IS_CHERRYVIEW(dev_priv))
+                cherryview_init_gt_powersave(dev_priv);
+        else if (IS_VALLEYVIEW(dev_priv))
+                valleyview_init_gt_powersave(dev_priv);
 }
 
-void intel_cleanup_gt_powersave(struct drm_device *dev)
+void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (IS_CHERRYVIEW(dev))
+        if (IS_CHERRYVIEW(dev_priv))
                 return;
-        else if (IS_VALLEYVIEW(dev))
-                valleyview_cleanup_gt_powersave(dev);
+        else if (IS_VALLEYVIEW(dev_priv))
+                valleyview_cleanup_gt_powersave(dev_priv);
 
         if (!i915.enable_rc6)
                 intel_runtime_pm_put(dev_priv);
 }
 
-static void gen6_suspend_rps(struct drm_device *dev)
+static void gen6_suspend_rps(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         flush_delayed_work(&dev_priv->rps.delayed_resume_work);
 
-        gen6_disable_rps_interrupts(dev);
+        gen6_disable_rps_interrupts(dev_priv);
 }
 
 /**
  * intel_suspend_gt_powersave - suspend PM work and helper threads
- * @dev: drm device
+ * @dev_priv: i915 device
  *
  * We don't want to disable RC6 or other features here, we just want
  * to make sure any work we've queued has finished and won't bother
  * us while we're suspended.
  */
-void intel_suspend_gt_powersave(struct drm_device *dev)
+void intel_suspend_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (INTEL_INFO(dev)->gen < 6)
+        if (INTEL_GEN(dev_priv) < 6)
                 return;
 
-        gen6_suspend_rps(dev);
+        gen6_suspend_rps(dev_priv);
 
         /* Force GPU to min freq during suspend */
         gen6_rps_idle(dev_priv);
 }
 
-void intel_disable_gt_powersave(struct drm_device *dev)
+void intel_disable_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (IS_IRONLAKE_M(dev)) {
-                ironlake_disable_drps(dev);
-        } else if (INTEL_INFO(dev)->gen >= 6) {
-                intel_suspend_gt_powersave(dev);
+        if (IS_IRONLAKE_M(dev_priv)) {
+                ironlake_disable_drps(dev_priv);
+        } else if (INTEL_INFO(dev_priv)->gen >= 6) {
+                intel_suspend_gt_powersave(dev_priv);
 
                 mutex_lock(&dev_priv->rps.hw_lock);
-                if (INTEL_INFO(dev)->gen >= 9) {
-                        gen9_disable_rc6(dev);
-                        gen9_disable_rps(dev);
-                } else if (IS_CHERRYVIEW(dev))
-                        cherryview_disable_rps(dev);
-                else if (IS_VALLEYVIEW(dev))
-                        valleyview_disable_rps(dev);
+                if (INTEL_INFO(dev_priv)->gen >= 9) {
+                        gen9_disable_rc6(dev_priv);
+                        gen9_disable_rps(dev_priv);
+                } else if (IS_CHERRYVIEW(dev_priv))
+                        cherryview_disable_rps(dev_priv);
+                else if (IS_VALLEYVIEW(dev_priv))
+                        valleyview_disable_rps(dev_priv);
                 else
-                        gen6_disable_rps(dev);
+                        gen6_disable_rps(dev_priv);
 
                 dev_priv->rps.enabled = false;
                 mutex_unlock(&dev_priv->rps.hw_lock);
@@ -6308,27 +6579,26 @@ static void intel_gen6_powersave_work(struct work_struct *work)
         struct drm_i915_private *dev_priv =
                 container_of(work, struct drm_i915_private,
                              rps.delayed_resume_work.work);
-        struct drm_device *dev = dev_priv->dev;
 
         mutex_lock(&dev_priv->rps.hw_lock);
 
-        gen6_reset_rps_interrupts(dev);
+        gen6_reset_rps_interrupts(dev_priv);
 
-        if (IS_CHERRYVIEW(dev)) {
-                cherryview_enable_rps(dev);
-        } else if (IS_VALLEYVIEW(dev)) {
-                valleyview_enable_rps(dev);
-        } else if (INTEL_INFO(dev)->gen >= 9) {
-                gen9_enable_rc6(dev);
-                gen9_enable_rps(dev);
-                if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev))
-                        __gen6_update_ring_freq(dev);
-        } else if (IS_BROADWELL(dev)) {
-                gen8_enable_rps(dev);
-                __gen6_update_ring_freq(dev);
+        if (IS_CHERRYVIEW(dev_priv)) {
+                cherryview_enable_rps(dev_priv);
+        } else if (IS_VALLEYVIEW(dev_priv)) {
+                valleyview_enable_rps(dev_priv);
+        } else if (INTEL_INFO(dev_priv)->gen >= 9) {
+                gen9_enable_rc6(dev_priv);
+                gen9_enable_rps(dev_priv);
+                if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+                        __gen6_update_ring_freq(dev_priv);
+        } else if (IS_BROADWELL(dev_priv)) {
+                gen8_enable_rps(dev_priv);
+                __gen6_update_ring_freq(dev_priv);
         } else {
-                gen6_enable_rps(dev);
-                __gen6_update_ring_freq(dev);
+                gen6_enable_rps(dev_priv);
+                __gen6_update_ring_freq(dev_priv);
         }
 
         WARN_ON(dev_priv->rps.max_freq < dev_priv->rps.min_freq);
@@ -6339,27 +6609,25 @@ static void intel_gen6_powersave_work(struct work_struct *work)
 
         dev_priv->rps.enabled = true;
 
-        gen6_enable_rps_interrupts(dev);
+        gen6_enable_rps_interrupts(dev_priv);
 
         mutex_unlock(&dev_priv->rps.hw_lock);
 
         intel_runtime_pm_put(dev_priv);
 }
 
-void intel_enable_gt_powersave(struct drm_device *dev)
+void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         /* Powersaving is controlled by the host when inside a VM */
-        if (intel_vgpu_active(dev))
+        if (intel_vgpu_active(dev_priv))
                 return;
 
-        if (IS_IRONLAKE_M(dev)) {
-                ironlake_enable_drps(dev);
-                mutex_lock(&dev->struct_mutex);
-                intel_init_emon(dev);
-                mutex_unlock(&dev->struct_mutex);
-        } else if (INTEL_INFO(dev)->gen >= 6) {
+        if (IS_IRONLAKE_M(dev_priv)) {
+                ironlake_enable_drps(dev_priv);
+                mutex_lock(&dev_priv->dev->struct_mutex);
+                intel_init_emon(dev_priv);
+                mutex_unlock(&dev_priv->dev->struct_mutex);
+        } else if (INTEL_INFO(dev_priv)->gen >= 6) {
                 /*
                  * PCU communication is slow and this doesn't need to be
                  * done at any specific time, so do this out of our fast path
@@ -6378,14 +6646,12 @@ void intel_enable_gt_powersave(struct drm_device *dev)
         }
 }
 
-void intel_reset_gt_powersave(struct drm_device *dev)
+void intel_reset_gt_powersave(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (INTEL_INFO(dev)->gen < 6)
+        if (INTEL_INFO(dev_priv)->gen < 6)
                 return;
 
-        gen6_suspend_rps(dev);
+        gen6_suspend_rps(dev_priv);
         dev_priv->rps.enabled = false;
 }
 
@@ -6698,11 +6964,69 @@ static void lpt_suspend_hw(struct drm_device *dev)
         }
 }
 
+static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
+                                   int general_prio_credits,
+                                   int high_prio_credits)
+{
+        u32 misccpctl;
+
+        /* WaTempDisableDOPClkGating:bdw */
+        misccpctl = I915_READ(GEN7_MISCCPCTL);
+        I915_WRITE(GEN7_MISCCPCTL, misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE);
+
+        I915_WRITE(GEN8_L3SQCREG1,
+                   L3_GENERAL_PRIO_CREDITS(general_prio_credits) |
+                   L3_HIGH_PRIO_CREDITS(high_prio_credits));
+
+        /*
+         * Wait at least 100 clocks before re-enabling clock gating.
+         * See the definition of L3SQCREG1 in BSpec.
+         */
+        POSTING_READ(GEN8_L3SQCREG1);
+        udelay(1);
+        I915_WRITE(GEN7_MISCCPCTL, misccpctl);
+}
+
+static void kabylake_init_clock_gating(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        gen9_init_clock_gating(dev);
+
+        /* WaDisableSDEUnitClockGating:kbl */
+        if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
+                I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
+                           GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
+
+        /* WaDisableGamClockGating:kbl */
+        if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
+                I915_WRITE(GEN6_UCGCTL1, I915_READ(GEN6_UCGCTL1) |
+                           GEN6_GAMUNIT_CLOCK_GATE_DISABLE);
+
+        /* WaFbcNukeOnHostModify:kbl */
+        I915_WRITE(ILK_DPFC_CHICKEN, I915_READ(ILK_DPFC_CHICKEN) |
+                   ILK_DPFC_NUKE_ON_ANY_MODIFICATION);
+}
+
+static void skylake_init_clock_gating(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        gen9_init_clock_gating(dev);
+
+        /* WAC6entrylatency:skl */
+        I915_WRITE(FBC_LLC_READ_CTRL, I915_READ(FBC_LLC_READ_CTRL) |
+                   FBC_LLC_FULLY_OPEN);
+
+        /* WaFbcNukeOnHostModify:skl */
+        I915_WRITE(ILK_DPFC_CHICKEN, I915_READ(ILK_DPFC_CHICKEN) |
+                   ILK_DPFC_NUKE_ON_ANY_MODIFICATION);
+}
+
 static void broadwell_init_clock_gating(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         enum pipe pipe;
-        uint32_t misccpctl;
 
         ilk_init_lp_watermarks(dev);
 
@@ -6733,20 +7057,8 @@ static void broadwell_init_clock_gating(struct drm_device *dev)
         I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
                    GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
 
-        /*
-         * WaProgramL3SqcReg1Default:bdw
-         * WaTempDisableDOPClkGating:bdw
-         */
-        misccpctl = I915_READ(GEN7_MISCCPCTL);
-        I915_WRITE(GEN7_MISCCPCTL, misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE);
-        I915_WRITE(GEN8_L3SQCREG1, BDW_WA_L3SQCREG1_DEFAULT);
-        /*
-         * Wait at least 100 clocks before re-enabling clock gating. See
-         * the definition of L3SQCREG1 in BSpec.
-         */
-        POSTING_READ(GEN8_L3SQCREG1);
-        udelay(1);
-        I915_WRITE(GEN7_MISCCPCTL, misccpctl);
+        /* WaProgramL3SqcReg1Default:bdw */
+        gen8_set_l3sqc_credits(dev_priv, 30, 2);
 
         /*
          * WaGttCachingOffByDefault:bdw
@@ -6755,6 +7067,10 @@ static void broadwell_init_clock_gating(struct drm_device *dev)
          */
         I915_WRITE(HSW_GTT_CACHE_EN, GTT_CACHE_EN_ALL);
 
+        /* WaKVMNotificationOnConfigChange:bdw */
+        I915_WRITE(CHICKEN_PAR2_1, I915_READ(CHICKEN_PAR2_1)
+                   | KVM_CONFIG_CHANGE_NOTIFICATION_SELECT);
+
         lpt_init_clock_gating(dev);
 }
 
@@ -7017,6 +7333,13 @@ static void cherryview_init_clock_gating(struct drm_device *dev)
                    GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
 
         /*
+         * WaProgramL3SqcReg1Default:chv
+         * See gfxspecs/Related Documents/Performance Guide/
+         * LSQC Setting Recommendations.
+         */
+        gen8_set_l3sqc_credits(dev_priv, 38, 2);
+
+        /*
          * GTT cache may not work with big pages, so if those
          * are ever enabled GTT cache may need to be disabled.
          */
@@ -7163,9 +7486,9 @@ static void nop_init_clock_gating(struct drm_device *dev)
 void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
 {
         if (IS_SKYLAKE(dev_priv))
-                dev_priv->display.init_clock_gating = nop_init_clock_gating;
+                dev_priv->display.init_clock_gating = skylake_init_clock_gating;
         else if (IS_KABYLAKE(dev_priv))
-                dev_priv->display.init_clock_gating = nop_init_clock_gating;
+                dev_priv->display.init_clock_gating = kabylake_init_clock_gating;
         else if (IS_BROXTON(dev_priv))
                 dev_priv->display.init_clock_gating = bxt_init_clock_gating;
         else if (IS_BROADWELL(dev_priv))
@@ -7217,6 +7540,7 @@ void intel_init_pm(struct drm_device *dev)
         if (INTEL_INFO(dev)->gen >= 9) {
                 skl_setup_wm_latency(dev);
                 dev_priv->display.update_wm = skl_update_wm;
+                dev_priv->display.compute_global_watermarks = skl_compute_wm;
         } else if (HAS_PCH_SPLIT(dev)) {
                 ilk_setup_wm_latency(dev);
 
@@ -7390,19 +7714,17 @@ static void __intel_rps_boost_work(struct work_struct *work)
         struct drm_i915_gem_request *req = boost->req;
 
         if (!i915_gem_request_completed(req, true))
-                gen6_rps_boost(to_i915(req->engine->dev), NULL,
-                               req->emitted_jiffies);
+                gen6_rps_boost(req->i915, NULL, req->emitted_jiffies);
 
-        i915_gem_request_unreference__unlocked(req);
+        i915_gem_request_unreference(req);
         kfree(boost);
 }
 
-void intel_queue_rps_boost_for_request(struct drm_device *dev,
-                                       struct drm_i915_gem_request *req)
+void intel_queue_rps_boost_for_request(struct drm_i915_gem_request *req)
 {
         struct request_boost *boost;
 
-        if (req == NULL || INTEL_INFO(dev)->gen < 6)
+        if (req == NULL || INTEL_GEN(req->i915) < 6)
                 return;
 
         if (i915_gem_request_completed(req, true))
@@ -7416,7 +7738,7 @@ void intel_queue_rps_boost_for_request(struct drm_device *dev,
         boost->req = req;
 
         INIT_WORK(&boost->work, __intel_rps_boost_work);
-        queue_work(to_i915(dev)->wq, &boost->work);
+        queue_work(req->i915->wq, &boost->work);
 }
 
 void intel_pm_setup(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index a788d1e9589b..29a09bf6bd18 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -176,7 +176,6 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
         struct drm_i915_private *dev_priv = dev->dev_private;
         uint32_t aux_clock_divider;
         i915_reg_t aux_ctl_reg;
-        int precharge = 0x3;
         static const uint8_t aux_msg[] = {
                 [0] = DP_AUX_NATIVE_WRITE << 4,
                 [1] = DP_SET_POWER >> 8,
@@ -185,6 +184,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
                 [4] = DP_SET_POWER_D0,
         };
         enum port port = dig_port->port;
+        u32 aux_ctl;
         int i;
 
         BUILD_BUG_ON(sizeof(aux_msg) > 20);
@@ -197,6 +197,13 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
                                 DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF,
                                 DP_AUX_FRAME_SYNC_ENABLE);
 
+        if (dev_priv->psr.link_standby)
+                drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG,
+                                   DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);
+        else
+                drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG,
+                                   DP_PSR_ENABLE);
+
         aux_ctl_reg = psr_aux_ctl_reg(dev_priv, port);
 
         /* Setup AUX registers */
@@ -204,33 +211,9 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
                 I915_WRITE(psr_aux_data_reg(dev_priv, port, i >> 2),
                            intel_dp_pack_aux(&aux_msg[i], sizeof(aux_msg) - i));
 
-        if (INTEL_INFO(dev)->gen >= 9) {
-                uint32_t val;
-
-                val = I915_READ(aux_ctl_reg);
-                val &= ~DP_AUX_CH_CTL_TIME_OUT_MASK;
-                val |= DP_AUX_CH_CTL_TIME_OUT_1600us;
-                val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK;
-                val |= (sizeof(aux_msg) << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT);
-                /* Use hardcoded data values for PSR, frame sync and GTC */
-                val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL;
-                val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL;
-                val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL;
-                I915_WRITE(aux_ctl_reg, val);
-        } else {
-                I915_WRITE(aux_ctl_reg,
-                   DP_AUX_CH_CTL_TIME_OUT_400us |
-                   (sizeof(aux_msg) << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |
-                   (precharge << DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT) |
-                   (aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT));
-        }
-
-        if (dev_priv->psr.link_standby)
-                drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG,
-                                   DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);
-        else
-                drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG,
-                                   DP_PSR_ENABLE);
+        aux_ctl = intel_dp->get_aux_send_ctl(intel_dp, 0, sizeof(aux_msg),
+                                             aux_clock_divider);
+        I915_WRITE(aux_ctl_reg, aux_ctl);
 }
 
 static void vlv_psr_enable_source(struct intel_dp *intel_dp)
@@ -272,14 +255,14 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         uint32_t max_sleep_time = 0x1f;
-        /*
-         * Let's respect VBT in case VBT asks a higher idle_frame value.
-         * Let's use 6 as the minimum to cover all known cases including
-         * the off-by-one issue that HW has in some cases. Also there are
-         * cases where sink should be able to train
-         * with the 5 or 6 idle patterns.
+        /* Lately it was identified that depending on panel idle frame count
+         * calculated at HW can be off by 1. So let's use what came
+         * from VBT + 1.
+         * There are also other cases where panel demands at least 4
+         * but VBT is not being set. To cover these 2 cases lets use
+         * at least 5 when VBT isn't set to be on the safest side.
          */
-        uint32_t idle_frames = max(6, dev_priv->vbt.psr.idle_frames);
+        uint32_t idle_frames = dev_priv->vbt.psr.idle_frames + 1;
         uint32_t val = EDP_PSR_ENABLE;
 
         val |= max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 04402bb9d26b..fedd27049814 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -34,6 +34,11 @@
 #include "i915_trace.h"
 #include "intel_drv.h"
 
+/* Rough estimate of the typical request size, performing a flush,
+ * set-context and then emitting the batch.
+ */
+#define LEGACY_REQUEST_SIZE 200
+
 int __intel_ring_space(int head, int tail, int size)
 {
         int space = head - tail;
@@ -55,7 +60,7 @@ void intel_ring_update_space(struct intel_ringbuffer *ringbuf)
 
 bool intel_engine_stopped(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         return dev_priv->gpu_error.stop_rings & intel_engine_flag(engine);
 }
 
@@ -101,7 +106,6 @@ gen4_render_ring_flush(struct drm_i915_gem_request *req,
                        u32      flush_domains)
 {
         struct intel_engine_cs *engine = req->engine;
-        struct drm_device *dev = engine->dev;
         u32 cmd;
         int ret;
 
@@ -140,7 +144,7 @@ gen4_render_ring_flush(struct drm_i915_gem_request *req,
                 cmd |= MI_EXE_FLUSH;
 
         if (invalidate_domains & I915_GEM_DOMAIN_COMMAND &&
-            (IS_G4X(dev) || IS_GEN5(dev)))
+            (IS_G4X(req->i915) || IS_GEN5(req->i915)))
                 cmd |= MI_INVALIDATE_ISP;
 
         ret = intel_ring_begin(req, 2);
@@ -426,19 +430,19 @@ gen8_render_ring_flush(struct drm_i915_gem_request *req,
 static void ring_write_tail(struct intel_engine_cs *engine,
                             u32 value)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         I915_WRITE_TAIL(engine, value);
 }
 
 u64 intel_ring_get_active_head(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         u64 acthd;
 
-        if (INTEL_INFO(engine->dev)->gen >= 8)
+        if (INTEL_GEN(dev_priv) >= 8)
                 acthd = I915_READ64_2x32(RING_ACTHD(engine->mmio_base),
                                          RING_ACTHD_UDW(engine->mmio_base));
-        else if (INTEL_INFO(engine->dev)->gen >= 4)
+        else if (INTEL_GEN(dev_priv) >= 4)
                 acthd = I915_READ(RING_ACTHD(engine->mmio_base));
         else
                 acthd = I915_READ(ACTHD);
@@ -448,25 +452,24 @@ u64 intel_ring_get_active_head(struct intel_engine_cs *engine)
 
 static void ring_setup_phys_status_page(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         u32 addr;
 
         addr = dev_priv->status_page_dmah->busaddr;
-        if (INTEL_INFO(engine->dev)->gen >= 4)
+        if (INTEL_GEN(dev_priv) >= 4)
                 addr |= (dev_priv->status_page_dmah->busaddr >> 28) & 0xf0;
         I915_WRITE(HWS_PGA, addr);
 }
 
 static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         i915_reg_t mmio;
 
         /* The ring status page addresses are no longer next to the rest of
          * the ring registers as of gen7.
          */
-        if (IS_GEN7(dev)) {
+        if (IS_GEN7(dev_priv)) {
                 switch (engine->id) {
                 case RCS:
                         mmio = RENDER_HWS_PGA_GEN7;
@@ -486,7 +489,7 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
                         mmio = VEBOX_HWS_PGA_GEN7;
                         break;
                 }
-        } else if (IS_GEN6(engine->dev)) {
+        } else if (IS_GEN6(dev_priv)) {
                 mmio = RING_HWS_PGA_GEN6(engine->mmio_base);
         } else {
                 /* XXX: gen8 returns to sanity */
@@ -503,7 +506,7 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
          * arises: do we still need this and if so how should we go about
          * invalidating the TLB?
          */
-        if (INTEL_INFO(dev)->gen >= 6 && INTEL_INFO(dev)->gen < 8) {
+        if (IS_GEN(dev_priv, 6, 7)) {
                 i915_reg_t reg = RING_INSTPM(engine->mmio_base);
 
                 /* ring should be idle before issuing a sync flush*/
@@ -521,9 +524,9 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
 
 static bool stop_ring(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = to_i915(engine->dev);
+        struct drm_i915_private *dev_priv = engine->i915;
 
-        if (!IS_GEN2(engine->dev)) {
+        if (!IS_GEN2(dev_priv)) {
                 I915_WRITE_MODE(engine, _MASKED_BIT_ENABLE(STOP_RING));
                 if (wait_for((I915_READ_MODE(engine) & MODE_IDLE) != 0, 1000)) {
                         DRM_ERROR("%s : timed out trying to stop ring\n",
@@ -541,7 +544,7 @@ static bool stop_ring(struct intel_engine_cs *engine)
         I915_WRITE_HEAD(engine, 0);
         engine->write_tail(engine, 0);
 
-        if (!IS_GEN2(engine->dev)) {
+        if (!IS_GEN2(dev_priv)) {
                 (void)I915_READ_CTL(engine);
                 I915_WRITE_MODE(engine, _MASKED_BIT_DISABLE(STOP_RING));
         }
@@ -556,8 +559,7 @@ void intel_engine_init_hangcheck(struct intel_engine_cs *engine)
 
 static int init_ring_common(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         struct intel_ringbuffer *ringbuf = engine->buffer;
         struct drm_i915_gem_object *obj = ringbuf->obj;
         int ret = 0;
@@ -587,7 +589,7 @@ static int init_ring_common(struct intel_engine_cs *engine)
                 }
         }
 
-        if (I915_NEED_GFX_HWS(dev))
+        if (I915_NEED_GFX_HWS(dev_priv))
                 intel_ring_setup_status_page(engine);
         else
                 ring_setup_phys_status_page(engine);
@@ -644,12 +646,10 @@ out:
 void
 intel_fini_pipe_control(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-
         if (engine->scratch.obj == NULL)
                 return;
 
-        if (INTEL_INFO(dev)->gen >= 5) {
+        if (INTEL_GEN(engine->i915) >= 5) {
                 kunmap(sg_page(engine->scratch.obj->pages->sgl));
                 i915_gem_object_ggtt_unpin(engine->scratch.obj);
         }
@@ -665,10 +665,11 @@ intel_init_pipe_control(struct intel_engine_cs *engine)
 
         WARN_ON(engine->scratch.obj);
 
-        engine->scratch.obj = i915_gem_alloc_object(engine->dev, 4096);
-        if (engine->scratch.obj == NULL) {
+        engine->scratch.obj = i915_gem_object_create(engine->i915->dev, 4096);
+        if (IS_ERR(engine->scratch.obj)) {
                 DRM_ERROR("Failed to allocate seqno page\n");
-                ret = -ENOMEM;
+                ret = PTR_ERR(engine->scratch.obj);
+                engine->scratch.obj = NULL;
                 goto err;
         }
 
@@ -702,11 +703,9 @@ err:
 
 static int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
 {
-        int ret, i;
         struct intel_engine_cs *engine = req->engine;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct i915_workarounds *w = &dev_priv->workarounds;
+        struct i915_workarounds *w = &req->i915->workarounds;
+        int ret, i;
 
         if (w->count == 0)
                 return 0;
@@ -795,7 +794,7 @@ static int wa_add(struct drm_i915_private *dev_priv,
 static int wa_ring_whitelist_reg(struct intel_engine_cs *engine,
                                  i915_reg_t reg)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         struct i915_workarounds *wa = &dev_priv->workarounds;
         const uint32_t index = wa->hw_whitelist_count[engine->id];
 
@@ -811,8 +810,7 @@ static int wa_ring_whitelist_reg(struct intel_engine_cs *engine,
 
 static int gen8_init_workarounds(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING);
 
@@ -863,9 +861,8 @@ static int gen8_init_workarounds(struct intel_engine_cs *engine)
 
 static int bdw_init_workarounds(struct intel_engine_cs *engine)
 {
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
 
         ret = gen8_init_workarounds(engine);
         if (ret)
@@ -885,16 +882,15 @@ static int bdw_init_workarounds(struct intel_engine_cs *engine)
                           /* WaForceContextSaveRestoreNonCoherent:bdw */
                           HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |
                           /* WaDisableFenceDestinationToSLM:bdw (pre-prod) */
-                          (IS_BDW_GT3(dev) ? HDC_FENCE_DEST_SLM_DISABLE : 0));
+                          (IS_BDW_GT3(dev_priv) ? HDC_FENCE_DEST_SLM_DISABLE : 0));
 
         return 0;
 }
 
 static int chv_init_workarounds(struct intel_engine_cs *engine)
 {
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
 
         ret = gen8_init_workarounds(engine);
         if (ret)
@@ -911,38 +907,39 @@ static int chv_init_workarounds(struct intel_engine_cs *engine)
 
 static int gen9_init_workarounds(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        uint32_t tmp;
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
 
-        /* WaEnableLbsSlaRetryTimerDecrement:skl */
+        /* WaConextSwitchWithConcurrentTLBInvalidate:skl,bxt,kbl */
+        I915_WRITE(GEN9_CSFE_CHICKEN1_RCS, _MASKED_BIT_ENABLE(GEN9_PREEMPT_GPGPU_SYNC_SWITCH_DISABLE));
+
+        /* WaEnableLbsSlaRetryTimerDecrement:skl,bxt,kbl */
         I915_WRITE(BDW_SCRATCH1, I915_READ(BDW_SCRATCH1) |
                    GEN9_LBS_SLA_RETRY_TIMER_DECREMENT_ENABLE);
 
-        /* WaDisableKillLogic:bxt,skl */
+        /* WaDisableKillLogic:bxt,skl,kbl */
         I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
                    ECOCHK_DIS_TLB);
 
-        /* WaClearFlowControlGpgpuContextSave:skl,bxt */
-        /* WaDisablePartialInstShootdown:skl,bxt */
+        /* WaClearFlowControlGpgpuContextSave:skl,bxt,kbl */
+        /* WaDisablePartialInstShootdown:skl,bxt,kbl */
         WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
                           FLOW_CONTROL_ENABLE |
                           PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
-        /* Syncing dependencies between camera and graphics:skl,bxt */
+        /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
         WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
                           GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
 
         /* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
+            IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
                 WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
                                   GEN9_DG_MIRROR_FIX_ENABLE);
 
         /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
+            IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
                 WA_SET_BIT_MASKED(GEN7_COMMON_SLICE_CHICKEN1,
                                   GEN9_RHWO_OPTIMIZATION_DISABLE);
                 /*
@@ -952,52 +949,78 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
                  */
         }
 
-        /* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt */
-        /* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt */
+        /* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl */
+        /* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl */
         WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
                           GEN9_ENABLE_YV12_BUGFIX |
                           GEN9_ENABLE_GPGPU_PREEMPTION);
 
-        /* Wa4x4STCOptimizationDisable:skl,bxt */
-        /* WaDisablePartialResolveInVc:skl,bxt */
+        /* Wa4x4STCOptimizationDisable:skl,bxt,kbl */
+        /* WaDisablePartialResolveInVc:skl,bxt,kbl */
         WA_SET_BIT_MASKED(CACHE_MODE_1, (GEN8_4x4_STC_OPTIMIZATION_DISABLE |
                                          GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE));
 
-        /* WaCcsTlbPrefetchDisable:skl,bxt */
+        /* WaCcsTlbPrefetchDisable:skl,bxt,kbl */
         WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
                           GEN9_CCS_TLB_PREFETCH_ENABLE);
 
         /* WaDisableMaskBasedCammingInRCC:skl,bxt */
-        if (IS_SKL_REVID(dev, SKL_REVID_C0, SKL_REVID_C0) ||
-            IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+        if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, SKL_REVID_C0) ||
+            IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
                 WA_SET_BIT_MASKED(SLICE_ECO_CHICKEN0,
                                   PIXEL_MASK_CAMMING_DISABLE);
 
-        /* WaForceContextSaveRestoreNonCoherent:skl,bxt */
-        tmp = HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT;
-        if (IS_SKL_REVID(dev, SKL_REVID_F0, REVID_FOREVER) ||
-            IS_BXT_REVID(dev, BXT_REVID_B0, REVID_FOREVER))
-                tmp |= HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE;
-        WA_SET_BIT_MASKED(HDC_CHICKEN0, tmp);
+        /* WaForceContextSaveRestoreNonCoherent:skl,bxt,kbl */
+        WA_SET_BIT_MASKED(HDC_CHICKEN0,
+                          HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |
+                          HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE);
+
+        /* WaForceEnableNonCoherent and WaDisableHDCInvalidation are
+         * both tied to WaForceContextSaveRestoreNonCoherent
+         * in some hsds for skl. We keep the tie for all gen9. The
+         * documentation is a bit hazy and so we want to get common behaviour,
+         * even though there is no clear evidence we would need both on kbl/bxt.
+         * This area has been source of system hangs so we play it safe
+         * and mimic the skl regardless of what bspec says.
+         *
+         * Use Force Non-Coherent whenever executing a 3D context. This
+         * is a workaround for a possible hang in the unlikely event
+         * a TLB invalidation occurs during a PSD flush.
+         */
+
+        /* WaForceEnableNonCoherent:skl,bxt,kbl */
+        WA_SET_BIT_MASKED(HDC_CHICKEN0,
+                          HDC_FORCE_NON_COHERENT);
 
-        /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt */
-        if (IS_SKYLAKE(dev) || IS_BXT_REVID(dev, 0, BXT_REVID_B0))
+        /* WaDisableHDCInvalidation:skl,bxt,kbl */
+        I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+                   BDW_DISABLE_HDC_INVALIDATION);
+
+        /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl */
+        if (IS_SKYLAKE(dev_priv) ||
+            IS_KABYLAKE(dev_priv) ||
+            IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
                 WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
                                   GEN8_SAMPLER_POWER_BYPASS_DIS);
 
-        /* WaDisableSTUnitPowerOptimization:skl,bxt */
+        /* WaDisableSTUnitPowerOptimization:skl,bxt,kbl */
         WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN2, GEN8_ST_PO_DISABLE);
 
-        /* WaOCLCoherentLineFlush:skl,bxt */
+        /* WaOCLCoherentLineFlush:skl,bxt,kbl */
         I915_WRITE(GEN8_L3SQCREG4, (I915_READ(GEN8_L3SQCREG4) |
                                     GEN8_LQSC_FLUSH_COHERENT_LINES));
 
-        /* WaEnablePreemptionGranularityControlByUMD:skl,bxt */
+        /* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt */
+        ret = wa_ring_whitelist_reg(engine, GEN9_CTX_PREEMPT_REG);
+        if (ret)
+                return ret;
+
+        /* WaEnablePreemptionGranularityControlByUMD:skl,bxt,kbl */
         ret= wa_ring_whitelist_reg(engine, GEN8_CS_CHICKEN1);
         if (ret)
                 return ret;
 
-        /* WaAllowUMDToModifyHDCChicken1:skl,bxt */
+        /* WaAllowUMDToModifyHDCChicken1:skl,bxt,kbl */
         ret = wa_ring_whitelist_reg(engine, GEN8_HDC_CHICKEN1);
         if (ret)
                 return ret;
@@ -1007,8 +1030,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
 
 static int skl_tune_iz_hashing(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         u8 vals[3] = { 0, 0, 0 };
         unsigned int i;
 
@@ -1049,9 +1071,8 @@ static int skl_tune_iz_hashing(struct intel_engine_cs *engine)
 
 static int skl_init_workarounds(struct intel_engine_cs *engine)
 {
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
 
         ret = gen9_init_workarounds(engine);
         if (ret)
@@ -1062,12 +1083,12 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
          * until D0 which is the default case so this is equivalent to
          * !WaDisablePerCtxtPreemptionGranularityControl:skl
          */
-        if (IS_SKL_REVID(dev, SKL_REVID_E0, REVID_FOREVER)) {
+        if (IS_SKL_REVID(dev_priv, SKL_REVID_E0, REVID_FOREVER)) {
                 I915_WRITE(GEN7_FF_SLICE_CS_CHICKEN1,
                            _MASKED_BIT_ENABLE(GEN9_FFSC_PERCTX_PREEMPT_CTRL));
         }
 
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_D0)) {
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0)) {
                 /* WaDisableChickenBitTSGBarrierAckForFFSliceCS:skl */
                 I915_WRITE(FF_SLICE_CS_CHICKEN2,
                            _MASKED_BIT_ENABLE(GEN9_TSG_BARRIER_ACK_DISABLE));
@@ -1076,50 +1097,37 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
         /* GEN8_L3SQCREG4 has a dependency with WA batch so any new changes
          * involving this register should also be added to WA batch as required.
          */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_E0))
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0))
                 /* WaDisableLSQCROPERFforOCL:skl */
                 I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) |
                            GEN8_LQSC_RO_PERF_DIS);
 
         /* WaEnableGapsTsvCreditFix:skl */
-        if (IS_SKL_REVID(dev, SKL_REVID_C0, REVID_FOREVER)) {
+        if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, REVID_FOREVER)) {
                 I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
                                            GEN9_GAPS_TSV_CREDIT_DISABLE));
         }
 
         /* WaDisablePowerCompilerClockGating:skl */
-        if (IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_B0))
+        if (IS_SKL_REVID(dev_priv, SKL_REVID_B0, SKL_REVID_B0))
                 WA_SET_BIT_MASKED(HIZ_CHICKEN,
                                   BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
 
-        /* This is tied to WaForceContextSaveRestoreNonCoherent */
-        if (IS_SKL_REVID(dev, 0, REVID_FOREVER)) {
-                /*
-                 *Use Force Non-Coherent whenever executing a 3D context. This
-                 * is a workaround for a possible hang in the unlikely event
-                 * a TLB invalidation occurs during a PSD flush.
-                 */
-                /* WaForceEnableNonCoherent:skl */
-                WA_SET_BIT_MASKED(HDC_CHICKEN0,
-                                  HDC_FORCE_NON_COHERENT);
-
-                /* WaDisableHDCInvalidation:skl */
-                I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
-                           BDW_DISABLE_HDC_INVALIDATION);
-        }
-
         /* WaBarrierPerformanceFixDisable:skl */
-        if (IS_SKL_REVID(dev, SKL_REVID_C0, SKL_REVID_D0))
+        if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, SKL_REVID_D0))
                 WA_SET_BIT_MASKED(HDC_CHICKEN0,
                                   HDC_FENCE_DEST_SLM_DISABLE |
                                   HDC_BARRIER_PERFORMANCE_DISABLE);
 
         /* WaDisableSbeCacheDispatchPortSharing:skl */
-        if (IS_SKL_REVID(dev, 0, SKL_REVID_F0))
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_F0))
                 WA_SET_BIT_MASKED(
                         GEN7_HALF_SLICE_CHICKEN1,
                         GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
 
+        /* WaDisableGafsUnitClkGating:skl */
+        WA_SET_BIT(GEN7_UCGCTL4, GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);
+
         /* WaDisableLSQCROPERFforOCL:skl */
         ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
         if (ret)
@@ -1130,9 +1138,8 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
 
 static int bxt_init_workarounds(struct intel_engine_cs *engine)
 {
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
 
         ret = gen9_init_workarounds(engine);
         if (ret)
@@ -1140,11 +1147,11 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
 
         /* WaStoreMultiplePTEenable:bxt */
         /* This is a requirement according to Hardware specification */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
                 I915_WRITE(TILECTL, I915_READ(TILECTL) | TILECTL_TLBPF);
 
         /* WaSetClckGatingDisableMedia:bxt */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
                 I915_WRITE(GEN7_MISCCPCTL, (I915_READ(GEN7_MISCCPCTL) &
                                             ~GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE));
         }
@@ -1153,8 +1160,14 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
         WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
                           STALL_DOP_GATING_DISABLE);
 
+        /* WaDisablePooledEuLoadBalancingFix:bxt */
+        if (IS_BXT_REVID(dev_priv, BXT_REVID_B0, REVID_FOREVER)) {
+                WA_SET_BIT_MASKED(FF_SLICE_CS_CHICKEN2,
+                                  GEN9_POOLED_EU_LOAD_BALANCING_FIX_DISABLE);
+        }
+
         /* WaDisableSbeCacheDispatchPortSharing:bxt */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_B0)) {
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0)) {
                 WA_SET_BIT_MASKED(
                         GEN7_HALF_SLICE_CHICKEN1,
                         GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
@@ -1164,7 +1177,7 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
         /* WaDisableObjectLevelPreemptionForInstancedDraw:bxt */
         /* WaDisableObjectLevelPreemtionForInstanceId:bxt */
         /* WaDisableLSQCROPERFforOCL:bxt */
-        if (IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
                 ret = wa_ring_whitelist_reg(engine, GEN9_CS_DEBUG_MODE1);
                 if (ret)
                         return ret;
@@ -1174,44 +1187,107 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
                         return ret;
         }
 
+        /* WaProgramL3SqcReg1DefaultForPerf:bxt */
+        if (IS_BXT_REVID(dev_priv, BXT_REVID_B0, REVID_FOREVER))
+                I915_WRITE(GEN8_L3SQCREG1, L3_GENERAL_PRIO_CREDITS(62) |
+                                           L3_HIGH_PRIO_CREDITS(2));
+
+        /* WaInsertDummyPushConstPs:bxt */
+        if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
+                WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
+                                  GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
+
+        return 0;
+}
+
+static int kbl_init_workarounds(struct intel_engine_cs *engine)
+{
+        struct drm_i915_private *dev_priv = engine->i915;
+        int ret;
+
+        ret = gen9_init_workarounds(engine);
+        if (ret)
+                return ret;
+
+        /* WaEnableGapsTsvCreditFix:kbl */
+        I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
+                                   GEN9_GAPS_TSV_CREDIT_DISABLE));
+
+        /* WaDisableDynamicCreditSharing:kbl */
+        if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
+                WA_SET_BIT(GAMT_CHKN_BIT_REG,
+                           GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING);
+
+        /* WaDisableFenceDestinationToSLM:kbl (pre-prod) */
+        if (IS_KBL_REVID(dev_priv, KBL_REVID_A0, KBL_REVID_A0))
+                WA_SET_BIT_MASKED(HDC_CHICKEN0,
+                                  HDC_FENCE_DEST_SLM_DISABLE);
+
+        /* GEN8_L3SQCREG4 has a dependency with WA batch so any new changes
+         * involving this register should also be added to WA batch as required.
+         */
+        if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
+                /* WaDisableLSQCROPERFforOCL:kbl */
+                I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) |
+                           GEN8_LQSC_RO_PERF_DIS);
+
+        /* WaInsertDummyPushConstPs:kbl */
+        if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
+                WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
+                                  GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
+
+        /* WaDisableGafsUnitClkGating:kbl */
+        WA_SET_BIT(GEN7_UCGCTL4, GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);
+
+        /* WaDisableSbeCacheDispatchPortSharing:kbl */
+        WA_SET_BIT_MASKED(
+                GEN7_HALF_SLICE_CHICKEN1,
+                GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
+
+        /* WaDisableLSQCROPERFforOCL:kbl */
+        ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
+        if (ret)
+                return ret;
+
         return 0;
 }
 
 int init_workarounds_ring(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         WARN_ON(engine->id != RCS);
 
         dev_priv->workarounds.count = 0;
         dev_priv->workarounds.hw_whitelist_count[RCS] = 0;
 
-        if (IS_BROADWELL(dev))
+        if (IS_BROADWELL(dev_priv))
                 return bdw_init_workarounds(engine);
 
-        if (IS_CHERRYVIEW(dev))
+        if (IS_CHERRYVIEW(dev_priv))
                 return chv_init_workarounds(engine);
 
-        if (IS_SKYLAKE(dev))
+        if (IS_SKYLAKE(dev_priv))
                 return skl_init_workarounds(engine);
 
-        if (IS_BROXTON(dev))
+        if (IS_BROXTON(dev_priv))
                 return bxt_init_workarounds(engine);
 
+        if (IS_KABYLAKE(dev_priv))
+                return kbl_init_workarounds(engine);
+
         return 0;
 }
 
 static int init_render_ring(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret = init_ring_common(engine);
         if (ret)
                 return ret;
 
         /* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */
-        if (INTEL_INFO(dev)->gen >= 4 && INTEL_INFO(dev)->gen < 7)
+        if (IS_GEN(dev_priv, 4, 6))
                 I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH));
 
         /* We need to disable the AsyncFlip performance optimisations in order
@@ -1220,22 +1296,22 @@ static int init_render_ring(struct intel_engine_cs *engine)
          *
          * WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv
          */
-        if (INTEL_INFO(dev)->gen >= 6 && INTEL_INFO(dev)->gen < 8)
+        if (IS_GEN(dev_priv, 6, 7))
                 I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
 
         /* Required for the hardware to program scanline values for waiting */
         /* WaEnableFlushTlbInvalidationMode:snb */
-        if (INTEL_INFO(dev)->gen == 6)
+        if (IS_GEN6(dev_priv))
                 I915_WRITE(GFX_MODE,
                            _MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_EXPLICIT));
 
         /* WaBCSVCSTlbInvalidationMode:ivb,vlv,hsw */
-        if (IS_GEN7(dev))
+        if (IS_GEN7(dev_priv))
                 I915_WRITE(GFX_MODE_GEN7,
                            _MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_EXPLICIT) |
                            _MASKED_BIT_ENABLE(GFX_REPLAY_MODE));
 
-        if (IS_GEN6(dev)) {
+        if (IS_GEN6(dev_priv)) {
                 /* From the Sandybridge PRM, volume 1 part 3, page 24:
                  * "If this bit is set, STCunit will have LRA as replacement
                  *  policy. [...] This bit must be reset.  LRA replacement
@@ -1245,19 +1321,18 @@ static int init_render_ring(struct intel_engine_cs *engine)
                            _MASKED_BIT_DISABLE(CM0_STC_EVICT_DISABLE_LRA_SNB));
         }
 
-        if (INTEL_INFO(dev)->gen >= 6 && INTEL_INFO(dev)->gen < 8)
+        if (IS_GEN(dev_priv, 6, 7))
                 I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
 
-        if (HAS_L3_DPF(dev))
-                I915_WRITE_IMR(engine, ~GT_PARITY_ERROR(dev));
+        if (HAS_L3_DPF(dev_priv))
+                I915_WRITE_IMR(engine, ~GT_PARITY_ERROR(dev_priv));
 
         return init_workarounds_ring(engine);
 }
 
 static void render_ring_cleanup(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         if (dev_priv->semaphore_obj) {
                 i915_gem_object_ggtt_unpin(dev_priv->semaphore_obj);
@@ -1273,13 +1348,12 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *signaller_req,
 {
 #define MBOX_UPDATE_DWORDS 8
         struct intel_engine_cs *signaller = signaller_req->engine;
-        struct drm_device *dev = signaller->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = signaller_req->i915;
         struct intel_engine_cs *waiter;
         enum intel_engine_id id;
         int ret, num_rings;
 
-        num_rings = hweight32(INTEL_INFO(dev)->ring_mask);
+        num_rings = hweight32(INTEL_INFO(dev_priv)->ring_mask);
         num_dwords += (num_rings-1) * MBOX_UPDATE_DWORDS;
 #undef MBOX_UPDATE_DWORDS
 
@@ -1297,7 +1371,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *signaller_req,
                 intel_ring_emit(signaller, GFX_OP_PIPE_CONTROL(6));
                 intel_ring_emit(signaller, PIPE_CONTROL_GLOBAL_GTT_IVB |
                                            PIPE_CONTROL_QW_WRITE |
-                                           PIPE_CONTROL_FLUSH_ENABLE);
+                                           PIPE_CONTROL_CS_STALL);
                 intel_ring_emit(signaller, lower_32_bits(gtt_offset));
                 intel_ring_emit(signaller, upper_32_bits(gtt_offset));
                 intel_ring_emit(signaller, seqno);
@@ -1315,13 +1389,12 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *signaller_req,
 {
 #define MBOX_UPDATE_DWORDS 6
         struct intel_engine_cs *signaller = signaller_req->engine;
-        struct drm_device *dev = signaller->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = signaller_req->i915;
         struct intel_engine_cs *waiter;
         enum intel_engine_id id;
         int ret, num_rings;
 
-        num_rings = hweight32(INTEL_INFO(dev)->ring_mask);
+        num_rings = hweight32(INTEL_INFO(dev_priv)->ring_mask);
         num_dwords += (num_rings-1) * MBOX_UPDATE_DWORDS;
 #undef MBOX_UPDATE_DWORDS
 
@@ -1354,14 +1427,13 @@ static int gen6_signal(struct drm_i915_gem_request *signaller_req,
                        unsigned int num_dwords)
 {
         struct intel_engine_cs *signaller = signaller_req->engine;
-        struct drm_device *dev = signaller->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = signaller_req->i915;
         struct intel_engine_cs *useless;
         enum intel_engine_id id;
         int ret, num_rings;
 
 #define MBOX_UPDATE_DWORDS 3
-        num_rings = hweight32(INTEL_INFO(dev)->ring_mask);
+        num_rings = hweight32(INTEL_INFO(dev_priv)->ring_mask);
         num_dwords += round_up((num_rings-1) * MBOX_UPDATE_DWORDS, 2);
 #undef MBOX_UPDATE_DWORDS
 
@@ -1420,10 +1492,38 @@ gen6_add_request(struct drm_i915_gem_request *req)
         return 0;
 }
 
-static inline bool i915_gem_has_seqno_wrapped(struct drm_device *dev,
+static int
+gen8_render_add_request(struct drm_i915_gem_request *req)
+{
+        struct intel_engine_cs *engine = req->engine;
+        int ret;
+
+        if (engine->semaphore.signal)
+                ret = engine->semaphore.signal(req, 8);
+        else
+                ret = intel_ring_begin(req, 8);
+        if (ret)
+                return ret;
+
+        intel_ring_emit(engine, GFX_OP_PIPE_CONTROL(6));
+        intel_ring_emit(engine, (PIPE_CONTROL_GLOBAL_GTT_IVB |
+                                 PIPE_CONTROL_CS_STALL |
+                                 PIPE_CONTROL_QW_WRITE));
+        intel_ring_emit(engine, intel_hws_seqno_address(req->engine));
+        intel_ring_emit(engine, 0);
+        intel_ring_emit(engine, i915_gem_request_get_seqno(req));
+        /* We're thrashing one dword of HWS. */
+        intel_ring_emit(engine, 0);
+        intel_ring_emit(engine, MI_USER_INTERRUPT);
+        intel_ring_emit(engine, MI_NOOP);
+        __intel_ring_advance(engine);
+
+        return 0;
+}
+
+static inline bool i915_gem_has_seqno_wrapped(struct drm_i915_private *dev_priv,
                                               u32 seqno)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         return dev_priv->last_seqno < seqno;
 }
 
@@ -1441,7 +1541,8 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req,
                u32 seqno)
 {
         struct intel_engine_cs *waiter = waiter_req->engine;
-        struct drm_i915_private *dev_priv = waiter->dev->dev_private;
+        struct drm_i915_private *dev_priv = waiter_req->i915;
+        struct i915_hw_ppgtt *ppgtt;
         int ret;
 
         ret = intel_ring_begin(waiter_req, 4);
@@ -1450,7 +1551,6 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req,
 
         intel_ring_emit(waiter, MI_SEMAPHORE_WAIT |
                                 MI_SEMAPHORE_GLOBAL_GTT |
-                                MI_SEMAPHORE_POLL |
                                 MI_SEMAPHORE_SAD_GTE_SDD);
         intel_ring_emit(waiter, seqno);
         intel_ring_emit(waiter,
@@ -1458,6 +1558,15 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req,
         intel_ring_emit(waiter,
                         upper_32_bits(GEN8_WAIT_OFFSET(waiter, signaller->id)));
         intel_ring_advance(waiter);
+
+        /* When the !RCS engines idle waiting upon a semaphore, they lose their
+         * pagetables and we must reload them before executing the batch.
+         * We do this on the i915_switch_context() following the wait and
+         * before the dispatch.
+         */
+        ppgtt = waiter_req->ctx->ppgtt;
+        if (ppgtt && waiter_req->engine->id != RCS)
+                ppgtt->pd_dirty_rings |= intel_engine_flag(waiter_req->engine);
         return 0;
 }
 
@@ -1486,7 +1595,7 @@ gen6_ring_sync(struct drm_i915_gem_request *waiter_req,
                 return ret;
 
         /* If seqno wrap happened, omit the wait with no-ops */
-        if (likely(!i915_gem_has_seqno_wrapped(waiter->dev, seqno))) {
+        if (likely(!i915_gem_has_seqno_wrapped(waiter_req->i915, seqno))) {
                 intel_ring_emit(waiter, dw1 | wait_mbox);
                 intel_ring_emit(waiter, seqno);
                 intel_ring_emit(waiter, 0);
@@ -1567,7 +1676,7 @@ pc_render_add_request(struct drm_i915_gem_request *req)
 static void
 gen6_seqno_barrier(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         /* Workaround to force correct ordering between irq and seqno writes on
          * ivb (and maybe also on snb) by reading from a CS register (like
@@ -1616,8 +1725,7 @@ pc_render_set_seqno(struct intel_engine_cs *engine, u32 seqno)
 static bool
 gen5_ring_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (WARN_ON(!intel_irqs_enabled(dev_priv)))
@@ -1634,8 +1742,7 @@ gen5_ring_get_irq(struct intel_engine_cs *engine)
 static void
 gen5_ring_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -1647,8 +1754,7 @@ gen5_ring_put_irq(struct intel_engine_cs *engine)
 static bool
 i9xx_ring_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (!intel_irqs_enabled(dev_priv))
@@ -1668,8 +1774,7 @@ i9xx_ring_get_irq(struct intel_engine_cs *engine)
 static void
 i9xx_ring_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -1684,8 +1789,7 @@ i9xx_ring_put_irq(struct intel_engine_cs *engine)
 static bool
 i8xx_ring_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (!intel_irqs_enabled(dev_priv))
@@ -1705,8 +1809,7 @@ i8xx_ring_get_irq(struct intel_engine_cs *engine)
 static void
 i8xx_ring_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -1759,8 +1862,7 @@ i9xx_add_request(struct drm_i915_gem_request *req)
 static bool
 gen6_ring_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (WARN_ON(!intel_irqs_enabled(dev_priv)))
@@ -1768,10 +1870,10 @@ gen6_ring_get_irq(struct intel_engine_cs *engine)
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
         if (engine->irq_refcount++ == 0) {
-                if (HAS_L3_DPF(dev) && engine->id == RCS)
+                if (HAS_L3_DPF(dev_priv) && engine->id == RCS)
                         I915_WRITE_IMR(engine,
                                        ~(engine->irq_enable_mask |
-                                         GT_PARITY_ERROR(dev)));
+                                         GT_PARITY_ERROR(dev_priv)));
                 else
                         I915_WRITE_IMR(engine, ~engine->irq_enable_mask);
                 gen5_enable_gt_irq(dev_priv, engine->irq_enable_mask);
@@ -1784,14 +1886,13 @@ gen6_ring_get_irq(struct intel_engine_cs *engine)
 static void
 gen6_ring_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
         if (--engine->irq_refcount == 0) {
-                if (HAS_L3_DPF(dev) && engine->id == RCS)
-                        I915_WRITE_IMR(engine, ~GT_PARITY_ERROR(dev));
+                if (HAS_L3_DPF(dev_priv) && engine->id == RCS)
+                        I915_WRITE_IMR(engine, ~GT_PARITY_ERROR(dev_priv));
                 else
                         I915_WRITE_IMR(engine, ~0);
                 gen5_disable_gt_irq(dev_priv, engine->irq_enable_mask);
@@ -1802,8 +1903,7 @@ gen6_ring_put_irq(struct intel_engine_cs *engine)
 static bool
 hsw_vebox_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (WARN_ON(!intel_irqs_enabled(dev_priv)))
@@ -1822,8 +1922,7 @@ hsw_vebox_get_irq(struct intel_engine_cs *engine)
 static void
 hsw_vebox_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -1837,8 +1936,7 @@ hsw_vebox_put_irq(struct intel_engine_cs *engine)
 static bool
 gen8_ring_get_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         if (WARN_ON(!intel_irqs_enabled(dev_priv)))
@@ -1846,7 +1944,7 @@ gen8_ring_get_irq(struct intel_engine_cs *engine)
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
         if (engine->irq_refcount++ == 0) {
-                if (HAS_L3_DPF(dev) && engine->id == RCS) {
+                if (HAS_L3_DPF(dev_priv) && engine->id == RCS) {
                         I915_WRITE_IMR(engine,
                                        ~(engine->irq_enable_mask |
                                          GT_RENDER_L3_PARITY_ERROR_INTERRUPT));
@@ -1863,13 +1961,12 @@ gen8_ring_get_irq(struct intel_engine_cs *engine)
 static void
 gen8_ring_put_irq(struct intel_engine_cs *engine)
 {
-        struct drm_device *dev = engine->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
         unsigned long flags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, flags);
         if (--engine->irq_refcount == 0) {
-                if (HAS_L3_DPF(dev) && engine->id == RCS) {
+                if (HAS_L3_DPF(dev_priv) && engine->id == RCS) {
                         I915_WRITE_IMR(engine,
                                        ~GT_RENDER_L3_PARITY_ERROR_INTERRUPT);
                 } else {
@@ -1991,12 +2088,12 @@ i915_dispatch_execbuffer(struct drm_i915_gem_request *req,
 
 static void cleanup_phys_status_page(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = to_i915(engine->dev);
+        struct drm_i915_private *dev_priv = engine->i915;
 
         if (!dev_priv->status_page_dmah)
                 return;
 
-        drm_pci_free(engine->dev, dev_priv->status_page_dmah);
+        drm_pci_free(dev_priv->dev, dev_priv->status_page_dmah);
         engine->status_page.page_addr = NULL;
 }
 
@@ -2022,10 +2119,10 @@ static int init_status_page(struct intel_engine_cs *engine)
                 unsigned flags;
                 int ret;
 
-                obj = i915_gem_alloc_object(engine->dev, 4096);
-                if (obj == NULL) {
+                obj = i915_gem_object_create(engine->i915->dev, 4096);
+                if (IS_ERR(obj)) {
                         DRM_ERROR("Failed to allocate status page\n");
-                        return -ENOMEM;
+                        return PTR_ERR(obj);
                 }
 
                 ret = i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
@@ -2033,7 +2130,7 @@ static int init_status_page(struct intel_engine_cs *engine)
                         goto err_unref;
 
                 flags = 0;
-                if (!HAS_LLC(engine->dev))
+                if (!HAS_LLC(engine->i915))
                         /* On g33, we cannot place HWS above 256MiB, so
                          * restrict its pinning to the low mappable arena.
                          * Though this restriction is not documented for
@@ -2067,11 +2164,11 @@ err_unref:
 
 static int init_phys_status_page(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         if (!dev_priv->status_page_dmah) {
                 dev_priv->status_page_dmah =
-                        drm_pci_alloc(engine->dev, PAGE_SIZE, PAGE_SIZE);
+                        drm_pci_alloc(dev_priv->dev, PAGE_SIZE, PAGE_SIZE);
                 if (!dev_priv->status_page_dmah)
                         return -ENOMEM;
         }
@@ -2084,20 +2181,22 @@ static int init_phys_status_page(struct intel_engine_cs *engine)
 
 void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
 {
+        GEM_BUG_ON(ringbuf->vma == NULL);
+        GEM_BUG_ON(ringbuf->virtual_start == NULL);
+
         if (HAS_LLC(ringbuf->obj->base.dev) && !ringbuf->obj->stolen)
                 i915_gem_object_unpin_map(ringbuf->obj);
         else
-                iounmap(ringbuf->virtual_start);
+                i915_vma_unpin_iomap(ringbuf->vma);
         ringbuf->virtual_start = NULL;
-        ringbuf->vma = NULL;
+
         i915_gem_object_ggtt_unpin(ringbuf->obj);
+        ringbuf->vma = NULL;
 }
 
-int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,
+int intel_pin_and_map_ringbuffer_obj(struct drm_i915_private *dev_priv,
                                      struct intel_ringbuffer *ringbuf)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
         struct drm_i915_gem_object *obj = ringbuf->obj;
         /* Ring wraparound at offset 0 sometimes hangs. No idea why. */
         unsigned flags = PIN_OFFSET_BIAS | 4096;
@@ -2131,10 +2230,9 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,
                 /* Access through the GTT requires the device to be awake. */
                 assert_rpm_wakelock_held(dev_priv);
 
-                addr = ioremap_wc(ggtt->mappable_base +
-                                  i915_gem_obj_ggtt_offset(obj), ringbuf->size);
-                if (addr == NULL) {
-                        ret = -ENOMEM;
+                addr = i915_vma_pin_iomap(i915_gem_obj_to_ggtt(obj));
+                if (IS_ERR(addr)) {
+                        ret = PTR_ERR(addr);
                         goto err_unpin;
                 }
         }
@@ -2163,9 +2261,9 @@ static int intel_alloc_ringbuffer_obj(struct drm_device *dev,
         if (!HAS_LLC(dev))
                 obj = i915_gem_object_create_stolen(dev, ringbuf->size);
         if (obj == NULL)
-                obj = i915_gem_alloc_object(dev, ringbuf->size);
-        if (obj == NULL)
-                return -ENOMEM;
+                obj = i915_gem_object_create(dev, ringbuf->size);
+        if (IS_ERR(obj))
+                return PTR_ERR(obj);
 
         /* mark ring buffers as read-only from GPU side by default */
         obj->gt_ro = 1;
@@ -2197,13 +2295,13 @@ intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size)
          * of the buffer.
          */
         ring->effective_size = size;
-        if (IS_I830(engine->dev) || IS_845G(engine->dev))
+        if (IS_I830(engine->i915) || IS_845G(engine->i915))
                 ring->effective_size -= 2 * CACHELINE_BYTES;
 
         ring->last_retired_head = -1;
         intel_ring_update_space(ring);
 
-        ret = intel_alloc_ringbuffer_obj(engine->dev, ring);
+        ret = intel_alloc_ringbuffer_obj(engine->i915->dev, ring);
         if (ret) {
                 DRM_DEBUG_DRIVER("Failed to allocate ringbuffer %s: %d\n",
                                  engine->name, ret);
@@ -2226,12 +2324,13 @@ intel_ringbuffer_free(struct intel_ringbuffer *ring)
 static int intel_init_ring_buffer(struct drm_device *dev,
                                   struct intel_engine_cs *engine)
 {
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_ringbuffer *ringbuf;
         int ret;
 
         WARN_ON(engine->buffer);
 
-        engine->dev = dev;
+        engine->i915 = dev_priv;
         INIT_LIST_HEAD(&engine->active_list);
         INIT_LIST_HEAD(&engine->request_list);
         INIT_LIST_HEAD(&engine->execlist_queue);
@@ -2249,7 +2348,7 @@ static int intel_init_ring_buffer(struct drm_device *dev,
         }
         engine->buffer = ringbuf;
 
-        if (I915_NEED_GFX_HWS(dev)) {
+        if (I915_NEED_GFX_HWS(dev_priv)) {
                 ret = init_status_page(engine);
                 if (ret)
                         goto error;
@@ -2260,7 +2359,7 @@ static int intel_init_ring_buffer(struct drm_device *dev,
                         goto error;
         }
 
-        ret = intel_pin_and_map_ringbuffer_obj(dev, ringbuf);
+        ret = intel_pin_and_map_ringbuffer_obj(dev_priv, ringbuf);
         if (ret) {
                 DRM_ERROR("Failed to pin and map ringbuffer %s: %d\n",
                                 engine->name, ret);
@@ -2286,11 +2385,11 @@ void intel_cleanup_engine(struct intel_engine_cs *engine)
         if (!intel_engine_initialized(engine))
                 return;
 
-        dev_priv = to_i915(engine->dev);
+        dev_priv = engine->i915;
 
         if (engine->buffer) {
                 intel_stop_engine(engine);
-                WARN_ON(!IS_GEN2(engine->dev) && (I915_READ_MODE(engine) & MODE_IDLE) == 0);
+                WARN_ON(!IS_GEN2(dev_priv) && (I915_READ_MODE(engine) & MODE_IDLE) == 0);
 
                 intel_unpin_ringbuffer_obj(engine->buffer);
                 intel_ringbuffer_free(engine->buffer);
@@ -2300,7 +2399,7 @@ void intel_cleanup_engine(struct intel_engine_cs *engine)
         if (engine->cleanup)
                 engine->cleanup(engine);
 
-        if (I915_NEED_GFX_HWS(engine->dev)) {
+        if (I915_NEED_GFX_HWS(dev_priv)) {
                 cleanup_status_page(engine);
         } else {
                 WARN_ON(engine->id != RCS);
@@ -2309,7 +2408,7 @@ void intel_cleanup_engine(struct intel_engine_cs *engine)
 
         i915_cmd_parser_fini_ring(engine);
         i915_gem_batch_pool_fini(&engine->batch_pool);
-        engine->dev = NULL;
+        engine->i915 = NULL;
 }
 
 int intel_engine_idle(struct intel_engine_cs *engine)
@@ -2332,46 +2431,22 @@ int intel_engine_idle(struct intel_engine_cs *engine)
 
 int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request)
 {
-        request->ringbuf = request->engine->buffer;
-        return 0;
-}
+        int ret;
 
-int intel_ring_reserve_space(struct drm_i915_gem_request *request)
-{
-        /*
-         * The first call merely notes the reserve request and is common for
-         * all back ends. The subsequent localised _begin() call actually
-         * ensures that the reservation is available. Without the begin, if
-         * the request creator immediately submitted the request without
-         * adding any commands to it then there might not actually be
-         * sufficient room for the submission commands.
+        /* Flush enough space to reduce the likelihood of waiting after
+         * we start building the request - in which case we will just
+         * have to repeat work.
          */
-        intel_ring_reserved_space_reserve(request->ringbuf, MIN_SPACE_FOR_ADD_REQUEST);
+        request->reserved_space += LEGACY_REQUEST_SIZE;
 
-        return intel_ring_begin(request, 0);
-}
-
-void intel_ring_reserved_space_reserve(struct intel_ringbuffer *ringbuf, int size)
-{
-        GEM_BUG_ON(ringbuf->reserved_size);
-        ringbuf->reserved_size = size;
-}
-
-void intel_ring_reserved_space_cancel(struct intel_ringbuffer *ringbuf)
-{
-        GEM_BUG_ON(!ringbuf->reserved_size);
-        ringbuf->reserved_size   = 0;
-}
+        request->ringbuf = request->engine->buffer;
 
-void intel_ring_reserved_space_use(struct intel_ringbuffer *ringbuf)
-{
-        GEM_BUG_ON(!ringbuf->reserved_size);
-        ringbuf->reserved_size   = 0;
-}
+        ret = intel_ring_begin(request, 0);
+        if (ret)
+                return ret;
 
-void intel_ring_reserved_space_end(struct intel_ringbuffer *ringbuf)
-{
-        GEM_BUG_ON(ringbuf->reserved_size);
+        request->reserved_space -= LEGACY_REQUEST_SIZE;
+        return 0;
 }
 
 static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
@@ -2393,7 +2468,7 @@ static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
          *
          * See also i915_gem_request_alloc() and i915_add_request().
          */
-        GEM_BUG_ON(!ringbuf->reserved_size);
+        GEM_BUG_ON(!req->reserved_space);
 
         list_for_each_entry(target, &engine->request_list, list) {
                 unsigned space;
@@ -2428,7 +2503,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
         int total_bytes, wait_bytes;
         bool need_wrap = false;
 
-        total_bytes = bytes + ringbuf->reserved_size;
+        total_bytes = bytes + req->reserved_space;
 
         if (unlikely(bytes > remain_usable)) {
                 /*
@@ -2444,7 +2519,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
                  * and only need to effectively wait for the reserved
                  * size space from the start of ringbuffer.
                  */
-                wait_bytes = remain_actual + ringbuf->reserved_size;
+                wait_bytes = remain_actual + req->reserved_space;
         } else {
                 /* No wrapping required, just waiting. */
                 wait_bytes = total_bytes;
@@ -2501,7 +2576,7 @@ int intel_ring_cacheline_align(struct drm_i915_gem_request *req)
 
 void intel_ring_init_seqno(struct intel_engine_cs *engine, u32 seqno)
 {
-        struct drm_i915_private *dev_priv = to_i915(engine->dev);
+        struct drm_i915_private *dev_priv = engine->i915;
 
         /* Our semaphore implementation is strictly monotonic (i.e. we proceed
          * so long as the semaphore value in the register/page is greater
@@ -2511,7 +2586,7 @@ void intel_ring_init_seqno(struct intel_engine_cs *engine, u32 seqno)
          * the semaphore value, then when the seqno moves backwards all
          * future waits will complete instantly (causing rendering corruption).
          */
-        if (INTEL_INFO(dev_priv)->gen == 6 || INTEL_INFO(dev_priv)->gen == 7) {
+        if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv)) {
                 I915_WRITE(RING_SYNC_0(engine->mmio_base), 0);
                 I915_WRITE(RING_SYNC_1(engine->mmio_base), 0);
                 if (HAS_VEBOX(dev_priv))
@@ -2537,7 +2612,7 @@ void intel_ring_init_seqno(struct intel_engine_cs *engine, u32 seqno)
 static void gen6_bsd_ring_write_tail(struct intel_engine_cs *engine,
                                      u32 value)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
        /* Every tail move must follow the sequence below */
 
@@ -2579,7 +2654,7 @@ static int gen6_bsd_ring_flush(struct drm_i915_gem_request *req,
                 return ret;
 
         cmd = MI_FLUSH_DW;
-        if (INTEL_INFO(engine->dev)->gen >= 8)
+        if (INTEL_GEN(req->i915) >= 8)
                 cmd += 1;
 
         /* We always require a command barrier so that subsequent
@@ -2601,7 +2676,7 @@ static int gen6_bsd_ring_flush(struct drm_i915_gem_request *req,
         intel_ring_emit(engine, cmd);
         intel_ring_emit(engine,
                         I915_GEM_HWS_SCRATCH_ADDR | MI_FLUSH_DW_USE_GTT);
-        if (INTEL_INFO(engine->dev)->gen >= 8) {
+        if (INTEL_GEN(req->i915) >= 8) {
                 intel_ring_emit(engine, 0); /* upper addr */
                 intel_ring_emit(engine, 0); /* value */
         } else  {
@@ -2692,7 +2767,6 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,
                            u32 invalidate, u32 flush)
 {
         struct intel_engine_cs *engine = req->engine;
-        struct drm_device *dev = engine->dev;
         uint32_t cmd;
         int ret;
 
@@ -2701,7 +2775,7 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,
                 return ret;
 
         cmd = MI_FLUSH_DW;
-        if (INTEL_INFO(dev)->gen >= 8)
+        if (INTEL_GEN(req->i915) >= 8)
                 cmd += 1;
 
         /* We always require a command barrier so that subsequent
@@ -2722,7 +2796,7 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,
         intel_ring_emit(engine, cmd);
         intel_ring_emit(engine,
                         I915_GEM_HWS_SCRATCH_ADDR | MI_FLUSH_DW_USE_GTT);
-        if (INTEL_INFO(dev)->gen >= 8) {
+        if (INTEL_GEN(req->i915) >= 8) {
                 intel_ring_emit(engine, 0); /* upper addr */
                 intel_ring_emit(engine, 0); /* value */
         } else  {
@@ -2747,10 +2821,10 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
         engine->hw_id = 0;
         engine->mmio_base = RENDER_RING_BASE;
 
-        if (INTEL_INFO(dev)->gen >= 8) {
-                if (i915_semaphore_is_enabled(dev)) {
-                        obj = i915_gem_alloc_object(dev, 4096);
-                        if (obj == NULL) {
+        if (INTEL_GEN(dev_priv) >= 8) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
+                        obj = i915_gem_object_create(dev, 4096);
+                        if (IS_ERR(obj)) {
                                 DRM_ERROR("Failed to allocate semaphore bo. Disabling semaphores\n");
                                 i915.semaphores = 0;
                         } else {
@@ -2766,25 +2840,24 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                 }
 
                 engine->init_context = intel_rcs_ctx_init;
-                engine->add_request = gen6_add_request;
+                engine->add_request = gen8_render_add_request;
                 engine->flush = gen8_render_ring_flush;
                 engine->irq_get = gen8_ring_get_irq;
                 engine->irq_put = gen8_ring_put_irq;
                 engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT;
-                engine->irq_seqno_barrier = gen6_seqno_barrier;
                 engine->get_seqno = ring_get_seqno;
                 engine->set_seqno = ring_set_seqno;
-                if (i915_semaphore_is_enabled(dev)) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
                         WARN_ON(!dev_priv->semaphore_obj);
                         engine->semaphore.sync_to = gen8_ring_sync;
                         engine->semaphore.signal = gen8_rcs_signal;
                         GEN8_RING_SEMAPHORE_INIT(engine);
                 }
-        } else if (INTEL_INFO(dev)->gen >= 6) {
+        } else if (INTEL_GEN(dev_priv) >= 6) {
                 engine->init_context = intel_rcs_ctx_init;
                 engine->add_request = gen6_add_request;
                 engine->flush = gen7_render_ring_flush;
-                if (INTEL_INFO(dev)->gen == 6)
+                if (IS_GEN6(dev_priv))
                         engine->flush = gen6_render_ring_flush;
                 engine->irq_get = gen6_ring_get_irq;
                 engine->irq_put = gen6_ring_put_irq;
@@ -2792,7 +2865,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                 engine->irq_seqno_barrier = gen6_seqno_barrier;
                 engine->get_seqno = ring_get_seqno;
                 engine->set_seqno = ring_set_seqno;
-                if (i915_semaphore_is_enabled(dev)) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
                         engine->semaphore.sync_to = gen6_ring_sync;
                         engine->semaphore.signal = gen6_signal;
                         /*
@@ -2813,7 +2886,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                         engine->semaphore.mbox.signal[VECS] = GEN6_VERSYNC;
                         engine->semaphore.mbox.signal[VCS2] = GEN6_NOSYNC;
                 }
-        } else if (IS_GEN5(dev)) {
+        } else if (IS_GEN5(dev_priv)) {
                 engine->add_request = pc_render_add_request;
                 engine->flush = gen4_render_ring_flush;
                 engine->get_seqno = pc_render_get_seqno;
@@ -2824,13 +2897,13 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                                         GT_RENDER_PIPECTL_NOTIFY_INTERRUPT;
         } else {
                 engine->add_request = i9xx_add_request;
-                if (INTEL_INFO(dev)->gen < 4)
+                if (INTEL_GEN(dev_priv) < 4)
                         engine->flush = gen2_render_ring_flush;
                 else
                         engine->flush = gen4_render_ring_flush;
                 engine->get_seqno = ring_get_seqno;
                 engine->set_seqno = ring_set_seqno;
-                if (IS_GEN2(dev)) {
+                if (IS_GEN2(dev_priv)) {
                         engine->irq_get = i8xx_ring_get_irq;
                         engine->irq_put = i8xx_ring_put_irq;
                 } else {
@@ -2841,15 +2914,15 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
         }
         engine->write_tail = ring_write_tail;
 
-        if (IS_HASWELL(dev))
+        if (IS_HASWELL(dev_priv))
                 engine->dispatch_execbuffer = hsw_ring_dispatch_execbuffer;
-        else if (IS_GEN8(dev))
+        else if (IS_GEN8(dev_priv))
                 engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;
-        else if (INTEL_INFO(dev)->gen >= 6)
+        else if (INTEL_GEN(dev_priv) >= 6)
                 engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
-        else if (INTEL_INFO(dev)->gen >= 4)
+        else if (INTEL_GEN(dev_priv) >= 4)
                 engine->dispatch_execbuffer = i965_dispatch_execbuffer;
-        else if (IS_I830(dev) || IS_845G(dev))
+        else if (IS_I830(dev_priv) || IS_845G(dev_priv))
                 engine->dispatch_execbuffer = i830_dispatch_execbuffer;
         else
                 engine->dispatch_execbuffer = i915_dispatch_execbuffer;
@@ -2857,11 +2930,11 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
         engine->cleanup = render_ring_cleanup;
 
         /* Workaround batchbuffer to combat CS tlb bug. */
-        if (HAS_BROKEN_CS_TLB(dev)) {
-                obj = i915_gem_alloc_object(dev, I830_WA_SIZE);
-                if (obj == NULL) {
+        if (HAS_BROKEN_CS_TLB(dev_priv)) {
+                obj = i915_gem_object_create(dev, I830_WA_SIZE);
+                if (IS_ERR(obj)) {
                         DRM_ERROR("Failed to allocate batch bo\n");
-                        return -ENOMEM;
+                        return PTR_ERR(obj);
                 }
 
                 ret = i915_gem_obj_ggtt_pin(obj, 0, 0);
@@ -2879,7 +2952,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
         if (ret)
                 return ret;
 
-        if (INTEL_INFO(dev)->gen >= 5) {
+        if (INTEL_GEN(dev_priv) >= 5) {
                 ret = intel_init_pipe_control(engine);
                 if (ret)
                         return ret;
@@ -2899,24 +2972,24 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
         engine->hw_id = 1;
 
         engine->write_tail = ring_write_tail;
-        if (INTEL_INFO(dev)->gen >= 6) {
+        if (INTEL_GEN(dev_priv) >= 6) {
                 engine->mmio_base = GEN6_BSD_RING_BASE;
                 /* gen6 bsd needs a special wa for tail updates */
-                if (IS_GEN6(dev))
+                if (IS_GEN6(dev_priv))
                         engine->write_tail = gen6_bsd_ring_write_tail;
                 engine->flush = gen6_bsd_ring_flush;
                 engine->add_request = gen6_add_request;
                 engine->irq_seqno_barrier = gen6_seqno_barrier;
                 engine->get_seqno = ring_get_seqno;
                 engine->set_seqno = ring_set_seqno;
-                if (INTEL_INFO(dev)->gen >= 8) {
+                if (INTEL_GEN(dev_priv) >= 8) {
                         engine->irq_enable_mask =
                                 GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT;
                         engine->irq_get = gen8_ring_get_irq;
                         engine->irq_put = gen8_ring_put_irq;
                         engine->dispatch_execbuffer =
                                 gen8_ring_dispatch_execbuffer;
-                        if (i915_semaphore_is_enabled(dev)) {
+                        if (i915_semaphore_is_enabled(dev_priv)) {
                                 engine->semaphore.sync_to = gen8_ring_sync;
                                 engine->semaphore.signal = gen8_xcs_signal;
                                 GEN8_RING_SEMAPHORE_INIT(engine);
@@ -2927,7 +3000,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
                         engine->irq_put = gen6_ring_put_irq;
                         engine->dispatch_execbuffer =
                                 gen6_ring_dispatch_execbuffer;
-                        if (i915_semaphore_is_enabled(dev)) {
+                        if (i915_semaphore_is_enabled(dev_priv)) {
                                 engine->semaphore.sync_to = gen6_ring_sync;
                                 engine->semaphore.signal = gen6_signal;
                                 engine->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VR;
@@ -2948,7 +3021,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
                 engine->add_request = i9xx_add_request;
                 engine->get_seqno = ring_get_seqno;
                 engine->set_seqno = ring_set_seqno;
-                if (IS_GEN5(dev)) {
+                if (IS_GEN5(dev_priv)) {
                         engine->irq_enable_mask = ILK_BSD_USER_INTERRUPT;
                         engine->irq_get = gen5_ring_get_irq;
                         engine->irq_put = gen5_ring_put_irq;
@@ -2990,7 +3063,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)
         engine->irq_put = gen8_ring_put_irq;
         engine->dispatch_execbuffer =
                         gen8_ring_dispatch_execbuffer;
-        if (i915_semaphore_is_enabled(dev)) {
+        if (i915_semaphore_is_enabled(dev_priv)) {
                 engine->semaphore.sync_to = gen8_ring_sync;
                 engine->semaphore.signal = gen8_xcs_signal;
                 GEN8_RING_SEMAPHORE_INIT(engine);
@@ -3017,13 +3090,13 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
         engine->irq_seqno_barrier = gen6_seqno_barrier;
         engine->get_seqno = ring_get_seqno;
         engine->set_seqno = ring_set_seqno;
-        if (INTEL_INFO(dev)->gen >= 8) {
+        if (INTEL_GEN(dev_priv) >= 8) {
                 engine->irq_enable_mask =
                         GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT;
                 engine->irq_get = gen8_ring_get_irq;
                 engine->irq_put = gen8_ring_put_irq;
                 engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;
-                if (i915_semaphore_is_enabled(dev)) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
                         engine->semaphore.sync_to = gen8_ring_sync;
                         engine->semaphore.signal = gen8_xcs_signal;
                         GEN8_RING_SEMAPHORE_INIT(engine);
@@ -3033,7 +3106,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
                 engine->irq_get = gen6_ring_get_irq;
                 engine->irq_put = gen6_ring_put_irq;
                 engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
-                if (i915_semaphore_is_enabled(dev)) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
                         engine->semaphore.signal = gen6_signal;
                         engine->semaphore.sync_to = gen6_ring_sync;
                         /*
@@ -3078,13 +3151,13 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
         engine->get_seqno = ring_get_seqno;
         engine->set_seqno = ring_set_seqno;
 
-        if (INTEL_INFO(dev)->gen >= 8) {
+        if (INTEL_GEN(dev_priv) >= 8) {
                 engine->irq_enable_mask =
                         GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT;
                 engine->irq_get = gen8_ring_get_irq;
                 engine->irq_put = gen8_ring_put_irq;
                 engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;
-                if (i915_semaphore_is_enabled(dev)) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
                         engine->semaphore.sync_to = gen8_ring_sync;
                         engine->semaphore.signal = gen8_xcs_signal;
                         GEN8_RING_SEMAPHORE_INIT(engine);
@@ -3094,7 +3167,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
                 engine->irq_get = hsw_vebox_get_irq;
                 engine->irq_put = hsw_vebox_put_irq;
                 engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
-                if (i915_semaphore_is_enabled(dev)) {
+                if (i915_semaphore_is_enabled(dev_priv)) {
                         engine->semaphore.sync_to = gen6_ring_sync;
                         engine->semaphore.signal = gen6_signal;
                         engine->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VER;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index ff126485d398..b33c876fed20 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -107,7 +107,6 @@ struct intel_ringbuffer {
         int space;
         int size;
         int effective_size;
-        int reserved_size;
 
         /** We track the position of the requests in the ring buffer, and
          * when each is retired we increment last_retired_head as the GPU
@@ -120,7 +119,7 @@ struct intel_ringbuffer {
         u32 last_retired_head;
 };
 
-struct  intel_context;
+struct i915_gem_context;
 struct drm_i915_reg_table;
 
 /*
@@ -142,7 +141,8 @@ struct  i915_ctx_workarounds {
         struct drm_i915_gem_object *obj;
 };
 
-struct  intel_engine_cs {
+struct intel_engine_cs {
+        struct drm_i915_private *i915;
         const char      *name;
         enum intel_engine_id {
                 RCS = 0,
@@ -157,7 +157,6 @@ struct  intel_engine_cs {
         unsigned int hw_id;
         unsigned int guc_id; /* XXX same as hw_id? */
         u32             mmio_base;
-        struct          drm_device *dev;
         struct intel_ringbuffer *buffer;
         struct list_head buffers;
 
@@ -268,7 +267,6 @@ struct  intel_engine_cs {
         struct tasklet_struct irq_tasklet;
         spinlock_t execlist_lock; /* used inside tasklet, use spin_lock_bh */
         struct list_head execlist_queue;
-        struct list_head execlist_retired_req_list;
         unsigned int fw_domains;
         unsigned int next_context_status_buffer;
         unsigned int idle_lite_restore_wa;
@@ -312,7 +310,7 @@ struct  intel_engine_cs {
 
         wait_queue_head_t irq_queue;
 
-        struct intel_context *last_context;
+        struct i915_gem_context *last_context;
 
         struct intel_ring_hangcheck hangcheck;
 
@@ -352,7 +350,7 @@ struct  intel_engine_cs {
 static inline bool
 intel_engine_initialized(struct intel_engine_cs *engine)
 {
-        return engine->dev != NULL;
+        return engine->i915 != NULL;
 }
 
 static inline unsigned
@@ -427,7 +425,7 @@ intel_write_status_page(struct intel_engine_cs *engine,
 
 struct intel_ringbuffer *
 intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size);
-int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,
+int intel_pin_and_map_ringbuffer_obj(struct drm_i915_private *dev_priv,
                                      struct intel_ringbuffer *ringbuf);
 void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf);
 void intel_ringbuffer_free(struct intel_ringbuffer *ring);
@@ -486,26 +484,15 @@ static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
 /*
  * Arbitrary size for largest possible 'add request' sequence. The code paths
  * are complex and variable. Empirical measurement shows that the worst case
- * is ILK at 136 words. Reserving too much is better than reserving too little
- * as that allows for corner cases that might have been missed. So the figure
- * has been rounded up to 160 words.
+ * is BDW at 192 bytes (6 + 6 + 36 dwords), then ILK at 136 bytes. However,
+ * we need to allocate double the largest single packet within that emission
+ * to account for tail wraparound (so 6 + 6 + 72 dwords for BDW).
  */
-#define MIN_SPACE_FOR_ADD_REQUEST       160
+#define MIN_SPACE_FOR_ADD_REQUEST 336
 
-/*
- * Reserve space in the ring to guarantee that the i915_add_request() call
- * will always have sufficient room to do its stuff. The request creation
- * code calls this automatically.
- */
-void intel_ring_reserved_space_reserve(struct intel_ringbuffer *ringbuf, int size);
-/* Cancel the reservation, e.g. because the request is being discarded. */
-void intel_ring_reserved_space_cancel(struct intel_ringbuffer *ringbuf);
-/* Use the reserved space - for use by i915_add_request() only. */
-void intel_ring_reserved_space_use(struct intel_ringbuffer *ringbuf);
-/* Finish with the reserved space - for use by i915_add_request() only. */
-void intel_ring_reserved_space_end(struct intel_ringbuffer *ringbuf);
-
-/* Legacy ringbuffer specific portion of reservation code: */
-int intel_ring_reserve_space(struct drm_i915_gem_request *request);
+static inline u32 intel_hws_seqno_address(struct intel_engine_cs *engine)
+{
+        return engine->status_page.gfx_addr + I915_GEM_HWS_INDEX_ADDR;
+}
 
 #endif /* _INTEL_RINGBUFFER_H_ */
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 7fb1da4e7fc3..e856d49d6dc3 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -65,6 +65,9 @@
 bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv,
                                     int power_well_id);
 
+static struct i915_power_well *
+lookup_power_well(struct drm_i915_private *dev_priv, int power_well_id);
+
 const char *
 intel_display_power_domain_str(enum intel_display_power_domain domain)
 {
@@ -151,6 +154,23 @@ static void intel_power_well_disable(struct drm_i915_private *dev_priv,
         power_well->ops->disable(dev_priv, power_well);
 }
 
+static void intel_power_well_get(struct drm_i915_private *dev_priv,
+                                 struct i915_power_well *power_well)
+{
+        if (!power_well->count++)
+                intel_power_well_enable(dev_priv, power_well);
+}
+
+static void intel_power_well_put(struct drm_i915_private *dev_priv,
+                                 struct i915_power_well *power_well)
+{
+        WARN(!power_well->count, "Use count on power well %s is already zero",
+             power_well->name);
+
+        if (!--power_well->count)
+                intel_power_well_disable(dev_priv, power_well);
+}
+
 /*
  * We should only use the power well if we explicitly asked the hardware to
  * enable it, so check if it's enabled and also check if we've requested it to
@@ -419,6 +439,16 @@ static void hsw_set_power_well(struct drm_i915_private *dev_priv,
         BIT(POWER_DOMAIN_MODESET) |                     \
         BIT(POWER_DOMAIN_AUX_A) |                       \
         BIT(POWER_DOMAIN_INIT))
+#define BXT_DPIO_CMN_A_POWER_DOMAINS (                  \
+        BIT(POWER_DOMAIN_PORT_DDI_A_LANES) |            \
+        BIT(POWER_DOMAIN_AUX_A) |                       \
+        BIT(POWER_DOMAIN_INIT))
+#define BXT_DPIO_CMN_BC_POWER_DOMAINS (                 \
+        BIT(POWER_DOMAIN_PORT_DDI_B_LANES) |            \
+        BIT(POWER_DOMAIN_PORT_DDI_C_LANES) |            \
+        BIT(POWER_DOMAIN_AUX_B) |                       \
+        BIT(POWER_DOMAIN_AUX_C) |                       \
+        BIT(POWER_DOMAIN_INIT))
 
 static void assert_can_enable_dc9(struct drm_i915_private *dev_priv)
 {
@@ -800,21 +830,99 @@ static void skl_power_well_disable(struct drm_i915_private *dev_priv,
         skl_set_power_well(dev_priv, power_well, false);
 }
 
+static enum dpio_phy bxt_power_well_to_phy(struct i915_power_well *power_well)
+{
+        enum skl_disp_power_wells power_well_id = power_well->data;
+
+        return power_well_id == BXT_DPIO_CMN_A ? DPIO_PHY1 : DPIO_PHY0;
+}
+
+static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
+                                           struct i915_power_well *power_well)
+{
+        enum skl_disp_power_wells power_well_id = power_well->data;
+        struct i915_power_well *cmn_a_well;
+
+        if (power_well_id == BXT_DPIO_CMN_BC) {
+                /*
+                 * We need to copy the GRC calibration value from the eDP PHY,
+                 * so make sure it's powered up.
+                 */
+                cmn_a_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_A);
+                intel_power_well_get(dev_priv, cmn_a_well);
+        }
+
+        bxt_ddi_phy_init(dev_priv, bxt_power_well_to_phy(power_well));
+
+        if (power_well_id == BXT_DPIO_CMN_BC)
+                intel_power_well_put(dev_priv, cmn_a_well);
+}
+
+static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
+                                            struct i915_power_well *power_well)
+{
+        bxt_ddi_phy_uninit(dev_priv, bxt_power_well_to_phy(power_well));
+}
+
+static bool bxt_dpio_cmn_power_well_enabled(struct drm_i915_private *dev_priv,
+                                            struct i915_power_well *power_well)
+{
+        return bxt_ddi_phy_is_enabled(dev_priv,
+                                      bxt_power_well_to_phy(power_well));
+}
+
+static void bxt_dpio_cmn_power_well_sync_hw(struct drm_i915_private *dev_priv,
+                                            struct i915_power_well *power_well)
+{
+        if (power_well->count > 0)
+                bxt_dpio_cmn_power_well_enable(dev_priv, power_well);
+        else
+                bxt_dpio_cmn_power_well_disable(dev_priv, power_well);
+}
+
+
+static void bxt_verify_ddi_phy_power_wells(struct drm_i915_private *dev_priv)
+{
+        struct i915_power_well *power_well;
+
+        power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_A);
+        if (power_well->count > 0)
+                bxt_ddi_phy_verify_state(dev_priv,
+                                         bxt_power_well_to_phy(power_well));
+
+        power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_BC);
+        if (power_well->count > 0)
+                bxt_ddi_phy_verify_state(dev_priv,
+                                         bxt_power_well_to_phy(power_well));
+}
+
 static bool gen9_dc_off_power_well_enabled(struct drm_i915_private *dev_priv,
                                            struct i915_power_well *power_well)
 {
         return (I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC5_DC6_MASK) == 0;
 }
 
+static void gen9_assert_dbuf_enabled(struct drm_i915_private *dev_priv)
+{
+        u32 tmp = I915_READ(DBUF_CTL);
+
+        WARN((tmp & (DBUF_POWER_STATE | DBUF_POWER_REQUEST)) !=
+             (DBUF_POWER_STATE | DBUF_POWER_REQUEST),
+             "Unexpected DBuf power power state (0x%08x)\n", tmp);
+}
+
 static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv,
                                           struct i915_power_well *power_well)
 {
         gen9_set_dc_state(dev_priv, DC_STATE_DISABLE);
 
-        if (IS_BROXTON(dev_priv)) {
-                broxton_cdclk_verify_state(dev_priv);
-                broxton_ddi_phy_verify_state(dev_priv);
-        }
+        WARN_ON(dev_priv->cdclk_freq !=
+                dev_priv->display.get_display_clock_speed(dev_priv->dev));
+
+        gen9_assert_dbuf_enabled(dev_priv);
+
+        if (IS_BROXTON(dev_priv))
+                bxt_verify_ddi_phy_power_wells(dev_priv);
 }
 
 static void gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv,
@@ -948,6 +1056,11 @@ static void vlv_init_display_clock_gating(struct drm_i915_private *dev_priv)
          */
         I915_WRITE(MI_ARB_VLV, MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE);
         I915_WRITE(CBR1_VLV, 0);
+
+        WARN_ON(dev_priv->rawclk_freq == 0);
+
+        I915_WRITE(RAWCLK_FREQ_VLV,
+                   DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 1000));
 }
 
 static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)
@@ -1501,10 +1614,8 @@ __intel_display_power_get_domain(struct drm_i915_private *dev_priv,
         struct i915_power_well *power_well;
         int i;
 
-        for_each_power_well(i, power_well, BIT(domain), power_domains) {
-                if (!power_well->count++)
-                        intel_power_well_enable(dev_priv, power_well);
-        }
+        for_each_power_well(i, power_well, BIT(domain), power_domains)
+                intel_power_well_get(dev_priv, power_well);
 
         power_domains->domain_use_count[domain]++;
 }
@@ -1598,14 +1709,8 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
              intel_display_power_domain_str(domain));
         power_domains->domain_use_count[domain]--;
 
-        for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
-                WARN(!power_well->count,
-                     "Use count on power well %s is already zero",
-                     power_well->name);
-
-                if (!--power_well->count)
-                        intel_power_well_disable(dev_priv, power_well);
-        }
+        for_each_power_well_rev(i, power_well, BIT(domain), power_domains)
+                intel_power_well_put(dev_priv, power_well);
 
         mutex_unlock(&power_domains->lock);
 
@@ -1776,6 +1881,13 @@ static const struct i915_power_well_ops gen9_dc_off_power_well_ops = {
         .is_enabled = gen9_dc_off_power_well_enabled,
 };
 
+static const struct i915_power_well_ops bxt_dpio_cmn_power_well_ops = {
+        .sync_hw = bxt_dpio_cmn_power_well_sync_hw,
+        .enable = bxt_dpio_cmn_power_well_enable,
+        .disable = bxt_dpio_cmn_power_well_disable,
+        .is_enabled = bxt_dpio_cmn_power_well_enabled,
+};
+
 static struct i915_power_well hsw_power_wells[] = {
         {
                 .name = "always-on",
@@ -2012,6 +2124,18 @@ static struct i915_power_well bxt_power_wells[] = {
                 .ops = &skl_power_well_ops,
                 .data = SKL_DISP_PW_2,
         },
+        {
+                .name = "dpio-common-a",
+                .domains = BXT_DPIO_CMN_A_POWER_DOMAINS,
+                .ops = &bxt_dpio_cmn_power_well_ops,
+                .data = BXT_DPIO_CMN_A,
+        },
+        {
+                .name = "dpio-common-bc",
+                .domains = BXT_DPIO_CMN_BC_POWER_DOMAINS,
+                .ops = &bxt_dpio_cmn_power_well_ops,
+                .data = BXT_DPIO_CMN_BC,
+        },
 };
 
 static int
@@ -2171,6 +2295,28 @@ static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv)
         mutex_unlock(&power_domains->lock);
 }
 
+static void gen9_dbuf_enable(struct drm_i915_private *dev_priv)
+{
+        I915_WRITE(DBUF_CTL, I915_READ(DBUF_CTL) | DBUF_POWER_REQUEST);
+        POSTING_READ(DBUF_CTL);
+
+        udelay(10);
+
+        if (!(I915_READ(DBUF_CTL) & DBUF_POWER_STATE))
+                DRM_ERROR("DBuf power enable timeout\n");
+}
+
+static void gen9_dbuf_disable(struct drm_i915_private *dev_priv)
+{
+        I915_WRITE(DBUF_CTL, I915_READ(DBUF_CTL) & ~DBUF_POWER_REQUEST);
+        POSTING_READ(DBUF_CTL);
+
+        udelay(10);
+
+        if (I915_READ(DBUF_CTL) & DBUF_POWER_STATE)
+                DRM_ERROR("DBuf power disable timeout!\n");
+}
+
 static void skl_display_core_init(struct drm_i915_private *dev_priv,
                                    bool resume)
 {
@@ -2195,12 +2341,11 @@ static void skl_display_core_init(struct drm_i915_private *dev_priv,
 
         mutex_unlock(&power_domains->lock);
 
-        if (!resume)
-                return;
-
         skl_init_cdclk(dev_priv);
 
-        if (dev_priv->csr.dmc_payload)
+        gen9_dbuf_enable(dev_priv);
+
+        if (resume && dev_priv->csr.dmc_payload)
                 intel_csr_load_program(dev_priv);
 }
 
@@ -2211,6 +2356,8 @@ static void skl_display_core_uninit(struct drm_i915_private *dev_priv)
 
         gen9_set_dc_state(dev_priv, DC_STATE_DISABLE);
 
+        gen9_dbuf_disable(dev_priv);
+
         skl_uninit_cdclk(dev_priv);
 
         /* The spec doesn't call for removing the reset handshake flag */
@@ -2254,11 +2401,9 @@ void bxt_display_core_init(struct drm_i915_private *dev_priv,
 
         mutex_unlock(&power_domains->lock);
 
-        broxton_init_cdclk(dev_priv);
-        broxton_ddi_phy_init(dev_priv);
+        bxt_init_cdclk(dev_priv);
 
-        broxton_cdclk_verify_state(dev_priv);
-        broxton_ddi_phy_verify_state(dev_priv);
+        gen9_dbuf_enable(dev_priv);
 
         if (resume && dev_priv->csr.dmc_payload)
                 intel_csr_load_program(dev_priv);
@@ -2271,8 +2416,9 @@ void bxt_display_core_uninit(struct drm_i915_private *dev_priv)
 
         gen9_set_dc_state(dev_priv, DC_STATE_DISABLE);
 
-        broxton_ddi_phy_uninit(dev_priv);
-        broxton_uninit_cdclk(dev_priv);
+        gen9_dbuf_disable(dev_priv);
+
+        bxt_uninit_cdclk(dev_priv);
 
         /* The spec doesn't call for removing the reset handshake flag */
 
@@ -2403,6 +2549,7 @@ static void vlv_cmnlane_wa(struct drm_i915_private *dev_priv)
 /**
  * intel_power_domains_init_hw - initialize hardware power domain state
  * @dev_priv: i915 device instance
+ * @resume: Called from resume code paths or not
  *
  * This function initializes the hardware power domain state and enables all
  * power domains using intel_display_set_init_power().
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 2128fae5687d..02b4a6695528 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2177,12 +2177,23 @@ done:
 #undef CHECK_PROPERTY
 }
 
+static void
+intel_sdvo_connector_unregister(struct drm_connector *connector)
+{
+        struct intel_sdvo *sdvo = intel_attached_sdvo(connector);
+
+        sysfs_remove_link(&connector->kdev->kobj,
+                          sdvo->ddc.dev.kobj.name);
+        intel_connector_unregister(connector);
+}
+
 static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_sdvo_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_sdvo_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
+        .early_unregister = intel_sdvo_connector_unregister,
         .destroy = intel_sdvo_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -2191,7 +2202,6 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_sdvo_connector_helper_funcs = {
         .get_modes = intel_sdvo_get_modes,
         .mode_valid = intel_sdvo_mode_valid,
-        .best_encoder = intel_best_encoder,
 };
 
 static void intel_sdvo_enc_destroy(struct drm_encoder *encoder)
@@ -2346,20 +2356,6 @@ intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)
                 return 0x72;
 }
 
-static void
-intel_sdvo_connector_unregister(struct intel_connector *intel_connector)
-{
-        struct drm_connector *drm_connector;
-        struct intel_sdvo *sdvo_encoder;
-
-        drm_connector = &intel_connector->base;
-        sdvo_encoder = intel_attached_sdvo(&intel_connector->base);
-
-        sysfs_remove_link(&drm_connector->kdev->kobj,
-                          sdvo_encoder->ddc.dev.kobj.name);
-        intel_connector_unregister(intel_connector);
-}
-
 static int
 intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
                           struct intel_sdvo *encoder)
@@ -2382,7 +2378,6 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
         connector->base.base.doublescan_allowed = 0;
         connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
         connector->base.get_hw_state = intel_sdvo_connector_get_hw_state;
-        connector->base.unregister = intel_sdvo_connector_unregister;
 
         intel_connector_attach_encoder(&connector->base, &encoder->base);
         ret = drm_connector_register(drm_connector);
@@ -2981,7 +2976,7 @@ bool intel_sdvo_init(struct drm_device *dev,
         intel_encoder = &intel_sdvo->base;
         intel_encoder->type = INTEL_OUTPUT_SDVO;
         drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0,
-                         NULL);
+                         "SDVO %c", port_name(port));
 
         /* Read the regs to test if we can talk to the device */
         for (i = 0; i < 0x40; i++) {
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 0f3e2303e0e9..fc654173c491 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -80,9 +80,7 @@ static int usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
  */
 void intel_pipe_update_start(struct intel_crtc *crtc)
 {
-        struct drm_device *dev = crtc->base.dev;
         const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
-        enum pipe pipe = crtc->pipe;
         long timeout = msecs_to_jiffies_timeout(1);
         int scanline, min, max, vblank_start;
         wait_queue_head_t *wq = drm_crtc_vblank_waitqueue(&crtc->base);
@@ -139,8 +137,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
 
         crtc->debug.scanline_start = scanline;
         crtc->debug.start_vbl_time = ktime_get();
-        crtc->debug.start_vbl_count =
-                dev->driver->get_vblank_counter(dev, pipe);
+        crtc->debug.start_vbl_count = intel_crtc_get_vblank_counter(crtc);
 
         trace_i915_pipe_update_vblank_evaded(crtc);
 }
@@ -154,16 +151,35 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
  * re-enables interrupts and verifies the update was actually completed
  * before a vblank using the value of @start_vbl_count.
  */
-void intel_pipe_update_end(struct intel_crtc *crtc)
+void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work)
 {
-        struct drm_device *dev = crtc->base.dev;
         enum pipe pipe = crtc->pipe;
         int scanline_end = intel_get_crtc_scanline(crtc);
-        u32 end_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
+        u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc);
         ktime_t end_vbl_time = ktime_get();
 
+        if (work) {
+                work->flip_queued_vblank = end_vbl_count;
+                smp_mb__before_atomic();
+                atomic_set(&work->pending, 1);
+        }
+
         trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end);
 
+        /* We're still in the vblank-evade critical section, this can't race.
+         * Would be slightly nice to just grab the vblank count and arm the
+         * event outside of the critical section - the spinlock might spin for a
+         * while ... */
+        if (crtc->base.state->event) {
+                WARN_ON(drm_crtc_vblank_get(&crtc->base) != 0);
+
+                spin_lock(&crtc->base.dev->event_lock);
+                drm_crtc_arm_vblank_event(&crtc->base, crtc->base.state->event);
+                spin_unlock(&crtc->base.dev->event_lock);
+
+                crtc->base.state->event = NULL;
+        }
+
         local_irq_enable();
 
         if (crtc->debug.start_vbl_count &&
@@ -203,8 +219,6 @@ skl_update_plane(struct drm_plane *drm_plane,
         uint32_t y = plane_state->src.y1 >> 16;
         uint32_t src_w = drm_rect_width(&plane_state->src) >> 16;
         uint32_t src_h = drm_rect_height(&plane_state->src) >> 16;
-        const struct intel_scaler *scaler =
-                &crtc_state->scaler_state.scalers[plane_state->scaler_id];
 
         plane_ctl = PLANE_CTL_ENABLE |
                 PLANE_CTL_PIPE_GAMMA_ENABLE |
@@ -260,13 +274,16 @@ skl_update_plane(struct drm_plane *drm_plane,
 
         /* program plane scaler */
         if (plane_state->scaler_id >= 0) {
-                uint32_t ps_ctrl = 0;
                 int scaler_id = plane_state->scaler_id;
+                const struct intel_scaler *scaler;
 
                 DRM_DEBUG_KMS("plane = %d PS_PLANE_SEL(plane) = 0x%x\n", plane,
                         PS_PLANE_SEL(plane));
-                ps_ctrl = PS_SCALER_EN | PS_PLANE_SEL(plane) | scaler->mode;
-                I915_WRITE(SKL_PS_CTRL(pipe, scaler_id), ps_ctrl);
+
+                scaler = &crtc_state->scaler_state.scalers[scaler_id];
+
+                I915_WRITE(SKL_PS_CTRL(pipe, scaler_id),
+                           PS_SCALER_EN | PS_PLANE_SEL(plane) | scaler->mode);
                 I915_WRITE(SKL_PS_PWR_GATE(pipe, scaler_id), 0);
                 I915_WRITE(SKL_PS_WIN_POS(pipe, scaler_id), (crtc_x << 16) | crtc_y);
                 I915_WRITE(SKL_PS_WIN_SZ(pipe, scaler_id),
@@ -1111,10 +1128,18 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
 
         possible_crtcs = (1 << pipe);
 
-        ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
-                                       &intel_plane_funcs,
-                                       plane_formats, num_plane_formats,
-                                       DRM_PLANE_TYPE_OVERLAY, NULL);
+        if (INTEL_INFO(dev)->gen >= 9)
+                ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
+                                               &intel_plane_funcs,
+                                               plane_formats, num_plane_formats,
+                                               DRM_PLANE_TYPE_OVERLAY,
+                                               "plane %d%c", plane + 2, pipe_name(pipe));
+        else
+                ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
+                                               &intel_plane_funcs,
+                                               plane_formats, num_plane_formats,
+                                               DRM_PLANE_TYPE_OVERLAY,
+                                               "sprite %c", sprite_name(pipe, plane));
         if (ret)
                 goto fail;
 
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 223129d3c765..4ce70a9f9df2 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1501,6 +1501,7 @@ out:
 static const struct drm_connector_funcs intel_tv_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_tv_detect,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_tv_destroy,
         .set_property = intel_tv_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
@@ -1512,7 +1513,6 @@ static const struct drm_connector_funcs intel_tv_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = {
         .mode_valid = intel_tv_mode_valid,
         .get_modes = intel_tv_get_modes,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_encoder_funcs intel_tv_enc_funcs = {
@@ -1591,7 +1591,7 @@ intel_tv_init(struct drm_device *dev)
                            DRM_MODE_CONNECTOR_SVIDEO);
 
         drm_encoder_init(dev, &intel_encoder->base, &intel_tv_enc_funcs,
-                         DRM_MODE_ENCODER_TVDAC, NULL);
+                         DRM_MODE_ENCODER_TVDAC, "TV");
 
         intel_encoder->compute_config = intel_tv_compute_config;
         intel_encoder->get_config = intel_tv_get_config;
@@ -1600,7 +1600,6 @@ intel_tv_init(struct drm_device *dev)
         intel_encoder->disable = intel_disable_tv;
         intel_encoder->get_hw_state = intel_tv_get_hw_state;
         intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
         intel_encoder->type = INTEL_OUTPUT_TVOUT;
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 4f1dfe616856..c1ca458d688e 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -248,9 +248,9 @@ intel_uncore_fw_release_timer(struct hrtimer *timer)
         return HRTIMER_NORESTART;
 }
 
-void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
+void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv,
+                                  bool restore)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         unsigned long irqflags;
         struct intel_uncore_forcewake_domain *domain;
         int retry_count = 100;
@@ -304,7 +304,7 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
                 if (fw)
                         dev_priv->uncore.funcs.force_wake_get(dev_priv, fw);
 
-                if (IS_GEN6(dev) || IS_GEN7(dev))
+                if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv))
                         dev_priv->uncore.fifo_count =
                                 fifo_free_entries(dev_priv);
         }
@@ -400,43 +400,42 @@ check_for_unclaimed_mmio(struct drm_i915_private *dev_priv)
         return false;
 }
 
-static void __intel_uncore_early_sanitize(struct drm_device *dev,
+static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,
                                           bool restore_forcewake)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         /* clear out unclaimed reg detection bit */
         if (check_for_unclaimed_mmio(dev_priv))
                 DRM_DEBUG("unclaimed mmio detected on uncore init, clearing\n");
 
         /* clear out old GT FIFO errors */
-        if (IS_GEN6(dev) || IS_GEN7(dev))
+        if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv))
                 __raw_i915_write32(dev_priv, GTFIFODBG,
                                    __raw_i915_read32(dev_priv, GTFIFODBG));
 
         /* WaDisableShadowRegForCpd:chv */
-        if (IS_CHERRYVIEW(dev)) {
+        if (IS_CHERRYVIEW(dev_priv)) {
                 __raw_i915_write32(dev_priv, GTFIFOCTL,
                                    __raw_i915_read32(dev_priv, GTFIFOCTL) |
                                    GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL |
                                    GT_FIFO_CTL_RC6_POLICY_STALL);
         }
 
-        intel_uncore_forcewake_reset(dev, restore_forcewake);
+        intel_uncore_forcewake_reset(dev_priv, restore_forcewake);
 }
 
-void intel_uncore_early_sanitize(struct drm_device *dev, bool restore_forcewake)
+void intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,
+                                 bool restore_forcewake)
 {
-        __intel_uncore_early_sanitize(dev, restore_forcewake);
-        i915_check_and_clear_faults(dev);
+        __intel_uncore_early_sanitize(dev_priv, restore_forcewake);
+        i915_check_and_clear_faults(dev_priv);
 }
 
-void intel_uncore_sanitize(struct drm_device *dev)
+void intel_uncore_sanitize(struct drm_i915_private *dev_priv)
 {
-        i915.enable_rc6 = sanitize_rc6_option(dev, i915.enable_rc6);
+        i915.enable_rc6 = sanitize_rc6_option(dev_priv, i915.enable_rc6);
 
         /* BIOS often leaves RC6 enabled, but disable it for hw init */
-        intel_disable_gt_powersave(dev);
+        intel_disable_gt_powersave(dev_priv);
 }
 
 static void __intel_uncore_forcewake_get(struct drm_i915_private *dev_priv,
@@ -1233,14 +1232,12 @@ static void fw_domain_init(struct drm_i915_private *dev_priv,
         fw_domain_reset(d);
 }
 
-static void intel_uncore_fw_domains_init(struct drm_device *dev)
+static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (INTEL_INFO(dev_priv)->gen <= 5)
                 return;
 
-        if (IS_GEN9(dev)) {
+        if (IS_GEN9(dev_priv)) {
                 dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
                 dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
                 fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
@@ -1251,9 +1248,9 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev)
                                FORCEWAKE_ACK_BLITTER_GEN9);
                 fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
                                FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9);
-        } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+        } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                 dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
-                if (!IS_CHERRYVIEW(dev))
+                if (!IS_CHERRYVIEW(dev_priv))
                         dev_priv->uncore.funcs.force_wake_put =
                                 fw_domains_put_with_fifo;
                 else
@@ -1262,17 +1259,17 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev)
                                FORCEWAKE_VLV, FORCEWAKE_ACK_VLV);
                 fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
                                FORCEWAKE_MEDIA_VLV, FORCEWAKE_ACK_MEDIA_VLV);
-        } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
+        } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {
                 dev_priv->uncore.funcs.force_wake_get =
                         fw_domains_get_with_thread_status;
-                if (IS_HASWELL(dev))
+                if (IS_HASWELL(dev_priv))
                         dev_priv->uncore.funcs.force_wake_put =
                                 fw_domains_put_with_fifo;
                 else
                         dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
                 fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
                                FORCEWAKE_MT, FORCEWAKE_ACK_HSW);
-        } else if (IS_IVYBRIDGE(dev)) {
+        } else if (IS_IVYBRIDGE(dev_priv)) {
                 u32 ecobus;
 
                 /* IVB configs may use multi-threaded forcewake */
@@ -1302,11 +1299,9 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev)
                 fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
                                FORCEWAKE_MT, FORCEWAKE_MT_ACK);
 
-                mutex_lock(&dev->struct_mutex);
                 fw_domains_get_with_thread_status(dev_priv, FORCEWAKE_ALL);
                 ecobus = __raw_i915_read32(dev_priv, ECOBUS);
                 fw_domains_put_with_fifo(dev_priv, FORCEWAKE_ALL);
-                mutex_unlock(&dev->struct_mutex);
 
                 if (!(ecobus & FORCEWAKE_MT_ENABLE)) {
                         DRM_INFO("No MT forcewake available on Ivybridge, this can result in issues\n");
@@ -1314,7 +1309,7 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev)
                         fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
                                        FORCEWAKE, FORCEWAKE_ACK);
                 }
-        } else if (IS_GEN6(dev)) {
+        } else if (IS_GEN6(dev_priv)) {
                 dev_priv->uncore.funcs.force_wake_get =
                         fw_domains_get_with_thread_status;
                 dev_priv->uncore.funcs.force_wake_put =
@@ -1327,26 +1322,24 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev)
         WARN_ON(dev_priv->uncore.fw_domains == 0);
 }
 
-void intel_uncore_init(struct drm_device *dev)
+void intel_uncore_init(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        i915_check_vgpu(dev);
+        i915_check_vgpu(dev_priv);
 
         intel_uncore_edram_detect(dev_priv);
-        intel_uncore_fw_domains_init(dev);
-        __intel_uncore_early_sanitize(dev, false);
+        intel_uncore_fw_domains_init(dev_priv);
+        __intel_uncore_early_sanitize(dev_priv, false);
 
         dev_priv->uncore.unclaimed_mmio_check = 1;
 
-        switch (INTEL_INFO(dev)->gen) {
+        switch (INTEL_INFO(dev_priv)->gen) {
         default:
         case 9:
                 ASSIGN_WRITE_MMIO_VFUNCS(gen9);
                 ASSIGN_READ_MMIO_VFUNCS(gen9);
                 break;
         case 8:
-                if (IS_CHERRYVIEW(dev)) {
+                if (IS_CHERRYVIEW(dev_priv)) {
                         ASSIGN_WRITE_MMIO_VFUNCS(chv);
                         ASSIGN_READ_MMIO_VFUNCS(chv);
 
@@ -1357,13 +1350,13 @@ void intel_uncore_init(struct drm_device *dev)
                 break;
         case 7:
         case 6:
-                if (IS_HASWELL(dev)) {
+                if (IS_HASWELL(dev_priv)) {
                         ASSIGN_WRITE_MMIO_VFUNCS(hsw);
                 } else {
                         ASSIGN_WRITE_MMIO_VFUNCS(gen6);
                 }
 
-                if (IS_VALLEYVIEW(dev)) {
+                if (IS_VALLEYVIEW(dev_priv)) {
                         ASSIGN_READ_MMIO_VFUNCS(vlv);
                 } else {
                         ASSIGN_READ_MMIO_VFUNCS(gen6);
@@ -1381,24 +1374,24 @@ void intel_uncore_init(struct drm_device *dev)
                 break;
         }
 
-        if (intel_vgpu_active(dev)) {
+        if (intel_vgpu_active(dev_priv)) {
                 ASSIGN_WRITE_MMIO_VFUNCS(vgpu);
                 ASSIGN_READ_MMIO_VFUNCS(vgpu);
         }
 
-        i915_check_and_clear_faults(dev);
+        i915_check_and_clear_faults(dev_priv);
 }
 #undef ASSIGN_WRITE_MMIO_VFUNCS
 #undef ASSIGN_READ_MMIO_VFUNCS
 
-void intel_uncore_fini(struct drm_device *dev)
+void intel_uncore_fini(struct drm_i915_private *dev_priv)
 {
         /* Paranoia: make sure we have disabled everything before we exit. */
-        intel_uncore_sanitize(dev);
-        intel_uncore_forcewake_reset(dev, false);
+        intel_uncore_sanitize(dev_priv);
+        intel_uncore_forcewake_reset(dev_priv, false);
 }
 
-#define GEN_RANGE(l, h) GENMASK(h, l)
+#define GEN_RANGE(l, h) GENMASK((h) - 1, (l) - 1)
 
 static const struct register_whitelist {
         i915_reg_t offset_ldw, offset_udw;
@@ -1423,7 +1416,7 @@ int i915_reg_read_ioctl(struct drm_device *dev,
 
         for (i = 0; i < ARRAY_SIZE(whitelist); i++, entry++) {
                 if (i915_mmio_reg_offset(entry->offset_ldw) == (reg->offset & -entry->size) &&
-                    (1 << INTEL_INFO(dev)->gen & entry->gen_bitmask))
+                    (INTEL_INFO(dev)->gen_mask & entry->gen_bitmask))
                         break;
         }
 
@@ -1467,83 +1460,47 @@ out:
         return ret;
 }
 
-int i915_get_reset_stats_ioctl(struct drm_device *dev,
-                               void *data, struct drm_file *file)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_i915_reset_stats *args = data;
-        struct i915_ctx_hang_stats *hs;
-        struct intel_context *ctx;
-        int ret;
-
-        if (args->flags || args->pad)
-                return -EINVAL;
-
-        if (args->ctx_id == DEFAULT_CONTEXT_HANDLE && !capable(CAP_SYS_ADMIN))
-                return -EPERM;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
-
-        ctx = i915_gem_context_get(file->driver_priv, args->ctx_id);
-        if (IS_ERR(ctx)) {
-                mutex_unlock(&dev->struct_mutex);
-                return PTR_ERR(ctx);
-        }
-        hs = &ctx->hang_stats;
-
-        if (capable(CAP_SYS_ADMIN))
-                args->reset_count = i915_reset_count(&dev_priv->gpu_error);
-        else
-                args->reset_count = 0;
-
-        args->batch_active = hs->batch_active;
-        args->batch_pending = hs->batch_pending;
-
-        mutex_unlock(&dev->struct_mutex);
-
-        return 0;
-}
-
-static int i915_reset_complete(struct drm_device *dev)
+static int i915_reset_complete(struct pci_dev *pdev)
 {
         u8 gdrst;
-        pci_read_config_byte(dev->pdev, I915_GDRST, &gdrst);
+        pci_read_config_byte(pdev, I915_GDRST, &gdrst);
         return (gdrst & GRDOM_RESET_STATUS) == 0;
 }
 
-static int i915_do_reset(struct drm_device *dev, unsigned engine_mask)
+static int i915_do_reset(struct drm_i915_private *dev_priv, unsigned engine_mask)
 {
+        struct pci_dev *pdev = dev_priv->dev->pdev;
+
         /* assert reset for at least 20 usec */
-        pci_write_config_byte(dev->pdev, I915_GDRST, GRDOM_RESET_ENABLE);
+        pci_write_config_byte(pdev, I915_GDRST, GRDOM_RESET_ENABLE);
         udelay(20);
-        pci_write_config_byte(dev->pdev, I915_GDRST, 0);
+        pci_write_config_byte(pdev, I915_GDRST, 0);
 
-        return wait_for(i915_reset_complete(dev), 500);
+        return wait_for(i915_reset_complete(pdev), 500);
 }
 
-static int g4x_reset_complete(struct drm_device *dev)
+static int g4x_reset_complete(struct pci_dev *pdev)
 {
         u8 gdrst;
-        pci_read_config_byte(dev->pdev, I915_GDRST, &gdrst);
+        pci_read_config_byte(pdev, I915_GDRST, &gdrst);
         return (gdrst & GRDOM_RESET_ENABLE) == 0;
 }
 
-static int g33_do_reset(struct drm_device *dev, unsigned engine_mask)
+static int g33_do_reset(struct drm_i915_private *dev_priv, unsigned engine_mask)
 {
-        pci_write_config_byte(dev->pdev, I915_GDRST, GRDOM_RESET_ENABLE);
-        return wait_for(g4x_reset_complete(dev), 500);
+        struct pci_dev *pdev = dev_priv->dev->pdev;
+        pci_write_config_byte(pdev, I915_GDRST, GRDOM_RESET_ENABLE);
+        return wait_for(g4x_reset_complete(pdev), 500);
 }
 
-static int g4x_do_reset(struct drm_device *dev, unsigned engine_mask)
+static int g4x_do_reset(struct drm_i915_private *dev_priv, unsigned engine_mask)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct pci_dev *pdev = dev_priv->dev->pdev;
         int ret;
 
-        pci_write_config_byte(dev->pdev, I915_GDRST,
+        pci_write_config_byte(pdev, I915_GDRST,
                               GRDOM_RENDER | GRDOM_RESET_ENABLE);
-        ret =  wait_for(g4x_reset_complete(dev), 500);
+        ret =  wait_for(g4x_reset_complete(pdev), 500);
         if (ret)
                 return ret;
 
@@ -1551,9 +1508,9 @@ static int g4x_do_reset(struct drm_device *dev, unsigned engine_mask)
         I915_WRITE(VDECCLK_GATE_D, I915_READ(VDECCLK_GATE_D) | VCP_UNIT_CLOCK_GATE_DISABLE);
         POSTING_READ(VDECCLK_GATE_D);
 
-        pci_write_config_byte(dev->pdev, I915_GDRST,
+        pci_write_config_byte(pdev, I915_GDRST,
                               GRDOM_MEDIA | GRDOM_RESET_ENABLE);
-        ret =  wait_for(g4x_reset_complete(dev), 500);
+        ret =  wait_for(g4x_reset_complete(pdev), 500);
         if (ret)
                 return ret;
 
@@ -1561,14 +1518,14 @@ static int g4x_do_reset(struct drm_device *dev, unsigned engine_mask)
         I915_WRITE(VDECCLK_GATE_D, I915_READ(VDECCLK_GATE_D) & ~VCP_UNIT_CLOCK_GATE_DISABLE);
         POSTING_READ(VDECCLK_GATE_D);
 
-        pci_write_config_byte(dev->pdev, I915_GDRST, 0);
+        pci_write_config_byte(pdev, I915_GDRST, 0);
 
         return 0;
 }
 
-static int ironlake_do_reset(struct drm_device *dev, unsigned engine_mask)
+static int ironlake_do_reset(struct drm_i915_private *dev_priv,
+                             unsigned engine_mask)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         int ret;
 
         I915_WRITE(ILK_GDSR,
@@ -1612,7 +1569,7 @@ static int gen6_hw_domain_reset(struct drm_i915_private *dev_priv,
 
 /**
  * gen6_reset_engines - reset individual engines
- * @dev: DRM device
+ * @dev_priv: i915 device
  * @engine_mask: mask of intel_ring_flag() engines or ALL_ENGINES for full reset
  *
  * This function will reset the individual engines that are set in engine_mask.
@@ -1623,9 +1580,9 @@ static int gen6_hw_domain_reset(struct drm_i915_private *dev_priv,
  *
  * Returns 0 on success, nonzero on error.
  */
-static int gen6_reset_engines(struct drm_device *dev, unsigned engine_mask)
+static int gen6_reset_engines(struct drm_i915_private *dev_priv,
+                              unsigned engine_mask)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
         const u32 hw_engine_mask[I915_NUM_ENGINES] = {
                 [RCS] = GEN6_GRDOM_RENDER,
@@ -1647,7 +1604,7 @@ static int gen6_reset_engines(struct drm_device *dev, unsigned engine_mask)
 
         ret = gen6_hw_domain_reset(dev_priv, hw_mask);
 
-        intel_uncore_forcewake_reset(dev, true);
+        intel_uncore_forcewake_reset(dev_priv, true);
 
         return ret;
 }
@@ -1663,8 +1620,8 @@ static int wait_for_register_fw(struct drm_i915_private *dev_priv,
 
 static int gen8_request_engine_reset(struct intel_engine_cs *engine)
 {
+        struct drm_i915_private *dev_priv = engine->i915;
         int ret;
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
 
         I915_WRITE_FW(RING_RESET_CTL(engine->mmio_base),
                       _MASKED_BIT_ENABLE(RESET_CTL_REQUEST_RESET));
@@ -1682,22 +1639,22 @@ static int gen8_request_engine_reset(struct intel_engine_cs *engine)
 
 static void gen8_unrequest_engine_reset(struct intel_engine_cs *engine)
 {
-        struct drm_i915_private *dev_priv = engine->dev->dev_private;
+        struct drm_i915_private *dev_priv = engine->i915;
 
         I915_WRITE_FW(RING_RESET_CTL(engine->mmio_base),
                       _MASKED_BIT_DISABLE(RESET_CTL_REQUEST_RESET));
 }
 
-static int gen8_reset_engines(struct drm_device *dev, unsigned engine_mask)
+static int gen8_reset_engines(struct drm_i915_private *dev_priv,
+                              unsigned engine_mask)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *engine;
 
         for_each_engine_masked(engine, dev_priv, engine_mask)
                 if (gen8_request_engine_reset(engine))
                         goto not_ready;
 
-        return gen6_reset_engines(dev, engine_mask);
+        return gen6_reset_engines(dev_priv, engine_mask);
 
 not_ready:
         for_each_engine_masked(engine, dev_priv, engine_mask)
@@ -1706,35 +1663,35 @@ not_ready:
         return -EIO;
 }
 
-static int (*intel_get_gpu_reset(struct drm_device *dev))(struct drm_device *,
-                                                          unsigned engine_mask)
+typedef int (*reset_func)(struct drm_i915_private *, unsigned engine_mask);
+
+static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)
 {
         if (!i915.reset)
                 return NULL;
 
-        if (INTEL_INFO(dev)->gen >= 8)
+        if (INTEL_INFO(dev_priv)->gen >= 8)
                 return gen8_reset_engines;
-        else if (INTEL_INFO(dev)->gen >= 6)
+        else if (INTEL_INFO(dev_priv)->gen >= 6)
                 return gen6_reset_engines;
-        else if (IS_GEN5(dev))
+        else if (IS_GEN5(dev_priv))
                 return ironlake_do_reset;
-        else if (IS_G4X(dev))
+        else if (IS_G4X(dev_priv))
                 return g4x_do_reset;
-        else if (IS_G33(dev))
+        else if (IS_G33(dev_priv))
                 return g33_do_reset;
-        else if (INTEL_INFO(dev)->gen >= 3)
+        else if (INTEL_INFO(dev_priv)->gen >= 3)
                 return i915_do_reset;
         else
                 return NULL;
 }
 
-int intel_gpu_reset(struct drm_device *dev, unsigned engine_mask)
+int intel_gpu_reset(struct drm_i915_private *dev_priv, unsigned engine_mask)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
-        int (*reset)(struct drm_device *, unsigned);
+        reset_func reset;
         int ret;
 
-        reset = intel_get_gpu_reset(dev);
+        reset = intel_get_gpu_reset(dev_priv);
         if (reset == NULL)
                 return -ENODEV;
 
@@ -1742,15 +1699,15 @@ int intel_gpu_reset(struct drm_device *dev, unsigned engine_mask)
          * request may be dropped and never completes (causing -EIO).
          */
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
-        ret = reset(dev, engine_mask);
+        ret = reset(dev_priv, engine_mask);
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 
         return ret;
 }
 
-bool intel_has_gpu_reset(struct drm_device *dev)
+bool intel_has_gpu_reset(struct drm_i915_private *dev_priv)
 {
-        return intel_get_gpu_reset(dev) != NULL;
+        return intel_get_gpu_reset(dev_priv) != NULL;
 }
 
 int intel_guc_reset(struct drm_i915_private *dev_priv)
@@ -1758,7 +1715,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)
         int ret;
         unsigned long irqflags;
 
-        if (!i915.enable_guc_submission)
+        if (!HAS_GUC(dev_priv))
                 return -EINVAL;
 
         intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
@@ -1802,10 +1759,10 @@ intel_uncore_forcewake_for_read(struct drm_i915_private *dev_priv,
 {
         enum forcewake_domains fw_domains;
 
-        if (intel_vgpu_active(dev_priv->dev))
+        if (intel_vgpu_active(dev_priv))
                 return 0;
 
-        switch (INTEL_INFO(dev_priv)->gen) {
+        switch (INTEL_GEN(dev_priv)) {
         case 9:
                 fw_domains = __gen9_reg_read_fw_domains(i915_mmio_reg_offset(reg));
                 break;
@@ -1842,10 +1799,10 @@ intel_uncore_forcewake_for_write(struct drm_i915_private *dev_priv,
 {
         enum forcewake_domains fw_domains;
 
-        if (intel_vgpu_active(dev_priv->dev))
+        if (intel_vgpu_active(dev_priv))
                 return 0;
 
-        switch (INTEL_INFO(dev_priv)->gen) {
+        switch (INTEL_GEN(dev_priv)) {
         case 9:
                 fw_domains = __gen9_reg_write_fw_domains(i915_mmio_reg_offset(reg));
                 break;
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index c15051de8023..68db9621f1f0 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -403,9 +403,10 @@ struct lvds_dvo_timing {
         u8 vsync_off:4;
         u8 rsvd0:6;
         u8 hsync_off_hi:2;
-        u8 h_image;
-        u8 v_image;
-        u8 max_hv;
+        u8 himage_lo;
+        u8 vimage_lo;
+        u8 vimage_hi:4;
+        u8 himage_hi:4;
         u8 h_border;
         u8 v_border;
         u8 rsvd1:3;
@@ -446,10 +447,16 @@ struct bdb_lfp_backlight_data_entry {
         u8 obsolete3;
 } __packed;
 
+struct bdb_lfp_backlight_control_method {
+        u8 type:4;
+        u8 controller:4;
+} __packed;
+
 struct bdb_lfp_backlight_data {
         u8 entry_size;
         struct bdb_lfp_backlight_data_entry data[16];
         u8 level[16];
+        struct bdb_lfp_backlight_control_method backlight_control[16];
 } __packed;
 
 struct aimdb_header {
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index 1f14b602882b..7746418a4c08 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -97,8 +97,8 @@ static struct imx_drm_crtc *imx_drm_find_crtc(struct drm_crtc *crtc)
         return NULL;
 }
 
-int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, u32 bus_format,
-                int hsync_pin, int vsync_pin)
+int imx_drm_set_bus_config(struct drm_encoder *encoder, u32 bus_format,
+                int hsync_pin, int vsync_pin, u32 bus_flags)
 {
         struct imx_drm_crtc_helper_funcs *helper;
         struct imx_drm_crtc *imx_crtc;
@@ -110,14 +110,17 @@ int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, u32 bus_format,
         helper = &imx_crtc->imx_drm_helper_funcs;
         if (helper->set_interface_pix_fmt)
                 return helper->set_interface_pix_fmt(encoder->crtc,
-                                        bus_format, hsync_pin, vsync_pin);
+                                        bus_format, hsync_pin, vsync_pin,
+                                        bus_flags);
         return 0;
 }
-EXPORT_SYMBOL_GPL(imx_drm_set_bus_format_pins);
+EXPORT_SYMBOL_GPL(imx_drm_set_bus_config);
 
 int imx_drm_set_bus_format(struct drm_encoder *encoder, u32 bus_format)
 {
-        return imx_drm_set_bus_format_pins(encoder, bus_format, 2, 3);
+        return imx_drm_set_bus_config(encoder, bus_format, 2, 3,
+                                      DRM_BUS_FLAG_DE_HIGH |
+                                      DRM_BUS_FLAG_PIXDATA_NEGEDGE);
 }
 EXPORT_SYMBOL_GPL(imx_drm_set_bus_format);
 
@@ -404,7 +407,6 @@ static struct drm_driver imx_drm_driver = {
         .load                   = imx_drm_driver_load,
         .unload                 = imx_drm_driver_unload,
         .lastclose              = imx_drm_driver_lastclose,
-        .set_busid              = drm_platform_set_busid,
         .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .dumb_create            = drm_gem_cma_dumb_create,
diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h
index b0241b9d1334..74320a1723b7 100644
--- a/drivers/gpu/drm/imx/imx-drm.h
+++ b/drivers/gpu/drm/imx/imx-drm.h
@@ -19,7 +19,8 @@ struct imx_drm_crtc_helper_funcs {
         int (*enable_vblank)(struct drm_crtc *crtc);
         void (*disable_vblank)(struct drm_crtc *crtc);
         int (*set_interface_pix_fmt)(struct drm_crtc *crtc,
-                        u32 bus_format, int hsync_pin, int vsync_pin);
+                        u32 bus_format, int hsync_pin, int vsync_pin,
+                        u32 bus_flags);
         const struct drm_crtc_helper_funcs *crtc_helper_funcs;
         const struct drm_crtc_funcs *crtc_funcs;
 };
@@ -41,8 +42,8 @@ void imx_drm_mode_config_init(struct drm_device *drm);
 
 struct drm_gem_cma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb);
 
-int imx_drm_set_bus_format_pins(struct drm_encoder *encoder,
-                u32 bus_format, int hsync_pin, int vsync_pin);
+int imx_drm_set_bus_config(struct drm_encoder *encoder, u32 bus_format,
+                int hsync_pin, int vsync_pin, u32 bus_flags);
 int imx_drm_set_bus_format(struct drm_encoder *encoder,
                 u32 bus_format);
 
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index a58eee59550a..beff793bb717 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
 #include <linux/of_device.h>
 #include <linux/of_graph.h>
+#include <video/of_display_timing.h>
 #include <video/of_videomode.h>
 #include <linux/regmap.h>
 #include <linux/videodev2.h>
@@ -59,6 +60,7 @@ struct imx_ldb_channel {
         struct drm_encoder encoder;
         struct drm_panel *panel;
         struct device_node *child;
+        struct i2c_adapter *ddc;
         int chno;
         void *edid;
         int edid_len;
@@ -107,6 +109,9 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
                         return num_modes;
         }
 
+        if (!imx_ldb_ch->edid && imx_ldb_ch->ddc)
+                imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
+
         if (imx_ldb_ch->edid) {
                 drm_mode_connector_update_edid_property(connector,
                                                         imx_ldb_ch->edid);
@@ -553,7 +558,8 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
 
         for_each_child_of_node(np, child) {
                 struct imx_ldb_channel *channel;
-                struct device_node *port;
+                struct device_node *ddc_node;
+                struct device_node *ep;
 
                 ret = of_property_read_u32(child, "reg", &i);
                 if (ret || i < 0 || i > 1)
@@ -576,33 +582,54 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
                  * The output port is port@4 with an external 4-port mux or
                  * port@2 with the internal 2-port mux.
                  */
-                port = of_graph_get_port_by_id(child, imx_ldb->lvds_mux ? 4 : 2);
-                if (port) {
-                        struct device_node *endpoint, *remote;
-
-                        endpoint = of_get_child_by_name(port, "endpoint");
-                        if (endpoint) {
-                                remote = of_graph_get_remote_port_parent(endpoint);
-                                if (remote)
-                                        channel->panel = of_drm_find_panel(remote);
-                                else
-                                        return -EPROBE_DEFER;
-                                if (!channel->panel) {
-                                        dev_err(dev, "panel not found: %s\n",
-                                                remote->full_name);
-                                        return -EPROBE_DEFER;
-                                }
+                ep = of_graph_get_endpoint_by_regs(child,
+                                                   imx_ldb->lvds_mux ? 4 : 2,
+                                                   -1);
+                if (ep) {
+                        struct device_node *remote;
+
+                        remote = of_graph_get_remote_port_parent(ep);
+                        of_node_put(ep);
+                        if (remote)
+                                channel->panel = of_drm_find_panel(remote);
+                        else
+                                return -EPROBE_DEFER;
+                        of_node_put(remote);
+                        if (!channel->panel) {
+                                dev_err(dev, "panel not found: %s\n",
+                                        remote->full_name);
+                                return -EPROBE_DEFER;
                         }
                 }
 
-                edidp = of_get_property(child, "edid", &channel->edid_len);
-                if (edidp) {
-                        channel->edid = kmemdup(edidp, channel->edid_len,
-                                                GFP_KERNEL);
-                } else if (!channel->panel) {
-                        ret = of_get_drm_display_mode(child, &channel->mode, 0);
-                        if (!ret)
-                                channel->mode_valid = 1;
+                ddc_node = of_parse_phandle(child, "ddc-i2c-bus", 0);
+                if (ddc_node) {
+                        channel->ddc = of_find_i2c_adapter_by_node(ddc_node);
+                        of_node_put(ddc_node);
+                        if (!channel->ddc) {
+                                dev_warn(dev, "failed to get ddc i2c adapter\n");
+                                return -EPROBE_DEFER;
+                        }
+                }
+
+                if (!channel->ddc) {
+                        /* if no DDC available, fallback to hardcoded EDID */
+                        dev_dbg(dev, "no ddc available\n");
+
+                        edidp = of_get_property(child, "edid",
+                                                &channel->edid_len);
+                        if (edidp) {
+                                channel->edid = kmemdup(edidp,
+                                                        channel->edid_len,
+                                                        GFP_KERNEL);
+                        } else if (!channel->panel) {
+                                /* fallback to display-timings node */
+                                ret = of_get_drm_display_mode(child,
+                                                              &channel->mode,
+                                                              OF_USE_NATIVE_MODE);
+                                if (!ret)
+                                        channel->mode_valid = 1;
+                        }
                 }
 
                 channel->bus_format = of_get_bus_format(dev, child);
@@ -647,6 +674,7 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,
                 channel->encoder.funcs->destroy(&channel->encoder);
 
                 kfree(channel->edid);
+                i2c_put_adapter(channel->ddc);
         }
 }
 
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index ae7a9fb3b8a2..baf788121287 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -294,8 +294,10 @@ static void imx_tve_encoder_prepare(struct drm_encoder *encoder)
 
         switch (tve->mode) {
         case TVE_MODE_VGA:
-                imx_drm_set_bus_format_pins(encoder, MEDIA_BUS_FMT_GBR888_1X24,
-                                            tve->hsync_pin, tve->vsync_pin);
+                imx_drm_set_bus_config(encoder, MEDIA_BUS_FMT_GBR888_1X24,
+                                       tve->hsync_pin, tve->vsync_pin,
+                                       DRM_BUS_FLAG_DE_HIGH |
+                                       DRM_BUS_FLAG_PIXDATA_NEGEDGE);
                 break;
         case TVE_MODE_TVOUT:
                 imx_drm_set_bus_format(encoder, MEDIA_BUS_FMT_YUV8_1X24);
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index b2c30b8d9816..fc040417e1e8 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -66,6 +66,7 @@ struct ipu_crtc {
         struct ipu_flip_work    *flip_work;
         int                     irq;
         u32                     bus_format;
+        u32                     bus_flags;
         int                     di_hsync_pin;
         int                     di_vsync_pin;
 };
@@ -271,8 +272,10 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc,
         else
                 sig_cfg.clkflags = 0;
 
-        sig_cfg.enable_pol = 1;
-        sig_cfg.clk_pol = 0;
+        sig_cfg.enable_pol = !(ipu_crtc->bus_flags & DRM_BUS_FLAG_DE_LOW);
+        /* Default to driving pixel data on negative clock edges */
+        sig_cfg.clk_pol = !!(ipu_crtc->bus_flags &
+                             DRM_BUS_FLAG_PIXDATA_POSEDGE);
         sig_cfg.bus_format = ipu_crtc->bus_format;
         sig_cfg.v_to_h_sync = 0;
         sig_cfg.hsync_pin = ipu_crtc->di_hsync_pin;
@@ -396,11 +399,12 @@ static void ipu_disable_vblank(struct drm_crtc *crtc)
 }
 
 static int ipu_set_interface_pix_fmt(struct drm_crtc *crtc,
-                u32 bus_format, int hsync_pin, int vsync_pin)
+                u32 bus_format, int hsync_pin, int vsync_pin, u32 bus_flags)
 {
         struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 
         ipu_crtc->bus_format = bus_format;
+        ipu_crtc->bus_flags = bus_flags;
         ipu_crtc->di_hsync_pin = hsync_pin;
         ipu_crtc->di_vsync_pin = vsync_pin;
 
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 681ec6eb77d9..a4bb44118d33 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -38,6 +38,8 @@ static const uint32_t ipu_plane_formats[] = {
         DRM_FORMAT_RGBX8888,
         DRM_FORMAT_BGRA8888,
         DRM_FORMAT_BGRA8888,
+        DRM_FORMAT_UYVY,
+        DRM_FORMAT_VYUY,
         DRM_FORMAT_YUYV,
         DRM_FORMAT_YVYU,
         DRM_FORMAT_YUV420,
@@ -428,7 +430,6 @@ static int ipu_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
         if (crtc != plane->crtc)
                 dev_dbg(plane->dev->dev, "crtc change: %p -> %p\n",
                                 plane->crtc, crtc);
-        plane->crtc = crtc;
 
         if (!ipu_plane->enabled)
                 ipu_plane_enable(ipu_plane);
@@ -461,7 +462,7 @@ static void ipu_plane_destroy(struct drm_plane *plane)
         kfree(ipu_plane);
 }
 
-static struct drm_plane_funcs ipu_plane_funcs = {
+static const struct drm_plane_funcs ipu_plane_funcs = {
         .update_plane   = ipu_update_plane,
         .disable_plane  = ipu_disable_plane,
         .destroy        = ipu_plane_destroy,
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 363e2c7741e2..2d1fd02cd3d6 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -35,7 +35,6 @@ struct imx_parallel_display {
         void *edid;
         int edid_len;
         u32 bus_format;
-        int mode_valid;
         struct drm_display_mode mode;
         struct drm_panel *panel;
 };
@@ -68,17 +67,6 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
                 num_modes = drm_add_edid_modes(connector, imxpd->edid);
         }
 
-        if (imxpd->mode_valid) {
-                struct drm_display_mode *mode = drm_mode_create(connector->dev);
-
-                if (!mode)
-                        return -EINVAL;
-                drm_mode_copy(mode, &imxpd->mode);
-                mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
-                drm_mode_probed_add(connector, mode);
-                num_modes++;
-        }
-
         if (np) {
                 struct drm_display_mode *mode = drm_mode_create(connector->dev);
 
@@ -115,8 +103,8 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode)
 static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
 {
         struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
-
-        imx_drm_set_bus_format(encoder, imxpd->bus_format);
+        imx_drm_set_bus_config(encoder, imxpd->bus_format, 2, 3,
+                               imxpd->connector.display_info.bus_flags);
 }
 
 static void imx_pd_encoder_commit(struct drm_encoder *encoder)
@@ -203,7 +191,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
 {
         struct drm_device *drm = data;
         struct device_node *np = dev->of_node;
-        struct device_node *port;
+        struct device_node *ep;
         const u8 *edidp;
         struct imx_parallel_display *imxpd;
         int ret;
@@ -230,18 +218,18 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
         }
 
         /* port@1 is the output port */
-        port = of_graph_get_port_by_id(np, 1);
-        if (port) {
-                struct device_node *endpoint, *remote;
-
-                endpoint = of_get_child_by_name(port, "endpoint");
-                if (endpoint) {
-                        remote = of_graph_get_remote_port_parent(endpoint);
-                        if (remote)
-                                imxpd->panel = of_drm_find_panel(remote);
-                        if (!imxpd->panel)
-                                return -EPROBE_DEFER;
+        ep = of_graph_get_endpoint_by_regs(np, 1, -1);
+        if (ep) {
+                struct device_node *remote;
+
+                remote = of_graph_get_remote_port_parent(ep);
+                of_node_put(ep);
+                if (remote) {
+                        imxpd->panel = of_drm_find_panel(remote);
+                        of_node_put(remote);
                 }
+                if (!imxpd->panel)
+                        return -EPROBE_DEFER;
         }
 
         imxpd->dev = dev;
diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
index eeefc971801a..23ac8041c562 100644
--- a/drivers/gpu/drm/mediatek/Kconfig
+++ b/drivers/gpu/drm/mediatek/Kconfig
@@ -6,7 +6,6 @@ config DRM_MEDIATEK
         select DRM_KMS_HELPER
         select DRM_MIPI_DSI
         select DRM_PANEL
-        select IOMMU_DMA
         select MEMORY
         select MTK_SMI
         help
@@ -14,3 +13,11 @@ config DRM_MEDIATEK
           The module will be called mediatek-drm
           This driver provides kernel mode setting and
           buffer management to userspace.
+
+config DRM_MEDIATEK_HDMI
+        tristate "DRM HDMI Support for Mediatek SoCs"
+        depends on DRM_MEDIATEK
+        select SND_SOC_HDMI_CODEC if SND_SOC
+        select GENERIC_PHY
+        help
+          DRM/KMS HDMI driver for Mediatek SoCs
diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
index 5fcf58e87786..bf2e5be1ab30 100644
--- a/drivers/gpu/drm/mediatek/Makefile
+++ b/drivers/gpu/drm/mediatek/Makefile
@@ -12,3 +12,10 @@ mediatek-drm-y := mtk_disp_ovl.o \
                   mtk_dpi.o
 
 obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
+
+mediatek-drm-hdmi-objs := mtk_cec.o \
+                          mtk_hdmi.o \
+                          mtk_hdmi_ddc.o \
+                          mtk_mt8173_hdmi_phy.o
+
+obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c
new file mode 100644
index 000000000000..7a3eb8c17ef9
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_cec.c
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+
+#include "mtk_cec.h"
+
+#define TR_CONFIG               0x00
+#define CLEAR_CEC_IRQ                   BIT(15)
+
+#define CEC_CKGEN               0x04
+#define CEC_32K_PDN                     BIT(19)
+#define PDN                             BIT(16)
+
+#define RX_EVENT                0x54
+#define HDMI_PORD                       BIT(25)
+#define HDMI_HTPLG                      BIT(24)
+#define HDMI_PORD_INT_EN                BIT(9)
+#define HDMI_HTPLG_INT_EN               BIT(8)
+
+#define RX_GEN_WD               0x58
+#define HDMI_PORD_INT_32K_STATUS        BIT(26)
+#define RX_RISC_INT_32K_STATUS          BIT(25)
+#define HDMI_HTPLG_INT_32K_STATUS       BIT(24)
+#define HDMI_PORD_INT_32K_CLR           BIT(18)
+#define RX_INT_32K_CLR                  BIT(17)
+#define HDMI_HTPLG_INT_32K_CLR          BIT(16)
+#define HDMI_PORD_INT_32K_STA_MASK      BIT(10)
+#define RX_RISC_INT_32K_STA_MASK        BIT(9)
+#define HDMI_HTPLG_INT_32K_STA_MASK     BIT(8)
+#define HDMI_PORD_INT_32K_EN            BIT(2)
+#define RX_INT_32K_EN                   BIT(1)
+#define HDMI_HTPLG_INT_32K_EN           BIT(0)
+
+#define NORMAL_INT_CTRL         0x5C
+#define HDMI_HTPLG_INT_STA              BIT(0)
+#define HDMI_PORD_INT_STA               BIT(1)
+#define HDMI_HTPLG_INT_CLR              BIT(16)
+#define HDMI_PORD_INT_CLR               BIT(17)
+#define HDMI_FULL_INT_CLR               BIT(20)
+
+struct mtk_cec {
+        void __iomem *regs;
+        struct clk *clk;
+        int irq;
+        bool hpd;
+        void (*hpd_event)(bool hpd, struct device *dev);
+        struct device *hdmi_dev;
+        spinlock_t lock;
+};
+
+static void mtk_cec_clear_bits(struct mtk_cec *cec, unsigned int offset,
+                               unsigned int bits)
+{
+        void __iomem *reg = cec->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp &= ~bits;
+        writel(tmp, reg);
+}
+
+static void mtk_cec_set_bits(struct mtk_cec *cec, unsigned int offset,
+                             unsigned int bits)
+{
+        void __iomem *reg = cec->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp |= bits;
+        writel(tmp, reg);
+}
+
+static void mtk_cec_mask(struct mtk_cec *cec, unsigned int offset,
+                         unsigned int val, unsigned int mask)
+{
+        u32 tmp = readl(cec->regs + offset) & ~mask;
+
+        tmp |= val & mask;
+        writel(val, cec->regs + offset);
+}
+
+void mtk_cec_set_hpd_event(struct device *dev,
+                           void (*hpd_event)(bool hpd, struct device *dev),
+                           struct device *hdmi_dev)
+{
+        struct mtk_cec *cec = dev_get_drvdata(dev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&cec->lock, flags);
+        cec->hdmi_dev = hdmi_dev;
+        cec->hpd_event = hpd_event;
+        spin_unlock_irqrestore(&cec->lock, flags);
+}
+
+bool mtk_cec_hpd_high(struct device *dev)
+{
+        struct mtk_cec *cec = dev_get_drvdata(dev);
+        unsigned int status;
+
+        status = readl(cec->regs + RX_EVENT);
+
+        return (status & (HDMI_PORD | HDMI_HTPLG)) == (HDMI_PORD | HDMI_HTPLG);
+}
+
+static void mtk_cec_htplg_irq_init(struct mtk_cec *cec)
+{
+        mtk_cec_mask(cec, CEC_CKGEN, 0 | CEC_32K_PDN, PDN | CEC_32K_PDN);
+        mtk_cec_set_bits(cec, RX_GEN_WD, HDMI_PORD_INT_32K_CLR |
+                         RX_INT_32K_CLR | HDMI_HTPLG_INT_32K_CLR);
+        mtk_cec_mask(cec, RX_GEN_WD, 0, HDMI_PORD_INT_32K_CLR | RX_INT_32K_CLR |
+                     HDMI_HTPLG_INT_32K_CLR | HDMI_PORD_INT_32K_EN |
+                     RX_INT_32K_EN | HDMI_HTPLG_INT_32K_EN);
+}
+
+static void mtk_cec_htplg_irq_enable(struct mtk_cec *cec)
+{
+        mtk_cec_set_bits(cec, RX_EVENT, HDMI_PORD_INT_EN | HDMI_HTPLG_INT_EN);
+}
+
+static void mtk_cec_htplg_irq_disable(struct mtk_cec *cec)
+{
+        mtk_cec_clear_bits(cec, RX_EVENT, HDMI_PORD_INT_EN | HDMI_HTPLG_INT_EN);
+}
+
+static void mtk_cec_clear_htplg_irq(struct mtk_cec *cec)
+{
+        mtk_cec_set_bits(cec, TR_CONFIG, CLEAR_CEC_IRQ);
+        mtk_cec_set_bits(cec, NORMAL_INT_CTRL, HDMI_HTPLG_INT_CLR |
+                         HDMI_PORD_INT_CLR | HDMI_FULL_INT_CLR);
+        mtk_cec_set_bits(cec, RX_GEN_WD, HDMI_PORD_INT_32K_CLR |
+                         RX_INT_32K_CLR | HDMI_HTPLG_INT_32K_CLR);
+        usleep_range(5, 10);
+        mtk_cec_clear_bits(cec, NORMAL_INT_CTRL, HDMI_HTPLG_INT_CLR |
+                           HDMI_PORD_INT_CLR | HDMI_FULL_INT_CLR);
+        mtk_cec_clear_bits(cec, TR_CONFIG, CLEAR_CEC_IRQ);
+        mtk_cec_clear_bits(cec, RX_GEN_WD, HDMI_PORD_INT_32K_CLR |
+                           RX_INT_32K_CLR | HDMI_HTPLG_INT_32K_CLR);
+}
+
+static void mtk_cec_hpd_event(struct mtk_cec *cec, bool hpd)
+{
+        void (*hpd_event)(bool hpd, struct device *dev);
+        struct device *hdmi_dev;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cec->lock, flags);
+        hpd_event = cec->hpd_event;
+        hdmi_dev = cec->hdmi_dev;
+        spin_unlock_irqrestore(&cec->lock, flags);
+
+        if (hpd_event)
+                hpd_event(hpd, hdmi_dev);
+}
+
+static irqreturn_t mtk_cec_htplg_isr_thread(int irq, void *arg)
+{
+        struct device *dev = arg;
+        struct mtk_cec *cec = dev_get_drvdata(dev);
+        bool hpd;
+
+        mtk_cec_clear_htplg_irq(cec);
+        hpd = mtk_cec_hpd_high(dev);
+
+        if (cec->hpd != hpd) {
+                dev_dbg(dev, "hotplug event! cur hpd = %d, hpd = %d\n",
+                        cec->hpd, hpd);
+                cec->hpd = hpd;
+                mtk_cec_hpd_event(cec, hpd);
+        }
+        return IRQ_HANDLED;
+}
+
+static int mtk_cec_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct mtk_cec *cec;
+        struct resource *res;
+        int ret;
+
+        cec = devm_kzalloc(dev, sizeof(*cec), GFP_KERNEL);
+        if (!cec)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, cec);
+        spin_lock_init(&cec->lock);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        cec->regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(cec->regs)) {
+                ret = PTR_ERR(cec->regs);
+                dev_err(dev, "Failed to ioremap cec: %d\n", ret);
+                return ret;
+        }
+
+        cec->clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(cec->clk)) {
+                ret = PTR_ERR(cec->clk);
+                dev_err(dev, "Failed to get cec clock: %d\n", ret);
+                return ret;
+        }
+
+        cec->irq = platform_get_irq(pdev, 0);
+        if (cec->irq < 0) {
+                dev_err(dev, "Failed to get cec irq: %d\n", cec->irq);
+                return cec->irq;
+        }
+
+        ret = devm_request_threaded_irq(dev, cec->irq, NULL,
+                                        mtk_cec_htplg_isr_thread,
+                                        IRQF_SHARED | IRQF_TRIGGER_LOW |
+                                        IRQF_ONESHOT, "hdmi hpd", dev);
+        if (ret) {
+                dev_err(dev, "Failed to register cec irq: %d\n", ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(cec->clk);
+        if (ret) {
+                dev_err(dev, "Failed to enable cec clock: %d\n", ret);
+                return ret;
+        }
+
+        mtk_cec_htplg_irq_init(cec);
+        mtk_cec_htplg_irq_enable(cec);
+
+        return 0;
+}
+
+static int mtk_cec_remove(struct platform_device *pdev)
+{
+        struct mtk_cec *cec = platform_get_drvdata(pdev);
+
+        mtk_cec_htplg_irq_disable(cec);
+        clk_disable_unprepare(cec->clk);
+        return 0;
+}
+
+static const struct of_device_id mtk_cec_of_ids[] = {
+        { .compatible = "mediatek,mt8173-cec", },
+        {}
+};
+
+struct platform_driver mtk_cec_driver = {
+        .probe = mtk_cec_probe,
+        .remove = mtk_cec_remove,
+        .driver = {
+                .name = "mediatek-cec",
+                .of_match_table = mtk_cec_of_ids,
+        },
+};
diff --git a/drivers/gpu/drm/mediatek/mtk_cec.h b/drivers/gpu/drm/mediatek/mtk_cec.h
new file mode 100644
index 000000000000..10057b7eabec
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_cec.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _MTK_CEC_H
+#define _MTK_CEC_H
+
+#include <linux/types.h>
+
+struct device;
+
+void mtk_cec_set_hpd_event(struct device *dev,
+                           void (*hotplug_event)(bool hpd, struct device *dev),
+                           struct device *hdmi_dev);
+bool mtk_cec_hpd_high(struct device *dev);
+
+#endif /* _MTK_CEC_H */
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index d05ca7901315..0186e500d2a5 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -432,11 +432,6 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
         unsigned long pll_rate;
         unsigned int factor;
 
-        if (!dpi) {
-                dev_err(dpi->dev, "invalid argument\n");
-                return -EINVAL;
-        }
-
         pix_rate = 1000UL * mode->clock;
         if (mode->clock <= 74000)
                 factor = 8 * 3;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index b1223d54d0ab..eebb7d881c2b 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -91,7 +91,7 @@ static int mtk_atomic_commit(struct drm_device *drm,
         mutex_lock(&private->commit.lock);
         flush_work(&private->commit.work);
 
-        drm_atomic_helper_swap_state(drm, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (async)
                 mtk_atomic_schedule(private, state);
@@ -243,7 +243,7 @@ static struct drm_driver mtk_drm_driver = {
         .enable_vblank = mtk_drm_crtc_enable_vblank,
         .disable_vblank = mtk_drm_crtc_disable_vblank,
 
-        .gem_free_object = mtk_drm_gem_free_object,
+        .gem_free_object_unlocked = mtk_drm_gem_free_object,
         .gem_vm_ops = &drm_gem_cma_vm_ops,
         .dumb_create = mtk_drm_gem_dumb_create,
         .dumb_map_offset = mtk_drm_gem_dumb_map_offset,
@@ -280,8 +280,6 @@ static int mtk_drm_bind(struct device *dev)
         if (!drm)
                 return -ENOMEM;
 
-        drm_dev_set_unique(drm, dev_name(dev));
-
         drm->dev_private = private;
         private->drm = drm;
 
@@ -293,14 +291,8 @@ static int mtk_drm_bind(struct device *dev)
         if (ret < 0)
                 goto err_deinit;
 
-        ret = drm_connector_register_all(drm);
-        if (ret < 0)
-                goto err_unregister;
-
         return 0;
 
-err_unregister:
-        drm_dev_unregister(drm);
 err_deinit:
         mtk_drm_kms_deinit(drm);
 err_free:
@@ -455,7 +447,6 @@ static int mtk_drm_remove(struct platform_device *pdev)
         struct drm_device *drm = private->drm;
         int i;
 
-        drm_connector_unregister_all(drm);
         drm_dev_unregister(drm);
         mtk_drm_kms_deinit(drm);
         drm_dev_unref(drm);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 51bc8988fc26..3995765a90dc 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -170,6 +170,7 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
 
         return drm_plane_helper_check_update(plane, state->crtc, fb,
                                              &src, &dest, &clip,
+                                             state->rotation,
                                              DRM_PLANE_HELPER_NO_SCALING,
                                              DRM_PLANE_HELPER_NO_SCALING,
                                              true, true, &visible);
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 2d808e59fefd..28b2044ed9f2 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -575,14 +575,6 @@ static int mtk_dsi_connector_get_modes(struct drm_connector *connector)
         return drm_panel_get_modes(dsi->panel);
 }
 
-static struct drm_encoder *mtk_dsi_connector_best_encoder(
-                struct drm_connector *connector)
-{
-        struct mtk_dsi *dsi = connector_to_dsi(connector);
-
-        return &dsi->encoder;
-}
-
 static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = {
         .mode_fixup = mtk_dsi_encoder_mode_fixup,
         .mode_set = mtk_dsi_encoder_mode_set,
@@ -603,7 +595,6 @@ static const struct drm_connector_funcs mtk_dsi_connector_funcs = {
 static const struct drm_connector_helper_funcs
         mtk_dsi_connector_helper_funcs = {
         .get_modes = mtk_dsi_connector_get_modes,
-        .best_encoder = mtk_dsi_connector_best_encoder,
 };
 
 static int mtk_drm_attach_bridge(struct drm_bridge *bridge,
@@ -695,10 +686,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)
 {
         drm_encoder_cleanup(&dsi->encoder);
         /* Skip connector cleanup if creation was delegated to the bridge */
-        if (dsi->conn.dev) {
-                drm_connector_unregister(&dsi->conn);
+        if (dsi->conn.dev)
                 drm_connector_cleanup(&dsi->conn);
-        }
 }
 
 static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
new file mode 100644
index 000000000000..334562d06731
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -0,0 +1,1828 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <linux/arm-smccc.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/hdmi.h>
+#include <linux/i2c.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
+#include <linux/of_platform.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_graph.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <sound/hdmi-codec.h>
+#include "mtk_cec.h"
+#include "mtk_hdmi.h"
+#include "mtk_hdmi_regs.h"
+
+#define NCTS_BYTES      7
+
+enum mtk_hdmi_clk_id {
+        MTK_HDMI_CLK_HDMI_PIXEL,
+        MTK_HDMI_CLK_HDMI_PLL,
+        MTK_HDMI_CLK_AUD_BCLK,
+        MTK_HDMI_CLK_AUD_SPDIF,
+        MTK_HDMI_CLK_COUNT
+};
+
+enum hdmi_aud_input_type {
+        HDMI_AUD_INPUT_I2S = 0,
+        HDMI_AUD_INPUT_SPDIF,
+};
+
+enum hdmi_aud_i2s_fmt {
+        HDMI_I2S_MODE_RJT_24BIT = 0,
+        HDMI_I2S_MODE_RJT_16BIT,
+        HDMI_I2S_MODE_LJT_24BIT,
+        HDMI_I2S_MODE_LJT_16BIT,
+        HDMI_I2S_MODE_I2S_24BIT,
+        HDMI_I2S_MODE_I2S_16BIT
+};
+
+enum hdmi_aud_mclk {
+        HDMI_AUD_MCLK_128FS,
+        HDMI_AUD_MCLK_192FS,
+        HDMI_AUD_MCLK_256FS,
+        HDMI_AUD_MCLK_384FS,
+        HDMI_AUD_MCLK_512FS,
+        HDMI_AUD_MCLK_768FS,
+        HDMI_AUD_MCLK_1152FS,
+};
+
+enum hdmi_aud_channel_type {
+        HDMI_AUD_CHAN_TYPE_1_0 = 0,
+        HDMI_AUD_CHAN_TYPE_1_1,
+        HDMI_AUD_CHAN_TYPE_2_0,
+        HDMI_AUD_CHAN_TYPE_2_1,
+        HDMI_AUD_CHAN_TYPE_3_0,
+        HDMI_AUD_CHAN_TYPE_3_1,
+        HDMI_AUD_CHAN_TYPE_4_0,
+        HDMI_AUD_CHAN_TYPE_4_1,
+        HDMI_AUD_CHAN_TYPE_5_0,
+        HDMI_AUD_CHAN_TYPE_5_1,
+        HDMI_AUD_CHAN_TYPE_6_0,
+        HDMI_AUD_CHAN_TYPE_6_1,
+        HDMI_AUD_CHAN_TYPE_7_0,
+        HDMI_AUD_CHAN_TYPE_7_1,
+        HDMI_AUD_CHAN_TYPE_3_0_LRS,
+        HDMI_AUD_CHAN_TYPE_3_1_LRS,
+        HDMI_AUD_CHAN_TYPE_4_0_CLRS,
+        HDMI_AUD_CHAN_TYPE_4_1_CLRS,
+        HDMI_AUD_CHAN_TYPE_6_1_CS,
+        HDMI_AUD_CHAN_TYPE_6_1_CH,
+        HDMI_AUD_CHAN_TYPE_6_1_OH,
+        HDMI_AUD_CHAN_TYPE_6_1_CHR,
+        HDMI_AUD_CHAN_TYPE_7_1_LH_RH,
+        HDMI_AUD_CHAN_TYPE_7_1_LSR_RSR,
+        HDMI_AUD_CHAN_TYPE_7_1_LC_RC,
+        HDMI_AUD_CHAN_TYPE_7_1_LW_RW,
+        HDMI_AUD_CHAN_TYPE_7_1_LSD_RSD,
+        HDMI_AUD_CHAN_TYPE_7_1_LSS_RSS,
+        HDMI_AUD_CHAN_TYPE_7_1_LHS_RHS,
+        HDMI_AUD_CHAN_TYPE_7_1_CS_CH,
+        HDMI_AUD_CHAN_TYPE_7_1_CS_OH,
+        HDMI_AUD_CHAN_TYPE_7_1_CS_CHR,
+        HDMI_AUD_CHAN_TYPE_7_1_CH_OH,
+        HDMI_AUD_CHAN_TYPE_7_1_CH_CHR,
+        HDMI_AUD_CHAN_TYPE_7_1_OH_CHR,
+        HDMI_AUD_CHAN_TYPE_7_1_LSS_RSS_LSR_RSR,
+        HDMI_AUD_CHAN_TYPE_6_0_CS,
+        HDMI_AUD_CHAN_TYPE_6_0_CH,
+        HDMI_AUD_CHAN_TYPE_6_0_OH,
+        HDMI_AUD_CHAN_TYPE_6_0_CHR,
+        HDMI_AUD_CHAN_TYPE_7_0_LH_RH,
+        HDMI_AUD_CHAN_TYPE_7_0_LSR_RSR,
+        HDMI_AUD_CHAN_TYPE_7_0_LC_RC,
+        HDMI_AUD_CHAN_TYPE_7_0_LW_RW,
+        HDMI_AUD_CHAN_TYPE_7_0_LSD_RSD,
+        HDMI_AUD_CHAN_TYPE_7_0_LSS_RSS,
+        HDMI_AUD_CHAN_TYPE_7_0_LHS_RHS,
+        HDMI_AUD_CHAN_TYPE_7_0_CS_CH,
+        HDMI_AUD_CHAN_TYPE_7_0_CS_OH,
+        HDMI_AUD_CHAN_TYPE_7_0_CS_CHR,
+        HDMI_AUD_CHAN_TYPE_7_0_CH_OH,
+        HDMI_AUD_CHAN_TYPE_7_0_CH_CHR,
+        HDMI_AUD_CHAN_TYPE_7_0_OH_CHR,
+        HDMI_AUD_CHAN_TYPE_7_0_LSS_RSS_LSR_RSR,
+        HDMI_AUD_CHAN_TYPE_8_0_LH_RH_CS,
+        HDMI_AUD_CHAN_TYPE_UNKNOWN = 0xFF
+};
+
+enum hdmi_aud_channel_swap_type {
+        HDMI_AUD_SWAP_LR,
+        HDMI_AUD_SWAP_LFE_CC,
+        HDMI_AUD_SWAP_LSRS,
+        HDMI_AUD_SWAP_RLS_RRS,
+        HDMI_AUD_SWAP_LR_STATUS,
+};
+
+struct hdmi_audio_param {
+        enum hdmi_audio_coding_type aud_codec;
+        enum hdmi_audio_sample_size aud_sampe_size;
+        enum hdmi_aud_input_type aud_input_type;
+        enum hdmi_aud_i2s_fmt aud_i2s_fmt;
+        enum hdmi_aud_mclk aud_mclk;
+        enum hdmi_aud_channel_type aud_input_chan_type;
+        struct hdmi_codec_params codec_params;
+};
+
+struct mtk_hdmi {
+        struct drm_bridge bridge;
+        struct drm_connector conn;
+        struct device *dev;
+        struct phy *phy;
+        struct device *cec_dev;
+        struct i2c_adapter *ddc_adpt;
+        struct clk *clk[MTK_HDMI_CLK_COUNT];
+        struct drm_display_mode mode;
+        bool dvi_mode;
+        u32 min_clock;
+        u32 max_clock;
+        u32 max_hdisplay;
+        u32 max_vdisplay;
+        u32 ibias;
+        u32 ibias_up;
+        struct regmap *sys_regmap;
+        unsigned int sys_offset;
+        void __iomem *regs;
+        enum hdmi_colorspace csp;
+        struct hdmi_audio_param aud_param;
+        bool audio_enable;
+        bool powered;
+        bool enabled;
+};
+
+static inline struct mtk_hdmi *hdmi_ctx_from_bridge(struct drm_bridge *b)
+{
+        return container_of(b, struct mtk_hdmi, bridge);
+}
+
+static inline struct mtk_hdmi *hdmi_ctx_from_conn(struct drm_connector *c)
+{
+        return container_of(c, struct mtk_hdmi, conn);
+}
+
+static u32 mtk_hdmi_read(struct mtk_hdmi *hdmi, u32 offset)
+{
+        return readl(hdmi->regs + offset);
+}
+
+static void mtk_hdmi_write(struct mtk_hdmi *hdmi, u32 offset, u32 val)
+{
+        writel(val, hdmi->regs + offset);
+}
+
+static void mtk_hdmi_clear_bits(struct mtk_hdmi *hdmi, u32 offset, u32 bits)
+{
+        void __iomem *reg = hdmi->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp &= ~bits;
+        writel(tmp, reg);
+}
+
+static void mtk_hdmi_set_bits(struct mtk_hdmi *hdmi, u32 offset, u32 bits)
+{
+        void __iomem *reg = hdmi->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp |= bits;
+        writel(tmp, reg);
+}
+
+static void mtk_hdmi_mask(struct mtk_hdmi *hdmi, u32 offset, u32 val, u32 mask)
+{
+        void __iomem *reg = hdmi->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp = (tmp & ~mask) | (val & mask);
+        writel(tmp, reg);
+}
+
+static void mtk_hdmi_hw_vid_black(struct mtk_hdmi *hdmi, bool black)
+{
+        mtk_hdmi_mask(hdmi, VIDEO_CFG_4, black ? GEN_RGB : NORMAL_PATH,
+                      VIDEO_SOURCE_SEL);
+}
+
+static void mtk_hdmi_hw_make_reg_writable(struct mtk_hdmi *hdmi, bool enable)
+{
+        struct arm_smccc_res res;
+
+        /*
+         * MT8173 HDMI hardware has an output control bit to enable/disable HDMI
+         * output. This bit can only be controlled in ARM supervisor mode.
+         * The ARM trusted firmware provides an API for the HDMI driver to set
+         * this control bit to enable HDMI output in supervisor mode.
+         */
+        arm_smccc_smc(MTK_SIP_SET_AUTHORIZED_SECURE_REG, 0x14000904, 0x80000000,
+                      0, 0, 0, 0, 0, &res);
+
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG20,
+                           HDMI_PCLK_FREE_RUN, enable ? HDMI_PCLK_FREE_RUN : 0);
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG1C,
+                           HDMI_ON | ANLG_ON, enable ? (HDMI_ON | ANLG_ON) : 0);
+}
+
+static void mtk_hdmi_hw_1p4_version_enable(struct mtk_hdmi *hdmi, bool enable)
+{
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG20,
+                           HDMI2P0_EN, enable ? 0 : HDMI2P0_EN);
+}
+
+static void mtk_hdmi_hw_aud_mute(struct mtk_hdmi *hdmi)
+{
+        mtk_hdmi_set_bits(hdmi, GRL_AUDIO_CFG, AUDIO_ZERO);
+}
+
+static void mtk_hdmi_hw_aud_unmute(struct mtk_hdmi *hdmi)
+{
+        mtk_hdmi_clear_bits(hdmi, GRL_AUDIO_CFG, AUDIO_ZERO);
+}
+
+static void mtk_hdmi_hw_reset(struct mtk_hdmi *hdmi)
+{
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG1C,
+                           HDMI_RST, HDMI_RST);
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG1C,
+                           HDMI_RST, 0);
+        mtk_hdmi_clear_bits(hdmi, GRL_CFG3, CFG3_CONTROL_PACKET_DELAY);
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG1C,
+                           ANLG_ON, ANLG_ON);
+}
+
+static void mtk_hdmi_hw_enable_notice(struct mtk_hdmi *hdmi, bool enable_notice)
+{
+        mtk_hdmi_mask(hdmi, GRL_CFG2, enable_notice ? CFG2_NOTICE_EN : 0,
+                      CFG2_NOTICE_EN);
+}
+
+static void mtk_hdmi_hw_write_int_mask(struct mtk_hdmi *hdmi, u32 int_mask)
+{
+        mtk_hdmi_write(hdmi, GRL_INT_MASK, int_mask);
+}
+
+static void mtk_hdmi_hw_enable_dvi_mode(struct mtk_hdmi *hdmi, bool enable)
+{
+        mtk_hdmi_mask(hdmi, GRL_CFG1, enable ? CFG1_DVI : 0, CFG1_DVI);
+}
+
+static void mtk_hdmi_hw_send_info_frame(struct mtk_hdmi *hdmi, u8 *buffer,
+                                        u8 len)
+{
+        u32 ctrl_reg = GRL_CTRL;
+        int i;
+        u8 *frame_data;
+        enum hdmi_infoframe_type frame_type;
+        u8 frame_ver;
+        u8 frame_len;
+        u8 checksum;
+        int ctrl_frame_en = 0;
+
+        frame_type = *buffer;
+        buffer += 1;
+        frame_ver = *buffer;
+        buffer += 1;
+        frame_len = *buffer;
+        buffer += 1;
+        checksum = *buffer;
+        buffer += 1;
+        frame_data = buffer;
+
+        dev_dbg(hdmi->dev,
+                "frame_type:0x%x,frame_ver:0x%x,frame_len:0x%x,checksum:0x%x\n",
+                frame_type, frame_ver, frame_len, checksum);
+
+        switch (frame_type) {
+        case HDMI_INFOFRAME_TYPE_AVI:
+                ctrl_frame_en = CTRL_AVI_EN;
+                ctrl_reg = GRL_CTRL;
+                break;
+        case HDMI_INFOFRAME_TYPE_SPD:
+                ctrl_frame_en = CTRL_SPD_EN;
+                ctrl_reg = GRL_CTRL;
+                break;
+        case HDMI_INFOFRAME_TYPE_AUDIO:
+                ctrl_frame_en = CTRL_AUDIO_EN;
+                ctrl_reg = GRL_CTRL;
+                break;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                ctrl_frame_en = VS_EN;
+                ctrl_reg = GRL_ACP_ISRC_CTRL;
+                break;
+        }
+        mtk_hdmi_clear_bits(hdmi, ctrl_reg, ctrl_frame_en);
+        mtk_hdmi_write(hdmi, GRL_INFOFRM_TYPE, frame_type);
+        mtk_hdmi_write(hdmi, GRL_INFOFRM_VER, frame_ver);
+        mtk_hdmi_write(hdmi, GRL_INFOFRM_LNG, frame_len);
+
+        mtk_hdmi_write(hdmi, GRL_IFM_PORT, checksum);
+        for (i = 0; i < frame_len; i++)
+                mtk_hdmi_write(hdmi, GRL_IFM_PORT, frame_data[i]);
+
+        mtk_hdmi_set_bits(hdmi, ctrl_reg, ctrl_frame_en);
+}
+
+static void mtk_hdmi_hw_send_aud_packet(struct mtk_hdmi *hdmi, bool enable)
+{
+        mtk_hdmi_mask(hdmi, GRL_SHIFT_R2, enable ? 0 : AUDIO_PACKET_OFF,
+                      AUDIO_PACKET_OFF);
+}
+
+static void mtk_hdmi_hw_config_sys(struct mtk_hdmi *hdmi)
+{
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG20,
+                           HDMI_OUT_FIFO_EN | MHL_MODE_ON, 0);
+        usleep_range(2000, 4000);
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG20,
+                           HDMI_OUT_FIFO_EN | MHL_MODE_ON, HDMI_OUT_FIFO_EN);
+}
+
+static void mtk_hdmi_hw_set_deep_color_mode(struct mtk_hdmi *hdmi)
+{
+        regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG20,
+                           DEEP_COLOR_MODE_MASK | DEEP_COLOR_EN,
+                           COLOR_8BIT_MODE);
+}
+
+static void mtk_hdmi_hw_send_av_mute(struct mtk_hdmi *hdmi)
+{
+        mtk_hdmi_clear_bits(hdmi, GRL_CFG4, CTRL_AVMUTE);
+        usleep_range(2000, 4000);
+        mtk_hdmi_set_bits(hdmi, GRL_CFG4, CTRL_AVMUTE);
+}
+
+static void mtk_hdmi_hw_send_av_unmute(struct mtk_hdmi *hdmi)
+{
+        mtk_hdmi_mask(hdmi, GRL_CFG4, CFG4_AV_UNMUTE_EN,
+                      CFG4_AV_UNMUTE_EN | CFG4_AV_UNMUTE_SET);
+        usleep_range(2000, 4000);
+        mtk_hdmi_mask(hdmi, GRL_CFG4, CFG4_AV_UNMUTE_SET,
+                      CFG4_AV_UNMUTE_EN | CFG4_AV_UNMUTE_SET);
+}
+
+static void mtk_hdmi_hw_ncts_enable(struct mtk_hdmi *hdmi, bool on)
+{
+        mtk_hdmi_mask(hdmi, GRL_CTS_CTRL, on ? 0 : CTS_CTRL_SOFT,
+                      CTS_CTRL_SOFT);
+}
+
+static void mtk_hdmi_hw_ncts_auto_write_enable(struct mtk_hdmi *hdmi,
+                                               bool enable)
+{
+        mtk_hdmi_mask(hdmi, GRL_CTS_CTRL, enable ? NCTS_WRI_ANYTIME : 0,
+                      NCTS_WRI_ANYTIME);
+}
+
+static void mtk_hdmi_hw_msic_setting(struct mtk_hdmi *hdmi,
+                                     struct drm_display_mode *mode)
+{
+        mtk_hdmi_clear_bits(hdmi, GRL_CFG4, CFG4_MHL_MODE);
+
+        if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
+            mode->clock == 74250 &&
+            mode->vdisplay == 1080)
+                mtk_hdmi_clear_bits(hdmi, GRL_CFG2, CFG2_MHL_DE_SEL);
+        else
+                mtk_hdmi_set_bits(hdmi, GRL_CFG2, CFG2_MHL_DE_SEL);
+}
+
+static void mtk_hdmi_hw_aud_set_channel_swap(struct mtk_hdmi *hdmi,
+                                        enum hdmi_aud_channel_swap_type swap)
+{
+        u8 swap_bit;
+
+        switch (swap) {
+        case HDMI_AUD_SWAP_LR:
+                swap_bit = LR_SWAP;
+                break;
+        case HDMI_AUD_SWAP_LFE_CC:
+                swap_bit = LFE_CC_SWAP;
+                break;
+        case HDMI_AUD_SWAP_LSRS:
+                swap_bit = LSRS_SWAP;
+                break;
+        case HDMI_AUD_SWAP_RLS_RRS:
+                swap_bit = RLS_RRS_SWAP;
+                break;
+        case HDMI_AUD_SWAP_LR_STATUS:
+                swap_bit = LR_STATUS_SWAP;
+                break;
+        default:
+                swap_bit = LFE_CC_SWAP;
+                break;
+        }
+        mtk_hdmi_mask(hdmi, GRL_CH_SWAP, swap_bit, 0xff);
+}
+
+static void mtk_hdmi_hw_aud_set_bit_num(struct mtk_hdmi *hdmi,
+                                        enum hdmi_audio_sample_size bit_num)
+{
+        u32 val;
+
+        switch (bit_num) {
+        case HDMI_AUDIO_SAMPLE_SIZE_16:
+                val = AOUT_16BIT;
+                break;
+        case HDMI_AUDIO_SAMPLE_SIZE_20:
+                val = AOUT_20BIT;
+                break;
+        case HDMI_AUDIO_SAMPLE_SIZE_24:
+        case HDMI_AUDIO_SAMPLE_SIZE_STREAM:
+                val = AOUT_24BIT;
+                break;
+        }
+
+        mtk_hdmi_mask(hdmi, GRL_AOUT_CFG, val, AOUT_BNUM_SEL_MASK);
+}
+
+static void mtk_hdmi_hw_aud_set_i2s_fmt(struct mtk_hdmi *hdmi,
+                                        enum hdmi_aud_i2s_fmt i2s_fmt)
+{
+        u32 val;
+
+        val = mtk_hdmi_read(hdmi, GRL_CFG0);
+        val &= ~(CFG0_W_LENGTH_MASK | CFG0_I2S_MODE_MASK);
+
+        switch (i2s_fmt) {
+        case HDMI_I2S_MODE_RJT_24BIT:
+                val |= CFG0_I2S_MODE_RTJ | CFG0_W_LENGTH_24BIT;
+                break;
+        case HDMI_I2S_MODE_RJT_16BIT:
+                val |= CFG0_I2S_MODE_RTJ | CFG0_W_LENGTH_16BIT;
+                break;
+        case HDMI_I2S_MODE_LJT_24BIT:
+        default:
+                val |= CFG0_I2S_MODE_LTJ | CFG0_W_LENGTH_24BIT;
+                break;
+        case HDMI_I2S_MODE_LJT_16BIT:
+                val |= CFG0_I2S_MODE_LTJ | CFG0_W_LENGTH_16BIT;
+                break;
+        case HDMI_I2S_MODE_I2S_24BIT:
+                val |= CFG0_I2S_MODE_I2S | CFG0_W_LENGTH_24BIT;
+                break;
+        case HDMI_I2S_MODE_I2S_16BIT:
+                val |= CFG0_I2S_MODE_I2S | CFG0_W_LENGTH_16BIT;
+                break;
+        }
+        mtk_hdmi_write(hdmi, GRL_CFG0, val);
+}
+
+static void mtk_hdmi_hw_audio_config(struct mtk_hdmi *hdmi, bool dst)
+{
+        const u8 mask = HIGH_BIT_RATE | DST_NORMAL_DOUBLE | SACD_DST | DSD_SEL;
+        u8 val;
+
+        /* Disable high bitrate, set DST packet normal/double */
+        mtk_hdmi_clear_bits(hdmi, GRL_AOUT_CFG, HIGH_BIT_RATE_PACKET_ALIGN);
+
+        if (dst)
+                val = DST_NORMAL_DOUBLE | SACD_DST;
+        else
+                val = 0;
+
+        mtk_hdmi_mask(hdmi, GRL_AUDIO_CFG, val, mask);
+}
+
+static void mtk_hdmi_hw_aud_set_i2s_chan_num(struct mtk_hdmi *hdmi,
+                                        enum hdmi_aud_channel_type channel_type,
+                                        u8 channel_count)
+{
+        unsigned int ch_switch;
+        u8 i2s_uv;
+
+        ch_switch = CH_SWITCH(7, 7) | CH_SWITCH(6, 6) |
+                    CH_SWITCH(5, 5) | CH_SWITCH(4, 4) |
+                    CH_SWITCH(3, 3) | CH_SWITCH(1, 2) |
+                    CH_SWITCH(2, 1) | CH_SWITCH(0, 0);
+
+        if (channel_count == 2) {
+                i2s_uv = I2S_UV_CH_EN(0);
+        } else if (channel_count == 3 || channel_count == 4) {
+                if (channel_count == 4 &&
+                    (channel_type == HDMI_AUD_CHAN_TYPE_3_0_LRS ||
+                    channel_type == HDMI_AUD_CHAN_TYPE_4_0))
+                        i2s_uv = I2S_UV_CH_EN(2) | I2S_UV_CH_EN(0);
+                else
+                        i2s_uv = I2S_UV_CH_EN(3) | I2S_UV_CH_EN(2);
+        } else if (channel_count == 6 || channel_count == 5) {
+                if (channel_count == 6 &&
+                    channel_type != HDMI_AUD_CHAN_TYPE_5_1 &&
+                    channel_type != HDMI_AUD_CHAN_TYPE_4_1_CLRS) {
+                        i2s_uv = I2S_UV_CH_EN(3) | I2S_UV_CH_EN(2) |
+                                 I2S_UV_CH_EN(1) | I2S_UV_CH_EN(0);
+                } else {
+                        i2s_uv = I2S_UV_CH_EN(2) | I2S_UV_CH_EN(1) |
+                                 I2S_UV_CH_EN(0);
+                }
+        } else if (channel_count == 8 || channel_count == 7) {
+                i2s_uv = I2S_UV_CH_EN(3) | I2S_UV_CH_EN(2) |
+                         I2S_UV_CH_EN(1) | I2S_UV_CH_EN(0);
+        } else {
+                i2s_uv = I2S_UV_CH_EN(0);
+        }
+
+        mtk_hdmi_write(hdmi, GRL_CH_SW0, ch_switch & 0xff);
+        mtk_hdmi_write(hdmi, GRL_CH_SW1, (ch_switch >> 8) & 0xff);
+        mtk_hdmi_write(hdmi, GRL_CH_SW2, (ch_switch >> 16) & 0xff);
+        mtk_hdmi_write(hdmi, GRL_I2S_UV, i2s_uv);
+}
+
+static void mtk_hdmi_hw_aud_set_input_type(struct mtk_hdmi *hdmi,
+                                           enum hdmi_aud_input_type input_type)
+{
+        u32 val;
+
+        val = mtk_hdmi_read(hdmi, GRL_CFG1);
+        if (input_type == HDMI_AUD_INPUT_I2S &&
+            (val & CFG1_SPDIF) == CFG1_SPDIF) {
+                val &= ~CFG1_SPDIF;
+        } else if (input_type == HDMI_AUD_INPUT_SPDIF &&
+                (val & CFG1_SPDIF) == 0) {
+                val |= CFG1_SPDIF;
+        }
+        mtk_hdmi_write(hdmi, GRL_CFG1, val);
+}
+
+static void mtk_hdmi_hw_aud_set_channel_status(struct mtk_hdmi *hdmi,
+                                               u8 *channel_status)
+{
+        int i;
+
+        for (i = 0; i < 5; i++) {
+                mtk_hdmi_write(hdmi, GRL_I2S_C_STA0 + i * 4, channel_status[i]);
+                mtk_hdmi_write(hdmi, GRL_L_STATUS_0 + i * 4, channel_status[i]);
+                mtk_hdmi_write(hdmi, GRL_R_STATUS_0 + i * 4, channel_status[i]);
+        }
+        for (; i < 24; i++) {
+                mtk_hdmi_write(hdmi, GRL_L_STATUS_0 + i * 4, 0);
+                mtk_hdmi_write(hdmi, GRL_R_STATUS_0 + i * 4, 0);
+        }
+}
+
+static void mtk_hdmi_hw_aud_src_reenable(struct mtk_hdmi *hdmi)
+{
+        u32 val;
+
+        val = mtk_hdmi_read(hdmi, GRL_MIX_CTRL);
+        if (val & MIX_CTRL_SRC_EN) {
+                val &= ~MIX_CTRL_SRC_EN;
+                mtk_hdmi_write(hdmi, GRL_MIX_CTRL, val);
+                usleep_range(255, 512);
+                val |= MIX_CTRL_SRC_EN;
+                mtk_hdmi_write(hdmi, GRL_MIX_CTRL, val);
+        }
+}
+
+static void mtk_hdmi_hw_aud_src_disable(struct mtk_hdmi *hdmi)
+{
+        u32 val;
+
+        val = mtk_hdmi_read(hdmi, GRL_MIX_CTRL);
+        val &= ~MIX_CTRL_SRC_EN;
+        mtk_hdmi_write(hdmi, GRL_MIX_CTRL, val);
+        mtk_hdmi_write(hdmi, GRL_SHIFT_L1, 0x00);
+}
+
+static void mtk_hdmi_hw_aud_set_mclk(struct mtk_hdmi *hdmi,
+                                     enum hdmi_aud_mclk mclk)
+{
+        u32 val;
+
+        val = mtk_hdmi_read(hdmi, GRL_CFG5);
+        val &= CFG5_CD_RATIO_MASK;
+
+        switch (mclk) {
+        case HDMI_AUD_MCLK_128FS:
+                val |= CFG5_FS128;
+                break;
+        case HDMI_AUD_MCLK_256FS:
+                val |= CFG5_FS256;
+                break;
+        case HDMI_AUD_MCLK_384FS:
+                val |= CFG5_FS384;
+                break;
+        case HDMI_AUD_MCLK_512FS:
+                val |= CFG5_FS512;
+                break;
+        case HDMI_AUD_MCLK_768FS:
+                val |= CFG5_FS768;
+                break;
+        default:
+                val |= CFG5_FS256;
+                break;
+        }
+        mtk_hdmi_write(hdmi, GRL_CFG5, val);
+}
+
+struct hdmi_acr_n {
+        unsigned int clock;
+        unsigned int n[3];
+};
+
+/* Recommended N values from HDMI specification, tables 7-1 to 7-3 */
+static const struct hdmi_acr_n hdmi_rec_n_table[] = {
+        /* Clock, N: 32kHz 44.1kHz 48kHz */
+        {  25175, {  4576,  7007,  6864 } },
+        {  74176, { 11648, 17836, 11648 } },
+        { 148352, { 11648,  8918,  5824 } },
+        { 296703, {  5824,  4459,  5824 } },
+        { 297000, {  3072,  4704,  5120 } },
+        {      0, {  4096,  6272,  6144 } }, /* all other TMDS clocks */
+};
+
+/**
+ * hdmi_recommended_n() - Return N value recommended by HDMI specification
+ * @freq: audio sample rate in Hz
+ * @clock: rounded TMDS clock in kHz
+ */
+static unsigned int hdmi_recommended_n(unsigned int freq, unsigned int clock)
+{
+        const struct hdmi_acr_n *recommended;
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(hdmi_rec_n_table) - 1; i++) {
+                if (clock == hdmi_rec_n_table[i].clock)
+                        break;
+        }
+        recommended = hdmi_rec_n_table + i;
+
+        switch (freq) {
+        case 32000:
+                return recommended->n[0];
+        case 44100:
+                return recommended->n[1];
+        case 48000:
+                return recommended->n[2];
+        case 88200:
+                return recommended->n[1] * 2;
+        case 96000:
+                return recommended->n[2] * 2;
+        case 176400:
+                return recommended->n[1] * 4;
+        case 192000:
+                return recommended->n[2] * 4;
+        default:
+                return (128 * freq) / 1000;
+        }
+}
+
+static unsigned int hdmi_mode_clock_to_hz(unsigned int clock)
+{
+        switch (clock) {
+        case 25175:
+                return 25174825;        /* 25.2/1.001 MHz */
+        case 74176:
+                return 74175824;        /* 74.25/1.001 MHz */
+        case 148352:
+                return 148351648;       /* 148.5/1.001 MHz */
+        case 296703:
+                return 296703297;       /* 297/1.001 MHz */
+        default:
+                return clock * 1000;
+        }
+}
+
+static unsigned int hdmi_expected_cts(unsigned int audio_sample_rate,
+                                      unsigned int tmds_clock, unsigned int n)
+{
+        return DIV_ROUND_CLOSEST_ULL((u64)hdmi_mode_clock_to_hz(tmds_clock) * n,
+                                     128 * audio_sample_rate);
+}
+
+static void do_hdmi_hw_aud_set_ncts(struct mtk_hdmi *hdmi, unsigned int n,
+                                    unsigned int cts)
+{
+        unsigned char val[NCTS_BYTES];
+        int i;
+
+        mtk_hdmi_write(hdmi, GRL_NCTS, 0);
+        mtk_hdmi_write(hdmi, GRL_NCTS, 0);
+        mtk_hdmi_write(hdmi, GRL_NCTS, 0);
+        memset(val, 0, sizeof(val));
+
+        val[0] = (cts >> 24) & 0xff;
+        val[1] = (cts >> 16) & 0xff;
+        val[2] = (cts >> 8) & 0xff;
+        val[3] = cts & 0xff;
+
+        val[4] = (n >> 16) & 0xff;
+        val[5] = (n >> 8) & 0xff;
+        val[6] = n & 0xff;
+
+        for (i = 0; i < NCTS_BYTES; i++)
+                mtk_hdmi_write(hdmi, GRL_NCTS, val[i]);
+}
+
+static void mtk_hdmi_hw_aud_set_ncts(struct mtk_hdmi *hdmi,
+                                     unsigned int sample_rate,
+                                     unsigned int clock)
+{
+        unsigned int n, cts;
+
+        n = hdmi_recommended_n(sample_rate, clock);
+        cts = hdmi_expected_cts(sample_rate, clock, n);
+
+        dev_dbg(hdmi->dev, "%s: sample_rate=%u, clock=%d, cts=%u, n=%u\n",
+                __func__, sample_rate, clock, n, cts);
+
+        mtk_hdmi_mask(hdmi, DUMMY_304, AUDIO_I2S_NCTS_SEL_64,
+                      AUDIO_I2S_NCTS_SEL);
+        do_hdmi_hw_aud_set_ncts(hdmi, n, cts);
+}
+
+static u8 mtk_hdmi_aud_get_chnl_count(enum hdmi_aud_channel_type channel_type)
+{
+        switch (channel_type) {
+        case HDMI_AUD_CHAN_TYPE_1_0:
+        case HDMI_AUD_CHAN_TYPE_1_1:
+        case HDMI_AUD_CHAN_TYPE_2_0:
+                return 2;
+        case HDMI_AUD_CHAN_TYPE_2_1:
+        case HDMI_AUD_CHAN_TYPE_3_0:
+                return 3;
+        case HDMI_AUD_CHAN_TYPE_3_1:
+        case HDMI_AUD_CHAN_TYPE_4_0:
+        case HDMI_AUD_CHAN_TYPE_3_0_LRS:
+                return 4;
+        case HDMI_AUD_CHAN_TYPE_4_1:
+        case HDMI_AUD_CHAN_TYPE_5_0:
+        case HDMI_AUD_CHAN_TYPE_3_1_LRS:
+        case HDMI_AUD_CHAN_TYPE_4_0_CLRS:
+                return 5;
+        case HDMI_AUD_CHAN_TYPE_5_1:
+        case HDMI_AUD_CHAN_TYPE_6_0:
+        case HDMI_AUD_CHAN_TYPE_4_1_CLRS:
+        case HDMI_AUD_CHAN_TYPE_6_0_CS:
+        case HDMI_AUD_CHAN_TYPE_6_0_CH:
+        case HDMI_AUD_CHAN_TYPE_6_0_OH:
+        case HDMI_AUD_CHAN_TYPE_6_0_CHR:
+                return 6;
+        case HDMI_AUD_CHAN_TYPE_6_1:
+        case HDMI_AUD_CHAN_TYPE_6_1_CS:
+        case HDMI_AUD_CHAN_TYPE_6_1_CH:
+        case HDMI_AUD_CHAN_TYPE_6_1_OH:
+        case HDMI_AUD_CHAN_TYPE_6_1_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_0:
+        case HDMI_AUD_CHAN_TYPE_7_0_LH_RH:
+        case HDMI_AUD_CHAN_TYPE_7_0_LSR_RSR:
+        case HDMI_AUD_CHAN_TYPE_7_0_LC_RC:
+        case HDMI_AUD_CHAN_TYPE_7_0_LW_RW:
+        case HDMI_AUD_CHAN_TYPE_7_0_LSD_RSD:
+        case HDMI_AUD_CHAN_TYPE_7_0_LSS_RSS:
+        case HDMI_AUD_CHAN_TYPE_7_0_LHS_RHS:
+        case HDMI_AUD_CHAN_TYPE_7_0_CS_CH:
+        case HDMI_AUD_CHAN_TYPE_7_0_CS_OH:
+        case HDMI_AUD_CHAN_TYPE_7_0_CS_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_0_CH_OH:
+        case HDMI_AUD_CHAN_TYPE_7_0_CH_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_0_OH_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_0_LSS_RSS_LSR_RSR:
+        case HDMI_AUD_CHAN_TYPE_8_0_LH_RH_CS:
+                return 7;
+        case HDMI_AUD_CHAN_TYPE_7_1:
+        case HDMI_AUD_CHAN_TYPE_7_1_LH_RH:
+        case HDMI_AUD_CHAN_TYPE_7_1_LSR_RSR:
+        case HDMI_AUD_CHAN_TYPE_7_1_LC_RC:
+        case HDMI_AUD_CHAN_TYPE_7_1_LW_RW:
+        case HDMI_AUD_CHAN_TYPE_7_1_LSD_RSD:
+        case HDMI_AUD_CHAN_TYPE_7_1_LSS_RSS:
+        case HDMI_AUD_CHAN_TYPE_7_1_LHS_RHS:
+        case HDMI_AUD_CHAN_TYPE_7_1_CS_CH:
+        case HDMI_AUD_CHAN_TYPE_7_1_CS_OH:
+        case HDMI_AUD_CHAN_TYPE_7_1_CS_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_1_CH_OH:
+        case HDMI_AUD_CHAN_TYPE_7_1_CH_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_1_OH_CHR:
+        case HDMI_AUD_CHAN_TYPE_7_1_LSS_RSS_LSR_RSR:
+                return 8;
+        default:
+                return 2;
+        }
+}
+
+static int mtk_hdmi_video_change_vpll(struct mtk_hdmi *hdmi, u32 clock)
+{
+        unsigned long rate;
+        int ret;
+
+        /* The DPI driver already should have set TVDPLL to the correct rate */
+        ret = clk_set_rate(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL], clock);
+        if (ret) {
+                dev_err(hdmi->dev, "Failed to set PLL to %u Hz: %d\n", clock,
+                        ret);
+                return ret;
+        }
+
+        rate = clk_get_rate(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]);
+
+        if (DIV_ROUND_CLOSEST(rate, 1000) != DIV_ROUND_CLOSEST(clock, 1000))
+                dev_warn(hdmi->dev, "Want PLL %u Hz, got %lu Hz\n", clock,
+                         rate);
+        else
+                dev_dbg(hdmi->dev, "Want PLL %u Hz, got %lu Hz\n", clock, rate);
+
+        mtk_hdmi_hw_config_sys(hdmi);
+        mtk_hdmi_hw_set_deep_color_mode(hdmi);
+        return 0;
+}
+
+static void mtk_hdmi_video_set_display_mode(struct mtk_hdmi *hdmi,
+                                            struct drm_display_mode *mode)
+{
+        mtk_hdmi_hw_reset(hdmi);
+        mtk_hdmi_hw_enable_notice(hdmi, true);
+        mtk_hdmi_hw_write_int_mask(hdmi, 0xff);
+        mtk_hdmi_hw_enable_dvi_mode(hdmi, hdmi->dvi_mode);
+        mtk_hdmi_hw_ncts_auto_write_enable(hdmi, true);
+
+        mtk_hdmi_hw_msic_setting(hdmi, mode);
+}
+
+static int mtk_hdmi_aud_enable_packet(struct mtk_hdmi *hdmi, bool enable)
+{
+        mtk_hdmi_hw_send_aud_packet(hdmi, enable);
+        return 0;
+}
+
+static int mtk_hdmi_aud_on_off_hw_ncts(struct mtk_hdmi *hdmi, bool on)
+{
+        mtk_hdmi_hw_ncts_enable(hdmi, on);
+        return 0;
+}
+
+static int mtk_hdmi_aud_set_input(struct mtk_hdmi *hdmi)
+{
+        enum hdmi_aud_channel_type chan_type;
+        u8 chan_count;
+        bool dst;
+
+        mtk_hdmi_hw_aud_set_channel_swap(hdmi, HDMI_AUD_SWAP_LFE_CC);
+        mtk_hdmi_set_bits(hdmi, GRL_MIX_CTRL, MIX_CTRL_FLAT);
+
+        if (hdmi->aud_param.aud_input_type == HDMI_AUD_INPUT_SPDIF &&
+            hdmi->aud_param.aud_codec == HDMI_AUDIO_CODING_TYPE_DST) {
+                mtk_hdmi_hw_aud_set_bit_num(hdmi, HDMI_AUDIO_SAMPLE_SIZE_24);
+        } else if (hdmi->aud_param.aud_i2s_fmt == HDMI_I2S_MODE_LJT_24BIT) {
+                hdmi->aud_param.aud_i2s_fmt = HDMI_I2S_MODE_LJT_16BIT;
+        }
+
+        mtk_hdmi_hw_aud_set_i2s_fmt(hdmi, hdmi->aud_param.aud_i2s_fmt);
+        mtk_hdmi_hw_aud_set_bit_num(hdmi, HDMI_AUDIO_SAMPLE_SIZE_24);
+
+        dst = ((hdmi->aud_param.aud_input_type == HDMI_AUD_INPUT_SPDIF) &&
+               (hdmi->aud_param.aud_codec == HDMI_AUDIO_CODING_TYPE_DST));
+        mtk_hdmi_hw_audio_config(hdmi, dst);
+
+        if (hdmi->aud_param.aud_input_type == HDMI_AUD_INPUT_SPDIF)
+                chan_type = HDMI_AUD_CHAN_TYPE_2_0;
+        else
+                chan_type = hdmi->aud_param.aud_input_chan_type;
+        chan_count = mtk_hdmi_aud_get_chnl_count(chan_type);
+        mtk_hdmi_hw_aud_set_i2s_chan_num(hdmi, chan_type, chan_count);
+        mtk_hdmi_hw_aud_set_input_type(hdmi, hdmi->aud_param.aud_input_type);
+
+        return 0;
+}
+
+static int mtk_hdmi_aud_set_src(struct mtk_hdmi *hdmi,
+                                struct drm_display_mode *display_mode)
+{
+        unsigned int sample_rate = hdmi->aud_param.codec_params.sample_rate;
+
+        mtk_hdmi_aud_on_off_hw_ncts(hdmi, false);
+        mtk_hdmi_hw_aud_src_disable(hdmi);
+        mtk_hdmi_clear_bits(hdmi, GRL_CFG2, CFG2_ACLK_INV);
+
+        if (hdmi->aud_param.aud_input_type == HDMI_AUD_INPUT_I2S) {
+                switch (sample_rate) {
+                case 32000:
+                case 44100:
+                case 48000:
+                case 88200:
+                case 96000:
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                mtk_hdmi_hw_aud_set_mclk(hdmi, hdmi->aud_param.aud_mclk);
+        } else {
+                switch (sample_rate) {
+                case 32000:
+                case 44100:
+                case 48000:
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                mtk_hdmi_hw_aud_set_mclk(hdmi, HDMI_AUD_MCLK_128FS);
+        }
+
+        mtk_hdmi_hw_aud_set_ncts(hdmi, sample_rate, display_mode->clock);
+
+        mtk_hdmi_hw_aud_src_reenable(hdmi);
+        return 0;
+}
+
+static int mtk_hdmi_aud_output_config(struct mtk_hdmi *hdmi,
+                                      struct drm_display_mode *display_mode)
+{
+        mtk_hdmi_hw_aud_mute(hdmi);
+        mtk_hdmi_aud_enable_packet(hdmi, false);
+
+        mtk_hdmi_aud_set_input(hdmi);
+        mtk_hdmi_aud_set_src(hdmi, display_mode);
+        mtk_hdmi_hw_aud_set_channel_status(hdmi,
+                        hdmi->aud_param.codec_params.iec.status);
+
+        usleep_range(50, 100);
+
+        mtk_hdmi_aud_on_off_hw_ncts(hdmi, true);
+        mtk_hdmi_aud_enable_packet(hdmi, true);
+        mtk_hdmi_hw_aud_unmute(hdmi);
+        return 0;
+}
+
+static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi,
+                                        struct drm_display_mode *mode)
+{
+        struct hdmi_avi_infoframe frame;
+        u8 buffer[17];
+        ssize_t err;
+
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
+        if (err < 0) {
+                dev_err(hdmi->dev,
+                        "Failed to get AVI infoframe from mode: %zd\n", err);
+                return err;
+        }
+
+        err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer));
+        if (err < 0) {
+                dev_err(hdmi->dev, "Failed to pack AVI infoframe: %zd\n", err);
+                return err;
+        }
+
+        mtk_hdmi_hw_send_info_frame(hdmi, buffer, sizeof(buffer));
+        return 0;
+}
+
+static int mtk_hdmi_setup_spd_infoframe(struct mtk_hdmi *hdmi,
+                                        const char *vendor,
+                                        const char *product)
+{
+        struct hdmi_spd_infoframe frame;
+        u8 buffer[29];
+        ssize_t err;
+
+        err = hdmi_spd_infoframe_init(&frame, vendor, product);
+        if (err < 0) {
+                dev_err(hdmi->dev, "Failed to initialize SPD infoframe: %zd\n",
+                        err);
+                return err;
+        }
+
+        err = hdmi_spd_infoframe_pack(&frame, buffer, sizeof(buffer));
+        if (err < 0) {
+                dev_err(hdmi->dev, "Failed to pack SDP infoframe: %zd\n", err);
+                return err;
+        }
+
+        mtk_hdmi_hw_send_info_frame(hdmi, buffer, sizeof(buffer));
+        return 0;
+}
+
+static int mtk_hdmi_setup_audio_infoframe(struct mtk_hdmi *hdmi)
+{
+        struct hdmi_audio_infoframe frame;
+        u8 buffer[14];
+        ssize_t err;
+
+        err = hdmi_audio_infoframe_init(&frame);
+        if (err < 0) {
+                dev_err(hdmi->dev, "Failed to setup audio infoframe: %zd\n",
+                        err);
+                return err;
+        }
+
+        frame.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
+        frame.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
+        frame.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
+        frame.channels = mtk_hdmi_aud_get_chnl_count(
+                                        hdmi->aud_param.aud_input_chan_type);
+
+        err = hdmi_audio_infoframe_pack(&frame, buffer, sizeof(buffer));
+        if (err < 0) {
+                dev_err(hdmi->dev, "Failed to pack audio infoframe: %zd\n",
+                        err);
+                return err;
+        }
+
+        mtk_hdmi_hw_send_info_frame(hdmi, buffer, sizeof(buffer));
+        return 0;
+}
+
+static int mtk_hdmi_setup_vendor_specific_infoframe(struct mtk_hdmi *hdmi,
+                                                struct drm_display_mode *mode)
+{
+        struct hdmi_vendor_infoframe frame;
+        u8 buffer[10];
+        ssize_t err;
+
+        err = drm_hdmi_vendor_infoframe_from_display_mode(&frame, mode);
+        if (err) {
+                dev_err(hdmi->dev,
+                        "Failed to get vendor infoframe from mode: %zd\n", err);
+                return err;
+        }
+
+        err = hdmi_vendor_infoframe_pack(&frame, buffer, sizeof(buffer));
+        if (err) {
+                dev_err(hdmi->dev, "Failed to pack vendor infoframe: %zd\n",
+                        err);
+                return err;
+        }
+
+        mtk_hdmi_hw_send_info_frame(hdmi, buffer, sizeof(buffer));
+        return 0;
+}
+
+static int mtk_hdmi_output_init(struct mtk_hdmi *hdmi)
+{
+        struct hdmi_audio_param *aud_param = &hdmi->aud_param;
+
+        hdmi->csp = HDMI_COLORSPACE_RGB;
+        aud_param->aud_codec = HDMI_AUDIO_CODING_TYPE_PCM;
+        aud_param->aud_sampe_size = HDMI_AUDIO_SAMPLE_SIZE_16;
+        aud_param->aud_input_type = HDMI_AUD_INPUT_I2S;
+        aud_param->aud_i2s_fmt = HDMI_I2S_MODE_I2S_24BIT;
+        aud_param->aud_mclk = HDMI_AUD_MCLK_128FS;
+        aud_param->aud_input_chan_type = HDMI_AUD_CHAN_TYPE_2_0;
+
+        return 0;
+}
+
+void mtk_hdmi_audio_enable(struct mtk_hdmi *hdmi)
+{
+        mtk_hdmi_aud_enable_packet(hdmi, true);
+        hdmi->audio_enable = true;
+}
+
+void mtk_hdmi_audio_disable(struct mtk_hdmi *hdmi)
+{
+        mtk_hdmi_aud_enable_packet(hdmi, false);
+        hdmi->audio_enable = false;
+}
+
+int mtk_hdmi_audio_set_param(struct mtk_hdmi *hdmi,
+                             struct hdmi_audio_param *param)
+{
+        if (!hdmi->audio_enable) {
+                dev_err(hdmi->dev, "hdmi audio is in disable state!\n");
+                return -EINVAL;
+        }
+        dev_dbg(hdmi->dev, "codec:%d, input:%d, channel:%d, fs:%d\n",
+                param->aud_codec, param->aud_input_type,
+                param->aud_input_chan_type, param->codec_params.sample_rate);
+        memcpy(&hdmi->aud_param, param, sizeof(*param));
+        return mtk_hdmi_aud_output_config(hdmi, &hdmi->mode);
+}
+
+static int mtk_hdmi_output_set_display_mode(struct mtk_hdmi *hdmi,
+                                            struct drm_display_mode *mode)
+{
+        int ret;
+
+        mtk_hdmi_hw_vid_black(hdmi, true);
+        mtk_hdmi_hw_aud_mute(hdmi);
+        mtk_hdmi_hw_send_av_mute(hdmi);
+        phy_power_off(hdmi->phy);
+
+        ret = mtk_hdmi_video_change_vpll(hdmi,
+                                         mode->clock * 1000);
+        if (ret) {
+                dev_err(hdmi->dev, "Failed to set vpll: %d\n", ret);
+                return ret;
+        }
+        mtk_hdmi_video_set_display_mode(hdmi, mode);
+
+        phy_power_on(hdmi->phy);
+        mtk_hdmi_aud_output_config(hdmi, mode);
+
+        mtk_hdmi_setup_audio_infoframe(hdmi);
+        mtk_hdmi_setup_avi_infoframe(hdmi, mode);
+        mtk_hdmi_setup_spd_infoframe(hdmi, "mediatek", "On-chip HDMI");
+        if (mode->flags & DRM_MODE_FLAG_3D_MASK)
+                mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode);
+
+        mtk_hdmi_hw_vid_black(hdmi, false);
+        mtk_hdmi_hw_aud_unmute(hdmi);
+        mtk_hdmi_hw_send_av_unmute(hdmi);
+
+        return 0;
+}
+
+static const char * const mtk_hdmi_clk_names[MTK_HDMI_CLK_COUNT] = {
+        [MTK_HDMI_CLK_HDMI_PIXEL] = "pixel",
+        [MTK_HDMI_CLK_HDMI_PLL] = "pll",
+        [MTK_HDMI_CLK_AUD_BCLK] = "bclk",
+        [MTK_HDMI_CLK_AUD_SPDIF] = "spdif",
+};
+
+static int mtk_hdmi_get_all_clk(struct mtk_hdmi *hdmi,
+                                struct device_node *np)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mtk_hdmi_clk_names); i++) {
+                hdmi->clk[i] = of_clk_get_by_name(np,
+                                                  mtk_hdmi_clk_names[i]);
+                if (IS_ERR(hdmi->clk[i]))
+                        return PTR_ERR(hdmi->clk[i]);
+        }
+        return 0;
+}
+
+static int mtk_hdmi_clk_enable_audio(struct mtk_hdmi *hdmi)
+{
+        int ret;
+
+        ret = clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_AUD_BCLK]);
+        if (ret)
+                return ret;
+
+        ret = clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_AUD_SPDIF]);
+        if (ret)
+                goto err;
+
+        return 0;
+err:
+        clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_BCLK]);
+        return ret;
+}
+
+static void mtk_hdmi_clk_disable_audio(struct mtk_hdmi *hdmi)
+{
+        clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_BCLK]);
+        clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_SPDIF]);
+}
+
+static enum drm_connector_status hdmi_conn_detect(struct drm_connector *conn,
+                                                  bool force)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
+
+        return mtk_cec_hpd_high(hdmi->cec_dev) ?
+               connector_status_connected : connector_status_disconnected;
+}
+
+static void hdmi_conn_destroy(struct drm_connector *conn)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
+
+        mtk_cec_set_hpd_event(hdmi->cec_dev, NULL, NULL);
+
+        drm_connector_cleanup(conn);
+}
+
+static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
+        struct edid *edid;
+        int ret;
+
+        if (!hdmi->ddc_adpt)
+                return -ENODEV;
+
+        edid = drm_get_edid(conn, hdmi->ddc_adpt);
+        if (!edid)
+                return -ENODEV;
+
+        hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
+
+        drm_mode_connector_update_edid_property(conn, edid);
+
+        ret = drm_add_edid_modes(conn, edid);
+        drm_edid_to_eld(conn, edid);
+        kfree(edid);
+        return ret;
+}
+
+static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,
+                                    struct drm_display_mode *mode)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
+
+        dev_dbg(hdmi->dev, "xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n",
+                mode->hdisplay, mode->vdisplay, mode->vrefresh,
+                !!(mode->flags & DRM_MODE_FLAG_INTERLACE), mode->clock * 1000);
+
+        if (hdmi->bridge.next) {
+                struct drm_display_mode adjusted_mode;
+
+                drm_mode_copy(&adjusted_mode, mode);
+                if (!drm_bridge_mode_fixup(hdmi->bridge.next, mode,
+                                           &adjusted_mode))
+                        return MODE_BAD;
+        }
+
+        if (mode->clock < 27000)
+                return MODE_CLOCK_LOW;
+        if (mode->clock > 297000)
+                return MODE_CLOCK_HIGH;
+
+        return drm_mode_validate_size(mode, 0x1fff, 0x1fff);
+}
+
+static struct drm_encoder *mtk_hdmi_conn_best_enc(struct drm_connector *conn)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
+
+        return hdmi->bridge.encoder;
+}
+
+static const struct drm_connector_funcs mtk_hdmi_connector_funcs = {
+        .dpms = drm_atomic_helper_connector_dpms,
+        .detect = hdmi_conn_detect,
+        .fill_modes = drm_helper_probe_single_connector_modes,
+        .destroy = hdmi_conn_destroy,
+        .reset = drm_atomic_helper_connector_reset,
+        .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+static const struct drm_connector_helper_funcs
+                mtk_hdmi_connector_helper_funcs = {
+        .get_modes = mtk_hdmi_conn_get_modes,
+        .mode_valid = mtk_hdmi_conn_mode_valid,
+        .best_encoder = mtk_hdmi_conn_best_enc,
+};
+
+static void mtk_hdmi_hpd_event(bool hpd, struct device *dev)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+
+        if (hdmi && hdmi->bridge.encoder && hdmi->bridge.encoder->dev)
+                drm_helper_hpd_irq_event(hdmi->bridge.encoder->dev);
+}
+
+/*
+ * Bridge callbacks
+ */
+
+static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
+        int ret;
+
+        ret = drm_connector_init(bridge->encoder->dev, &hdmi->conn,
+                                 &mtk_hdmi_connector_funcs,
+                                 DRM_MODE_CONNECTOR_HDMIA);
+        if (ret) {
+                dev_err(hdmi->dev, "Failed to initialize connector: %d\n", ret);
+                return ret;
+        }
+        drm_connector_helper_add(&hdmi->conn, &mtk_hdmi_connector_helper_funcs);
+
+        hdmi->conn.polled = DRM_CONNECTOR_POLL_HPD;
+        hdmi->conn.interlace_allowed = true;
+        hdmi->conn.doublescan_allowed = false;
+
+        ret = drm_mode_connector_attach_encoder(&hdmi->conn,
+                                                bridge->encoder);
+        if (ret) {
+                dev_err(hdmi->dev,
+                        "Failed to attach connector to encoder: %d\n", ret);
+                return ret;
+        }
+
+        if (bridge->next) {
+                bridge->next->encoder = bridge->encoder;
+                ret = drm_bridge_attach(bridge->encoder->dev, bridge->next);
+                if (ret) {
+                        dev_err(hdmi->dev,
+                                "Failed to attach external bridge: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        mtk_cec_set_hpd_event(hdmi->cec_dev, mtk_hdmi_hpd_event, hdmi->dev);
+
+        return 0;
+}
+
+static bool mtk_hdmi_bridge_mode_fixup(struct drm_bridge *bridge,
+                                       const struct drm_display_mode *mode,
+                                       struct drm_display_mode *adjusted_mode)
+{
+        return true;
+}
+
+static void mtk_hdmi_bridge_disable(struct drm_bridge *bridge)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
+
+        if (!hdmi->enabled)
+                return;
+
+        phy_power_off(hdmi->phy);
+        clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_HDMI_PIXEL]);
+        clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]);
+
+        hdmi->enabled = false;
+}
+
+static void mtk_hdmi_bridge_post_disable(struct drm_bridge *bridge)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
+
+        if (!hdmi->powered)
+                return;
+
+        mtk_hdmi_hw_1p4_version_enable(hdmi, true);
+        mtk_hdmi_hw_make_reg_writable(hdmi, false);
+
+        hdmi->powered = false;
+}
+
+static void mtk_hdmi_bridge_mode_set(struct drm_bridge *bridge,
+                                     struct drm_display_mode *mode,
+                                     struct drm_display_mode *adjusted_mode)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
+
+        dev_dbg(hdmi->dev, "cur info: name:%s, hdisplay:%d\n",
+                adjusted_mode->name, adjusted_mode->hdisplay);
+        dev_dbg(hdmi->dev, "hsync_start:%d,hsync_end:%d, htotal:%d",
+                adjusted_mode->hsync_start, adjusted_mode->hsync_end,
+                adjusted_mode->htotal);
+        dev_dbg(hdmi->dev, "hskew:%d, vdisplay:%d\n",
+                adjusted_mode->hskew, adjusted_mode->vdisplay);
+        dev_dbg(hdmi->dev, "vsync_start:%d, vsync_end:%d, vtotal:%d",
+                adjusted_mode->vsync_start, adjusted_mode->vsync_end,
+                adjusted_mode->vtotal);
+        dev_dbg(hdmi->dev, "vscan:%d, flag:%d\n",
+                adjusted_mode->vscan, adjusted_mode->flags);
+
+        drm_mode_copy(&hdmi->mode, adjusted_mode);
+}
+
+static void mtk_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
+
+        mtk_hdmi_hw_make_reg_writable(hdmi, true);
+        mtk_hdmi_hw_1p4_version_enable(hdmi, true);
+
+        hdmi->powered = true;
+}
+
+static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge)
+{
+        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
+
+        mtk_hdmi_output_set_display_mode(hdmi, &hdmi->mode);
+        clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]);
+        clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PIXEL]);
+        phy_power_on(hdmi->phy);
+
+        hdmi->enabled = true;
+}
+
+static const struct drm_bridge_funcs mtk_hdmi_bridge_funcs = {
+        .attach = mtk_hdmi_bridge_attach,
+        .mode_fixup = mtk_hdmi_bridge_mode_fixup,
+        .disable = mtk_hdmi_bridge_disable,
+        .post_disable = mtk_hdmi_bridge_post_disable,
+        .mode_set = mtk_hdmi_bridge_mode_set,
+        .pre_enable = mtk_hdmi_bridge_pre_enable,
+        .enable = mtk_hdmi_bridge_enable,
+};
+
+static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
+                                   struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct device_node *np = dev->of_node;
+        struct device_node *cec_np, *port, *ep, *remote, *i2c_np;
+        struct platform_device *cec_pdev;
+        struct regmap *regmap;
+        struct resource *mem;
+        int ret;
+
+        ret = mtk_hdmi_get_all_clk(hdmi, np);
+        if (ret) {
+                dev_err(dev, "Failed to get clocks: %d\n", ret);
+                return ret;
+        }
+
+        /* The CEC module handles HDMI hotplug detection */
+        cec_np = of_find_compatible_node(np->parent, NULL,
+                                         "mediatek,mt8173-cec");
+        if (!cec_np) {
+                dev_err(dev, "Failed to find CEC node\n");
+                return -EINVAL;
+        }
+
+        cec_pdev = of_find_device_by_node(cec_np);
+        if (!cec_pdev) {
+                dev_err(hdmi->dev, "Waiting for CEC device %s\n",
+                        cec_np->full_name);
+                return -EPROBE_DEFER;
+        }
+        hdmi->cec_dev = &cec_pdev->dev;
+
+        /*
+         * The mediatek,syscon-hdmi property contains a phandle link to the
+         * MMSYS_CONFIG device and the register offset of the HDMI_SYS_CFG
+         * registers it contains.
+         */
+        regmap = syscon_regmap_lookup_by_phandle(np, "mediatek,syscon-hdmi");
+        ret = of_property_read_u32_index(np, "mediatek,syscon-hdmi", 1,
+                                         &hdmi->sys_offset);
+        if (IS_ERR(regmap))
+                ret = PTR_ERR(regmap);
+        if (ret) {
+                ret = PTR_ERR(regmap);
+                dev_err(dev,
+                        "Failed to get system configuration registers: %d\n",
+                        ret);
+                return ret;
+        }
+        hdmi->sys_regmap = regmap;
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        hdmi->regs = devm_ioremap_resource(dev, mem);
+        if (IS_ERR(hdmi->regs))
+                return PTR_ERR(hdmi->regs);
+
+        port = of_graph_get_port_by_id(np, 1);
+        if (!port) {
+                dev_err(dev, "Missing output port node\n");
+                return -EINVAL;
+        }
+
+        ep = of_get_child_by_name(port, "endpoint");
+        if (!ep) {
+                dev_err(dev, "Missing endpoint node in port %s\n",
+                        port->full_name);
+                of_node_put(port);
+                return -EINVAL;
+        }
+        of_node_put(port);
+
+        remote = of_graph_get_remote_port_parent(ep);
+        if (!remote) {
+                dev_err(dev, "Missing connector/bridge node for endpoint %s\n",
+                        ep->full_name);
+                of_node_put(ep);
+                return -EINVAL;
+        }
+        of_node_put(ep);
+
+        if (!of_device_is_compatible(remote, "hdmi-connector")) {
+                hdmi->bridge.next = of_drm_find_bridge(remote);
+                if (!hdmi->bridge.next) {
+                        dev_err(dev, "Waiting for external bridge\n");
+                        of_node_put(remote);
+                        return -EPROBE_DEFER;
+                }
+        }
+
+        i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0);
+        if (!i2c_np) {
+                dev_err(dev, "Failed to find ddc-i2c-bus node in %s\n",
+                        remote->full_name);
+                of_node_put(remote);
+                return -EINVAL;
+        }
+        of_node_put(remote);
+
+        hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);
+        if (!hdmi->ddc_adpt) {
+                dev_err(dev, "Failed to get ddc i2c adapter by node\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/*
+ * HDMI audio codec callbacks
+ */
+
+static int mtk_hdmi_audio_hw_params(struct device *dev, void *data,
+                                    struct hdmi_codec_daifmt *daifmt,
+                                    struct hdmi_codec_params *params)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+        struct hdmi_audio_param hdmi_params;
+        unsigned int chan = params->cea.channels;
+
+        dev_dbg(hdmi->dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
+                params->sample_rate, params->sample_width, chan);
+
+        if (!hdmi->bridge.encoder)
+                return -ENODEV;
+
+        switch (chan) {
+        case 2:
+                hdmi_params.aud_input_chan_type = HDMI_AUD_CHAN_TYPE_2_0;
+                break;
+        case 4:
+                hdmi_params.aud_input_chan_type = HDMI_AUD_CHAN_TYPE_4_0;
+                break;
+        case 6:
+                hdmi_params.aud_input_chan_type = HDMI_AUD_CHAN_TYPE_5_1;
+                break;
+        case 8:
+                hdmi_params.aud_input_chan_type = HDMI_AUD_CHAN_TYPE_7_1;
+                break;
+        default:
+                dev_err(hdmi->dev, "channel[%d] not supported!\n", chan);
+                return -EINVAL;
+        }
+
+        switch (params->sample_rate) {
+        case 32000:
+        case 44100:
+        case 48000:
+        case 88200:
+        case 96000:
+        case 176400:
+        case 192000:
+                break;
+        default:
+                dev_err(hdmi->dev, "rate[%d] not supported!\n",
+                        params->sample_rate);
+                return -EINVAL;
+        }
+
+        switch (daifmt->fmt) {
+        case HDMI_I2S:
+                hdmi_params.aud_codec = HDMI_AUDIO_CODING_TYPE_PCM;
+                hdmi_params.aud_sampe_size = HDMI_AUDIO_SAMPLE_SIZE_16;
+                hdmi_params.aud_input_type = HDMI_AUD_INPUT_I2S;
+                hdmi_params.aud_i2s_fmt = HDMI_I2S_MODE_I2S_24BIT;
+                hdmi_params.aud_mclk = HDMI_AUD_MCLK_128FS;
+                break;
+        default:
+                dev_err(hdmi->dev, "%s: Invalid DAI format %d\n", __func__,
+                        daifmt->fmt);
+                return -EINVAL;
+        }
+
+        memcpy(&hdmi_params.codec_params, params,
+               sizeof(hdmi_params.codec_params));
+
+        mtk_hdmi_audio_set_param(hdmi, &hdmi_params);
+
+        return 0;
+}
+
+static int mtk_hdmi_audio_startup(struct device *dev, void *data)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+
+        dev_dbg(dev, "%s\n", __func__);
+
+        mtk_hdmi_audio_enable(hdmi);
+
+        return 0;
+}
+
+static void mtk_hdmi_audio_shutdown(struct device *dev, void *data)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+
+        dev_dbg(dev, "%s\n", __func__);
+
+        mtk_hdmi_audio_disable(hdmi);
+}
+
+int mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+
+        dev_dbg(dev, "%s(%d)\n", __func__, enable);
+
+        if (enable)
+                mtk_hdmi_hw_aud_mute(hdmi);
+        else
+                mtk_hdmi_hw_aud_unmute(hdmi);
+
+        return 0;
+}
+
+static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+
+        dev_dbg(dev, "%s\n", __func__);
+
+        memcpy(buf, hdmi->conn.eld, min(sizeof(hdmi->conn.eld), len));
+
+        return 0;
+}
+
+static const struct hdmi_codec_ops mtk_hdmi_audio_codec_ops = {
+        .hw_params = mtk_hdmi_audio_hw_params,
+        .audio_startup = mtk_hdmi_audio_startup,
+        .audio_shutdown = mtk_hdmi_audio_shutdown,
+        .digital_mute = mtk_hdmi_audio_digital_mute,
+        .get_eld = mtk_hdmi_audio_get_eld,
+};
+
+static void mtk_hdmi_register_audio_driver(struct device *dev)
+{
+        struct hdmi_codec_pdata codec_data = {
+                .ops = &mtk_hdmi_audio_codec_ops,
+                .max_i2s_channels = 2,
+                .i2s = 1,
+        };
+        struct platform_device *pdev;
+
+        pdev = platform_device_register_data(dev, HDMI_CODEC_DRV_NAME,
+                                             PLATFORM_DEVID_AUTO, &codec_data,
+                                             sizeof(codec_data));
+        if (IS_ERR(pdev))
+                return;
+
+        DRM_INFO("%s driver bound to HDMI\n", HDMI_CODEC_DRV_NAME);
+}
+
+static int mtk_drm_hdmi_probe(struct platform_device *pdev)
+{
+        struct mtk_hdmi *hdmi;
+        struct device *dev = &pdev->dev;
+        int ret;
+
+        hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
+        if (!hdmi)
+                return -ENOMEM;
+
+        hdmi->dev = dev;
+
+        ret = mtk_hdmi_dt_parse_pdata(hdmi, pdev);
+        if (ret)
+                return ret;
+
+        hdmi->phy = devm_phy_get(dev, "hdmi");
+        if (IS_ERR(hdmi->phy)) {
+                ret = PTR_ERR(hdmi->phy);
+                dev_err(dev, "Failed to get HDMI PHY: %d\n", ret);
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, hdmi);
+
+        ret = mtk_hdmi_output_init(hdmi);
+        if (ret) {
+                dev_err(dev, "Failed to initialize hdmi output\n");
+                return ret;
+        }
+
+        mtk_hdmi_register_audio_driver(dev);
+
+        hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs;
+        hdmi->bridge.of_node = pdev->dev.of_node;
+        ret = drm_bridge_add(&hdmi->bridge);
+        if (ret) {
+                dev_err(dev, "failed to add bridge, ret = %d\n", ret);
+                return ret;
+        }
+
+        ret = mtk_hdmi_clk_enable_audio(hdmi);
+        if (ret) {
+                dev_err(dev, "Failed to enable audio clocks: %d\n", ret);
+                goto err_bridge_remove;
+        }
+
+        dev_dbg(dev, "mediatek hdmi probe success\n");
+        return 0;
+
+err_bridge_remove:
+        drm_bridge_remove(&hdmi->bridge);
+        return ret;
+}
+
+static int mtk_drm_hdmi_remove(struct platform_device *pdev)
+{
+        struct mtk_hdmi *hdmi = platform_get_drvdata(pdev);
+
+        drm_bridge_remove(&hdmi->bridge);
+        mtk_hdmi_clk_disable_audio(hdmi);
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int mtk_hdmi_suspend(struct device *dev)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+
+        mtk_hdmi_clk_disable_audio(hdmi);
+        dev_dbg(dev, "hdmi suspend success!\n");
+        return 0;
+}
+
+static int mtk_hdmi_resume(struct device *dev)
+{
+        struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
+        int ret = 0;
+
+        ret = mtk_hdmi_clk_enable_audio(hdmi);
+        if (ret) {
+                dev_err(dev, "hdmi resume failed!\n");
+                return ret;
+        }
+
+        dev_dbg(dev, "hdmi resume success!\n");
+        return 0;
+}
+#endif
+static SIMPLE_DEV_PM_OPS(mtk_hdmi_pm_ops,
+                         mtk_hdmi_suspend, mtk_hdmi_resume);
+
+static const struct of_device_id mtk_drm_hdmi_of_ids[] = {
+        { .compatible = "mediatek,mt8173-hdmi", },
+        {}
+};
+
+static struct platform_driver mtk_hdmi_driver = {
+        .probe = mtk_drm_hdmi_probe,
+        .remove = mtk_drm_hdmi_remove,
+        .driver = {
+                .name = "mediatek-drm-hdmi",
+                .of_match_table = mtk_drm_hdmi_of_ids,
+                .pm = &mtk_hdmi_pm_ops,
+        },
+};
+
+static struct platform_driver * const mtk_hdmi_drivers[] = {
+        &mtk_hdmi_phy_driver,
+        &mtk_hdmi_ddc_driver,
+        &mtk_cec_driver,
+        &mtk_hdmi_driver,
+};
+
+static int __init mtk_hdmitx_init(void)
+{
+        int ret;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mtk_hdmi_drivers); i++) {
+                ret = platform_driver_register(mtk_hdmi_drivers[i]);
+                if (ret < 0) {
+                        pr_err("Failed to register %s driver: %d\n",
+                               mtk_hdmi_drivers[i]->driver.name, ret);
+                        goto err;
+                }
+        }
+
+        return 0;
+
+err:
+        while (--i >= 0)
+                platform_driver_unregister(mtk_hdmi_drivers[i]);
+
+        return ret;
+}
+
+static void __exit mtk_hdmitx_exit(void)
+{
+        int i;
+
+        for (i = ARRAY_SIZE(mtk_hdmi_drivers) - 1; i >= 0; i--)
+                platform_driver_unregister(mtk_hdmi_drivers[i]);
+}
+
+module_init(mtk_hdmitx_init);
+module_exit(mtk_hdmitx_exit);
+
+MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>");
+MODULE_DESCRIPTION("MediaTek HDMI Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.h b/drivers/gpu/drm/mediatek/mtk_hdmi.h
new file mode 100644
index 000000000000..6371b3de1ff6
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _MTK_HDMI_CTRL_H
+#define _MTK_HDMI_CTRL_H
+
+struct platform_driver;
+
+extern struct platform_driver mtk_cec_driver;
+extern struct platform_driver mtk_hdmi_ddc_driver;
+extern struct platform_driver mtk_hdmi_phy_driver;
+
+#endif /* _MTK_HDMI_CTRL_H */
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c
new file mode 100644
index 000000000000..33c9e1bdb114
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/time.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+
+#define SIF1_CLOK               (288)
+#define DDC_DDCMCTL0            (0x0)
+#define DDCM_ODRAIN                     BIT(31)
+#define DDCM_CLK_DIV_OFFSET             (16)
+#define DDCM_CLK_DIV_MASK               (0xfff << 16)
+#define DDCM_CS_STATUS                  BIT(4)
+#define DDCM_SCL_STATE                  BIT(3)
+#define DDCM_SDA_STATE                  BIT(2)
+#define DDCM_SM0EN                      BIT(1)
+#define DDCM_SCL_STRECH                 BIT(0)
+#define DDC_DDCMCTL1            (0x4)
+#define DDCM_ACK_OFFSET                 (16)
+#define DDCM_ACK_MASK                   (0xff << 16)
+#define DDCM_PGLEN_OFFSET               (8)
+#define DDCM_PGLEN_MASK                 (0x7 << 8)
+#define DDCM_SIF_MODE_OFFSET            (4)
+#define DDCM_SIF_MODE_MASK              (0x7 << 4)
+#define DDCM_START                      (0x1)
+#define DDCM_WRITE_DATA                 (0x2)
+#define DDCM_STOP                       (0x3)
+#define DDCM_READ_DATA_NO_ACK           (0x4)
+#define DDCM_READ_DATA_ACK              (0x5)
+#define DDCM_TRI                        BIT(0)
+#define DDC_DDCMD0              (0x8)
+#define DDCM_DATA3                      (0xff << 24)
+#define DDCM_DATA2                      (0xff << 16)
+#define DDCM_DATA1                      (0xff << 8)
+#define DDCM_DATA0                      (0xff << 0)
+#define DDC_DDCMD1              (0xc)
+#define DDCM_DATA7                      (0xff << 24)
+#define DDCM_DATA6                      (0xff << 16)
+#define DDCM_DATA5                      (0xff << 8)
+#define DDCM_DATA4                      (0xff << 0)
+
+struct mtk_hdmi_ddc {
+        struct i2c_adapter adap;
+        struct clk *clk;
+        void __iomem *regs;
+};
+
+static inline void sif_set_bit(struct mtk_hdmi_ddc *ddc, unsigned int offset,
+                               unsigned int val)
+{
+        writel(readl(ddc->regs + offset) | val, ddc->regs + offset);
+}
+
+static inline void sif_clr_bit(struct mtk_hdmi_ddc *ddc, unsigned int offset,
+                               unsigned int val)
+{
+        writel(readl(ddc->regs + offset) & ~val, ddc->regs + offset);
+}
+
+static inline bool sif_bit_is_set(struct mtk_hdmi_ddc *ddc, unsigned int offset,
+                                  unsigned int val)
+{
+        return (readl(ddc->regs + offset) & val) == val;
+}
+
+static inline void sif_write_mask(struct mtk_hdmi_ddc *ddc, unsigned int offset,
+                                  unsigned int mask, unsigned int shift,
+                                  unsigned int val)
+{
+        unsigned int tmp;
+
+        tmp = readl(ddc->regs + offset);
+        tmp &= ~mask;
+        tmp |= (val << shift) & mask;
+        writel(tmp, ddc->regs + offset);
+}
+
+static inline unsigned int sif_read_mask(struct mtk_hdmi_ddc *ddc,
+                                         unsigned int offset, unsigned int mask,
+                                         unsigned int shift)
+{
+        return (readl(ddc->regs + offset) & mask) >> shift;
+}
+
+static void ddcm_trigger_mode(struct mtk_hdmi_ddc *ddc, int mode)
+{
+        u32 val;
+
+        sif_write_mask(ddc, DDC_DDCMCTL1, DDCM_SIF_MODE_MASK,
+                       DDCM_SIF_MODE_OFFSET, mode);
+        sif_set_bit(ddc, DDC_DDCMCTL1, DDCM_TRI);
+        readl_poll_timeout(ddc->regs + DDC_DDCMCTL1, val,
+                           (val & DDCM_TRI) != DDCM_TRI, 4, 20000);
+}
+
+static int mtk_hdmi_ddc_read_msg(struct mtk_hdmi_ddc *ddc, struct i2c_msg *msg)
+{
+        struct device *dev = ddc->adap.dev.parent;
+        u32 remain_count, ack_count, ack_final, read_count, temp_count;
+        u32 index = 0;
+        u32 ack;
+        int i;
+
+        ddcm_trigger_mode(ddc, DDCM_START);
+        sif_write_mask(ddc, DDC_DDCMD0, 0xff, 0, (msg->addr << 1) | 0x01);
+        sif_write_mask(ddc, DDC_DDCMCTL1, DDCM_PGLEN_MASK, DDCM_PGLEN_OFFSET,
+                       0x00);
+        ddcm_trigger_mode(ddc, DDCM_WRITE_DATA);
+        ack = sif_read_mask(ddc, DDC_DDCMCTL1, DDCM_ACK_MASK, DDCM_ACK_OFFSET);
+        dev_dbg(dev, "ack = 0x%x\n", ack);
+        if (ack != 0x01) {
+                dev_err(dev, "i2c ack err!\n");
+                return -ENXIO;
+        }
+
+        remain_count = msg->len;
+        ack_count = (msg->len - 1) / 8;
+        ack_final = 0;
+
+        while (remain_count > 0) {
+                if (ack_count > 0) {
+                        read_count = 8;
+                        ack_final = 0;
+                        ack_count--;
+                } else {
+                        read_count = remain_count;
+                        ack_final = 1;
+                }
+
+                sif_write_mask(ddc, DDC_DDCMCTL1, DDCM_PGLEN_MASK,
+                               DDCM_PGLEN_OFFSET, read_count - 1);
+                ddcm_trigger_mode(ddc, (ack_final == 1) ?
+                                  DDCM_READ_DATA_NO_ACK :
+                                  DDCM_READ_DATA_ACK);
+
+                ack = sif_read_mask(ddc, DDC_DDCMCTL1, DDCM_ACK_MASK,
+                                    DDCM_ACK_OFFSET);
+                temp_count = 0;
+                while (((ack & (1 << temp_count)) != 0) && (temp_count < 8))
+                        temp_count++;
+                if (((ack_final == 1) && (temp_count != (read_count - 1))) ||
+                    ((ack_final == 0) && (temp_count != read_count))) {
+                        dev_err(dev, "Address NACK! ACK(0x%x)\n", ack);
+                        break;
+                }
+
+                for (i = read_count; i >= 1; i--) {
+                        int shift;
+                        int offset;
+
+                        if (i > 4) {
+                                offset = DDC_DDCMD1;
+                                shift = (i - 5) * 8;
+                        } else {
+                                offset = DDC_DDCMD0;
+                                shift = (i - 1) * 8;
+                        }
+
+                        msg->buf[index + i - 1] = sif_read_mask(ddc, offset,
+                                                                0xff << shift,
+                                                                shift);
+                }
+
+                remain_count -= read_count;
+                index += read_count;
+        }
+
+        return 0;
+}
+
+static int mtk_hdmi_ddc_write_msg(struct mtk_hdmi_ddc *ddc, struct i2c_msg *msg)
+{
+        struct device *dev = ddc->adap.dev.parent;
+        u32 ack;
+
+        ddcm_trigger_mode(ddc, DDCM_START);
+        sif_write_mask(ddc, DDC_DDCMD0, DDCM_DATA0, 0, msg->addr << 1);
+        sif_write_mask(ddc, DDC_DDCMD0, DDCM_DATA1, 8, msg->buf[0]);
+        sif_write_mask(ddc, DDC_DDCMCTL1, DDCM_PGLEN_MASK, DDCM_PGLEN_OFFSET,
+                       0x1);
+        ddcm_trigger_mode(ddc, DDCM_WRITE_DATA);
+
+        ack = sif_read_mask(ddc, DDC_DDCMCTL1, DDCM_ACK_MASK, DDCM_ACK_OFFSET);
+        dev_dbg(dev, "ack = %d\n", ack);
+
+        if (ack != 0x03) {
+                dev_err(dev, "i2c ack err!\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int mtk_hdmi_ddc_xfer(struct i2c_adapter *adapter,
+                             struct i2c_msg *msgs, int num)
+{
+        struct mtk_hdmi_ddc *ddc = adapter->algo_data;
+        struct device *dev = adapter->dev.parent;
+        int ret;
+        int i;
+
+        if (!ddc) {
+                dev_err(dev, "invalid arguments\n");
+                return -EINVAL;
+        }
+
+        sif_set_bit(ddc, DDC_DDCMCTL0, DDCM_SCL_STRECH);
+        sif_set_bit(ddc, DDC_DDCMCTL0, DDCM_SM0EN);
+        sif_clr_bit(ddc, DDC_DDCMCTL0, DDCM_ODRAIN);
+
+        if (sif_bit_is_set(ddc, DDC_DDCMCTL1, DDCM_TRI)) {
+                dev_err(dev, "ddc line is busy!\n");
+                return -EBUSY;
+        }
+
+        sif_write_mask(ddc, DDC_DDCMCTL0, DDCM_CLK_DIV_MASK,
+                       DDCM_CLK_DIV_OFFSET, SIF1_CLOK);
+
+        for (i = 0; i < num; i++) {
+                struct i2c_msg *msg = &msgs[i];
+
+                dev_dbg(dev, "i2c msg, adr:0x%x, flags:%d, len :0x%x\n",
+                        msg->addr, msg->flags, msg->len);
+
+                if (msg->flags & I2C_M_RD)
+                        ret = mtk_hdmi_ddc_read_msg(ddc, msg);
+                else
+                        ret = mtk_hdmi_ddc_write_msg(ddc, msg);
+                if (ret < 0)
+                        goto xfer_end;
+        }
+
+        ddcm_trigger_mode(ddc, DDCM_STOP);
+
+        return i;
+
+xfer_end:
+        ddcm_trigger_mode(ddc, DDCM_STOP);
+        dev_err(dev, "ddc failed!\n");
+        return ret;
+}
+
+static u32 mtk_hdmi_ddc_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+}
+
+static const struct i2c_algorithm mtk_hdmi_ddc_algorithm = {
+        .master_xfer = mtk_hdmi_ddc_xfer,
+        .functionality = mtk_hdmi_ddc_func,
+};
+
+static int mtk_hdmi_ddc_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct mtk_hdmi_ddc *ddc;
+        struct resource *mem;
+        int ret;
+
+        ddc = devm_kzalloc(dev, sizeof(struct mtk_hdmi_ddc), GFP_KERNEL);
+        if (!ddc)
+                return -ENOMEM;
+
+        ddc->clk = devm_clk_get(dev, "ddc-i2c");
+        if (IS_ERR(ddc->clk)) {
+                dev_err(dev, "get ddc_clk failed: %p ,\n", ddc->clk);
+                return PTR_ERR(ddc->clk);
+        }
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ddc->regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(ddc->regs))
+                return PTR_ERR(ddc->regs);
+
+        ret = clk_prepare_enable(ddc->clk);
+        if (ret) {
+                dev_err(dev, "enable ddc clk failed!\n");
+                return ret;
+        }
+
+        strlcpy(ddc->adap.name, "mediatek-hdmi-ddc", sizeof(ddc->adap.name));
+        ddc->adap.owner = THIS_MODULE;
+        ddc->adap.class = I2C_CLASS_DDC;
+        ddc->adap.algo = &mtk_hdmi_ddc_algorithm;
+        ddc->adap.retries = 3;
+        ddc->adap.dev.of_node = dev->of_node;
+        ddc->adap.algo_data = ddc;
+        ddc->adap.dev.parent = &pdev->dev;
+
+        ret = i2c_add_adapter(&ddc->adap);
+        if (ret < 0) {
+                dev_err(dev, "failed to add bus to i2c core\n");
+                goto err_clk_disable;
+        }
+
+        platform_set_drvdata(pdev, ddc);
+
+        dev_dbg(dev, "ddc->adap: %p\n", &ddc->adap);
+        dev_dbg(dev, "ddc->clk: %p\n", ddc->clk);
+        dev_dbg(dev, "physical adr: %pa, end: %pa\n", &mem->start,
+                &mem->end);
+
+        return 0;
+
+err_clk_disable:
+        clk_disable_unprepare(ddc->clk);
+        return ret;
+}
+
+static int mtk_hdmi_ddc_remove(struct platform_device *pdev)
+{
+        struct mtk_hdmi_ddc *ddc = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&ddc->adap);
+        clk_disable_unprepare(ddc->clk);
+
+        return 0;
+}
+
+static const struct of_device_id mtk_hdmi_ddc_match[] = {
+        { .compatible = "mediatek,mt8173-hdmi-ddc", },
+        {},
+};
+
+struct platform_driver mtk_hdmi_ddc_driver = {
+        .probe = mtk_hdmi_ddc_probe,
+        .remove = mtk_hdmi_ddc_remove,
+        .driver = {
+                .name = "mediatek-hdmi-ddc",
+                .of_match_table = mtk_hdmi_ddc_match,
+        },
+};
+
+MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>");
+MODULE_DESCRIPTION("MediaTek HDMI DDC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h b/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h
new file mode 100644
index 000000000000..a5cb07d12c9c
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _MTK_HDMI_REGS_H
+#define _MTK_HDMI_REGS_H
+
+#define GRL_INT_MASK            0x18
+#define GRL_IFM_PORT            0x188
+#define GRL_CH_SWAP             0x198
+#define LR_SWAP                         BIT(0)
+#define LFE_CC_SWAP                     BIT(1)
+#define LSRS_SWAP                       BIT(2)
+#define RLS_RRS_SWAP                    BIT(3)
+#define LR_STATUS_SWAP                  BIT(4)
+#define GRL_I2S_C_STA0          0x140
+#define GRL_I2S_C_STA1          0x144
+#define GRL_I2S_C_STA2          0x148
+#define GRL_I2S_C_STA3          0x14C
+#define GRL_I2S_C_STA4          0x150
+#define GRL_I2S_UV              0x154
+#define I2S_UV_V                        BIT(0)
+#define I2S_UV_U                        BIT(1)
+#define I2S_UV_CH_EN_MASK               0x3c
+#define I2S_UV_CH_EN(x)                 BIT((x) + 2)
+#define I2S_UV_TMDS_DEBUG               BIT(6)
+#define I2S_UV_NORMAL_INFO_INV          BIT(7)
+#define GRL_ACP_ISRC_CTRL       0x158
+#define VS_EN                           BIT(0)
+#define ACP_EN                          BIT(1)
+#define ISRC1_EN                        BIT(2)
+#define ISRC2_EN                        BIT(3)
+#define GAMUT_EN                        BIT(4)
+#define GRL_CTS_CTRL            0x160
+#define CTS_CTRL_SOFT                   BIT(0)
+#define GRL_INT                 0x14
+#define INT_MDI                         BIT(0)
+#define INT_HDCP                        BIT(1)
+#define INT_FIFO_O                      BIT(2)
+#define INT_FIFO_U                      BIT(3)
+#define INT_IFM_ERR                     BIT(4)
+#define INT_INF_DONE                    BIT(5)
+#define INT_NCTS_DONE                   BIT(6)
+#define INT_CTRL_PKT_DONE               BIT(7)
+#define GRL_INT_MASK            0x18
+#define GRL_CTRL                0x1C
+#define CTRL_GEN_EN                     BIT(2)
+#define CTRL_SPD_EN                     BIT(3)
+#define CTRL_MPEG_EN                    BIT(4)
+#define CTRL_AUDIO_EN                   BIT(5)
+#define CTRL_AVI_EN                     BIT(6)
+#define CTRL_AVMUTE                     BIT(7)
+#define GRL_STATUS              0x20
+#define STATUS_HTPLG                    BIT(0)
+#define STATUS_PORD                     BIT(1)
+#define GRL_DIVN                0x170
+#define NCTS_WRI_ANYTIME                BIT(6)
+#define GRL_AUDIO_CFG           0x17C
+#define AUDIO_ZERO                      BIT(0)
+#define HIGH_BIT_RATE                   BIT(1)
+#define SACD_DST                        BIT(2)
+#define DST_NORMAL_DOUBLE               BIT(3)
+#define DSD_INV                         BIT(4)
+#define LR_INV                          BIT(5)
+#define LR_MIX                          BIT(6)
+#define DSD_SEL                         BIT(7)
+#define GRL_NCTS                0x184
+#define GRL_CH_SW0              0x18C
+#define GRL_CH_SW1              0x190
+#define GRL_CH_SW2              0x194
+#define CH_SWITCH(from, to)             ((from) << ((to) * 3))
+#define GRL_INFOFRM_VER         0x19C
+#define GRL_INFOFRM_TYPE        0x1A0
+#define GRL_INFOFRM_LNG         0x1A4
+#define GRL_MIX_CTRL            0x1B4
+#define MIX_CTRL_SRC_EN                 BIT(0)
+#define BYPASS_VOLUME                   BIT(1)
+#define MIX_CTRL_FLAT                   BIT(7)
+#define GRL_AOUT_CFG            0x1C4
+#define AOUT_BNUM_SEL_MASK              0x03
+#define AOUT_24BIT                      0x00
+#define AOUT_20BIT                      0x02
+#define AOUT_16BIT                      0x03
+#define AOUT_FIFO_ADAP_CTRL             BIT(6)
+#define AOUT_BURST_PREAMBLE_EN          BIT(7)
+#define HIGH_BIT_RATE_PACKET_ALIGN      (AOUT_BURST_PREAMBLE_EN | \
+                                         AOUT_FIFO_ADAP_CTRL)
+#define GRL_SHIFT_L1            0x1C0
+#define GRL_SHIFT_R2            0x1B0
+#define AUDIO_PACKET_OFF                BIT(6)
+#define GRL_CFG0                0x24
+#define CFG0_I2S_MODE_MASK              0x3
+#define CFG0_I2S_MODE_RTJ               0x1
+#define CFG0_I2S_MODE_LTJ               0x0
+#define CFG0_I2S_MODE_I2S               0x2
+#define CFG0_W_LENGTH_MASK              0x30
+#define CFG0_W_LENGTH_24BIT             0x00
+#define CFG0_W_LENGTH_16BIT             0x10
+#define GRL_CFG1                0x28
+#define CFG1_EDG_SEL                    BIT(0)
+#define CFG1_SPDIF                      BIT(1)
+#define CFG1_DVI                        BIT(2)
+#define CFG1_HDCP_DEBUG                 BIT(3)
+#define GRL_CFG2                0x2c
+#define CFG2_MHL_DE_SEL                 BIT(3)
+#define CFG2_MHL_FAKE_DE_SEL            BIT(4)
+#define CFG2_MHL_DATA_REMAP             BIT(5)
+#define CFG2_NOTICE_EN                  BIT(6)
+#define CFG2_ACLK_INV                   BIT(7)
+#define GRL_CFG3                0x30
+#define CFG3_AES_KEY_INDEX_MASK         0x3f
+#define CFG3_CONTROL_PACKET_DELAY       BIT(6)
+#define CFG3_KSV_LOAD_START             BIT(7)
+#define GRL_CFG4                0x34
+#define CFG4_AES_KEY_LOAD               BIT(4)
+#define CFG4_AV_UNMUTE_EN               BIT(5)
+#define CFG4_AV_UNMUTE_SET              BIT(6)
+#define CFG4_MHL_MODE                   BIT(7)
+#define GRL_CFG5                0x38
+#define CFG5_CD_RATIO_MASK      0x8F
+#define CFG5_FS128                      (0x1 << 4)
+#define CFG5_FS256                      (0x2 << 4)
+#define CFG5_FS384                      (0x3 << 4)
+#define CFG5_FS512                      (0x4 << 4)
+#define CFG5_FS768                      (0x6 << 4)
+#define DUMMY_304               0x304
+#define CHMO_SEL                        (0x3 << 2)
+#define CHM1_SEL                        (0x3 << 4)
+#define CHM2_SEL                        (0x3 << 6)
+#define AUDIO_I2S_NCTS_SEL              BIT(1)
+#define AUDIO_I2S_NCTS_SEL_64           (1 << 1)
+#define AUDIO_I2S_NCTS_SEL_128          (0 << 1)
+#define NEW_GCP_CTRL                    BIT(0)
+#define NEW_GCP_CTRL_MERGE              BIT(0)
+#define GRL_L_STATUS_0          0x200
+#define GRL_L_STATUS_1          0x204
+#define GRL_L_STATUS_2          0x208
+#define GRL_L_STATUS_3          0x20c
+#define GRL_L_STATUS_4          0x210
+#define GRL_L_STATUS_5          0x214
+#define GRL_L_STATUS_6          0x218
+#define GRL_L_STATUS_7          0x21c
+#define GRL_L_STATUS_8          0x220
+#define GRL_L_STATUS_9          0x224
+#define GRL_L_STATUS_10         0x228
+#define GRL_L_STATUS_11         0x22c
+#define GRL_L_STATUS_12         0x230
+#define GRL_L_STATUS_13         0x234
+#define GRL_L_STATUS_14         0x238
+#define GRL_L_STATUS_15         0x23c
+#define GRL_L_STATUS_16         0x240
+#define GRL_L_STATUS_17         0x244
+#define GRL_L_STATUS_18         0x248
+#define GRL_L_STATUS_19         0x24c
+#define GRL_L_STATUS_20         0x250
+#define GRL_L_STATUS_21         0x254
+#define GRL_L_STATUS_22         0x258
+#define GRL_L_STATUS_23         0x25c
+#define GRL_R_STATUS_0          0x260
+#define GRL_R_STATUS_1          0x264
+#define GRL_R_STATUS_2          0x268
+#define GRL_R_STATUS_3          0x26c
+#define GRL_R_STATUS_4          0x270
+#define GRL_R_STATUS_5          0x274
+#define GRL_R_STATUS_6          0x278
+#define GRL_R_STATUS_7          0x27c
+#define GRL_R_STATUS_8          0x280
+#define GRL_R_STATUS_9          0x284
+#define GRL_R_STATUS_10         0x288
+#define GRL_R_STATUS_11         0x28c
+#define GRL_R_STATUS_12         0x290
+#define GRL_R_STATUS_13         0x294
+#define GRL_R_STATUS_14         0x298
+#define GRL_R_STATUS_15         0x29c
+#define GRL_R_STATUS_16         0x2a0
+#define GRL_R_STATUS_17         0x2a4
+#define GRL_R_STATUS_18         0x2a8
+#define GRL_R_STATUS_19         0x2ac
+#define GRL_R_STATUS_20         0x2b0
+#define GRL_R_STATUS_21         0x2b4
+#define GRL_R_STATUS_22         0x2b8
+#define GRL_R_STATUS_23         0x2bc
+#define GRL_ABIST_CTRL0         0x2D4
+#define GRL_ABIST_CTRL1         0x2D8
+#define ABIST_EN                        BIT(7)
+#define ABIST_DATA_FMT                  (0x7 << 0)
+#define VIDEO_CFG_0             0x380
+#define VIDEO_CFG_1             0x384
+#define VIDEO_CFG_2             0x388
+#define VIDEO_CFG_3             0x38c
+#define VIDEO_CFG_4             0x390
+#define VIDEO_SOURCE_SEL                BIT(7)
+#define NORMAL_PATH                     (1 << 7)
+#define GEN_RGB                         (0 << 7)
+
+#define HDMI_SYS_CFG1C          0x000
+#define HDMI_ON                         BIT(0)
+#define HDMI_RST                        BIT(1)
+#define ANLG_ON                         BIT(2)
+#define CFG10_DVI                       BIT(3)
+#define HDMI_TST                        BIT(3)
+#define SYS_KEYMASK1                    (0xff << 8)
+#define SYS_KEYMASK2                    (0xff << 16)
+#define AUD_OUTSYNC_EN                  BIT(24)
+#define AUD_OUTSYNC_PRE_EN              BIT(25)
+#define I2CM_ON                         BIT(26)
+#define E2PROM_TYPE_8BIT                BIT(27)
+#define MCM_E2PROM_ON                   BIT(28)
+#define EXT_E2PROM_ON                   BIT(29)
+#define HTPLG_PIN_SEL_OFF               BIT(30)
+#define AES_EFUSE_ENABLE                BIT(31)
+#define HDMI_SYS_CFG20          0x004
+#define DEEP_COLOR_MODE_MASK            (3 << 1)
+#define COLOR_8BIT_MODE                 (0 << 1)
+#define COLOR_10BIT_MODE                (1 << 1)
+#define COLOR_12BIT_MODE                (2 << 1)
+#define COLOR_16BIT_MODE                (3 << 1)
+#define DEEP_COLOR_EN                   BIT(0)
+#define HDMI_AUDIO_TEST_SEL             BIT(8)
+#define HDMI2P0_EN                      BIT(11)
+#define HDMI_OUT_FIFO_EN                BIT(16)
+#define HDMI_OUT_FIFO_CLK_INV           BIT(17)
+#define MHL_MODE_ON                     BIT(28)
+#define MHL_PP_MODE                     BIT(29)
+#define MHL_SYNC_AUTO_EN                BIT(30)
+#define HDMI_PCLK_FREE_RUN              BIT(31)
+
+#define MTK_SIP_SET_AUTHORIZED_SECURE_REG 0x82000001
+#endif
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
new file mode 100644
index 000000000000..8a24754b440f
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
@@ -0,0 +1,515 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Jie Qiu <jie.qiu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+
+#define HDMI_CON0               0x00
+#define RG_HDMITX_PLL_EN                BIT(31)
+#define RG_HDMITX_PLL_FBKDIV            (0x7f << 24)
+#define PLL_FBKDIV_SHIFT                24
+#define RG_HDMITX_PLL_FBKSEL            (0x3 << 22)
+#define PLL_FBKSEL_SHIFT                22
+#define RG_HDMITX_PLL_PREDIV            (0x3 << 20)
+#define PREDIV_SHIFT                    20
+#define RG_HDMITX_PLL_POSDIV            (0x3 << 18)
+#define POSDIV_SHIFT                    18
+#define RG_HDMITX_PLL_RST_DLY           (0x3 << 16)
+#define RG_HDMITX_PLL_IR                (0xf << 12)
+#define PLL_IR_SHIFT                    12
+#define RG_HDMITX_PLL_IC                (0xf << 8)
+#define PLL_IC_SHIFT                    8
+#define RG_HDMITX_PLL_BP                (0xf << 4)
+#define PLL_BP_SHIFT                    4
+#define RG_HDMITX_PLL_BR                (0x3 << 2)
+#define PLL_BR_SHIFT                    2
+#define RG_HDMITX_PLL_BC                (0x3 << 0)
+#define PLL_BC_SHIFT                    0
+#define HDMI_CON1               0x04
+#define RG_HDMITX_PLL_DIVEN             (0x7 << 29)
+#define PLL_DIVEN_SHIFT                 29
+#define RG_HDMITX_PLL_AUTOK_EN          BIT(28)
+#define RG_HDMITX_PLL_AUTOK_KF          (0x3 << 26)
+#define RG_HDMITX_PLL_AUTOK_KS          (0x3 << 24)
+#define RG_HDMITX_PLL_AUTOK_LOAD        BIT(23)
+#define RG_HDMITX_PLL_BAND              (0x3f << 16)
+#define RG_HDMITX_PLL_REF_SEL           BIT(15)
+#define RG_HDMITX_PLL_BIAS_EN           BIT(14)
+#define RG_HDMITX_PLL_BIAS_LPF_EN       BIT(13)
+#define RG_HDMITX_PLL_TXDIV_EN          BIT(12)
+#define RG_HDMITX_PLL_TXDIV             (0x3 << 10)
+#define PLL_TXDIV_SHIFT                 10
+#define RG_HDMITX_PLL_LVROD_EN          BIT(9)
+#define RG_HDMITX_PLL_MONVC_EN          BIT(8)
+#define RG_HDMITX_PLL_MONCK_EN          BIT(7)
+#define RG_HDMITX_PLL_MONREF_EN         BIT(6)
+#define RG_HDMITX_PLL_TST_EN            BIT(5)
+#define RG_HDMITX_PLL_TST_CK_EN         BIT(4)
+#define RG_HDMITX_PLL_TST_SEL           (0xf << 0)
+#define HDMI_CON2               0x08
+#define RGS_HDMITX_PLL_AUTOK_BAND       (0x7f << 8)
+#define RGS_HDMITX_PLL_AUTOK_FAIL       BIT(1)
+#define RG_HDMITX_EN_TX_CKLDO           BIT(0)
+#define HDMI_CON3               0x0c
+#define RG_HDMITX_SER_EN                (0xf << 28)
+#define RG_HDMITX_PRD_EN                (0xf << 24)
+#define RG_HDMITX_PRD_IMP_EN            (0xf << 20)
+#define RG_HDMITX_DRV_EN                (0xf << 16)
+#define RG_HDMITX_DRV_IMP_EN            (0xf << 12)
+#define DRV_IMP_EN_SHIFT                12
+#define RG_HDMITX_MHLCK_FORCE           BIT(10)
+#define RG_HDMITX_MHLCK_PPIX_EN         BIT(9)
+#define RG_HDMITX_MHLCK_EN              BIT(8)
+#define RG_HDMITX_SER_DIN_SEL           (0xf << 4)
+#define RG_HDMITX_SER_5T1_BIST_EN       BIT(3)
+#define RG_HDMITX_SER_BIST_TOG          BIT(2)
+#define RG_HDMITX_SER_DIN_TOG           BIT(1)
+#define RG_HDMITX_SER_CLKDIG_INV        BIT(0)
+#define HDMI_CON4               0x10
+#define RG_HDMITX_PRD_IBIAS_CLK         (0xf << 24)
+#define RG_HDMITX_PRD_IBIAS_D2          (0xf << 16)
+#define RG_HDMITX_PRD_IBIAS_D1          (0xf << 8)
+#define RG_HDMITX_PRD_IBIAS_D0          (0xf << 0)
+#define PRD_IBIAS_CLK_SHIFT             24
+#define PRD_IBIAS_D2_SHIFT              16
+#define PRD_IBIAS_D1_SHIFT              8
+#define PRD_IBIAS_D0_SHIFT              0
+#define HDMI_CON5               0x14
+#define RG_HDMITX_DRV_IBIAS_CLK         (0x3f << 24)
+#define RG_HDMITX_DRV_IBIAS_D2          (0x3f << 16)
+#define RG_HDMITX_DRV_IBIAS_D1          (0x3f << 8)
+#define RG_HDMITX_DRV_IBIAS_D0          (0x3f << 0)
+#define DRV_IBIAS_CLK_SHIFT             24
+#define DRV_IBIAS_D2_SHIFT              16
+#define DRV_IBIAS_D1_SHIFT              8
+#define DRV_IBIAS_D0_SHIFT              0
+#define HDMI_CON6               0x18
+#define RG_HDMITX_DRV_IMP_CLK           (0x3f << 24)
+#define RG_HDMITX_DRV_IMP_D2            (0x3f << 16)
+#define RG_HDMITX_DRV_IMP_D1            (0x3f << 8)
+#define RG_HDMITX_DRV_IMP_D0            (0x3f << 0)
+#define DRV_IMP_CLK_SHIFT               24
+#define DRV_IMP_D2_SHIFT                16
+#define DRV_IMP_D1_SHIFT                8
+#define DRV_IMP_D0_SHIFT                0
+#define HDMI_CON7               0x1c
+#define RG_HDMITX_MHLCK_DRV_IBIAS       (0x1f << 27)
+#define RG_HDMITX_SER_DIN               (0x3ff << 16)
+#define RG_HDMITX_CHLDC_TST             (0xf << 12)
+#define RG_HDMITX_CHLCK_TST             (0xf << 8)
+#define RG_HDMITX_RESERVE               (0xff << 0)
+#define HDMI_CON8               0x20
+#define RGS_HDMITX_2T1_LEV              (0xf << 16)
+#define RGS_HDMITX_2T1_EDG              (0xf << 12)
+#define RGS_HDMITX_5T1_LEV              (0xf << 8)
+#define RGS_HDMITX_5T1_EDG              (0xf << 4)
+#define RGS_HDMITX_PLUG_TST             BIT(0)
+
+struct mtk_hdmi_phy {
+        void __iomem *regs;
+        struct device *dev;
+        struct clk *pll;
+        struct clk_hw pll_hw;
+        unsigned long pll_rate;
+        u8 drv_imp_clk;
+        u8 drv_imp_d2;
+        u8 drv_imp_d1;
+        u8 drv_imp_d0;
+        u32 ibias;
+        u32 ibias_up;
+};
+
+static const u8 PREDIV[3][4] = {
+        {0x0, 0x0, 0x0, 0x0},   /* 27Mhz */
+        {0x1, 0x1, 0x1, 0x1},   /* 74Mhz */
+        {0x1, 0x1, 0x1, 0x1}    /* 148Mhz */
+};
+
+static const u8 TXDIV[3][4] = {
+        {0x3, 0x3, 0x3, 0x2},   /* 27Mhz */
+        {0x2, 0x1, 0x1, 0x1},   /* 74Mhz */
+        {0x1, 0x0, 0x0, 0x0}    /* 148Mhz */
+};
+
+static const u8 FBKSEL[3][4] = {
+        {0x1, 0x1, 0x1, 0x1},   /* 27Mhz */
+        {0x1, 0x0, 0x1, 0x1},   /* 74Mhz */
+        {0x1, 0x0, 0x1, 0x1}    /* 148Mhz */
+};
+
+static const u8 FBKDIV[3][4] = {
+        {19, 24, 29, 19},       /* 27Mhz */
+        {19, 24, 14, 19},       /* 74Mhz */
+        {19, 24, 14, 19}        /* 148Mhz */
+};
+
+static const u8 DIVEN[3][4] = {
+        {0x2, 0x1, 0x1, 0x2},   /* 27Mhz */
+        {0x2, 0x2, 0x2, 0x2},   /* 74Mhz */
+        {0x2, 0x2, 0x2, 0x2}    /* 148Mhz */
+};
+
+static const u8 HTPLLBP[3][4] = {
+        {0xc, 0xc, 0x8, 0xc},   /* 27Mhz */
+        {0xc, 0xf, 0xf, 0xc},   /* 74Mhz */
+        {0xc, 0xf, 0xf, 0xc}    /* 148Mhz */
+};
+
+static const u8 HTPLLBC[3][4] = {
+        {0x2, 0x3, 0x3, 0x2},   /* 27Mhz */
+        {0x2, 0x3, 0x3, 0x2},   /* 74Mhz */
+        {0x2, 0x3, 0x3, 0x2}    /* 148Mhz */
+};
+
+static const u8 HTPLLBR[3][4] = {
+        {0x1, 0x1, 0x0, 0x1},   /* 27Mhz */
+        {0x1, 0x2, 0x2, 0x1},   /* 74Mhz */
+        {0x1, 0x2, 0x2, 0x1}    /* 148Mhz */
+};
+
+static void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,
+                                    u32 bits)
+{
+        void __iomem *reg = hdmi_phy->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp &= ~bits;
+        writel(tmp, reg);
+}
+
+static void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,
+                                  u32 bits)
+{
+        void __iomem *reg = hdmi_phy->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp |= bits;
+        writel(tmp, reg);
+}
+
+static void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,
+                              u32 val, u32 mask)
+{
+        void __iomem *reg = hdmi_phy->regs + offset;
+        u32 tmp;
+
+        tmp = readl(reg);
+        tmp = (tmp & ~mask) | (val & mask);
+        writel(tmp, reg);
+}
+
+static inline struct mtk_hdmi_phy *to_mtk_hdmi_phy(struct clk_hw *hw)
+{
+        return container_of(hw, struct mtk_hdmi_phy, pll_hw);
+}
+
+static int mtk_hdmi_pll_prepare(struct clk_hw *hw)
+{
+        struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);
+
+        dev_dbg(hdmi_phy->dev, "%s\n", __func__);
+
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_AUTOK_EN);
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_PLL_POSDIV);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON3, RG_HDMITX_MHLCK_EN);
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_BIAS_EN);
+        usleep_range(100, 150);
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_PLL_EN);
+        usleep_range(100, 150);
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_BIAS_LPF_EN);
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_TXDIV_EN);
+
+        return 0;
+}
+
+static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)
+{
+        struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);
+
+        dev_dbg(hdmi_phy->dev, "%s\n", __func__);
+
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_TXDIV_EN);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_BIAS_LPF_EN);
+        usleep_range(100, 150);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_PLL_EN);
+        usleep_range(100, 150);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_BIAS_EN);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_PLL_POSDIV);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON1, RG_HDMITX_PLL_AUTOK_EN);
+        usleep_range(100, 150);
+}
+
+static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,
+                                 unsigned long parent_rate)
+{
+        struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);
+        unsigned int pre_div;
+        unsigned int div;
+
+        dev_dbg(hdmi_phy->dev, "%s: %lu Hz, parent: %lu Hz\n", __func__,
+                rate, parent_rate);
+
+        if (rate <= 27000000) {
+                pre_div = 0;
+                div = 3;
+        } else if (rate <= 74250000) {
+                pre_div = 1;
+                div = 2;
+        } else {
+                pre_div = 1;
+                div = 1;
+        }
+
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON0,
+                          (pre_div << PREDIV_SHIFT), RG_HDMITX_PLL_PREDIV);
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_PLL_POSDIV);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON0,
+                          (0x1 << PLL_IC_SHIFT) | (0x1 << PLL_IR_SHIFT),
+                          RG_HDMITX_PLL_IC | RG_HDMITX_PLL_IR);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON1,
+                          (div << PLL_TXDIV_SHIFT), RG_HDMITX_PLL_TXDIV);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON0,
+                          (0x1 << PLL_FBKSEL_SHIFT) | (19 << PLL_FBKDIV_SHIFT),
+                          RG_HDMITX_PLL_FBKSEL | RG_HDMITX_PLL_FBKDIV);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON1,
+                          (0x2 << PLL_DIVEN_SHIFT), RG_HDMITX_PLL_DIVEN);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON0,
+                          (0xc << PLL_BP_SHIFT) | (0x2 << PLL_BC_SHIFT) |
+                          (0x1 << PLL_BR_SHIFT),
+                          RG_HDMITX_PLL_BP | RG_HDMITX_PLL_BC |
+                          RG_HDMITX_PLL_BR);
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON3, RG_HDMITX_PRD_IMP_EN);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON4,
+                          (0x3 << PRD_IBIAS_CLK_SHIFT) |
+                          (0x3 << PRD_IBIAS_D2_SHIFT) |
+                          (0x3 << PRD_IBIAS_D1_SHIFT) |
+                          (0x3 << PRD_IBIAS_D0_SHIFT),
+                          RG_HDMITX_PRD_IBIAS_CLK |
+                          RG_HDMITX_PRD_IBIAS_D2 |
+                          RG_HDMITX_PRD_IBIAS_D1 |
+                          RG_HDMITX_PRD_IBIAS_D0);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON3,
+                          (0x0 << DRV_IMP_EN_SHIFT), RG_HDMITX_DRV_IMP_EN);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON6,
+                          (hdmi_phy->drv_imp_clk << DRV_IMP_CLK_SHIFT) |
+                          (hdmi_phy->drv_imp_d2 << DRV_IMP_D2_SHIFT) |
+                          (hdmi_phy->drv_imp_d1 << DRV_IMP_D1_SHIFT) |
+                          (hdmi_phy->drv_imp_d0 << DRV_IMP_D0_SHIFT),
+                          RG_HDMITX_DRV_IMP_CLK | RG_HDMITX_DRV_IMP_D2 |
+                          RG_HDMITX_DRV_IMP_D1 | RG_HDMITX_DRV_IMP_D0);
+        mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON5,
+                          (hdmi_phy->ibias << DRV_IBIAS_CLK_SHIFT) |
+                          (hdmi_phy->ibias << DRV_IBIAS_D2_SHIFT) |
+                          (hdmi_phy->ibias << DRV_IBIAS_D1_SHIFT) |
+                          (hdmi_phy->ibias << DRV_IBIAS_D0_SHIFT),
+                          RG_HDMITX_DRV_IBIAS_CLK | RG_HDMITX_DRV_IBIAS_D2 |
+                          RG_HDMITX_DRV_IBIAS_D1 | RG_HDMITX_DRV_IBIAS_D0);
+        return 0;
+}
+
+static long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,
+                                    unsigned long *parent_rate)
+{
+        struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);
+
+        hdmi_phy->pll_rate = rate;
+        if (rate <= 74250000)
+                *parent_rate = rate;
+        else
+                *parent_rate = rate / 2;
+
+        return rate;
+}
+
+static unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw,
+                                              unsigned long parent_rate)
+{
+        struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);
+
+        return hdmi_phy->pll_rate;
+}
+
+static const struct clk_ops mtk_hdmi_pll_ops = {
+        .prepare = mtk_hdmi_pll_prepare,
+        .unprepare = mtk_hdmi_pll_unprepare,
+        .set_rate = mtk_hdmi_pll_set_rate,
+        .round_rate = mtk_hdmi_pll_round_rate,
+        .recalc_rate = mtk_hdmi_pll_recalc_rate,
+};
+
+static void mtk_hdmi_phy_enable_tmds(struct mtk_hdmi_phy *hdmi_phy)
+{
+        mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON3,
+                              RG_HDMITX_SER_EN | RG_HDMITX_PRD_EN |
+                              RG_HDMITX_DRV_EN);
+        usleep_range(100, 150);
+}
+
+static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)
+{
+        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON3,
+                                RG_HDMITX_DRV_EN | RG_HDMITX_PRD_EN |
+                                RG_HDMITX_SER_EN);
+}
+
+static int mtk_hdmi_phy_power_on(struct phy *phy)
+{
+        struct mtk_hdmi_phy *hdmi_phy = phy_get_drvdata(phy);
+        int ret;
+
+        ret = clk_prepare_enable(hdmi_phy->pll);
+        if (ret < 0)
+                return ret;
+
+        mtk_hdmi_phy_enable_tmds(hdmi_phy);
+
+        return 0;
+}
+
+static int mtk_hdmi_phy_power_off(struct phy *phy)
+{
+        struct mtk_hdmi_phy *hdmi_phy = phy_get_drvdata(phy);
+
+        mtk_hdmi_phy_disable_tmds(hdmi_phy);
+        clk_disable_unprepare(hdmi_phy->pll);
+
+        return 0;
+}
+
+static const struct phy_ops mtk_hdmi_phy_ops = {
+        .power_on = mtk_hdmi_phy_power_on,
+        .power_off = mtk_hdmi_phy_power_off,
+        .owner = THIS_MODULE,
+};
+
+static int mtk_hdmi_phy_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct mtk_hdmi_phy *hdmi_phy;
+        struct resource *mem;
+        struct clk *ref_clk;
+        const char *ref_clk_name;
+        struct clk_init_data clk_init = {
+                .ops = &mtk_hdmi_pll_ops,
+                .num_parents = 1,
+                .parent_names = (const char * const *)&ref_clk_name,
+                .flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,
+        };
+        struct phy *phy;
+        struct phy_provider *phy_provider;
+        int ret;
+
+        hdmi_phy = devm_kzalloc(dev, sizeof(*hdmi_phy), GFP_KERNEL);
+        if (!hdmi_phy)
+                return -ENOMEM;
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        hdmi_phy->regs = devm_ioremap_resource(dev, mem);
+        if (IS_ERR(hdmi_phy->regs)) {
+                ret = PTR_ERR(hdmi_phy->regs);
+                dev_err(dev, "Failed to get memory resource: %d\n", ret);
+                return ret;
+        }
+
+        ref_clk = devm_clk_get(dev, "pll_ref");
+        if (IS_ERR(ref_clk)) {
+                ret = PTR_ERR(ref_clk);
+                dev_err(&pdev->dev, "Failed to get PLL reference clock: %d\n",
+                        ret);
+                return ret;
+        }
+        ref_clk_name = __clk_get_name(ref_clk);
+
+        ret = of_property_read_string(dev->of_node, "clock-output-names",
+                                      &clk_init.name);
+        if (ret < 0) {
+                dev_err(dev, "Failed to read clock-output-names: %d\n", ret);
+                return ret;
+        }
+
+        hdmi_phy->pll_hw.init = &clk_init;
+        hdmi_phy->pll = devm_clk_register(dev, &hdmi_phy->pll_hw);
+        if (IS_ERR(hdmi_phy->pll)) {
+                ret = PTR_ERR(hdmi_phy->pll);
+                dev_err(dev, "Failed to register PLL: %d\n", ret);
+                return ret;
+        }
+
+        ret = of_property_read_u32(dev->of_node, "mediatek,ibias",
+                                   &hdmi_phy->ibias);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to get ibias: %d\n", ret);
+                return ret;
+        }
+
+        ret = of_property_read_u32(dev->of_node, "mediatek,ibias_up",
+                                   &hdmi_phy->ibias_up);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to get ibias up: %d\n", ret);
+                return ret;
+        }
+
+        dev_info(dev, "Using default TX DRV impedance: 4.2k/36\n");
+        hdmi_phy->drv_imp_clk = 0x30;
+        hdmi_phy->drv_imp_d2 = 0x30;
+        hdmi_phy->drv_imp_d1 = 0x30;
+        hdmi_phy->drv_imp_d0 = 0x30;
+
+        phy = devm_phy_create(dev, NULL, &mtk_hdmi_phy_ops);
+        if (IS_ERR(phy)) {
+                dev_err(dev, "Failed to create HDMI PHY\n");
+                return PTR_ERR(phy);
+        }
+        phy_set_drvdata(phy, hdmi_phy);
+
+        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+        if (IS_ERR(phy_provider))
+                return PTR_ERR(phy_provider);
+
+        hdmi_phy->dev = dev;
+        return of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
+                                   hdmi_phy->pll);
+}
+
+static int mtk_hdmi_phy_remove(struct platform_device *pdev)
+{
+        return 0;
+}
+
+static const struct of_device_id mtk_hdmi_phy_match[] = {
+        { .compatible = "mediatek,mt8173-hdmi-phy", },
+        {},
+};
+
+struct platform_driver mtk_hdmi_phy_driver = {
+        .probe = mtk_hdmi_phy_probe,
+        .remove = mtk_hdmi_phy_remove,
+        .driver = {
+                .name = "mediatek-hdmi-phy",
+                .of_match_table = mtk_hdmi_phy_match,
+        },
+};
+
+MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>");
+MODULE_DESCRIPTION("MediaTek MT8173 HDMI PHY Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index ebb470ff7200..2b4b125eebc3 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -101,7 +101,7 @@ static struct drm_driver driver = {
         .minor = DRIVER_MINOR,
         .patchlevel = DRIVER_PATCHLEVEL,
 
-        .gem_free_object = mgag200_gem_free_object,
+        .gem_free_object_unlocked = mgag200_gem_free_object,
         .dumb_create = mgag200_dumb_create,
         .dumb_map_offset = mgag200_dumb_mmap_offset,
         .dumb_destroy = drm_gem_dumb_destroy,
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 14e64e08909e..6b21cb27e1cc 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -182,7 +182,7 @@ static int mga_g200se_set_plls(struct mga_device *mdev, long clock)
                         }
                 }
 
-                fvv = pllreffreq * testn / testm;
+                fvv = pllreffreq * (n + 1) / (m + 1);
                 fvv = (fvv - 800000) / 50000;
 
                 if (fvv > 15)
@@ -202,6 +202,14 @@ static int mga_g200se_set_plls(struct mga_device *mdev, long clock)
         WREG_DAC(MGA1064_PIX_PLLC_M, m);
         WREG_DAC(MGA1064_PIX_PLLC_N, n);
         WREG_DAC(MGA1064_PIX_PLLC_P, p);
+
+        if (mdev->unique_rev_id >= 0x04) {
+                WREG_DAC(0x1a, 0x09);
+                msleep(20);
+                WREG_DAC(0x1a, 0x01);
+
+        }
+
         return 0;
 }
 
@@ -1344,19 +1352,20 @@ static void mga_crtc_commit(struct drm_crtc *crtc)
  * use this for 8-bit mode so can't perform smooth fades on deeper modes,
  * but it's a requirement that we provide the function
  */
-static void mga_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                  u16 *blue, uint32_t start, uint32_t size)
+static int mga_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                              u16 *blue, uint32_t size)
 {
         struct mga_crtc *mga_crtc = to_mga_crtc(crtc);
-        int end = (start + size > MGAG200_LUT_SIZE) ? MGAG200_LUT_SIZE : start + size;
         int i;
 
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 mga_crtc->lut_r[i] = red[i] >> 8;
                 mga_crtc->lut_g[i] = green[i] >> 8;
                 mga_crtc->lut_b[i] = blue[i] >> 8;
         }
         mga_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 /* Simple cleanup function */
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index fbe304ee6c80..2aec27dbb5bb 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -408,7 +408,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
         }
 
         adreno_gpu->memptrs = msm_gem_vaddr(adreno_gpu->memptrs_bo);
-        if (!adreno_gpu->memptrs) {
+        if (IS_ERR(adreno_gpu->memptrs)) {
                 dev_err(drm->dev, "could not vmap memptrs\n");
                 return -ENOMEM;
         }
diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index 72360cd038c0..5960628ceb93 100644
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -91,15 +91,6 @@ static int edp_connector_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static struct drm_encoder *
-edp_connector_best_encoder(struct drm_connector *connector)
-{
-        struct edp_connector *edp_connector = to_edp_connector(connector);
-
-        DBG("");
-        return edp_connector->edp->encoder;
-}
-
 static const struct drm_connector_funcs edp_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = edp_connector_detect,
@@ -113,7 +104,6 @@ static const struct drm_connector_funcs edp_connector_funcs = {
 static const struct drm_connector_helper_funcs edp_connector_helper_funcs = {
         .get_modes = edp_connector_get_modes,
         .mode_valid = edp_connector_mode_valid,
-        .best_encoder = edp_connector_best_encoder,
 };
 
 /* initialize connector */
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index b15d72683112..a2515b466ce5 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -406,13 +406,6 @@ static int msm_hdmi_connector_mode_valid(struct drm_connector *connector,
         return 0;
 }
 
-static struct drm_encoder *
-msm_hdmi_connector_best_encoder(struct drm_connector *connector)
-{
-        struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-        return hdmi_connector->hdmi->encoder;
-}
-
 static const struct drm_connector_funcs hdmi_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = hdmi_connector_detect,
@@ -426,7 +419,6 @@ static const struct drm_connector_funcs hdmi_connector_funcs = {
 static const struct drm_connector_helper_funcs msm_hdmi_connector_helper_funcs = {
         .get_modes = msm_hdmi_connector_get_modes,
         .mode_valid = msm_hdmi_connector_mode_valid,
-        .best_encoder = msm_hdmi_connector_best_encoder,
 };
 
 /* initialize connector */
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
index 67442d50a6c2..f145d256e332 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
@@ -106,31 +106,27 @@ out:
 static void mdp4_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state)
 {
         struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
-        int i, ncrtcs = state->dev->mode_config.num_crtc;
+        int i;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
 
         mdp4_enable(mdp4_kms);
 
         /* see 119ecb7fd */
-        for (i = 0; i < ncrtcs; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
-                if (!crtc)
-                        continue;
+        for_each_crtc_in_state(state, crtc, crtc_state, i)
                 drm_crtc_vblank_get(crtc);
-        }
 }
 
 static void mdp4_complete_commit(struct msm_kms *kms, struct drm_atomic_state *state)
 {
         struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
-        int i, ncrtcs = state->dev->mode_config.num_crtc;
+        int i;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
 
         /* see 119ecb7fd */
-        for (i = 0; i < ncrtcs; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
-                if (!crtc)
-                        continue;
+        for_each_crtc_in_state(state, crtc, crtc_state, i)
                 drm_crtc_vblank_put(crtc);
-        }
 
         mdp4_disable(mdp4_kms);
 }
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
index 2648cd7631ef..353429b05733 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
@@ -90,14 +90,6 @@ static int mdp4_lvds_connector_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static struct drm_encoder *
-mdp4_lvds_connector_best_encoder(struct drm_connector *connector)
-{
-        struct mdp4_lvds_connector *mdp4_lvds_connector =
-                        to_mdp4_lvds_connector(connector);
-        return mdp4_lvds_connector->encoder;
-}
-
 static const struct drm_connector_funcs mdp4_lvds_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = mdp4_lvds_connector_detect,
@@ -111,7 +103,6 @@ static const struct drm_connector_funcs mdp4_lvds_connector_funcs = {
 static const struct drm_connector_helper_funcs mdp4_lvds_connector_helper_funcs = {
         .get_modes = mdp4_lvds_connector_get_modes,
         .mode_valid = mdp4_lvds_connector_mode_valid,
-        .best_encoder = mdp4_lvds_connector_best_encoder,
 };
 
 /* initialize connector */
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 88fe256c1931..4e8ed739f558 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -374,6 +374,7 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
         struct drm_device *dev = crtc->dev;
         struct plane_state pstates[STAGE_MAX + 1];
         const struct mdp5_cfg_hw *hw_cfg;
+        const struct drm_plane_state *pstate;
         int cnt = 0, i;
 
         DBG("%s: check", mdp5_crtc->name);
@@ -382,20 +383,13 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
          * and that we don't have conflicting mixer stages:
          */
         hw_cfg = mdp5_cfg_get_hw_config(mdp5_kms->cfg);
-        drm_atomic_crtc_state_for_each_plane(plane, state) {
-                struct drm_plane_state *pstate;
+        drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) {
                 if (cnt >= (hw_cfg->lm.nb_stages)) {
                         dev_err(dev->dev, "too many planes!\n");
                         return -EINVAL;
                 }
 
-                pstate = state->state->plane_states[drm_plane_index(plane)];
 
-                /* plane might not have changed, in which case take
-                 * current state:
-                 */
-                if (!pstate)
-                        pstate = plane->state;
                 pstates[cnt].plane = plane;
                 pstates[cnt].state = to_mdp5_plane_state(pstate);
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 484b4d15e71d..f0c285b1c027 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -78,17 +78,11 @@ static void mdp5_complete_commit(struct msm_kms *kms, struct drm_atomic_state *s
 {
         int i;
         struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
-        int nplanes = mdp5_kms->dev->mode_config.num_total_plane;
-
-        for (i = 0; i < nplanes; i++) {
-                struct drm_plane *plane = state->planes[i];
-                struct drm_plane_state *plane_state = state->plane_states[i];
-
-                if (!plane)
-                        continue;
+        struct drm_plane *plane;
+        struct drm_plane_state *plane_state;
 
+        for_each_plane_in_state(state, plane, plane_state, i)
                 mdp5_plane_complete_commit(plane, plane_state);
-        }
 
         mdp5_disable(mdp5_kms);
 }
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index e3892c263f27..4a8a6f1f1151 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -84,17 +84,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev,
                 struct drm_atomic_state *old_state)
 {
         struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
         struct msm_drm_private *priv = old_state->dev->dev_private;
         struct msm_kms *kms = priv->kms;
-        int ncrtcs = old_state->dev->mode_config.num_crtc;
         int i;
 
-        for (i = 0; i < ncrtcs; i++) {
-                crtc = old_state->crtcs[i];
-
-                if (!crtc)
-                        continue;
-
+        for_each_crtc_in_state(old_state, crtc, crtc_state, i) {
                 if (!crtc->state->enable)
                         continue;
 
@@ -192,9 +187,11 @@ int msm_atomic_commit(struct drm_device *dev,
                 struct drm_atomic_state *state, bool nonblock)
 {
         struct msm_drm_private *priv = dev->dev_private;
-        int nplanes = dev->mode_config.num_total_plane;
-        int ncrtcs = dev->mode_config.num_crtc;
         struct msm_commit *c;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_plane *plane;
+        struct drm_plane_state *plane_state;
         int i, ret;
 
         ret = drm_atomic_helper_prepare_planes(dev, state);
@@ -210,28 +207,18 @@ int msm_atomic_commit(struct drm_device *dev,
         /*
          * Figure out what crtcs we have:
          */
-        for (i = 0; i < ncrtcs; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
-                if (!crtc)
-                        continue;
-                c->crtc_mask |= (1 << drm_crtc_index(crtc));
-        }
+        for_each_crtc_in_state(state, crtc, crtc_state, i)
+                c->crtc_mask |= drm_crtc_mask(crtc);
 
         /*
          * Figure out what fence to wait for:
          */
-        for (i = 0; i < nplanes; i++) {
-                struct drm_plane *plane = state->planes[i];
-                struct drm_plane_state *new_state = state->plane_states[i];
-
-                if (!plane)
-                        continue;
-
-                if ((plane->state->fb != new_state->fb) && new_state->fb) {
-                        struct drm_gem_object *obj = msm_framebuffer_bo(new_state->fb, 0);
+        for_each_plane_in_state(state, plane, plane_state, i) {
+                if ((plane->state->fb != plane_state->fb) && plane_state->fb) {
+                        struct drm_gem_object *obj = msm_framebuffer_bo(plane_state->fb, 0);
                         struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
-                        new_state->fence = reservation_object_get_excl_rcu(msm_obj->resv);
+                        plane_state->fence = reservation_object_get_excl_rcu(msm_obj->resv);
                 }
         }
 
@@ -251,7 +238,7 @@ int msm_atomic_commit(struct drm_device *dev,
          * the software side now.
          */
 
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         /*
          * Everything below can be run asynchronously without the need to grab
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 9c654092ef78..a02dc2b27739 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -197,8 +197,6 @@ static int msm_drm_uninit(struct device *dev)
 
         drm_kms_helper_poll_fini(ddev);
 
-        drm_connector_unregister_all(ddev);
-
         drm_dev_unregister(ddev);
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
@@ -431,12 +429,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
         if (ret)
                 goto fail;
 
-        ret = drm_connector_register_all(ddev);
-        if (ret) {
-                dev_err(dev, "failed to register connectors\n");
-                goto fail;
-        }
-
         drm_mode_config_reset(ddev);
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
@@ -730,7 +722,6 @@ static struct drm_driver msm_driver = {
         .open               = msm_open,
         .preclose           = msm_preclose,
         .lastclose          = msm_lastclose,
-        .set_busid          = drm_platform_set_busid,
         .irq_handler        = msm_irq,
         .irq_preinstall     = msm_irq_preinstall,
         .irq_postinstall    = msm_irq_postinstall,
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 461dc8b873f0..7919c24c6ddd 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -56,17 +56,9 @@ static void msm_framebuffer_destroy(struct drm_framebuffer *fb)
         kfree(msm_fb);
 }
 
-static int msm_framebuffer_dirty(struct drm_framebuffer *fb,
-                struct drm_file *file_priv, unsigned flags, unsigned color,
-                struct drm_clip_rect *clips, unsigned num_clips)
-{
-        return 0;
-}
-
 static const struct drm_framebuffer_funcs msm_framebuffer_funcs = {
         .create_handle = msm_framebuffer_create_handle,
         .destroy = msm_framebuffer_destroy,
-        .dirty = msm_framebuffer_dirty,
 };
 
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index d9759bf3482e..a9223bea871b 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -159,6 +159,10 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
         dev->mode_config.fb_base = paddr;
 
         fbi->screen_base = msm_gem_vaddr_locked(fbdev->bo);
+        if (IS_ERR(fbi->screen_base)) {
+                ret = PTR_ERR(fbi->screen_base);
+                goto fail_unlock;
+        }
         fbi->screen_size = fbdev->bo->size;
         fbi->fix.smem_start = paddr;
         fbi->fix.smem_len = fbdev->bo->size;
@@ -184,21 +188,7 @@ fail:
         return ret;
 }
 
-static void msm_crtc_fb_gamma_set(struct drm_crtc *crtc,
-                u16 red, u16 green, u16 blue, int regno)
-{
-        DBG("fbdev: set gamma");
-}
-
-static void msm_crtc_fb_gamma_get(struct drm_crtc *crtc,
-                u16 *red, u16 *green, u16 *blue, int regno)
-{
-        DBG("fbdev: get gamma");
-}
-
 static const struct drm_fb_helper_funcs msm_fb_helper_funcs = {
-        .gamma_set = msm_crtc_fb_gamma_set,
-        .gamma_get = msm_crtc_fb_gamma_get,
         .fb_probe = msm_fbdev_create,
 };
 
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 7daf4054dd2b..69836f5685b1 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -398,6 +398,8 @@ void *msm_gem_vaddr_locked(struct drm_gem_object *obj)
                         return ERR_CAST(pages);
                 msm_obj->vaddr = vmap(pages, obj->size >> PAGE_SHIFT,
                                 VM_MAP, pgprot_writecombine(PAGE_KERNEL));
+                if (msm_obj->vaddr == NULL)
+                        return ERR_PTR(-ENOMEM);
         }
         return msm_obj->vaddr;
 }
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index b89ca5174863..eb4bb8b2f3a5 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -40,12 +40,14 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
 
         submit->dev = dev;
         submit->gpu = gpu;
+        submit->fence = NULL;
         submit->pid = get_pid(task_pid(current));
 
         /* initially, until copy_from_user() and bo lookup succeeds: */
         submit->nr_bos = 0;
         submit->nr_cmds = 0;
 
+        INIT_LIST_HEAD(&submit->node);
         INIT_LIST_HEAD(&submit->bo_list);
         ww_acquire_init(&submit->ticket, &reservation_ww_class);
 
@@ -75,6 +77,11 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
                 void __user *userptr =
                         u64_to_user_ptr(args->bos + (i * sizeof(submit_bo)));
 
+                /* make sure we don't have garbage flags, in case we hit
+                 * error path before flags is initialized:
+                 */
+                submit->bos[i].flags = 0;
+
                 ret = copy_from_user(&submit_bo, userptr, sizeof(submit_bo));
                 if (ret) {
                         ret = -EFAULT;
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index b48f73ac6389..0857710c2ff2 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -312,6 +312,9 @@ void msm_rd_dump_submit(struct msm_gem_submit *submit)
                 struct msm_gem_object *obj = submit->bos[idx].obj;
                 const char *buf = msm_gem_vaddr_locked(&obj->base);
 
+                if (IS_ERR(buf))
+                        continue;
+
                 buf += iova - submit->bos[idx].iova;
 
                 rd_write_section(rd, RD_GPUADDR,
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 1f14b908b221..42f5359cf988 100644
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -40,6 +40,10 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int size)
         }
 
         ring->start = msm_gem_vaddr_locked(ring->bo);
+        if (IS_ERR(ring->start)) {
+                ret = PTR_ERR(ring->start);
+                goto fail;
+        }
         ring->end   = ring->start + (size / 4);
         ring->cur   = ring->start;
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 6f318c54da33..0cb7a18cde26 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -785,14 +785,14 @@ nv_crtc_disable(struct drm_crtc *crtc)
         nouveau_bo_ref(NULL, &disp->image[nv_crtc->index]);
 }
 
-static void
-nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t start,
+static int
+nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
                   uint32_t size)
 {
-        int end = (start + size > 256) ? 256 : start + size, i;
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
+        int i;
 
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 nv_crtc->lut.r[i] = r[i];
                 nv_crtc->lut.g[i] = g[i];
                 nv_crtc->lut.b[i] = b[i];
@@ -805,10 +805,12 @@ nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t start,
          */
         if (!nv_crtc->base.primary->fb) {
                 nv_crtc->lut.depth = 0;
-                return;
+                return 0;
         }
 
         nv_crtc_gamma_load(crtc);
+
+        return 0;
 }
 
 static int
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index c612dc1f1eb4..126a85cc81bc 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -16,9 +16,9 @@ enum nvkm_devidx {
         NVKM_SUBDEV_MC,
         NVKM_SUBDEV_BUS,
         NVKM_SUBDEV_TIMER,
+        NVKM_SUBDEV_INSTMEM,
         NVKM_SUBDEV_FB,
         NVKM_SUBDEV_LTC,
-        NVKM_SUBDEV_INSTMEM,
         NVKM_SUBDEV_MMU,
         NVKM_SUBDEV_BAR,
         NVKM_SUBDEV_PMU,
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
index db10c11f0595..c5a6ebd5a478 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
@@ -25,7 +25,8 @@ u16 nvbios_outp_match(struct nvkm_bios *, u16 type, u16 mask,
                       u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_outp *);
 
 struct nvbios_ocfg {
-        u16 match;
+        u8  proto;
+        u8  flags;
         u16 clkcmp[2];
 };
 
@@ -33,7 +34,7 @@ u16 nvbios_ocfg_entry(struct nvkm_bios *, u16 outp, u8 idx,
                       u8 *ver, u8 *hdr, u8 *cnt, u8 *len);
 u16 nvbios_ocfg_parse(struct nvkm_bios *, u16 outp, u8 idx,
                       u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_ocfg *);
-u16 nvbios_ocfg_match(struct nvkm_bios *, u16 outp, u16 type,
+u16 nvbios_ocfg_match(struct nvkm_bios *, u16 outp, u8 proto, u8 flags,
                       u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_ocfg *);
 u16 nvbios_oclk_match(struct nvkm_bios *, u16 cmp, u32 khz);
 #endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 7c77f960c8b8..6072fe292db8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -760,12 +760,11 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
 
         /* Initialize a page flip struct */
         *s = (struct nouveau_page_flip_state)
-                { { }, event, nouveau_crtc(crtc)->index,
-                  fb->bits_per_pixel, fb->pitches[0], crtc->x, crtc->y,
+                { { }, event, crtc, fb->bits_per_pixel, fb->pitches[0],
                   new_bo->bo.offset };
 
         /* Keep vblanks on during flip, for the target crtc of this flip */
-        drm_vblank_get(dev, nouveau_crtc(crtc)->index);
+        drm_crtc_vblank_get(crtc);
 
         /* Emit a page flip */
         if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
@@ -810,7 +809,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
         return 0;
 
 fail_unreserve:
-        drm_vblank_put(dev, nouveau_crtc(crtc)->index);
+        drm_crtc_vblank_put(crtc);
         ttm_bo_unreserve(&old_bo->bo);
 fail_unpin:
         mutex_unlock(&cli->mutex);
@@ -842,17 +841,17 @@ nouveau_finish_page_flip(struct nouveau_channel *chan,
         s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head);
         if (s->event) {
                 if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
-                        drm_arm_vblank_event(dev, s->crtc, s->event);
+                        drm_crtc_arm_vblank_event(s->crtc, s->event);
                 } else {
-                        drm_send_vblank_event(dev, s->crtc, s->event);
+                        drm_crtc_send_vblank_event(s->crtc, s->event);
 
                         /* Give up ownership of vblank for page-flipped crtc */
-                        drm_vblank_put(dev, s->crtc);
+                        drm_crtc_vblank_put(s->crtc);
                 }
         }
         else {
                 /* Give up ownership of vblank for page-flipped crtc */
-                drm_vblank_put(dev, s->crtc);
+                drm_crtc_vblank_put(s->crtc);
         }
 
         list_del(&s->head);
@@ -873,9 +872,10 @@ nouveau_flip_complete(struct nvif_notify *notify)
 
         if (!nouveau_finish_page_flip(chan, &state)) {
                 if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
-                        nv_set_crtc_base(drm->dev, state.crtc, state.offset +
-                                         state.y * state.pitch +
-                                         state.x * state.bpp / 8);
+                        nv_set_crtc_base(drm->dev, drm_crtc_index(state.crtc),
+                                         state.offset + state.crtc->y *
+                                         state.pitch + state.crtc->x *
+                                         state.bpp / 8);
                 }
         }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 24273bacd885..0420ee861ea4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -28,7 +28,8 @@ int nouveau_framebuffer_init(struct drm_device *, struct nouveau_framebuffer *,
 struct nouveau_page_flip_state {
         struct list_head head;
         struct drm_pending_vblank_event *event;
-        int crtc, bpp, pitch, x, y;
+        struct drm_crtc *crtc;
+        int bpp, pitch;
         u64 offset;
 };
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 11f8dd9c0edb..295e7621cc68 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -22,13 +22,11 @@
  * Authors: Ben Skeggs
  */
 
-#include <linux/apple-gmux.h>
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
-#include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 
 #include "drmP.h"
@@ -315,13 +313,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
         bool boot = false;
         int ret;
 
-        /*
-         * apple-gmux is needed on dual GPU MacBook Pro
-         * to probe the panel if we're the inactive GPU.
-         */
-        if (IS_ENABLED(CONFIG_VGA_ARB) && IS_ENABLED(CONFIG_VGA_SWITCHEROO) &&
-            apple_gmux_present() && pdev != vga_default_device() &&
-            !vga_switcheroo_handler_flags())
+        if (vga_switcheroo_client_probe_defer(pdev))
                 return -EPROBE_DEFER;
 
         /* remove conflicting drivers (vesafb, efifb etc) */
@@ -970,7 +962,7 @@ driver_stub = {
         .gem_prime_vmap = nouveau_gem_prime_vmap,
         .gem_prime_vunmap = nouveau_gem_prime_vunmap,
 
-        .gem_free_object = nouveau_gem_object_del,
+        .gem_free_object_unlocked = nouveau_gem_object_del,
         .gem_open_object = nouveau_gem_object_open,
         .gem_close_object = nouveau_gem_object_close,
 
@@ -1078,7 +1070,6 @@ nouveau_drm_init(void)
         driver_pci = driver_stub;
         driver_pci.set_busid = drm_pci_set_busid;
         driver_platform = driver_stub;
-        driver_platform.set_busid = drm_platform_set_busid;
 
         nouveau_display_options();
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 57aaf98a26f9..d1f248fd3506 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -552,6 +552,8 @@ nouveau_fbcon_init(struct drm_device *dev)
         if (ret)
                 goto fini;
 
+        if (fbcon->helper.fbdev)
+                fbcon->helper.fbdev->pixmap.buf_align = 4;
         return 0;
 
 fini:
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h
index 2e3a62d38fe9..64c4ce7115ad 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.h
@@ -57,7 +57,8 @@ struct nouveau_fence_priv {
         int  (*context_new)(struct nouveau_channel *);
         void (*context_del)(struct nouveau_channel *);
 
-        u32 contexts, context_base;
+        u32 contexts;
+        u64 context_base;
         bool uevent;
 };
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c
index 675e9e077a95..08f9c6fa0f7f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_usif.c
+++ b/drivers/gpu/drm/nouveau/nouveau_usif.c
@@ -212,7 +212,6 @@ usif_notify_get(struct drm_file *f, void *data, u32 size, void *argv, u32 argc)
         ntfy->p->base.event = &ntfy->p->e.base;
         ntfy->p->base.file_priv = f;
         ntfy->p->base.pid = current->pid;
-        ntfy->p->base.destroy =(void(*)(struct drm_pending_event *))kfree;
         ntfy->p->e.base.type = DRM_NOUVEAU_EVENT_NVIF;
         ntfy->p->e.base.length = sizeof(ntfy->p->e.base) + ntfy->reply;
 
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
index 0f3e4bb411cc..7d9248b8c664 100644
--- a/drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
@@ -82,7 +82,6 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         uint32_t fg;
         uint32_t bg;
         uint32_t dsize;
-        uint32_t width;
         uint32_t *data = (uint32_t *)image->data;
         int ret;
 
@@ -93,9 +92,6 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         if (ret)
                 return ret;
 
-        width = ALIGN(image->width, 8);
-        dsize = ALIGN(width * image->height, 32) >> 5;
-
         if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
             info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
                 fg = ((uint32_t *) info->pseudo_palette)[image->fg_color];
@@ -111,10 +107,11 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
                          ((image->dx + image->width) & 0xffff));
         OUT_RING(chan, bg);
         OUT_RING(chan, fg);
-        OUT_RING(chan, (image->height << 16) | width);
+        OUT_RING(chan, (image->height << 16) | image->width);
         OUT_RING(chan, (image->height << 16) | image->width);
         OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff));
 
+        dsize = ALIGN(image->width * image->height, 32) >> 5;
         while (dsize) {
                 int iter_len = dsize > 128 ? 128 : dsize;
 
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 3ffc2b0057bf..7a7788212df7 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1346,21 +1346,22 @@ nv50_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
         return 0;
 }
 
-static void
+static int
 nv50_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
-                    uint32_t start, uint32_t size)
+                    uint32_t size)
 {
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
-        u32 end = min_t(u32, start + size, 256);
         u32 i;
 
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 nv_crtc->lut.r[i] = r[i];
                 nv_crtc->lut.g[i] = g[i];
                 nv_crtc->lut.b[i] = b[i];
         }
 
         nv50_crtc_lut_load(crtc);
+
+        return 0;
 }
 
 static void
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 33d9ee0fac40..1aeb698e9707 100644
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -95,7 +95,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         struct nouveau_fbdev *nfbdev = info->par;
         struct nouveau_drm *drm = nouveau_drm(nfbdev->dev);
         struct nouveau_channel *chan = drm->channel;
-        uint32_t width, dwords, *data = (uint32_t *)image->data;
+        uint32_t dwords, *data = (uint32_t *)image->data;
         uint32_t mask = ~(~0 >> (32 - info->var.bits_per_pixel));
         uint32_t *palette = info->pseudo_palette;
         int ret;
@@ -107,9 +107,6 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         if (ret)
                 return ret;
 
-        width = ALIGN(image->width, 32);
-        dwords = (width * image->height) >> 5;
-
         BEGIN_NV04(chan, NvSub2D, 0x0814, 2);
         if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
             info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
@@ -128,6 +125,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         OUT_RING(chan, 0);
         OUT_RING(chan, image->dy);
 
+        dwords = ALIGN(image->width * image->height, 32) >> 5;
         while (dwords) {
                 int push = dwords > 2047 ? 2047 : dwords;
 
diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index a0913359ac05..839f4c8c1805 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -95,7 +95,7 @@ nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         struct nouveau_fbdev *nfbdev = info->par;
         struct nouveau_drm *drm = nouveau_drm(nfbdev->dev);
         struct nouveau_channel *chan = drm->channel;
-        uint32_t width, dwords, *data = (uint32_t *)image->data;
+        uint32_t dwords, *data = (uint32_t *)image->data;
         uint32_t mask = ~(~0 >> (32 - info->var.bits_per_pixel));
         uint32_t *palette = info->pseudo_palette;
         int ret;
@@ -107,9 +107,6 @@ nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         if (ret)
                 return ret;
 
-        width = ALIGN(image->width, 32);
-        dwords = (width * image->height) >> 5;
-
         BEGIN_NVC0(chan, NvSub2D, 0x0814, 2);
         if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
             info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
@@ -128,6 +125,7 @@ nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         OUT_RING  (chan, 0);
         OUT_RING  (chan, image->dy);
 
+        dwords = ALIGN(image->width * image->height, 32) >> 5;
         while (dwords) {
                 int push = dwords > 2047 ? 2047 : dwords;
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index 18fab3973ce5..62ad0300cfa5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -1614,7 +1614,7 @@ nvkm_device_pci_func = {
         .fini = nvkm_device_pci_fini,
         .resource_addr = nvkm_device_pci_resource_addr,
         .resource_size = nvkm_device_pci_resource_size,
-        .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64),
+        .cpu_coherent = !IS_ENABLED(CONFIG_ARM),
 };
 
 int
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
index a74c5dd27dc0..e2a64ed14b22 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
@@ -18,6 +18,7 @@ nvkm-y += nvkm/engine/disp/piornv50.o
 nvkm-y += nvkm/engine/disp/sornv50.o
 nvkm-y += nvkm/engine/disp/sorg94.o
 nvkm-y += nvkm/engine/disp/sorgf119.o
+nvkm-y += nvkm/engine/disp/sorgm107.o
 nvkm-y += nvkm/engine/disp/sorgm200.o
 nvkm-y += nvkm/engine/disp/dport.o
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
index f0314664349c..5dd34382f55a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
@@ -76,6 +76,7 @@ exec_lookup(struct nv50_disp *disp, int head, int or, u32 ctrl,
         mask |= 0x0001 << or;
         mask |= 0x0100 << head;
 
+
         list_for_each_entry(outp, &disp->base.outp, head) {
                 if ((outp->info.hasht & 0xff) == type &&
                     (outp->info.hashm & mask) == mask) {
@@ -155,25 +156,21 @@ exec_clkcmp(struct nv50_disp *disp, int head, int id, u32 pclk, u32 *conf)
         if (!outp)
                 return NULL;
 
+        *conf = (ctrl & 0x00000f00) >> 8;
         switch (outp->info.type) {
         case DCB_OUTPUT_TMDS:
-                *conf = (ctrl & 0x00000f00) >> 8;
                 if (*conf == 5)
                         *conf |= 0x0100;
                 break;
         case DCB_OUTPUT_LVDS:
-                *conf = disp->sor.lvdsconf;
-                break;
-        case DCB_OUTPUT_DP:
-                *conf = (ctrl & 0x00000f00) >> 8;
+                *conf |= disp->sor.lvdsconf;
                 break;
-        case DCB_OUTPUT_ANALOG:
         default:
-                *conf = 0x00ff;
                 break;
         }
 
-        data = nvbios_ocfg_match(bios, data, *conf, &ver, &hdr, &cnt, &len, &info2);
+        data = nvbios_ocfg_match(bios, data, *conf & 0xff, *conf >> 8,
+                                 &ver, &hdr, &cnt, &len, &info2);
         if (data && id < 0xff) {
                 data = nvbios_oclk_match(bios, info2.clkcmp[id], pclk);
                 if (data) {
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
index b6944142d616..f4b9cf8574be 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
@@ -36,7 +36,7 @@ gm107_disp = {
         .outp.internal.crt = nv50_dac_output_new,
         .outp.internal.tmds = nv50_sor_output_new,
         .outp.internal.lvds = nv50_sor_output_new,
-        .outp.internal.dp = gf119_sor_dp_new,
+        .outp.internal.dp = gm107_sor_dp_new,
         .dac.nr = 3,
         .dac.power = nv50_dac_power,
         .dac.sense = nv50_dac_sense,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
index 4226d2153b9c..fcb1b0c46d64 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
@@ -387,22 +387,17 @@ exec_clkcmp(struct nv50_disp *disp, int head, int id, u32 pclk, u32 *conf)
         if (!outp)
                 return NULL;
 
+        *conf = (ctrl & 0x00000f00) >> 8;
         if (outp->info.location == 0) {
                 switch (outp->info.type) {
                 case DCB_OUTPUT_TMDS:
-                        *conf = (ctrl & 0x00000f00) >> 8;
                         if (*conf == 5)
                                 *conf |= 0x0100;
                         break;
                 case DCB_OUTPUT_LVDS:
-                        *conf = disp->sor.lvdsconf;
+                        *conf |= disp->sor.lvdsconf;
                         break;
-                case DCB_OUTPUT_DP:
-                        *conf = (ctrl & 0x00000f00) >> 8;
-                        break;
-                case DCB_OUTPUT_ANALOG:
                 default:
-                        *conf = 0x00ff;
                         break;
                 }
         } else {
@@ -410,7 +405,8 @@ exec_clkcmp(struct nv50_disp *disp, int head, int id, u32 pclk, u32 *conf)
                 pclk = pclk / 2;
         }
 
-        data = nvbios_ocfg_match(bios, data, *conf, &ver, &hdr, &cnt, &len, &info2);
+        data = nvbios_ocfg_match(bios, data, *conf & 0xff, *conf >> 8,
+                                 &ver, &hdr, &cnt, &len, &info2);
         if (data && id < 0xff) {
                 data = nvbios_oclk_match(bios, info2.clkcmp[id], pclk);
                 if (data) {
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
index e9067ba4e179..4e983f6d7032 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
@@ -62,7 +62,12 @@ int g94_sor_dp_lnk_pwr(struct nvkm_output_dp *, int);
 int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
                      struct nvkm_output **);
 int gf119_sor_dp_lnk_ctl(struct nvkm_output_dp *, int, int, bool);
+int gf119_sor_dp_drv_ctl(struct nvkm_output_dp *, int, int, int, int);
 
-int  gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
-                      struct nvkm_output **);
+int gm107_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
+                     struct nvkm_output **);
+int gm107_sor_dp_pattern(struct nvkm_output_dp *, int);
+
+int gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
+                     struct nvkm_output **);
 #endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
index b4b41b135643..22706c0a54b5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
@@ -40,8 +40,7 @@ static int
 gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
 {
         struct nvkm_device *device = outp->base.disp->engine.subdev.device;
-        const u32 loff = gf119_sor_loff(outp);
-        nvkm_mask(device, 0x61c110 + loff, 0x0f0f0f0f, 0x01010101 * pattern);
+        nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern);
         return 0;
 }
 
@@ -64,7 +63,7 @@ gf119_sor_dp_lnk_ctl(struct nvkm_output_dp *outp, int nr, int bw, bool ef)
         return 0;
 }
 
-static int
+int
 gf119_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
                      int ln, int vs, int pe, int pc)
 {
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
new file mode 100644
index 000000000000..37790b2617c5
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016 Red Hat Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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: Ben Skeggs <bskeggs@redhat.com>
+ */
+#include "nv50.h"
+#include "outpdp.h"
+
+int
+gm107_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
+{
+        struct nvkm_device *device = outp->base.disp->engine.subdev.device;
+        const u32 soff = outp->base.or * 0x800;
+        const u32 data = 0x01010101 * pattern;
+        if (outp->base.info.sorconf.link & 1)
+                nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, data);
+        else
+                nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data);
+        return 0;
+}
+
+static const struct nvkm_output_dp_func
+gm107_sor_dp_func = {
+        .pattern = gm107_sor_dp_pattern,
+        .lnk_pwr = g94_sor_dp_lnk_pwr,
+        .lnk_ctl = gf119_sor_dp_lnk_ctl,
+        .drv_ctl = gf119_sor_dp_drv_ctl,
+};
+
+int
+gm107_sor_dp_new(struct nvkm_disp *disp, int index,
+                 struct dcb_output *dcbE, struct nvkm_output **poutp)
+{
+        return nvkm_output_dp_new_(&gm107_sor_dp_func, disp, index, dcbE, poutp);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
index 2cfbef9c344f..c44fa7ea672a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
@@ -57,19 +57,6 @@ gm200_sor_dp_lane_map(struct nvkm_device *device, u8 lane)
 }
 
 static int
-gm200_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
-{
-        struct nvkm_device *device = outp->base.disp->engine.subdev.device;
-        const u32 soff = gm200_sor_soff(outp);
-        const u32 data = 0x01010101 * pattern;
-        if (outp->base.info.sorconf.link & 1)
-                nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, data);
-        else
-                nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data);
-        return 0;
-}
-
-static int
 gm200_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
 {
         struct nvkm_device *device = outp->base.disp->engine.subdev.device;
@@ -129,7 +116,7 @@ gm200_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
 
 static const struct nvkm_output_dp_func
 gm200_sor_dp_func = {
-        .pattern = gm200_sor_dp_pattern,
+        .pattern = gm107_sor_dp_pattern,
         .lnk_pwr = gm200_sor_dp_lnk_pwr,
         .lnk_ctl = gf119_sor_dp_lnk_ctl,
         .drv_ctl = gm200_sor_dp_drv_ctl,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 9513badb8220..ae9ab5b1ab97 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -949,22 +949,41 @@ gf100_gr_trap_gpc_rop(struct gf100_gr *gr, int gpc)
 }
 
 static const struct nvkm_enum gf100_mp_warp_error[] = {
-        { 0x00, "NO_ERROR" },
-        { 0x01, "STACK_MISMATCH" },
+        { 0x01, "STACK_ERROR" },
+        { 0x02, "API_STACK_ERROR" },
+        { 0x03, "RET_EMPTY_STACK_ERROR" },
+        { 0x04, "PC_WRAP" },
         { 0x05, "MISALIGNED_PC" },
-        { 0x08, "MISALIGNED_GPR" },
-        { 0x09, "INVALID_OPCODE" },
-        { 0x0d, "GPR_OUT_OF_BOUNDS" },
-        { 0x0e, "MEM_OUT_OF_BOUNDS" },
-        { 0x0f, "UNALIGNED_MEM_ACCESS" },
+        { 0x06, "PC_OVERFLOW" },
+        { 0x07, "MISALIGNED_IMMC_ADDR" },
+        { 0x08, "MISALIGNED_REG" },
+        { 0x09, "ILLEGAL_INSTR_ENCODING" },
+        { 0x0a, "ILLEGAL_SPH_INSTR_COMBO" },
+        { 0x0b, "ILLEGAL_INSTR_PARAM" },
+        { 0x0c, "INVALID_CONST_ADDR" },
+        { 0x0d, "OOR_REG" },
+        { 0x0e, "OOR_ADDR" },
+        { 0x0f, "MISALIGNED_ADDR" },
         { 0x10, "INVALID_ADDR_SPACE" },
-        { 0x11, "INVALID_PARAM" },
+        { 0x11, "ILLEGAL_INSTR_PARAM2" },
+        { 0x12, "INVALID_CONST_ADDR_LDC" },
+        { 0x13, "GEOMETRY_SM_ERROR" },
+        { 0x14, "DIVERGENT" },
+        { 0x15, "WARP_EXIT" },
         {}
 };
 
 static const struct nvkm_bitfield gf100_mp_global_error[] = {
+        { 0x00000001, "SM_TO_SM_FAULT" },
+        { 0x00000002, "L1_ERROR" },
         { 0x00000004, "MULTIPLE_WARP_ERRORS" },
-        { 0x00000008, "OUT_OF_STACK_SPACE" },
+        { 0x00000008, "PHYSICAL_STACK_OVERFLOW" },
+        { 0x00000010, "BPT_INT" },
+        { 0x00000020, "BPT_PAUSE" },
+        { 0x00000040, "SINGLE_STEP_COMPLETE" },
+        { 0x20000000, "ECC_SEC_ERROR" },
+        { 0x40000000, "ECC_DED_ERROR" },
+        { 0x80000000, "TIMEOUT" },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
index a5e92135cd77..9efb1b48cd54 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
@@ -141,7 +141,8 @@ nvbios_ocfg_parse(struct nvkm_bios *bios, u16 outp, u8 idx,
 {
         u16 data = nvbios_ocfg_entry(bios, outp, idx, ver, hdr, cnt, len);
         if (data) {
-                info->match     = nvbios_rd16(bios, data + 0x00);
+                info->proto     = nvbios_rd08(bios, data + 0x00);
+                info->flags     = nvbios_rd16(bios, data + 0x01);
                 info->clkcmp[0] = nvbios_rd16(bios, data + 0x02);
                 info->clkcmp[1] = nvbios_rd16(bios, data + 0x04);
         }
@@ -149,12 +150,13 @@ nvbios_ocfg_parse(struct nvkm_bios *bios, u16 outp, u8 idx,
 }
 
 u16
-nvbios_ocfg_match(struct nvkm_bios *bios, u16 outp, u16 type,
+nvbios_ocfg_match(struct nvkm_bios *bios, u16 outp, u8 proto, u8 flags,
                   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_ocfg *info)
 {
         u16 data, idx = 0;
         while ((data = nvbios_ocfg_parse(bios, outp, idx++, ver, hdr, cnt, len, info))) {
-                if (info->match == type)
+                if ((info->proto == proto || info->proto == 0xff) &&
+                    (info->flags == flags))
                         break;
         }
         return data;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
index 323c79abe468..41bd5d0f7692 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
@@ -276,6 +276,8 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
                 struct pwr_rail_t *r = &stbl.rail[i];
                 struct nvkm_iccsense_rail *rail;
                 struct nvkm_iccsense_sensor *sensor;
+                int (*read)(struct nvkm_iccsense *,
+                            struct nvkm_iccsense_rail *);
 
                 if (!r->mode || r->resistor_mohm == 0)
                         continue;
@@ -284,31 +286,31 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
                 if (!sensor)
                         continue;
 
-                rail = kmalloc(sizeof(*rail), GFP_KERNEL);
-                if (!rail)
-                        return -ENOMEM;
-
                 switch (sensor->type) {
                 case NVBIOS_EXTDEV_INA209:
                         if (r->rail != 0)
                                 continue;
-                        rail->read = nvkm_iccsense_ina209_read;
+                        read = nvkm_iccsense_ina209_read;
                         break;
                 case NVBIOS_EXTDEV_INA219:
                         if (r->rail != 0)
                                 continue;
-                        rail->read = nvkm_iccsense_ina219_read;
+                        read = nvkm_iccsense_ina219_read;
                         break;
                 case NVBIOS_EXTDEV_INA3221:
                         if (r->rail >= 3)
                                 continue;
-                        rail->read = nvkm_iccsense_ina3221_read;
+                        read = nvkm_iccsense_ina3221_read;
                         break;
                 default:
                         continue;
                 }
 
+                rail = kmalloc(sizeof(*rail), GFP_KERNEL);
+                if (!rail)
+                        return -ENOMEM;
                 sensor->rail_mask |= 1 << r->rail;
+                rail->read = read;
                 rail->sensor = sensor;
                 rail->idx = r->rail;
                 rail->mohm = r->resistor_mohm;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
index e292f5679418..389fb13a1998 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
@@ -69,11 +69,11 @@ gm107_ltc_zbc_clear_depth(struct nvkm_ltc *ltc, int i, const u32 depth)
 }
 
 static void
-gm107_ltc_lts_isr(struct nvkm_ltc *ltc, int c, int s)
+gm107_ltc_intr_lts(struct nvkm_ltc *ltc, int c, int s)
 {
         struct nvkm_subdev *subdev = &ltc->subdev;
         struct nvkm_device *device = subdev->device;
-        u32 base = 0x140000 + (c * 0x2000) + (s * 0x200);
+        u32 base = 0x140400 + (c * 0x2000) + (s * 0x200);
         u32 stat = nvkm_rd32(device, base + 0x00c);
 
         if (stat) {
@@ -92,7 +92,7 @@ gm107_ltc_intr(struct nvkm_ltc *ltc)
         while (mask) {
                 u32 s, c = __ffs(mask);
                 for (s = 0; s < ltc->lts_nr; s++)
-                        gm107_ltc_lts_isr(ltc, c, s);
+                        gm107_ltc_intr_lts(ltc, c, s);
                 mask &= ~(1 << c);
         }
 }
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c
index 2a29bfd5125a..e18e0dc19ec8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c
@@ -46,7 +46,7 @@ static const struct nvkm_ltc_func
 gm200_ltc = {
         .oneinit = gm200_ltc_oneinit,
         .init = gm200_ltc_init,
-        .intr = gm107_ltc_intr, /*XXX: not validated */
+        .intr = gm107_ltc_intr,
         .cbc_clear = gm107_ltc_cbc_clear,
         .cbc_wait = gm107_ltc_cbc_wait,
         .zbc = 16,
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 73241c4eb7aa..336ad4de9981 100644
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -2,6 +2,7 @@ config DRM_OMAP
         tristate "OMAP DRM"
         depends on DRM
         depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
+        select OMAP2_DSS
         select DRM_KMS_HELPER
         select DRM_KMS_FB_HELPER
         select FB_SYS_FILLRECT
diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig
index 2a618afe0f53..c226da145fb3 100644
--- a/drivers/gpu/drm/omapdrm/displays/Kconfig
+++ b/drivers/gpu/drm/omapdrm/displays/Kconfig
@@ -1,80 +1,80 @@
 menu "OMAPDRM External Display Device Drivers"
 
-config DISPLAY_ENCODER_OPA362
+config DRM_OMAP_ENCODER_OPA362
         tristate "OPA362 external analog amplifier"
         help
           Driver for OPA362 external analog TV amplifier controlled
           through a GPIO.
 
-config DISPLAY_ENCODER_TFP410
+config DRM_OMAP_ENCODER_TFP410
         tristate "TFP410 DPI to DVI Encoder"
         help
           Driver for TFP410 DPI to DVI encoder.
 
-config DISPLAY_ENCODER_TPD12S015
+config DRM_OMAP_ENCODER_TPD12S015
         tristate "TPD12S015 HDMI ESD protection and level shifter"
         help
           Driver for TPD12S015, which offers HDMI ESD protection and level
           shifting.
 
-config DISPLAY_CONNECTOR_DVI
+config DRM_OMAP_CONNECTOR_DVI
         tristate "DVI Connector"
         depends on I2C
         help
           Driver for a generic DVI connector.
 
-config DISPLAY_CONNECTOR_HDMI
+config DRM_OMAP_CONNECTOR_HDMI
         tristate "HDMI Connector"
         help
           Driver for a generic HDMI connector.
 
-config DISPLAY_CONNECTOR_ANALOG_TV
+config DRM_OMAP_CONNECTOR_ANALOG_TV
         tristate "Analog TV Connector"
         help
           Driver for a generic analog TV connector.
 
-config DISPLAY_PANEL_DPI
+config DRM_OMAP_PANEL_DPI
         tristate "Generic DPI panel"
         help
           Driver for generic DPI panels.
 
-config DISPLAY_PANEL_DSI_CM
+config DRM_OMAP_PANEL_DSI_CM
         tristate "Generic DSI Command Mode Panel"
         depends on BACKLIGHT_CLASS_DEVICE
         help
           Driver for generic DSI command mode panels.
 
-config DISPLAY_PANEL_SONY_ACX565AKM
+config DRM_OMAP_PANEL_SONY_ACX565AKM
         tristate "ACX565AKM Panel"
         depends on SPI && BACKLIGHT_CLASS_DEVICE
         help
           This is the LCD panel used on Nokia N900
 
-config DISPLAY_PANEL_LGPHILIPS_LB035Q02
+config DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
         tristate "LG.Philips LB035Q02 LCD Panel"
         depends on SPI
         help
           LCD Panel used on the Gumstix Overo Palo35
 
-config DISPLAY_PANEL_SHARP_LS037V7DW01
+config DRM_OMAP_PANEL_SHARP_LS037V7DW01
         tristate "Sharp LS037V7DW01 LCD Panel"
         depends on BACKLIGHT_CLASS_DEVICE
         help
           LCD Panel used in TI's SDP3430 and EVM boards
 
-config DISPLAY_PANEL_TPO_TD028TTEC1
+config DRM_OMAP_PANEL_TPO_TD028TTEC1
         tristate "TPO TD028TTEC1 LCD Panel"
         depends on SPI
         help
           LCD panel used in Openmoko.
 
-config DISPLAY_PANEL_TPO_TD043MTEA1
+config DRM_OMAP_PANEL_TPO_TD043MTEA1
         tristate "TPO TD043MTEA1 LCD Panel"
         depends on SPI
         help
           LCD Panel used in OMAP3 Pandora
 
-config DISPLAY_PANEL_NEC_NL8048HL11
+config DRM_OMAP_PANEL_NEC_NL8048HL11
         tristate "NEC NL8048HL11 Panel"
         depends on SPI
         depends on BACKLIGHT_CLASS_DEVICE
diff --git a/drivers/gpu/drm/omapdrm/displays/Makefile b/drivers/gpu/drm/omapdrm/displays/Makefile
index 9aa176bfbf2e..46baafb1a83e 100644
--- a/drivers/gpu/drm/omapdrm/displays/Makefile
+++ b/drivers/gpu/drm/omapdrm/displays/Makefile
@@ -1,14 +1,14 @@
-obj-$(CONFIG_DISPLAY_ENCODER_OPA362) += encoder-opa362.o
-obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o
-obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o
-obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o
-obj-$(CONFIG_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o
-obj-$(CONFIG_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
-obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o
-obj-$(CONFIG_DISPLAY_PANEL_DSI_CM) += panel-dsi-cm.o
-obj-$(CONFIG_DISPLAY_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
-obj-$(CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
-obj-$(CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
-obj-$(CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
-obj-$(CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
-obj-$(CONFIG_DISPLAY_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o
+obj-$(CONFIG_DRM_OMAP_ENCODER_OPA362) += encoder-opa362.o
+obj-$(CONFIG_DRM_OMAP_ENCODER_TFP410) += encoder-tfp410.o
+obj-$(CONFIG_DRM_OMAP_ENCODER_TPD12S015) += encoder-tpd12s015.o
+obj-$(CONFIG_DRM_OMAP_CONNECTOR_DVI) += connector-dvi.o
+obj-$(CONFIG_DRM_OMAP_CONNECTOR_HDMI) += connector-hdmi.o
+obj-$(CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
+obj-$(CONFIG_DRM_OMAP_PANEL_DPI) += panel-dpi.o
+obj-$(CONFIG_DRM_OMAP_PANEL_DSI_CM) += panel-dsi-cm.o
+obj-$(CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
+obj-$(CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
+obj-$(CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
+obj-$(CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
+obj-$(CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
+obj-$(CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 8511c648a15c..3485d1ecd655 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -14,9 +14,10 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
 #include <video/omap-panel-data.h>
 
+#include "../dss/omapdss.h"
+
 struct panel_drv_data {
         struct omap_dss_device dssdev;
         struct omap_dss_device *in;
@@ -25,7 +26,6 @@ struct panel_drv_data {
 
         struct omap_video_timings timings;
 
-        enum omap_dss_venc_type connector_type;
         bool invert_polarity;
 };
 
@@ -45,10 +45,6 @@ static const struct omap_video_timings tvc_pal_timings = {
 
 static const struct of_device_id tvc_of_match[];
 
-struct tvc_of_data {
-        enum omap_dss_venc_type connector_type;
-};
-
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
 
 static int tvc_connect(struct omap_dss_device *dssdev)
@@ -99,7 +95,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
         in->ops.atv->set_timings(in, &ddata->timings);
 
         if (!ddata->dev->of_node) {
-                in->ops.atv->set_type(in, ddata->connector_type);
+                in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
 
                 in->ops.atv->invert_vid_out_polarity(in,
                         ddata->invert_polarity);
@@ -207,7 +203,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
 
         ddata->in = in;
 
-        ddata->connector_type = pdata->connector_type;
         ddata->invert_polarity = pdata->invert_polarity;
 
         dssdev = &ddata->dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 747f26a55e43..75f7827525cf 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -15,10 +15,10 @@
 #include <linux/slab.h>
 
 #include <drm/drm_edid.h>
-
-#include <video/omapdss.h>
 #include <video/omap-panel-data.h>
 
+#include "../dss/omapdss.h"
+
 static const struct omap_video_timings dvic_default_timings = {
         .x_res          = 640,
         .y_res          = 480,
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 225fd8d6ab31..7bdf83af9797 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -9,6 +9,7 @@
  * the Free Software Foundation.
  */
 
+#include <linux/gpio/consumer.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -16,10 +17,10 @@
 #include <linux/of_gpio.h>
 
 #include <drm/drm_edid.h>
-
-#include <video/omapdss.h>
 #include <video/omap-panel-data.h>
 
+#include "../dss/omapdss.h"
+
 static const struct omap_video_timings hdmic_default_timings = {
         .x_res          = 640,
         .y_res          = 480,
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 8c246c213e06..fe4e7ec3bab0 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -14,13 +14,12 @@
  * the Free Software Foundation.
  */
 
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 2fd5602880a7..d768217cefe0 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -9,14 +9,13 @@
  * the Free Software Foundation.
  */
 
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 916a89978387..46855c8f5cbf 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -16,8 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index e780fd4f8b46..7f16f985ab22 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -9,17 +9,19 @@
  * the Free Software Foundation.
  */
 
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/regulator/consumer.h>
 
-#include <video/omapdss.h>
 #include <video/omap-panel-data.h>
 #include <video/of_display_timing.h>
 
+#include "../dss/omapdss.h"
+
 struct panel_drv_data {
         struct omap_dss_device dssdev;
         struct omap_dss_device *in;
@@ -32,6 +34,7 @@ struct panel_drv_data {
         int backlight_gpio;
 
         struct gpio_desc *enable_gpio;
+        struct regulator *vcc_supply;
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -83,6 +86,12 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
         if (r)
                 return r;
 
+        r = regulator_enable(ddata->vcc_supply);
+        if (r) {
+                in->ops.dpi->disable(in);
+                return r;
+        }
+
         gpiod_set_value_cansleep(ddata->enable_gpio, 1);
 
         if (gpio_is_valid(ddata->backlight_gpio))
@@ -105,6 +114,7 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
                 gpio_set_value_cansleep(ddata->backlight_gpio, 0);
 
         gpiod_set_value_cansleep(ddata->enable_gpio, 0);
+        regulator_disable(ddata->vcc_supply);
 
         in->ops.dpi->disable(in);
 
@@ -213,6 +223,20 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
 
         ddata->enable_gpio = gpio;
 
+        /*
+         * Many different panels are supported by this driver and there are
+         * probably very different needs for their reset pins in regards to
+         * timing and order relative to the enable gpio. So for now it's just
+         * ensured that the reset line isn't active.
+         */
+        gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_OUT_LOW);
+        if (IS_ERR(gpio))
+                return PTR_ERR(gpio);
+
+        ddata->vcc_supply = devm_regulator_get(&pdev->dev, "vcc");
+        if (IS_ERR(ddata->vcc_supply))
+                return PTR_ERR(ddata->vcc_supply);
+
         ddata->backlight_gpio = -ENOENT;
 
         r = of_get_display_timing(node, "panel-timing", &timing);
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 36485c2137ce..1b0cf2d8224b 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -14,7 +14,7 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/module.h>
@@ -25,10 +25,10 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
 #include <video/mipi_display.h>
 
+#include "../dss/omapdss.h"
+
 /* DSI Virtual channel. Hardcoded for now. */
 #define TCH 0
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 458f77bc473d..6dfb96cea293 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -15,9 +15,9 @@
 #include <linux/spi/spi.h>
 #include <linux/mutex.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
 
 static struct omap_video_timings lb035q02_timings = {
         .x_res = 320,
@@ -50,9 +50,6 @@ struct panel_drv_data {
 
         struct omap_video_timings videomode;
 
-        /* used for non-DT boot, to be removed */
-        int backlight_gpio;
-
         struct gpio_desc *enable_gpio;
 };
 
@@ -170,9 +167,6 @@ static int lb035q02_enable(struct omap_dss_device *dssdev)
         if (ddata->enable_gpio)
                 gpiod_set_value_cansleep(ddata->enable_gpio, 1);
 
-        if (gpio_is_valid(ddata->backlight_gpio))
-                gpio_set_value_cansleep(ddata->backlight_gpio, 1);
-
         dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
         return 0;
@@ -189,9 +183,6 @@ static void lb035q02_disable(struct omap_dss_device *dssdev)
         if (ddata->enable_gpio)
                 gpiod_set_value_cansleep(ddata->enable_gpio, 0);
 
-        if (gpio_is_valid(ddata->backlight_gpio))
-                gpio_set_value_cansleep(ddata->backlight_gpio, 0);
-
         in->ops.dpi->disable(in);
 
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
@@ -255,8 +246,6 @@ static int lb035q02_probe_of(struct spi_device *spi)
 
         ddata->enable_gpio = gpio;
 
-        ddata->backlight_gpio = -ENOENT;
-
         in = omapdss_of_find_source_for_first_ep(node);
         if (IS_ERR(in)) {
                 dev_err(&spi->dev, "failed to find video source\n");
@@ -289,13 +278,6 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
         if (r)
                 return r;
 
-        if (gpio_is_valid(ddata->backlight_gpio)) {
-                r = devm_gpio_request_one(&spi->dev, ddata->backlight_gpio,
-                                GPIOF_OUT_INIT_LOW, "panel backlight");
-                if (r)
-                        goto err_gpio;
-        }
-
         ddata->videomode = lb035q02_timings;
 
         dssdev = &ddata->dssdev;
@@ -315,7 +297,6 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
         return 0;
 
 err_reg:
-err_gpio:
         omap_dss_put_device(ddata->in);
         return r;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 780cb263a318..fc4c238c9583 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -15,10 +15,10 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/fb.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
 
 struct panel_drv_data {
         struct omap_dss_device  dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index 529a017602e4..3d3efc561ea9 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -10,14 +10,14 @@
  */
 
 #include <linux/delay.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
-#include <video/omapdss.h>
+
+#include "../dss/omapdss.h"
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
index 31efcca801bd..157c512205d1 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -29,13 +29,14 @@
 #include <linux/sched.h>
 #include <linux/backlight.h>
 #include <linux/fb.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
 #include <video/omap-panel-data.h>
 
+#include "../dss/omapdss.h"
+
 #define MIPID_CMD_READ_DISP_ID          0x04
 #define MIPID_CMD_READ_RED              0x06
 #define MIPID_CMD_READ_GREEN            0x07
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index bd8d85041926..e859b3f893f7 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -28,7 +28,8 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio.h>
-#include <video/omapdss.h>
+
+#include "../dss/omapdss.h"
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 03e2beb7b4f0..66c6bbe6472b 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -14,12 +14,12 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/regulator/consumer.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
 
 #define TPO_R02_MODE(x)         ((x) & 7)
 #define TPO_R02_MODE_800x480    7
diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
index 7e4e5bebabbe..6a3ebfcd7223 100644
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -35,8 +35,7 @@
 #include <linux/suspend.h>
 #include <linux/slab.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
@@ -196,8 +195,6 @@ static int __init omap_dss_probe(struct platform_device *pdev)
                 core.default_display_name = def_disp_name;
         else if (pdata->default_display_name)
                 core.default_display_name = pdata->default_display_name;
-        else if (pdata->default_device)
-                core.default_display_name = pdata->default_device->name;
 
         return 0;
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index f83608b69e68..535240fba671 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -41,8 +41,7 @@
 #include <linux/of.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 #include "dispc.h"
@@ -113,9 +112,14 @@ struct dispc_features {
          * never both, we can just use this flag for now.
          */
         bool reverse_ilace_field_order:1;
+
+        bool has_gamma_table:1;
+
+        bool has_gamma_i734_bug:1;
 };
 
 #define DISPC_MAX_NR_FIFOS 5
+#define DISPC_MAX_CHANNEL_GAMMA 4
 
 static struct {
         struct platform_device *pdev;
@@ -135,6 +139,8 @@ static struct {
         bool            ctx_valid;
         u32             ctx[DISPC_SZ_REGS / sizeof(u32)];
 
+        u32 *gamma_table[DISPC_MAX_CHANNEL_GAMMA];
+
         const struct dispc_features *feat;
 
         bool is_enabled;
@@ -178,11 +184,19 @@ struct dispc_reg_field {
         u8 low;
 };
 
+struct dispc_gamma_desc {
+        u32 len;
+        u32 bits;
+        u16 reg;
+        bool has_index;
+};
+
 static const struct {
         const char *name;
         u32 vsync_irq;
         u32 framedone_irq;
         u32 sync_lost_irq;
+        struct dispc_gamma_desc gamma;
         struct dispc_reg_field reg_desc[DISPC_MGR_FLD_NUM];
 } mgr_desc[] = {
         [OMAP_DSS_CHANNEL_LCD] = {
@@ -190,6 +204,12 @@ static const struct {
                 .vsync_irq      = DISPC_IRQ_VSYNC,
                 .framedone_irq  = DISPC_IRQ_FRAMEDONE,
                 .sync_lost_irq  = DISPC_IRQ_SYNC_LOST,
+                .gamma          = {
+                        .len    = 256,
+                        .bits   = 8,
+                        .reg    = DISPC_GAMMA_TABLE0,
+                        .has_index = true,
+                },
                 .reg_desc       = {
                         [DISPC_MGR_FLD_ENABLE]          = { DISPC_CONTROL,  0,  0 },
                         [DISPC_MGR_FLD_STNTFT]          = { DISPC_CONTROL,  3,  3 },
@@ -207,6 +227,12 @@ static const struct {
                 .vsync_irq      = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN,
                 .framedone_irq  = DISPC_IRQ_FRAMEDONETV,
                 .sync_lost_irq  = DISPC_IRQ_SYNC_LOST_DIGIT,
+                .gamma          = {
+                        .len    = 1024,
+                        .bits   = 10,
+                        .reg    = DISPC_GAMMA_TABLE2,
+                        .has_index = false,
+                },
                 .reg_desc       = {
                         [DISPC_MGR_FLD_ENABLE]          = { DISPC_CONTROL,  1,  1 },
                         [DISPC_MGR_FLD_STNTFT]          = { },
@@ -224,6 +250,12 @@ static const struct {
                 .vsync_irq      = DISPC_IRQ_VSYNC2,
                 .framedone_irq  = DISPC_IRQ_FRAMEDONE2,
                 .sync_lost_irq  = DISPC_IRQ_SYNC_LOST2,
+                .gamma          = {
+                        .len    = 256,
+                        .bits   = 8,
+                        .reg    = DISPC_GAMMA_TABLE1,
+                        .has_index = true,
+                },
                 .reg_desc       = {
                         [DISPC_MGR_FLD_ENABLE]          = { DISPC_CONTROL2,  0,  0 },
                         [DISPC_MGR_FLD_STNTFT]          = { DISPC_CONTROL2,  3,  3 },
@@ -241,6 +273,12 @@ static const struct {
                 .vsync_irq      = DISPC_IRQ_VSYNC3,
                 .framedone_irq  = DISPC_IRQ_FRAMEDONE3,
                 .sync_lost_irq  = DISPC_IRQ_SYNC_LOST3,
+                .gamma          = {
+                        .len    = 256,
+                        .bits   = 8,
+                        .reg    = DISPC_GAMMA_TABLE3,
+                        .has_index = true,
+                },
                 .reg_desc       = {
                         [DISPC_MGR_FLD_ENABLE]          = { DISPC_CONTROL3,  0,  0 },
                         [DISPC_MGR_FLD_STNTFT]          = { DISPC_CONTROL3,  3,  3 },
@@ -1084,20 +1122,6 @@ static u32 dispc_ovl_get_burst_size(enum omap_plane plane)
         return unit * 8;
 }
 
-void dispc_enable_gamma_table(bool enable)
-{
-        /*
-         * This is partially implemented to support only disabling of
-         * the gamma table.
-         */
-        if (enable) {
-                DSSWARN("Gamma table enabling for TV not yet supported");
-                return;
-        }
-
-        REG_FLD_MOD(DISPC_CONFIG, enable, 9, 9);
-}
-
 static void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable)
 {
         if (channel == OMAP_DSS_CHANNEL_DIGIT)
@@ -3299,30 +3323,21 @@ static void dispc_mgr_get_lcd_divisor(enum omap_channel channel, int *lck_div,
 
 static unsigned long dispc_fclk_rate(void)
 {
-        struct dss_pll *pll;
-        unsigned long r = 0;
+        unsigned long r;
+        enum dss_clk_source src;
+
+        src = dss_get_dispc_clk_source();
 
-        switch (dss_get_dispc_clk_source()) {
-        case OMAP_DSS_CLK_SRC_FCK:
+        if (src == DSS_CLK_SRC_FCK) {
                 r = dss_get_dispc_clk_rate();
-                break;
-        case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
-                pll = dss_pll_find("dsi0");
-                if (!pll)
-                        pll = dss_pll_find("video0");
+        } else {
+                struct dss_pll *pll;
+                unsigned clkout_idx;
 
-                r = pll->cinfo.clkout[0];
-                break;
-        case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
-                pll = dss_pll_find("dsi1");
-                if (!pll)
-                        pll = dss_pll_find("video1");
+                pll = dss_pll_find_by_src(src);
+                clkout_idx = dss_pll_get_clkout_idx_for_src(src);
 
-                r = pll->cinfo.clkout[0];
-                break;
-        default:
-                BUG();
-                return 0;
+                r = pll->cinfo.clkout[clkout_idx];
         }
 
         return r;
@@ -3330,43 +3345,31 @@ static unsigned long dispc_fclk_rate(void)
 
 static unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
 {
-        struct dss_pll *pll;
         int lcd;
         unsigned long r;
-        u32 l;
-
-        if (dss_mgr_is_lcd(channel)) {
-                l = dispc_read_reg(DISPC_DIVISORo(channel));
+        enum dss_clk_source src;
 
-                lcd = FLD_GET(l, 23, 16);
+        /* for TV, LCLK rate is the FCLK rate */
+        if (!dss_mgr_is_lcd(channel))
+                return dispc_fclk_rate();
 
-                switch (dss_get_lcd_clk_source(channel)) {
-                case OMAP_DSS_CLK_SRC_FCK:
-                        r = dss_get_dispc_clk_rate();
-                        break;
-                case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
-                        pll = dss_pll_find("dsi0");
-                        if (!pll)
-                                pll = dss_pll_find("video0");
+        src = dss_get_lcd_clk_source(channel);
 
-                        r = pll->cinfo.clkout[0];
-                        break;
-                case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
-                        pll = dss_pll_find("dsi1");
-                        if (!pll)
-                                pll = dss_pll_find("video1");
+        if (src == DSS_CLK_SRC_FCK) {
+                r = dss_get_dispc_clk_rate();
+        } else {
+                struct dss_pll *pll;
+                unsigned clkout_idx;
 
-                        r = pll->cinfo.clkout[0];
-                        break;
-                default:
-                        BUG();
-                        return 0;
-                }
+                pll = dss_pll_find_by_src(src);
+                clkout_idx = dss_pll_get_clkout_idx_for_src(src);
 
-                return r / lcd;
-        } else {
-                return dispc_fclk_rate();
+                r = pll->cinfo.clkout[clkout_idx];
         }
+
+        lcd = REG_GET(DISPC_DIVISORo(channel), 23, 16);
+
+        return r / lcd;
 }
 
 static unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
@@ -3426,15 +3429,14 @@ static unsigned long dispc_plane_lclk_rate(enum omap_plane plane)
 static void dispc_dump_clocks_channel(struct seq_file *s, enum omap_channel channel)
 {
         int lcd, pcd;
-        enum omap_dss_clk_source lcd_clk_src;
+        enum dss_clk_source lcd_clk_src;
 
         seq_printf(s, "- %s -\n", mgr_desc[channel].name);
 
         lcd_clk_src = dss_get_lcd_clk_source(channel);
 
-        seq_printf(s, "%s clk source = %s (%s)\n", mgr_desc[channel].name,
-                dss_get_generic_clk_source_name(lcd_clk_src),
-                dss_feat_get_clk_source_name(lcd_clk_src));
+        seq_printf(s, "%s clk source = %s\n", mgr_desc[channel].name,
+                dss_get_clk_source_name(lcd_clk_src));
 
         dispc_mgr_get_lcd_divisor(channel, &lcd, &pcd);
 
@@ -3448,16 +3450,15 @@ void dispc_dump_clocks(struct seq_file *s)
 {
         int lcd;
         u32 l;
-        enum omap_dss_clk_source dispc_clk_src = dss_get_dispc_clk_source();
+        enum dss_clk_source dispc_clk_src = dss_get_dispc_clk_source();
 
         if (dispc_runtime_get())
                 return;
 
         seq_printf(s, "- DISPC -\n");
 
-        seq_printf(s, "dispc fclk source = %s (%s)\n",
-                        dss_get_generic_clk_source_name(dispc_clk_src),
-                        dss_feat_get_clk_source_name(dispc_clk_src));
+        seq_printf(s, "dispc fclk source = %s\n",
+                        dss_get_clk_source_name(dispc_clk_src));
 
         seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());
 
@@ -3814,6 +3815,139 @@ void dispc_disable_sidle(void)
         REG_FLD_MOD(DISPC_SYSCONFIG, 1, 4, 3);  /* SIDLEMODE: no idle */
 }
 
+u32 dispc_mgr_gamma_size(enum omap_channel channel)
+{
+        const struct dispc_gamma_desc *gdesc = &mgr_desc[channel].gamma;
+
+        if (!dispc.feat->has_gamma_table)
+                return 0;
+
+        return gdesc->len;
+}
+EXPORT_SYMBOL(dispc_mgr_gamma_size);
+
+static void dispc_mgr_write_gamma_table(enum omap_channel channel)
+{
+        const struct dispc_gamma_desc *gdesc = &mgr_desc[channel].gamma;
+        u32 *table = dispc.gamma_table[channel];
+        unsigned int i;
+
+        DSSDBG("%s: channel %d\n", __func__, channel);
+
+        for (i = 0; i < gdesc->len; ++i) {
+                u32 v = table[i];
+
+                if (gdesc->has_index)
+                        v |= i << 24;
+                else if (i == 0)
+                        v |= 1 << 31;
+
+                dispc_write_reg(gdesc->reg, v);
+        }
+}
+
+static void dispc_restore_gamma_tables(void)
+{
+        DSSDBG("%s()\n", __func__);
+
+        if (!dispc.feat->has_gamma_table)
+                return;
+
+        dispc_mgr_write_gamma_table(OMAP_DSS_CHANNEL_LCD);
+
+        dispc_mgr_write_gamma_table(OMAP_DSS_CHANNEL_DIGIT);
+
+        if (dss_has_feature(FEAT_MGR_LCD2))
+                dispc_mgr_write_gamma_table(OMAP_DSS_CHANNEL_LCD2);
+
+        if (dss_has_feature(FEAT_MGR_LCD3))
+                dispc_mgr_write_gamma_table(OMAP_DSS_CHANNEL_LCD3);
+}
+
+static const struct drm_color_lut dispc_mgr_gamma_default_lut[] = {
+        { .red = 0, .green = 0, .blue = 0, },
+        { .red = U16_MAX, .green = U16_MAX, .blue = U16_MAX, },
+};
+
+void dispc_mgr_set_gamma(enum omap_channel channel,
+                         const struct drm_color_lut *lut,
+                         unsigned int length)
+{
+        const struct dispc_gamma_desc *gdesc = &mgr_desc[channel].gamma;
+        u32 *table = dispc.gamma_table[channel];
+        uint i;
+
+        DSSDBG("%s: channel %d, lut len %u, hw len %u\n", __func__,
+               channel, length, gdesc->len);
+
+        if (!dispc.feat->has_gamma_table)
+                return;
+
+        if (lut == NULL || length < 2) {
+                lut = dispc_mgr_gamma_default_lut;
+                length = ARRAY_SIZE(dispc_mgr_gamma_default_lut);
+        }
+
+        for (i = 0; i < length - 1; ++i) {
+                uint first = i * (gdesc->len - 1) / (length - 1);
+                uint last = (i + 1) * (gdesc->len - 1) / (length - 1);
+                uint w = last - first;
+                u16 r, g, b;
+                uint j;
+
+                if (w == 0)
+                        continue;
+
+                for (j = 0; j <= w; j++) {
+                        r = (lut[i].red * (w - j) + lut[i+1].red * j) / w;
+                        g = (lut[i].green * (w - j) + lut[i+1].green * j) / w;
+                        b = (lut[i].blue * (w - j) + lut[i+1].blue * j) / w;
+
+                        r >>= 16 - gdesc->bits;
+                        g >>= 16 - gdesc->bits;
+                        b >>= 16 - gdesc->bits;
+
+                        table[first + j] = (r << (gdesc->bits * 2)) |
+                                (g << gdesc->bits) | b;
+                }
+        }
+
+        if (dispc.is_enabled)
+                dispc_mgr_write_gamma_table(channel);
+}
+EXPORT_SYMBOL(dispc_mgr_set_gamma);
+
+static int dispc_init_gamma_tables(void)
+{
+        int channel;
+
+        if (!dispc.feat->has_gamma_table)
+                return 0;
+
+        for (channel = 0; channel < ARRAY_SIZE(dispc.gamma_table); channel++) {
+                const struct dispc_gamma_desc *gdesc = &mgr_desc[channel].gamma;
+                u32 *gt;
+
+                if (channel == OMAP_DSS_CHANNEL_LCD2 &&
+                    !dss_has_feature(FEAT_MGR_LCD2))
+                        continue;
+
+                if (channel == OMAP_DSS_CHANNEL_LCD3 &&
+                    !dss_has_feature(FEAT_MGR_LCD3))
+                        continue;
+
+                gt = devm_kmalloc_array(&dispc.pdev->dev, gdesc->len,
+                                           sizeof(u32), GFP_KERNEL);
+                if (!gt)
+                        return -ENOMEM;
+
+                dispc.gamma_table[channel] = gt;
+
+                dispc_mgr_set_gamma(channel, NULL, 0);
+        }
+        return 0;
+}
+
 static void _omap_dispc_initial_config(void)
 {
         u32 l;
@@ -3829,8 +3963,15 @@ static void _omap_dispc_initial_config(void)
                 dispc.core_clk_rate = dispc_fclk_rate();
         }
 
-        /* FUNCGATED */
-        if (dss_has_feature(FEAT_FUNCGATED))
+        /* Use gamma table mode, instead of palette mode */
+        if (dispc.feat->has_gamma_table)
+                REG_FLD_MOD(DISPC_CONFIG, 1, 3, 3);
+
+        /* For older DSS versions (FEAT_FUNCGATED) this enables
+         * func-clock auto-gating. For newer versions
+         * (dispc.feat->has_gamma_table) this enables tv-out gamma tables.
+         */
+        if (dss_has_feature(FEAT_FUNCGATED) || dispc.feat->has_gamma_table)
                 REG_FLD_MOD(DISPC_CONFIG, 1, 9, 9);
 
         dispc_setup_color_conv_coef();
@@ -3934,6 +4075,8 @@ static const struct dispc_features omap44xx_dispc_feats = {
         .has_writeback          =       true,
         .supports_double_pixel  =       true,
         .reverse_ilace_field_order =    true,
+        .has_gamma_table        =       true,
+        .has_gamma_i734_bug     =       true,
 };
 
 static const struct dispc_features omap54xx_dispc_feats = {
@@ -3959,6 +4102,8 @@ static const struct dispc_features omap54xx_dispc_feats = {
         .has_writeback          =       true,
         .supports_double_pixel  =       true,
         .reverse_ilace_field_order =    true,
+        .has_gamma_table        =       true,
+        .has_gamma_i734_bug     =       true,
 };
 
 static int dispc_init_features(struct platform_device *pdev)
@@ -4050,6 +4195,168 @@ void dispc_free_irq(void *dev_id)
 }
 EXPORT_SYMBOL(dispc_free_irq);
 
+/*
+ * Workaround for errata i734 in DSS dispc
+ *  - LCD1 Gamma Correction Is Not Working When GFX Pipe Is Disabled
+ *
+ * For gamma tables to work on LCD1 the GFX plane has to be used at
+ * least once after DSS HW has come out of reset. The workaround
+ * sets up a minimal LCD setup with GFX plane and waits for one
+ * vertical sync irq before disabling the setup and continuing with
+ * the context restore. The physical outputs are gated during the
+ * operation. This workaround requires that gamma table's LOADMODE
+ * is set to 0x2 in DISPC_CONTROL1 register.
+ *
+ * For details see:
+ * OMAP543x Multimedia Device Silicon Revision 2.0 Silicon Errata
+ * Literature Number: SWPZ037E
+ * Or some other relevant errata document for the DSS IP version.
+ */
+
+static const struct dispc_errata_i734_data {
+        struct omap_video_timings timings;
+        struct omap_overlay_info ovli;
+        struct omap_overlay_manager_info mgri;
+        struct dss_lcd_mgr_config lcd_conf;
+} i734 = {
+        .timings = {
+                .x_res = 8, .y_res = 1,
+                .pixelclock = 16000000,
+                .hsw = 8, .hfp = 4, .hbp = 4,
+                .vsw = 1, .vfp = 1, .vbp = 1,
+                .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
+                .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
+                .interlace = false,
+                .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
+                .de_level = OMAPDSS_SIG_ACTIVE_HIGH,
+                .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
+                .double_pixel = false,
+        },
+        .ovli = {
+                .screen_width = 1,
+                .width = 1, .height = 1,
+                .color_mode = OMAP_DSS_COLOR_RGB24U,
+                .rotation = OMAP_DSS_ROT_0,
+                .rotation_type = OMAP_DSS_ROT_DMA,
+                .mirror = 0,
+                .pos_x = 0, .pos_y = 0,
+                .out_width = 0, .out_height = 0,
+                .global_alpha = 0xff,
+                .pre_mult_alpha = 0,
+                .zorder = 0,
+        },
+        .mgri = {
+                .default_color = 0,
+                .trans_enabled = false,
+                .partial_alpha_enabled = false,
+                .cpr_enable = false,
+        },
+        .lcd_conf = {
+                .io_pad_mode = DSS_IO_PAD_MODE_BYPASS,
+                .stallmode = false,
+                .fifohandcheck = false,
+                .clock_info = {
+                        .lck_div = 1,
+                        .pck_div = 2,
+                },
+                .video_port_width = 24,
+                .lcden_sig_polarity = 0,
+        },
+};
+
+static struct i734_buf {
+        size_t size;
+        dma_addr_t paddr;
+        void *vaddr;
+} i734_buf;
+
+static int dispc_errata_i734_wa_init(void)
+{
+        if (!dispc.feat->has_gamma_i734_bug)
+                return 0;
+
+        i734_buf.size = i734.ovli.width * i734.ovli.height *
+                color_mode_to_bpp(i734.ovli.color_mode) / 8;
+
+        i734_buf.vaddr = dma_alloc_writecombine(&dispc.pdev->dev, i734_buf.size,
+                                                &i734_buf.paddr, GFP_KERNEL);
+        if (!i734_buf.vaddr) {
+                dev_err(&dispc.pdev->dev, "%s: dma_alloc_writecombine failed",
+                        __func__);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void dispc_errata_i734_wa_fini(void)
+{
+        if (!dispc.feat->has_gamma_i734_bug)
+                return;
+
+        dma_free_writecombine(&dispc.pdev->dev, i734_buf.size, i734_buf.vaddr,
+                              i734_buf.paddr);
+}
+
+static void dispc_errata_i734_wa(void)
+{
+        u32 framedone_irq = dispc_mgr_get_framedone_irq(OMAP_DSS_CHANNEL_LCD);
+        struct omap_overlay_info ovli;
+        struct dss_lcd_mgr_config lcd_conf;
+        u32 gatestate;
+        unsigned int count;
+
+        if (!dispc.feat->has_gamma_i734_bug)
+                return;
+
+        gatestate = REG_GET(DISPC_CONFIG, 8, 4);
+
+        ovli = i734.ovli;
+        ovli.paddr = i734_buf.paddr;
+        lcd_conf = i734.lcd_conf;
+
+        /* Gate all LCD1 outputs */
+        REG_FLD_MOD(DISPC_CONFIG, 0x1f, 8, 4);
+
+        /* Setup and enable GFX plane */
+        dispc_ovl_set_channel_out(OMAP_DSS_GFX, OMAP_DSS_CHANNEL_LCD);
+        dispc_ovl_setup(OMAP_DSS_GFX, &ovli, false, &i734.timings, false);
+        dispc_ovl_enable(OMAP_DSS_GFX, true);
+
+        /* Set up and enable display manager for LCD1 */
+        dispc_mgr_setup(OMAP_DSS_CHANNEL_LCD, &i734.mgri);
+        dispc_calc_clock_rates(dss_get_dispc_clk_rate(),
+                               &lcd_conf.clock_info);
+        dispc_mgr_set_lcd_config(OMAP_DSS_CHANNEL_LCD, &lcd_conf);
+        dispc_mgr_set_timings(OMAP_DSS_CHANNEL_LCD, &i734.timings);
+
+        dispc_clear_irqstatus(framedone_irq);
+
+        /* Enable and shut the channel to produce just one frame */
+        dispc_mgr_enable(OMAP_DSS_CHANNEL_LCD, true);
+        dispc_mgr_enable(OMAP_DSS_CHANNEL_LCD, false);
+
+        /* Busy wait for framedone. We can't fiddle with irq handlers
+         * in PM resume. Typically the loop runs less than 5 times and
+         * waits less than a micro second.
+         */
+        count = 0;
+        while (!(dispc_read_irqstatus() & framedone_irq)) {
+                if (count++ > 10000) {
+                        dev_err(&dispc.pdev->dev, "%s: framedone timeout\n",
+                                __func__);
+                        break;
+                }
+        }
+        dispc_ovl_enable(OMAP_DSS_GFX, false);
+
+        /* Clear all irq bits before continuing */
+        dispc_clear_irqstatus(0xffffffff);
+
+        /* Restore the original state to LCD1 output gates */
+        REG_FLD_MOD(DISPC_CONFIG, gatestate, 8, 4);
+}
+
 /* DISPC HW IP initialisation */
 static int dispc_bind(struct device *dev, struct device *master, void *data)
 {
@@ -4067,6 +4374,10 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
         if (r)
                 return r;
 
+        r = dispc_errata_i734_wa_init();
+        if (r)
+                return r;
+
         dispc_mem = platform_get_resource(dispc.pdev, IORESOURCE_MEM, 0);
         if (!dispc_mem) {
                 DSSERR("can't get IORESOURCE_MEM DISPC\n");
@@ -4100,6 +4411,10 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
                 }
         }
 
+        r = dispc_init_gamma_tables();
+        if (r)
+                return r;
+
         pm_runtime_enable(&pdev->dev);
 
         r = dispc_runtime_get();
@@ -4127,6 +4442,8 @@ static void dispc_unbind(struct device *dev, struct device *master,
                                void *data)
 {
         pm_runtime_disable(dev);
+
+        dispc_errata_i734_wa_fini();
 }
 
 static const struct component_ops dispc_component_ops = {
@@ -4169,7 +4486,11 @@ static int dispc_runtime_resume(struct device *dev)
         if (REG_GET(DISPC_CONFIG, 2, 1) != OMAP_DSS_LOAD_FRAME_ONLY) {
                 _omap_dispc_initial_config();
 
+                dispc_errata_i734_wa();
+
                 dispc_restore_context();
+
+                dispc_restore_gamma_tables();
         }
 
         dispc.is_enabled = true;
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.h b/drivers/gpu/drm/omapdrm/dss/dispc.h
index 483744223dd1..bc1d8126ee87 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.h
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.h
@@ -42,6 +42,11 @@
 #define DISPC_MSTANDBY_CTRL             0x0858
 #define DISPC_GLOBAL_MFLAG_ATTRIBUTE    0x085C
 
+#define DISPC_GAMMA_TABLE0              0x0630
+#define DISPC_GAMMA_TABLE1              0x0634
+#define DISPC_GAMMA_TABLE2              0x0638
+#define DISPC_GAMMA_TABLE3              0x0850
+
 /* DISPC overlay registers */
 #define DISPC_OVL_BA0(n)                (DISPC_OVL_BASE(n) + \
                                         DISPC_BA0_OFFSET(n))
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c b/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
index 038c15b04215..34fad2376f8d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
@@ -18,8 +18,8 @@
  */
 
 #include <linux/kernel.h>
-#include <video/omapdss.h>
 
+#include "omapdss.h"
 #include "dispc.h"
 
 static const struct dispc_coef coef3_M8[8] = {
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
index 9f3dd09b0a6c..8dcdd7cf9937 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 97ea60257884..b268295b76cf 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -34,17 +34,15 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
-#define HSDIV_DISPC     0
-
 struct dpi_data {
         struct platform_device *pdev;
 
         struct regulator *vdds_dsi_reg;
+        enum dss_clk_source clk_src;
         struct dss_pll *pll;
 
         struct mutex lock;
@@ -69,7 +67,7 @@ static struct dpi_data *dpi_get_data_from_pdev(struct platform_device *pdev)
         return dev_get_drvdata(&pdev->dev);
 }
 
-static struct dss_pll *dpi_get_pll(enum omap_channel channel)
+static enum dss_clk_source dpi_get_clk_src(enum omap_channel channel)
 {
         /*
          * XXX we can't currently use DSI PLL for DPI with OMAP3, as the DSI PLL
@@ -83,64 +81,51 @@ static struct dss_pll *dpi_get_pll(enum omap_channel channel)
         case OMAPDSS_VER_OMAP3630:
         case OMAPDSS_VER_AM35xx:
         case OMAPDSS_VER_AM43xx:
-                return NULL;
+                return DSS_CLK_SRC_FCK;
 
         case OMAPDSS_VER_OMAP4430_ES1:
         case OMAPDSS_VER_OMAP4430_ES2:
         case OMAPDSS_VER_OMAP4:
                 switch (channel) {
                 case OMAP_DSS_CHANNEL_LCD:
-                        return dss_pll_find("dsi0");
+                        return DSS_CLK_SRC_PLL1_1;
                 case OMAP_DSS_CHANNEL_LCD2:
-                        return dss_pll_find("dsi1");
+                        return DSS_CLK_SRC_PLL2_1;
                 default:
-                        return NULL;
+                        return DSS_CLK_SRC_FCK;
                 }
 
         case OMAPDSS_VER_OMAP5:
                 switch (channel) {
                 case OMAP_DSS_CHANNEL_LCD:
-                        return dss_pll_find("dsi0");
+                        return DSS_CLK_SRC_PLL1_1;
                 case OMAP_DSS_CHANNEL_LCD3:
-                        return dss_pll_find("dsi1");
+                        return DSS_CLK_SRC_PLL2_1;
+                case OMAP_DSS_CHANNEL_LCD2:
                 default:
-                        return NULL;
+                        return DSS_CLK_SRC_FCK;
                 }
 
         case OMAPDSS_VER_DRA7xx:
                 switch (channel) {
                 case OMAP_DSS_CHANNEL_LCD:
+                        return DSS_CLK_SRC_PLL1_1;
                 case OMAP_DSS_CHANNEL_LCD2:
-                        return dss_pll_find("video0");
+                        return DSS_CLK_SRC_PLL1_3;
                 case OMAP_DSS_CHANNEL_LCD3:
-                        return dss_pll_find("video1");
+                        return DSS_CLK_SRC_PLL2_1;
                 default:
-                        return NULL;
+                        return DSS_CLK_SRC_FCK;
                 }
 
         default:
-                return NULL;
-        }
-}
-
-static enum omap_dss_clk_source dpi_get_alt_clk_src(enum omap_channel channel)
-{
-        switch (channel) {
-        case OMAP_DSS_CHANNEL_LCD:
-                return OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC;
-        case OMAP_DSS_CHANNEL_LCD2:
-                return OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC;
-        default:
-                /* this shouldn't happen */
-                WARN_ON(1);
-                return OMAP_DSS_CLK_SRC_FCK;
+                return DSS_CLK_SRC_FCK;
         }
 }
 
 struct dpi_clk_calc_ctx {
         struct dss_pll *pll;
+        unsigned clkout_idx;
 
         /* inputs */
 
@@ -148,7 +133,7 @@ struct dpi_clk_calc_ctx {
 
         /* outputs */
 
-        struct dss_pll_clock_info dsi_cinfo;
+        struct dss_pll_clock_info pll_cinfo;
         unsigned long fck;
         struct dispc_clock_info dispc_cinfo;
 };
@@ -193,8 +178,8 @@ static bool dpi_calc_hsdiv_cb(int m_dispc, unsigned long dispc,
         if (m_dispc > 1 && m_dispc % 2 != 0 && ctx->pck_min >= 100000000)
                 return false;
 
-        ctx->dsi_cinfo.mX[HSDIV_DISPC] = m_dispc;
-        ctx->dsi_cinfo.clkout[HSDIV_DISPC] = dispc;
+        ctx->pll_cinfo.mX[ctx->clkout_idx] = m_dispc;
+        ctx->pll_cinfo.clkout[ctx->clkout_idx] = dispc;
 
         return dispc_div_calc(dispc, ctx->pck_min, ctx->pck_max,
                         dpi_calc_dispc_cb, ctx);
@@ -207,12 +192,12 @@ static bool dpi_calc_pll_cb(int n, int m, unsigned long fint,
 {
         struct dpi_clk_calc_ctx *ctx = data;
 
-        ctx->dsi_cinfo.n = n;
-        ctx->dsi_cinfo.m = m;
-        ctx->dsi_cinfo.fint = fint;
-        ctx->dsi_cinfo.clkdco = clkdco;
+        ctx->pll_cinfo.n = n;
+        ctx->pll_cinfo.m = m;
+        ctx->pll_cinfo.fint = fint;
+        ctx->pll_cinfo.clkdco = clkdco;
 
-        return dss_pll_hsdiv_calc(ctx->pll, clkdco,
+        return dss_pll_hsdiv_calc_a(ctx->pll, clkdco,
                 ctx->pck_min, dss_feat_get_param_max(FEAT_PARAM_DSS_FCK),
                 dpi_calc_hsdiv_cb, ctx);
 }
@@ -227,25 +212,39 @@ static bool dpi_calc_dss_cb(unsigned long fck, void *data)
                         dpi_calc_dispc_cb, ctx);
 }
 
-static bool dpi_dsi_clk_calc(struct dpi_data *dpi, unsigned long pck,
+static bool dpi_pll_clk_calc(struct dpi_data *dpi, unsigned long pck,
                 struct dpi_clk_calc_ctx *ctx)
 {
         unsigned long clkin;
-        unsigned long pll_min, pll_max;
 
         memset(ctx, 0, sizeof(*ctx));
         ctx->pll = dpi->pll;
-        ctx->pck_min = pck - 1000;
-        ctx->pck_max = pck + 1000;
+        ctx->clkout_idx = dss_pll_get_clkout_idx_for_src(dpi->clk_src);
 
-        pll_min = 0;
-        pll_max = 0;
+        clkin = clk_get_rate(dpi->pll->clkin);
 
-        clkin = clk_get_rate(ctx->pll->clkin);
+        if (dpi->pll->hw->type == DSS_PLL_TYPE_A) {
+                unsigned long pll_min, pll_max;
 
-        return dss_pll_calc(ctx->pll, clkin,
-                        pll_min, pll_max,
-                        dpi_calc_pll_cb, ctx);
+                ctx->pck_min = pck - 1000;
+                ctx->pck_max = pck + 1000;
+
+                pll_min = 0;
+                pll_max = 0;
+
+                return dss_pll_calc_a(ctx->pll, clkin,
+                                pll_min, pll_max,
+                                dpi_calc_pll_cb, ctx);
+        } else { /* DSS_PLL_TYPE_B */
+                dss_pll_calc_b(dpi->pll, clkin, pck, &ctx->pll_cinfo);
+
+                ctx->dispc_cinfo.lck_div = 1;
+                ctx->dispc_cinfo.pck_div = 1;
+                ctx->dispc_cinfo.lck = ctx->pll_cinfo.clkout[0];
+                ctx->dispc_cinfo.pck = ctx->dispc_cinfo.lck;
+
+                return true;
+        }
 }
 
 static bool dpi_dss_clk_calc(unsigned long pck, struct dpi_clk_calc_ctx *ctx)
@@ -279,7 +278,7 @@ static bool dpi_dss_clk_calc(unsigned long pck, struct dpi_clk_calc_ctx *ctx)
 
 
 
-static int dpi_set_dsi_clk(struct dpi_data *dpi, enum omap_channel channel,
+static int dpi_set_pll_clk(struct dpi_data *dpi, enum omap_channel channel,
                 unsigned long pck_req, unsigned long *fck, int *lck_div,
                 int *pck_div)
 {
@@ -287,20 +286,19 @@ static int dpi_set_dsi_clk(struct dpi_data *dpi, enum omap_channel channel,
         int r;
         bool ok;
 
-        ok = dpi_dsi_clk_calc(dpi, pck_req, &ctx);
+        ok = dpi_pll_clk_calc(dpi, pck_req, &ctx);
         if (!ok)
                 return -EINVAL;
 
-        r = dss_pll_set_config(dpi->pll, &ctx.dsi_cinfo);
+        r = dss_pll_set_config(dpi->pll, &ctx.pll_cinfo);
         if (r)
                 return r;
 
-        dss_select_lcd_clk_source(channel,
-                        dpi_get_alt_clk_src(channel));
+        dss_select_lcd_clk_source(channel, dpi->clk_src);
 
         dpi->mgr_config.clock_info = ctx.dispc_cinfo;
 
-        *fck = ctx.dsi_cinfo.clkout[HSDIV_DISPC];
+        *fck = ctx.pll_cinfo.clkout[ctx.clkout_idx];
         *lck_div = ctx.dispc_cinfo.lck_div;
         *pck_div = ctx.dispc_cinfo.pck_div;
 
@@ -342,7 +340,7 @@ static int dpi_set_mode(struct dpi_data *dpi)
         int r = 0;
 
         if (dpi->pll)
-                r = dpi_set_dsi_clk(dpi, channel, t->pixelclock, &fck,
+                r = dpi_set_pll_clk(dpi, channel, t->pixelclock, &fck,
                                 &lck_div, &pck_div);
         else
                 r = dpi_set_dispc_clk(dpi, t->pixelclock, &fck,
@@ -419,7 +417,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
         if (dpi->pll) {
                 r = dss_pll_enable(dpi->pll);
                 if (r)
-                        goto err_dsi_pll_init;
+                        goto err_pll_init;
         }
 
         r = dpi_set_mode(dpi);
@@ -442,7 +440,7 @@ err_mgr_enable:
 err_set_mode:
         if (dpi->pll)
                 dss_pll_disable(dpi->pll);
-err_dsi_pll_init:
+err_pll_init:
 err_src_sel:
         dispc_runtime_put();
 err_get_dispc:
@@ -465,7 +463,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)
         dss_mgr_disable(channel);
 
         if (dpi->pll) {
-                dss_select_lcd_clk_source(channel, OMAP_DSS_CLK_SRC_FCK);
+                dss_select_lcd_clk_source(channel, DSS_CLK_SRC_FCK);
                 dss_pll_disable(dpi->pll);
         }
 
@@ -524,11 +522,11 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
                 return -EINVAL;
 
         if (dpi->pll) {
-                ok = dpi_dsi_clk_calc(dpi, timings->pixelclock, &ctx);
+                ok = dpi_pll_clk_calc(dpi, timings->pixelclock, &ctx);
                 if (!ok)
                         return -EINVAL;
 
-                fck = ctx.dsi_cinfo.clkout[HSDIV_DISPC];
+                fck = ctx.pll_cinfo.clkout[ctx.clkout_idx];
         } else {
                 ok = dpi_dss_clk_calc(timings->pixelclock, &ctx);
                 if (!ok)
@@ -558,7 +556,7 @@ static void dpi_set_data_lines(struct omap_dss_device *dssdev, int data_lines)
         mutex_unlock(&dpi->lock);
 }
 
-static int dpi_verify_dsi_pll(struct dss_pll *pll)
+static int dpi_verify_pll(struct dss_pll *pll)
 {
         int r;
 
@@ -602,16 +600,14 @@ static void dpi_init_pll(struct dpi_data *dpi)
         if (dpi->pll)
                 return;
 
-        pll = dpi_get_pll(dpi->output.dispc_channel);
+        dpi->clk_src = dpi_get_clk_src(dpi->output.dispc_channel);
+
+        pll = dss_pll_find_by_src(dpi->clk_src);
         if (!pll)
                 return;
 
-        /* On DRA7 we need to set a mux to use the PLL */
-        if (omapdss_get_version() == OMAPDSS_VER_DRA7xx)
-                dss_ctrl_pll_set_control_mux(pll->id, dpi->output.dispc_channel);
-
-        if (dpi_verify_dsi_pll(pll)) {
-                DSSWARN("DSI PLL not operational\n");
+        if (dpi_verify_pll(pll)) {
+                DSSWARN("PLL not operational\n");
                 return;
         }
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 8730646a0cbb..e1be5e795cd8 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -42,9 +42,9 @@
 #include <linux/of_platform.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
 #include <video/mipi_display.h>
 
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
@@ -1167,7 +1167,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
 {
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         struct regulator *vdds_dsi;
-        int r;
 
         if (dsi->vdds_dsi_reg != NULL)
                 return 0;
@@ -1180,15 +1179,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
                 return PTR_ERR(vdds_dsi);
         }
 
-        if (regulator_can_change_voltage(vdds_dsi)) {
-                r = regulator_set_voltage(vdds_dsi, 1800000, 1800000);
-                if (r) {
-                        devm_regulator_put(vdds_dsi);
-                        DSSERR("can't set the DSI regulator voltage\n");
-                        return r;
-                }
-        }
-
         dsi->vdds_dsi_reg = vdds_dsi;
 
         return 0;
@@ -1271,7 +1261,7 @@ static unsigned long dsi_fclk_rate(struct platform_device *dsidev)
         unsigned long r;
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 
-        if (dss_get_dsi_clk_source(dsi->module_id) == OMAP_DSS_CLK_SRC_FCK) {
+        if (dss_get_dsi_clk_source(dsi->module_id) == DSS_CLK_SRC_FCK) {
                 /* DSI FCLK source is DSS_CLK_FCK */
                 r = clk_get_rate(dsi->dss_clk);
         } else {
@@ -1484,7 +1474,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
 {
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         struct dss_pll_clock_info *cinfo = &dsi->pll.cinfo;
-        enum omap_dss_clk_source dispc_clk_src, dsi_clk_src;
+        enum dss_clk_source dispc_clk_src, dsi_clk_src;
         int dsi_module = dsi->module_id;
         struct dss_pll *pll = &dsi->pll;
 
@@ -1504,28 +1494,27 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
                         cinfo->clkdco, cinfo->m);
 
         seq_printf(s,   "DSI_PLL_HSDIV_DISPC (%s)\t%-16lum_dispc %u\t(%s)\n",
-                        dss_feat_get_clk_source_name(dsi_module == 0 ?
-                                OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
-                                OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC),
+                        dss_get_clk_source_name(dsi_module == 0 ?
+                                DSS_CLK_SRC_PLL1_1 :
+                                DSS_CLK_SRC_PLL2_1),
                         cinfo->clkout[HSDIV_DISPC],
                         cinfo->mX[HSDIV_DISPC],
-                        dispc_clk_src == OMAP_DSS_CLK_SRC_FCK ?
+                        dispc_clk_src == DSS_CLK_SRC_FCK ?
                         "off" : "on");
 
         seq_printf(s,   "DSI_PLL_HSDIV_DSI (%s)\t%-16lum_dsi %u\t(%s)\n",
-                        dss_feat_get_clk_source_name(dsi_module == 0 ?
-                                OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
-                                OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI),
+                        dss_get_clk_source_name(dsi_module == 0 ?
+                                DSS_CLK_SRC_PLL1_2 :
+                                DSS_CLK_SRC_PLL2_2),
                         cinfo->clkout[HSDIV_DSI],
                         cinfo->mX[HSDIV_DSI],
-                        dsi_clk_src == OMAP_DSS_CLK_SRC_FCK ?
+                        dsi_clk_src == DSS_CLK_SRC_FCK ?
                         "off" : "on");
 
         seq_printf(s,   "- DSI%d -\n", dsi_module + 1);
 
-        seq_printf(s,   "dsi fclk source = %s (%s)\n",
-                        dss_get_generic_clk_source_name(dsi_clk_src),
-                        dss_feat_get_clk_source_name(dsi_clk_src));
+        seq_printf(s,   "dsi fclk source = %s\n",
+                        dss_get_clk_source_name(dsi_clk_src));
 
         seq_printf(s,   "DSI_FCLK\t%lu\n", dsi_fclk_rate(dsidev));
 
@@ -4111,8 +4100,8 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
         int r;
 
         dss_select_lcd_clk_source(channel, dsi->module_id == 0 ?
-                        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
-                        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC);
+                        DSS_CLK_SRC_PLL1_1 :
+                        DSS_CLK_SRC_PLL2_1);
 
         if (dsi->mode == OMAP_DSS_DSI_CMD_MODE) {
                 r = dss_mgr_register_framedone_handler(channel,
@@ -4159,7 +4148,7 @@ err1:
                 dss_mgr_unregister_framedone_handler(channel,
                                 dsi_framedone_irq_callback, dsidev);
 err:
-        dss_select_lcd_clk_source(channel, OMAP_DSS_CLK_SRC_FCK);
+        dss_select_lcd_clk_source(channel, DSS_CLK_SRC_FCK);
         return r;
 }
 
@@ -4172,7 +4161,7 @@ static void dsi_display_uninit_dispc(struct platform_device *dsidev,
                 dss_mgr_unregister_framedone_handler(channel,
                                 dsi_framedone_irq_callback, dsidev);
 
-        dss_select_lcd_clk_source(channel, OMAP_DSS_CLK_SRC_FCK);
+        dss_select_lcd_clk_source(channel, DSS_CLK_SRC_FCK);
 }
 
 static int dsi_configure_dsi_clocks(struct platform_device *dsidev)
@@ -4206,8 +4195,8 @@ static int dsi_display_init_dsi(struct platform_device *dsidev)
                 goto err1;
 
         dss_select_dsi_clk_source(dsi->module_id, dsi->module_id == 0 ?
-                        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
-                        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI);
+                        DSS_CLK_SRC_PLL1_2 :
+                        DSS_CLK_SRC_PLL2_2);
 
         DSSDBG("PLL OK\n");
 
@@ -4239,7 +4228,7 @@ static int dsi_display_init_dsi(struct platform_device *dsidev)
 err3:
         dsi_cio_uninit(dsidev);
 err2:
-        dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);
+        dss_select_dsi_clk_source(dsi->module_id, DSS_CLK_SRC_FCK);
 err1:
         dss_pll_disable(&dsi->pll);
 err0:
@@ -4261,7 +4250,7 @@ static void dsi_display_uninit_dsi(struct platform_device *dsidev,
         dsi_vc_enable(dsidev, 2, 0);
         dsi_vc_enable(dsidev, 3, 0);
 
-        dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);
+        dss_select_dsi_clk_source(dsi->module_id, DSS_CLK_SRC_FCK);
         dsi_cio_uninit(dsidev);
         dsi_pll_uninit(dsidev, disconnect_lanes);
 }
@@ -4462,7 +4451,7 @@ static bool dsi_cm_calc_pll_cb(int n, int m, unsigned long fint,
         ctx->dsi_cinfo.fint = fint;
         ctx->dsi_cinfo.clkdco = clkdco;
 
-        return dss_pll_hsdiv_calc(ctx->pll, clkdco, ctx->req_pck_min,
+        return dss_pll_hsdiv_calc_a(ctx->pll, clkdco, ctx->req_pck_min,
                         dss_feat_get_param_max(FEAT_PARAM_DSS_FCK),
                         dsi_cm_calc_hsdiv_cb, ctx);
 }
@@ -4501,7 +4490,7 @@ static bool dsi_cm_calc(struct dsi_data *dsi,
         pll_min = max(cfg->hs_clk_min * 4, txbyteclk * 4 * 4);
         pll_max = cfg->hs_clk_max * 4;
 
-        return dss_pll_calc(ctx->pll, clkin,
+        return dss_pll_calc_a(ctx->pll, clkin,
                         pll_min, pll_max,
                         dsi_cm_calc_pll_cb, ctx);
 }
@@ -4760,7 +4749,7 @@ static bool dsi_vm_calc_pll_cb(int n, int m, unsigned long fint,
         ctx->dsi_cinfo.fint = fint;
         ctx->dsi_cinfo.clkdco = clkdco;
 
-        return dss_pll_hsdiv_calc(ctx->pll, clkdco, ctx->req_pck_min,
+        return dss_pll_hsdiv_calc_a(ctx->pll, clkdco, ctx->req_pck_min,
                         dss_feat_get_param_max(FEAT_PARAM_DSS_FCK),
                         dsi_vm_calc_hsdiv_cb, ctx);
 }
@@ -4802,7 +4791,7 @@ static bool dsi_vm_calc(struct dsi_data *dsi,
                 pll_max = byteclk_max * 4 * 4;
         }
 
-        return dss_pll_calc(ctx->pll, clkin,
+        return dss_pll_calc_a(ctx->pll, clkin,
                         pll_min, pll_max,
                         dsi_vm_calc_pll_cb, ctx);
 }
@@ -5148,6 +5137,8 @@ static const struct dss_pll_ops dsi_pll_ops = {
 };
 
 static const struct dss_pll_hw dss_omap3_dsi_pll_hw = {
+        .type = DSS_PLL_TYPE_A,
+
         .n_max = (1 << 7) - 1,
         .m_max = (1 << 11) - 1,
         .mX_max = (1 << 4) - 1,
@@ -5173,6 +5164,8 @@ static const struct dss_pll_hw dss_omap3_dsi_pll_hw = {
 };
 
 static const struct dss_pll_hw dss_omap4_dsi_pll_hw = {
+        .type = DSS_PLL_TYPE_A,
+
         .n_max = (1 << 8) - 1,
         .m_max = (1 << 12) - 1,
         .mX_max = (1 << 5) - 1,
@@ -5198,6 +5191,8 @@ static const struct dss_pll_hw dss_omap4_dsi_pll_hw = {
 };
 
 static const struct dss_pll_hw dss_omap5_dsi_pll_hw = {
+        .type = DSS_PLL_TYPE_A,
+
         .n_max = (1 << 8) - 1,
         .m_max = (1 << 12) - 1,
         .mX_max = (1 << 5) - 1,
diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
index bf407b6ba15c..dfd4e9621e3b 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
@@ -18,8 +18,7 @@
 #include <linux/of.h>
 #include <linux/seq_file.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 
 struct device_node *
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index f95ff319e68e..14887d5b02e5 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/seq_file.h>
 #include <linux/clk.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/gfp.h>
@@ -41,8 +42,7 @@
 #include <linux/suspend.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
@@ -75,6 +75,8 @@ struct dss_features {
         const enum omap_display_type *ports;
         int num_ports;
         int (*dpi_select_source)(int port, enum omap_channel channel);
+        int (*select_lcd_source)(enum omap_channel channel,
+                enum dss_clk_source clk_src);
 };
 
 static struct {
@@ -91,9 +93,9 @@ static struct {
         unsigned long   cache_prate;
         struct dispc_clock_info cache_dispc_cinfo;
 
-        enum omap_dss_clk_source dsi_clk_source[MAX_NUM_DSI];
-        enum omap_dss_clk_source dispc_clk_source;
-        enum omap_dss_clk_source lcd_clk_source[MAX_DSS_LCD_MANAGERS];
+        enum dss_clk_source dsi_clk_source[MAX_NUM_DSI];
+        enum dss_clk_source dispc_clk_source;
+        enum dss_clk_source lcd_clk_source[MAX_DSS_LCD_MANAGERS];
 
         bool            ctx_valid;
         u32             ctx[DSS_SZ_REGS / sizeof(u32)];
@@ -105,11 +107,14 @@ static struct {
 } dss;
 
 static const char * const dss_generic_clk_source_names[] = {
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]  = "DSI_PLL_HSDIV_DISPC",
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]    = "DSI_PLL_HSDIV_DSI",
-        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS_FCK",
-        [OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC] = "DSI_PLL2_HSDIV_DISPC",
-        [OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI]   = "DSI_PLL2_HSDIV_DSI",
+        [DSS_CLK_SRC_FCK]       = "FCK",
+        [DSS_CLK_SRC_PLL1_1]    = "PLL1:1",
+        [DSS_CLK_SRC_PLL1_2]    = "PLL1:2",
+        [DSS_CLK_SRC_PLL1_3]    = "PLL1:3",
+        [DSS_CLK_SRC_PLL2_1]    = "PLL2:1",
+        [DSS_CLK_SRC_PLL2_2]    = "PLL2:2",
+        [DSS_CLK_SRC_PLL2_3]    = "PLL2:3",
+        [DSS_CLK_SRC_HDMI_PLL]  = "HDMI PLL",
 };
 
 static bool dss_initialized;
@@ -202,68 +207,70 @@ void dss_ctrl_pll_enable(enum dss_pll_id pll_id, bool enable)
                 1 << shift, val << shift);
 }
 
-void dss_ctrl_pll_set_control_mux(enum dss_pll_id pll_id,
+static int dss_ctrl_pll_set_control_mux(enum dss_clk_source clk_src,
         enum omap_channel channel)
 {
         unsigned shift, val;
 
         if (!dss.syscon_pll_ctrl)
-                return;
+                return -EINVAL;
 
         switch (channel) {
         case OMAP_DSS_CHANNEL_LCD:
                 shift = 3;
 
-                switch (pll_id) {
-                case DSS_PLL_VIDEO1:
+                switch (clk_src) {
+                case DSS_CLK_SRC_PLL1_1:
                         val = 0; break;
-                case DSS_PLL_HDMI:
+                case DSS_CLK_SRC_HDMI_PLL:
                         val = 1; break;
                 default:
                         DSSERR("error in PLL mux config for LCD\n");
-                        return;
+                        return -EINVAL;
                 }
 
                 break;
         case OMAP_DSS_CHANNEL_LCD2:
                 shift = 5;
 
-                switch (pll_id) {
-                case DSS_PLL_VIDEO1:
+                switch (clk_src) {
+                case DSS_CLK_SRC_PLL1_3:
                         val = 0; break;
-                case DSS_PLL_VIDEO2:
+                case DSS_CLK_SRC_PLL2_3:
                         val = 1; break;
-                case DSS_PLL_HDMI:
+                case DSS_CLK_SRC_HDMI_PLL:
                         val = 2; break;
                 default:
                         DSSERR("error in PLL mux config for LCD2\n");
-                        return;
+                        return -EINVAL;
                 }
 
                 break;
         case OMAP_DSS_CHANNEL_LCD3:
                 shift = 7;
 
-                switch (pll_id) {
-                case DSS_PLL_VIDEO1:
-                        val = 1; break;
-                case DSS_PLL_VIDEO2:
+                switch (clk_src) {
+                case DSS_CLK_SRC_PLL2_1:
                         val = 0; break;
-                case DSS_PLL_HDMI:
+                case DSS_CLK_SRC_PLL1_3:
+                        val = 1; break;
+                case DSS_CLK_SRC_HDMI_PLL:
                         val = 2; break;
                 default:
                         DSSERR("error in PLL mux config for LCD3\n");
-                        return;
+                        return -EINVAL;
                 }
 
                 break;
         default:
                 DSSERR("error in PLL mux config\n");
-                return;
+                return -EINVAL;
         }
 
         regmap_update_bits(dss.syscon_pll_ctrl, dss.syscon_pll_ctrl_offset,
                 0x3 << shift, val << shift);
+
+        return 0;
 }
 
 void dss_sdi_init(int datapairs)
@@ -353,14 +360,14 @@ void dss_sdi_disable(void)
         REG_FLD_MOD(DSS_PLL_CONTROL, 0, 18, 18); /* SDI_PLL_SYSRESET */
 }
 
-const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src)
+const char *dss_get_clk_source_name(enum dss_clk_source clk_src)
 {
         return dss_generic_clk_source_names[clk_src];
 }
 
 void dss_dump_clocks(struct seq_file *s)
 {
-        const char *fclk_name, *fclk_real_name;
+        const char *fclk_name;
         unsigned long fclk_rate;
 
         if (dss_runtime_get())
@@ -368,12 +375,11 @@ void dss_dump_clocks(struct seq_file *s)
 
         seq_printf(s, "- DSS -\n");
 
-        fclk_name = dss_get_generic_clk_source_name(OMAP_DSS_CLK_SRC_FCK);
-        fclk_real_name = dss_feat_get_clk_source_name(OMAP_DSS_CLK_SRC_FCK);
+        fclk_name = dss_get_clk_source_name(DSS_CLK_SRC_FCK);
         fclk_rate = clk_get_rate(dss.dss_clk);
 
-        seq_printf(s, "%s (%s) = %lu\n",
-                        fclk_name, fclk_real_name,
+        seq_printf(s, "%s = %lu\n",
+                        fclk_name,
                         fclk_rate);
 
         dss_runtime_put();
@@ -402,19 +408,42 @@ static void dss_dump_regs(struct seq_file *s)
 #undef DUMPREG
 }
 
-static void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
+static int dss_get_channel_index(enum omap_channel channel)
+{
+        switch (channel) {
+        case OMAP_DSS_CHANNEL_LCD:
+                return 0;
+        case OMAP_DSS_CHANNEL_LCD2:
+                return 1;
+        case OMAP_DSS_CHANNEL_LCD3:
+                return 2;
+        default:
+                WARN_ON(1);
+                return 0;
+        }
+}
+
+static void dss_select_dispc_clk_source(enum dss_clk_source clk_src)
 {
         int b;
         u8 start, end;
 
+        /*
+         * We always use PRCM clock as the DISPC func clock, except on DSS3,
+         * where we don't have separate DISPC and LCD clock sources.
+         */
+        if (WARN_ON(dss_has_feature(FEAT_LCD_CLK_SRC) &&
+                clk_src != DSS_CLK_SRC_FCK))
+                return;
+
         switch (clk_src) {
-        case OMAP_DSS_CLK_SRC_FCK:
+        case DSS_CLK_SRC_FCK:
                 b = 0;
                 break;
-        case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
+        case DSS_CLK_SRC_PLL1_1:
                 b = 1;
                 break;
-        case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
+        case DSS_CLK_SRC_PLL2_1:
                 b = 2;
                 break;
         default:
@@ -430,19 +459,19 @@ static void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
 }
 
 void dss_select_dsi_clk_source(int dsi_module,
-                enum omap_dss_clk_source clk_src)
+                enum dss_clk_source clk_src)
 {
         int b, pos;
 
         switch (clk_src) {
-        case OMAP_DSS_CLK_SRC_FCK:
+        case DSS_CLK_SRC_FCK:
                 b = 0;
                 break;
-        case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI:
+        case DSS_CLK_SRC_PLL1_2:
                 BUG_ON(dsi_module != 0);
                 b = 1;
                 break;
-        case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI:
+        case DSS_CLK_SRC_PLL2_2:
                 BUG_ON(dsi_module != 1);
                 b = 1;
                 break;
@@ -457,59 +486,125 @@ void dss_select_dsi_clk_source(int dsi_module,
         dss.dsi_clk_source[dsi_module] = clk_src;
 }
 
+static int dss_lcd_clk_mux_dra7(enum omap_channel channel,
+        enum dss_clk_source clk_src)
+{
+        const u8 ctrl_bits[] = {
+                [OMAP_DSS_CHANNEL_LCD] = 0,
+                [OMAP_DSS_CHANNEL_LCD2] = 12,
+                [OMAP_DSS_CHANNEL_LCD3] = 19,
+        };
+
+        u8 ctrl_bit = ctrl_bits[channel];
+        int r;
+
+        if (clk_src == DSS_CLK_SRC_FCK) {
+                /* LCDx_CLK_SWITCH */
+                REG_FLD_MOD(DSS_CONTROL, 0, ctrl_bit, ctrl_bit);
+                return -EINVAL;
+        }
+
+        r = dss_ctrl_pll_set_control_mux(clk_src, channel);
+        if (r)
+                return r;
+
+        REG_FLD_MOD(DSS_CONTROL, 1, ctrl_bit, ctrl_bit);
+
+        return 0;
+}
+
+static int dss_lcd_clk_mux_omap5(enum omap_channel channel,
+        enum dss_clk_source clk_src)
+{
+        const u8 ctrl_bits[] = {
+                [OMAP_DSS_CHANNEL_LCD] = 0,
+                [OMAP_DSS_CHANNEL_LCD2] = 12,
+                [OMAP_DSS_CHANNEL_LCD3] = 19,
+        };
+        const enum dss_clk_source allowed_plls[] = {
+                [OMAP_DSS_CHANNEL_LCD] = DSS_CLK_SRC_PLL1_1,
+                [OMAP_DSS_CHANNEL_LCD2] = DSS_CLK_SRC_FCK,
+                [OMAP_DSS_CHANNEL_LCD3] = DSS_CLK_SRC_PLL2_1,
+        };
+
+        u8 ctrl_bit = ctrl_bits[channel];
+
+        if (clk_src == DSS_CLK_SRC_FCK) {
+                /* LCDx_CLK_SWITCH */
+                REG_FLD_MOD(DSS_CONTROL, 0, ctrl_bit, ctrl_bit);
+                return -EINVAL;
+        }
+
+        if (WARN_ON(allowed_plls[channel] != clk_src))
+                return -EINVAL;
+
+        REG_FLD_MOD(DSS_CONTROL, 1, ctrl_bit, ctrl_bit);
+
+        return 0;
+}
+
+static int dss_lcd_clk_mux_omap4(enum omap_channel channel,
+        enum dss_clk_source clk_src)
+{
+        const u8 ctrl_bits[] = {
+                [OMAP_DSS_CHANNEL_LCD] = 0,
+                [OMAP_DSS_CHANNEL_LCD2] = 12,
+        };
+        const enum dss_clk_source allowed_plls[] = {
+                [OMAP_DSS_CHANNEL_LCD] = DSS_CLK_SRC_PLL1_1,
+                [OMAP_DSS_CHANNEL_LCD2] = DSS_CLK_SRC_PLL2_1,
+        };
+
+        u8 ctrl_bit = ctrl_bits[channel];
+
+        if (clk_src == DSS_CLK_SRC_FCK) {
+                /* LCDx_CLK_SWITCH */
+                REG_FLD_MOD(DSS_CONTROL, 0, ctrl_bit, ctrl_bit);
+                return 0;
+        }
+
+        if (WARN_ON(allowed_plls[channel] != clk_src))
+                return -EINVAL;
+
+        REG_FLD_MOD(DSS_CONTROL, 1, ctrl_bit, ctrl_bit);
+
+        return 0;
+}
+
 void dss_select_lcd_clk_source(enum omap_channel channel,
-                enum omap_dss_clk_source clk_src)
+                enum dss_clk_source clk_src)
 {
-        int b, ix, pos;
+        int idx = dss_get_channel_index(channel);
+        int r;
 
         if (!dss_has_feature(FEAT_LCD_CLK_SRC)) {
                 dss_select_dispc_clk_source(clk_src);
+                dss.lcd_clk_source[idx] = clk_src;
                 return;
         }
 
-        switch (clk_src) {
-        case OMAP_DSS_CLK_SRC_FCK:
-                b = 0;
-                break;
-        case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
-                BUG_ON(channel != OMAP_DSS_CHANNEL_LCD);
-                b = 1;
-                break;
-        case OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC:
-                BUG_ON(channel != OMAP_DSS_CHANNEL_LCD2 &&
-                       channel != OMAP_DSS_CHANNEL_LCD3);
-                b = 1;
-                break;
-        default:
-                BUG();
+        r = dss.feat->select_lcd_source(channel, clk_src);
+        if (r)
                 return;
-        }
-
-        pos = channel == OMAP_DSS_CHANNEL_LCD ? 0 :
-             (channel == OMAP_DSS_CHANNEL_LCD2 ? 12 : 19);
-        REG_FLD_MOD(DSS_CONTROL, b, pos, pos);  /* LCDx_CLK_SWITCH */
 
-        ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 :
-            (channel == OMAP_DSS_CHANNEL_LCD2 ? 1 : 2);
-        dss.lcd_clk_source[ix] = clk_src;
+        dss.lcd_clk_source[idx] = clk_src;
 }
 
-enum omap_dss_clk_source dss_get_dispc_clk_source(void)
+enum dss_clk_source dss_get_dispc_clk_source(void)
 {
         return dss.dispc_clk_source;
 }
 
-enum omap_dss_clk_source dss_get_dsi_clk_source(int dsi_module)
+enum dss_clk_source dss_get_dsi_clk_source(int dsi_module)
 {
         return dss.dsi_clk_source[dsi_module];
 }
 
-enum omap_dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel)
+enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel)
 {
         if (dss_has_feature(FEAT_LCD_CLK_SRC)) {
-                int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 :
-                        (channel == OMAP_DSS_CHANNEL_LCD2 ? 1 : 2);
-                return dss.lcd_clk_source[ix];
+                int idx = dss_get_channel_index(channel);
+                return dss.lcd_clk_source[idx];
         } else {
                 /* LCD_CLK source is the same as DISPC_FCLK source for
                  * OMAP2 and OMAP3 */
@@ -858,6 +953,7 @@ static const struct dss_features omap44xx_dss_feats = {
         .dpi_select_source      =       &dss_dpi_select_source_omap4,
         .ports                  =       omap2plus_ports,
         .num_ports              =       ARRAY_SIZE(omap2plus_ports),
+        .select_lcd_source      =       &dss_lcd_clk_mux_omap4,
 };
 
 static const struct dss_features omap54xx_dss_feats = {
@@ -867,6 +963,7 @@ static const struct dss_features omap54xx_dss_feats = {
         .dpi_select_source      =       &dss_dpi_select_source_omap5,
         .ports                  =       omap2plus_ports,
         .num_ports              =       ARRAY_SIZE(omap2plus_ports),
+        .select_lcd_source      =       &dss_lcd_clk_mux_omap5,
 };
 
 static const struct dss_features am43xx_dss_feats = {
@@ -885,6 +982,7 @@ static const struct dss_features dra7xx_dss_feats = {
         .dpi_select_source      =       &dss_dpi_select_source_dra7xx,
         .ports                  =       dra7xx_ports,
         .num_ports              =       ARRAY_SIZE(dra7xx_ports),
+        .select_lcd_source      =       &dss_lcd_clk_mux_dra7,
 };
 
 static int dss_init_features(struct platform_device *pdev)
@@ -1142,18 +1240,18 @@ static int dss_bind(struct device *dev)
         /* Select DPLL */
         REG_FLD_MOD(DSS_CONTROL, 0, 0, 0);
 
-        dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
+        dss_select_dispc_clk_source(DSS_CLK_SRC_FCK);
 
 #ifdef CONFIG_OMAP2_DSS_VENC
         REG_FLD_MOD(DSS_CONTROL, 1, 4, 4);      /* venc dac demen */
         REG_FLD_MOD(DSS_CONTROL, 1, 3, 3);      /* venc clock 4x enable */
         REG_FLD_MOD(DSS_CONTROL, 0, 2, 2);      /* venc clock mode = normal */
 #endif
-        dss.dsi_clk_source[0] = OMAP_DSS_CLK_SRC_FCK;
-        dss.dsi_clk_source[1] = OMAP_DSS_CLK_SRC_FCK;
-        dss.dispc_clk_source = OMAP_DSS_CLK_SRC_FCK;
-        dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK;
-        dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK;
+        dss.dsi_clk_source[0] = DSS_CLK_SRC_FCK;
+        dss.dsi_clk_source[1] = DSS_CLK_SRC_FCK;
+        dss.dispc_clk_source = DSS_CLK_SRC_FCK;
+        dss.lcd_clk_source[0] = DSS_CLK_SRC_FCK;
+        dss.lcd_clk_source[1] = DSS_CLK_SRC_FCK;
 
         rev = dss_read_reg(DSS_REVISION);
         printk(KERN_INFO "OMAP DSS rev %d.%d\n",
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index 38e6ab50142d..4fd06dc41cb3 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -102,6 +102,20 @@ enum dss_writeback_channel {
         DSS_WB_LCD3_MGR =       7,
 };
 
+enum dss_clk_source {
+        DSS_CLK_SRC_FCK = 0,
+
+        DSS_CLK_SRC_PLL1_1,
+        DSS_CLK_SRC_PLL1_2,
+        DSS_CLK_SRC_PLL1_3,
+
+        DSS_CLK_SRC_PLL2_1,
+        DSS_CLK_SRC_PLL2_2,
+        DSS_CLK_SRC_PLL2_3,
+
+        DSS_CLK_SRC_HDMI_PLL,
+};
+
 enum dss_pll_id {
         DSS_PLL_DSI1,
         DSS_PLL_DSI2,
@@ -114,6 +128,11 @@ struct dss_pll;
 
 #define DSS_PLL_MAX_HSDIVS 4
 
+enum dss_pll_type {
+        DSS_PLL_TYPE_A,
+        DSS_PLL_TYPE_B,
+};
+
 /*
  * Type-A PLLs: clkout[]/mX[] refer to hsdiv outputs m4, m5, m6, m7.
  * Type-B PLLs: clkout[0] refers to m2.
@@ -140,6 +159,8 @@ struct dss_pll_ops {
 };
 
 struct dss_pll_hw {
+        enum dss_pll_type type;
+
         unsigned n_max;
         unsigned m_min;
         unsigned m_max;
@@ -227,7 +248,7 @@ unsigned long dss_get_dispc_clk_rate(void);
 int dss_dpi_select_source(int port, enum omap_channel channel);
 void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
 enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void);
-const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);
+const char *dss_get_clk_source_name(enum dss_clk_source clk_src);
 void dss_dump_clocks(struct seq_file *s);
 
 /* DSS VIDEO PLL */
@@ -244,20 +265,18 @@ void dss_debug_dump_clocks(struct seq_file *s);
 #endif
 
 void dss_ctrl_pll_enable(enum dss_pll_id pll_id, bool enable);
-void dss_ctrl_pll_set_control_mux(enum dss_pll_id pll_id,
-        enum omap_channel channel);
 
 void dss_sdi_init(int datapairs);
 int dss_sdi_enable(void);
 void dss_sdi_disable(void);
 
 void dss_select_dsi_clk_source(int dsi_module,
-                enum omap_dss_clk_source clk_src);
+                enum dss_clk_source clk_src);
 void dss_select_lcd_clk_source(enum omap_channel channel,
-                enum omap_dss_clk_source clk_src);
-enum omap_dss_clk_source dss_get_dispc_clk_source(void);
-enum omap_dss_clk_source dss_get_dsi_clk_source(int dsi_module);
-enum omap_dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel);
+                enum dss_clk_source clk_src);
+enum dss_clk_source dss_get_dispc_clk_source(void);
+enum dss_clk_source dss_get_dsi_clk_source(int dsi_module);
+enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel);
 
 void dss_set_venc_output(enum omap_dss_venc_type type);
 void dss_set_dac_pwrdn_bgz(bool enable);
@@ -409,17 +428,23 @@ typedef bool (*dss_hsdiv_calc_func)(int m_dispc, unsigned long dispc,
 int dss_pll_register(struct dss_pll *pll);
 void dss_pll_unregister(struct dss_pll *pll);
 struct dss_pll *dss_pll_find(const char *name);
+struct dss_pll *dss_pll_find_by_src(enum dss_clk_source src);
+unsigned dss_pll_get_clkout_idx_for_src(enum dss_clk_source src);
 int dss_pll_enable(struct dss_pll *pll);
 void dss_pll_disable(struct dss_pll *pll);
 int dss_pll_set_config(struct dss_pll *pll,
                 const struct dss_pll_clock_info *cinfo);
 
-bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco,
+bool dss_pll_hsdiv_calc_a(const struct dss_pll *pll, unsigned long clkdco,
                 unsigned long out_min, unsigned long out_max,
                 dss_hsdiv_calc_func func, void *data);
-bool dss_pll_calc(const struct dss_pll *pll, unsigned long clkin,
+bool dss_pll_calc_a(const struct dss_pll *pll, unsigned long clkin,
                 unsigned long pll_min, unsigned long pll_max,
                 dss_pll_calc_func func, void *data);
+
+bool dss_pll_calc_b(const struct dss_pll *pll, unsigned long clkin,
+        unsigned long target_clkout, struct dss_pll_clock_info *cinfo);
+
 int dss_pll_write_config_type_a(struct dss_pll *pll,
                 const struct dss_pll_clock_info *cinfo);
 int dss_pll_write_config_type_b(struct dss_pll *pll,
diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.c b/drivers/gpu/drm/omapdrm/dss/dss_features.c
index c886a2927f73..ee5b93ce2763 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.c
@@ -23,8 +23,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
@@ -50,7 +49,6 @@ struct omap_dss_features {
         const enum omap_dss_output_id *supported_outputs;
         const enum omap_color_mode *supported_color_modes;
         const enum omap_overlay_caps *overlay_caps;
-        const char * const *clksrc_names;
         const struct dss_param_range *dss_params;
 
         const enum omap_dss_rotation_type supported_rotation_types;
@@ -389,34 +387,6 @@ static const enum omap_overlay_caps omap4_dss_overlay_caps[] = {
                 OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,
 };
 
-static const char * const omap2_dss_clk_source_names[] = {
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]  = "N/A",
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]    = "N/A",
-        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS_FCLK1",
-};
-
-static const char * const omap3_dss_clk_source_names[] = {
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]  = "DSI1_PLL_FCLK",
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]    = "DSI2_PLL_FCLK",
-        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS1_ALWON_FCLK",
-};
-
-static const char * const omap4_dss_clk_source_names[] = {
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]  = "PLL1_CLK1",
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]    = "PLL1_CLK2",
-        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS_FCLK",
-        [OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC] = "PLL2_CLK1",
-        [OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI]   = "PLL2_CLK2",
-};
-
-static const char * const omap5_dss_clk_source_names[] = {
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]  = "DPLL_DSI1_A_CLK1",
-        [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]    = "DPLL_DSI1_A_CLK2",
-        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS_CLK",
-        [OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC] = "DPLL_DSI1_C_CLK1",
-        [OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI]   = "DPLL_DSI1_C_CLK2",
-};
-
 static const struct dss_param_range omap2_dss_param_range[] = {
         [FEAT_PARAM_DSS_FCK]                    = { 0, 133000000 },
         [FEAT_PARAM_DSS_PCD]                    = { 2, 255 },
@@ -631,7 +601,6 @@ static const struct omap_dss_features omap2_dss_features = {
         .supported_outputs = omap2_dss_supported_outputs,
         .supported_color_modes = omap2_dss_supported_color_modes,
         .overlay_caps = omap2_dss_overlay_caps,
-        .clksrc_names = omap2_dss_clk_source_names,
         .dss_params = omap2_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
@@ -652,7 +621,6 @@ static const struct omap_dss_features omap3430_dss_features = {
         .supported_outputs = omap3430_dss_supported_outputs,
         .supported_color_modes = omap3_dss_supported_color_modes,
         .overlay_caps = omap3430_dss_overlay_caps,
-        .clksrc_names = omap3_dss_clk_source_names,
         .dss_params = omap3_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
@@ -676,7 +644,6 @@ static const struct omap_dss_features am35xx_dss_features = {
         .supported_outputs = omap3430_dss_supported_outputs,
         .supported_color_modes = omap3_dss_supported_color_modes,
         .overlay_caps = omap3430_dss_overlay_caps,
-        .clksrc_names = omap3_dss_clk_source_names,
         .dss_params = omap3_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
@@ -696,7 +663,6 @@ static const struct omap_dss_features am43xx_dss_features = {
         .supported_outputs = am43xx_dss_supported_outputs,
         .supported_color_modes = omap3_dss_supported_color_modes,
         .overlay_caps = omap3430_dss_overlay_caps,
-        .clksrc_names = omap2_dss_clk_source_names,
         .dss_params = am43xx_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA,
         .buffer_size_unit = 1,
@@ -716,7 +682,6 @@ static const struct omap_dss_features omap3630_dss_features = {
         .supported_outputs = omap3630_dss_supported_outputs,
         .supported_color_modes = omap3_dss_supported_color_modes,
         .overlay_caps = omap3630_dss_overlay_caps,
-        .clksrc_names = omap3_dss_clk_source_names,
         .dss_params = omap3_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
@@ -738,7 +703,6 @@ static const struct omap_dss_features omap4430_es1_0_dss_features  = {
         .supported_outputs = omap4_dss_supported_outputs,
         .supported_color_modes = omap4_dss_supported_color_modes,
         .overlay_caps = omap4_dss_overlay_caps,
-        .clksrc_names = omap4_dss_clk_source_names,
         .dss_params = omap4_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
@@ -759,7 +723,6 @@ static const struct omap_dss_features omap4430_es2_0_1_2_dss_features = {
         .supported_outputs = omap4_dss_supported_outputs,
         .supported_color_modes = omap4_dss_supported_color_modes,
         .overlay_caps = omap4_dss_overlay_caps,
-        .clksrc_names = omap4_dss_clk_source_names,
         .dss_params = omap4_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
@@ -780,7 +743,6 @@ static const struct omap_dss_features omap4_dss_features = {
         .supported_outputs = omap4_dss_supported_outputs,
         .supported_color_modes = omap4_dss_supported_color_modes,
         .overlay_caps = omap4_dss_overlay_caps,
-        .clksrc_names = omap4_dss_clk_source_names,
         .dss_params = omap4_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
@@ -801,7 +763,6 @@ static const struct omap_dss_features omap5_dss_features = {
         .supported_outputs = omap5_dss_supported_outputs,
         .supported_color_modes = omap4_dss_supported_color_modes,
         .overlay_caps = omap4_dss_overlay_caps,
-        .clksrc_names = omap5_dss_clk_source_names,
         .dss_params = omap5_dss_param_range,
         .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
@@ -859,11 +820,6 @@ bool dss_feat_color_mode_supported(enum omap_plane plane,
                         color_mode;
 }
 
-const char *dss_feat_get_clk_source_name(enum omap_dss_clk_source id)
-{
-        return omap_current_dss_features->clksrc_names[id];
-}
-
 u32 dss_feat_get_buffer_size_unit(void)
 {
         return omap_current_dss_features->buffer_size_unit;
diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h
index 3d67d39f192f..bb4b7f0e642b 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h
@@ -91,7 +91,6 @@ unsigned long dss_feat_get_param_max(enum dss_range_param param);
 enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane);
 bool dss_feat_color_mode_supported(enum omap_plane plane,
                 enum omap_color_mode color_mode);
-const char *dss_feat_get_clk_source_name(enum omap_dss_clk_source id);
 
 u32 dss_feat_get_buffer_size_unit(void);        /* in bytes */
 u32 dss_feat_get_burst_size_unit(void);         /* in bytes */
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h
index 53616b02b613..63e711545865 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi.h
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h
@@ -23,8 +23,9 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/hdmi.h>
-#include <video/omapdss.h>
+#include <sound/omap-hdmi-audio.h>
 
+#include "omapdss.h"
 #include "dss.h"
 
 /* HDMI Wrapper */
@@ -240,6 +241,7 @@ struct hdmi_pll_data {
 
         void __iomem *base;
 
+        struct platform_device *pdev;
         struct hdmi_wp_data *wp;
 };
 
@@ -306,8 +308,6 @@ phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp);
 
 /* HDMI PLL funcs */
 void hdmi_pll_dump(struct hdmi_pll_data *pll, struct seq_file *s);
-void hdmi_pll_compute(struct hdmi_pll_data *pll,
-        unsigned long target_tmds, struct dss_pll_clock_info *pi);
 int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,
         struct hdmi_wp_data *wp);
 void hdmi_pll_uninit(struct hdmi_pll_data *hpll);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index f892ae157ff3..cbd28dfdb86a 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -33,9 +33,10 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/component.h>
-#include <video/omapdss.h>
+#include <linux/of.h>
 #include <sound/omap-hdmi-audio.h>
 
+#include "omapdss.h"
 #include "hdmi4_core.h"
 #include "dss.h"
 #include "dss_features.h"
@@ -100,7 +101,6 @@ static irqreturn_t hdmi_irq_handler(int irq, void *data)
 
 static int hdmi_init_regulator(void)
 {
-        int r;
         struct regulator *reg;
 
         if (hdmi.vdda_reg != NULL)
@@ -114,15 +114,6 @@ static int hdmi_init_regulator(void)
                 return PTR_ERR(reg);
         }
 
-        if (regulator_can_change_voltage(reg)) {
-                r = regulator_set_voltage(reg, 1800000, 1800000);
-                if (r) {
-                        devm_regulator_put(reg);
-                        DSSWARN("can't set the regulator voltage\n");
-                        return r;
-                }
-        }
-
         hdmi.vdda_reg = reg;
 
         return 0;
@@ -186,7 +177,11 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
         if (p->double_pixel)
                 pc *= 2;
 
-        hdmi_pll_compute(&hdmi.pll, pc, &hdmi_cinfo);
+        /* DSS_HDMI_TCLK is bitclk / 10 */
+        pc *= 10;
+
+        dss_pll_calc_b(&hdmi.pll.pll, clk_get_rate(hdmi.pll.pll.clkin),
+                pc, &hdmi_cinfo);
 
         r = dss_pll_enable(&hdmi.pll.pll);
         if (r) {
@@ -213,9 +208,6 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 
         hdmi4_configure(&hdmi.core, &hdmi.wp, &hdmi.cfg);
 
-        /* bypass TV gamma table */
-        dispc_enable_gamma_table(0);
-
         /* tv size */
         dss_mgr_set_timings(channel, p);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
index fa72e735dad2..ef3afe99e487 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
@@ -211,7 +211,7 @@ static void hdmi_core_init(struct hdmi_core_video_config *video_cfg)
 static void hdmi_core_powerdown_disable(struct hdmi_core_data *core)
 {
         DSSDBG("Enter hdmi_core_powerdown_disable\n");
-        REG_FLD_MOD(core->base, HDMI_CORE_SYS_SYS_CTRL1, 0x0, 0, 0);
+        REG_FLD_MOD(core->base, HDMI_CORE_SYS_SYS_CTRL1, 0x1, 0, 0);
 }
 
 static void hdmi_core_swreset_release(struct hdmi_core_data *core)
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index a43f7b10e113..0c0a5139a301 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -38,9 +38,10 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/component.h>
-#include <video/omapdss.h>
+#include <linux/of.h>
 #include <sound/omap-hdmi-audio.h>
 
+#include "omapdss.h"
 #include "hdmi5_core.h"
 #include "dss.h"
 #include "dss_features.h"
@@ -119,7 +120,6 @@ static irqreturn_t hdmi_irq_handler(int irq, void *data)
 
 static int hdmi_init_regulator(void)
 {
-        int r;
         struct regulator *reg;
 
         if (hdmi.vdda_reg != NULL)
@@ -131,15 +131,6 @@ static int hdmi_init_regulator(void)
                 return PTR_ERR(reg);
         }
 
-        if (regulator_can_change_voltage(reg)) {
-                r = regulator_set_voltage(reg, 1800000, 1800000);
-                if (r) {
-                        devm_regulator_put(reg);
-                        DSSWARN("can't set the regulator voltage\n");
-                        return r;
-                }
-        }
-
         hdmi.vdda_reg = reg;
 
         return 0;
@@ -198,7 +189,11 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
         if (p->double_pixel)
                 pc *= 2;
 
-        hdmi_pll_compute(&hdmi.pll, pc, &hdmi_cinfo);
+        /* DSS_HDMI_TCLK is bitclk / 10 */
+        pc *= 10;
+
+        dss_pll_calc_b(&hdmi.pll.pll, clk_get_rate(hdmi.pll.pll.clkin),
+                pc, &hdmi_cinfo);
 
         /* disable and clear irqs */
         hdmi_wp_clear_irqenable(&hdmi.wp, 0xffffffff);
@@ -230,9 +225,6 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 
         hdmi5_configure(&hdmi.core, &hdmi.wp, &hdmi.cfg);
 
-        /* bypass TV gamma table */
-        dispc_enable_gamma_table(0);
-
         /* tv size */
         dss_mgr_set_timings(channel, p);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index 6a397520cae5..8ab2093daa12 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -51,8 +51,8 @@ static void hdmi_core_ddc_init(struct hdmi_core_data *core)
 {
         void __iomem *base = core->base;
         const unsigned long long iclk = 266000000;      /* DSS L3 ICLK */
-        const unsigned ss_scl_high = 4000;              /* ns */
-        const unsigned ss_scl_low = 4700;               /* ns */
+        const unsigned ss_scl_high = 4600;              /* ns */
+        const unsigned ss_scl_low = 5400;               /* ns */
         const unsigned fs_scl_high = 600;               /* ns */
         const unsigned fs_scl_low = 1300;               /* ns */
         const unsigned sda_hold = 1000;                 /* ns */
@@ -458,7 +458,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core,
 
         c = (ptr[1] >> 6) & 0x3;
         m = (ptr[1] >> 4) & 0x3;
-        r = (ptr[1] >> 0) & 0x3;
+        r = (ptr[1] >> 0) & 0xf;
 
         itc = (ptr[2] >> 7) & 0x1;
         ec = (ptr[2] >> 4) & 0x7;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_common.c b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
index 1b8fcc6c4ba1..4dfb67fe5f6d 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
@@ -4,8 +4,8 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/of.h>
-#include <video/omapdss.h>
 
+#include "omapdss.h"
 #include "hdmi.h"
 
 int hdmi_parse_lanes_of(struct platform_device *pdev, struct device_node *ep,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index 1f5d19c119ce..3ead47cccac5 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@ -13,8 +13,9 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <video/omapdss.h>
+#include <linux/seq_file.h>
 
+#include "omapdss.h"
 #include "dss.h"
 #include "hdmi.h"
 
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index 06e23a7c432c..b8bf6a9e5557 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -16,9 +16,10 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/seq_file.h>
+#include <linux/pm_runtime.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "hdmi.h"
 
@@ -38,71 +39,14 @@ void hdmi_pll_dump(struct hdmi_pll_data *pll, struct seq_file *s)
         DUMPPLL(PLLCTRL_CFG4);
 }
 
-void hdmi_pll_compute(struct hdmi_pll_data *pll,
-        unsigned long target_tmds, struct dss_pll_clock_info *pi)
-{
-        unsigned long fint, clkdco, clkout;
-        unsigned long target_bitclk, target_clkdco;
-        unsigned long min_dco;
-        unsigned n, m, mf, m2, sd;
-        unsigned long clkin;
-        const struct dss_pll_hw *hw = pll->pll.hw;
-
-        clkin = clk_get_rate(pll->pll.clkin);
-
-        DSSDBG("clkin %lu, target tmds %lu\n", clkin, target_tmds);
-
-        target_bitclk = target_tmds * 10;
-
-        /* Fint */
-        n = DIV_ROUND_UP(clkin, hw->fint_max);
-        fint = clkin / n;
-
-        /* adjust m2 so that the clkdco will be high enough */
-        min_dco = roundup(hw->clkdco_min, fint);
-        m2 = DIV_ROUND_UP(min_dco, target_bitclk);
-        if (m2 == 0)
-                m2 = 1;
-
-        target_clkdco = target_bitclk * m2;
-        m = target_clkdco / fint;
-
-        clkdco = fint * m;
-
-        /* adjust clkdco with fractional mf */
-        if (WARN_ON(target_clkdco - clkdco > fint))
-                mf = 0;
-        else
-                mf = (u32)div_u64(262144ull * (target_clkdco - clkdco), fint);
-
-        if (mf > 0)
-                clkdco += (u32)div_u64((u64)mf * fint, 262144);
-
-        clkout = clkdco / m2;
-
-        /* sigma-delta */
-        sd = DIV_ROUND_UP(fint * m, 250000000);
-
-        DSSDBG("N = %u, M = %u, M.f = %u, M2 = %u, SD = %u\n",
-                n, m, mf, m2, sd);
-        DSSDBG("Fint %lu, clkdco %lu, clkout %lu\n", fint, clkdco, clkout);
-
-        pi->n = n;
-        pi->m = m;
-        pi->mf = mf;
-        pi->mX[0] = m2;
-        pi->sd = sd;
-
-        pi->fint = fint;
-        pi->clkdco = clkdco;
-        pi->clkout[0] = clkout;
-}
-
 static int hdmi_pll_enable(struct dss_pll *dsspll)
 {
         struct hdmi_pll_data *pll = container_of(dsspll, struct hdmi_pll_data, pll);
         struct hdmi_wp_data *wp = pll->wp;
-        u16 r = 0;
+        int r;
+
+        r = pm_runtime_get_sync(&pll->pdev->dev);
+        WARN_ON(r < 0);
 
         dss_ctrl_pll_enable(DSS_PLL_HDMI, true);
 
@@ -117,10 +61,14 @@ static void hdmi_pll_disable(struct dss_pll *dsspll)
 {
         struct hdmi_pll_data *pll = container_of(dsspll, struct hdmi_pll_data, pll);
         struct hdmi_wp_data *wp = pll->wp;
+        int r;
 
         hdmi_wp_set_pll_pwr(wp, HDMI_PLLPWRCMD_ALLOFF);
 
         dss_ctrl_pll_enable(DSS_PLL_HDMI, false);
+
+        r = pm_runtime_put_sync(&pll->pdev->dev);
+        WARN_ON(r < 0 && r != -ENOSYS);
 }
 
 static const struct dss_pll_ops dsi_pll_ops = {
@@ -130,6 +78,8 @@ static const struct dss_pll_ops dsi_pll_ops = {
 };
 
 static const struct dss_pll_hw dss_omap4_hdmi_pll_hw = {
+        .type = DSS_PLL_TYPE_B,
+
         .n_max = 255,
         .m_min = 20,
         .m_max = 4095,
@@ -153,6 +103,8 @@ static const struct dss_pll_hw dss_omap4_hdmi_pll_hw = {
 };
 
 static const struct dss_pll_hw dss_omap5_hdmi_pll_hw = {
+        .type = DSS_PLL_TYPE_B,
+
         .n_max = 255,
         .m_min = 20,
         .m_max = 2045,
@@ -224,6 +176,7 @@ int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,
         int r;
         struct resource *res;
 
+        pll->pdev = pdev;
         pll->wp = wp;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index 13442b9052d1..203694a52d18 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@ -14,8 +14,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <video/omapdss.h>
+#include <linux/seq_file.h>
 
+#include "omapdss.h"
 #include "dss.h"
 #include "hdmi.h"
 
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index d7e7c909bbc2..6eaf1adbd606 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -18,7 +18,872 @@
 #ifndef __OMAP_DRM_DSS_H
 #define __OMAP_DRM_DSS_H
 
-#include <video/omapdss.h>
+#include <linux/list.h>
+#include <linux/kobject.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <video/videomode.h>
+#include <linux/platform_data/omapdss.h>
+#include <uapi/drm/drm_mode.h>
+
+#define DISPC_IRQ_FRAMEDONE             (1 << 0)
+#define DISPC_IRQ_VSYNC                 (1 << 1)
+#define DISPC_IRQ_EVSYNC_EVEN           (1 << 2)
+#define DISPC_IRQ_EVSYNC_ODD            (1 << 3)
+#define DISPC_IRQ_ACBIAS_COUNT_STAT     (1 << 4)
+#define DISPC_IRQ_PROG_LINE_NUM         (1 << 5)
+#define DISPC_IRQ_GFX_FIFO_UNDERFLOW    (1 << 6)
+#define DISPC_IRQ_GFX_END_WIN           (1 << 7)
+#define DISPC_IRQ_PAL_GAMMA_MASK        (1 << 8)
+#define DISPC_IRQ_OCP_ERR               (1 << 9)
+#define DISPC_IRQ_VID1_FIFO_UNDERFLOW   (1 << 10)
+#define DISPC_IRQ_VID1_END_WIN          (1 << 11)
+#define DISPC_IRQ_VID2_FIFO_UNDERFLOW   (1 << 12)
+#define DISPC_IRQ_VID2_END_WIN          (1 << 13)
+#define DISPC_IRQ_SYNC_LOST             (1 << 14)
+#define DISPC_IRQ_SYNC_LOST_DIGIT       (1 << 15)
+#define DISPC_IRQ_WAKEUP                (1 << 16)
+#define DISPC_IRQ_SYNC_LOST2            (1 << 17)
+#define DISPC_IRQ_VSYNC2                (1 << 18)
+#define DISPC_IRQ_VID3_END_WIN          (1 << 19)
+#define DISPC_IRQ_VID3_FIFO_UNDERFLOW   (1 << 20)
+#define DISPC_IRQ_ACBIAS_COUNT_STAT2    (1 << 21)
+#define DISPC_IRQ_FRAMEDONE2            (1 << 22)
+#define DISPC_IRQ_FRAMEDONEWB           (1 << 23)
+#define DISPC_IRQ_FRAMEDONETV           (1 << 24)
+#define DISPC_IRQ_WBBUFFEROVERFLOW      (1 << 25)
+#define DISPC_IRQ_WBUNCOMPLETEERROR     (1 << 26)
+#define DISPC_IRQ_SYNC_LOST3            (1 << 27)
+#define DISPC_IRQ_VSYNC3                (1 << 28)
+#define DISPC_IRQ_ACBIAS_COUNT_STAT3    (1 << 29)
+#define DISPC_IRQ_FRAMEDONE3            (1 << 30)
+
+struct omap_dss_device;
+struct omap_overlay_manager;
+struct dss_lcd_mgr_config;
+struct snd_aes_iec958;
+struct snd_cea_861_aud_if;
+struct hdmi_avi_infoframe;
+
+enum omap_display_type {
+        OMAP_DISPLAY_TYPE_NONE          = 0,
+        OMAP_DISPLAY_TYPE_DPI           = 1 << 0,
+        OMAP_DISPLAY_TYPE_DBI           = 1 << 1,
+        OMAP_DISPLAY_TYPE_SDI           = 1 << 2,
+        OMAP_DISPLAY_TYPE_DSI           = 1 << 3,
+        OMAP_DISPLAY_TYPE_VENC          = 1 << 4,
+        OMAP_DISPLAY_TYPE_HDMI          = 1 << 5,
+        OMAP_DISPLAY_TYPE_DVI           = 1 << 6,
+};
+
+enum omap_plane {
+        OMAP_DSS_GFX    = 0,
+        OMAP_DSS_VIDEO1 = 1,
+        OMAP_DSS_VIDEO2 = 2,
+        OMAP_DSS_VIDEO3 = 3,
+        OMAP_DSS_WB     = 4,
+};
+
+enum omap_channel {
+        OMAP_DSS_CHANNEL_LCD    = 0,
+        OMAP_DSS_CHANNEL_DIGIT  = 1,
+        OMAP_DSS_CHANNEL_LCD2   = 2,
+        OMAP_DSS_CHANNEL_LCD3   = 3,
+        OMAP_DSS_CHANNEL_WB     = 4,
+};
+
+enum omap_color_mode {
+        OMAP_DSS_COLOR_CLUT1    = 1 << 0,  /* BITMAP 1 */
+        OMAP_DSS_COLOR_CLUT2    = 1 << 1,  /* BITMAP 2 */
+        OMAP_DSS_COLOR_CLUT4    = 1 << 2,  /* BITMAP 4 */
+        OMAP_DSS_COLOR_CLUT8    = 1 << 3,  /* BITMAP 8 */
+        OMAP_DSS_COLOR_RGB12U   = 1 << 4,  /* RGB12, 16-bit container */
+        OMAP_DSS_COLOR_ARGB16   = 1 << 5,  /* ARGB16 */
+        OMAP_DSS_COLOR_RGB16    = 1 << 6,  /* RGB16 */
+        OMAP_DSS_COLOR_RGB24U   = 1 << 7,  /* RGB24, 32-bit container */
+        OMAP_DSS_COLOR_RGB24P   = 1 << 8,  /* RGB24, 24-bit container */
+        OMAP_DSS_COLOR_YUV2     = 1 << 9,  /* YUV2 4:2:2 co-sited */
+        OMAP_DSS_COLOR_UYVY     = 1 << 10, /* UYVY 4:2:2 co-sited */
+        OMAP_DSS_COLOR_ARGB32   = 1 << 11, /* ARGB32 */
+        OMAP_DSS_COLOR_RGBA32   = 1 << 12, /* RGBA32 */
+        OMAP_DSS_COLOR_RGBX32   = 1 << 13, /* RGBx32 */
+        OMAP_DSS_COLOR_NV12             = 1 << 14, /* NV12 format: YUV 4:2:0 */
+        OMAP_DSS_COLOR_RGBA16           = 1 << 15, /* RGBA16 - 4444 */
+        OMAP_DSS_COLOR_RGBX16           = 1 << 16, /* RGBx16 - 4444 */
+        OMAP_DSS_COLOR_ARGB16_1555      = 1 << 17, /* ARGB16 - 1555 */
+        OMAP_DSS_COLOR_XRGB16_1555      = 1 << 18, /* xRGB16 - 1555 */
+};
+
+enum omap_dss_load_mode {
+        OMAP_DSS_LOAD_CLUT_AND_FRAME    = 0,
+        OMAP_DSS_LOAD_CLUT_ONLY         = 1,
+        OMAP_DSS_LOAD_FRAME_ONLY        = 2,
+        OMAP_DSS_LOAD_CLUT_ONCE_FRAME   = 3,
+};
+
+enum omap_dss_trans_key_type {
+        OMAP_DSS_COLOR_KEY_GFX_DST = 0,
+        OMAP_DSS_COLOR_KEY_VID_SRC = 1,
+};
+
+enum omap_rfbi_te_mode {
+        OMAP_DSS_RFBI_TE_MODE_1 = 1,
+        OMAP_DSS_RFBI_TE_MODE_2 = 2,
+};
+
+enum omap_dss_signal_level {
+        OMAPDSS_SIG_ACTIVE_LOW,
+        OMAPDSS_SIG_ACTIVE_HIGH,
+};
+
+enum omap_dss_signal_edge {
+        OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+        OMAPDSS_DRIVE_SIG_RISING_EDGE,
+};
+
+enum omap_dss_venc_type {
+        OMAP_DSS_VENC_TYPE_COMPOSITE,
+        OMAP_DSS_VENC_TYPE_SVIDEO,
+};
+
+enum omap_dss_dsi_pixel_format {
+        OMAP_DSS_DSI_FMT_RGB888,
+        OMAP_DSS_DSI_FMT_RGB666,
+        OMAP_DSS_DSI_FMT_RGB666_PACKED,
+        OMAP_DSS_DSI_FMT_RGB565,
+};
+
+enum omap_dss_dsi_mode {
+        OMAP_DSS_DSI_CMD_MODE = 0,
+        OMAP_DSS_DSI_VIDEO_MODE,
+};
+
+enum omap_display_caps {
+        OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE      = 1 << 0,
+        OMAP_DSS_DISPLAY_CAP_TEAR_ELIM          = 1 << 1,
+};
+
+enum omap_dss_display_state {
+        OMAP_DSS_DISPLAY_DISABLED = 0,
+        OMAP_DSS_DISPLAY_ACTIVE,
+};
+
+enum omap_dss_rotation_type {
+        OMAP_DSS_ROT_DMA        = 1 << 0,
+        OMAP_DSS_ROT_VRFB       = 1 << 1,
+        OMAP_DSS_ROT_TILER      = 1 << 2,
+};
+
+/* clockwise rotation angle */
+enum omap_dss_rotation_angle {
+        OMAP_DSS_ROT_0   = 0,
+        OMAP_DSS_ROT_90  = 1,
+        OMAP_DSS_ROT_180 = 2,
+        OMAP_DSS_ROT_270 = 3,
+};
+
+enum omap_overlay_caps {
+        OMAP_DSS_OVL_CAP_SCALE = 1 << 0,
+        OMAP_DSS_OVL_CAP_GLOBAL_ALPHA = 1 << 1,
+        OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA = 1 << 2,
+        OMAP_DSS_OVL_CAP_ZORDER = 1 << 3,
+        OMAP_DSS_OVL_CAP_POS = 1 << 4,
+        OMAP_DSS_OVL_CAP_REPLICATION = 1 << 5,
+};
+
+enum omap_overlay_manager_caps {
+        OMAP_DSS_DUMMY_VALUE, /* add a dummy value to prevent compiler error */
+};
+
+enum omap_dss_clk_source {
+        OMAP_DSS_CLK_SRC_FCK = 0,               /* OMAP2/3: DSS1_ALWON_FCLK
+                                                 * OMAP4: DSS_FCLK */
+        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC,   /* OMAP3: DSI1_PLL_FCLK
+                                                 * OMAP4: PLL1_CLK1 */
+        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI,     /* OMAP3: DSI2_PLL_FCLK
+                                                 * OMAP4: PLL1_CLK2 */
+        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC,  /* OMAP4: PLL2_CLK1 */
+        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,    /* OMAP4: PLL2_CLK2 */
+};
+
+enum omap_hdmi_flags {
+        OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0,
+};
+
+enum omap_dss_output_id {
+        OMAP_DSS_OUTPUT_DPI     = 1 << 0,
+        OMAP_DSS_OUTPUT_DBI     = 1 << 1,
+        OMAP_DSS_OUTPUT_SDI     = 1 << 2,
+        OMAP_DSS_OUTPUT_DSI1    = 1 << 3,
+        OMAP_DSS_OUTPUT_DSI2    = 1 << 4,
+        OMAP_DSS_OUTPUT_VENC    = 1 << 5,
+        OMAP_DSS_OUTPUT_HDMI    = 1 << 6,
+};
+
+/* RFBI */
+
+struct rfbi_timings {
+        int cs_on_time;
+        int cs_off_time;
+        int we_on_time;
+        int we_off_time;
+        int re_on_time;
+        int re_off_time;
+        int we_cycle_time;
+        int re_cycle_time;
+        int cs_pulse_width;
+        int access_time;
+
+        int clk_div;
+
+        u32 tim[5];             /* set by rfbi_convert_timings() */
+
+        int converted;
+};
+
+/* DSI */
+
+enum omap_dss_dsi_trans_mode {
+        /* Sync Pulses: both sync start and end packets sent */
+        OMAP_DSS_DSI_PULSE_MODE,
+        /* Sync Events: only sync start packets sent */
+        OMAP_DSS_DSI_EVENT_MODE,
+        /* Burst: only sync start packets sent, pixels are time compressed */
+        OMAP_DSS_DSI_BURST_MODE,
+};
+
+struct omap_dss_dsi_videomode_timings {
+        unsigned long hsclk;
+
+        unsigned ndl;
+        unsigned bitspp;
+
+        /* pixels */
+        u16 hact;
+        /* lines */
+        u16 vact;
+
+        /* DSI video mode blanking data */
+        /* Unit: byte clock cycles */
+        u16 hss;
+        u16 hsa;
+        u16 hse;
+        u16 hfp;
+        u16 hbp;
+        /* Unit: line clocks */
+        u16 vsa;
+        u16 vfp;
+        u16 vbp;
+
+        /* DSI blanking modes */
+        int blanking_mode;
+        int hsa_blanking_mode;
+        int hbp_blanking_mode;
+        int hfp_blanking_mode;
+
+        enum omap_dss_dsi_trans_mode trans_mode;
+
+        bool ddr_clk_always_on;
+        int window_sync;
+};
+
+struct omap_dss_dsi_config {
+        enum omap_dss_dsi_mode mode;
+        enum omap_dss_dsi_pixel_format pixel_format;
+        const struct omap_video_timings *timings;
+
+        unsigned long hs_clk_min, hs_clk_max;
+        unsigned long lp_clk_min, lp_clk_max;
+
+        bool ddr_clk_always_on;
+        enum omap_dss_dsi_trans_mode trans_mode;
+};
+
+struct omap_video_timings {
+        /* Unit: pixels */
+        u16 x_res;
+        /* Unit: pixels */
+        u16 y_res;
+        /* Unit: Hz */
+        u32 pixelclock;
+        /* Unit: pixel clocks */
+        u16 hsw;        /* Horizontal synchronization pulse width */
+        /* Unit: pixel clocks */
+        u16 hfp;        /* Horizontal front porch */
+        /* Unit: pixel clocks */
+        u16 hbp;        /* Horizontal back porch */
+        /* Unit: line clocks */
+        u16 vsw;        /* Vertical synchronization pulse width */
+        /* Unit: line clocks */
+        u16 vfp;        /* Vertical front porch */
+        /* Unit: line clocks */
+        u16 vbp;        /* Vertical back porch */
+
+        /* Vsync logic level */
+        enum omap_dss_signal_level vsync_level;
+        /* Hsync logic level */
+        enum omap_dss_signal_level hsync_level;
+        /* Interlaced or Progressive timings */
+        bool interlace;
+        /* Pixel clock edge to drive LCD data */
+        enum omap_dss_signal_edge data_pclk_edge;
+        /* Data enable logic level */
+        enum omap_dss_signal_level de_level;
+        /* Pixel clock edges to drive HSYNC and VSYNC signals */
+        enum omap_dss_signal_edge sync_pclk_edge;
+
+        bool double_pixel;
+};
+
+/* Hardcoded timings for tv modes. Venc only uses these to
+ * identify the mode, and does not actually use the configs
+ * itself. However, the configs should be something that
+ * a normal monitor can also show */
+extern const struct omap_video_timings omap_dss_pal_timings;
+extern const struct omap_video_timings omap_dss_ntsc_timings;
+
+struct omap_dss_cpr_coefs {
+        s16 rr, rg, rb;
+        s16 gr, gg, gb;
+        s16 br, bg, bb;
+};
+
+struct omap_overlay_info {
+        dma_addr_t paddr;
+        dma_addr_t p_uv_addr;  /* for NV12 format */
+        u16 screen_width;
+        u16 width;
+        u16 height;
+        enum omap_color_mode color_mode;
+        u8 rotation;
+        enum omap_dss_rotation_type rotation_type;
+        bool mirror;
+
+        u16 pos_x;
+        u16 pos_y;
+        u16 out_width;  /* if 0, out_width == width */
+        u16 out_height; /* if 0, out_height == height */
+        u8 global_alpha;
+        u8 pre_mult_alpha;
+        u8 zorder;
+};
+
+struct omap_overlay {
+        struct kobject kobj;
+        struct list_head list;
+
+        /* static fields */
+        const char *name;
+        enum omap_plane id;
+        enum omap_color_mode supported_modes;
+        enum omap_overlay_caps caps;
+
+        /* dynamic fields */
+        struct omap_overlay_manager *manager;
+
+        /*
+         * The following functions do not block:
+         *
+         * is_enabled
+         * set_overlay_info
+         * get_overlay_info
+         *
+         * The rest of the functions may block and cannot be called from
+         * interrupt context
+         */
+
+        int (*enable)(struct omap_overlay *ovl);
+        int (*disable)(struct omap_overlay *ovl);
+        bool (*is_enabled)(struct omap_overlay *ovl);
+
+        int (*set_manager)(struct omap_overlay *ovl,
+                struct omap_overlay_manager *mgr);
+        int (*unset_manager)(struct omap_overlay *ovl);
+
+        int (*set_overlay_info)(struct omap_overlay *ovl,
+                        struct omap_overlay_info *info);
+        void (*get_overlay_info)(struct omap_overlay *ovl,
+                        struct omap_overlay_info *info);
+
+        int (*wait_for_go)(struct omap_overlay *ovl);
+
+        struct omap_dss_device *(*get_device)(struct omap_overlay *ovl);
+};
+
+struct omap_overlay_manager_info {
+        u32 default_color;
+
+        enum omap_dss_trans_key_type trans_key_type;
+        u32 trans_key;
+        bool trans_enabled;
+
+        bool partial_alpha_enabled;
+
+        bool cpr_enable;
+        struct omap_dss_cpr_coefs cpr_coefs;
+};
+
+struct omap_overlay_manager {
+        struct kobject kobj;
+
+        /* static fields */
+        const char *name;
+        enum omap_channel id;
+        enum omap_overlay_manager_caps caps;
+        struct list_head overlays;
+        enum omap_display_type supported_displays;
+        enum omap_dss_output_id supported_outputs;
+
+        /* dynamic fields */
+        struct omap_dss_device *output;
+
+        /*
+         * The following functions do not block:
+         *
+         * set_manager_info
+         * get_manager_info
+         * apply
+         *
+         * The rest of the functions may block and cannot be called from
+         * interrupt context
+         */
+
+        int (*set_output)(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *output);
+        int (*unset_output)(struct omap_overlay_manager *mgr);
+
+        int (*set_manager_info)(struct omap_overlay_manager *mgr,
+                        struct omap_overlay_manager_info *info);
+        void (*get_manager_info)(struct omap_overlay_manager *mgr,
+                        struct omap_overlay_manager_info *info);
+
+        int (*apply)(struct omap_overlay_manager *mgr);
+        int (*wait_for_go)(struct omap_overlay_manager *mgr);
+        int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
+
+        struct omap_dss_device *(*get_device)(struct omap_overlay_manager *mgr);
+};
+
+/* 22 pins means 1 clk lane and 10 data lanes */
+#define OMAP_DSS_MAX_DSI_PINS 22
+
+struct omap_dsi_pin_config {
+        int num_pins;
+        /*
+         * pin numbers in the following order:
+         * clk+, clk-
+         * data1+, data1-
+         * data2+, data2-
+         * ...
+         */
+        int pins[OMAP_DSS_MAX_DSI_PINS];
+};
+
+struct omap_dss_writeback_info {
+        u32 paddr;
+        u32 p_uv_addr;
+        u16 buf_width;
+        u16 width;
+        u16 height;
+        enum omap_color_mode color_mode;
+        u8 rotation;
+        enum omap_dss_rotation_type rotation_type;
+        bool mirror;
+        u8 pre_mult_alpha;
+};
+
+struct omapdss_dpi_ops {
+        int (*connect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+        void (*disconnect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+
+        int (*enable)(struct omap_dss_device *dssdev);
+        void (*disable)(struct omap_dss_device *dssdev);
+
+        int (*check_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*set_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*get_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+
+        void (*set_data_lines)(struct omap_dss_device *dssdev, int data_lines);
+};
+
+struct omapdss_sdi_ops {
+        int (*connect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+        void (*disconnect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+
+        int (*enable)(struct omap_dss_device *dssdev);
+        void (*disable)(struct omap_dss_device *dssdev);
+
+        int (*check_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*set_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*get_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+
+        void (*set_datapairs)(struct omap_dss_device *dssdev, int datapairs);
+};
+
+struct omapdss_dvi_ops {
+        int (*connect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+        void (*disconnect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+
+        int (*enable)(struct omap_dss_device *dssdev);
+        void (*disable)(struct omap_dss_device *dssdev);
+
+        int (*check_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*set_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*get_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+};
+
+struct omapdss_atv_ops {
+        int (*connect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+        void (*disconnect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+
+        int (*enable)(struct omap_dss_device *dssdev);
+        void (*disable)(struct omap_dss_device *dssdev);
+
+        int (*check_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*set_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*get_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+
+        void (*set_type)(struct omap_dss_device *dssdev,
+                enum omap_dss_venc_type type);
+        void (*invert_vid_out_polarity)(struct omap_dss_device *dssdev,
+                bool invert_polarity);
+
+        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
+        u32 (*get_wss)(struct omap_dss_device *dssdev);
+};
+
+struct omapdss_hdmi_ops {
+        int (*connect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+        void (*disconnect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+
+        int (*enable)(struct omap_dss_device *dssdev);
+        void (*disable)(struct omap_dss_device *dssdev);
+
+        int (*check_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*set_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*get_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+
+        int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
+        bool (*detect)(struct omap_dss_device *dssdev);
+
+        int (*set_hdmi_mode)(struct omap_dss_device *dssdev, bool hdmi_mode);
+        int (*set_infoframe)(struct omap_dss_device *dssdev,
+                const struct hdmi_avi_infoframe *avi);
+};
+
+struct omapdss_dsi_ops {
+        int (*connect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+        void (*disconnect)(struct omap_dss_device *dssdev,
+                        struct omap_dss_device *dst);
+
+        int (*enable)(struct omap_dss_device *dssdev);
+        void (*disable)(struct omap_dss_device *dssdev, bool disconnect_lanes,
+                        bool enter_ulps);
+
+        /* bus configuration */
+        int (*set_config)(struct omap_dss_device *dssdev,
+                        const struct omap_dss_dsi_config *cfg);
+        int (*configure_pins)(struct omap_dss_device *dssdev,
+                        const struct omap_dsi_pin_config *pin_cfg);
+
+        void (*enable_hs)(struct omap_dss_device *dssdev, int channel,
+                        bool enable);
+        int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
+
+        int (*update)(struct omap_dss_device *dssdev, int channel,
+                        void (*callback)(int, void *), void *data);
+
+        void (*bus_lock)(struct omap_dss_device *dssdev);
+        void (*bus_unlock)(struct omap_dss_device *dssdev);
+
+        int (*enable_video_output)(struct omap_dss_device *dssdev, int channel);
+        void (*disable_video_output)(struct omap_dss_device *dssdev,
+                        int channel);
+
+        int (*request_vc)(struct omap_dss_device *dssdev, int *channel);
+        int (*set_vc_id)(struct omap_dss_device *dssdev, int channel,
+                        int vc_id);
+        void (*release_vc)(struct omap_dss_device *dssdev, int channel);
+
+        /* data transfer */
+        int (*dcs_write)(struct omap_dss_device *dssdev, int channel,
+                        u8 *data, int len);
+        int (*dcs_write_nosync)(struct omap_dss_device *dssdev, int channel,
+                        u8 *data, int len);
+        int (*dcs_read)(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd,
+                        u8 *data, int len);
+
+        int (*gen_write)(struct omap_dss_device *dssdev, int channel,
+                        u8 *data, int len);
+        int (*gen_write_nosync)(struct omap_dss_device *dssdev, int channel,
+                        u8 *data, int len);
+        int (*gen_read)(struct omap_dss_device *dssdev, int channel,
+                        u8 *reqdata, int reqlen,
+                        u8 *data, int len);
+
+        int (*bta_sync)(struct omap_dss_device *dssdev, int channel);
+
+        int (*set_max_rx_packet_size)(struct omap_dss_device *dssdev,
+                        int channel, u16 plen);
+};
+
+struct omap_dss_device {
+        struct kobject kobj;
+        struct device *dev;
+
+        struct module *owner;
+
+        struct list_head panel_list;
+
+        /* alias in the form of "display%d" */
+        char alias[16];
+
+        enum omap_display_type type;
+        enum omap_display_type output_type;
+
+        union {
+                struct {
+                        u8 data_lines;
+                } dpi;
+
+                struct {
+                        u8 channel;
+                        u8 data_lines;
+                } rfbi;
+
+                struct {
+                        u8 datapairs;
+                } sdi;
+
+                struct {
+                        int module;
+                } dsi;
+
+                struct {
+                        enum omap_dss_venc_type type;
+                        bool invert_polarity;
+                } venc;
+        } phy;
+
+        struct {
+                struct omap_video_timings timings;
+
+                enum omap_dss_dsi_pixel_format dsi_pix_fmt;
+                enum omap_dss_dsi_mode dsi_mode;
+        } panel;
+
+        struct {
+                u8 pixel_size;
+                struct rfbi_timings rfbi_timings;
+        } ctrl;
+
+        const char *name;
+
+        /* used to match device to driver */
+        const char *driver_name;
+
+        void *data;
+
+        struct omap_dss_driver *driver;
+
+        union {
+                const struct omapdss_dpi_ops *dpi;
+                const struct omapdss_sdi_ops *sdi;
+                const struct omapdss_dvi_ops *dvi;
+                const struct omapdss_hdmi_ops *hdmi;
+                const struct omapdss_atv_ops *atv;
+                const struct omapdss_dsi_ops *dsi;
+        } ops;
+
+        /* helper variable for driver suspend/resume */
+        bool activate_after_resume;
+
+        enum omap_display_caps caps;
+
+        struct omap_dss_device *src;
+
+        enum omap_dss_display_state state;
+
+        /* OMAP DSS output specific fields */
+
+        struct list_head list;
+
+        /* DISPC channel for this output */
+        enum omap_channel dispc_channel;
+        bool dispc_channel_connected;
+
+        /* output instance */
+        enum omap_dss_output_id id;
+
+        /* the port number in the DT node */
+        int port_num;
+
+        /* dynamic fields */
+        struct omap_overlay_manager *manager;
+
+        struct omap_dss_device *dst;
+};
+
+struct omap_dss_driver {
+        int (*probe)(struct omap_dss_device *);
+        void (*remove)(struct omap_dss_device *);
+
+        int (*connect)(struct omap_dss_device *dssdev);
+        void (*disconnect)(struct omap_dss_device *dssdev);
+
+        int (*enable)(struct omap_dss_device *display);
+        void (*disable)(struct omap_dss_device *display);
+        int (*run_test)(struct omap_dss_device *display, int test);
+
+        int (*update)(struct omap_dss_device *dssdev,
+                               u16 x, u16 y, u16 w, u16 h);
+        int (*sync)(struct omap_dss_device *dssdev);
+
+        int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
+        int (*get_te)(struct omap_dss_device *dssdev);
+
+        u8 (*get_rotate)(struct omap_dss_device *dssdev);
+        int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
+
+        bool (*get_mirror)(struct omap_dss_device *dssdev);
+        int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);
+
+        int (*memory_read)(struct omap_dss_device *dssdev,
+                        void *buf, size_t size,
+                        u16 x, u16 y, u16 w, u16 h);
+
+        void (*get_resolution)(struct omap_dss_device *dssdev,
+                        u16 *xres, u16 *yres);
+        void (*get_dimensions)(struct omap_dss_device *dssdev,
+                        u32 *width, u32 *height);
+        int (*get_recommended_bpp)(struct omap_dss_device *dssdev);
+
+        int (*check_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*set_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+        void (*get_timings)(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings);
+
+        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
+        u32 (*get_wss)(struct omap_dss_device *dssdev);
+
+        int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
+        bool (*detect)(struct omap_dss_device *dssdev);
+
+        int (*set_hdmi_mode)(struct omap_dss_device *dssdev, bool hdmi_mode);
+        int (*set_hdmi_infoframe)(struct omap_dss_device *dssdev,
+                const struct hdmi_avi_infoframe *avi);
+};
+
+enum omapdss_version omapdss_get_version(void);
+bool omapdss_is_initialized(void);
+
+int omap_dss_register_driver(struct omap_dss_driver *);
+void omap_dss_unregister_driver(struct omap_dss_driver *);
+
+int omapdss_register_display(struct omap_dss_device *dssdev);
+void omapdss_unregister_display(struct omap_dss_device *dssdev);
+
+struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev);
+void omap_dss_put_device(struct omap_dss_device *dssdev);
+#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)
+struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
+struct omap_dss_device *omap_dss_find_device(void *data,
+                int (*match)(struct omap_dss_device *dssdev, void *data));
+const char *omapdss_get_default_display_name(void);
+
+void videomode_to_omap_video_timings(const struct videomode *vm,
+                struct omap_video_timings *ovt);
+void omap_video_timings_to_videomode(const struct omap_video_timings *ovt,
+                struct videomode *vm);
+
+int dss_feat_get_num_mgrs(void);
+int dss_feat_get_num_ovls(void);
+enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane);
+
+
+
+int omap_dss_get_num_overlay_managers(void);
+struct omap_overlay_manager *omap_dss_get_overlay_manager(int num);
+
+int omap_dss_get_num_overlays(void);
+struct omap_overlay *omap_dss_get_overlay(int num);
+
+int omapdss_register_output(struct omap_dss_device *output);
+void omapdss_unregister_output(struct omap_dss_device *output);
+struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id);
+struct omap_dss_device *omap_dss_find_output(const char *name);
+struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node *port);
+int omapdss_output_set_device(struct omap_dss_device *out,
+                struct omap_dss_device *dssdev);
+int omapdss_output_unset_device(struct omap_dss_device *out);
+
+struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev);
+struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev);
+
+void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
+                u16 *xres, u16 *yres);
+int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);
+void omapdss_default_get_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings);
+
+typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
+int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
+int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
+
+int omapdss_compat_init(void);
+void omapdss_compat_uninit(void);
+
+static inline bool omapdss_device_is_connected(struct omap_dss_device *dssdev)
+{
+        return dssdev->src;
+}
+
+static inline bool omapdss_device_is_enabled(struct omap_dss_device *dssdev)
+{
+        return dssdev->state == OMAP_DSS_DISPLAY_ACTIVE;
+}
+
+struct device_node *
+omapdss_of_get_next_port(const struct device_node *parent,
+                         struct device_node *prev);
+
+struct device_node *
+omapdss_of_get_next_endpoint(const struct device_node *parent,
+                             struct device_node *prev);
+
+struct device_node *
+omapdss_of_get_first_endpoint(const struct device_node *parent);
+
+struct omap_dss_device *
+omapdss_of_find_source_for_first_ep(struct device_node *node);
 
 u32 dispc_read_irqstatus(void);
 void dispc_clear_irqstatus(u32 mask);
@@ -44,6 +909,10 @@ void dispc_mgr_set_timings(enum omap_channel channel,
                 const struct omap_video_timings *timings);
 void dispc_mgr_setup(enum omap_channel channel,
                 const struct omap_overlay_manager_info *info);
+u32 dispc_mgr_gamma_size(enum omap_channel channel);
+void dispc_mgr_set_gamma(enum omap_channel channel,
+                         const struct drm_color_lut *lut,
+                         unsigned int length);
 
 int dispc_ovl_enable(enum omap_plane plane, bool enable);
 bool dispc_ovl_enabled(enum omap_plane plane);
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 829232ad8c81..24f859488201 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -21,8 +21,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 
 static LIST_HEAD(output_list);
diff --git a/drivers/gpu/drm/omapdrm/dss/pll.c b/drivers/gpu/drm/omapdrm/dss/pll.c
index f974ddcd3b6e..0a76c89cdc2e 100644
--- a/drivers/gpu/drm/omapdrm/dss/pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/pll.c
@@ -22,8 +22,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/sched.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 
 #define PLL_CONTROL                     0x0000
@@ -76,6 +75,59 @@ struct dss_pll *dss_pll_find(const char *name)
         return NULL;
 }
 
+struct dss_pll *dss_pll_find_by_src(enum dss_clk_source src)
+{
+        struct dss_pll *pll;
+
+        switch (src) {
+        default:
+        case DSS_CLK_SRC_FCK:
+                return NULL;
+
+        case DSS_CLK_SRC_HDMI_PLL:
+                return dss_pll_find("hdmi");
+
+        case DSS_CLK_SRC_PLL1_1:
+        case DSS_CLK_SRC_PLL1_2:
+        case DSS_CLK_SRC_PLL1_3:
+                pll = dss_pll_find("dsi0");
+                if (!pll)
+                        pll = dss_pll_find("video0");
+                return pll;
+
+        case DSS_CLK_SRC_PLL2_1:
+        case DSS_CLK_SRC_PLL2_2:
+        case DSS_CLK_SRC_PLL2_3:
+                pll = dss_pll_find("dsi1");
+                if (!pll)
+                        pll = dss_pll_find("video1");
+                return pll;
+        }
+}
+
+unsigned dss_pll_get_clkout_idx_for_src(enum dss_clk_source src)
+{
+        switch (src) {
+        case DSS_CLK_SRC_HDMI_PLL:
+                return 0;
+
+        case DSS_CLK_SRC_PLL1_1:
+        case DSS_CLK_SRC_PLL2_1:
+                return 0;
+
+        case DSS_CLK_SRC_PLL1_2:
+        case DSS_CLK_SRC_PLL2_2:
+                return 1;
+
+        case DSS_CLK_SRC_PLL1_3:
+        case DSS_CLK_SRC_PLL2_3:
+                return 2;
+
+        default:
+                return 0;
+        }
+}
+
 int dss_pll_enable(struct dss_pll *pll)
 {
         int r;
@@ -129,7 +181,7 @@ int dss_pll_set_config(struct dss_pll *pll, const struct dss_pll_clock_info *cin
         return 0;
 }
 
-bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco,
+bool dss_pll_hsdiv_calc_a(const struct dss_pll *pll, unsigned long clkdco,
                 unsigned long out_min, unsigned long out_max,
                 dss_hsdiv_calc_func func, void *data)
 {
@@ -154,7 +206,11 @@ bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco,
         return false;
 }
 
-bool dss_pll_calc(const struct dss_pll *pll, unsigned long clkin,
+/*
+ * clkdco = clkin / n * m * 2
+ * clkoutX = clkdco / mX
+ */
+bool dss_pll_calc_a(const struct dss_pll *pll, unsigned long clkin,
                 unsigned long pll_min, unsigned long pll_max,
                 dss_pll_calc_func func, void *data)
 {
@@ -195,6 +251,71 @@ bool dss_pll_calc(const struct dss_pll *pll, unsigned long clkin,
         return false;
 }
 
+/*
+ * This calculates a PLL config that will provide the target_clkout rate
+ * for clkout. Additionally clkdco rate will be the same as clkout rate
+ * when clkout rate is >= min_clkdco.
+ *
+ * clkdco = clkin / n * m + clkin / n * mf / 262144
+ * clkout = clkdco / m2
+ */
+bool dss_pll_calc_b(const struct dss_pll *pll, unsigned long clkin,
+        unsigned long target_clkout, struct dss_pll_clock_info *cinfo)
+{
+        unsigned long fint, clkdco, clkout;
+        unsigned long target_clkdco;
+        unsigned long min_dco;
+        unsigned n, m, mf, m2, sd;
+        const struct dss_pll_hw *hw = pll->hw;
+
+        DSSDBG("clkin %lu, target clkout %lu\n", clkin, target_clkout);
+
+        /* Fint */
+        n = DIV_ROUND_UP(clkin, hw->fint_max);
+        fint = clkin / n;
+
+        /* adjust m2 so that the clkdco will be high enough */
+        min_dco = roundup(hw->clkdco_min, fint);
+        m2 = DIV_ROUND_UP(min_dco, target_clkout);
+        if (m2 == 0)
+                m2 = 1;
+
+        target_clkdco = target_clkout * m2;
+        m = target_clkdco / fint;
+
+        clkdco = fint * m;
+
+        /* adjust clkdco with fractional mf */
+        if (WARN_ON(target_clkdco - clkdco > fint))
+                mf = 0;
+        else
+                mf = (u32)div_u64(262144ull * (target_clkdco - clkdco), fint);
+
+        if (mf > 0)
+                clkdco += (u32)div_u64((u64)mf * fint, 262144);
+
+        clkout = clkdco / m2;
+
+        /* sigma-delta */
+        sd = DIV_ROUND_UP(fint * m, 250000000);
+
+        DSSDBG("N = %u, M = %u, M.f = %u, M2 = %u, SD = %u\n",
+                n, m, mf, m2, sd);
+        DSSDBG("Fint %lu, clkdco %lu, clkout %lu\n", fint, clkdco, clkout);
+
+        cinfo->n = n;
+        cinfo->m = m;
+        cinfo->mf = mf;
+        cinfo->mX[0] = m2;
+        cinfo->sd = sd;
+
+        cinfo->fint = fint;
+        cinfo->clkdco = clkdco;
+        cinfo->clkout[0] = clkout;
+
+        return true;
+}
+
 static int wait_for_bit_change(void __iomem *reg, int bitnum, int value)
 {
         unsigned long timeout;
diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
index 3796576dfadf..cd53566d75eb 100644
--- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
+++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
@@ -38,7 +38,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include "omapdss.h"
 #include "dss.h"
 
 struct rfbi_reg { u16 idx; };
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index cd6d3bfb041d..0a96c321ce62 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -29,7 +29,7 @@
 #include <linux/of.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include "omapdss.h"
 #include "dss.h"
 
 static struct {
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 08a2cc778ba9..6eedf2118708 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -37,8 +37,7 @@
 #include <linux/of.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
diff --git a/drivers/gpu/drm/omapdrm/dss/video-pll.c b/drivers/gpu/drm/omapdrm/dss/video-pll.c
index b1ec59e42940..7429de928d4e 100644
--- a/drivers/gpu/drm/omapdrm/dss/video-pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/video-pll.c
@@ -17,8 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 
-#include <video/omapdss.h>
-
+#include "omapdss.h"
 #include "dss.h"
 #include "dss_features.h"
 
@@ -108,6 +107,8 @@ static const struct dss_pll_ops dss_pll_ops = {
 };
 
 static const struct dss_pll_hw dss_dra7_video_pll_hw = {
+        .type = DSS_PLL_TYPE_A,
+
         .n_max = (1 << 8) - 1,
         .m_max = (1 << 12) - 1,
         .mX_max = (1 << 5) - 1,
@@ -124,6 +125,10 @@ static const struct dss_pll_hw dss_dra7_video_pll_hw = {
         .mX_lsb[0] = 21,
         .mX_msb[1] = 30,
         .mX_lsb[1] = 26,
+        .mX_msb[2] = 4,
+        .mX_lsb[2] = 0,
+        .mX_msb[3] = 9,
+        .mX_lsb[3] = 5,
 
         .has_refsel = true,
 };
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index ce2d67b6a8c7..137fe690a0da 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -32,7 +32,6 @@
 struct omap_connector {
         struct drm_connector base;
         struct omap_dss_device *dssdev;
-        struct drm_encoder *encoder;
         bool hdmi_mode;
 };
 
@@ -256,13 +255,6 @@ static int omap_connector_mode_valid(struct drm_connector *connector,
         return ret;
 }
 
-struct drm_encoder *omap_connector_attached_encoder(
-                struct drm_connector *connector)
-{
-        struct omap_connector *omap_connector = to_omap_connector(connector);
-        return omap_connector->encoder;
-}
-
 static const struct drm_connector_funcs omap_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .reset = drm_atomic_helper_connector_reset,
@@ -276,7 +268,6 @@ static const struct drm_connector_funcs omap_connector_funcs = {
 static const struct drm_connector_helper_funcs omap_connector_helper_funcs = {
         .get_modes = omap_connector_get_modes,
         .mode_valid = omap_connector_mode_valid,
-        .best_encoder = omap_connector_attached_encoder,
 };
 
 /* initialize connector */
@@ -296,7 +287,6 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
                 goto fail;
 
         omap_connector->dssdev = dssdev;
-        omap_connector->encoder = encoder;
 
         connector = &omap_connector->base;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 075f2bb44867..180f644e861e 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -372,6 +372,20 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
         copy_timings_drm_to_omap(&omap_crtc->timings, mode);
 }
 
+static int omap_crtc_atomic_check(struct drm_crtc *crtc,
+                                struct drm_crtc_state *state)
+{
+        if (state->color_mgmt_changed && state->gamma_lut) {
+                uint length = state->gamma_lut->length /
+                        sizeof(struct drm_color_lut);
+
+                if (length < 2)
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
 static void omap_crtc_atomic_begin(struct drm_crtc *crtc,
                                   struct drm_crtc_state *old_crtc_state)
 {
@@ -384,6 +398,32 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
 
         WARN_ON(omap_crtc->vblank_irq.registered);
 
+        if (crtc->state->color_mgmt_changed) {
+                struct drm_color_lut *lut = NULL;
+                uint length = 0;
+
+                if (crtc->state->gamma_lut) {
+                        lut = (struct drm_color_lut *)
+                                crtc->state->gamma_lut->data;
+                        length = crtc->state->gamma_lut->length /
+                                sizeof(*lut);
+                }
+                dispc_mgr_set_gamma(omap_crtc->channel, lut, length);
+        }
+
+        if (crtc->state->color_mgmt_changed) {
+                struct drm_color_lut *lut = NULL;
+                uint length = 0;
+
+                if (crtc->state->gamma_lut) {
+                        lut = (struct drm_color_lut *)
+                                crtc->state->gamma_lut->data;
+                        length = crtc->state->gamma_lut->length /
+                                sizeof(*lut);
+                }
+                dispc_mgr_set_gamma(omap_crtc->channel, lut, length);
+        }
+
         if (dispc_mgr_is_enabled(omap_crtc->channel)) {
 
                 DBG("%s: GO", omap_crtc->name);
@@ -460,6 +500,7 @@ static const struct drm_crtc_funcs omap_crtc_funcs = {
         .set_config = drm_atomic_helper_set_config,
         .destroy = omap_crtc_destroy,
         .page_flip = drm_atomic_helper_page_flip,
+        .gamma_set = drm_atomic_helper_legacy_gamma_set,
         .set_property = drm_atomic_helper_crtc_set_property,
         .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
@@ -471,6 +512,7 @@ static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = {
         .mode_set_nofb = omap_crtc_mode_set_nofb,
         .disable = omap_crtc_disable,
         .enable = omap_crtc_enable,
+        .atomic_check = omap_crtc_atomic_check,
         .atomic_begin = omap_crtc_atomic_begin,
         .atomic_flush = omap_crtc_atomic_flush,
 };
@@ -534,6 +576,20 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
 
         drm_crtc_helper_add(crtc, &omap_crtc_helper_funcs);
 
+        /* The dispc API adapts to what ever size, but the HW supports
+         * 256 element gamma table for LCDs and 1024 element table for
+         * OMAP_DSS_CHANNEL_DIGIT. X server assumes 256 element gamma
+         * tables so lets use that. Size of HW gamma table can be
+         * extracted with dispc_mgr_gamma_size(). If it returns 0
+         * gamma table is not supprted.
+         */
+        if (dispc_mgr_gamma_size(channel)) {
+                uint gamma_lut_size = 256;
+
+                drm_crtc_enable_color_mgmt(crtc, 0, false, gamma_lut_size);
+                drm_mode_crtc_set_gamma_size(crtc, gamma_lut_size);
+        }
+
         omap_plane_install_properties(crtc->primary, &crtc->base);
 
         omap_crtcs[channel] = omap_crtc;
diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c
index 6f5fc14fc015..479bf24050f8 100644
--- a/drivers/gpu/drm/omapdrm/omap_debugfs.c
+++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c
@@ -17,6 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/seq_file.h>
+
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
 
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index de275a5be1db..4ceed7a9762f 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h> /* platform_device() */
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index d86f5479345b..26c6134eb744 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -142,8 +142,9 @@ static int omap_atomic_commit(struct drm_device *dev,
 {
         struct omap_drm_private *priv = dev->dev_private;
         struct omap_atomic_state_commit *commit;
-        unsigned int i;
-        int ret;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        int i, ret;
 
         ret = drm_atomic_helper_prepare_planes(dev, state);
         if (ret)
@@ -163,10 +164,8 @@ static int omap_atomic_commit(struct drm_device *dev,
         /* Wait until all affected CRTCs have completed previous commits and
          * mark them as pending.
          */
-        for (i = 0; i < dev->mode_config.num_crtc; ++i) {
-                if (state->crtcs[i])
-                        commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]);
-        }
+        for_each_crtc_in_state(state, crtc, crtc_state, i)
+                commit->crtcs |= drm_crtc_mask(crtc);
 
         wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit));
 
@@ -175,7 +174,7 @@ static int omap_atomic_commit(struct drm_device *dev,
         spin_unlock(&priv->commit.lock);
 
         /* Swap the state, this is the point of no return. */
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (nonblock)
                 schedule_work(&commit->work);
@@ -203,6 +202,8 @@ static int get_connector_type(struct omap_dss_device *dssdev)
                 return DRM_MODE_CONNECTOR_HDMIA;
         case OMAP_DISPLAY_TYPE_DVI:
                 return DRM_MODE_CONNECTOR_DVID;
+        case OMAP_DISPLAY_TYPE_DSI:
+                return DRM_MODE_CONNECTOR_DSI;
         default:
                 return DRM_MODE_CONNECTOR_Unknown;
         }
@@ -800,7 +801,6 @@ static struct drm_driver omap_drm_driver = {
         .unload = dev_unload,
         .open = dev_open,
         .lastclose = dev_lastclose,
-        .set_busid = drm_platform_set_busid,
         .get_vblank_counter = drm_vblank_no_hw_counter,
         .enable_vblank = omap_irq_enable_vblank,
         .disable_vblank = omap_irq_disable_vblank,
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 3f823c368912..dcc30a98b9d4 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -24,7 +24,6 @@
 #include <linux/platform_data/omap_drm.h>
 #include <linux/types.h>
 #include <linux/wait.h>
-#include <video/omapdss.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
@@ -183,7 +182,6 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
                 struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd);
 struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
                 const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
-struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p);
 int omap_framebuffer_pin(struct drm_framebuffer *fb);
 void omap_framebuffer_unpin(struct drm_framebuffer *fb);
 void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
@@ -231,7 +229,6 @@ int omap_gem_rotated_paddr(struct drm_gem_object *obj, uint32_t orient,
                 int x, int y, dma_addr_t *paddr);
 uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj);
 size_t omap_gem_mmap_size(struct drm_gem_object *obj);
-int omap_gem_tiled_size(struct drm_gem_object *obj, uint16_t *w, uint16_t *h);
 int omap_gem_tiled_stride(struct drm_gem_object *obj, uint32_t orient);
 
 struct dma_buf *omap_gem_prime_export(struct drm_device *dev,
@@ -239,17 +236,6 @@ struct dma_buf *omap_gem_prime_export(struct drm_device *dev,
 struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
                 struct dma_buf *buffer);
 
-static inline int align_pitch(int pitch, int width, int bpp)
-{
-        int bytespp = (bpp + 7) / 8;
-        /* in case someone tries to feed us a completely bogus stride: */
-        pitch = max(pitch, width * bytespp);
-        /* PVR needs alignment to 8 pixels.. right now that is the most
-         * restrictive stride requirement..
-         */
-        return roundup(pitch, 8 * bytespp);
-}
-
 /* map crtc to vblank mask */
 uint32_t pipe2vbl(struct drm_crtc *crtc);
 struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *encoder);
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 94ec06d3d737..983c8cf2441c 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -17,6 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/seq_file.h>
+
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 
@@ -120,17 +122,9 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
         kfree(omap_fb);
 }
 
-static int omap_framebuffer_dirty(struct drm_framebuffer *fb,
-                struct drm_file *file_priv, unsigned flags, unsigned color,
-                struct drm_clip_rect *clips, unsigned num_clips)
-{
-        return 0;
-}
-
 static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {
         .create_handle = omap_framebuffer_create_handle,
         .destroy = omap_framebuffer_destroy,
-        .dirty = omap_framebuffer_dirty,
 };
 
 static uint32_t get_linear_addr(struct plane *plane,
@@ -318,14 +312,6 @@ void omap_framebuffer_unpin(struct drm_framebuffer *fb)
         mutex_unlock(&omap_fb->lock);
 }
 
-struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p)
-{
-        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
-        if (p >= drm_format_num_planes(fb->pixel_format))
-                return NULL;
-        return omap_fb->planes[p].bo;
-}
-
 /* iterate thru all the connectors, returning ones that are attached
  * to the same fb..
  */
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 89da41ac64d2..adb10fbe918d 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -125,9 +125,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
         mode_cmd.width = sizes->surface_width;
         mode_cmd.height = sizes->surface_height;
 
-        mode_cmd.pitches[0] = align_pitch(
-                        mode_cmd.width * ((sizes->surface_bpp + 7) / 8),
-                        mode_cmd.width, sizes->surface_bpp);
+        mode_cmd.pitches[0] =
+                        DIV_ROUND_UP(mode_cmd.width * sizes->surface_bpp, 8);
 
         fbdev->ywrap_enabled = priv->has_dmm && ywrap_enabled;
         if (fbdev->ywrap_enabled) {
@@ -280,9 +279,6 @@ struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev)
         if (ret)
                 goto fini;
 
-        /* disable all the possible outputs/crtcs before entering KMS mode */
-        drm_helper_disable_unused_functions(dev);
-
         ret = drm_fb_helper_initial_config(helper, 32);
         if (ret)
                 goto fini;
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index b97afc281778..9b3f565fd8d7 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -17,6 +17,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/seq_file.h>
 #include <linux/shmem_fs.h>
 #include <linux/spinlock.h>
 #include <linux/pfn_t.h>
@@ -382,18 +383,6 @@ size_t omap_gem_mmap_size(struct drm_gem_object *obj)
         return size;
 }
 
-/* get tiled size, returns -EINVAL if not tiled buffer */
-int omap_gem_tiled_size(struct drm_gem_object *obj, uint16_t *w, uint16_t *h)
-{
-        struct omap_gem_object *omap_obj = to_omap_bo(obj);
-        if (omap_obj->flags & OMAP_BO_TILED) {
-                *w = omap_obj->width;
-                *h = omap_obj->height;
-                return 0;
-        }
-        return -EINVAL;
-}
-
 /* -----------------------------------------------------------------------------
  * Fault Handling
  */
@@ -660,7 +649,8 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 {
         union omap_gem_size gsize;
 
-        args->pitch = align_pitch(0, args->width, args->bpp);
+        args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
+
         args->size = PAGE_ALIGN(args->pitch * args->height);
 
         gsize = (union omap_gem_size){
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 8b5d54385892..ad429683fef7 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -221,7 +221,6 @@ static int qxl_crtc_page_flip(struct drm_crtc *crtc,
 {
         struct drm_device *dev = crtc->dev;
         struct qxl_device *qdev = dev->dev_private;
-        struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
         struct qxl_framebuffer *qfb_src = to_qxl_framebuffer(fb);
         struct qxl_framebuffer *qfb_old = to_qxl_framebuffer(crtc->primary->fb);
         struct qxl_bo *bo_old = gem_to_qxl_bo(qfb_old->obj);
@@ -252,14 +251,14 @@ static int qxl_crtc_page_flip(struct drm_crtc *crtc,
         qxl_draw_dirty_fb(qdev, qfb_src, bo, 0, 0,
                           &norect, one_clip_rect, inc);
 
-        drm_vblank_get(dev, qcrtc->index);
+        drm_crtc_vblank_get(crtc);
 
         if (event) {
                 spin_lock_irqsave(&dev->event_lock, flags);
-                drm_send_vblank_event(dev, qcrtc->index, event);
+                drm_crtc_send_vblank_event(crtc, event);
                 spin_unlock_irqrestore(&dev->event_lock, flags);
         }
-        drm_vblank_put(dev, qcrtc->index);
+        drm_crtc_vblank_put(crtc);
 
         ret = qxl_bo_reserve(bo, false);
         if (!ret) {
@@ -730,7 +729,6 @@ static int qdev_crtc_init(struct drm_device *dev, int crtc_id)
 
         drm_crtc_init(dev, &qxl_crtc->base, &qxl_crtc_funcs);
         qxl_crtc->index = crtc_id;
-        drm_mode_crtc_set_gamma_size(&qxl_crtc->base, 256);
         drm_crtc_helper_add(&qxl_crtc->base, &qxl_crtc_helper_funcs);
         return 0;
 }
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index dc9df5fe50ba..460bbceae297 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -256,7 +256,7 @@ static struct drm_driver qxl_driver = {
         .gem_prime_vmap = qxl_gem_prime_vmap,
         .gem_prime_vunmap = qxl_gem_prime_vunmap,
         .gem_prime_mmap = qxl_gem_prime_mmap,
-        .gem_free_object = qxl_gem_object_free,
+        .gem_free_object_unlocked = qxl_gem_object_free,
         .gem_open_object = qxl_gem_object_open,
         .gem_close_object = qxl_gem_object_close,
         .fops = &qxl_fops,
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 5ea57f6320b8..df2657051afd 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -131,10 +131,6 @@ static int qxlfb_create_pinned_object(struct qxl_fbdev *qfbdev,
         int ret;
         int aligned_size, size;
         int height = mode_cmd->height;
-        int bpp;
-        int depth;
-
-        drm_fb_get_bpp_depth(mode_cmd->pixel_format, &bpp, &depth);
 
         size = mode_cmd->pitches[0] * height;
         aligned_size = ALIGN(size, PAGE_SIZE);
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index 4efa8e261baf..f599cd073b72 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -96,7 +96,7 @@ retry:
                         return 0;
 
                 if (have_drawable_releases && sc > 300) {
-                        FENCE_WARN(fence, "failed to wait on release %d "
+                        FENCE_WARN(fence, "failed to wait on release %llu "
                                           "after spincount %d\n",
                                           fence->context & ~0xf0000000, sc);
                         goto signaled;
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 2e216e2ea78c..a97abc8af657 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -276,14 +276,14 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
                         atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);
                 atombios_blank_crtc(crtc, ATOM_DISABLE);
                 if (dev->num_crtcs > radeon_crtc->crtc_id)
-                        drm_vblank_on(dev, radeon_crtc->crtc_id);
+                        drm_crtc_vblank_on(crtc);
                 radeon_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
                 if (dev->num_crtcs > radeon_crtc->crtc_id)
-                        drm_vblank_off(dev, radeon_crtc->crtc_id);
+                        drm_crtc_vblank_off(crtc);
                 if (radeon_crtc->enabled)
                         atombios_blank_crtc(crtc, ATOM_ENABLE);
                 if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))
@@ -589,7 +589,8 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                 if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev) || ASIC_IS_DCE8(rdev))
                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
                 /* use frac fb div on RS780/RS880 */
-                if ((rdev->family == CHIP_RS780) || (rdev->family == CHIP_RS880))
+                if (((rdev->family == CHIP_RS780) || (rdev->family == CHIP_RS880))
+                    && !radeon_crtc->ss_enabled)
                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
                 if (ASIC_IS_DCE32(rdev) && mode->clock > 165000)
                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
@@ -626,7 +627,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                         if (radeon_crtc->ss.refdiv) {
                                 radeon_crtc->pll_flags |= RADEON_PLL_USE_REF_DIV;
                                 radeon_crtc->pll_reference_div = radeon_crtc->ss.refdiv;
-                                if (ASIC_IS_AVIVO(rdev))
+                                if (rdev->family >= CHIP_RV770)
                                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
                         }
                 }
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 80b24a495d6c..5633ee3eb46e 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -2386,7 +2386,7 @@ struct radeon_device {
         struct radeon_mman              mman;
         struct radeon_fence_driver      fence_drv[RADEON_NUM_RINGS];
         wait_queue_head_t               fence_queue;
-        unsigned                        fence_context;
+        u64                             fence_context;
         struct mutex                    ring_lock;
         struct radeon_ring              ring[RADEON_NUM_RINGS];
         bool                            ib_pool_ready;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index e721e6b2766e..21c44b2293bc 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -630,6 +630,23 @@ void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
 /*
  * GPU helpers function.
  */
+
+/**
+ * radeon_device_is_virtual - check if we are running is a virtual environment
+ *
+ * Check if the asic has been passed through to a VM (all asics).
+ * Used at driver startup.
+ * Returns true if virtual or false if not.
+ */
+static bool radeon_device_is_virtual(void)
+{
+#ifdef CONFIG_X86
+        return boot_cpu_has(X86_FEATURE_HYPERVISOR);
+#else
+        return false;
+#endif
+}
+
 /**
  * radeon_card_posted - check if the hw has already been initialized
  *
@@ -643,6 +660,10 @@ bool radeon_card_posted(struct radeon_device *rdev)
 {
         uint32_t reg;
 
+        /* for pass through, always force asic_init */
+        if (radeon_device_is_virtual())
+                return false;
+
         /* required for EFI mode on macbook2,1 which uses an r5xx asic */
         if (efi_enabled(EFI_BOOT) &&
             (rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) &&
@@ -1631,7 +1652,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,
         radeon_agp_suspend(rdev);
 
         pci_save_state(dev->pdev);
-        if (freeze && rdev->family >= CHIP_R600) {
+        if (freeze && rdev->family >= CHIP_CEDAR) {
                 rdev->asic->asic_reset(rdev, true);
                 pci_restore_state(dev->pdev);
         } else if (suspend) {
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 6a41b4982647..3965d1916b9c 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -231,19 +231,21 @@ void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
         *blue = radeon_crtc->lut_b[regno] << 6;
 }
 
-static void radeon_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                  u16 *blue, uint32_t start, uint32_t size)
+static int radeon_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                                 u16 *blue, uint32_t size)
 {
         struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-        int end = (start + size > 256) ? 256 : start + size, i;
+        int i;
 
         /* userspace palettes are always correct as is */
-        for (i = start; i < end; i++) {
+        for (i = 0; i < size; i++) {
                 radeon_crtc->lut_r[i] = red[i] >> 6;
                 radeon_crtc->lut_g[i] = green[i] >> 6;
                 radeon_crtc->lut_b[i] = blue[i] >> 6;
         }
         radeon_crtc_load_lut(crtc);
+
+        return 0;
 }
 
 static void radeon_crtc_destroy(struct drm_crtc *crtc)
@@ -381,7 +383,7 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
 
         spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
 
-        drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id);
+        drm_crtc_vblank_put(&radeon_crtc->base);
         radeon_irq_kms_pflip_irq_put(rdev, work->crtc_id);
         queue_work(radeon_crtc->flip_queue, &work->unpin_work);
 }
@@ -598,7 +600,7 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
         }
         work->base = base;
 
-        r = drm_vblank_get(crtc->dev, radeon_crtc->crtc_id);
+        r = drm_crtc_vblank_get(crtc);
         if (r) {
                 DRM_ERROR("failed to get vblank before flip\n");
                 goto pflip_cleanup;
@@ -625,7 +627,7 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
         return 0;
 
 vblank_cleanup:
-        drm_vblank_put(crtc->dev, radeon_crtc->crtc_id);
+        drm_crtc_vblank_put(crtc);
 
 pflip_cleanup:
         if (unlikely(radeon_bo_reserve(new_rbo, false) != 0)) {
@@ -688,6 +690,7 @@ radeon_crtc_set_config(struct drm_mode_set *set)
         pm_runtime_put_autosuspend(dev->dev);
         return ret;
 }
+
 static const struct drm_crtc_funcs radeon_crtc_funcs = {
         .cursor_set2 = radeon_crtc_cursor_set2,
         .cursor_move = radeon_crtc_cursor_move,
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index b55aa740171f..a455dc7d4aa1 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -34,11 +34,9 @@
 #include "radeon_drv.h"
 
 #include <drm/drm_pciids.h>
-#include <linux/apple-gmux.h>
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
-#include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 #include <drm/drm_gem.h>
 
@@ -340,13 +338,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
         if (ret == -EPROBE_DEFER)
                 return ret;
 
-        /*
-         * apple-gmux is needed on dual GPU MacBook Pro
-         * to probe the panel if we're the inactive GPU.
-         */
-        if (IS_ENABLED(CONFIG_VGA_ARB) && IS_ENABLED(CONFIG_VGA_SWITCHEROO) &&
-            apple_gmux_present() && pdev != vga_default_device() &&
-            !vga_switcheroo_handler_flags())
+        if (vga_switcheroo_client_probe_defer(pdev))
                 return -EPROBE_DEFER;
 
         /* Get rid of things like offb */
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 478d4099b0d0..d0de4022fff9 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -332,14 +332,14 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)
                         WREG32_P(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl, ~(mask | crtc_ext_cntl));
                 }
                 if (dev->num_crtcs > radeon_crtc->crtc_id)
-                        drm_vblank_on(dev, radeon_crtc->crtc_id);
+                        drm_crtc_vblank_on(crtc);
                 radeon_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
                 if (dev->num_crtcs > radeon_crtc->crtc_id)
-                        drm_vblank_off(dev, radeon_crtc->crtc_id);
+                        drm_crtc_vblank_off(crtc);
                 if (radeon_crtc->crtc_id)
                         WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask));
                 else {
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 38226d925a5b..4b6542538ff9 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -246,6 +246,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
 
 static void radeon_pm_set_clocks(struct radeon_device *rdev)
 {
+        struct drm_crtc *crtc;
         int i, r;
 
         /* no need to take locks, etc. if nothing's going to change */
@@ -274,26 +275,30 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
         radeon_unmap_vram_bos(rdev);
 
         if (rdev->irq.installed) {
-                for (i = 0; i < rdev->num_crtc; i++) {
+                i = 0;
+                drm_for_each_crtc(crtc, rdev->ddev) {
                         if (rdev->pm.active_crtcs & (1 << i)) {
                                 /* This can fail if a modeset is in progress */
-                                if (drm_vblank_get(rdev->ddev, i) == 0)
+                                if (drm_crtc_vblank_get(crtc) == 0)
                                         rdev->pm.req_vblank |= (1 << i);
                                 else
                                         DRM_DEBUG_DRIVER("crtc %d no vblank, can glitch\n",
                                                          i);
                         }
+                        i++;
                 }
         }
 
         radeon_set_power_state(rdev);
 
         if (rdev->irq.installed) {
-                for (i = 0; i < rdev->num_crtc; i++) {
+                i = 0;
+                drm_for_each_crtc(crtc, rdev->ddev) {
                         if (rdev->pm.req_vblank & (1 << i)) {
                                 rdev->pm.req_vblank &= ~(1 << i);
-                                drm_vblank_put(rdev->ddev, i);
+                                drm_crtc_vblank_put(crtc);
                         }
+                        i++;
                 }
         }
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index fb9242d27883..899ef7a2a7b4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -217,7 +217,7 @@ static struct drm_driver rcar_du_driver = {
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = rcar_du_enable_vblank,
         .disable_vblank         = rcar_du_disable_vblank,
-        .gem_free_object        = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
@@ -278,7 +278,6 @@ static int rcar_du_remove(struct platform_device *pdev)
         struct rcar_du_device *rcdu = platform_get_drvdata(pdev);
         struct drm_device *ddev = rcdu->ddev;
 
-        drm_connector_unregister_all(ddev);
         drm_dev_unregister(ddev);
 
         if (rcdu->fbdev)
@@ -320,8 +319,6 @@ static int rcar_du_probe(struct platform_device *pdev)
         if (!ddev)
                 return -ENOMEM;
 
-        drm_dev_set_unique(ddev, dev_name(&pdev->dev));
-
         rcdu->ddev = ddev;
         ddev->dev_private = rcdu;
 
@@ -339,15 +336,15 @@ static int rcar_du_probe(struct platform_device *pdev)
          * disabled for all CRTCs.
          */
         ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to initialize vblank\n");
+        if (ret < 0)
                 goto error;
-        }
 
         /* DRM/KMS objects */
         ret = rcar_du_modeset_init(rcdu);
         if (ret < 0) {
-                dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret);
+                if (ret != -EPROBE_DEFER)
+                        dev_err(&pdev->dev,
+                                "failed to initialize DRM/KMS (%d)\n", ret);
                 goto error;
         }
 
@@ -360,10 +357,6 @@ static int rcar_du_probe(struct platform_device *pdev)
         if (ret)
                 goto error;
 
-        ret = drm_connector_register_all(ddev);
-        if (ret < 0)
-                goto error;
-
         DRM_INFO("Device %s probed\n", dev_name(&pdev->dev));
 
         return 0;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index 4e939e41f030..55149e9ce28e 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -27,18 +27,6 @@
 #include "rcar_du_vgacon.h"
 
 /* -----------------------------------------------------------------------------
- * Common connector functions
- */
-
-struct drm_encoder *
-rcar_du_connector_best_encoder(struct drm_connector *connector)
-{
-        struct rcar_du_connector *rcon = to_rcar_connector(connector);
-
-        return rcar_encoder_to_drm_encoder(rcon->encoder);
-}
-
-/* -----------------------------------------------------------------------------
  * Encoder
  */
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
index 719b6f2a031c..a8669c3e0dd5 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
@@ -49,9 +49,6 @@ struct rcar_du_connector {
 #define to_rcar_connector(c) \
         container_of(c, struct rcar_du_connector, connector)
 
-struct drm_encoder *
-rcar_du_connector_best_encoder(struct drm_connector *connector);
-
 int rcar_du_encoder_init(struct rcar_du_device *rcdu,
                          enum rcar_du_encoder_type type,
                          enum rcar_du_output output,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
index 6c927144b5c9..612b4d5ae098 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
@@ -52,7 +52,6 @@ static int rcar_du_hdmi_connector_mode_valid(struct drm_connector *connector,
 static const struct drm_connector_helper_funcs connector_helper_funcs = {
         .get_modes = rcar_du_hdmi_connector_get_modes,
         .mode_valid = rcar_du_hdmi_connector_mode_valid,
-        .best_encoder = rcar_du_connector_best_encoder,
 };
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index e70a4f33d970..6bb032d8ac6b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -288,6 +288,8 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
 {
         struct rcar_du_device *rcdu = dev->dev_private;
         struct rcar_du_commit *commit;
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
         unsigned int i;
         int ret;
 
@@ -309,10 +311,8 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
         /* Wait until all affected CRTCs have completed previous commits and
          * mark them as pending.
          */
-        for (i = 0; i < dev->mode_config.num_crtc; ++i) {
-                if (state->crtcs[i])
-                        commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]);
-        }
+        for_each_crtc_in_state(state, crtc, crtc_state, i)
+                commit->crtcs |= drm_crtc_mask(crtc);
 
         spin_lock(&rcdu->commit.wait.lock);
         ret = wait_event_interruptible_locked(rcdu->commit.wait,
@@ -327,7 +327,7 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
         }
 
         /* Swap the state, this is the point of no return. */
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (nonblock)
                 schedule_work(&commit->work);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
index e905f5da7aaa..6afd0af312ba 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
@@ -59,7 +59,6 @@ static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector)
 
 static const struct drm_connector_helper_funcs connector_helper_funcs = {
         .get_modes = rcar_du_lvds_connector_get_modes,
-        .best_encoder = rcar_du_connector_best_encoder,
 };
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index d445e67f78e1..bfe31ca870cc 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -140,18 +140,17 @@ int rcar_du_atomic_check_planes(struct drm_device *dev,
         bool needs_realloc = false;
         unsigned int groups = 0;
         unsigned int i;
+        struct drm_plane *drm_plane;
+        struct drm_plane_state *drm_plane_state;
 
         /* Check if hardware planes need to be reallocated. */
-        for (i = 0; i < dev->mode_config.num_total_plane; ++i) {
+        for_each_plane_in_state(state, drm_plane, drm_plane_state, i) {
                 struct rcar_du_plane_state *plane_state;
                 struct rcar_du_plane *plane;
                 unsigned int index;
 
-                if (!state->planes[i])
-                        continue;
-
-                plane = to_rcar_plane(state->planes[i]);
-                plane_state = to_rcar_plane_state(state->plane_states[i]);
+                plane = to_rcar_plane(drm_plane);
+                plane_state = to_rcar_plane_state(drm_plane_state);
 
                 dev_dbg(rcdu->dev, "%s: checking plane (%u,%tu)\n", __func__,
                         plane->group->index, plane - plane->group->planes);
@@ -247,18 +246,15 @@ int rcar_du_atomic_check_planes(struct drm_device *dev,
         }
 
         /* Reallocate hardware planes for each plane that needs it. */
-        for (i = 0; i < dev->mode_config.num_total_plane; ++i) {
+        for_each_plane_in_state(state, drm_plane, drm_plane_state, i) {
                 struct rcar_du_plane_state *plane_state;
                 struct rcar_du_plane *plane;
                 unsigned int crtc_planes;
                 unsigned int free;
                 int idx;
 
-                if (!state->planes[i])
-                        continue;
-
-                plane = to_rcar_plane(state->planes[i]);
-                plane_state = to_rcar_plane_state(state->plane_states[i]);
+                plane = to_rcar_plane(drm_plane);
+                plane_state = to_rcar_plane_state(drm_plane_state);
 
                 dev_dbg(rcdu->dev, "%s: allocating plane (%u,%tu)\n", __func__,
                         plane->group->index, plane - plane->group->planes);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
index d2f66068e52c..fedb0161e234 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
@@ -195,9 +195,10 @@
 #define DEFR6_ODPM12_DISP       (2 << 8)
 #define DEFR6_ODPM12_CDE        (3 << 8)
 #define DEFR6_ODPM12_MASK       (3 << 8)
-#define DEFR6_TCNE2             (1 << 6)
+#define DEFR6_TCNE1             (1 << 6)
+#define DEFR6_TCNE0             (1 << 4)
 #define DEFR6_MLOS1             (1 << 2)
-#define DEFR6_DEFAULT           (DEFR6_CODE | DEFR6_TCNE2)
+#define DEFR6_DEFAULT           (DEFR6_CODE | DEFR6_TCNE1)
 
 /* -----------------------------------------------------------------------------
  * R8A7790-only Control Registers
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
index 9d7e5c99caf6..8d6125c1c0f9 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
@@ -28,7 +28,6 @@ static int rcar_du_vga_connector_get_modes(struct drm_connector *connector)
 
 static const struct drm_connector_helper_funcs connector_helper_funcs = {
         .get_modes = rcar_du_vga_connector_get_modes,
-        .best_encoder = rcar_du_connector_best_encoder,
 };
 
 static enum drm_connector_status
@@ -79,7 +78,5 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
         if (ret < 0)
                 return ret;
 
-        rcon->encoder = renc;
-
         return 0;
 }
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index d30bdc38a760..e48611e83c03 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -2,6 +2,7 @@ config DRM_ROCKCHIP
         tristate "DRM Support for Rockchip"
         depends on DRM && ROCKCHIP_IOMMU
         depends on RESET_CONTROLLER
+        select DRM_GEM_CMA_HELPER
         select DRM_KMS_HELPER
         select DRM_KMS_FB_HELPER
         select DRM_PANEL
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 7f6a55cae27a..c120172add5c 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -349,20 +349,11 @@ static int rockchip_dp_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct dev_pm_ops rockchip_dp_pm_ops = {
 #ifdef CONFIG_PM_SLEEP
-static int rockchip_dp_suspend(struct device *dev)
-{
-        return analogix_dp_suspend(dev);
-}
-
-static int rockchip_dp_resume(struct device *dev)
-{
-        return analogix_dp_resume(dev);
-}
+        .suspend = analogix_dp_suspend,
+        .resume_early = analogix_dp_resume,
 #endif
-
-static const struct dev_pm_ops rockchip_dp_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(rockchip_dp_suspend, rockchip_dp_resume)
 };
 
 static const struct of_device_id rockchip_dp_dt_ids[] = {
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index dedc65b40f36..ca22e5ee89ca 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -964,18 +964,9 @@ static enum drm_mode_status dw_mipi_dsi_mode_valid(
         return mode_status;
 }
 
-static struct drm_encoder *dw_mipi_dsi_connector_best_encoder(
-                                        struct drm_connector *connector)
-{
-        struct dw_mipi_dsi *dsi = con_to_dsi(connector);
-
-        return &dsi->encoder;
-}
-
 static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = {
         .get_modes = dw_mipi_dsi_connector_get_modes,
         .mode_valid = dw_mipi_dsi_mode_valid,
-        .best_encoder = dw_mipi_dsi_connector_best_encoder,
 };
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index f8b4feb60b25..006260de9dbd 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -579,14 +579,6 @@ inno_hdmi_connector_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static struct drm_encoder *
-inno_hdmi_connector_best_encoder(struct drm_connector *connector)
-{
-        struct inno_hdmi *hdmi = to_inno_hdmi(connector);
-
-        return &hdmi->encoder;
-}
-
 static int
 inno_hdmi_probe_single_connector_modes(struct drm_connector *connector,
                                        uint32_t maxX, uint32_t maxY)
@@ -613,7 +605,6 @@ static struct drm_connector_funcs inno_hdmi_connector_funcs = {
 static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = {
         .get_modes = inno_hdmi_connector_get_modes,
         .mode_valid = inno_hdmi_connector_mode_valid,
-        .best_encoder = inno_hdmi_connector_best_encoder,
 };
 
 static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index a409d1f703cb..d665fb04d264 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -19,11 +19,13 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/component.h>
+#include <linux/console.h>
 
 #include "rockchip_drm_drv.h"
 #include "rockchip_drm_fb.h"
@@ -37,6 +39,7 @@
 #define DRIVER_MINOR    0
 
 static bool is_support_iommu = true;
+static struct drm_driver rockchip_drm_driver;
 
 /*
  * Attach a (component) device to the shared drm dma mapping from master drm
@@ -132,20 +135,24 @@ static void rockchip_drm_crtc_disable_vblank(struct drm_device *dev,
                 priv->crtc_funcs[pipe]->disable_vblank(crtc);
 }
 
-static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
+static int rockchip_drm_bind(struct device *dev)
 {
+        struct drm_device *drm_dev;
         struct rockchip_drm_private *private;
         struct dma_iommu_mapping *mapping = NULL;
-        struct device *dev = drm_dev->dev;
-        struct drm_connector *connector;
         int ret;
 
-        private = devm_kzalloc(drm_dev->dev, sizeof(*private), GFP_KERNEL);
-        if (!private)
+        drm_dev = drm_dev_alloc(&rockchip_drm_driver, dev);
+        if (!drm_dev)
                 return -ENOMEM;
 
-        mutex_init(&private->commit.lock);
-        INIT_WORK(&private->commit.work, rockchip_drm_atomic_work);
+        dev_set_drvdata(dev, drm_dev);
+
+        private = devm_kzalloc(drm_dev->dev, sizeof(*private), GFP_KERNEL);
+        if (!private) {
+                ret = -ENOMEM;
+                goto err_free;
+        }
 
         drm_dev->dev_private = private;
 
@@ -186,23 +193,6 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
         if (ret)
                 goto err_detach_device;
 
-        /*
-         * All components are now added, we can publish the connector sysfs
-         * entries to userspace.  This will generate hotplug events and so
-         * userspace will expect to be able to access DRM at this point.
-         */
-        list_for_each_entry(connector, &drm_dev->mode_config.connector_list,
-                        head) {
-                ret = drm_connector_register(connector);
-                if (ret) {
-                        dev_err(drm_dev->dev,
-                                "[CONNECTOR:%d:%s] drm_connector_register failed: %d\n",
-                                connector->base.id,
-                                connector->name, ret);
-                        goto err_unbind;
-                }
-        }
-
         /* init kms poll for handling hpd */
         drm_kms_helper_poll_init(drm_dev);
 
@@ -222,14 +212,19 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
         if (ret)
                 goto err_vblank_cleanup;
 
+        ret = drm_dev_register(drm_dev, 0);
+        if (ret)
+                goto err_fbdev_fini;
+
         if (is_support_iommu)
                 arm_iommu_release_mapping(mapping);
         return 0;
+err_fbdev_fini:
+        rockchip_drm_fbdev_fini(drm_dev);
 err_vblank_cleanup:
         drm_vblank_cleanup(drm_dev);
 err_kms_helper_poll_fini:
         drm_kms_helper_poll_fini(drm_dev);
-err_unbind:
         component_unbind_all(dev, drm_dev);
 err_detach_device:
         if (is_support_iommu)
@@ -240,12 +235,14 @@ err_release_mapping:
 err_config_cleanup:
         drm_mode_config_cleanup(drm_dev);
         drm_dev->dev_private = NULL;
+err_free:
+        drm_dev_unref(drm_dev);
         return ret;
 }
 
-static int rockchip_drm_unload(struct drm_device *drm_dev)
+static void rockchip_drm_unbind(struct device *dev)
 {
-        struct device *dev = drm_dev->dev;
+        struct drm_device *drm_dev = dev_get_drvdata(dev);
 
         rockchip_drm_fbdev_fini(drm_dev);
         drm_vblank_cleanup(drm_dev);
@@ -255,29 +252,9 @@ static int rockchip_drm_unload(struct drm_device *drm_dev)
                 arm_iommu_detach_device(dev);
         drm_mode_config_cleanup(drm_dev);
         drm_dev->dev_private = NULL;
-
-        return 0;
-}
-
-static void rockchip_drm_crtc_cancel_pending_vblank(struct drm_crtc *crtc,
-                                                    struct drm_file *file_priv)
-{
-        struct rockchip_drm_private *priv = crtc->dev->dev_private;
-        int pipe = drm_crtc_index(crtc);
-
-        if (pipe < ROCKCHIP_MAX_CRTC &&
-            priv->crtc_funcs[pipe] &&
-            priv->crtc_funcs[pipe]->cancel_pending_vblank)
-                priv->crtc_funcs[pipe]->cancel_pending_vblank(crtc, file_priv);
-}
-
-static void rockchip_drm_preclose(struct drm_device *dev,
-                                  struct drm_file *file_priv)
-{
-        struct drm_crtc *crtc;
-
-        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
-                rockchip_drm_crtc_cancel_pending_vblank(crtc, file_priv);
+        drm_dev_unregister(drm_dev);
+        drm_dev_unref(drm_dev);
+        dev_set_drvdata(dev, NULL);
 }
 
 void rockchip_drm_lastclose(struct drm_device *dev)
@@ -300,23 +277,15 @@ static const struct file_operations rockchip_drm_driver_fops = {
         .release = drm_release,
 };
 
-const struct vm_operations_struct rockchip_drm_vm_ops = {
-        .open = drm_gem_vm_open,
-        .close = drm_gem_vm_close,
-};
-
 static struct drm_driver rockchip_drm_driver = {
         .driver_features        = DRIVER_MODESET | DRIVER_GEM |
                                   DRIVER_PRIME | DRIVER_ATOMIC,
-        .load                   = rockchip_drm_load,
-        .unload                 = rockchip_drm_unload,
-        .preclose               = rockchip_drm_preclose,
         .lastclose              = rockchip_drm_lastclose,
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = rockchip_drm_crtc_enable_vblank,
         .disable_vblank         = rockchip_drm_crtc_disable_vblank,
-        .gem_vm_ops             = &rockchip_drm_vm_ops,
-        .gem_free_object        = rockchip_gem_free_object,
+        .gem_vm_ops             = &drm_gem_cma_vm_ops,
+        .gem_free_object_unlocked = rockchip_gem_free_object,
         .dumb_create            = rockchip_gem_dumb_create,
         .dumb_map_offset        = rockchip_gem_dumb_map_offset,
         .dumb_destroy           = drm_gem_dumb_destroy,
@@ -337,25 +306,38 @@ static struct drm_driver rockchip_drm_driver = {
 };
 
 #ifdef CONFIG_PM_SLEEP
-static int rockchip_drm_sys_suspend(struct device *dev)
+void rockchip_drm_fb_suspend(struct drm_device *drm)
 {
-        struct drm_device *drm = dev_get_drvdata(dev);
-        struct drm_connector *connector;
+        struct rockchip_drm_private *priv = drm->dev_private;
 
-        if (!drm)
-                return 0;
+        console_lock();
+        drm_fb_helper_set_suspend(&priv->fbdev_helper, 1);
+        console_unlock();
+}
 
-        drm_modeset_lock_all(drm);
-        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
-                int old_dpms = connector->dpms;
+void rockchip_drm_fb_resume(struct drm_device *drm)
+{
+        struct rockchip_drm_private *priv = drm->dev_private;
 
-                if (connector->funcs->dpms)
-                        connector->funcs->dpms(connector, DRM_MODE_DPMS_OFF);
+        console_lock();
+        drm_fb_helper_set_suspend(&priv->fbdev_helper, 0);
+        console_unlock();
+}
 
-                /* Set the old mode back to the connector for resume */
-                connector->dpms = old_dpms;
+static int rockchip_drm_sys_suspend(struct device *dev)
+{
+        struct drm_device *drm = dev_get_drvdata(dev);
+        struct rockchip_drm_private *priv = drm->dev_private;
+
+        drm_kms_helper_poll_disable(drm);
+        rockchip_drm_fb_suspend(drm);
+
+        priv->state = drm_atomic_helper_suspend(drm);
+        if (IS_ERR(priv->state)) {
+                rockchip_drm_fb_resume(drm);
+                drm_kms_helper_poll_enable(drm);
+                return PTR_ERR(priv->state);
         }
-        drm_modeset_unlock_all(drm);
 
         return 0;
 }
@@ -363,47 +345,11 @@ static int rockchip_drm_sys_suspend(struct device *dev)
 static int rockchip_drm_sys_resume(struct device *dev)
 {
         struct drm_device *drm = dev_get_drvdata(dev);
-        struct drm_connector *connector;
-        enum drm_connector_status status;
-        bool changed = false;
-
-        if (!drm)
-                return 0;
+        struct rockchip_drm_private *priv = drm->dev_private;
 
-        drm_modeset_lock_all(drm);
-        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
-                int desired_mode = connector->dpms;
-
-                /*
-                 * at suspend time, we save dpms to connector->dpms,
-                 * restore the old_dpms, and at current time, the connector
-                 * dpms status must be DRM_MODE_DPMS_OFF.
-                 */
-                connector->dpms = DRM_MODE_DPMS_OFF;
-
-                /*
-                 * If the connector has been disconnected during suspend,
-                 * disconnect it from the encoder and leave it off. We'll notify
-                 * userspace at the end.
-                 */
-                if (desired_mode == DRM_MODE_DPMS_ON) {
-                        status = connector->funcs->detect(connector, true);
-                        if (status == connector_status_disconnected) {
-                                connector->encoder = NULL;
-                                connector->status = status;
-                                changed = true;
-                                continue;
-                        }
-                }
-                if (connector->funcs->dpms)
-                        connector->funcs->dpms(connector, desired_mode);
-        }
-        drm_modeset_unlock_all(drm);
-
-        drm_helper_resume_force_mode(drm);
-
-        if (changed)
-                drm_kms_helper_hotplug_event(drm);
+        drm_atomic_helper_resume(drm, priv->state);
+        rockchip_drm_fb_resume(drm);
+        drm_kms_helper_poll_enable(drm);
 
         return 0;
 }
@@ -444,37 +390,6 @@ static void rockchip_add_endpoints(struct device *dev,
         }
 }
 
-static int rockchip_drm_bind(struct device *dev)
-{
-        struct drm_device *drm;
-        int ret;
-
-        drm = drm_dev_alloc(&rockchip_drm_driver, dev);
-        if (!drm)
-                return -ENOMEM;
-
-        ret = drm_dev_register(drm, 0);
-        if (ret)
-                goto err_free;
-
-        dev_set_drvdata(dev, drm);
-
-        return 0;
-
-err_free:
-        drm_dev_unref(drm);
-        return ret;
-}
-
-static void rockchip_drm_unbind(struct device *dev)
-{
-        struct drm_device *drm = dev_get_drvdata(dev);
-
-        drm_dev_unregister(drm);
-        drm_dev_unref(drm);
-        dev_set_drvdata(dev, NULL);
-}
-
 static const struct component_master_ops rockchip_drm_ops = {
         .bind = rockchip_drm_bind,
         .unbind = rockchip_drm_unbind,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index 56f43a364c7f..ea3932940061 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -40,14 +40,6 @@ struct rockchip_crtc_funcs {
         int (*enable_vblank)(struct drm_crtc *crtc);
         void (*disable_vblank)(struct drm_crtc *crtc);
         void (*wait_for_update)(struct drm_crtc *crtc);
-        void (*cancel_pending_vblank)(struct drm_crtc *crtc, struct drm_file *file_priv);
-};
-
-struct rockchip_atomic_commit {
-        struct work_struct      work;
-        struct drm_atomic_state *state;
-        struct drm_device *dev;
-        struct mutex lock;
 };
 
 struct rockchip_crtc_state {
@@ -68,11 +60,9 @@ struct rockchip_drm_private {
         struct drm_fb_helper fbdev_helper;
         struct drm_gem_object *fbdev_bo;
         const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC];
-
-        struct rockchip_atomic_commit commit;
+        struct drm_atomic_state *state;
 };
 
-void rockchip_drm_atomic_work(struct work_struct *work);
 int rockchip_register_crtc_funcs(struct drm_crtc *crtc,
                                  const struct rockchip_crtc_funcs *crtc_funcs);
 void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 755cfdba61cd..20f12bc5a386 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -228,87 +228,32 @@ rockchip_atomic_wait_for_complete(struct drm_device *dev, struct drm_atomic_stat
 }
 
 static void
-rockchip_atomic_commit_complete(struct rockchip_atomic_commit *commit)
+rockchip_atomic_commit_tail(struct drm_atomic_state *state)
 {
-        struct drm_atomic_state *state = commit->state;
-        struct drm_device *dev = commit->dev;
+        struct drm_device *dev = state->dev;
 
-        /*
-         * TODO: do fence wait here.
-         */
-
-        /*
-         * Rockchip crtc support runtime PM, can't update display planes
-         * when crtc is disabled.
-         *
-         * drm_atomic_helper_commit comments detail that:
-         *     For drivers supporting runtime PM the recommended sequence is
-         *
-         *     drm_atomic_helper_commit_modeset_disables(dev, state);
-         *
-         *     drm_atomic_helper_commit_modeset_enables(dev, state);
-         *
-         *     drm_atomic_helper_commit_planes(dev, state, true);
-         *
-         * See the kerneldoc entries for these three functions for more details.
-         */
         drm_atomic_helper_commit_modeset_disables(dev, state);
 
         drm_atomic_helper_commit_modeset_enables(dev, state);
 
         drm_atomic_helper_commit_planes(dev, state, true);
 
+        drm_atomic_helper_commit_hw_done(state);
+
         rockchip_atomic_wait_for_complete(dev, state);
 
         drm_atomic_helper_cleanup_planes(dev, state);
-
-        drm_atomic_state_free(state);
-}
-
-void rockchip_drm_atomic_work(struct work_struct *work)
-{
-        struct rockchip_atomic_commit *commit = container_of(work,
-                                        struct rockchip_atomic_commit, work);
-
-        rockchip_atomic_commit_complete(commit);
 }
 
-int rockchip_drm_atomic_commit(struct drm_device *dev,
-                               struct drm_atomic_state *state,
-                               bool nonblock)
-{
-        struct rockchip_drm_private *private = dev->dev_private;
-        struct rockchip_atomic_commit *commit = &private->commit;
-        int ret;
-
-        ret = drm_atomic_helper_prepare_planes(dev, state);
-        if (ret)
-                return ret;
-
-        /* serialize outstanding nonblocking commits */
-        mutex_lock(&commit->lock);
-        flush_work(&commit->work);
-
-        drm_atomic_helper_swap_state(dev, state);
-
-        commit->dev = dev;
-        commit->state = state;
-
-        if (nonblock)
-                schedule_work(&commit->work);
-        else
-                rockchip_atomic_commit_complete(commit);
-
-        mutex_unlock(&commit->lock);
-
-        return 0;
-}
+struct drm_mode_config_helper_funcs rockchip_mode_config_helpers = {
+        .atomic_commit_tail = rockchip_atomic_commit_tail,
+};
 
 static const struct drm_mode_config_funcs rockchip_drm_mode_config_funcs = {
         .fb_create = rockchip_user_fb_create,
         .output_poll_changed = rockchip_drm_output_poll_changed,
         .atomic_check = drm_atomic_helper_check,
-        .atomic_commit = rockchip_drm_atomic_commit,
+        .atomic_commit = drm_atomic_helper_commit,
 };
 
 struct drm_framebuffer *
@@ -339,4 +284,5 @@ void rockchip_drm_mode_config_init(struct drm_device *dev)
         dev->mode_config.max_height = 4096;
 
         dev->mode_config.funcs = &rockchip_drm_mode_config_funcs;
+        dev->mode_config.helper_private = &rockchip_mode_config_helpers;
 }
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
index f261512bb4a0..207e01de6e32 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
@@ -108,7 +108,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper,
         fbi->screen_size = rk_obj->base.size;
         fbi->fix.smem_len = rk_obj->base.size;
 
-        DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
+        DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%zu\n",
                       fb->width, fb->height, fb->depth, rk_obj->kvaddr,
                       offset, size);
 
@@ -156,9 +156,6 @@ int rockchip_drm_fbdev_init(struct drm_device *dev)
                 goto err_drm_fb_helper_fini;
         }
 
-        /* disable all the possible outputs/crtcs before entering KMS mode */
-        drm_helper_disable_unused_functions(dev);
-
         ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);
         if (ret < 0) {
                 dev_err(dev->dev, "Failed to set initial hw config - %d.\n",
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 9c2d8a894093..059e902f872d 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -38,7 +38,7 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj,
                                          &rk_obj->dma_addr, GFP_KERNEL,
                                          &rk_obj->dma_attrs);
         if (!rk_obj->kvaddr) {
-                DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
+                DRM_ERROR("failed to allocate %zu byte dma buffer", obj->size);
                 return -ENOMEM;
         }
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 1c4d5b5a70a2..6255e5bcd954 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -98,7 +98,9 @@ struct vop_win {
         const struct vop_win_data *data;
         struct vop *vop;
 
-        struct vop_plane_state state;
+        /* protected by dev->event_lock */
+        bool enable;
+        dma_addr_t yrgb_mst;
 };
 
 struct vop {
@@ -112,6 +114,8 @@ struct vop {
         bool vsync_work_pending;
         struct completion dsp_hold_completion;
         struct completion wait_update_complete;
+
+        /* protected by dev->event_lock */
         struct drm_pending_vblank_event *event;
 
         const struct vop_data *data;
@@ -431,9 +435,6 @@ static void vop_enable(struct drm_crtc *crtc)
         struct vop *vop = to_vop(crtc);
         int ret;
 
-        if (vop->is_enabled)
-                return;
-
         ret = pm_runtime_get_sync(vop->dev);
         if (ret < 0) {
                 dev_err(vop->dev, "failed to get pm runtime: %d\n", ret);
@@ -501,8 +502,7 @@ static void vop_crtc_disable(struct drm_crtc *crtc)
         struct vop *vop = to_vop(crtc);
         int i;
 
-        if (!vop->is_enabled)
-                return;
+        WARN_ON(vop->event);
 
         /*
          * We need to make sure that all windows are disabled before we
@@ -553,6 +553,14 @@ static void vop_crtc_disable(struct drm_crtc *crtc)
         clk_disable(vop->aclk);
         clk_disable(vop->hclk);
         pm_runtime_put(vop->dev);
+
+        if (crtc->state->event && !crtc->state->active) {
+                spin_lock_irq(&crtc->dev->event_lock);
+                drm_crtc_send_vblank_event(crtc, crtc->state->event);
+                spin_unlock_irq(&crtc->dev->event_lock);
+
+                crtc->state->event = NULL;
+        }
 }
 
 static void vop_plane_destroy(struct drm_plane *plane)
@@ -618,6 +626,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
 
         ret = drm_plane_helper_check_update(plane, crtc, state->fb,
                                             src, dest, &clip,
+                                            state->rotation,
                                             min_scale,
                                             max_scale,
                                             true, true, &visible);
@@ -658,6 +667,11 @@ static void vop_plane_atomic_disable(struct drm_plane *plane,
         if (!old_state->crtc)
                 return;
 
+        spin_lock_irq(&plane->dev->event_lock);
+        vop_win->enable = false;
+        vop_win->yrgb_mst = 0;
+        spin_unlock_irq(&plane->dev->event_lock);
+
         spin_lock(&vop->reg_lock);
 
         VOP_WIN_SET(vop, win, enable, 0);
@@ -692,7 +706,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         /*
          * can't update plane when vop is disabled.
          */
-        if (!crtc)
+        if (WARN_ON(!crtc))
                 return;
 
         if (WARN_ON(!vop->is_enabled))
@@ -721,6 +735,11 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         offset += (src->y1 >> 16) * fb->pitches[0];
         vop_plane_state->yrgb_mst = rk_obj->dma_addr + offset + fb->offsets[0];
 
+        spin_lock_irq(&plane->dev->event_lock);
+        vop_win->enable = true;
+        vop_win->yrgb_mst = vop_plane_state->yrgb_mst;
+        spin_unlock_irq(&plane->dev->event_lock);
+
         spin_lock(&vop->reg_lock);
 
         VOP_WIN_SET(vop, win, format, vop_plane_state->format);
@@ -876,30 +895,10 @@ static void vop_crtc_wait_for_update(struct drm_crtc *crtc)
         WARN_ON(!wait_for_completion_timeout(&vop->wait_update_complete, 100));
 }
 
-static void vop_crtc_cancel_pending_vblank(struct drm_crtc *crtc,
-                                           struct drm_file *file_priv)
-{
-        struct drm_device *drm = crtc->dev;
-        struct vop *vop = to_vop(crtc);
-        struct drm_pending_vblank_event *e;
-        unsigned long flags;
-
-        spin_lock_irqsave(&drm->event_lock, flags);
-        e = vop->event;
-        if (e && e->base.file_priv == file_priv) {
-                vop->event = NULL;
-
-                e->base.destroy(&e->base);
-                file_priv->event_space += sizeof(e->event);
-        }
-        spin_unlock_irqrestore(&drm->event_lock, flags);
-}
-
 static const struct rockchip_crtc_funcs private_crtc_funcs = {
         .enable_vblank = vop_crtc_enable_vblank,
         .disable_vblank = vop_crtc_disable_vblank,
         .wait_for_update = vop_crtc_wait_for_update,
-        .cancel_pending_vblank = vop_crtc_cancel_pending_vblank,
 };
 
 static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -931,6 +930,8 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
         u16 vact_end = vact_st + vdisplay;
         uint32_t val;
 
+        WARN_ON(vop->event);
+
         vop_enable(crtc);
         /*
          * If dclk rate is zero, mean that scanout is stop,
@@ -1027,12 +1028,15 @@ static void vop_crtc_atomic_begin(struct drm_crtc *crtc,
 {
         struct vop *vop = to_vop(crtc);
 
+        spin_lock_irq(&crtc->dev->event_lock);
         if (crtc->state->event) {
                 WARN_ON(drm_crtc_vblank_get(crtc) != 0);
+                WARN_ON(vop->event);
 
                 vop->event = crtc->state->event;
                 crtc->state->event = NULL;
         }
+        spin_unlock_irq(&crtc->dev->event_lock);
 }
 
 static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = {
@@ -1080,16 +1084,14 @@ static const struct drm_crtc_funcs vop_crtc_funcs = {
 
 static bool vop_win_pending_is_complete(struct vop_win *vop_win)
 {
-        struct drm_plane *plane = &vop_win->base;
-        struct vop_plane_state *state = to_vop_plane_state(plane->state);
         dma_addr_t yrgb_mst;
 
-        if (!state->enable)
+        if (!vop_win->enable)
                 return VOP_WIN_GET(vop_win->vop, vop_win->data, enable) == 0;
 
         yrgb_mst = VOP_WIN_GET_YRGBADDR(vop_win->vop, vop_win->data);
 
-        return yrgb_mst == state->yrgb_mst;
+        return yrgb_mst == vop_win->yrgb_mst;
 }
 
 static void vop_handle_vblank(struct vop *vop)
@@ -1104,15 +1106,16 @@ static void vop_handle_vblank(struct vop *vop)
                         return;
         }
 
+        spin_lock_irqsave(&drm->event_lock, flags);
         if (vop->event) {
-                spin_lock_irqsave(&drm->event_lock, flags);
 
                 drm_crtc_send_vblank_event(crtc, vop->event);
                 drm_crtc_vblank_put(crtc);
                 vop->event = NULL;
 
-                spin_unlock_irqrestore(&drm->event_lock, flags);
         }
+        spin_unlock_irqrestore(&drm->event_lock, flags);
+
         if (!completion_done(&vop->wait_update_complete))
                 complete(&vop->wait_update_complete);
 }
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 1e154fc779d5..6547b1db460a 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -441,7 +441,7 @@ void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc)
         scrtc->event = NULL;
         if (event) {
                 drm_crtc_send_vblank_event(&scrtc->crtc, event);
-                drm_vblank_put(dev, 0);
+                drm_crtc_vblank_put(&scrtc->crtc);
         }
         spin_unlock_irqrestore(&dev->event_lock, flags);
 }
@@ -467,7 +467,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
 
         if (event) {
                 event->pipe = 0;
-                drm_vblank_get(dev, 0);
+                drm_crtc_vblank_get(&scrtc->crtc);
                 spin_lock_irqsave(&dev->event_lock, flags);
                 scrtc->event = event;
                 spin_unlock_irqrestore(&dev->event_lock, flags);
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index 7700ff172079..f0492603ea88 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -259,12 +259,11 @@ static struct drm_driver shmob_drm_driver = {
                                 | DRIVER_PRIME,
         .load                   = shmob_drm_load,
         .unload                 = shmob_drm_unload,
-        .set_busid              = drm_platform_set_busid,
         .irq_handler            = shmob_drm_irq,
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = shmob_drm_enable_vblank,
         .disable_vblank         = shmob_drm_disable_vblank,
-        .gem_free_object        = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 93ad8a5704d1..03defda77766 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -316,7 +316,7 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
         struct sis_file_private *file_priv = file->driver_priv;
         struct sis_memblock *entry, *next;
 
-        if (!(file->minor->master && file->master->lock.hw_lock))
+        if (!(dev->master && file->master->lock.hw_lock))
                 return;
 
         drm_legacy_idlelock_take(&file->master->lock);
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
index 5ad43a1bb260..494ab257f77c 100644
--- a/drivers/gpu/drm/sti/Kconfig
+++ b/drivers/gpu/drm/sti/Kconfig
@@ -7,5 +7,6 @@ config DRM_STI
         select DRM_KMS_CMA_HELPER
         select DRM_PANEL
         select FW_LOADER
+        select SND_SOC_HDMI_CODEC if SND_SOC
         help
           Choose this option to enable DRM on STM stiH41x chipset
diff --git a/drivers/gpu/drm/sti/sti_awg_utils.c b/drivers/gpu/drm/sti/sti_awg_utils.c
index a516eb869f6f..2da7d6866d5d 100644
--- a/drivers/gpu/drm/sti/sti_awg_utils.c
+++ b/drivers/gpu/drm/sti/sti_awg_utils.c
@@ -6,6 +6,8 @@
 
 #include "sti_awg_utils.h"
 
+#define AWG_DELAY (-5)
+
 #define AWG_OPCODE_OFFSET 10
 #define AWG_MAX_ARG       0x3ff
 
@@ -125,7 +127,7 @@ static int awg_generate_line_signal(
                 val = timing->blanking_level;
                 ret |= awg_generate_instr(RPLSET, val, 0, 0, fwparams);
 
-                val = timing->trailing_pixels - 1;
+                val = timing->trailing_pixels - 1 + AWG_DELAY;
                 ret |= awg_generate_instr(SKIP, val, 0, 0, fwparams);
         }
 
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index 3d2fa3ab33df..794148ff0e57 100644
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -55,6 +55,26 @@ struct sti_compositor_data stih416_compositor_data = {
         },
 };
 
+int sti_compositor_debufs_init(struct sti_compositor *compo,
+                               struct drm_minor *minor)
+{
+        int ret = 0, i;
+
+        for (i = 0; compo->vid[i]; i++) {
+                ret = vid_debugfs_init(compo->vid[i], minor);
+                if (ret)
+                        return ret;
+        }
+
+        for (i = 0; compo->mixer[i]; i++) {
+                ret = sti_mixer_debugfs_init(compo->mixer[i], minor);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
 static int sti_compositor_bind(struct device *dev,
                                struct device *master,
                                void *data)
diff --git a/drivers/gpu/drm/sti/sti_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h
index 1a4a73dab11e..24444ef42a98 100644
--- a/drivers/gpu/drm/sti/sti_compositor.h
+++ b/drivers/gpu/drm/sti/sti_compositor.h
@@ -81,4 +81,7 @@ struct sti_compositor {
         struct notifier_block vtg_vblank_nb;
 };
 
+int sti_compositor_debufs_init(struct sti_compositor *compo,
+                               struct drm_minor *minor);
+
 #endif
diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index 505620c7c2c8..c7d734dc3cf4 100644
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -23,22 +23,11 @@
 static void sti_crtc_enable(struct drm_crtc *crtc)
 {
         struct sti_mixer *mixer = to_sti_mixer(crtc);
-        struct device *dev = mixer->dev;
-        struct sti_compositor *compo = dev_get_drvdata(dev);
 
         DRM_DEBUG_DRIVER("\n");
 
         mixer->status = STI_MIXER_READY;
 
-        /* Prepare and enable the compo IP clock */
-        if (mixer->id == STI_MIXER_MAIN) {
-                if (clk_prepare_enable(compo->clk_compo_main))
-                        DRM_INFO("Failed to prepare/enable compo_main clk\n");
-        } else {
-                if (clk_prepare_enable(compo->clk_compo_aux))
-                        DRM_INFO("Failed to prepare/enable compo_aux clk\n");
-        }
-
         drm_crtc_vblank_on(crtc);
 }
 
@@ -51,24 +40,14 @@ static void sti_crtc_disabling(struct drm_crtc *crtc)
         mixer->status = STI_MIXER_DISABLING;
 }
 
-static bool sti_crtc_mode_fixup(struct drm_crtc *crtc,
-                                const struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
-{
-        /* accept the provided drm_display_mode, do not fix it up */
-        drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-        return true;
-}
-
 static int
 sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode)
 {
         struct sti_mixer *mixer = to_sti_mixer(crtc);
         struct device *dev = mixer->dev;
         struct sti_compositor *compo = dev_get_drvdata(dev);
-        struct clk *clk;
+        struct clk *compo_clk, *pix_clk;
         int rate = mode->clock * 1000;
-        int res;
 
         DRM_DEBUG_KMS("CRTC:%d (%s) mode:%d (%s)\n",
                       crtc->base.id, sti_mixer_to_str(mixer),
@@ -83,32 +62,46 @@ sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode)
                       mode->vsync_start, mode->vsync_end,
                       mode->vtotal, mode->type, mode->flags);
 
-        /* Set rate and prepare/enable pixel clock */
-        if (mixer->id == STI_MIXER_MAIN)
-                clk = compo->clk_pix_main;
-        else
-                clk = compo->clk_pix_aux;
+        if (mixer->id == STI_MIXER_MAIN) {
+                compo_clk = compo->clk_compo_main;
+                pix_clk = compo->clk_pix_main;
+        } else {
+                compo_clk = compo->clk_compo_aux;
+                pix_clk = compo->clk_pix_aux;
+        }
+
+        /* Prepare and enable the compo IP clock */
+        if (clk_prepare_enable(compo_clk)) {
+                DRM_INFO("Failed to prepare/enable compositor clk\n");
+                goto compo_error;
+        }
 
-        res = clk_set_rate(clk, rate);
-        if (res < 0) {
+        /* Set rate and prepare/enable pixel clock */
+        if (clk_set_rate(pix_clk, rate) < 0) {
                 DRM_ERROR("Cannot set rate (%dHz) for pix clk\n", rate);
-                return -EINVAL;
+                goto pix_error;
         }
-        if (clk_prepare_enable(clk)) {
+        if (clk_prepare_enable(pix_clk)) {
                 DRM_ERROR("Failed to prepare/enable pix clk\n");
-                return -EINVAL;
+                goto pix_error;
         }
 
         sti_vtg_set_config(mixer->id == STI_MIXER_MAIN ?
                         compo->vtg_main : compo->vtg_aux, &crtc->mode);
 
-        res = sti_mixer_active_video_area(mixer, &crtc->mode);
-        if (res) {
+        if (sti_mixer_active_video_area(mixer, &crtc->mode)) {
                 DRM_ERROR("Can't set active video area\n");
-                return -EINVAL;
+                goto mixer_error;
         }
 
-        return res;
+        return 0;
+
+mixer_error:
+        clk_disable_unprepare(pix_clk);
+pix_error:
+        clk_disable_unprepare(compo_clk);
+compo_error:
+        return -EINVAL;
 }
 
 static void sti_crtc_disable(struct drm_crtc *crtc)
@@ -139,7 +132,6 @@ static void sti_crtc_disable(struct drm_crtc *crtc)
 static void
 sti_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
-        sti_crtc_enable(crtc);
         sti_crtc_mode_set(crtc, &crtc->state->adjusted_mode);
 }
 
@@ -230,10 +222,7 @@ static void sti_crtc_atomic_flush(struct drm_crtc *crtc,
 static const struct drm_crtc_helper_funcs sti_crtc_helper_funcs = {
         .enable = sti_crtc_enable,
         .disable = sti_crtc_disabling,
-        .mode_fixup = sti_crtc_mode_fixup,
-        .mode_set = drm_helper_crtc_mode_set,
         .mode_set_nofb = sti_crtc_mode_set_nofb,
-        .mode_set_base = drm_helper_crtc_mode_set_base,
         .atomic_begin = sti_crtc_atomic_begin,
         .atomic_flush = sti_crtc_atomic_flush,
 };
@@ -341,6 +330,17 @@ void sti_crtc_disable_vblank(struct drm_device *drm_dev, unsigned int pipe)
         }
 }
 
+static int sti_crtc_late_register(struct drm_crtc *crtc)
+{
+        struct sti_mixer *mixer = to_sti_mixer(crtc);
+        struct sti_compositor *compo = dev_get_drvdata(mixer->dev);
+
+        if (drm_crtc_index(crtc) == 0)
+                return sti_compositor_debufs_init(compo, crtc->dev->primary);
+
+        return 0;
+}
+
 static const struct drm_crtc_funcs sti_crtc_funcs = {
         .set_config = drm_atomic_helper_set_config,
         .page_flip = drm_atomic_helper_page_flip,
@@ -349,6 +349,7 @@ static const struct drm_crtc_funcs sti_crtc_funcs = {
         .reset = drm_atomic_helper_crtc_reset,
         .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+        .late_register = sti_crtc_late_register,
 };
 
 bool sti_crtc_is_main(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
index 4e990299735c..a263bbba4119 100644
--- a/drivers/gpu/drm/sti/sti_cursor.c
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -105,12 +105,6 @@ static int cursor_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_cursor *cursor = (struct sti_cursor *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "%s: (vaddr = 0x%p)",
                    sti_plane_to_str(&cursor->plane), cursor->regs);
@@ -129,7 +123,6 @@ static int cursor_dbg_show(struct seq_file *s, void *data)
         DBGFS_DUMP(CUR_AWE);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -336,6 +329,33 @@ static const struct drm_plane_helper_funcs sti_cursor_helpers_funcs = {
         .atomic_disable = sti_cursor_atomic_disable,
 };
 
+static void sti_cursor_destroy(struct drm_plane *drm_plane)
+{
+        DRM_DEBUG_DRIVER("\n");
+
+        drm_plane_helper_disable(drm_plane);
+        drm_plane_cleanup(drm_plane);
+}
+
+static int sti_cursor_late_register(struct drm_plane *drm_plane)
+{
+        struct sti_plane *plane = to_sti_plane(drm_plane);
+        struct sti_cursor *cursor = to_sti_cursor(plane);
+
+        return cursor_debugfs_init(cursor, drm_plane->dev->primary);
+}
+
+struct drm_plane_funcs sti_cursor_plane_helpers_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = sti_cursor_destroy,
+        .set_property = sti_plane_set_property,
+        .reset = drm_atomic_helper_plane_reset,
+        .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+        .late_register = sti_cursor_late_register,
+};
+
 struct drm_plane *sti_cursor_create(struct drm_device *drm_dev,
                                     struct device *dev, int desc,
                                     void __iomem *baseaddr,
@@ -370,7 +390,7 @@ struct drm_plane *sti_cursor_create(struct drm_device *drm_dev,
 
         res = drm_universal_plane_init(drm_dev, &cursor->plane.drm_plane,
                                        possible_crtcs,
-                                       &sti_plane_helpers_funcs,
+                                       &sti_cursor_plane_helpers_funcs,
                                        cursor_supported_formats,
                                        ARRAY_SIZE(cursor_supported_formats),
                                        DRM_PLANE_TYPE_CURSOR, NULL);
@@ -384,9 +404,6 @@ struct drm_plane *sti_cursor_create(struct drm_device *drm_dev,
 
         sti_plane_init_property(&cursor->plane, DRM_PLANE_TYPE_CURSOR);
 
-        if (cursor_debugfs_init(cursor, drm_dev->primary))
-                DRM_ERROR("CURSOR debugfs setup failed\n");
-
         return &cursor->plane.drm_plane;
 
 err_plane:
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index 872495e72294..96bd3d08b2d4 100644
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -72,11 +72,6 @@ static int sti_drm_fps_dbg_show(struct seq_file *s, void *data)
         struct drm_info_node *node = s->private;
         struct drm_device *dev = node->minor->dev;
         struct drm_plane *p;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         list_for_each_entry(p, &dev->mode_config.plane_list, head) {
                 struct sti_plane *plane = to_sti_plane(p);
@@ -86,7 +81,6 @@ static int sti_drm_fps_dbg_show(struct seq_file *s, void *data)
                            plane->fps_info.fips_str);
         }
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -221,7 +215,7 @@ static int sti_atomic_commit(struct drm_device *drm,
          * the software side now.
          */
 
-        drm_atomic_helper_swap_state(drm, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (nonblock)
                 sti_atomic_schedule(private, state);
@@ -232,8 +226,28 @@ static int sti_atomic_commit(struct drm_device *drm,
         return 0;
 }
 
+static void sti_output_poll_changed(struct drm_device *ddev)
+{
+        struct sti_private *private = ddev->dev_private;
+
+        if (!ddev->mode_config.num_connector)
+                return;
+
+        if (private->fbdev) {
+                drm_fbdev_cma_hotplug_event(private->fbdev);
+                return;
+        }
+
+        private->fbdev = drm_fbdev_cma_init(ddev, 32,
+                                            ddev->mode_config.num_crtc,
+                                            ddev->mode_config.num_connector);
+        if (IS_ERR(private->fbdev))
+                private->fbdev = NULL;
+}
+
 static const struct drm_mode_config_funcs sti_mode_config_funcs = {
         .fb_create = drm_fb_cma_create,
+        .output_poll_changed = sti_output_poll_changed,
         .atomic_check = drm_atomic_helper_check,
         .atomic_commit = sti_atomic_commit,
 };
@@ -254,45 +268,6 @@ static void sti_mode_config_init(struct drm_device *dev)
         dev->mode_config.funcs = &sti_mode_config_funcs;
 }
 
-static int sti_load(struct drm_device *dev, unsigned long flags)
-{
-        struct sti_private *private;
-        int ret;
-
-        private = kzalloc(sizeof(*private), GFP_KERNEL);
-        if (!private) {
-                DRM_ERROR("Failed to allocate private\n");
-                return -ENOMEM;
-        }
-        dev->dev_private = (void *)private;
-        private->drm_dev = dev;
-
-        mutex_init(&private->commit.lock);
-        INIT_WORK(&private->commit.work, sti_atomic_work);
-
-        drm_mode_config_init(dev);
-        drm_kms_helper_poll_init(dev);
-
-        sti_mode_config_init(dev);
-
-        ret = component_bind_all(dev->dev, dev);
-        if (ret) {
-                drm_kms_helper_poll_fini(dev);
-                drm_mode_config_cleanup(dev);
-                kfree(private);
-                return ret;
-        }
-
-        drm_mode_config_reset(dev);
-
-        drm_helper_disable_unused_functions(dev);
-        drm_fbdev_cma_init(dev, 32,
-                           dev->mode_config.num_crtc,
-                           dev->mode_config.num_connector);
-
-        return 0;
-}
-
 static const struct file_operations sti_driver_fops = {
         .owner = THIS_MODULE,
         .open = drm_open,
@@ -309,8 +284,7 @@ static const struct file_operations sti_driver_fops = {
 static struct drm_driver sti_driver = {
         .driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET |
             DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
-        .load = sti_load,
-        .gem_free_object = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops = &drm_gem_cma_vm_ops,
         .dumb_create = drm_gem_cma_dumb_create,
         .dumb_map_offset = drm_gem_cma_dumb_map_offset,
@@ -346,14 +320,88 @@ static int compare_of(struct device *dev, void *data)
         return dev->of_node == data;
 }
 
+static int sti_init(struct drm_device *ddev)
+{
+        struct sti_private *private;
+
+        private = kzalloc(sizeof(*private), GFP_KERNEL);
+        if (!private)
+                return -ENOMEM;
+
+        ddev->dev_private = (void *)private;
+        dev_set_drvdata(ddev->dev, ddev);
+        private->drm_dev = ddev;
+
+        mutex_init(&private->commit.lock);
+        INIT_WORK(&private->commit.work, sti_atomic_work);
+
+        drm_mode_config_init(ddev);
+
+        sti_mode_config_init(ddev);
+
+        drm_kms_helper_poll_init(ddev);
+
+        return 0;
+}
+
+static void sti_cleanup(struct drm_device *ddev)
+{
+        struct sti_private *private = ddev->dev_private;
+
+        if (private->fbdev) {
+                drm_fbdev_cma_fini(private->fbdev);
+                private->fbdev = NULL;
+        }
+
+        drm_kms_helper_poll_fini(ddev);
+        drm_vblank_cleanup(ddev);
+        kfree(private);
+        ddev->dev_private = NULL;
+}
+
 static int sti_bind(struct device *dev)
 {
-        return drm_platform_init(&sti_driver, to_platform_device(dev));
+        struct drm_device *ddev;
+        int ret;
+
+        ddev = drm_dev_alloc(&sti_driver, dev);
+        if (!ddev)
+                return -ENOMEM;
+
+        ddev->platformdev = to_platform_device(dev);
+
+        ret = sti_init(ddev);
+        if (ret)
+                goto err_drm_dev_unref;
+
+        ret = component_bind_all(ddev->dev, ddev);
+        if (ret)
+                goto err_cleanup;
+
+        ret = drm_dev_register(ddev, 0);
+        if (ret)
+                goto err_register;
+
+        drm_mode_config_reset(ddev);
+
+        return 0;
+
+err_register:
+        drm_mode_config_cleanup(ddev);
+err_cleanup:
+        sti_cleanup(ddev);
+err_drm_dev_unref:
+        drm_dev_unref(ddev);
+        return ret;
 }
 
 static void sti_unbind(struct device *dev)
 {
-        drm_put_dev(dev_get_drvdata(dev));
+        struct drm_device *ddev = dev_get_drvdata(dev);
+
+        drm_dev_unregister(ddev);
+        sti_cleanup(ddev);
+        drm_dev_unref(ddev);
 }
 
 static const struct component_master_ops sti_ops = {
diff --git a/drivers/gpu/drm/sti/sti_drv.h b/drivers/gpu/drm/sti/sti_drv.h
index 30ddc20841c3..78ebe5e30f53 100644
--- a/drivers/gpu/drm/sti/sti_drv.h
+++ b/drivers/gpu/drm/sti/sti_drv.h
@@ -24,6 +24,7 @@ struct sti_private {
         struct sti_compositor *compo;
         struct drm_property *plane_zorder_property;
         struct drm_device *drm_dev;
+        struct drm_fbdev_cma *fbdev;
 
         struct {
                 struct drm_atomic_state *state;
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index 25f76632002c..ec3108074350 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -177,12 +177,6 @@ static int dvo_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_dvo *dvo = (struct sti_dvo *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "DVO: (vaddr = 0x%p)", dvo->regs);
         DBGFS_DUMP(DVO_AWG_DIGSYNC_CTRL);
@@ -193,7 +187,6 @@ static int dvo_dbg_show(struct seq_file *s, void *data)
         dvo_dbg_awg_microcode(s, dvo->regs + DVO_DIGSYNC_INSTR_I);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -384,20 +377,10 @@ static int sti_dvo_connector_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-struct drm_encoder *sti_dvo_best_encoder(struct drm_connector *connector)
-{
-        struct sti_dvo_connector *dvo_connector
-                = to_sti_dvo_connector(connector);
-
-        /* Best encoder is the one associated during connector creation */
-        return dvo_connector->encoder;
-}
-
 static const
 struct drm_connector_helper_funcs sti_dvo_connector_helper_funcs = {
         .get_modes = sti_dvo_connector_get_modes,
         .mode_valid = sti_dvo_connector_mode_valid,
-        .best_encoder = sti_dvo_best_encoder,
 };
 
 static enum drm_connector_status
@@ -421,24 +404,29 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force)
         return connector_status_disconnected;
 }
 
-static void sti_dvo_connector_destroy(struct drm_connector *connector)
+static int sti_dvo_late_register(struct drm_connector *connector)
 {
         struct sti_dvo_connector *dvo_connector
                 = to_sti_dvo_connector(connector);
+        struct sti_dvo *dvo = dvo_connector->dvo;
 
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-        kfree(dvo_connector);
+        if (dvo_debugfs_init(dvo, dvo->drm_dev->primary)) {
+                DRM_ERROR("DVO debugfs setup failed\n");
+                return -EINVAL;
+        }
+
+        return 0;
 }
 
 static const struct drm_connector_funcs sti_dvo_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .detect = sti_dvo_connector_detect,
-        .destroy = sti_dvo_connector_destroy,
+        .destroy = drm_connector_cleanup,
         .reset = drm_atomic_helper_connector_reset,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+        .late_register = sti_dvo_late_register,
 };
 
 static struct drm_encoder *sti_dvo_find_encoder(struct drm_device *dev)
@@ -509,26 +497,16 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
         drm_connector_helper_add(drm_connector,
                                  &sti_dvo_connector_helper_funcs);
 
-        err = drm_connector_register(drm_connector);
-        if (err)
-                goto err_connector;
-
         err = drm_mode_connector_attach_encoder(drm_connector, encoder);
         if (err) {
                 DRM_ERROR("Failed to attach a connector to a encoder\n");
                 goto err_sysfs;
         }
 
-        if (dvo_debugfs_init(dvo, drm_dev->primary))
-                DRM_ERROR("DVO debugfs setup failed\n");
-
         return 0;
 
 err_sysfs:
-        drm_connector_unregister(drm_connector);
-err_connector:
         drm_bridge_remove(bridge);
-        drm_connector_cleanup(drm_connector);
         return -EINVAL;
 }
 
diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
index ff33c38da197..bf63086a3dc8 100644
--- a/drivers/gpu/drm/sti/sti_gdp.c
+++ b/drivers/gpu/drm/sti/sti_gdp.c
@@ -208,14 +208,8 @@ static int gdp_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_gdp *gdp = (struct sti_gdp *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
         struct drm_plane *drm_plane = &gdp->plane.drm_plane;
         struct drm_crtc *crtc = drm_plane->crtc;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "%s: (vaddr = 0x%p)",
                    sti_plane_to_str(&gdp->plane), gdp->regs);
@@ -248,7 +242,6 @@ static int gdp_dbg_show(struct seq_file *s, void *data)
                 seq_printf(s, "  Connected to DRM CRTC #%d (%s)\n",
                            crtc->base.id, sti_mixer_to_str(to_sti_mixer(crtc)));
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -279,13 +272,7 @@ static int gdp_node_dbg_show(struct seq_file *s, void *arg)
 {
         struct drm_info_node *node = s->private;
         struct sti_gdp *gdp = (struct sti_gdp *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
         unsigned int b;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         for (b = 0; b < GDP_NODE_NB_BANK; b++) {
                 seq_printf(s, "\n%s[%d].top", sti_plane_to_str(&gdp->plane), b);
@@ -294,7 +281,6 @@ static int gdp_node_dbg_show(struct seq_file *s, void *arg)
                 gdp_node_dump_node(s, gdp->node_list[b].btm_field);
         }
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -880,6 +866,33 @@ static const struct drm_plane_helper_funcs sti_gdp_helpers_funcs = {
         .atomic_disable = sti_gdp_atomic_disable,
 };
 
+static void sti_gdp_destroy(struct drm_plane *drm_plane)
+{
+        DRM_DEBUG_DRIVER("\n");
+
+        drm_plane_helper_disable(drm_plane);
+        drm_plane_cleanup(drm_plane);
+}
+
+static int sti_gdp_late_register(struct drm_plane *drm_plane)
+{
+        struct sti_plane *plane = to_sti_plane(drm_plane);
+        struct sti_gdp *gdp = to_sti_gdp(plane);
+
+        return gdp_debugfs_init(gdp, drm_plane->dev->primary);
+}
+
+struct drm_plane_funcs sti_gdp_plane_helpers_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = sti_gdp_destroy,
+        .set_property = sti_plane_set_property,
+        .reset = drm_atomic_helper_plane_reset,
+        .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+        .late_register = sti_gdp_late_register,
+};
+
 struct drm_plane *sti_gdp_create(struct drm_device *drm_dev,
                                  struct device *dev, int desc,
                                  void __iomem *baseaddr,
@@ -906,7 +919,7 @@ struct drm_plane *sti_gdp_create(struct drm_device *drm_dev,
 
         res = drm_universal_plane_init(drm_dev, &gdp->plane.drm_plane,
                                        possible_crtcs,
-                                       &sti_plane_helpers_funcs,
+                                       &sti_gdp_plane_helpers_funcs,
                                        gdp_supported_formats,
                                        ARRAY_SIZE(gdp_supported_formats),
                                        type, NULL);
@@ -919,9 +932,6 @@ struct drm_plane *sti_gdp_create(struct drm_device *drm_dev,
 
         sti_plane_init_property(&gdp->plane, type);
 
-        if (gdp_debugfs_init(gdp, drm_dev->primary))
-                DRM_ERROR("GDP debugfs setup failed\n");
-
         return &gdp->plane.drm_plane;
 
 err:
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index f7d3464cdf09..8505569f75de 100644
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -376,12 +376,6 @@ static int hda_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_hda *hda = (struct sti_hda *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "HD Analog: (vaddr = 0x%p)", hda->regs);
         DBGFS_DUMP(HDA_ANA_CFG);
@@ -397,7 +391,6 @@ static int hda_dbg_show(struct seq_file *s, void *data)
                 hda_dbg_video_dacs_ctrl(s, hda->video_dacs_ctrl);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -676,20 +669,10 @@ static int sti_hda_connector_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-struct drm_encoder *sti_hda_best_encoder(struct drm_connector *connector)
-{
-        struct sti_hda_connector *hda_connector
-                = to_sti_hda_connector(connector);
-
-        /* Best encoder is the one associated during connector creation */
-        return hda_connector->encoder;
-}
-
 static const
 struct drm_connector_helper_funcs sti_hda_connector_helper_funcs = {
         .get_modes = sti_hda_connector_get_modes,
         .mode_valid = sti_hda_connector_mode_valid,
-        .best_encoder = sti_hda_best_encoder,
 };
 
 static enum drm_connector_status
@@ -698,24 +681,29 @@ sti_hda_connector_detect(struct drm_connector *connector, bool force)
         return connector_status_connected;
 }
 
-static void sti_hda_connector_destroy(struct drm_connector *connector)
+static int sti_hda_late_register(struct drm_connector *connector)
 {
         struct sti_hda_connector *hda_connector
                 = to_sti_hda_connector(connector);
+        struct sti_hda *hda = hda_connector->hda;
+
+        if (hda_debugfs_init(hda, hda->drm_dev->primary)) {
+                DRM_ERROR("HDA debugfs setup failed\n");
+                return -EINVAL;
+        }
 
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-        kfree(hda_connector);
+        return 0;
 }
 
 static const struct drm_connector_funcs sti_hda_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .detect = sti_hda_connector_detect,
-        .destroy = sti_hda_connector_destroy,
+        .destroy = drm_connector_cleanup,
         .reset = drm_atomic_helper_connector_reset,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+        .late_register = sti_hda_late_register,
 };
 
 static struct drm_encoder *sti_hda_find_encoder(struct drm_device *dev)
@@ -773,10 +761,6 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
         drm_connector_helper_add(drm_connector,
                         &sti_hda_connector_helper_funcs);
 
-        err = drm_connector_register(drm_connector);
-        if (err)
-                goto err_connector;
-
         err = drm_mode_connector_attach_encoder(drm_connector, encoder);
         if (err) {
                 DRM_ERROR("Failed to attach a connector to a encoder\n");
@@ -786,15 +770,10 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
         /* force to disable hd dacs at startup */
         hda_enable_hd_dacs(hda, false);
 
-        if (hda_debugfs_init(hda, drm_dev->primary))
-                DRM_ERROR("HDA debugfs setup failed\n");
-
         return 0;
 
 err_sysfs:
-        drm_connector_unregister(drm_connector);
-err_connector:
-        drm_connector_cleanup(drm_connector);
+        drm_bridge_remove(bridge);
         return -EINVAL;
 }
 
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 6ef0715bd5b9..fedc17f98d9b 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -18,6 +18,8 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_edid.h>
 
+#include <sound/hdmi-codec.h>
+
 #include "sti_hdmi.h"
 #include "sti_hdmi_tx3g4c28phy.h"
 #include "sti_hdmi_tx3g0c55phy.h"
@@ -35,6 +37,8 @@
 #define HDMI_DFLT_CHL0_DAT              0x0110
 #define HDMI_DFLT_CHL1_DAT              0x0114
 #define HDMI_DFLT_CHL2_DAT              0x0118
+#define HDMI_AUDIO_CFG                  0x0200
+#define HDMI_SPDIF_FIFO_STATUS          0x0204
 #define HDMI_SW_DI_1_HEAD_WORD          0x0210
 #define HDMI_SW_DI_1_PKT_WORD0          0x0214
 #define HDMI_SW_DI_1_PKT_WORD1          0x0218
@@ -44,6 +48,9 @@
 #define HDMI_SW_DI_1_PKT_WORD5          0x0228
 #define HDMI_SW_DI_1_PKT_WORD6          0x022C
 #define HDMI_SW_DI_CFG                  0x0230
+#define HDMI_SAMPLE_FLAT_MASK           0x0244
+#define HDMI_AUDN                       0x0400
+#define HDMI_AUD_CTS                    0x0404
 #define HDMI_SW_DI_2_HEAD_WORD          0x0600
 #define HDMI_SW_DI_2_PKT_WORD0          0x0604
 #define HDMI_SW_DI_2_PKT_WORD1          0x0608
@@ -103,6 +110,7 @@
 #define HDMI_INT_DLL_LCK                BIT(5)
 #define HDMI_INT_NEW_FRAME              BIT(6)
 #define HDMI_INT_GENCTRL_PKT            BIT(7)
+#define HDMI_INT_AUDIO_FIFO_XRUN        BIT(8)
 #define HDMI_INT_SINK_TERM_PRESENT      BIT(11)
 
 #define HDMI_DEFAULT_INT (HDMI_INT_SINK_TERM_PRESENT \
@@ -111,6 +119,7 @@
                         | HDMI_INT_GLOBAL)
 
 #define HDMI_WORKING_INT (HDMI_INT_SINK_TERM_PRESENT \
+                        | HDMI_INT_AUDIO_FIFO_XRUN \
                         | HDMI_INT_GENCTRL_PKT \
                         | HDMI_INT_NEW_FRAME \
                         | HDMI_INT_DLL_LCK \
@@ -121,6 +130,27 @@
 
 #define HDMI_STA_SW_RST                 BIT(1)
 
+#define HDMI_AUD_CFG_8CH                BIT(0)
+#define HDMI_AUD_CFG_SPDIF_DIV_2        BIT(1)
+#define HDMI_AUD_CFG_SPDIF_DIV_3        BIT(2)
+#define HDMI_AUD_CFG_SPDIF_CLK_DIV_4    (BIT(1) | BIT(2))
+#define HDMI_AUD_CFG_CTS_CLK_256FS      BIT(12)
+#define HDMI_AUD_CFG_DTS_INVALID        BIT(16)
+#define HDMI_AUD_CFG_ONE_BIT_INVALID    (BIT(18) | BIT(19) | BIT(20) |  BIT(21))
+#define HDMI_AUD_CFG_CH12_VALID BIT(28)
+#define HDMI_AUD_CFG_CH34_VALID BIT(29)
+#define HDMI_AUD_CFG_CH56_VALID BIT(30)
+#define HDMI_AUD_CFG_CH78_VALID BIT(31)
+
+/* sample flat mask */
+#define HDMI_SAMPLE_FLAT_NO      0
+#define HDMI_SAMPLE_FLAT_SP0 BIT(0)
+#define HDMI_SAMPLE_FLAT_SP1 BIT(1)
+#define HDMI_SAMPLE_FLAT_SP2 BIT(2)
+#define HDMI_SAMPLE_FLAT_SP3 BIT(3)
+#define HDMI_SAMPLE_FLAT_ALL (HDMI_SAMPLE_FLAT_SP0 | HDMI_SAMPLE_FLAT_SP1 |\
+                              HDMI_SAMPLE_FLAT_SP2 | HDMI_SAMPLE_FLAT_SP3)
+
 #define HDMI_INFOFRAME_HEADER_TYPE(x)    (((x) & 0xff) <<  0)
 #define HDMI_INFOFRAME_HEADER_VERSION(x) (((x) & 0xff) <<  8)
 #define HDMI_INFOFRAME_HEADER_LEN(x)     (((x) & 0x0f) << 16)
@@ -171,6 +201,10 @@ static irqreturn_t hdmi_irq_thread(int irq, void *arg)
                 wake_up_interruptible(&hdmi->wait_event);
         }
 
+        /* Audio FIFO underrun IRQ */
+        if (hdmi->irq_status & HDMI_INT_AUDIO_FIFO_XRUN)
+                DRM_INFO("Warning: audio FIFO underrun occurs!");
+
         return IRQ_HANDLED;
 }
 
@@ -441,26 +475,29 @@ static int hdmi_avi_infoframe_config(struct sti_hdmi *hdmi)
  */
 static int hdmi_audio_infoframe_config(struct sti_hdmi *hdmi)
 {
-        struct hdmi_audio_infoframe infofame;
+        struct hdmi_audio_params *audio = &hdmi->audio;
         u8 buffer[HDMI_INFOFRAME_SIZE(AUDIO)];
-        int ret;
-
-        ret = hdmi_audio_infoframe_init(&infofame);
-        if (ret < 0) {
-                DRM_ERROR("failed to setup audio infoframe: %d\n", ret);
-                return ret;
-        }
-
-        infofame.channels = 2;
-
-        ret = hdmi_audio_infoframe_pack(&infofame, buffer, sizeof(buffer));
-        if (ret < 0) {
-                DRM_ERROR("failed to pack audio infoframe: %d\n", ret);
-                return ret;
+        int ret, val;
+
+        DRM_DEBUG_DRIVER("enter %s, AIF %s\n", __func__,
+                         audio->enabled ? "enable" : "disable");
+        if (audio->enabled) {
+                /* set audio parameters stored*/
+                ret = hdmi_audio_infoframe_pack(&audio->cea, buffer,
+                                                sizeof(buffer));
+                if (ret < 0) {
+                        DRM_ERROR("failed to pack audio infoframe: %d\n", ret);
+                        return ret;
+                }
+                hdmi_infoframe_write_infopack(hdmi, buffer, ret);
+        } else {
+                /*disable audio info frame transmission */
+                val = hdmi_read(hdmi, HDMI_SW_DI_CFG);
+                val &= ~HDMI_IFRAME_CFG_DI_N(HDMI_IFRAME_MASK,
+                                             HDMI_IFRAME_SLOT_AUDIO);
+                hdmi_write(hdmi, val, HDMI_SW_DI_CFG);
         }
 
-        hdmi_infoframe_write_infopack(hdmi, buffer, ret);
-
         return 0;
 }
 
@@ -628,12 +665,6 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_hdmi *hdmi = (struct sti_hdmi *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "HDMI: (vaddr = 0x%p)", hdmi->regs);
         DBGFS_DUMP("\n", HDMI_CFG);
@@ -656,6 +687,10 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
         DBGFS_DUMP("", HDMI_SW_DI_CFG);
         hdmi_dbg_sw_di_cfg(s, hdmi_read(hdmi, HDMI_SW_DI_CFG));
 
+        DBGFS_DUMP("\n", HDMI_AUDIO_CFG);
+        DBGFS_DUMP("\n", HDMI_SPDIF_FIFO_STATUS);
+        DBGFS_DUMP("\n", HDMI_AUDN);
+
         seq_printf(s, "\n AVI Infoframe (Data Island slot N=%d):",
                    HDMI_IFRAME_SLOT_AVI);
         DBGFS_DUMP_DI(HDMI_SW_DI_N_HEAD_WORD, HDMI_IFRAME_SLOT_AVI);
@@ -690,7 +725,6 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
         DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_VENDOR);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -861,6 +895,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
 
         count = drm_add_edid_modes(connector, edid);
         drm_mode_connector_update_edid_property(connector, edid);
+        drm_edid_to_eld(connector, edid);
 
         kfree(edid);
         return count;
@@ -897,20 +932,10 @@ static int sti_hdmi_connector_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-struct drm_encoder *sti_hdmi_best_encoder(struct drm_connector *connector)
-{
-        struct sti_hdmi_connector *hdmi_connector
-                = to_sti_hdmi_connector(connector);
-
-        /* Best encoder is the one associated during connector creation */
-        return hdmi_connector->encoder;
-}
-
 static const
 struct drm_connector_helper_funcs sti_hdmi_connector_helper_funcs = {
         .get_modes = sti_hdmi_connector_get_modes,
         .mode_valid = sti_hdmi_connector_mode_valid,
-        .best_encoder = sti_hdmi_best_encoder,
 };
 
 /* get detection status of display device */
@@ -932,16 +957,6 @@ sti_hdmi_connector_detect(struct drm_connector *connector, bool force)
         return connector_status_disconnected;
 }
 
-static void sti_hdmi_connector_destroy(struct drm_connector *connector)
-{
-        struct sti_hdmi_connector *hdmi_connector
-                = to_sti_hdmi_connector(connector);
-
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-        kfree(hdmi_connector);
-}
-
 static void sti_hdmi_connector_init_property(struct drm_device *drm_dev,
                                              struct drm_connector *connector)
 {
@@ -1024,17 +1039,31 @@ sti_hdmi_connector_get_property(struct drm_connector *connector,
         return -EINVAL;
 }
 
+static int sti_hdmi_late_register(struct drm_connector *connector)
+{
+        struct sti_hdmi_connector *hdmi_connector
+                = to_sti_hdmi_connector(connector);
+        struct sti_hdmi *hdmi = hdmi_connector->hdmi;
+
+        if (hdmi_debugfs_init(hdmi, hdmi->drm_dev->primary)) {
+                DRM_ERROR("HDMI debugfs setup failed\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static const struct drm_connector_funcs sti_hdmi_connector_funcs = {
-        .dpms = drm_atomic_helper_connector_dpms,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .detect = sti_hdmi_connector_detect,
-        .destroy = sti_hdmi_connector_destroy,
+        .destroy = drm_connector_cleanup,
         .reset = drm_atomic_helper_connector_reset,
         .set_property = drm_atomic_helper_connector_set_property,
         .atomic_set_property = sti_hdmi_connector_set_property,
         .atomic_get_property = sti_hdmi_connector_get_property,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+        .late_register = sti_hdmi_late_register,
 };
 
 static struct drm_encoder *sti_hdmi_find_encoder(struct drm_device *dev)
@@ -1049,6 +1078,207 @@ static struct drm_encoder *sti_hdmi_find_encoder(struct drm_device *dev)
         return NULL;
 }
 
+/**
+ * sti_hdmi_audio_get_non_coherent_n() - get N parameter for non-coherent
+ * clocks. None-coherent clocks means that audio and TMDS clocks have not the
+ * same source (drifts between clocks). In this case assumption is that CTS is
+ * automatically calculated by hardware.
+ *
+ * @audio_fs: audio frame clock frequency in Hz
+ *
+ * Values computed are based on table described in HDMI specification 1.4b
+ *
+ * Returns n value.
+ */
+static int sti_hdmi_audio_get_non_coherent_n(unsigned int audio_fs)
+{
+        unsigned int n;
+
+        switch (audio_fs) {
+        case 32000:
+                n = 4096;
+                break;
+        case 44100:
+                n = 6272;
+                break;
+        case 48000:
+                n = 6144;
+                break;
+        case 88200:
+                n = 6272 * 2;
+                break;
+        case 96000:
+                n = 6144 * 2;
+                break;
+        case 176400:
+                n = 6272 * 4;
+                break;
+        case 192000:
+                n = 6144 * 4;
+                break;
+        default:
+                /* Not pre-defined, recommended value: 128 * fs / 1000 */
+                n = (audio_fs * 128) / 1000;
+        }
+
+        return n;
+}
+
+static int hdmi_audio_configure(struct sti_hdmi *hdmi,
+                                struct hdmi_audio_params *params)
+{
+        int audio_cfg, n;
+        struct hdmi_audio_infoframe *info = &params->cea;
+
+        DRM_DEBUG_DRIVER("\n");
+
+        if (!hdmi->enabled)
+                return 0;
+
+        /* update N parameter */
+        n = sti_hdmi_audio_get_non_coherent_n(params->sample_rate);
+
+        DRM_DEBUG_DRIVER("Audio rate = %d Hz, TMDS clock = %d Hz, n = %d\n",
+                         params->sample_rate, hdmi->mode.clock * 1000, n);
+        hdmi_write(hdmi, n, HDMI_AUDN);
+
+        /* update HDMI registers according to configuration */
+        audio_cfg = HDMI_AUD_CFG_SPDIF_DIV_2 | HDMI_AUD_CFG_DTS_INVALID |
+                    HDMI_AUD_CFG_ONE_BIT_INVALID;
+
+        switch (info->channels) {
+        case 8:
+                audio_cfg |= HDMI_AUD_CFG_CH78_VALID;
+        case 6:
+                audio_cfg |= HDMI_AUD_CFG_CH56_VALID;
+        case 4:
+                audio_cfg |= HDMI_AUD_CFG_CH34_VALID | HDMI_AUD_CFG_8CH;
+        case 2:
+                audio_cfg |= HDMI_AUD_CFG_CH12_VALID;
+                break;
+        default:
+                DRM_ERROR("ERROR: Unsupported number of channels (%d)!\n",
+                          info->channels);
+                return -EINVAL;
+        }
+
+        hdmi_write(hdmi, audio_cfg, HDMI_AUDIO_CFG);
+
+        hdmi->audio = *params;
+
+        return hdmi_audio_infoframe_config(hdmi);
+}
+
+static void hdmi_audio_shutdown(struct device *dev, void *data)
+{
+        struct sti_hdmi *hdmi = dev_get_drvdata(dev);
+        int audio_cfg;
+
+        DRM_DEBUG_DRIVER("\n");
+
+        /* disable audio */
+        audio_cfg = HDMI_AUD_CFG_SPDIF_DIV_2 | HDMI_AUD_CFG_DTS_INVALID |
+                    HDMI_AUD_CFG_ONE_BIT_INVALID;
+        hdmi_write(hdmi, audio_cfg, HDMI_AUDIO_CFG);
+
+        hdmi->audio.enabled = 0;
+        hdmi_audio_infoframe_config(hdmi);
+}
+
+static int hdmi_audio_hw_params(struct device *dev,
+                                void *data,
+                                struct hdmi_codec_daifmt *daifmt,
+                                struct hdmi_codec_params *params)
+{
+        struct sti_hdmi *hdmi = dev_get_drvdata(dev);
+        int ret;
+        struct hdmi_audio_params audio = {
+                .sample_width = params->sample_width,
+                .sample_rate = params->sample_rate,
+                .cea = params->cea,
+        };
+
+        DRM_DEBUG_DRIVER("\n");
+
+        if (!hdmi->enabled)
+                return 0;
+
+        if ((daifmt->fmt != HDMI_I2S) || daifmt->bit_clk_inv ||
+            daifmt->frame_clk_inv || daifmt->bit_clk_master ||
+            daifmt->frame_clk_master) {
+                dev_err(dev, "%s: Bad flags %d %d %d %d\n", __func__,
+                        daifmt->bit_clk_inv, daifmt->frame_clk_inv,
+                        daifmt->bit_clk_master,
+                        daifmt->frame_clk_master);
+                return -EINVAL;
+        }
+
+        audio.enabled = 1;
+
+        ret = hdmi_audio_configure(hdmi, &audio);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)
+{
+        struct sti_hdmi *hdmi = dev_get_drvdata(dev);
+
+        DRM_DEBUG_DRIVER("%s\n", enable ? "enable" : "disable");
+
+        if (enable)
+                hdmi_write(hdmi, HDMI_SAMPLE_FLAT_ALL, HDMI_SAMPLE_FLAT_MASK);
+        else
+                hdmi_write(hdmi, HDMI_SAMPLE_FLAT_NO, HDMI_SAMPLE_FLAT_MASK);
+
+        return 0;
+}
+
+static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len)
+{
+        struct sti_hdmi *hdmi = dev_get_drvdata(dev);
+        struct drm_connector *connector = hdmi->drm_connector;
+
+        DRM_DEBUG_DRIVER("\n");
+        memcpy(buf, connector->eld, min(sizeof(connector->eld), len));
+
+        return 0;
+}
+
+static const struct hdmi_codec_ops audio_codec_ops = {
+        .hw_params = hdmi_audio_hw_params,
+        .audio_shutdown = hdmi_audio_shutdown,
+        .digital_mute = hdmi_audio_digital_mute,
+        .get_eld = hdmi_audio_get_eld,
+};
+
+static int sti_hdmi_register_audio_driver(struct device *dev,
+                                          struct sti_hdmi *hdmi)
+{
+        struct hdmi_codec_pdata codec_data = {
+                .ops = &audio_codec_ops,
+                .max_i2s_channels = 8,
+                .i2s = 1,
+        };
+
+        DRM_DEBUG_DRIVER("\n");
+
+        hdmi->audio.enabled = 0;
+
+        hdmi->audio_pdev = platform_device_register_data(
+                dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
+                &codec_data, sizeof(codec_data));
+
+        if (IS_ERR(hdmi->audio_pdev))
+                return PTR_ERR(hdmi->audio_pdev);
+
+        DRM_INFO("%s Driver bound %s\n", HDMI_CODEC_DRV_NAME, dev_name(dev));
+
+        return 0;
+}
+
 static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
 {
         struct sti_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1095,9 +1325,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
         /* initialise property */
         sti_hdmi_connector_init_property(drm_dev, drm_connector);
 
-        err = drm_connector_register(drm_connector);
-        if (err)
-                goto err_connector;
+        hdmi->drm_connector = drm_connector;
 
         err = drm_mode_connector_attach_encoder(drm_connector, encoder);
         if (err) {
@@ -1105,19 +1333,27 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
                 goto err_sysfs;
         }
 
+        err = sti_hdmi_register_audio_driver(dev, hdmi);
+        if (err) {
+                DRM_ERROR("Failed to attach an audio codec\n");
+                goto err_sysfs;
+        }
+
+        /* Initialize audio infoframe */
+        err = hdmi_audio_infoframe_init(&hdmi->audio.cea);
+        if (err) {
+                DRM_ERROR("Failed to init audio infoframe\n");
+                goto err_sysfs;
+        }
+
         /* Enable default interrupts */
         hdmi_write(hdmi, HDMI_DEFAULT_INT, HDMI_INT_EN);
 
-        if (hdmi_debugfs_init(hdmi, drm_dev->primary))
-                DRM_ERROR("HDMI debugfs setup failed\n");
-
         return 0;
 
 err_sysfs:
-        drm_connector_unregister(drm_connector);
-err_connector:
-        drm_connector_cleanup(drm_connector);
-
+        drm_bridge_remove(bridge);
+        hdmi->drm_connector = NULL;
         return -EINVAL;
 }
 
@@ -1267,6 +1503,8 @@ static int sti_hdmi_remove(struct platform_device *pdev)
         struct sti_hdmi *hdmi = dev_get_drvdata(&pdev->dev);
 
         i2c_put_adapter(hdmi->ddc_adapt);
+        if (hdmi->audio_pdev)
+                platform_device_unregister(hdmi->audio_pdev);
         component_del(&pdev->dev, &sti_hdmi_ops);
 
         return 0;
diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h
index ef3a94583bbd..119bc3582ac7 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.h
+++ b/drivers/gpu/drm/sti/sti_hdmi.h
@@ -23,6 +23,13 @@ struct hdmi_phy_ops {
         void (*stop)(struct sti_hdmi *hdmi);
 };
 
+struct hdmi_audio_params {
+        bool enabled;
+        unsigned int sample_width;
+        unsigned int sample_rate;
+        struct hdmi_audio_infoframe cea;
+};
+
 /* values for the framing mode property */
 enum sti_hdmi_modes {
         HDMI_MODE_HDMI,
@@ -67,6 +74,9 @@ static const struct drm_prop_enum_list colorspace_mode_names[] = {
  * @ddc_adapt: i2c ddc adapter
  * @colorspace: current colorspace selected
  * @hdmi_mode: select framing for HDMI or DVI
+ * @audio_pdev: ASoC hdmi-codec platform device
+ * @audio: hdmi audio parameters.
+ * @drm_connector: hdmi connector
  */
 struct sti_hdmi {
         struct device dev;
@@ -89,6 +99,9 @@ struct sti_hdmi {
         struct i2c_adapter *ddc_adapt;
         enum hdmi_colorspace colorspace;
         enum sti_hdmi_modes hdmi_mode;
+        struct platform_device *audio_pdev;
+        struct hdmi_audio_params audio;
+        struct drm_connector *drm_connector;
 };
 
 u32 hdmi_read(struct sti_hdmi *hdmi, int offset);
diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c
index 1edec29b9e45..33d2f42550cc 100644
--- a/drivers/gpu/drm/sti/sti_hqvdp.c
+++ b/drivers/gpu/drm/sti/sti_hqvdp.c
@@ -555,14 +555,8 @@ static int hqvdp_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_hqvdp *hqvdp = (struct sti_hqvdp *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
         int cmd, cmd_offset, infoxp70;
         void *virt;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "%s: (vaddr = 0x%p)",
                    sti_plane_to_str(&hqvdp->plane), hqvdp->regs);
@@ -630,7 +624,6 @@ static int hqvdp_dbg_show(struct seq_file *s, void *data)
 
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -1241,6 +1234,33 @@ static const struct drm_plane_helper_funcs sti_hqvdp_helpers_funcs = {
         .atomic_disable = sti_hqvdp_atomic_disable,
 };
 
+static void sti_hqvdp_destroy(struct drm_plane *drm_plane)
+{
+        DRM_DEBUG_DRIVER("\n");
+
+        drm_plane_helper_disable(drm_plane);
+        drm_plane_cleanup(drm_plane);
+}
+
+static int sti_hqvdp_late_register(struct drm_plane *drm_plane)
+{
+        struct sti_plane *plane = to_sti_plane(drm_plane);
+        struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
+
+        return hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary);
+}
+
+struct drm_plane_funcs sti_hqvdp_plane_helpers_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = sti_hqvdp_destroy,
+        .set_property = sti_plane_set_property,
+        .reset = drm_atomic_helper_plane_reset,
+        .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+        .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+        .late_register = sti_hqvdp_late_register,
+};
+
 static struct drm_plane *sti_hqvdp_create(struct drm_device *drm_dev,
                                           struct device *dev, int desc)
 {
@@ -1253,7 +1273,7 @@ static struct drm_plane *sti_hqvdp_create(struct drm_device *drm_dev,
         sti_hqvdp_init(hqvdp);
 
         res = drm_universal_plane_init(drm_dev, &hqvdp->plane.drm_plane, 1,
-                                       &sti_plane_helpers_funcs,
+                                       &sti_hqvdp_plane_helpers_funcs,
                                        hqvdp_supported_formats,
                                        ARRAY_SIZE(hqvdp_supported_formats),
                                        DRM_PLANE_TYPE_OVERLAY, NULL);
@@ -1266,9 +1286,6 @@ static struct drm_plane *sti_hqvdp_create(struct drm_device *drm_dev,
 
         sti_plane_init_property(&hqvdp->plane, DRM_PLANE_TYPE_OVERLAY);
 
-        if (hqvdp_debugfs_init(hqvdp, drm_dev->primary))
-                DRM_ERROR("HQVDP debugfs setup failed\n");
-
         return &hqvdp->plane.drm_plane;
 }
 
diff --git a/drivers/gpu/drm/sti/sti_mixer.c b/drivers/gpu/drm/sti/sti_mixer.c
index aed7801b51f7..1885c7ab5a8b 100644
--- a/drivers/gpu/drm/sti/sti_mixer.c
+++ b/drivers/gpu/drm/sti/sti_mixer.c
@@ -151,12 +151,6 @@ static int mixer_dbg_show(struct seq_file *s, void *arg)
 {
         struct drm_info_node *node = s->private;
         struct sti_mixer *mixer = (struct sti_mixer *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "%s: (vaddr = 0x%p)",
                    sti_mixer_to_str(mixer), mixer->regs);
@@ -176,7 +170,6 @@ static int mixer_dbg_show(struct seq_file *s, void *arg)
         mixer_dbg_mxn(s, mixer->regs + GAM_MIXER_MX0);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -188,7 +181,7 @@ static struct drm_info_list mixer1_debugfs_files[] = {
         { "mixer_aux", mixer_dbg_show, 0, NULL },
 };
 
-static int mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor)
+int sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor)
 {
         unsigned int i;
         struct drm_info_list *mixer_debugfs_files;
@@ -400,8 +393,5 @@ struct sti_mixer *sti_mixer_create(struct device *dev,
         DRM_DEBUG_DRIVER("%s created. Regs=%p\n",
                          sti_mixer_to_str(mixer), mixer->regs);
 
-        if (mixer_debugfs_init(mixer, drm_dev->primary))
-                DRM_ERROR("MIXER debugfs setup failed\n");
-
         return mixer;
 }
diff --git a/drivers/gpu/drm/sti/sti_mixer.h b/drivers/gpu/drm/sti/sti_mixer.h
index 6f35fc086873..830a3c42d886 100644
--- a/drivers/gpu/drm/sti/sti_mixer.h
+++ b/drivers/gpu/drm/sti/sti_mixer.h
@@ -55,6 +55,8 @@ int sti_mixer_active_video_area(struct sti_mixer *mixer,
 
 void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable);
 
+int sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor);
+
 /* depth in Cross-bar control = z order */
 #define GAM_MIXER_NB_DEPTH_LEVEL 6
 
diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c
index f10c98d3f012..0cf3335ef37c 100644
--- a/drivers/gpu/drm/sti/sti_plane.c
+++ b/drivers/gpu/drm/sti/sti_plane.c
@@ -45,25 +45,15 @@ const char *sti_plane_to_str(struct sti_plane *plane)
 
 #define STI_FPS_INTERVAL_MS     3000
 
-static int sti_plane_timespec_ms_diff(struct timespec lhs, struct timespec rhs)
-{
-        struct timespec tmp_ts = timespec_sub(lhs, rhs);
-        u64 tmp_ns = (u64)timespec_to_ns(&tmp_ts);
-
-        do_div(tmp_ns, NSEC_PER_MSEC);
-
-        return (u32)tmp_ns;
-}
-
 void sti_plane_update_fps(struct sti_plane *plane,
                           bool new_frame,
                           bool new_field)
 {
-        struct timespec now;
+        ktime_t now;
         struct sti_fps_info *fps;
         int fpks, fipks, ms_since_last, num_frames, num_fields;
 
-        getrawmonotonic(&now);
+        now = ktime_get();
 
         /* Compute number of frame updates */
         fps = &plane->fps_info;
@@ -76,7 +66,7 @@ void sti_plane_update_fps(struct sti_plane *plane,
                 return;
 
         fps->curr_frame_counter++;
-        ms_since_last = sti_plane_timespec_ms_diff(now, fps->last_timestamp);
+        ms_since_last = ktime_to_ms(ktime_sub(now, fps->last_timestamp));
         num_frames = fps->curr_frame_counter - fps->last_frame_counter;
 
         if (num_frames <= 0  || ms_since_last < STI_FPS_INTERVAL_MS)
@@ -106,17 +96,9 @@ void sti_plane_update_fps(struct sti_plane *plane,
                          plane->fps_info.fips_str);
 }
 
-static void sti_plane_destroy(struct drm_plane *drm_plane)
-{
-        DRM_DEBUG_DRIVER("\n");
-
-        drm_plane_helper_disable(drm_plane);
-        drm_plane_cleanup(drm_plane);
-}
-
-static int sti_plane_set_property(struct drm_plane *drm_plane,
-                                  struct drm_property *property,
-                                  uint64_t val)
+int sti_plane_set_property(struct drm_plane *drm_plane,
+                           struct drm_property *property,
+                           uint64_t val)
 {
         struct drm_device *dev = drm_plane->dev;
         struct sti_private *private = dev->dev_private;
@@ -170,13 +152,3 @@ void sti_plane_init_property(struct sti_plane *plane,
                          plane->drm_plane.base.id,
                          sti_plane_to_str(plane), plane->zorder);
 }
-
-struct drm_plane_funcs sti_plane_helpers_funcs = {
-        .update_plane = drm_atomic_helper_update_plane,
-        .disable_plane = drm_atomic_helper_disable_plane,
-        .destroy = sti_plane_destroy,
-        .set_property = sti_plane_set_property,
-        .reset = drm_atomic_helper_plane_reset,
-        .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
-        .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-};
diff --git a/drivers/gpu/drm/sti/sti_plane.h b/drivers/gpu/drm/sti/sti_plane.h
index c50a3b9f5d37..e0ea1dd3bb88 100644
--- a/drivers/gpu/drm/sti/sti_plane.h
+++ b/drivers/gpu/drm/sti/sti_plane.h
@@ -11,8 +11,6 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
 
-extern struct drm_plane_funcs sti_plane_helpers_funcs;
-
 #define to_sti_plane(x) container_of(x, struct sti_plane, drm_plane)
 
 #define STI_PLANE_TYPE_SHIFT 8
@@ -57,7 +55,7 @@ struct sti_fps_info {
         unsigned int last_frame_counter;
         unsigned int curr_field_counter;
         unsigned int last_field_counter;
-        struct timespec last_timestamp;
+        ktime_t      last_timestamp;
         char fps_str[FPS_LENGTH];
         char fips_str[FPS_LENGTH];
 };
@@ -83,6 +81,11 @@ const char *sti_plane_to_str(struct sti_plane *plane);
 void sti_plane_update_fps(struct sti_plane *plane,
                           bool new_frame,
                           bool new_field);
+
+int sti_plane_set_property(struct drm_plane *drm_plane,
+                           struct drm_property *property,
+                           uint64_t val);
+
 void sti_plane_init_property(struct sti_plane *plane,
                              enum drm_plane_type type);
 #endif
diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
index f983db5a59da..e25995b35715 100644
--- a/drivers/gpu/drm/sti/sti_tvout.c
+++ b/drivers/gpu/drm/sti/sti_tvout.c
@@ -112,6 +112,7 @@ struct sti_tvout {
         struct drm_encoder *hdmi;
         struct drm_encoder *hda;
         struct drm_encoder *dvo;
+        bool debugfs_registered;
 };
 
 struct sti_tvout_encoder {
@@ -515,13 +516,7 @@ static int tvout_dbg_show(struct seq_file *s, void *data)
 {
         struct drm_info_node *node = s->private;
         struct sti_tvout *tvout = (struct sti_tvout *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
         struct drm_crtc *crtc;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "TVOUT: (vaddr = 0x%p)", tvout->regs);
 
@@ -587,7 +582,6 @@ static int tvout_dbg_show(struct seq_file *s, void *data)
         DBGFS_DUMP(TVO_AUX_IN_VID_FORMAT);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -632,8 +626,37 @@ static void sti_tvout_encoder_destroy(struct drm_encoder *encoder)
         kfree(sti_encoder);
 }
 
+static int sti_tvout_late_register(struct drm_encoder *encoder)
+{
+        struct sti_tvout *tvout = to_sti_tvout(encoder);
+        int ret;
+
+        if (tvout->debugfs_registered)
+                return 0;
+
+        ret = tvout_debugfs_init(tvout, encoder->dev->primary);
+        if (ret)
+                return ret;
+
+        tvout->debugfs_registered = true;
+        return 0;
+}
+
+static void sti_tvout_early_unregister(struct drm_encoder *encoder)
+{
+        struct sti_tvout *tvout = to_sti_tvout(encoder);
+
+        if (!tvout->debugfs_registered)
+                return;
+
+        tvout_debugfs_exit(tvout, encoder->dev->primary);
+        tvout->debugfs_registered = false;
+}
+
 static const struct drm_encoder_funcs sti_tvout_encoder_funcs = {
         .destroy = sti_tvout_encoder_destroy,
+        .late_register = sti_tvout_late_register,
+        .early_unregister = sti_tvout_early_unregister,
 };
 
 static void sti_dvo_encoder_enable(struct drm_encoder *encoder)
@@ -820,9 +843,6 @@ static int sti_tvout_bind(struct device *dev, struct device *master, void *data)
 
         sti_tvout_create_encoders(drm_dev, tvout);
 
-        if (tvout_debugfs_init(tvout, drm_dev->primary))
-                DRM_ERROR("TVOUT debugfs setup failed\n");
-
         return 0;
 }
 
@@ -830,11 +850,8 @@ static void sti_tvout_unbind(struct device *dev, struct device *master,
         void *data)
 {
         struct sti_tvout *tvout = dev_get_drvdata(dev);
-        struct drm_device *drm_dev = data;
 
         sti_tvout_destroy_encoders(tvout);
-
-        tvout_debugfs_exit(tvout, drm_dev->primary);
 }
 
 static const struct component_ops sti_tvout_ops = {
diff --git a/drivers/gpu/drm/sti/sti_vid.c b/drivers/gpu/drm/sti/sti_vid.c
index 523ed19f5ac6..47634a0251fc 100644
--- a/drivers/gpu/drm/sti/sti_vid.c
+++ b/drivers/gpu/drm/sti/sti_vid.c
@@ -92,12 +92,6 @@ static int vid_dbg_show(struct seq_file *s, void *arg)
 {
         struct drm_info_node *node = s->private;
         struct sti_vid *vid = (struct sti_vid *)node->info_ent->data;
-        struct drm_device *dev = node->minor->dev;
-        int ret;
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
 
         seq_printf(s, "VID: (vaddr= 0x%p)", vid->regs);
 
@@ -122,7 +116,6 @@ static int vid_dbg_show(struct seq_file *s, void *arg)
         DBGFS_DUMP(VID_CSAT);
         seq_puts(s, "\n");
 
-        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -130,7 +123,7 @@ static struct drm_info_list vid_debugfs_files[] = {
         { "vid", vid_dbg_show, 0, NULL },
 };
 
-static int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)
+int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)
 {
         unsigned int i;
 
@@ -227,8 +220,5 @@ struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev,
 
         sti_vid_init(vid);
 
-        if (vid_debugfs_init(vid, drm_dev->primary))
-                DRM_ERROR("VID debugfs setup failed\n");
-
         return vid;
 }
diff --git a/drivers/gpu/drm/sti/sti_vid.h b/drivers/gpu/drm/sti/sti_vid.h
index 6c842344f3d8..fdc90f922a05 100644
--- a/drivers/gpu/drm/sti/sti_vid.h
+++ b/drivers/gpu/drm/sti/sti_vid.h
@@ -26,4 +26,6 @@ void sti_vid_disable(struct sti_vid *vid);
 struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev,
                                int id, void __iomem *baseaddr);
 
+int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor);
+
 #endif
diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c
index 6bf4ce466d20..957ce712ea44 100644
--- a/drivers/gpu/drm/sti/sti_vtg.c
+++ b/drivers/gpu/drm/sti/sti_vtg.c
@@ -65,7 +65,7 @@
 #define HDMI_DELAY          (5)
 
 /* Delay introduced by the DVO in nb of pixel */
-#define DVO_DELAY           (2)
+#define DVO_DELAY           (7)
 
 /* delay introduced by the Arbitrary Waveform Generator in nb of pixels */
 #define AWG_DELAY_HD        (-9)
diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index 99510e64e91a..a4b357db8856 100644
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -1,6 +1,6 @@
 config DRM_SUN4I
         tristate "DRM Support for Allwinner A10 Display Engine"
-        depends on DRM && ARM
+        depends on DRM && ARM && COMMON_CLK
         depends on ARCH_SUNXI || COMPILE_TEST
         select DRM_GEM_CMA_HELPER
         select DRM_KMS_HELPER
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index f7a15c1a93bf..3ab560450a82 100644
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -190,7 +190,7 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend,
         /* Get the physical address of the buffer in memory */
         gem = drm_fb_cma_get_gem_obj(fb, 0);
 
-        DRM_DEBUG_DRIVER("Using GEM @ 0x%x\n", gem->paddr);
+        DRM_DEBUG_DRIVER("Using GEM @ %pad\n", &gem->paddr);
 
         /* Compute the start of the displayed memory */
         bpp = drm_format_plane_cpp(fb->pixel_format, 0);
@@ -198,7 +198,7 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend,
         paddr += (state->src_x >> 16) * bpp;
         paddr += (state->src_y >> 16) * fb->pitches[0];
 
-        DRM_DEBUG_DRIVER("Setting buffer address to 0x%x\n", paddr);
+        DRM_DEBUG_DRIVER("Setting buffer address to %pad\n", &paddr);
 
         /* Write the 32 lower bits of the address (in bits) */
         lo_paddr = paddr << 3;
diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
index 4182a21f5923..f628b6d8f23f 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
@@ -51,10 +51,22 @@ static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc,
 {
         struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
         struct sun4i_drv *drv = scrtc->drv;
+        struct drm_pending_vblank_event *event = crtc->state->event;
 
         DRM_DEBUG_DRIVER("Committing plane changes\n");
 
         sun4i_backend_commit(drv->backend);
+
+        if (event) {
+                crtc->state->event = NULL;
+
+                spin_lock_irq(&crtc->dev->event_lock);
+                if (drm_crtc_vblank_get(crtc) == 0)
+                        drm_crtc_arm_vblank_event(crtc, event);
+                else
+                        drm_crtc_send_vblank_event(crtc, event);
+                spin_unlock_irq(&crtc->dev->event_lock);
+        }
 }
 
 static void sun4i_crtc_disable(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
index 3ff668cb463c..5b3463197c48 100644
--- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c
+++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
@@ -72,14 +72,40 @@ static unsigned long sun4i_dclk_recalc_rate(struct clk_hw *hw,
 static long sun4i_dclk_round_rate(struct clk_hw *hw, unsigned long rate,
                                   unsigned long *parent_rate)
 {
-        return *parent_rate / DIV_ROUND_CLOSEST(*parent_rate, rate);
+        unsigned long best_parent = 0;
+        u8 best_div = 1;
+        int i;
+
+        for (i = 6; i < 127; i++) {
+                unsigned long ideal = rate * i;
+                unsigned long rounded;
+
+                rounded = clk_hw_round_rate(clk_hw_get_parent(hw),
+                                            ideal);
+
+                if (rounded == ideal) {
+                        best_parent = rounded;
+                        best_div = i;
+                        goto out;
+                }
+
+                if ((rounded < ideal) && (rounded > best_parent)) {
+                        best_parent = rounded;
+                        best_div = i;
+                }
+        }
+
+out:
+        *parent_rate = best_parent;
+
+        return best_parent / best_div;
 }
 
 static int sun4i_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
                                unsigned long parent_rate)
 {
         struct sun4i_dclk *dclk = hw_to_dclk(hw);
-        int div = DIV_ROUND_CLOSEST(parent_rate, rate);
+        u8 div = parent_rate / rate;
 
         return regmap_update_bits(dclk->regmap, SUN4I_TCON0_DCLK_REG,
                                   GENMASK(6, 0), div);
@@ -127,10 +153,14 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon)
         const char *clk_name, *parent_name;
         struct clk_init_data init;
         struct sun4i_dclk *dclk;
+        int ret;
 
         parent_name = __clk_get_name(tcon->sclk0);
-        of_property_read_string_index(dev->of_node, "clock-output-names", 0,
-                                      &clk_name);
+        ret = of_property_read_string_index(dev->of_node,
+                                            "clock-output-names", 0,
+                                            &clk_name);
+        if (ret)
+                return ret;
 
         dclk = devm_kzalloc(dev, sizeof(*dclk), GFP_KERNEL);
         if (!dclk)
@@ -140,6 +170,7 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon)
         init.ops = &sun4i_dclk_ops;
         init.parent_names = &parent_name;
         init.num_parents = 1;
+        init.flags = CLK_SET_RATE_PARENT;
 
         dclk->regmap = tcon->regs;
         dclk->hw.init = &init;
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 76e922bb60e5..5b89940edcb1 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -24,34 +24,6 @@
 #include "sun4i_layer.h"
 #include "sun4i_tcon.h"
 
-static int sun4i_drv_connector_plug_all(struct drm_device *drm)
-{
-        struct drm_connector *connector, *failed;
-        int ret;
-
-        mutex_lock(&drm->mode_config.mutex);
-        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
-                ret = drm_connector_register(connector);
-                if (ret) {
-                        failed = connector;
-                        goto err;
-                }
-        }
-        mutex_unlock(&drm->mode_config.mutex);
-        return 0;
-
-err:
-        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
-                if (failed == connector)
-                        break;
-
-                drm_connector_unregister(connector);
-        }
-        mutex_unlock(&drm->mode_config.mutex);
-
-        return ret;
-}
-
 static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe)
 {
         struct sun4i_drv *drv = drm->dev_private;
@@ -103,7 +75,7 @@ static struct drm_driver sun4i_drv_driver = {
         .dumb_create            = drm_gem_cma_dumb_create,
         .dumb_destroy           = drm_gem_dumb_destroy,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
-        .gem_free_object        = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
 
         /* PRIME Operations */
@@ -125,6 +97,22 @@ static struct drm_driver sun4i_drv_driver = {
         .disable_vblank         = sun4i_drv_disable_vblank,
 };
 
+static void sun4i_remove_framebuffers(void)
+{
+        struct apertures_struct *ap;
+
+        ap = alloc_apertures(1);
+        if (!ap)
+                return;
+
+        /* The framebuffer can be located anywhere in RAM */
+        ap->ranges[0].base = 0;
+        ap->ranges[0].size = ~0;
+
+        remove_conflicting_framebuffers(ap, "sun4i-drm-fb", false);
+        kfree(ap);
+}
+
 static int sun4i_drv_bind(struct device *dev)
 {
         struct drm_device *drm;
@@ -135,10 +123,6 @@ static int sun4i_drv_bind(struct device *dev)
         if (!drm)
                 return -ENOMEM;
 
-        ret = drm_dev_set_unique(drm, dev_name(drm->dev));
-        if (ret)
-                goto free_drm;
-
         drv = devm_kzalloc(dev, sizeof(*drv), GFP_KERNEL);
         if (!drv) {
                 ret = -ENOMEM;
@@ -172,6 +156,9 @@ static int sun4i_drv_bind(struct device *dev)
         }
         drm->irq_enabled = true;
 
+        /* Remove early framebuffers (ie. simplefb) */
+        sun4i_remove_framebuffers();
+
         /* Create our framebuffer */
         drv->fbdev = sun4i_framebuffer_init(drm);
         if (IS_ERR(drv->fbdev)) {
@@ -187,14 +174,8 @@ static int sun4i_drv_bind(struct device *dev)
         if (ret)
                 goto free_drm;
 
-        ret = sun4i_drv_connector_plug_all(drm);
-        if (ret)
-                goto unregister_drm;
-
         return 0;
 
-unregister_drm:
-        drm_dev_unregister(drm);
 free_drm:
         drm_dev_unref(drm);
         return ret;
@@ -204,6 +185,7 @@ static void sun4i_drv_unbind(struct device *dev)
 {
         struct drm_device *drm = dev_get_drvdata(dev);
 
+        drm_connector_unregister_all(drm);
         drm_dev_unregister(drm);
         drm_kms_helper_poll_fini(drm);
         sun4i_framebuffer_free(drm);
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index ab6494818050..f5bbac6efb4c 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -54,8 +54,13 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector)
 static int sun4i_rgb_mode_valid(struct drm_connector *connector,
                                 struct drm_display_mode *mode)
 {
+        struct sun4i_rgb *rgb = drm_connector_to_sun4i_rgb(connector);
+        struct sun4i_drv *drv = rgb->drv;
+        struct sun4i_tcon *tcon = drv->tcon;
         u32 hsync = mode->hsync_end - mode->hsync_start;
         u32 vsync = mode->vsync_end - mode->vsync_start;
+        unsigned long rate = mode->clock * 1000;
+        long rounded_rate;
 
         DRM_DEBUG_DRIVER("Validating modes...\n");
 
@@ -87,22 +92,21 @@ static int sun4i_rgb_mode_valid(struct drm_connector *connector,
 
         DRM_DEBUG_DRIVER("Vertical parameters OK\n");
 
-        return MODE_OK;
-}
+        rounded_rate = clk_round_rate(tcon->dclk, rate);
+        if (rounded_rate < rate)
+                return MODE_CLOCK_LOW;
 
-static struct drm_encoder *
-sun4i_rgb_best_encoder(struct drm_connector *connector)
-{
-        struct sun4i_rgb *rgb =
-                drm_connector_to_sun4i_rgb(connector);
+        if (rounded_rate > rate)
+                return MODE_CLOCK_HIGH;
 
-        return &rgb->encoder;
+        DRM_DEBUG_DRIVER("Clock rate OK\n");
+
+        return MODE_OK;
 }
 
 static struct drm_connector_helper_funcs sun4i_rgb_con_helper_funcs = {
         .get_modes      = sun4i_rgb_get_modes,
         .mode_valid     = sun4i_rgb_mode_valid,
-        .best_encoder   = sun4i_rgb_best_encoder,
 };
 
 static enum drm_connector_status
@@ -203,7 +207,7 @@ int sun4i_rgb_init(struct drm_device *drm)
         int ret;
 
         /* If we don't have a panel, there's no point in going on */
-        if (!tcon->panel)
+        if (IS_ERR(tcon->panel))
                 return -ENODEV;
 
         rgb = devm_kzalloc(drm->dev, sizeof(*rgb), GFP_KERNEL);
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 9f19b0e08560..652385f09735 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -425,11 +425,11 @@ static struct drm_panel *sun4i_tcon_find_panel(struct device_node *node)
 
         remote = of_graph_get_remote_port_parent(end_node);
         if (!remote) {
-                DRM_DEBUG_DRIVER("Enable to parse remote node\n");
+                DRM_DEBUG_DRIVER("Unable to parse remote node\n");
                 return ERR_PTR(-EINVAL);
         }
 
-        return of_drm_find_panel(remote);
+        return of_drm_find_panel(remote) ?: ERR_PTR(-EPROBE_DEFER);
 }
 
 static int sun4i_tcon_bind(struct device *dev, struct device *master,
@@ -490,7 +490,11 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
                 return 0;
         }
 
-        return sun4i_rgb_init(drm);
+        ret = sun4i_rgb_init(drm);
+        if (ret < 0)
+                goto err_free_clocks;
+
+        return 0;
 
 err_free_clocks:
         sun4i_tcon_free_clocks(tcon);
@@ -522,12 +526,13 @@ static int sun4i_tcon_probe(struct platform_device *pdev)
          * Defer the probe.
          */
         panel = sun4i_tcon_find_panel(node);
-        if (IS_ERR(panel)) {
-                /*
-                 * If we don't have a panel endpoint, just go on
-                 */
-                if (PTR_ERR(panel) != -ENODEV)
-                        return -EPROBE_DEFER;
+
+        /*
+         * If we don't have a panel endpoint, just go on
+         */
+        if (PTR_ERR(panel) == -EPROBE_DEFER) {
+                DRM_DEBUG_DRIVER("Still waiting for our panel. Deferring...\n");
+                return -EPROBE_DEFER;
         }
 
         return component_add(&pdev->dev, &sun4i_tcon_ops);
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index bc047f923508..b84147896294 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -526,18 +526,9 @@ static int sun4i_tv_comp_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static struct drm_encoder *
-sun4i_tv_comp_best_encoder(struct drm_connector *connector)
-{
-        struct sun4i_tv *tv = drm_connector_to_sun4i_tv(connector);
-
-        return &tv->encoder;
-}
-
 static struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = {
         .get_modes      = sun4i_tv_comp_get_modes,
         .mode_valid     = sun4i_tv_comp_mode_valid,
-        .best_encoder   = sun4i_tv_comp_best_encoder,
 };
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index b59c3bf0df44..a177a42a9849 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -93,7 +93,7 @@ static int tegra_atomic_commit(struct drm_device *drm,
          * the software side now.
          */
 
-        drm_atomic_helper_swap_state(drm, state);
+        drm_atomic_helper_swap_state(state, true);
 
         if (nonblock)
                 tegra_atomic_schedule(tegra, state);
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index f52d6cb24ff5..0ddcce1b420d 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -239,8 +239,6 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output);
 void tegra_output_exit(struct tegra_output *output);
 
 int tegra_output_connector_get_modes(struct drm_connector *connector);
-struct drm_encoder *
-tegra_output_connector_best_encoder(struct drm_connector *connector);
 enum drm_connector_status
 tegra_output_connector_detect(struct drm_connector *connector, bool force);
 void tegra_output_connector_destroy(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index d1239ebc190f..099cccb2fbcb 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -794,7 +794,6 @@ tegra_dsi_connector_mode_valid(struct drm_connector *connector,
 static const struct drm_connector_helper_funcs tegra_dsi_connector_helper_funcs = {
         .get_modes = tegra_output_connector_get_modes,
         .mode_valid = tegra_dsi_connector_mode_valid,
-        .best_encoder = tegra_output_connector_best_encoder,
 };
 
 static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = {
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index b7ef4929e347..2fdb8796443e 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -806,7 +806,6 @@ static const struct drm_connector_helper_funcs
 tegra_hdmi_connector_helper_funcs = {
         .get_modes = tegra_output_connector_get_modes,
         .mode_valid = tegra_hdmi_connector_mode_valid,
-        .best_encoder = tegra_output_connector_best_encoder,
 };
 
 static const struct drm_encoder_funcs tegra_hdmi_encoder_funcs = {
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index 46664b622270..1480f6aaffe4 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -42,14 +42,6 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
         return err;
 }
 
-struct drm_encoder *
-tegra_output_connector_best_encoder(struct drm_connector *connector)
-{
-        struct tegra_output *output = connector_to_output(connector);
-
-        return &output->encoder;
-}
-
 enum drm_connector_status
 tegra_output_connector_detect(struct drm_connector *connector, bool force)
 {
diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index e246334e0252..a131b44e2d6f 100644
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -112,7 +112,6 @@ tegra_rgb_connector_mode_valid(struct drm_connector *connector,
 static const struct drm_connector_helper_funcs tegra_rgb_connector_helper_funcs = {
         .get_modes = tegra_output_connector_get_modes,
         .mode_valid = tegra_rgb_connector_mode_valid,
-        .best_encoder = tegra_output_connector_best_encoder,
 };
 
 static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = {
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 757c6e8603af..34958d71284b 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -1087,7 +1087,6 @@ tegra_sor_connector_mode_valid(struct drm_connector *connector,
 static const struct drm_connector_helper_funcs tegra_sor_connector_helper_funcs = {
         .get_modes = tegra_sor_connector_get_modes,
         .mode_valid = tegra_sor_connector_mode_valid,
-        .best_encoder = tegra_output_connector_best_encoder,
 };
 
 static const struct drm_encoder_funcs tegra_sor_encoder_funcs = {
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 709bc903524d..d27809372d54 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -541,7 +541,6 @@ static struct drm_driver tilcdc_driver = {
         .load               = tilcdc_load,
         .unload             = tilcdc_unload,
         .lastclose          = tilcdc_lastclose,
-        .set_busid          = drm_platform_set_busid,
         .irq_handler        = tilcdc_irq,
         .irq_preinstall     = tilcdc_irq_preinstall,
         .irq_postinstall    = tilcdc_irq_postinstall,
@@ -549,7 +548,7 @@ static struct drm_driver tilcdc_driver = {
         .get_vblank_counter = drm_vblank_no_hw_counter,
         .enable_vblank      = tilcdc_enable_vblank,
         .disable_vblank     = tilcdc_disable_vblank,
-        .gem_free_object    = drm_gem_cma_free_object,
+        .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops         = &drm_gem_cma_vm_ops,
         .dumb_create        = drm_gem_cma_dumb_create,
         .dumb_map_offset    = drm_gem_cma_dumb_map_offset,
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index b87afee44995..f92ea9579674 100644
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -376,7 +376,7 @@ static int udl_crtc_page_flip(struct drm_crtc *crtc,
 
         spin_lock_irqsave(&dev->event_lock, flags);
         if (event)
-                drm_send_vblank_event(dev, 0, event);
+                drm_crtc_send_vblank_event(crtc, event);
         spin_unlock_irqrestore(&dev->event_lock, flags);
         crtc->primary->fb = fb;
 
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
index e5a9d3aaf45f..59adcf8532dd 100644
--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -291,8 +291,6 @@ static void vc4_bo_cache_free_old(struct drm_device *dev)
 
 /* Called on the last userspace/kernel unreference of the BO.  Returns
  * it to the BO cache if possible, otherwise frees it.
- *
- * Note that this is called with the struct_mutex held.
  */
 void vc4_free_object(struct drm_gem_object *gem_bo)
 {
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 904d0754ad78..c82d468d178b 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -175,20 +175,22 @@ vc4_crtc_lut_load(struct drm_crtc *crtc)
                 HVS_WRITE(SCALER_GAMDATA, vc4_crtc->lut_b[i]);
 }
 
-static void
+static int
 vc4_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
-                   uint32_t start, uint32_t size)
+                   uint32_t size)
 {
         struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
         u32 i;
 
-        for (i = start; i < start + size; i++) {
+        for (i = 0; i < size; i++) {
                 vc4_crtc->lut_r[i] = r[i] >> 8;
                 vc4_crtc->lut_g[i] = g[i] >> 8;
                 vc4_crtc->lut_b[i] = b[i] >> 8;
         }
 
         vc4_crtc_lut_load(crtc);
+
+        return 0;
 }
 
 static u32 vc4_get_fifo_full_level(u32 format)
@@ -395,6 +397,7 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
         struct vc4_dev *vc4 = to_vc4_dev(dev);
         struct drm_plane *plane;
         unsigned long flags;
+        const struct drm_plane_state *plane_state;
         u32 dlist_count = 0;
         int ret;
 
@@ -404,18 +407,8 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
         if (hweight32(state->connector_mask) > 1)
                 return -EINVAL;
 
-        drm_atomic_crtc_state_for_each_plane(plane, state) {
-                struct drm_plane_state *plane_state =
-                        state->state->plane_states[drm_plane_index(plane)];
-
-                /* plane might not have changed, in which case take
-                 * current state:
-                 */
-                if (!plane_state)
-                        plane_state = plane->state;
-
+        drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, state)
                 dlist_count += vc4_plane_dlist_size(plane_state);
-        }
 
         dlist_count++; /* Account for SCALER_CTL0_END. */
 
@@ -456,14 +449,6 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
 
         WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm.size);
 
-        HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel),
-                  vc4_state->mm.start);
-
-        if (debug_dump_regs) {
-                DRM_INFO("CRTC %d HVS after:\n", drm_crtc_index(crtc));
-                vc4_hvs_dump_state(dev);
-        }
-
         if (crtc->state->event) {
                 unsigned long flags;
 
@@ -473,8 +458,20 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
 
                 spin_lock_irqsave(&dev->event_lock, flags);
                 vc4_crtc->event = crtc->state->event;
-                spin_unlock_irqrestore(&dev->event_lock, flags);
                 crtc->state->event = NULL;
+
+                HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel),
+                          vc4_state->mm.start);
+
+                spin_unlock_irqrestore(&dev->event_lock, flags);
+        } else {
+                HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel),
+                          vc4_state->mm.start);
+        }
+
+        if (debug_dump_regs) {
+                DRM_INFO("CRTC %d HVS after:\n", drm_crtc_index(crtc));
+                vc4_hvs_dump_state(dev);
         }
 }
 
@@ -500,12 +497,17 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc)
 {
         struct drm_crtc *crtc = &vc4_crtc->base;
         struct drm_device *dev = crtc->dev;
+        struct vc4_dev *vc4 = to_vc4_dev(dev);
+        struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+        u32 chan = vc4_crtc->channel;
         unsigned long flags;
 
         spin_lock_irqsave(&dev->event_lock, flags);
-        if (vc4_crtc->event) {
+        if (vc4_crtc->event &&
+            (vc4_state->mm.start == HVS_READ(SCALER_DISPLACTX(chan)))) {
                 drm_crtc_send_vblank_event(crtc, vc4_crtc->event);
                 vc4_crtc->event = NULL;
+                drm_crtc_vblank_put(crtc);
         }
         spin_unlock_irqrestore(&dev->event_lock, flags);
 }
@@ -556,6 +558,7 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb)
                 spin_unlock_irqrestore(&dev->event_lock, flags);
         }
 
+        drm_crtc_vblank_put(crtc);
         drm_framebuffer_unreference(flip_state->fb);
         kfree(flip_state);
 
@@ -598,6 +601,8 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
                 return ret;
         }
 
+        WARN_ON(drm_crtc_vblank_get(crtc) != 0);
+
         /* Immediately update the plane's legacy fb pointer, so that later
          * modeset prep sees the state that will be present when the semaphore
          * is released.
diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
index 9817dbfa4ac3..dba1114297e4 100644
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -208,14 +208,6 @@ static int vc4_dpi_connector_get_modes(struct drm_connector *connector)
         return 0;
 }
 
-static struct drm_encoder *
-vc4_dpi_connector_best_encoder(struct drm_connector *connector)
-{
-        struct vc4_dpi_connector *dpi_connector =
-                to_vc4_dpi_connector(connector);
-        return dpi_connector->encoder;
-}
-
 static const struct drm_connector_funcs vc4_dpi_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = vc4_dpi_connector_detect,
@@ -228,7 +220,6 @@ static const struct drm_connector_funcs vc4_dpi_connector_funcs = {
 
 static const struct drm_connector_helper_funcs vc4_dpi_connector_helper_funcs = {
         .get_modes = vc4_dpi_connector_get_modes,
-        .best_encoder = vc4_dpi_connector_best_encoder,
 };
 
 static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 3446ece21b4a..54d0471243dd 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -66,12 +66,12 @@ static const struct file_operations vc4_drm_fops = {
 };
 
 static const struct drm_ioctl_desc vc4_drm_ioctls[] = {
-        DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0),
-        DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0),
-        DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0),
-        DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0),
-        DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0),
-        DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0),
+        DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(VC4_GET_HANG_STATE, vc4_get_hang_state_ioctl,
                           DRM_ROOT_ONLY),
 };
@@ -91,7 +91,7 @@ static struct drm_driver vc4_drm_driver = {
 
         .enable_vblank = vc4_enable_vblank,
         .disable_vblank = vc4_disable_vblank,
-        .get_vblank_counter = drm_vblank_count,
+        .get_vblank_counter = drm_vblank_no_hw_counter,
 
 #if defined(CONFIG_DEBUG_FS)
         .debugfs_init = vc4_debugfs_init,
@@ -99,7 +99,7 @@ static struct drm_driver vc4_drm_driver = {
 #endif
 
         .gem_create_object = vc4_create_object,
-        .gem_free_object = vc4_free_object,
+        .gem_free_object_unlocked = vc4_free_object,
         .gem_vm_ops = &drm_gem_cma_vm_ops,
 
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
@@ -176,7 +176,6 @@ static int vc4_drm_bind(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct drm_device *drm;
-        struct drm_connector *connector;
         struct vc4_dev *vc4;
         int ret = 0;
 
@@ -211,22 +210,10 @@ static int vc4_drm_bind(struct device *dev)
         if (ret < 0)
                 goto unbind_all;
 
-        /* Connector registration has to occur after DRM device
-         * registration, because it creates sysfs entries based on the
-         * DRM device.
-         */
-        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
-                ret = drm_connector_register(connector);
-                if (ret)
-                        goto unregister;
-        }
-
         vc4_kms_load(drm);
 
         return 0;
 
-unregister:
-        drm_dev_unregister(drm);
 unbind_all:
         component_unbind_all(dev, drm);
 gem_destroy:
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 37cac59401d7..c799baabc008 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -469,7 +469,7 @@ int vc4_kms_load(struct drm_device *dev);
 struct drm_plane *vc4_plane_init(struct drm_device *dev,
                                  enum drm_plane_type type);
 u32 vc4_plane_write_dlist(struct drm_plane *plane, u32 __iomem *dlist);
-u32 vc4_plane_dlist_size(struct drm_plane_state *state);
+u32 vc4_plane_dlist_size(const struct drm_plane_state *state);
 void vc4_plane_async_set_fb(struct drm_plane *plane,
                             struct drm_framebuffer *fb);
 
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 46899d6de675..6155e8aca1c6 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -53,10 +53,8 @@ vc4_free_hang_state(struct drm_device *dev, struct vc4_hang_state *state)
 {
         unsigned int i;
 
-        mutex_lock(&dev->struct_mutex);
         for (i = 0; i < state->user_state.bo_count; i++)
-                drm_gem_object_unreference(state->bo[i]);
-        mutex_unlock(&dev->struct_mutex);
+                drm_gem_object_unreference_unlocked(state->bo[i]);
 
         kfree(state);
 }
@@ -687,11 +685,9 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
         struct vc4_dev *vc4 = to_vc4_dev(dev);
         unsigned i;
 
-        /* Need the struct lock for drm_gem_object_unreference(). */
-        mutex_lock(&dev->struct_mutex);
         if (exec->bo) {
                 for (i = 0; i < exec->bo_count; i++)
-                        drm_gem_object_unreference(&exec->bo[i]->base);
+                        drm_gem_object_unreference_unlocked(&exec->bo[i]->base);
                 kfree(exec->bo);
         }
 
@@ -699,9 +695,8 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
                 struct vc4_bo *bo = list_first_entry(&exec->unref_list,
                                                      struct vc4_bo, unref_head);
                 list_del(&bo->unref_head);
-                drm_gem_object_unreference(&bo->base.base);
+                drm_gem_object_unreference_unlocked(&bo->base.base);
         }
-        mutex_unlock(&dev->struct_mutex);
 
         mutex_lock(&vc4->power_lock);
         if (--vc4->power_refcount == 0)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index fd2644d231ff..68df91c3f860 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -208,14 +208,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
         return ret;
 }
 
-static struct drm_encoder *
-vc4_hdmi_connector_best_encoder(struct drm_connector *connector)
-{
-        struct vc4_hdmi_connector *hdmi_connector =
-                to_vc4_hdmi_connector(connector);
-        return hdmi_connector->encoder;
-}
-
 static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = vc4_hdmi_connector_detect,
@@ -228,7 +220,6 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
 
 static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = {
         .get_modes = vc4_hdmi_connector_get_modes,
-        .best_encoder = vc4_hdmi_connector_best_encoder,
 };
 
 static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index cb37751bc99f..9a217fd025f3 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -111,16 +111,26 @@ static int vc4_atomic_commit(struct drm_device *dev,
         int i;
         uint64_t wait_seqno = 0;
         struct vc4_commit *c;
+        struct drm_plane *plane;
+        struct drm_plane_state *new_state;
 
         c = commit_init(state);
         if (!c)
                 return -ENOMEM;
 
         /* Make sure that any outstanding modesets have finished. */
-        ret = down_interruptible(&vc4->async_modeset);
-        if (ret) {
-                kfree(c);
-                return ret;
+        if (nonblock) {
+                ret = down_trylock(&vc4->async_modeset);
+                if (ret) {
+                        kfree(c);
+                        return -EBUSY;
+                }
+        } else {
+                ret = down_interruptible(&vc4->async_modeset);
+                if (ret) {
+                        kfree(c);
+                        return ret;
+                }
         }
 
         ret = drm_atomic_helper_prepare_planes(dev, state);
@@ -130,13 +140,7 @@ static int vc4_atomic_commit(struct drm_device *dev,
                 return ret;
         }
 
-        for (i = 0; i < dev->mode_config.num_total_plane; i++) {
-                struct drm_plane *plane = state->planes[i];
-                struct drm_plane_state *new_state = state->plane_states[i];
-
-                if (!plane)
-                        continue;
-
+        for_each_plane_in_state(state, plane, new_state, i) {
                 if ((plane->state->fb != new_state->fb) && new_state->fb) {
                         struct drm_gem_cma_object *cma_bo =
                                 drm_fb_cma_get_gem_obj(new_state->fb, 0);
@@ -152,7 +156,7 @@ static int vc4_atomic_commit(struct drm_device *dev,
          * the software side now.
          */
 
-        drm_atomic_helper_swap_state(dev, state);
+        drm_atomic_helper_swap_state(state, true);
 
         /*
          * Everything below can be run asynchronously without the need to grab
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 4037b52fde31..5d2c3d9fd17a 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -690,9 +690,10 @@ u32 vc4_plane_write_dlist(struct drm_plane *plane, u32 __iomem *dlist)
         return vc4_state->dlist_count;
 }
 
-u32 vc4_plane_dlist_size(struct drm_plane_state *state)
+u32 vc4_plane_dlist_size(const struct drm_plane_state *state)
 {
-        struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
+        const struct vc4_plane_state *vc4_state =
+                container_of(state, typeof(*vc4_state), base);
 
         return vc4_state->dlist_count;
 }
diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
index 6163b95c5411..f99eece4cc97 100644
--- a/drivers/gpu/drm/vc4/vc4_regs.h
+++ b/drivers/gpu/drm/vc4/vc4_regs.h
@@ -341,6 +341,10 @@
 #define SCALER_DISPLACT0                        0x00000030
 #define SCALER_DISPLACT1                        0x00000034
 #define SCALER_DISPLACT2                        0x00000038
+#define SCALER_DISPLACTX(x)                     (SCALER_DISPLACT0 +     \
+                                                 (x) * (SCALER_DISPLACT1 - \
+                                                        SCALER_DISPLACT0))
+
 #define SCALER_DISPCTRL0                        0x00000040
 # define SCALER_DISPCTRLX_ENABLE                BIT(31)
 # define SCALER_DISPCTRLX_RESET                 BIT(30)
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 341f9be3dde6..35ea5d02a827 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -235,7 +235,7 @@ static const struct file_operations vgem_driver_fops = {
 
 static struct drm_driver vgem_driver = {
         .driver_features                = DRIVER_GEM,
-        .gem_free_object                = vgem_gem_free_object,
+        .gem_free_object_unlocked       = vgem_gem_free_object,
         .gem_vm_ops                     = &vgem_gem_vm_ops,
         .ioctls                         = vgem_ioctls,
         .fops                           = &vgem_driver_fops,
@@ -260,8 +260,6 @@ static int __init vgem_init(void)
                 goto out;
         }
 
-        drm_dev_set_unique(vgem_device, "vgem");
-
         ret  = drm_dev_register(vgem_device, 0);
 
         if (ret)
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index 4f20742e7788..a04ef1c992d9 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -208,7 +208,7 @@ void via_reclaim_buffers_locked(struct drm_device *dev,
         struct via_file_private *file_priv = file->driver_priv;
         struct via_memblock *entry, *next;
 
-        if (!(file->minor->master && file->master->lock.hw_lock))
+        if (!(dev->master && file->master->lock.hw_lock))
                 return;
 
         drm_legacy_idlelock_take(&file->master->lock);
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index d4305da88f44..ac758cdbc1bc 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -29,8 +29,8 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_atomic_helper.h>
 
-#define XRES_MIN   320
-#define YRES_MIN   200
+#define XRES_MIN    32
+#define YRES_MIN    32
 
 #define XRES_DEF  1024
 #define YRES_DEF   768
@@ -38,138 +38,11 @@
 #define XRES_MAX  8192
 #define YRES_MAX  8192
 
-static void
-virtio_gpu_hide_cursor(struct virtio_gpu_device *vgdev,
-                       struct virtio_gpu_output *output)
-{
-        output->cursor.hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_UPDATE_CURSOR);
-        output->cursor.resource_id = 0;
-        virtio_gpu_cursor_ping(vgdev, output);
-}
-
-static int virtio_gpu_crtc_cursor_set(struct drm_crtc *crtc,
-                                      struct drm_file *file_priv,
-                                      uint32_t handle,
-                                      uint32_t width,
-                                      uint32_t height,
-                                      int32_t hot_x, int32_t hot_y)
-{
-        struct virtio_gpu_device *vgdev = crtc->dev->dev_private;
-        struct virtio_gpu_output *output =
-                container_of(crtc, struct virtio_gpu_output, crtc);
-        struct drm_gem_object *gobj = NULL;
-        struct virtio_gpu_object *qobj = NULL;
-        struct virtio_gpu_fence *fence = NULL;
-        int ret = 0;
-
-        if (handle == 0) {
-                virtio_gpu_hide_cursor(vgdev, output);
-                return 0;
-        }
-
-        /* lookup the cursor */
-        gobj = drm_gem_object_lookup(file_priv, handle);
-        if (gobj == NULL)
-                return -ENOENT;
-
-        qobj = gem_to_virtio_gpu_obj(gobj);
-
-        if (!qobj->hw_res_handle) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        virtio_gpu_cmd_transfer_to_host_2d(vgdev, qobj->hw_res_handle, 0,
-                                           cpu_to_le32(64),
-                                           cpu_to_le32(64),
-                                           0, 0, &fence);
-        ret = virtio_gpu_object_reserve(qobj, false);
-        if (!ret) {
-                reservation_object_add_excl_fence(qobj->tbo.resv,
-                                                  &fence->f);
-                fence_put(&fence->f);
-                virtio_gpu_object_unreserve(qobj);
-                virtio_gpu_object_wait(qobj, false);
-        }
-
-        output->cursor.hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_UPDATE_CURSOR);
-        output->cursor.resource_id = cpu_to_le32(qobj->hw_res_handle);
-        output->cursor.hot_x = cpu_to_le32(hot_x);
-        output->cursor.hot_y = cpu_to_le32(hot_y);
-        virtio_gpu_cursor_ping(vgdev, output);
-        ret = 0;
-
-out:
-        drm_gem_object_unreference_unlocked(gobj);
-        return ret;
-}
-
-static int virtio_gpu_crtc_cursor_move(struct drm_crtc *crtc,
-                                    int x, int y)
-{
-        struct virtio_gpu_device *vgdev = crtc->dev->dev_private;
-        struct virtio_gpu_output *output =
-                container_of(crtc, struct virtio_gpu_output, crtc);
-
-        output->cursor.hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_MOVE_CURSOR);
-        output->cursor.pos.x = cpu_to_le32(x);
-        output->cursor.pos.y = cpu_to_le32(y);
-        virtio_gpu_cursor_ping(vgdev, output);
-        return 0;
-}
-
-static int virtio_gpu_page_flip(struct drm_crtc *crtc,
-                                struct drm_framebuffer *fb,
-                                struct drm_pending_vblank_event *event,
-                                uint32_t flags)
-{
-        struct virtio_gpu_device *vgdev = crtc->dev->dev_private;
-        struct virtio_gpu_output *output =
-                container_of(crtc, struct virtio_gpu_output, crtc);
-        struct drm_plane *plane = crtc->primary;
-        struct virtio_gpu_framebuffer *vgfb;
-        struct virtio_gpu_object *bo;
-        unsigned long irqflags;
-        uint32_t handle;
-
-        plane->fb = fb;
-        vgfb = to_virtio_gpu_framebuffer(plane->fb);
-        bo = gem_to_virtio_gpu_obj(vgfb->obj);
-        handle = bo->hw_res_handle;
-
-        DRM_DEBUG("handle 0x%x%s, crtc %dx%d\n", handle,
-                  bo->dumb ? ", dumb" : "",
-                  crtc->mode.hdisplay, crtc->mode.vdisplay);
-        if (bo->dumb) {
-                virtio_gpu_cmd_transfer_to_host_2d
-                        (vgdev, handle, 0,
-                         cpu_to_le32(crtc->mode.hdisplay),
-                         cpu_to_le32(crtc->mode.vdisplay),
-                         0, 0, NULL);
-        }
-        virtio_gpu_cmd_set_scanout(vgdev, output->index, handle,
-                                   crtc->mode.hdisplay,
-                                   crtc->mode.vdisplay, 0, 0);
-        virtio_gpu_cmd_resource_flush(vgdev, handle, 0, 0,
-                                      crtc->mode.hdisplay,
-                                      crtc->mode.vdisplay);
-
-        if (event) {
-                spin_lock_irqsave(&crtc->dev->event_lock, irqflags);
-                drm_send_vblank_event(crtc->dev, -1, event);
-                spin_unlock_irqrestore(&crtc->dev->event_lock, irqflags);
-        }
-
-        return 0;
-}
-
 static const struct drm_crtc_funcs virtio_gpu_crtc_funcs = {
-        .cursor_set2            = virtio_gpu_crtc_cursor_set,
-        .cursor_move            = virtio_gpu_crtc_cursor_move,
         .set_config             = drm_atomic_helper_set_config,
         .destroy                = drm_crtc_cleanup,
 
-        .page_flip              = virtio_gpu_page_flip,
+        .page_flip              = drm_atomic_helper_page_flip,
         .reset                  = drm_atomic_helper_crtc_reset,
         .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
         .atomic_destroy_state   = drm_atomic_helper_crtc_destroy_state,
@@ -267,6 +140,7 @@ static void virtio_gpu_crtc_atomic_flush(struct drm_crtc *crtc,
         spin_lock_irqsave(&crtc->dev->event_lock, flags);
         if (crtc->state->event)
                 drm_crtc_send_vblank_event(crtc, crtc->state->event);
+        crtc->state->event = NULL;
         spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
 }
 
@@ -341,15 +215,6 @@ static int virtio_gpu_conn_mode_valid(struct drm_connector *connector,
         return MODE_BAD;
 }
 
-static struct drm_encoder*
-virtio_gpu_best_encoder(struct drm_connector *connector)
-{
-        struct virtio_gpu_output *virtio_gpu_output =
-                drm_connector_to_virtio_gpu_output(connector);
-
-        return &virtio_gpu_output->enc;
-}
-
 static const struct drm_encoder_helper_funcs virtio_gpu_enc_helper_funcs = {
         .mode_set   = virtio_gpu_enc_mode_set,
         .enable     = virtio_gpu_enc_enable,
@@ -359,7 +224,6 @@ static const struct drm_encoder_helper_funcs virtio_gpu_enc_helper_funcs = {
 static const struct drm_connector_helper_funcs virtio_gpu_conn_helper_funcs = {
         .get_modes    = virtio_gpu_conn_get_modes,
         .mode_valid   = virtio_gpu_conn_mode_valid,
-        .best_encoder = virtio_gpu_best_encoder,
 };
 
 static enum drm_connector_status virtio_gpu_conn_detect(
@@ -406,7 +270,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
         struct drm_connector *connector = &output->conn;
         struct drm_encoder *encoder = &output->enc;
         struct drm_crtc *crtc = &output->crtc;
-        struct drm_plane *plane;
+        struct drm_plane *primary, *cursor;
 
         output->index = index;
         if (index == 0) {
@@ -415,13 +279,17 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
                 output->info.r.height = cpu_to_le32(YRES_DEF);
         }
 
-        plane = virtio_gpu_plane_init(vgdev, index);
-        if (IS_ERR(plane))
-                return PTR_ERR(plane);
-        drm_crtc_init_with_planes(dev, crtc, plane, NULL,
+        primary = virtio_gpu_plane_init(vgdev, DRM_PLANE_TYPE_PRIMARY, index);
+        if (IS_ERR(primary))
+                return PTR_ERR(primary);
+        cursor = virtio_gpu_plane_init(vgdev, DRM_PLANE_TYPE_CURSOR, index);
+        if (IS_ERR(cursor))
+                return PTR_ERR(cursor);
+        drm_crtc_init_with_planes(dev, crtc, primary, cursor,
                                   &virtio_gpu_crtc_funcs, NULL);
         drm_crtc_helper_add(crtc, &virtio_gpu_crtc_helper_funcs);
-        plane->crtc = crtc;
+        primary->crtc = crtc;
+        cursor->crtc = crtc;
 
         drm_connector_init(dev, connector, &virtio_gpu_connector_funcs,
                            DRM_MODE_CONNECTOR_VIRTUAL);
@@ -466,6 +334,24 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
         return &virtio_gpu_fb->base;
 }
 
+static void vgdev_atomic_commit_tail(struct drm_atomic_state *state)
+{
+        struct drm_device *dev = state->dev;
+
+        drm_atomic_helper_commit_modeset_disables(dev, state);
+        drm_atomic_helper_commit_modeset_enables(dev, state);
+        drm_atomic_helper_commit_planes(dev, state, true);
+
+        drm_atomic_helper_commit_hw_done(state);
+
+        drm_atomic_helper_wait_for_vblanks(dev, state);
+        drm_atomic_helper_cleanup_planes(dev, state);
+}
+
+struct drm_mode_config_helper_funcs virtio_mode_config_helpers = {
+        .atomic_commit_tail = vgdev_atomic_commit_tail,
+};
+
 static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = {
         .fb_create = virtio_gpu_user_framebuffer_create,
         .atomic_check = drm_atomic_helper_check,
@@ -477,7 +363,8 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
         int i;
 
         drm_mode_config_init(vgdev->ddev);
-        vgdev->ddev->mode_config.funcs = (void *)&virtio_gpu_mode_funcs;
+        vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs;
+        vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers;
 
         /* modes will be validated against the framebuffer size */
         vgdev->ddev->mode_config.min_width = XRES_MIN;
diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
index 88a39165edd5..7f0e93f87a55 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
@@ -27,16 +27,6 @@
 
 #include "virtgpu_drv.h"
 
-int drm_virtio_set_busid(struct drm_device *dev, struct drm_master *master)
-{
-        struct pci_dev *pdev = dev->pdev;
-
-        if (pdev) {
-                return drm_pci_set_busid(dev, master);
-        }
-        return 0;
-}
-
 static void virtio_pci_kick_out_firmware_fb(struct pci_dev *pci_dev)
 {
         struct apertures_struct *ap;
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 3cc7afa77a35..c13f70cfc461 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -117,7 +117,6 @@ static const struct file_operations virtio_gpu_driver_fops = {
 
 static struct drm_driver driver = {
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC,
-        .set_busid = drm_virtio_set_busid,
         .load = virtio_gpu_driver_load,
         .unload = virtio_gpu_driver_unload,
         .open = virtio_gpu_driver_open,
@@ -143,7 +142,7 @@ static struct drm_driver driver = {
         .gem_prime_vunmap = virtgpu_gem_prime_vunmap,
         .gem_prime_mmap = virtgpu_gem_prime_mmap,
 
-        .gem_free_object = virtio_gpu_gem_free_object,
+        .gem_free_object_unlocked = virtio_gpu_gem_free_object,
         .gem_open_object = virtio_gpu_gem_object_open,
         .gem_close_object = virtio_gpu_gem_object_close,
         .fops = &virtio_gpu_driver_fops,
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 0a54f43f846a..b18ef3111f0c 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -33,6 +33,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm_gem.h>
+#include <drm/drm_atomic.h>
 #include <drm/drm_crtc_helper.h>
 #include <ttm/ttm_bo_api.h>
 #include <ttm/ttm_bo_driver.h>
@@ -48,7 +49,6 @@
 #define DRIVER_PATCHLEVEL 1
 
 /* virtgpu_drm_bus.c */
-int drm_virtio_set_busid(struct drm_device *dev, struct drm_master *master);
 int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev);
 
 struct virtio_gpu_object {
@@ -335,6 +335,7 @@ void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev);
 
 /* virtio_gpu_plane.c */
 struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev,
+                                        enum drm_plane_type type,
                                         int index);
 
 /* virtio_gpu_ttm.c */
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 70b44a2345ab..925ca25209df 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -38,6 +38,10 @@ static const uint32_t virtio_gpu_formats[] = {
         DRM_FORMAT_ABGR8888,
 };
 
+static const uint32_t virtio_gpu_cursor_formats[] = {
+        DRM_FORMAT_ARGB8888,
+};
+
 static void virtio_gpu_plane_destroy(struct drm_plane *plane)
 {
         kfree(plane);
@@ -58,16 +62,22 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,
         return 0;
 }
 
-static void virtio_gpu_plane_atomic_update(struct drm_plane *plane,
-                                           struct drm_plane_state *old_state)
+static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
+                                            struct drm_plane_state *old_state)
 {
         struct drm_device *dev = plane->dev;
         struct virtio_gpu_device *vgdev = dev->dev_private;
-        struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(plane->crtc);
+        struct virtio_gpu_output *output = NULL;
         struct virtio_gpu_framebuffer *vgfb;
         struct virtio_gpu_object *bo;
         uint32_t handle;
 
+        if (plane->state->crtc)
+                output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
+        if (old_state->crtc)
+                output = drm_crtc_to_virtio_gpu_output(old_state->crtc);
+        WARN_ON(!output);
+
         if (plane->state->fb) {
                 vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
                 bo = gem_to_virtio_gpu_obj(vgfb->obj);
@@ -75,55 +85,149 @@ static void virtio_gpu_plane_atomic_update(struct drm_plane *plane,
                 if (bo->dumb) {
                         virtio_gpu_cmd_transfer_to_host_2d
                                 (vgdev, handle, 0,
-                                 cpu_to_le32(plane->state->crtc_w),
-                                 cpu_to_le32(plane->state->crtc_h),
-                                 plane->state->crtc_x, plane->state->crtc_y, NULL);
+                                 cpu_to_le32(plane->state->src_w >> 16),
+                                 cpu_to_le32(plane->state->src_h >> 16),
+                                 plane->state->src_x >> 16,
+                                 plane->state->src_y >> 16, NULL);
                 }
         } else {
                 handle = 0;
         }
 
-        DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d\n", handle,
+        DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", handle,
                   plane->state->crtc_w, plane->state->crtc_h,
-                  plane->state->crtc_x, plane->state->crtc_y);
+                  plane->state->crtc_x, plane->state->crtc_y,
+                  plane->state->src_w >> 16,
+                  plane->state->src_h >> 16,
+                  plane->state->src_x >> 16,
+                  plane->state->src_y >> 16);
         virtio_gpu_cmd_set_scanout(vgdev, output->index, handle,
-                                   plane->state->crtc_w,
-                                   plane->state->crtc_h,
-                                   plane->state->crtc_x,
-                                   plane->state->crtc_y);
+                                   plane->state->src_w >> 16,
+                                   plane->state->src_h >> 16,
+                                   plane->state->src_x >> 16,
+                                   plane->state->src_y >> 16);
         virtio_gpu_cmd_resource_flush(vgdev, handle,
-                                      plane->state->crtc_x,
-                                      plane->state->crtc_y,
-                                      plane->state->crtc_w,
-                                      plane->state->crtc_h);
+                                      plane->state->src_x >> 16,
+                                      plane->state->src_y >> 16,
+                                      plane->state->src_w >> 16,
+                                      plane->state->src_h >> 16);
 }
 
+static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
+                                           struct drm_plane_state *old_state)
+{
+        struct drm_device *dev = plane->dev;
+        struct virtio_gpu_device *vgdev = dev->dev_private;
+        struct virtio_gpu_output *output = NULL;
+        struct virtio_gpu_framebuffer *vgfb;
+        struct virtio_gpu_fence *fence = NULL;
+        struct virtio_gpu_object *bo = NULL;
+        uint32_t handle;
+        int ret = 0;
 
-static const struct drm_plane_helper_funcs virtio_gpu_plane_helper_funcs = {
+        if (plane->state->crtc)
+                output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
+        if (old_state->crtc)
+                output = drm_crtc_to_virtio_gpu_output(old_state->crtc);
+        WARN_ON(!output);
+
+        if (plane->state->fb) {
+                vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
+                bo = gem_to_virtio_gpu_obj(vgfb->obj);
+                handle = bo->hw_res_handle;
+        } else {
+                handle = 0;
+        }
+
+        if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {
+                /* new cursor -- update & wait */
+                virtio_gpu_cmd_transfer_to_host_2d
+                        (vgdev, handle, 0,
+                         cpu_to_le32(plane->state->crtc_w),
+                         cpu_to_le32(plane->state->crtc_h),
+                         0, 0, &fence);
+                ret = virtio_gpu_object_reserve(bo, false);
+                if (!ret) {
+                        reservation_object_add_excl_fence(bo->tbo.resv,
+                                                          &fence->f);
+                        fence_put(&fence->f);
+                        fence = NULL;
+                        virtio_gpu_object_unreserve(bo);
+                        virtio_gpu_object_wait(bo, false);
+                }
+        }
+
+        if (plane->state->fb != old_state->fb) {
+                DRM_DEBUG("update, handle %d, pos +%d+%d, hot %d,%d\n", handle,
+                          plane->state->crtc_x,
+                          plane->state->crtc_y,
+                          plane->state->fb ? plane->state->fb->hot_x : 0,
+                          plane->state->fb ? plane->state->fb->hot_y : 0);
+                output->cursor.hdr.type =
+                        cpu_to_le32(VIRTIO_GPU_CMD_UPDATE_CURSOR);
+                output->cursor.resource_id = cpu_to_le32(handle);
+                if (plane->state->fb) {
+                        output->cursor.hot_x =
+                                cpu_to_le32(plane->state->fb->hot_x);
+                        output->cursor.hot_y =
+                                cpu_to_le32(plane->state->fb->hot_y);
+                } else {
+                        output->cursor.hot_x = cpu_to_le32(0);
+                        output->cursor.hot_y = cpu_to_le32(0);
+                }
+        } else {
+                DRM_DEBUG("move +%d+%d\n",
+                          plane->state->crtc_x,
+                          plane->state->crtc_y);
+                output->cursor.hdr.type =
+                        cpu_to_le32(VIRTIO_GPU_CMD_MOVE_CURSOR);
+        }
+        output->cursor.pos.x = cpu_to_le32(plane->state->crtc_x);
+        output->cursor.pos.y = cpu_to_le32(plane->state->crtc_y);
+        virtio_gpu_cursor_ping(vgdev, output);
+}
+
+static const struct drm_plane_helper_funcs virtio_gpu_primary_helper_funcs = {
+        .atomic_check           = virtio_gpu_plane_atomic_check,
+        .atomic_update          = virtio_gpu_primary_plane_update,
+};
+
+static const struct drm_plane_helper_funcs virtio_gpu_cursor_helper_funcs = {
         .atomic_check           = virtio_gpu_plane_atomic_check,
-        .atomic_update          = virtio_gpu_plane_atomic_update,
+        .atomic_update          = virtio_gpu_cursor_plane_update,
 };
 
 struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev,
+                                        enum drm_plane_type type,
                                         int index)
 {
         struct drm_device *dev = vgdev->ddev;
+        const struct drm_plane_helper_funcs *funcs;
         struct drm_plane *plane;
-        int ret;
+        const uint32_t *formats;
+        int ret, nformats;
 
         plane = kzalloc(sizeof(*plane), GFP_KERNEL);
         if (!plane)
                 return ERR_PTR(-ENOMEM);
 
+        if (type == DRM_PLANE_TYPE_CURSOR) {
+                formats = virtio_gpu_cursor_formats;
+                nformats = ARRAY_SIZE(virtio_gpu_cursor_formats);
+                funcs = &virtio_gpu_cursor_helper_funcs;
+        } else {
+                formats = virtio_gpu_formats;
+                nformats = ARRAY_SIZE(virtio_gpu_formats);
+                funcs = &virtio_gpu_primary_helper_funcs;
+        }
         ret = drm_universal_plane_init(dev, plane, 1 << index,
                                        &virtio_gpu_plane_funcs,
-                                       virtio_gpu_formats,
-                                       ARRAY_SIZE(virtio_gpu_formats),
-                                       DRM_PLANE_TYPE_PRIMARY, NULL);
+                                       formats, nformats,
+                                       type, NULL);
         if (ret)
                 goto err_plane_init;
 
-        drm_plane_helper_add(plane, &virtio_gpu_plane_helper_funcs);
+        drm_plane_helper_add(plane, funcs);
         return plane;
 
 err_plane_init:
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index 67cebb23c940..aa04fb0159a7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -293,13 +293,10 @@ static int vmw_cmdbuf_header_submit(struct vmw_cmdbuf_header *header)
         struct vmw_cmdbuf_man *man = header->man;
         u32 val;
 
-        if (sizeof(header->handle) > 4)
-                val = (header->handle >> 32);
-        else
-                val = 0;
+        val = upper_32_bits(header->handle);
         vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, val);
 
-        val = (header->handle & 0xFFFFFFFFULL);
+        val = lower_32_bits(header->handle);
         val |= header->cb_context & SVGA_CB_CONTEXT_MASK;
         vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val);
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 9fcd8200d485..60646644bef3 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1049,7 +1049,7 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev,
         if (unlikely(ret != 0))
                 return ERR_PTR(-ERESTARTSYS);
 
-        if (file_priv->is_master) {
+        if (drm_is_current_master(file_priv)) {
                 mutex_unlock(&dev->master_mutex);
                 return NULL;
         }
@@ -1228,8 +1228,7 @@ static int vmw_master_set(struct drm_device *dev,
 }
 
 static void vmw_master_drop(struct drm_device *dev,
-                            struct drm_file *file_priv,
-                            bool from_release)
+                            struct drm_file *file_priv)
 {
         struct vmw_private *dev_priv = vmw_priv(dev);
         struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 1980e2a28265..9a90f824814e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -32,6 +32,7 @@
 #include <drm/drmP.h>
 #include <drm/vmwgfx_drm.h>
 #include <drm/drm_hashtab.h>
+#include <drm/drm_auth.h>
 #include <linux/suspend.h>
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_object.h>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index e959df6ede83..26ac8e80a478 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -46,7 +46,7 @@ struct vmw_fence_manager {
         bool goal_irq_on; /* Protected by @goal_irq_mutex */
         bool seqno_valid; /* Protected by @lock, and may not be set to true
                              without the @goal_irq_mutex held. */
-        unsigned ctx;
+        u64 ctx;
 };
 
 struct vmw_user_fence {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 55231cce73a0..8a69d4da40b5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1404,9 +1404,9 @@ static int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
         return 0;
 }
 
-void vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
-                           u16 *r, u16 *g, u16 *b,
-                           uint32_t start, uint32_t size)
+int vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
+                          u16 *r, u16 *g, u16 *b,
+                          uint32_t size)
 {
         struct vmw_private *dev_priv = vmw_priv(crtc->dev);
         int i;
@@ -1418,6 +1418,8 @@ void vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
                 vmw_write(dev_priv, SVGA_PALETTE_BASE + i * 3 + 1, g[i] >> 8);
                 vmw_write(dev_priv, SVGA_PALETTE_BASE + i * 3 + 2, b[i] >> 8);
         }
+
+        return 0;
 }
 
 int vmw_du_connector_dpms(struct drm_connector *connector, int mode)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index 57203212c501..ff4803c107bc 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
@@ -195,9 +195,9 @@ struct vmw_display_unit {
 void vmw_du_cleanup(struct vmw_display_unit *du);
 void vmw_du_crtc_save(struct drm_crtc *crtc);
 void vmw_du_crtc_restore(struct drm_crtc *crtc);
-void vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
+int vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
                            u16 *r, u16 *g, u16 *b,
-                           uint32_t start, uint32_t size);
+                           uint32_t size);
 int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
                             uint32_t handle, uint32_t width, uint32_t height,
                             int32_t hot_x, int32_t hot_y);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index 6de283c8fa3e..f0374f9b56ca 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/frame.h>
 #include <asm/hypervisor.h>
 #include "drmP.h"
 #include "vmwgfx_msg.h"
@@ -194,7 +195,7 @@ static int vmw_send_msg(struct rpc_channel *channel, const char *msg)
 
         return -EINVAL;
 }
-
+STACK_FRAME_NON_STANDARD(vmw_send_msg);
 
 
 /**
@@ -304,6 +305,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
 
         return 0;
 }
+STACK_FRAME_NON_STANDARD(vmw_recv_msg);
 
 
 /**
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index cbd7c986d926..2df216b39cc5 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -30,6 +30,7 @@
 
 #define pr_fmt(fmt) "vga_switcheroo: " fmt
 
+#include <linux/apple-gmux.h>
 #include <linux/console.h>
 #include <linux/debugfs.h>
 #include <linux/fb.h>
@@ -308,7 +309,8 @@ static int register_client(struct pci_dev *pdev,
  *
  * Register vga client (GPU). Enable vga_switcheroo if another GPU and a
  * handler have already registered. The power state of the client is assumed
- * to be ON.
+ * to be ON. Beforehand, vga_switcheroo_client_probe_defer() shall be called
+ * to ensure that all prerequisites are met.
  *
  * Return: 0 on success, -ENOMEM on memory allocation error.
  */
@@ -329,7 +331,8 @@ EXPORT_SYMBOL(vga_switcheroo_register_client);
  * @id: client identifier
  *
  * Register audio client (audio device on a GPU). The power state of the
- * client is assumed to be ON.
+ * client is assumed to be ON. Beforehand, vga_switcheroo_client_probe_defer()
+ * shall be called to ensure that all prerequisites are met.
  *
  * Return: 0 on success, -ENOMEM on memory allocation error.
  */
@@ -376,6 +379,33 @@ find_active_client(struct list_head *head)
 }
 
 /**
+ * vga_switcheroo_client_probe_defer() - whether to defer probing a given client
+ * @pdev: client pci device
+ *
+ * Determine whether any prerequisites are not fulfilled to probe a given
+ * client. Drivers shall invoke this early on in their ->probe callback
+ * and return %-EPROBE_DEFER if it evaluates to %true. Thou shalt not
+ * register the client ere thou hast called this.
+ *
+ * Return: %true if probing should be deferred, otherwise %false.
+ */
+bool vga_switcheroo_client_probe_defer(struct pci_dev *pdev)
+{
+        if ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
+                /*
+                 * apple-gmux is needed on pre-retina MacBook Pro
+                 * to probe the panel if pdev is the inactive GPU.
+                 */
+                if (apple_gmux_present() && pdev != vga_default_device() &&
+                    !vgasr_priv.handler_flags)
+                        return true;
+        }
+
+        return false;
+}
+EXPORT_SYMBOL(vga_switcheroo_client_probe_defer);
+
+/**
  * vga_switcheroo_get_client_state() - obtain power state of a given client
  * @pdev: client pci device
  *
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index aad8c162a825..0cd4f7216239 100644
--- a/drivers/hid/hid-elo.c
+++ b/drivers/hid/hid-elo.c
@@ -261,7 +261,7 @@ static void elo_remove(struct hid_device *hdev)
         struct elo_priv *priv = hid_get_drvdata(hdev);
 
         hid_hw_stop(hdev);
-        flush_workqueue(wq);
+        cancel_delayed_work_sync(&priv->work);
         kfree(priv);
 }
 
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index c741f5e50a66..95b7d61d9910 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1401,6 +1401,11 @@ static const struct hid_device_id mt_devices[] = {
                 MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK,
                         USB_DEVICE_ID_NOVATEK_PCT) },
 
+        /* Ntrig Panel */
+        { .driver_data = MT_CLS_NSMU,
+                HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
+                        USB_VENDOR_ID_NTRIG, 0x1b05) },
+
         /* PixArt optical touch screen */
         { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,
                 MT_USB_DEVICE(USB_VENDOR_ID_PIXART,
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 2f1ddca6f2e0..700145b15088 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -516,13 +516,13 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
                                         goto inval;
                         } else if (uref->usage_index >= field->report_count)
                                 goto inval;
-
-                        else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
-                                 (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
-                                  uref->usage_index + uref_multi->num_values > field->report_count))
-                                goto inval;
                 }
 
+                if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
+                    (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
+                     uref->usage_index + uref_multi->num_values > field->report_count))
+                        goto inval;
+
                 switch (cmd) {
                 case HIDIOCGUSAGE:
                         uref->value = field->value[uref->usage_index];
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index c43318d3416e..2ac87d553e22 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -35,6 +35,7 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 #include <linux/sched.h>
+#include <linux/ctype.h>
 
 #include <linux/i8k.h>
 
@@ -66,11 +67,13 @@
 
 static DEFINE_MUTEX(i8k_mutex);
 static char bios_version[4];
+static char bios_machineid[16];
 static struct device *i8k_hwmon_dev;
 static u32 i8k_hwmon_flags;
 static uint i8k_fan_mult = I8K_FAN_MULT;
 static uint i8k_pwm_mult;
 static uint i8k_fan_max = I8K_FAN_HIGH;
+static bool disallow_fan_type_call;
 
 #define I8K_HWMON_HAVE_TEMP1    (1 << 0)
 #define I8K_HWMON_HAVE_TEMP2    (1 << 1)
@@ -94,13 +97,13 @@ module_param(ignore_dmi, bool, 0);
 MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");
 
 #if IS_ENABLED(CONFIG_I8K)
-static bool restricted;
+static bool restricted = true;
 module_param(restricted, bool, 0);
-MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");
+MODULE_PARM_DESC(restricted, "Restrict fan control and serial number to CAP_SYS_ADMIN (default: 1)");
 
 static bool power_status;
 module_param(power_status, bool, 0600);
-MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k");
+MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k (default: 0)");
 #endif
 
 static uint fan_mult;
@@ -235,14 +238,28 @@ static int i8k_get_fan_speed(int fan)
 /*
  * Read the fan type.
  */
-static int i8k_get_fan_type(int fan)
+static int _i8k_get_fan_type(int fan)
 {
         struct smm_regs regs = { .eax = I8K_SMM_GET_FAN_TYPE, };
 
+        if (disallow_fan_type_call)
+                return -EINVAL;
+
         regs.ebx = fan & 0xff;
         return i8k_smm(&regs) ? : regs.eax & 0xff;
 }
 
+static int i8k_get_fan_type(int fan)
+{
+        /* I8K_SMM_GET_FAN_TYPE SMM call is expensive, so cache values */
+        static int types[2] = { INT_MIN, INT_MIN };
+
+        if (types[fan] == INT_MIN)
+                types[fan] = _i8k_get_fan_type(fan);
+
+        return types[fan];
+}
+
 /*
  * Read the fan nominal rpm for specific fan speed.
  */
@@ -387,14 +404,20 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg)
 
         switch (cmd) {
         case I8K_BIOS_VERSION:
+                if (!isdigit(bios_version[0]) || !isdigit(bios_version[1]) ||
+                    !isdigit(bios_version[2]))
+                        return -EINVAL;
+
                 val = (bios_version[0] << 16) |
                                 (bios_version[1] << 8) | bios_version[2];
                 break;
 
         case I8K_MACHINE_ID:
-                memset(buff, 0, 16);
-                strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
-                        sizeof(buff));
+                if (restricted && !capable(CAP_SYS_ADMIN))
+                        return -EPERM;
+
+                memset(buff, 0, sizeof(buff));
+                strlcpy(buff, bios_machineid, sizeof(buff));
                 break;
 
         case I8K_FN_STATUS:
@@ -511,7 +534,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
         seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
                    I8K_PROC_FMT,
                    bios_version,
-                   i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
+                   (restricted && !capable(CAP_SYS_ADMIN)) ? "-1" : bios_machineid,
                    cpu_temp,
                    left_fan, right_fan, left_speed, right_speed,
                    ac_power, fn_key);
@@ -718,6 +741,9 @@ static struct attribute *i8k_attrs[] = {
 static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr,
                               int index)
 {
+        if (disallow_fan_type_call &&
+            (index == 9 || index == 12))
+                return 0;
         if (index >= 0 && index <= 1 &&
             !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))
                 return 0;
@@ -767,13 +793,17 @@ static int __init i8k_init_hwmon(void)
         if (err >= 0)
                 i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;
 
-        /* First fan attributes, if fan type is OK */
-        err = i8k_get_fan_type(0);
+        /* First fan attributes, if fan status or type is OK */
+        err = i8k_get_fan_status(0);
+        if (err < 0)
+                err = i8k_get_fan_type(0);
         if (err >= 0)
                 i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1;
 
-        /* Second fan attributes, if fan type is OK */
-        err = i8k_get_fan_type(1);
+        /* Second fan attributes, if fan status or type is OK */
+        err = i8k_get_fan_status(1);
+        if (err < 0)
+                err = i8k_get_fan_type(1);
         if (err >= 0)
                 i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2;
 
@@ -929,12 +959,14 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
 
 MODULE_DEVICE_TABLE(dmi, i8k_dmi_table);
 
-static struct dmi_system_id i8k_blacklist_dmi_table[] __initdata = {
+/*
+ * On some machines once I8K_SMM_GET_FAN_TYPE is issued then CPU fan speed
+ * randomly going up and down due to bug in Dell SMM or BIOS. Here is blacklist
+ * of affected Dell machines for which we disallow I8K_SMM_GET_FAN_TYPE call.
+ * See bug: https://bugzilla.kernel.org/show_bug.cgi?id=100121
+ */
+static struct dmi_system_id i8k_blacklist_fan_type_dmi_table[] __initdata = {
         {
-                /*
-                 * CPU fan speed going up and down on Dell Studio XPS 8000
-                 * for unknown reasons.
-                 */
                 .ident = "Dell Studio XPS 8000",
                 .matches = {
                         DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -942,16 +974,19 @@ static struct dmi_system_id i8k_blacklist_dmi_table[] __initdata = {
                 },
         },
         {
-                /*
-                 * CPU fan speed going up and down on Dell Studio XPS 8100
-                 * for unknown reasons.
-                 */
                 .ident = "Dell Studio XPS 8100",
                 .matches = {
                         DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                         DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Studio XPS 8100"),
                 },
         },
+        {
+                .ident = "Dell Inspiron 580",
+                .matches = {
+                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Inspiron 580 "),
+                },
+        },
         { }
 };
 
@@ -966,8 +1001,7 @@ static int __init i8k_probe(void)
         /*
          * Get DMI information
          */
-        if (!dmi_check_system(i8k_dmi_table) ||
-            dmi_check_system(i8k_blacklist_dmi_table)) {
+        if (!dmi_check_system(i8k_dmi_table)) {
                 if (!ignore_dmi && !force)
                         return -ENODEV;
 
@@ -978,8 +1012,13 @@ static int __init i8k_probe(void)
                         i8k_get_dmi_data(DMI_BIOS_VERSION));
         }
 
+        if (dmi_check_system(i8k_blacklist_fan_type_dmi_table))
+                disallow_fan_type_call = true;
+
         strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION),
                 sizeof(bios_version));
+        strlcpy(bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
+                sizeof(bios_machineid));
 
         /*
          * Get SMM Dell signature
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index eb97a9241d17..15aa49d082c4 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -172,9 +172,9 @@ static void do_read_registers_on_cu(void *_data)
  */
 static int read_registers(struct fam15h_power_data *data)
 {
-        int this_cpu, ret, cpu;
         int core, this_core;
         cpumask_var_t mask;
+        int ret, cpu;
 
         ret = zalloc_cpumask_var(&mask, GFP_KERNEL);
         if (!ret)
@@ -183,7 +183,6 @@ static int read_registers(struct fam15h_power_data *data)
         memset(data->cu_on, 0, sizeof(int) * MAX_CUS);
 
         get_online_cpus();
-        this_cpu = smp_processor_id();
 
         /*
          * Choose the first online core of each compute unit, and then
@@ -205,12 +204,9 @@ static int read_registers(struct fam15h_power_data *data)
                 cpumask_set_cpu(cpumask_any(topology_sibling_cpumask(cpu)), mask);
         }
 
-        if (cpumask_test_cpu(this_cpu, mask))
-                do_read_registers_on_cu(data);
+        on_each_cpu_mask(mask, do_read_registers_on_cu, data, true);
 
-        smp_call_function_many(mask, do_read_registers_on_cu, data, true);
         put_online_cpus();
-
         free_cpumask_var(mask);
 
         return 0;
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index c9ff08dbe10c..e30a5939dc0d 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -375,7 +375,7 @@ struct lm90_data {
         int kind;
         u32 flags;
 
-        int update_interval;    /* in milliseconds */
+        unsigned int update_interval; /* in milliseconds */
 
         u8 config_orig;         /* Original configuration register value */
         u8 convrate_orig;       /* Original conversion rate register value */
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index 847d1b5f2c13..688be9e060fc 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -300,13 +300,10 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata)
         if (local_read(&drvdata->mode) == CS_MODE_SYSFS) {
                 /*
                  * The trace run will continue with the same allocated trace
-                 * buffer. As such zero-out the buffer so that we don't end
-                 * up with stale data.
-                 *
-                 * Since the tracer is still enabled drvdata::buf
-                 * can't be NULL.
+                 * buffer. The trace buffer is cleared in tmc_etr_enable_hw(),
+                 * so we don't have to explicitly clear it. Also, since the
+                 * tracer is still enabled drvdata::buf can't be NULL.
                  */
-                memset(drvdata->buf, 0, drvdata->size);
                 tmc_etr_enable_hw(drvdata);
         } else {
                 /*
@@ -315,7 +312,7 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata)
                  */
                 vaddr = drvdata->vaddr;
                 paddr = drvdata->paddr;
-                drvdata->buf = NULL;
+                drvdata->buf = drvdata->vaddr = NULL;
         }
 
         drvdata->reading = false;
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 5443d03a1eec..d08d1ab9bba5 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -385,7 +385,6 @@ static int _coresight_build_path(struct coresight_device *csdev,
         int i;
         bool found = false;
         struct coresight_node *node;
-        struct coresight_connection *conn;
 
         /* An activated sink has been found.  Enqueue the element */
         if ((csdev->type == CORESIGHT_DEV_TYPE_SINK ||
@@ -394,8 +393,9 @@ static int _coresight_build_path(struct coresight_device *csdev,
 
         /* Not a sink - recursively explore each port found on this element */
         for (i = 0; i < csdev->nr_outport; i++) {
-                conn = &csdev->conns[i];
-                if (_coresight_build_path(conn->child_dev, path) == 0) {
+                struct coresight_device *child_dev = csdev->conns[i].child_dev;
+
+                if (child_dev && _coresight_build_path(child_dev, path) == 0) {
                         found = true;
                         break;
                 }
@@ -425,6 +425,7 @@ out:
 struct list_head *coresight_build_path(struct coresight_device *csdev)
 {
         struct list_head *path;
+        int rc;
 
         path = kzalloc(sizeof(struct list_head), GFP_KERNEL);
         if (!path)
@@ -432,9 +433,10 @@ struct list_head *coresight_build_path(struct coresight_device *csdev)
 
         INIT_LIST_HEAD(path);
 
-        if (_coresight_build_path(csdev, path)) {
+        rc = _coresight_build_path(csdev, path);
+        if (rc) {
                 kfree(path);
-                path = NULL;
+                return ERR_PTR(rc);
         }
 
         return path;
@@ -507,8 +509,9 @@ int coresight_enable(struct coresight_device *csdev)
                 goto out;
 
         path = coresight_build_path(csdev);
-        if (!path) {
+        if (IS_ERR(path)) {
                 pr_err("building path(s) failed\n");
+                ret = PTR_ERR(path);
                 goto out;
         }
 
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 64b1208bca5e..4a60ad214747 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -245,6 +245,13 @@ struct i801_priv {
         struct platform_device *mux_pdev;
 #endif
         struct platform_device *tco_pdev;
+
+        /*
+         * If set to true the host controller registers are reserved for
+         * ACPI AML use. Protected by acpi_lock.
+         */
+        bool acpi_reserved;
+        struct mutex acpi_lock;
 };
 
 #define FEATURE_SMBUS_PEC       (1 << 0)
@@ -718,6 +725,12 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
         int ret = 0, xact = 0;
         struct i801_priv *priv = i2c_get_adapdata(adap);
 
+        mutex_lock(&priv->acpi_lock);
+        if (priv->acpi_reserved) {
+                mutex_unlock(&priv->acpi_lock);
+                return -EBUSY;
+        }
+
         pm_runtime_get_sync(&priv->pci_dev->dev);
 
         hwpec = (priv->features & FEATURE_SMBUS_PEC) && (flags & I2C_CLIENT_PEC)
@@ -820,6 +833,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
 out:
         pm_runtime_mark_last_busy(&priv->pci_dev->dev);
         pm_runtime_put_autosuspend(&priv->pci_dev->dev);
+        mutex_unlock(&priv->acpi_lock);
         return ret;
 }
 
@@ -1257,6 +1271,83 @@ static void i801_add_tco(struct i801_priv *priv)
         priv->tco_pdev = pdev;
 }
 
+#ifdef CONFIG_ACPI
+static acpi_status
+i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,
+                     u64 *value, void *handler_context, void *region_context)
+{
+        struct i801_priv *priv = handler_context;
+        struct pci_dev *pdev = priv->pci_dev;
+        acpi_status status;
+
+        /*
+         * Once BIOS AML code touches the OpRegion we warn and inhibit any
+         * further access from the driver itself. This device is now owned
+         * by the system firmware.
+         */
+        mutex_lock(&priv->acpi_lock);
+
+        if (!priv->acpi_reserved) {
+                priv->acpi_reserved = true;
+
+                dev_warn(&pdev->dev, "BIOS is accessing SMBus registers\n");
+                dev_warn(&pdev->dev, "Driver SMBus register access inhibited\n");
+
+                /*
+                 * BIOS is accessing the host controller so prevent it from
+                 * suspending automatically from now on.
+                 */
+                pm_runtime_get_sync(&pdev->dev);
+        }
+
+        if ((function & ACPI_IO_MASK) == ACPI_READ)
+                status = acpi_os_read_port(address, (u32 *)value, bits);
+        else
+                status = acpi_os_write_port(address, (u32)*value, bits);
+
+        mutex_unlock(&priv->acpi_lock);
+
+        return status;
+}
+
+static int i801_acpi_probe(struct i801_priv *priv)
+{
+        struct acpi_device *adev;
+        acpi_status status;
+
+        adev = ACPI_COMPANION(&priv->pci_dev->dev);
+        if (adev) {
+                status = acpi_install_address_space_handler(adev->handle,
+                                ACPI_ADR_SPACE_SYSTEM_IO, i801_acpi_io_handler,
+                                NULL, priv);
+                if (ACPI_SUCCESS(status))
+                        return 0;
+        }
+
+        return acpi_check_resource_conflict(&priv->pci_dev->resource[SMBBAR]);
+}
+
+static void i801_acpi_remove(struct i801_priv *priv)
+{
+        struct acpi_device *adev;
+
+        adev = ACPI_COMPANION(&priv->pci_dev->dev);
+        if (!adev)
+                return;
+
+        acpi_remove_address_space_handler(adev->handle,
+                ACPI_ADR_SPACE_SYSTEM_IO, i801_acpi_io_handler);
+
+        mutex_lock(&priv->acpi_lock);
+        if (priv->acpi_reserved)
+                pm_runtime_put(&priv->pci_dev->dev);
+        mutex_unlock(&priv->acpi_lock);
+}
+#else
+static inline int i801_acpi_probe(struct i801_priv *priv) { return 0; }
+static inline void i801_acpi_remove(struct i801_priv *priv) { }
+#endif
+
 static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
         unsigned char temp;
@@ -1274,6 +1365,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
         priv->adapter.dev.parent = &dev->dev;
         ACPI_COMPANION_SET(&priv->adapter.dev, ACPI_COMPANION(&dev->dev));
         priv->adapter.retries = 3;
+        mutex_init(&priv->acpi_lock);
 
         priv->pci_dev = dev;
         switch (dev->device) {
@@ -1336,10 +1428,8 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 return -ENODEV;
         }
 
-        err = acpi_check_resource_conflict(&dev->resource[SMBBAR]);
-        if (err) {
+        if (i801_acpi_probe(priv))
                 return -ENODEV;
-        }
 
         err = pcim_iomap_regions(dev, 1 << SMBBAR,
                                  dev_driver_string(&dev->dev));
@@ -1348,6 +1438,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                         "Failed to request SMBus region 0x%lx-0x%Lx\n",
                         priv->smba,
                         (unsigned long long)pci_resource_end(dev, SMBBAR));
+                i801_acpi_remove(priv);
                 return err;
         }
 
@@ -1412,6 +1503,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
         err = i2c_add_adapter(&priv->adapter);
         if (err) {
                 dev_err(&dev->dev, "Failed to add SMBus adapter\n");
+                i801_acpi_remove(priv);
                 return err;
         }
 
@@ -1438,6 +1530,7 @@ static void i801_remove(struct pci_dev *dev)
 
         i801_del_mux(priv);
         i2c_del_adapter(&priv->adapter);
+        i801_acpi_remove(priv);
         pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
 
         platform_device_unregister(priv->tco_pdev);
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index aa5f01efd826..30ae35146723 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -934,8 +934,15 @@ static int octeon_i2c_read(struct octeon_i2c *i2c, int target,
                 return result;
 
         for (i = 0; i < length; i++) {
-                /* for the last byte TWSI_CTL_AAK must not be set */
-                if (i + 1 == length)
+                /*
+                 * For the last byte to receive TWSI_CTL_AAK must not be set.
+                 *
+                 * A special case is I2C_M_RECV_LEN where we don't know the
+                 * additional length yet. If recv_len is set we assume we're
+                 * not reading the final byte and therefore need to set
+                 * TWSI_CTL_AAK.
+                 */
+                if ((i + 1 == length) && !(recv_len && i == 0))
                         final_read = true;
 
                 /* clear iflg to allow next event */
@@ -950,12 +957,8 @@ static int octeon_i2c_read(struct octeon_i2c *i2c, int target,
 
                 data[i] = octeon_i2c_data_read(i2c);
                 if (recv_len && i == 0) {
-                        if (data[i] > I2C_SMBUS_BLOCK_MAX + 1) {
-                                dev_err(i2c->dev,
-                                        "%s: read len > I2C_SMBUS_BLOCK_MAX %d\n",
-                                        __func__, data[i]);
+                        if (data[i] > I2C_SMBUS_BLOCK_MAX + 1)
                                 return -EPROTO;
-                        }
                         length += data[i];
                 }
 
diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index 6773cadf7c9f..26e7c5187a58 100644
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@ -260,6 +260,7 @@ static struct platform_driver i2c_mux_reg_driver = {
         .remove = i2c_mux_reg_remove,
         .driver = {
                 .name   = "i2c-mux-reg",
+                .of_match_table = of_match_ptr(i2c_mux_reg_of_match),
         },
 };
 
diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
index a1e642ee13d6..7fddc137e91e 100644
--- a/drivers/iio/accel/st_accel_buffer.c
+++ b/drivers/iio/accel/st_accel_buffer.c
@@ -91,7 +91,7 @@ static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = {
 
 int st_accel_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_accel_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index dc73f2d85e6d..4d95bfc4786c 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -741,6 +741,7 @@ static const struct iio_info accel_info = {
 static const struct iio_trigger_ops st_accel_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_ACCEL_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_ACCEL_TRIGGER_OPS (&st_accel_trigger_ops)
 #else
diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
index c55898543a47..f1693dbebb8a 100644
--- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
@@ -57,31 +57,20 @@ irqreturn_t st_sensors_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
         struct st_sensor_data *sdata = iio_priv(indio_dev);
+        s64 timestamp;
 
-        /* If we have a status register, check if this IRQ came from us */
-        if (sdata->sensor_settings->drdy_irq.addr_stat_drdy) {
-                u8 status;
-
-                len = sdata->tf->read_byte(&sdata->tb, sdata->dev,
-                           sdata->sensor_settings->drdy_irq.addr_stat_drdy,
-                           &status);
-                if (len < 0)
-                        dev_err(sdata->dev, "could not read channel status\n");
-
-                /*
-                 * If this was not caused by any channels on this sensor,
-                 * return IRQ_NONE
-                 */
-                if (!(status & (u8)indio_dev->active_scan_mask[0]))
-                        return IRQ_NONE;
-        }
+        /* If we do timetamping here, do it before reading the values */
+        if (sdata->hw_irq_trigger)
+                timestamp = sdata->hw_timestamp;
+        else
+                timestamp = iio_get_time_ns();
 
         len = st_sensors_get_buffer_element(indio_dev, sdata->buffer_data);
         if (len < 0)
                 goto st_sensors_get_buffer_element_error;
 
         iio_push_to_buffers_with_timestamp(indio_dev, sdata->buffer_data,
-                pf->timestamp);
+                                           timestamp);
 
 st_sensors_get_buffer_element_error:
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index dffe00692169..9e59c90f6a8d 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -363,6 +363,11 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
         if (err < 0)
                 return err;
 
+        /* Disable DRDY, this might be still be enabled after reboot. */
+        err = st_sensors_set_dataready_irq(indio_dev, false);
+        if (err < 0)
+                return err;
+
         if (sdata->current_fullscale) {
                 err = st_sensors_set_fullscale(indio_dev,
                                                 sdata->current_fullscale->num);
@@ -424,6 +429,9 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
         else
                 drdy_mask = sdata->sensor_settings->drdy_irq.mask_int2;
 
+        /* Flag to the poll function that the hardware trigger is in use */
+        sdata->hw_irq_trigger = enable;
+
         /* Enable/Disable the interrupt generator for data ready. */
         err = st_sensors_write_data_with_mask(indio_dev,
                                         sdata->sensor_settings->drdy_irq.addr,
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index da72279fcf99..296e4ff19ae8 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -17,6 +17,73 @@
 #include <linux/iio/common/st_sensors.h>
 #include "st_sensors_core.h"
 
+/**
+ * st_sensors_irq_handler() - top half of the IRQ-based triggers
+ * @irq: irq number
+ * @p: private handler data
+ */
+irqreturn_t st_sensors_irq_handler(int irq, void *p)
+{
+        struct iio_trigger *trig = p;
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct st_sensor_data *sdata = iio_priv(indio_dev);
+
+        /* Get the time stamp as close in time as possible */
+        sdata->hw_timestamp = iio_get_time_ns();
+        return IRQ_WAKE_THREAD;
+}
+
+/**
+ * st_sensors_irq_thread() - bottom half of the IRQ-based triggers
+ * @irq: irq number
+ * @p: private handler data
+ */
+irqreturn_t st_sensors_irq_thread(int irq, void *p)
+{
+        struct iio_trigger *trig = p;
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct st_sensor_data *sdata = iio_priv(indio_dev);
+        int ret;
+
+        /*
+         * If this trigger is backed by a hardware interrupt and we have a
+         * status register, check if this IRQ came from us
+         */
+        if (sdata->sensor_settings->drdy_irq.addr_stat_drdy) {
+                u8 status;
+
+                ret = sdata->tf->read_byte(&sdata->tb, sdata->dev,
+                           sdata->sensor_settings->drdy_irq.addr_stat_drdy,
+                           &status);
+                if (ret < 0) {
+                        dev_err(sdata->dev, "could not read channel status\n");
+                        goto out_poll;
+                }
+                /*
+                 * the lower bits of .active_scan_mask[0] is directly mapped
+                 * to the channels on the sensor: either bit 0 for
+                 * one-dimensional sensors, or e.g. x,y,z for accelerometers,
+                 * gyroscopes or magnetometers. No sensor use more than 3
+                 * channels, so cut the other status bits here.
+                 */
+                status &= 0x07;
+
+                /*
+                 * If this was not caused by any channels on this sensor,
+                 * return IRQ_NONE
+                 */
+                if (!indio_dev->active_scan_mask)
+                        return IRQ_NONE;
+                if (!(status & (u8)indio_dev->active_scan_mask[0]))
+                        return IRQ_NONE;
+        }
+
+out_poll:
+        /* It's our IRQ: proceed to handle the register polling */
+        iio_trigger_poll_chained(p);
+        return IRQ_HANDLED;
+}
+
 int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                                 const struct iio_trigger_ops *trigger_ops)
 {
@@ -30,6 +97,10 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                 return -ENOMEM;
         }
 
+        iio_trigger_set_drvdata(sdata->trig, indio_dev);
+        sdata->trig->ops = trigger_ops;
+        sdata->trig->dev.parent = sdata->dev;
+
         irq = sdata->get_irq_data_ready(indio_dev);
         irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));
         /*
@@ -77,9 +148,12 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
             sdata->sensor_settings->drdy_irq.addr_stat_drdy)
                 irq_trig |= IRQF_SHARED;
 
-        err = request_threaded_irq(irq,
-                        iio_trigger_generic_data_rdy_poll,
-                        NULL,
+        /* Let's create an interrupt thread masking the hard IRQ here */
+        irq_trig |= IRQF_ONESHOT;
+
+        err = request_threaded_irq(sdata->get_irq_data_ready(indio_dev),
+                        st_sensors_irq_handler,
+                        st_sensors_irq_thread,
                         irq_trig,
                         sdata->trig->name,
                         sdata->trig);
@@ -88,10 +162,6 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                 goto iio_trigger_free;
         }
 
-        iio_trigger_set_drvdata(sdata->trig, indio_dev);
-        sdata->trig->ops = trigger_ops;
-        sdata->trig->dev.parent = sdata->dev;
-
         err = iio_trigger_register(sdata->trig);
         if (err < 0) {
                 dev_err(&indio_dev->dev, "failed to register iio trigger.\n");
@@ -119,6 +189,18 @@ void st_sensors_deallocate_trigger(struct iio_dev *indio_dev)
 }
 EXPORT_SYMBOL(st_sensors_deallocate_trigger);
 
+int st_sensors_validate_device(struct iio_trigger *trig,
+                               struct iio_dev *indio_dev)
+{
+        struct iio_dev *indio = iio_trigger_get_drvdata(trig);
+
+        if (indio != indio_dev)
+                return -EINVAL;
+
+        return 0;
+}
+EXPORT_SYMBOL(st_sensors_validate_device);
+
 MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
 MODULE_DESCRIPTION("STMicroelectronics ST-sensors trigger");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index e63b957c985f..f7c71da42f15 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -247,7 +247,7 @@ config MCP4922
 
 config STX104
         tristate "Apex Embedded Systems STX104 DAC driver"
-        depends on X86 && ISA
+        depends on X86 && ISA_BUS_API
         help
           Say yes here to build support for the 2-channel DAC on the Apex
           Embedded Systems STX104 integrated analog PC/104 card. The base port
diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
index 948f600e7059..69bde5909854 100644
--- a/drivers/iio/dac/ad5592r-base.c
+++ b/drivers/iio/dac/ad5592r-base.c
@@ -525,7 +525,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
 
         device_for_each_child_node(st->dev, child) {
                 ret = fwnode_property_read_u32(child, "reg", &reg);
-                if (ret || reg > ARRAY_SIZE(st->channel_modes))
+                if (ret || reg >= ARRAY_SIZE(st->channel_modes))
                         continue;
 
                 ret = fwnode_property_read_u32(child, "adi,mode", &tmp);
diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c
index d67b17b6a7aa..a5377044e42f 100644
--- a/drivers/iio/gyro/st_gyro_buffer.c
+++ b/drivers/iio/gyro/st_gyro_buffer.c
@@ -91,7 +91,7 @@ static const struct iio_buffer_setup_ops st_gyro_buffer_setup_ops = {
 
 int st_gyro_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_gyro_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 52a3c87c375c..a8012955a1f6 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -409,6 +409,7 @@ static const struct iio_info gyro_info = {
 static const struct iio_trigger_ops st_gyro_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_GYRO_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_GYRO_TRIGGER_OPS (&st_gyro_trigger_ops)
 #else
diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index 3be6d209a159..11535911a5c6 100644
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)
         struct am2315_sensor_data sensor_data;
 
         ret = am2315_read_data(data, &sensor_data);
-        if (ret < 0) {
-                mutex_unlock(&data->lock);
+        if (ret < 0)
                 goto err;
-        }
 
         mutex_lock(&data->lock);
         if (*(indio_dev->active_scan_mask) == AM2315_ALL_CHANNEL_MASK) {
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index fa4767613173..a03832a5fc95 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -55,7 +55,7 @@ static const struct {
         },
         { /* IIO_HUMIDITYRELATIVE channel */
                 .shift = 8,
-                .mask = 2,
+                .mask = 3,
         },
 };
 
@@ -164,14 +164,14 @@ static int hdc100x_get_measurement(struct hdc100x_data *data,
                 dev_err(&client->dev, "cannot read high byte measurement");
                 return ret;
         }
-        val = ret << 6;
+        val = ret << 8;
 
         ret = i2c_smbus_read_byte(client);
         if (ret < 0) {
                 dev_err(&client->dev, "cannot read low byte measurement");
                 return ret;
         }
-        val |= ret >> 2;
+        val |= ret;
 
         return val;
 }
@@ -211,18 +211,18 @@ static int hdc100x_read_raw(struct iio_dev *indio_dev,
                 return IIO_VAL_INT_PLUS_MICRO;
         case IIO_CHAN_INFO_SCALE:
                 if (chan->type == IIO_TEMP) {
-                        *val = 165;
-                        *val2 = 65536 >> 2;
+                        *val = 165000;
+                        *val2 = 65536;
                         return IIO_VAL_FRACTIONAL;
                 } else {
-                        *val = 0;
-                        *val2 = 10000;
-                        return IIO_VAL_INT_PLUS_MICRO;
+                        *val = 100;
+                        *val2 = 65536;
+                        return IIO_VAL_FRACTIONAL;
                 }
                 break;
         case IIO_CHAN_INFO_OFFSET:
-                *val = -3971;
-                *val2 = 879096;
+                *val = -15887;
+                *val2 = 515151;
                 return IIO_VAL_INT_PLUS_MICRO;
         default:
                 return -EINVAL;
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index 0bf92b06d7d8..b8a290ec984e 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -209,11 +209,11 @@ static const struct  bmi160_scale_item bmi160_scale_table[] = {
 };
 
 static const struct bmi160_odr bmi160_accel_odr[] = {
-        {0x01, 0, 78125},
-        {0x02, 1, 5625},
-        {0x03, 3, 125},
-        {0x04, 6, 25},
-        {0x05, 12, 5},
+        {0x01, 0, 781250},
+        {0x02, 1, 562500},
+        {0x03, 3, 125000},
+        {0x04, 6, 250000},
+        {0x05, 12, 500000},
         {0x06, 25, 0},
         {0x07, 50, 0},
         {0x08, 100, 0},
@@ -229,7 +229,7 @@ static const struct bmi160_odr bmi160_gyro_odr[] = {
         {0x08, 100, 0},
         {0x09, 200, 0},
         {0x0A, 400, 0},
-        {0x0B, 8000, 0},
+        {0x0B, 800, 0},
         {0x0C, 1600, 0},
         {0x0D, 3200, 0},
 };
@@ -364,8 +364,8 @@ int bmi160_set_odr(struct bmi160_data *data, enum bmi160_sensor_type t,
 
         return regmap_update_bits(data->regmap,
                                   bmi160_regs[t].config,
-                                  bmi160_odr_table[t].tbl[i].bits,
-                                  bmi160_regs[t].config_odr_mask);
+                                  bmi160_regs[t].config_odr_mask,
+                                  bmi160_odr_table[t].tbl[i].bits);
 }
 
 static int bmi160_get_odr(struct bmi160_data *data, enum bmi160_sensor_type t,
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index ae2806aafb72..0c52dfe64977 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -210,22 +210,35 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
 
         /* Prevent the module from being removed whilst attached to a trigger */
         __module_get(pf->indio_dev->info->driver_module);
+
+        /* Get irq number */
         pf->irq = iio_trigger_get_irq(trig);
+        if (pf->irq < 0)
+                goto out_put_module;
+
+        /* Request irq */
         ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                    pf->type, pf->name,
                                    pf);
-        if (ret < 0) {
-                module_put(pf->indio_dev->info->driver_module);
-                return ret;
-        }
+        if (ret < 0)
+                goto out_put_irq;
 
+        /* Enable trigger in driver */
         if (trig->ops && trig->ops->set_trigger_state && notinuse) {
                 ret = trig->ops->set_trigger_state(trig, true);
                 if (ret < 0)
-                        module_put(pf->indio_dev->info->driver_module);
+                        goto out_free_irq;
         }
 
         return ret;
+
+out_free_irq:
+        free_irq(pf->irq, pf);
+out_put_irq:
+        iio_trigger_put_irq(trig, pf->irq);
+out_put_module:
+        module_put(pf->indio_dev->info->driver_module);
+        return ret;
 }
 
 static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
index b4dbb3912977..651d57b8abbf 100644
--- a/drivers/iio/light/apds9960.c
+++ b/drivers/iio/light/apds9960.c
@@ -1011,6 +1011,7 @@ static int apds9960_probe(struct i2c_client *client,
 
         iio_device_attach_buffer(indio_dev, buffer);
 
+        indio_dev->dev.parent = &client->dev;
         indio_dev->info = &apds9960_info;
         indio_dev->name = APDS9960_DRV_NAME;
         indio_dev->channels = apds9960_channels;
diff --git a/drivers/iio/light/bh1780.c b/drivers/iio/light/bh1780.c
index 72b364e4aa72..b54dcba05a82 100644
--- a/drivers/iio/light/bh1780.c
+++ b/drivers/iio/light/bh1780.c
@@ -84,7 +84,7 @@ static int bh1780_debugfs_reg_access(struct iio_dev *indio_dev,
         int ret;
 
         if (!readval)
-                bh1780_write(bh1780, (u8)reg, (u8)writeval);
+                return bh1780_write(bh1780, (u8)reg, (u8)writeval);
 
         ret = bh1780_read(bh1780, (u8)reg);
         if (ret < 0)
@@ -187,7 +187,7 @@ static int bh1780_probe(struct i2c_client *client,
 
         indio_dev->dev.parent = &client->dev;
         indio_dev->info = &bh1780_info;
-        indio_dev->name = id->name;
+        indio_dev->name = "bh1780";
         indio_dev->channels = bh1780_channels;
         indio_dev->num_channels = ARRAY_SIZE(bh1780_channels);
         indio_dev->modes = INDIO_DIRECT_MODE;
@@ -226,7 +226,8 @@ static int bh1780_remove(struct i2c_client *client)
 static int bh1780_runtime_suspend(struct device *dev)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        struct bh1780_data *bh1780 = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct bh1780_data *bh1780 = iio_priv(indio_dev);
         int ret;
 
         ret = bh1780_write(bh1780, BH1780_REG_CONTROL, BH1780_POFF);
@@ -241,7 +242,8 @@ static int bh1780_runtime_suspend(struct device *dev)
 static int bh1780_runtime_resume(struct device *dev)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        struct bh1780_data *bh1780 = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct bh1780_data *bh1780 = iio_priv(indio_dev);
         int ret;
 
         ret = bh1780_write(bh1780, BH1780_REG_CONTROL, BH1780_PON);
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index e01e58a9bd14..f17cb2ea18f5 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -147,7 +147,6 @@ static const struct iio_chan_spec max44000_channels[] = {
         {
                 .type = IIO_PROXIMITY,
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
                 .scan_index = MAX44000_SCAN_INDEX_PRX,
                 .scan_type = {
                         .sign           = 'u',
diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
index ecd3bd0a9769..0a9e8fadfa9d 100644
--- a/drivers/iio/magnetometer/st_magn_buffer.c
+++ b/drivers/iio/magnetometer/st_magn_buffer.c
@@ -82,7 +82,7 @@ static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = {
 
 int st_magn_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_magn_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 62036d2a9956..8250fc322c56 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -572,6 +572,7 @@ static const struct iio_info magn_info = {
 static const struct iio_trigger_ops st_magn_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_MAGN_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_MAGN_TRIGGER_OPS (&st_magn_trigger_ops)
 #else
diff --git a/drivers/iio/pressure/bmp280.c b/drivers/iio/pressure/bmp280.c
index 2f1498e12bb2..724452d61846 100644
--- a/drivers/iio/pressure/bmp280.c
+++ b/drivers/iio/pressure/bmp280.c
@@ -879,8 +879,8 @@ static int bmp280_probe(struct i2c_client *client,
         if (ret < 0)
                 return ret;
         if (chip_id != id->driver_data) {
-                dev_err(&client->dev, "bad chip id.  expected %x got %x\n",
-                        BMP280_CHIP_ID, chip_id);
+                dev_err(&client->dev, "bad chip id.  expected %lx got %x\n",
+                        id->driver_data, chip_id);
                 return -EINVAL;
         }
 
diff --git a/drivers/iio/pressure/st_pressure_buffer.c b/drivers/iio/pressure/st_pressure_buffer.c
index 2ff53f222352..99468d0a64e7 100644
--- a/drivers/iio/pressure/st_pressure_buffer.c
+++ b/drivers/iio/pressure/st_pressure_buffer.c
@@ -82,7 +82,7 @@ static const struct iio_buffer_setup_ops st_press_buffer_setup_ops = {
 
 int st_press_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_press_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 9e9b72a8f18f..92a118c3c4ac 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -28,15 +28,21 @@
 #include <linux/iio/common/st_sensors.h>
 #include "st_pressure.h"
 
+#define MCELSIUS_PER_CELSIUS                    1000
+
+/* Default pressure sensitivity */
 #define ST_PRESS_LSB_PER_MBAR                   4096UL
 #define ST_PRESS_KPASCAL_NANO_SCALE             (100000000UL / \
                                                  ST_PRESS_LSB_PER_MBAR)
+
+/* Default temperature sensitivity */
 #define ST_PRESS_LSB_PER_CELSIUS                480UL
-#define ST_PRESS_CELSIUS_NANO_SCALE             (1000000000UL / \
-                                                 ST_PRESS_LSB_PER_CELSIUS)
+#define ST_PRESS_MILLI_CELSIUS_OFFSET           42500UL
+
 #define ST_PRESS_NUMBER_DATA_CHANNELS           1
 
 /* FULLSCALE */
+#define ST_PRESS_FS_AVL_1100MB                  1100
 #define ST_PRESS_FS_AVL_1260MB                  1260
 
 #define ST_PRESS_1_OUT_XL_ADDR                  0x28
@@ -54,9 +60,6 @@
 #define ST_PRESS_LPS331AP_PW_MASK               0x80
 #define ST_PRESS_LPS331AP_FS_ADDR               0x23
 #define ST_PRESS_LPS331AP_FS_MASK               0x30
-#define ST_PRESS_LPS331AP_FS_AVL_1260_VAL       0x00
-#define ST_PRESS_LPS331AP_FS_AVL_1260_GAIN      ST_PRESS_KPASCAL_NANO_SCALE
-#define ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN      ST_PRESS_CELSIUS_NANO_SCALE
 #define ST_PRESS_LPS331AP_BDU_ADDR              0x20
 #define ST_PRESS_LPS331AP_BDU_MASK              0x04
 #define ST_PRESS_LPS331AP_DRDY_IRQ_ADDR         0x22
@@ -67,9 +70,14 @@
 #define ST_PRESS_LPS331AP_OD_IRQ_ADDR           0x22
 #define ST_PRESS_LPS331AP_OD_IRQ_MASK           0x40
 #define ST_PRESS_LPS331AP_MULTIREAD_BIT         true
-#define ST_PRESS_LPS331AP_TEMP_OFFSET           42500
 
 /* CUSTOM VALUES FOR LPS001WP SENSOR */
+
+/* LPS001WP pressure resolution */
+#define ST_PRESS_LPS001WP_LSB_PER_MBAR          16UL
+/* LPS001WP temperature resolution */
+#define ST_PRESS_LPS001WP_LSB_PER_CELSIUS       64UL
+
 #define ST_PRESS_LPS001WP_WAI_EXP               0xba
 #define ST_PRESS_LPS001WP_ODR_ADDR              0x20
 #define ST_PRESS_LPS001WP_ODR_MASK              0x30
@@ -78,6 +86,8 @@
 #define ST_PRESS_LPS001WP_ODR_AVL_13HZ_VAL      0x03
 #define ST_PRESS_LPS001WP_PW_ADDR               0x20
 #define ST_PRESS_LPS001WP_PW_MASK               0x40
+#define ST_PRESS_LPS001WP_FS_AVL_PRESS_GAIN \
+        (100000000UL / ST_PRESS_LPS001WP_LSB_PER_MBAR)
 #define ST_PRESS_LPS001WP_BDU_ADDR              0x20
 #define ST_PRESS_LPS001WP_BDU_MASK              0x04
 #define ST_PRESS_LPS001WP_MULTIREAD_BIT         true
@@ -94,11 +104,6 @@
 #define ST_PRESS_LPS25H_ODR_AVL_25HZ_VAL        0x04
 #define ST_PRESS_LPS25H_PW_ADDR                 0x20
 #define ST_PRESS_LPS25H_PW_MASK                 0x80
-#define ST_PRESS_LPS25H_FS_ADDR                 0x00
-#define ST_PRESS_LPS25H_FS_MASK                 0x00
-#define ST_PRESS_LPS25H_FS_AVL_1260_VAL         0x00
-#define ST_PRESS_LPS25H_FS_AVL_1260_GAIN        ST_PRESS_KPASCAL_NANO_SCALE
-#define ST_PRESS_LPS25H_FS_AVL_TEMP_GAIN        ST_PRESS_CELSIUS_NANO_SCALE
 #define ST_PRESS_LPS25H_BDU_ADDR                0x20
 #define ST_PRESS_LPS25H_BDU_MASK                0x04
 #define ST_PRESS_LPS25H_DRDY_IRQ_ADDR           0x23
@@ -109,7 +114,6 @@
 #define ST_PRESS_LPS25H_OD_IRQ_ADDR             0x22
 #define ST_PRESS_LPS25H_OD_IRQ_MASK             0x40
 #define ST_PRESS_LPS25H_MULTIREAD_BIT           true
-#define ST_PRESS_LPS25H_TEMP_OFFSET             42500
 #define ST_PRESS_LPS25H_OUT_XL_ADDR             0x28
 #define ST_TEMP_LPS25H_OUT_L_ADDR               0x2b
 
@@ -161,7 +165,9 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = {
                         .storagebits = 16,
                         .endianness = IIO_LE,
                 },
-                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .info_mask_separate =
+                        BIT(IIO_CHAN_INFO_RAW) |
+                        BIT(IIO_CHAN_INFO_SCALE),
                 .modified = 0,
         },
         {
@@ -177,7 +183,7 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = {
                 },
                 .info_mask_separate =
                         BIT(IIO_CHAN_INFO_RAW) |
-                        BIT(IIO_CHAN_INFO_OFFSET),
+                        BIT(IIO_CHAN_INFO_SCALE),
                 .modified = 0,
         },
         IIO_CHAN_SOFT_TIMESTAMP(1)
@@ -212,11 +218,14 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .addr = ST_PRESS_LPS331AP_FS_ADDR,
                         .mask = ST_PRESS_LPS331AP_FS_MASK,
                         .fs_avl = {
+                                /*
+                                 * Pressure and temperature sensitivity values
+                                 * as defined in table 3 of LPS331AP datasheet.
+                                 */
                                 [0] = {
                                         .num = ST_PRESS_FS_AVL_1260MB,
-                                        .value = ST_PRESS_LPS331AP_FS_AVL_1260_VAL,
-                                        .gain = ST_PRESS_LPS331AP_FS_AVL_1260_GAIN,
-                                        .gain2 = ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN,
+                                        .gain = ST_PRESS_KPASCAL_NANO_SCALE,
+                                        .gain2 = ST_PRESS_LSB_PER_CELSIUS,
                                 },
                         },
                 },
@@ -261,7 +270,17 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
-                        .addr = 0,
+                        .fs_avl = {
+                                /*
+                                 * Pressure and temperature resolution values
+                                 * as defined in table 3 of LPS001WP datasheet.
+                                 */
+                                [0] = {
+                                        .num = ST_PRESS_FS_AVL_1100MB,
+                                        .gain = ST_PRESS_LPS001WP_FS_AVL_PRESS_GAIN,
+                                        .gain2 = ST_PRESS_LPS001WP_LSB_PER_CELSIUS,
+                                },
+                        },
                 },
                 .bdu = {
                         .addr = ST_PRESS_LPS001WP_BDU_ADDR,
@@ -298,14 +317,15 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
-                        .addr = ST_PRESS_LPS25H_FS_ADDR,
-                        .mask = ST_PRESS_LPS25H_FS_MASK,
                         .fs_avl = {
+                                /*
+                                 * Pressure and temperature sensitivity values
+                                 * as defined in table 3 of LPS25H datasheet.
+                                 */
                                 [0] = {
                                         .num = ST_PRESS_FS_AVL_1260MB,
-                                        .value = ST_PRESS_LPS25H_FS_AVL_1260_VAL,
-                                        .gain = ST_PRESS_LPS25H_FS_AVL_1260_GAIN,
-                                        .gain2 = ST_PRESS_LPS25H_FS_AVL_TEMP_GAIN,
+                                        .gain = ST_PRESS_KPASCAL_NANO_SCALE,
+                                        .gain2 = ST_PRESS_LSB_PER_CELSIUS,
                                 },
                         },
                 },
@@ -364,26 +384,26 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
 
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
-                *val = 0;
-
                 switch (ch->type) {
                 case IIO_PRESSURE:
+                        *val = 0;
                         *val2 = press_data->current_fullscale->gain;
-                        break;
+                        return IIO_VAL_INT_PLUS_NANO;
                 case IIO_TEMP:
+                        *val = MCELSIUS_PER_CELSIUS;
                         *val2 = press_data->current_fullscale->gain2;
-                        break;
+                        return IIO_VAL_FRACTIONAL;
                 default:
                         err = -EINVAL;
                         goto read_error;
                 }
 
-                return IIO_VAL_INT_PLUS_NANO;
         case IIO_CHAN_INFO_OFFSET:
                 switch (ch->type) {
                 case IIO_TEMP:
-                        *val = 425;
-                        *val2 = 10;
+                        *val = ST_PRESS_MILLI_CELSIUS_OFFSET *
+                               press_data->current_fullscale->gain2;
+                        *val2 = MCELSIUS_PER_CELSIUS;
                         break;
                 default:
                         err = -EINVAL;
@@ -425,6 +445,7 @@ static const struct iio_info press_info = {
 static const struct iio_trigger_ops st_press_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_PRESS_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_PRESS_TRIGGER_OPS (&st_press_trigger_ops)
 #else
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index f4d29d5dbd5f..e2f926cdcad2 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -64,6 +64,7 @@ struct as3935_state {
         struct delayed_work work;
 
         u32 tune_cap;
+        u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */
         u8 buf[2] ____cacheline_aligned;
 };
 
@@ -72,7 +73,8 @@ static const struct iio_chan_spec as3935_channels[] = {
                 .type           = IIO_PROXIMITY,
                 .info_mask_separate =
                         BIT(IIO_CHAN_INFO_RAW) |
-                        BIT(IIO_CHAN_INFO_PROCESSED),
+                        BIT(IIO_CHAN_INFO_PROCESSED) |
+                        BIT(IIO_CHAN_INFO_SCALE),
                 .scan_index     = 0,
                 .scan_type = {
                         .sign           = 'u',
@@ -181,7 +183,12 @@ static int as3935_read_raw(struct iio_dev *indio_dev,
                 /* storm out of range */
                 if (*val == AS3935_DATA_MASK)
                         return -EINVAL;
-                *val *= 1000;
+
+                if (m == IIO_CHAN_INFO_PROCESSED)
+                        *val *= 1000;
+                break;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 1000;
                 break;
         default:
                 return -EINVAL;
@@ -206,10 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private)
         ret = as3935_read(st, AS3935_DATA, &val);
         if (ret)
                 goto err_read;
-        val &= AS3935_DATA_MASK;
-        val *= 1000;
 
-        iio_push_to_buffers_with_timestamp(indio_dev, &val, pf->timestamp);
+        st->buffer[0] = val & AS3935_DATA_MASK;
+        iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer,
+                                           pf->timestamp);
 err_read:
         iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index c2e257d97eff..1a2984c28b95 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -178,6 +178,7 @@ static int write_gid(struct ib_device *ib_dev, u8 port,
 {
         int ret = 0;
         struct net_device *old_net_dev;
+        enum ib_gid_type old_gid_type;
 
         /* in rdma_cap_roce_gid_table, this funciton should be protected by a
          * sleep-able lock.
@@ -199,6 +200,7 @@ static int write_gid(struct ib_device *ib_dev, u8 port,
         }
 
         old_net_dev = table->data_vec[ix].attr.ndev;
+        old_gid_type = table->data_vec[ix].attr.gid_type;
         if (old_net_dev && old_net_dev != attr->ndev)
                 dev_put(old_net_dev);
         /* if modify_gid failed, just delete the old gid */
@@ -207,10 +209,14 @@ static int write_gid(struct ib_device *ib_dev, u8 port,
                 attr = &zattr;
                 table->data_vec[ix].context = NULL;
         }
-        if (default_gid)
-                table->data_vec[ix].props |= GID_TABLE_ENTRY_DEFAULT;
+
         memcpy(&table->data_vec[ix].gid, gid, sizeof(*gid));
         memcpy(&table->data_vec[ix].attr, attr, sizeof(*attr));
+        if (default_gid) {
+                table->data_vec[ix].props |= GID_TABLE_ENTRY_DEFAULT;
+                if (action == GID_TABLE_WRITE_ACTION_DEL)
+                        table->data_vec[ix].attr.gid_type = old_gid_type;
+        }
         if (table->data_vec[ix].attr.ndev &&
             table->data_vec[ix].attr.ndev != old_net_dev)
                 dev_hold(table->data_vec[ix].attr.ndev);
@@ -405,7 +411,9 @@ int ib_cache_gid_del_all_netdev_gids(struct ib_device *ib_dev, u8 port,
 
         for (ix = 0; ix < table->sz; ix++)
                 if (table->data_vec[ix].attr.ndev == ndev)
-                        if (!del_gid(ib_dev, port, table, ix, false))
+                        if (!del_gid(ib_dev, port, table, ix,
+                                     !!(table->data_vec[ix].props &
+                                        GID_TABLE_ENTRY_DEFAULT)))
                                 deleted = true;
 
         write_unlock_irq(&table->rwlock);
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 1d92e091e22e..c99525512b34 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3452,14 +3452,14 @@ static int cm_establish(struct ib_cm_id *cm_id)
         work->cm_event.event = IB_CM_USER_ESTABLISHED;
 
         /* Check if the device started its remove_one */
-        spin_lock_irq(&cm.lock);
+        spin_lock_irqsave(&cm.lock, flags);
         if (!cm_dev->going_down) {
                 queue_delayed_work(cm.wq, &work->work, 0);
         } else {
                 kfree(work);
                 ret = -ENODEV;
         }
-        spin_unlock_irq(&cm.lock);
+        spin_unlock_irqrestore(&cm.lock, flags);
 
 out:
         return ret;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index f0c91ba3178a..ad1b1adcf6f0 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -708,17 +708,6 @@ static void cma_deref_id(struct rdma_id_private *id_priv)
                 complete(&id_priv->comp);
 }
 
-static int cma_disable_callback(struct rdma_id_private *id_priv,
-                                enum rdma_cm_state state)
-{
-        mutex_lock(&id_priv->handler_mutex);
-        if (id_priv->state != state) {
-                mutex_unlock(&id_priv->handler_mutex);
-                return -EINVAL;
-        }
-        return 0;
-}
-
 struct rdma_cm_id *rdma_create_id(struct net *net,
                                   rdma_cm_event_handler event_handler,
                                   void *context, enum rdma_port_space ps,
@@ -1671,11 +1660,12 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
         struct rdma_cm_event event;
         int ret = 0;
 
+        mutex_lock(&id_priv->handler_mutex);
         if ((ib_event->event != IB_CM_TIMEWAIT_EXIT &&
-                cma_disable_callback(id_priv, RDMA_CM_CONNECT)) ||
+             id_priv->state != RDMA_CM_CONNECT) ||
             (ib_event->event == IB_CM_TIMEWAIT_EXIT &&
-                cma_disable_callback(id_priv, RDMA_CM_DISCONNECT)))
-                return 0;
+             id_priv->state != RDMA_CM_DISCONNECT))
+                goto out;
 
         memset(&event, 0, sizeof event);
         switch (ib_event->event) {
@@ -1870,7 +1860,7 @@ static int cma_check_req_qp_type(struct rdma_cm_id *id, struct ib_cm_event *ib_e
 
 static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
 {
-        struct rdma_id_private *listen_id, *conn_id;
+        struct rdma_id_private *listen_id, *conn_id = NULL;
         struct rdma_cm_event event;
         struct net_device *net_dev;
         int offset, ret;
@@ -1884,9 +1874,10 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
                 goto net_dev_put;
         }
 
-        if (cma_disable_callback(listen_id, RDMA_CM_LISTEN)) {
+        mutex_lock(&listen_id->handler_mutex);
+        if (listen_id->state != RDMA_CM_LISTEN) {
                 ret = -ECONNABORTED;
-                goto net_dev_put;
+                goto err1;
         }
 
         memset(&event, 0, sizeof event);
@@ -1976,8 +1967,9 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
         struct sockaddr *laddr = (struct sockaddr *)&iw_event->local_addr;
         struct sockaddr *raddr = (struct sockaddr *)&iw_event->remote_addr;
 
-        if (cma_disable_callback(id_priv, RDMA_CM_CONNECT))
-                return 0;
+        mutex_lock(&id_priv->handler_mutex);
+        if (id_priv->state != RDMA_CM_CONNECT)
+                goto out;
 
         memset(&event, 0, sizeof event);
         switch (iw_event->event) {
@@ -2029,6 +2021,7 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
                 return ret;
         }
 
+out:
         mutex_unlock(&id_priv->handler_mutex);
         return ret;
 }
@@ -2039,13 +2032,15 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         struct rdma_cm_id *new_cm_id;
         struct rdma_id_private *listen_id, *conn_id;
         struct rdma_cm_event event;
-        int ret;
+        int ret = -ECONNABORTED;
         struct sockaddr *laddr = (struct sockaddr *)&iw_event->local_addr;
         struct sockaddr *raddr = (struct sockaddr *)&iw_event->remote_addr;
 
         listen_id = cm_id->context;
-        if (cma_disable_callback(listen_id, RDMA_CM_LISTEN))
-                return -ECONNABORTED;
+
+        mutex_lock(&listen_id->handler_mutex);
+        if (listen_id->state != RDMA_CM_LISTEN)
+                goto out;
 
         /* Create a new RDMA id for the new IW CM ID */
         new_cm_id = rdma_create_id(listen_id->id.route.addr.dev_addr.net,
@@ -3216,8 +3211,9 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
         struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd;
         int ret = 0;
 
-        if (cma_disable_callback(id_priv, RDMA_CM_CONNECT))
-                return 0;
+        mutex_lock(&id_priv->handler_mutex);
+        if (id_priv->state != RDMA_CM_CONNECT)
+                goto out;
 
         memset(&event, 0, sizeof event);
         switch (ib_event->event) {
@@ -3673,12 +3669,13 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
         struct rdma_id_private *id_priv;
         struct cma_multicast *mc = multicast->context;
         struct rdma_cm_event event;
-        int ret;
+        int ret = 0;
 
         id_priv = mc->id_priv;
-        if (cma_disable_callback(id_priv, RDMA_CM_ADDR_BOUND) &&
-            cma_disable_callback(id_priv, RDMA_CM_ADDR_RESOLVED))
-                return 0;
+        mutex_lock(&id_priv->handler_mutex);
+        if (id_priv->state != RDMA_CM_ADDR_BOUND &&
+            id_priv->state != RDMA_CM_ADDR_RESOLVED)
+                goto out;
 
         if (!status)
                 status = cma_set_qkey(id_priv, be32_to_cpu(multicast->rec.qkey));
@@ -3720,6 +3717,7 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
                 return 0;
         }
 
+out:
         mutex_unlock(&id_priv->handler_mutex);
         return 0;
 }
@@ -3878,12 +3876,12 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
         gid_type = id_priv->cma_dev->default_gid_type[id_priv->id.port_num -
                    rdma_start_port(id_priv->cma_dev->device)];
         if (addr->sa_family == AF_INET) {
-                if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
+                if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
+                        mc->multicast.ib->rec.hop_limit = IPV6_DEFAULT_HOPLIMIT;
                         err = cma_igmp_send(ndev, &mc->multicast.ib->rec.mgid,
                                             true);
-                if (!err) {
-                        mc->igmp_joined = true;
-                        mc->multicast.ib->rec.hop_limit = IPV6_DEFAULT_HOPLIMIT;
+                        if (!err)
+                                mc->igmp_joined = true;
                 }
         } else {
                 if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 5516fb070344..5c155fa91eec 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -661,6 +661,9 @@ int ib_query_port(struct ib_device *device,
         if (err || port_attr->subnet_prefix)
                 return err;
 
+        if (rdma_port_get_link_layer(device, port_num) != IB_LINK_LAYER_INFINIBAND)
+                return 0;
+
         err = ib_query_gid(device, port_num, 0, &gid, NULL);
         if (err)
                 return err;
@@ -1024,7 +1027,8 @@ static int __init ib_core_init(void)
                 goto err_mad;
         }
 
-        if (ib_add_ibnl_clients()) {
+        ret = ib_add_ibnl_clients();
+        if (ret) {
                 pr_warn("Couldn't register ibnl clients\n");
                 goto err_sa;
         }
diff --git a/drivers/infiniband/core/iwpm_msg.c b/drivers/infiniband/core/iwpm_msg.c
index 43e3fa27102b..1c41b95cefec 100644
--- a/drivers/infiniband/core/iwpm_msg.c
+++ b/drivers/infiniband/core/iwpm_msg.c
@@ -506,7 +506,7 @@ int iwpm_add_and_query_mapping_cb(struct sk_buff *skb,
         if (!nlmsg_request) {
                 pr_info("%s: Could not find a matching request (seq = %u)\n",
                                  __func__, msg_seq);
-                        return -EINVAL;
+                return -EINVAL;
         }
         pm_msg = nlmsg_request->req_buffer;
         local_sockaddr = (struct sockaddr_storage *)
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 82fb511112da..2d49228f28b2 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1638,9 +1638,9 @@ static void remove_mad_reg_req(struct ib_mad_agent_private *agent_priv)
                 /* Now, check to see if there are any methods still in use */
                 if (!check_method_table(method)) {
                         /* If not, release management method table */
-                         kfree(method);
-                         class->method_table[mgmt_class] = NULL;
-                         /* Any management classes left ? */
+                        kfree(method);
+                        class->method_table[mgmt_class] = NULL;
+                        /* Any management classes left ? */
                         if (!check_class_table(class)) {
                                 /* If not, release management class table */
                                 kfree(class);
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 5e573bb18660..a5793c8f1590 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -889,9 +889,9 @@ static struct attribute *alloc_hsa_lifespan(char *name, u8 port_num)
 static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                            u8 port_num)
 {
-        struct attribute_group *hsag = NULL;
+        struct attribute_group *hsag;
         struct rdma_hw_stats *stats;
-        int i = 0, ret;
+        int i, ret;
 
         stats = device->alloc_hw_stats(device, port_num);
 
@@ -899,19 +899,22 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                 return;
 
         if (!stats->names || stats->num_counters <= 0)
-                goto err;
+                goto err_free_stats;
 
+        /*
+         * Two extra attribue elements here, one for the lifespan entry and
+         * one to NULL terminate the list for the sysfs core code
+         */
         hsag = kzalloc(sizeof(*hsag) +
-                       // 1 extra for the lifespan config entry
-                       sizeof(void *) * (stats->num_counters + 1),
+                       sizeof(void *) * (stats->num_counters + 2),
                        GFP_KERNEL);
         if (!hsag)
-                return;
+                goto err_free_stats;
 
         ret = device->get_hw_stats(device, stats, port_num,
                                    stats->num_counters);
         if (ret != stats->num_counters)
-                goto err;
+                goto err_free_hsag;
 
         stats->timestamp = jiffies;
 
@@ -922,10 +925,13 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                 hsag->attrs[i] = alloc_hsa(i, port_num, stats->names[i]);
                 if (!hsag->attrs[i])
                         goto err;
+                sysfs_attr_init(hsag->attrs[i]);
         }
 
         /* treat an error here as non-fatal */
         hsag->attrs[i] = alloc_hsa_lifespan("lifespan", port_num);
+        if (hsag->attrs[i])
+                sysfs_attr_init(hsag->attrs[i]);
 
         if (port) {
                 struct kobject *kobj = &port->kobj;
@@ -946,10 +952,12 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
         return;
 
 err:
-        kfree(stats);
         for (; i >= 0; i--)
                 kfree(hsag->attrs[i]);
+err_free_hsag:
         kfree(hsag);
+err_free_stats:
+        kfree(stats);
         return;
 }
 
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 1a8babb8ee3c..825021d1008b 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1747,7 +1747,7 @@ static int create_qp(struct ib_uverbs_file *file,
         struct ib_srq                   *srq = NULL;
         struct ib_qp                    *qp;
         char                            *buf;
-        struct ib_qp_init_attr          attr;
+        struct ib_qp_init_attr          attr = {};
         struct ib_uverbs_ex_create_qp_resp resp;
         int                             ret;
 
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 1d7d4cf442e3..6298f54b4137 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -511,12 +511,16 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
                 ah_attr->grh.dgid = sgid;
 
                 if (!rdma_cap_eth_ah(device, port_num)) {
-                        ret = ib_find_cached_gid_by_port(device, &dgid,
-                                                         IB_GID_TYPE_IB,
-                                                         port_num, NULL,
-                                                         &gid_index);
-                        if (ret)
-                                return ret;
+                        if (dgid.global.interface_id != cpu_to_be64(IB_SA_WELL_KNOWN_GUID)) {
+                                ret = ib_find_cached_gid_by_port(device, &dgid,
+                                                                 IB_GID_TYPE_IB,
+                                                                 port_num, NULL,
+                                                                 &gid_index);
+                                if (ret)
+                                        return ret;
+                        } else {
+                                gid_index = 0;
+                        }
                 }
 
                 ah_attr->grh.sgid_index = (u8) gid_index;
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c
index 6e7050ab9e16..14d7eeb09be6 100644
--- a/drivers/infiniband/hw/hfi1/affinity.c
+++ b/drivers/infiniband/hw/hfi1/affinity.c
@@ -300,16 +300,15 @@ int hfi1_get_proc_affinity(struct hfi1_devdata *dd, int node)
         const struct cpumask *node_mask,
                 *proc_mask = tsk_cpus_allowed(current);
         struct cpu_mask_set *set = &dd->affinity->proc;
-        char buf[1024];
 
         /*
          * check whether process/context affinity has already
          * been set
          */
         if (cpumask_weight(proc_mask) == 1) {
-                scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(proc_mask));
-                hfi1_cdbg(PROC, "PID %u %s affinity set to CPU %s",
-                          current->pid, current->comm, buf);
+                hfi1_cdbg(PROC, "PID %u %s affinity set to CPU %*pbl",
+                          current->pid, current->comm,
+                          cpumask_pr_args(proc_mask));
                 /*
                  * Mark the pre-set CPU as used. This is atomic so we don't
                  * need the lock
@@ -318,9 +317,9 @@ int hfi1_get_proc_affinity(struct hfi1_devdata *dd, int node)
                 cpumask_set_cpu(cpu, &set->used);
                 goto done;
         } else if (cpumask_weight(proc_mask) < cpumask_weight(&set->mask)) {
-                scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(proc_mask));
-                hfi1_cdbg(PROC, "PID %u %s affinity set to CPU set(s) %s",
-                          current->pid, current->comm, buf);
+                hfi1_cdbg(PROC, "PID %u %s affinity set to CPU set(s) %*pbl",
+                          current->pid, current->comm,
+                          cpumask_pr_args(proc_mask));
                 goto done;
         }
 
@@ -356,8 +355,8 @@ int hfi1_get_proc_affinity(struct hfi1_devdata *dd, int node)
         cpumask_or(intrs, intrs, (dd->affinity->rcv_intr.gen ?
                                   &dd->affinity->rcv_intr.mask :
                                   &dd->affinity->rcv_intr.used));
-        scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(intrs));
-        hfi1_cdbg(PROC, "CPUs used by interrupts: %s", buf);
+        hfi1_cdbg(PROC, "CPUs used by interrupts: %*pbl",
+                  cpumask_pr_args(intrs));
 
         /*
          * If we don't have a NUMA node requested, preference is towards
@@ -366,18 +365,16 @@ int hfi1_get_proc_affinity(struct hfi1_devdata *dd, int node)
         if (node == -1)
                 node = dd->node;
         node_mask = cpumask_of_node(node);
-        scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(node_mask));
-        hfi1_cdbg(PROC, "device on NUMA %u, CPUs %s", node, buf);
+        hfi1_cdbg(PROC, "device on NUMA %u, CPUs %*pbl", node,
+                  cpumask_pr_args(node_mask));
 
         /* diff will hold all unused cpus */
         cpumask_andnot(diff, &set->mask, &set->used);
-        scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(diff));
-        hfi1_cdbg(PROC, "unused CPUs (all) %s", buf);
+        hfi1_cdbg(PROC, "unused CPUs (all) %*pbl", cpumask_pr_args(diff));
 
         /* get cpumask of available CPUs on preferred NUMA */
         cpumask_and(mask, diff, node_mask);
-        scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(mask));
-        hfi1_cdbg(PROC, "available cpus on NUMA %s", buf);
+        hfi1_cdbg(PROC, "available cpus on NUMA %*pbl", cpumask_pr_args(mask));
 
         /*
          * At first, we don't want to place processes on the same
@@ -395,8 +392,8 @@ int hfi1_get_proc_affinity(struct hfi1_devdata *dd, int node)
                 cpumask_andnot(diff, &set->mask, &set->used);
                 cpumask_andnot(mask, diff, node_mask);
         }
-        scnprintf(buf, 1024, "%*pbl", cpumask_pr_args(mask));
-        hfi1_cdbg(PROC, "possible CPUs for process %s", buf);
+        hfi1_cdbg(PROC, "possible CPUs for process %*pbl",
+                  cpumask_pr_args(mask));
 
         cpu = cpumask_first(mask);
         if (cpu >= nr_cpu_ids) /* empty */
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 3b876da745a1..f5de85178055 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -1037,7 +1037,7 @@ static void dc_shutdown(struct hfi1_devdata *);
 static void dc_start(struct hfi1_devdata *);
 static int qos_rmt_entries(struct hfi1_devdata *dd, unsigned int *mp,
                            unsigned int *np);
-static void remove_full_mgmt_pkey(struct hfi1_pportdata *ppd);
+static void clear_full_mgmt_pkey(struct hfi1_pportdata *ppd);
 
 /*
  * Error interrupt table entry.  This is used as input to the interrupt
@@ -6962,8 +6962,6 @@ void handle_link_down(struct work_struct *work)
         }
 
         reset_neighbor_info(ppd);
-        if (ppd->mgmt_allowed)
-                remove_full_mgmt_pkey(ppd);
 
         /* disable the port */
         clear_rcvctrl(ppd->dd, RCV_CTRL_RCV_PORT_ENABLE_SMASK);
@@ -7070,12 +7068,16 @@ static void add_full_mgmt_pkey(struct hfi1_pportdata *ppd)
                             __func__, ppd->pkeys[2], FULL_MGMT_P_KEY);
         ppd->pkeys[2] = FULL_MGMT_P_KEY;
         (void)hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_PKEYS, 0);
+        hfi1_event_pkey_change(ppd->dd, ppd->port);
 }
 
-static void remove_full_mgmt_pkey(struct hfi1_pportdata *ppd)
+static void clear_full_mgmt_pkey(struct hfi1_pportdata *ppd)
 {
-        ppd->pkeys[2] = 0;
-        (void)hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_PKEYS, 0);
+        if (ppd->pkeys[2] != 0) {
+                ppd->pkeys[2] = 0;
+                (void)hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_PKEYS, 0);
+                hfi1_event_pkey_change(ppd->dd, ppd->port);
+        }
 }
 
 /*
@@ -7832,8 +7834,8 @@ static void handle_dcc_err(struct hfi1_devdata *dd, u32 unused, u64 reg)
                          * save first 2 flits in the packet that caused
                          * the error
                          */
-                         dd->err_info_rcvport.packet_flit1 = hdr0;
-                         dd->err_info_rcvport.packet_flit2 = hdr1;
+                        dd->err_info_rcvport.packet_flit1 = hdr0;
+                        dd->err_info_rcvport.packet_flit2 = hdr1;
                 }
                 switch (info) {
                 case 1:
@@ -9168,6 +9170,13 @@ int start_link(struct hfi1_pportdata *ppd)
                 return 0;
         }
 
+        /*
+         * FULL_MGMT_P_KEY is cleared from the pkey table, so that the
+         * pkey table can be configured properly if the HFI unit is connected
+         * to switch port with MgmtAllowed=NO
+         */
+        clear_full_mgmt_pkey(ppd);
+
         return set_link_state(ppd, HLS_DN_POLL);
 }
 
@@ -9777,7 +9786,7 @@ static void set_send_length(struct hfi1_pportdata *ppd)
         u64 len1 = 0, len2 = (((dd->vld[15].mtu + max_hb) >> 2)
                               & SEND_LEN_CHECK1_LEN_VL15_MASK) <<
                 SEND_LEN_CHECK1_LEN_VL15_SHIFT;
-        int i;
+        int i, j;
         u32 thres;
 
         for (i = 0; i < ppd->vls_supported; i++) {
@@ -9801,7 +9810,10 @@ static void set_send_length(struct hfi1_pportdata *ppd)
                             sc_mtu_to_threshold(dd->vld[i].sc,
                                                 dd->vld[i].mtu,
                                                 dd->rcd[0]->rcvhdrqentsize));
-                sc_set_cr_threshold(dd->vld[i].sc, thres);
+                for (j = 0; j < INIT_SC_PER_VL; j++)
+                        sc_set_cr_threshold(
+                                        pio_select_send_context_vl(dd, j, i),
+                                            thres);
         }
         thres = min(sc_percent_to_threshold(dd->vld[15].sc, 50),
                     sc_mtu_to_threshold(dd->vld[15].sc,
@@ -11906,7 +11918,7 @@ static void update_synth_timer(unsigned long opaque)
                 hfi1_cdbg(CNTR, "[%d] No update necessary", dd->unit);
         }
 
-mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
+        mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
 }
 
 #define C_MAX_NAME 13 /* 12 chars + one for /0 */
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index 7a5b0e676cc7..c702a009608f 100644
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -203,6 +203,9 @@ static long hfi1_file_ioctl(struct file *fp, unsigned int cmd,
 
         switch (cmd) {
         case HFI1_IOCTL_ASSIGN_CTXT:
+                if (uctxt)
+                        return -EINVAL;
+
                 if (copy_from_user(&uinfo,
                                    (struct hfi1_user_info __user *)arg,
                                    sizeof(uinfo)))
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 5cc492e5776d..eed971ccd2a1 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -1337,7 +1337,7 @@ static void cleanup_device_data(struct hfi1_devdata *dd)
                 dma_free_coherent(&dd->pcidev->dev, sizeof(u64),
                                   (void *)dd->rcvhdrtail_dummy_kvaddr,
                                   dd->rcvhdrtail_dummy_physaddr);
-                                  dd->rcvhdrtail_dummy_kvaddr = NULL;
+                dd->rcvhdrtail_dummy_kvaddr = NULL;
         }
 
         for (ctxt = 0; tmp && ctxt < dd->num_rcv_contexts; ctxt++) {
@@ -1383,7 +1383,7 @@ static void postinit_cleanup(struct hfi1_devdata *dd)
 static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int ret = 0, j, pidx, initfail;
-        struct hfi1_devdata *dd = NULL;
+        struct hfi1_devdata *dd = ERR_PTR(-EINVAL);
         struct hfi1_pportdata *ppd;
 
         /* First, lock the non-writable module parameters */
diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 219029576ba0..fca07a1d6c28 100644
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -78,6 +78,16 @@ static inline void clear_opa_smp_data(struct opa_smp *smp)
         memset(data, 0, size);
 }
 
+void hfi1_event_pkey_change(struct hfi1_devdata *dd, u8 port)
+{
+        struct ib_event event;
+
+        event.event = IB_EVENT_PKEY_CHANGE;
+        event.device = &dd->verbs_dev.rdi.ibdev;
+        event.element.port_num = port;
+        ib_dispatch_event(&event);
+}
+
 static void send_trap(struct hfi1_ibport *ibp, void *data, unsigned len)
 {
         struct ib_mad_send_buf *send_buf;
@@ -1418,15 +1428,10 @@ static int set_pkeys(struct hfi1_devdata *dd, u8 port, u16 *pkeys)
         }
 
         if (changed) {
-                struct ib_event event;
-
                 (void)hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_PKEYS, 0);
-
-                event.event = IB_EVENT_PKEY_CHANGE;
-                event.device = &dd->verbs_dev.rdi.ibdev;
-                event.element.port_num = port;
-                ib_dispatch_event(&event);
+                hfi1_event_pkey_change(dd, port);
         }
+
         return 0;
 }
 
diff --git a/drivers/infiniband/hw/hfi1/mad.h b/drivers/infiniband/hw/hfi1/mad.h
index 55ee08675333..8b734aaae88a 100644
--- a/drivers/infiniband/hw/hfi1/mad.h
+++ b/drivers/infiniband/hw/hfi1/mad.h
@@ -434,4 +434,6 @@ struct sc2vlnt {
                     COUNTER_MASK(1, 3) | \
                     COUNTER_MASK(1, 4))
 
+void hfi1_event_pkey_change(struct hfi1_devdata *dd, u8 port);
+
 #endif                          /* _HFI1_MAD_H */
diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
index d5edb1afbb8f..d4022450b73f 100644
--- a/drivers/infiniband/hw/hfi1/pio.c
+++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -995,7 +995,7 @@ static void sc_wait_for_packet_egress(struct send_context *sc, int pause)
                 /* counter is reset if occupancy count changes */
                 if (reg != reg_prev)
                         loop = 0;
-                if (loop > 500) {
+                if (loop > 50000) {
                         /* timed out - bounce the link */
                         dd_dev_err(dd,
                                    "%s: context %u(%u) timeout waiting for packets to egress, remaining count %u, bouncing link\n",
@@ -1798,6 +1798,21 @@ static void pio_map_rcu_callback(struct rcu_head *list)
 }
 
 /*
+ * Set credit return threshold for the kernel send context
+ */
+static void set_threshold(struct hfi1_devdata *dd, int scontext, int i)
+{
+        u32 thres;
+
+        thres = min(sc_percent_to_threshold(dd->kernel_send_context[scontext],
+                                            50),
+                    sc_mtu_to_threshold(dd->kernel_send_context[scontext],
+                                        dd->vld[i].mtu,
+                                        dd->rcd[0]->rcvhdrqentsize));
+        sc_set_cr_threshold(dd->kernel_send_context[scontext], thres);
+}
+
+/*
  * pio_map_init - called when #vls change
  * @dd: hfi1_devdata
  * @port: port number
@@ -1872,11 +1887,16 @@ int pio_map_init(struct hfi1_devdata *dd, u8 port, u8 num_vls, u8 *vl_scontexts)
                         if (!newmap->map[i])
                                 goto bail;
                         newmap->map[i]->mask = (1 << ilog2(sz)) - 1;
-                        /* assign send contexts */
+                        /*
+                         * assign send contexts and
+                         * adjust credit return threshold
+                         */
                         for (j = 0; j < sz; j++) {
-                                if (dd->kernel_send_context[scontext])
+                                if (dd->kernel_send_context[scontext]) {
                                         newmap->map[i]->ksc[j] =
                                         dd->kernel_send_context[scontext];
+                                        set_threshold(dd, scontext, i);
+                                }
                                 if (++scontext >= first_scontext +
                                                   vl_scontexts[i])
                                         /* wrap back to first send context */
diff --git a/drivers/infiniband/hw/hfi1/qsfp.c b/drivers/infiniband/hw/hfi1/qsfp.c
index 2441669f0817..9fb561682c66 100644
--- a/drivers/infiniband/hw/hfi1/qsfp.c
+++ b/drivers/infiniband/hw/hfi1/qsfp.c
@@ -579,7 +579,8 @@ int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len)
 
         if (ppd->qsfp_info.cache_valid) {
                 if (QSFP_IS_CU(cache[QSFP_MOD_TECH_OFFS]))
-                        sprintf(lenstr, "%dM ", cache[QSFP_MOD_LEN_OFFS]);
+                        snprintf(lenstr, sizeof(lenstr), "%dM ",
+                                 cache[QSFP_MOD_LEN_OFFS]);
 
                 power_byte = cache[QSFP_MOD_PWR_OFFS];
                 sofar += scnprintf(buf + sofar, len - sofar, "PWR:%.3sW\n",
diff --git a/drivers/infiniband/hw/hfi1/trace.c b/drivers/infiniband/hw/hfi1/trace.c
index 79b2952c0dfb..4cfb13771897 100644
--- a/drivers/infiniband/hw/hfi1/trace.c
+++ b/drivers/infiniband/hw/hfi1/trace.c
@@ -214,19 +214,6 @@ const char *print_u32_array(
         return ret;
 }
 
-const char *print_u64_array(
-        struct trace_seq *p,
-        u64 *arr, int len)
-{
-        int i;
-        const char *ret = trace_seq_buffer_ptr(p);
-
-        for (i = 0; i < len; i++)
-                trace_seq_printf(p, "%s0x%016llx", i == 0 ? "" : " ", arr[i]);
-        trace_seq_putc(p, 0);
-        return ret;
-}
-
 __hfi1_trace_fn(PKT);
 __hfi1_trace_fn(PROC);
 __hfi1_trace_fn(SDMA);
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index 29f4795f866c..47ffd273ecbd 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -183,7 +183,7 @@ struct user_sdma_iovec {
         struct sdma_mmu_node *node;
 };
 
-#define SDMA_CACHE_NODE_EVICT BIT(0)
+#define SDMA_CACHE_NODE_EVICT 0
 
 struct sdma_mmu_node {
         struct mmu_rb_node rb;
@@ -1355,11 +1355,11 @@ static int set_txreq_header(struct user_sdma_request *req,
                  */
                 SDMA_DBG(req, "TID offset %ubytes %uunits om%u",
                          req->tidoffset, req->tidoffset / req->omfactor,
-                         !!(req->omfactor - KDETH_OM_SMALL));
+                         req->omfactor != KDETH_OM_SMALL);
                 KDETH_SET(hdr->kdeth.ver_tid_offset, OFFSET,
                           req->tidoffset / req->omfactor);
                 KDETH_SET(hdr->kdeth.ver_tid_offset, OM,
-                          !!(req->omfactor - KDETH_OM_SMALL));
+                          req->omfactor != KDETH_OM_SMALL);
         }
 done:
         trace_hfi1_sdma_user_header(pq->dd, pq->ctxt, pq->subctxt,
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.c b/drivers/infiniband/hw/hfi1/verbs_txreq.c
index bc95c4112c61..d8fb056526f8 100644
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.c
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.c
@@ -92,11 +92,10 @@ void hfi1_put_txreq(struct verbs_txreq *tx)
 
 struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
                                 struct rvt_qp *qp)
+        __must_hold(&qp->s_lock)
 {
         struct verbs_txreq *tx = ERR_PTR(-EBUSY);
-        unsigned long flags;
 
-        spin_lock_irqsave(&qp->s_lock, flags);
         write_seqlock(&dev->iowait_lock);
         if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {
                 struct hfi1_qp_priv *priv;
@@ -116,7 +115,6 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
         }
 out:
         write_sequnlock(&dev->iowait_lock);
-        spin_unlock_irqrestore(&qp->s_lock, flags);
         return tx;
 }
 
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.h b/drivers/infiniband/hw/hfi1/verbs_txreq.h
index 1cf69b2fe4a5..a1d6e0807f97 100644
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.h
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.h
@@ -73,6 +73,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
 
 static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
                                             struct rvt_qp *qp)
+        __must_hold(&qp->slock)
 {
         struct verbs_txreq *tx;
         struct hfi1_qp_priv *priv = qp->priv;
diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h
index 8b9532034558..b738acdb9b02 100644
--- a/drivers/infiniband/hw/i40iw/i40iw.h
+++ b/drivers/infiniband/hw/i40iw/i40iw.h
@@ -113,6 +113,8 @@
 
 #define IW_HMC_OBJ_TYPE_NUM ARRAY_SIZE(iw_hmc_obj_types)
 #define IW_CFG_FPM_QP_COUNT             32768
+#define I40IW_MAX_PAGES_PER_FMR         512
+#define I40IW_MIN_PAGES_PER_FMR         1
 
 #define I40IW_MTU_TO_MSS                40
 #define I40IW_DEFAULT_MSS               1460
diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index 02a735b64208..33959ed14563 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -79,6 +79,7 @@ static int i40iw_query_device(struct ib_device *ibdev,
         props->max_qp_init_rd_atom = props->max_qp_rd_atom;
         props->atomic_cap = IB_ATOMIC_NONE;
         props->max_map_per_fmr = 1;
+        props->max_fast_reg_page_list_len = I40IW_MAX_PAGES_PER_FMR;
         return 0;
 }
 
@@ -1527,7 +1528,7 @@ static struct ib_mr *i40iw_alloc_mr(struct ib_pd *pd,
         mutex_lock(&iwdev->pbl_mutex);
         status = i40iw_get_pble(&iwdev->sc_dev, iwdev->pble_rsrc, palloc, iwmr->page_cnt);
         mutex_unlock(&iwdev->pbl_mutex);
-        if (!status)
+        if (status)
                 goto err1;
 
         if (palloc->level != I40IW_LEVEL_1)
@@ -2149,6 +2150,7 @@ static int i40iw_post_send(struct ib_qp *ibqp,
                         struct i40iw_sc_dev *dev = &iwqp->iwdev->sc_dev;
                         struct i40iw_fast_reg_stag_info info;
 
+                        memset(&info, 0, sizeof(info));
                         info.access_rights = I40IW_ACCESS_FLAGS_LOCALREAD;
                         info.access_rights |= i40iw_get_user_access(flags);
                         info.stag_key = reg_wr(ib_wr)->key & 0xff;
@@ -2158,10 +2160,14 @@ static int i40iw_post_send(struct ib_qp *ibqp,
                         info.addr_type = I40IW_ADDR_TYPE_VA_BASED;
                         info.va = (void *)(uintptr_t)iwmr->ibmr.iova;
                         info.total_len = iwmr->ibmr.length;
+                        info.reg_addr_pa = *(u64 *)palloc->level1.addr;
                         info.first_pm_pbl_index = palloc->level1.idx;
                         info.local_fence = ib_wr->send_flags & IB_SEND_FENCE;
                         info.signaled = ib_wr->send_flags & IB_SEND_SIGNALED;
 
+                        if (iwmr->npages > I40IW_MIN_PAGES_PER_FMR)
+                                info.chunk_size = 1;
+
                         if (page_shift == 21)
                                 info.page_size = 1; /* 2M page */
 
@@ -2327,13 +2333,16 @@ static int i40iw_req_notify_cq(struct ib_cq *ibcq,
 {
         struct i40iw_cq *iwcq;
         struct i40iw_cq_uk *ukcq;
-        enum i40iw_completion_notify cq_notify = IW_CQ_COMPL_SOLICITED;
+        unsigned long flags;
+        enum i40iw_completion_notify cq_notify = IW_CQ_COMPL_EVENT;
 
         iwcq = (struct i40iw_cq *)ibcq;
         ukcq = &iwcq->sc_cq.cq_uk;
-        if (notify_flags == IB_CQ_NEXT_COMP)
-                cq_notify = IW_CQ_COMPL_EVENT;
+        if (notify_flags == IB_CQ_SOLICITED)
+                cq_notify = IW_CQ_COMPL_SOLICITED;
+        spin_lock_irqsave(&iwcq->lock, flags);
         ukcq->ops.iw_cq_request_notification(ukcq, cq_notify);
+        spin_unlock_irqrestore(&iwcq->lock, flags);
         return 0;
 }
 
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c
index 105246fba2e7..5fc623362731 100644
--- a/drivers/infiniband/hw/mlx4/ah.c
+++ b/drivers/infiniband/hw/mlx4/ah.c
@@ -47,6 +47,7 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
 
         ah->av.ib.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));
         ah->av.ib.g_slid  = ah_attr->src_path_bits;
+        ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);
         if (ah_attr->ah_flags & IB_AH_GRH) {
                 ah->av.ib.g_slid   |= 0x80;
                 ah->av.ib.gid_index = ah_attr->grh.sgid_index;
@@ -64,7 +65,6 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
                        !(1 << ah->av.ib.stat_rate & dev->caps.stat_rate_support))
                         --ah->av.ib.stat_rate;
         }
-        ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);
 
         return &ah->ibah;
 }
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index d68f506c1922..9c2e53d28f98 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -527,7 +527,7 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
                 tun_tx_ix = (++tun_qp->tx_ix_head) & (MLX4_NUM_TUNNEL_BUFS - 1);
         spin_unlock(&tun_qp->tx_lock);
         if (ret)
-                goto out;
+                goto end;
 
         tun_mad = (struct mlx4_rcv_tunnel_mad *) (tun_qp->tx_ring[tun_tx_ix].buf.addr);
         if (tun_qp->tx_ring[tun_tx_ix].ah)
@@ -596,9 +596,15 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
         wr.wr.send_flags = IB_SEND_SIGNALED;
 
         ret = ib_post_send(src_qp, &wr.wr, &bad_wr);
-out:
-        if (ret)
-                ib_destroy_ah(ah);
+        if (!ret)
+                return 0;
+ out:
+        spin_lock(&tun_qp->tx_lock);
+        tun_qp->tx_ix_tail++;
+        spin_unlock(&tun_qp->tx_lock);
+        tun_qp->tx_ring[tun_tx_ix].ah = NULL;
+end:
+        ib_destroy_ah(ah);
         return ret;
 }
 
@@ -1326,9 +1332,15 @@ int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port,
 
 
         ret = ib_post_send(send_qp, &wr.wr, &bad_wr);
+        if (!ret)
+                return 0;
+
+        spin_lock(&sqp->tx_lock);
+        sqp->tx_ix_tail++;
+        spin_unlock(&sqp->tx_lock);
+        sqp->tx_ring[wire_tx_ix].ah = NULL;
 out:
-        if (ret)
-                ib_destroy_ah(ah);
+        ib_destroy_ah(ah);
         return ret;
 }
 
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index b01ef6eee6e8..42a46078d7d5 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -505,9 +505,9 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
                         props->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2B;
                 else
                         props->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2A;
-        if (dev->steering_support ==  MLX4_STEERING_MODE_DEVICE_MANAGED)
-                props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;
         }
+        if (dev->steering_support == MLX4_STEERING_MODE_DEVICE_MANAGED)
+                props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;
 
         props->device_cap_flags |= IB_DEVICE_RAW_IP_CSUM;
 
@@ -1704,6 +1704,9 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
         struct mlx4_dev *dev = (to_mdev(qp->device))->dev;
         int is_bonded = mlx4_is_bonded(dev);
 
+        if (flow_attr->port < 1 || flow_attr->port > qp->device->phys_port_cnt)
+                return ERR_PTR(-EINVAL);
+
         if ((flow_attr->flags & IB_FLOW_ATTR_FLAGS_DONT_TRAP) &&
             (flow_attr->type != IB_FLOW_ATTR_NORMAL))
                 return ERR_PTR(-EOPNOTSUPP);
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index 6c5ac5d8f32f..29acda249612 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -139,7 +139,7 @@ struct mlx4_ib_mr {
         u32                     max_pages;
         struct mlx4_mr          mmr;
         struct ib_umem         *umem;
-        void                    *pages_alloc;
+        size_t                  page_map_size;
 };
 
 struct mlx4_ib_mw {
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 631272172a0b..5d73989d9771 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -277,20 +277,23 @@ mlx4_alloc_priv_pages(struct ib_device *device,
                       struct mlx4_ib_mr *mr,
                       int max_pages)
 {
-        int size = max_pages * sizeof(u64);
-        int add_size;
         int ret;
 
-        add_size = max_t(int, MLX4_MR_PAGES_ALIGN - ARCH_KMALLOC_MINALIGN, 0);
+        /* Ensure that size is aligned to DMA cacheline
+         * requirements.
+         * max_pages is limited to MLX4_MAX_FAST_REG_PAGES
+         * so page_map_size will never cross PAGE_SIZE.
+         */
+        mr->page_map_size = roundup(max_pages * sizeof(u64),
+                                    MLX4_MR_PAGES_ALIGN);
 
-        mr->pages_alloc = kzalloc(size + add_size, GFP_KERNEL);
-        if (!mr->pages_alloc)
+        /* Prevent cross page boundary allocation. */
+        mr->pages = (__be64 *)get_zeroed_page(GFP_KERNEL);
+        if (!mr->pages)
                 return -ENOMEM;
 
-        mr->pages = PTR_ALIGN(mr->pages_alloc, MLX4_MR_PAGES_ALIGN);
-
         mr->page_map = dma_map_single(device->dma_device, mr->pages,
-                                      size, DMA_TO_DEVICE);
+                                      mr->page_map_size, DMA_TO_DEVICE);
 
         if (dma_mapping_error(device->dma_device, mr->page_map)) {
                 ret = -ENOMEM;
@@ -298,9 +301,9 @@ mlx4_alloc_priv_pages(struct ib_device *device,
         }
 
         return 0;
-err:
-        kfree(mr->pages_alloc);
 
+err:
+        free_page((unsigned long)mr->pages);
         return ret;
 }
 
@@ -309,11 +312,10 @@ mlx4_free_priv_pages(struct mlx4_ib_mr *mr)
 {
         if (mr->pages) {
                 struct ib_device *device = mr->ibmr.device;
-                int size = mr->max_pages * sizeof(u64);
 
                 dma_unmap_single(device->dma_device, mr->page_map,
-                                 size, DMA_TO_DEVICE);
-                kfree(mr->pages_alloc);
+                                 mr->page_map_size, DMA_TO_DEVICE);
+                free_page((unsigned long)mr->pages);
                 mr->pages = NULL;
         }
 }
@@ -537,14 +539,12 @@ int mlx4_ib_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,
         mr->npages = 0;
 
         ib_dma_sync_single_for_cpu(ibmr->device, mr->page_map,
-                                   sizeof(u64) * mr->max_pages,
-                                   DMA_TO_DEVICE);
+                                   mr->page_map_size, DMA_TO_DEVICE);
 
         rc = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, mlx4_set_page);
 
         ib_dma_sync_single_for_device(ibmr->device, mr->page_map,
-                                      sizeof(u64) * mr->max_pages,
-                                      DMA_TO_DEVICE);
+                                      mr->page_map_size, DMA_TO_DEVICE);
 
         return rc;
 }
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 81b0e1fbec1d..8db8405c1e99 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -362,7 +362,7 @@ static int send_wqe_overhead(enum mlx4_ib_qp_type type, u32 flags)
                         sizeof (struct mlx4_wqe_raddr_seg);
         case MLX4_IB_QPT_RC:
                 return sizeof (struct mlx4_wqe_ctrl_seg) +
-                        sizeof (struct mlx4_wqe_atomic_seg) +
+                        sizeof (struct mlx4_wqe_masked_atomic_seg) +
                         sizeof (struct mlx4_wqe_raddr_seg);
         case MLX4_IB_QPT_SMI:
         case MLX4_IB_QPT_GSI:
@@ -1191,8 +1191,10 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
         {
                 err = create_qp_common(to_mdev(pd->device), pd, init_attr,
                                        udata, 0, &qp, gfp);
-                if (err)
+                if (err) {
+                        kfree(qp);
                         return ERR_PTR(err);
+                }
 
                 qp->ibqp.qp_num = qp->mqp.qpn;
                 qp->xrcdn = xrcdn;
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index dabcc65bd65e..9c0e67bd2ba7 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -822,7 +822,8 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev,
         int eqn;
         int err;
 
-        if (entries < 0)
+        if (entries < 0 ||
+            (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz))))
                 return ERR_PTR(-EINVAL);
 
         if (check_cq_create_flags(attr->flags))
@@ -1168,11 +1169,16 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                 return -ENOSYS;
         }
 
-        if (entries < 1)
+        if (entries < 1 ||
+            entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz))) {
+                mlx5_ib_warn(dev, "wrong entries number %d, max %d\n",
+                             entries,
+                             1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz));
                 return -EINVAL;
+        }
 
         entries = roundup_pow_of_two(entries + 1);
-        if (entries >  (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)) + 1)
+        if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)) + 1)
                 return -EINVAL;
 
         if (entries == ibcq->cqe + 1)
diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 1534af113058..364aab9f3c9e 100644
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -121,7 +121,7 @@ static void pma_cnt_ext_assign(struct ib_pma_portcounters_ext *pma_cnt_ext,
         pma_cnt_ext->port_xmit_data =
                 cpu_to_be64(MLX5_SUM_CNT(out, transmitted_ib_unicast.octets,
                                          transmitted_ib_multicast.octets) >> 2);
-        pma_cnt_ext->port_xmit_data =
+        pma_cnt_ext->port_rcv_data =
                 cpu_to_be64(MLX5_SUM_CNT(out, received_ib_unicast.octets,
                                          received_ib_multicast.octets) >> 2);
         pma_cnt_ext->port_xmit_packets =
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index c72797cd9e4f..b48ad85315dc 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -524,6 +524,9 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
             MLX5_CAP_ETH(dev->mdev, scatter_fcs))
                 props->device_cap_flags |= IB_DEVICE_RAW_SCATTER_FCS;
 
+        if (mlx5_get_flow_namespace(dev->mdev, MLX5_FLOW_NAMESPACE_BYPASS))
+                props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;
+
         props->vendor_part_id      = mdev->pdev->device;
         props->hw_ver              = mdev->pdev->revision;
 
@@ -915,7 +918,8 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
         num_uars = req.total_num_uuars / MLX5_NON_FP_BF_REGS_PER_PAGE;
         gross_uuars = num_uars * MLX5_BF_REGS_PER_PAGE;
         resp.qp_tab_size = 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp);
-        resp.bf_reg_size = 1 << MLX5_CAP_GEN(dev->mdev, log_bf_reg_size);
+        if (mlx5_core_is_pf(dev->mdev) && MLX5_CAP_GEN(dev->mdev, bf))
+                resp.bf_reg_size = 1 << MLX5_CAP_GEN(dev->mdev, log_bf_reg_size);
         resp.cache_line_size = L1_CACHE_BYTES;
         resp.max_sq_desc_sz = MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq);
         resp.max_rq_desc_sz = MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq);
@@ -988,7 +992,14 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
         if (field_avail(typeof(resp), cqe_version, udata->outlen))
                 resp.response_length += sizeof(resp.cqe_version);
 
-        if (field_avail(typeof(resp), hca_core_clock_offset, udata->outlen)) {
+        /*
+         * We don't want to expose information from the PCI bar that is located
+         * after 4096 bytes, so if the arch only supports larger pages, let's
+         * pretend we don't support reading the HCA's core clock. This is also
+         * forced by mmap function.
+         */
+        if (PAGE_SIZE <= 4096 &&
+            field_avail(typeof(resp), hca_core_clock_offset, udata->outlen)) {
                 resp.comp_mask |=
                         MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_CORE_CLOCK_OFFSET;
                 resp.hca_core_clock_offset =
@@ -1798,7 +1809,7 @@ static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr,
 {
         struct mlx5_ib_dev *dev =
                 container_of(device, struct mlx5_ib_dev, ib_dev.dev);
-        return sprintf(buf, "%d.%d.%d\n", fw_rev_maj(dev->mdev),
+        return sprintf(buf, "%d.%d.%04d\n", fw_rev_maj(dev->mdev),
                        fw_rev_min(dev->mdev), fw_rev_sub(dev->mdev));
 }
 
@@ -1866,14 +1877,11 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
                 break;
 
         case MLX5_DEV_EVENT_PORT_DOWN:
+        case MLX5_DEV_EVENT_PORT_INITIALIZED:
                 ibev.event = IB_EVENT_PORT_ERR;
                 port = (u8)param;
                 break;
 
-        case MLX5_DEV_EVENT_PORT_INITIALIZED:
-                /* not used by ULPs */
-                return;
-
         case MLX5_DEV_EVENT_LID_CHANGE:
                 ibev.event = IB_EVENT_LID_CHANGE;
                 port = (u8)param;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 504117657d41..ce0a7ab35a22 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -235,6 +235,8 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
                 qp->rq.max_gs = 0;
                 qp->rq.wqe_cnt = 0;
                 qp->rq.wqe_shift = 0;
+                cap->max_recv_wr = 0;
+                cap->max_recv_sge = 0;
         } else {
                 if (ucmd) {
                         qp->rq.wqe_cnt = ucmd->rq_wqe_count;
@@ -1851,13 +1853,15 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev,
 static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
                          const struct ib_ah_attr *ah,
                          struct mlx5_qp_path *path, u8 port, int attr_mask,
-                         u32 path_flags, const struct ib_qp_attr *attr)
+                         u32 path_flags, const struct ib_qp_attr *attr,
+                         bool alt)
 {
         enum rdma_link_layer ll = rdma_port_get_link_layer(&dev->ib_dev, port);
         int err;
 
         if (attr_mask & IB_QP_PKEY_INDEX)
-                path->pkey_index = attr->pkey_index;
+                path->pkey_index = cpu_to_be16(alt ? attr->alt_pkey_index :
+                                                     attr->pkey_index);
 
         if (ah->ah_flags & IB_AH_GRH) {
                 if (ah->grh.sgid_index >=
@@ -1877,9 +1881,9 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
                                                           ah->grh.sgid_index);
                 path->dci_cfi_prio_sl = (ah->sl & 0x7) << 4;
         } else {
-                path->fl = (path_flags & MLX5_PATH_FLAG_FL) ? 0x80 : 0;
-                path->free_ar = (path_flags & MLX5_PATH_FLAG_FREE_AR) ? 0x80 :
-                                                                        0;
+                path->fl_free_ar = (path_flags & MLX5_PATH_FLAG_FL) ? 0x80 : 0;
+                path->fl_free_ar |=
+                        (path_flags & MLX5_PATH_FLAG_FREE_AR) ? 0x40 : 0;
                 path->rlid = cpu_to_be16(ah->dlid);
                 path->grh_mlid = ah->src_path_bits & 0x7f;
                 if (ah->ah_flags & IB_AH_GRH)
@@ -1903,7 +1907,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
         path->port = port;
 
         if (attr_mask & IB_QP_TIMEOUT)
-                path->ackto_lt = attr->timeout << 3;
+                path->ackto_lt = (alt ? attr->alt_timeout : attr->timeout) << 3;
 
         if ((qp->ibqp.qp_type == IB_QPT_RAW_PACKET) && qp->sq.wqe_cnt)
                 return modify_raw_packet_eth_prio(dev->mdev,
@@ -2264,7 +2268,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
                 context->log_pg_sz_remote_qpn = cpu_to_be32(attr->dest_qp_num);
 
         if (attr_mask & IB_QP_PKEY_INDEX)
-                context->pri_path.pkey_index = attr->pkey_index;
+                context->pri_path.pkey_index = cpu_to_be16(attr->pkey_index);
 
         /* todo implement counter_index functionality */
 
@@ -2277,7 +2281,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         if (attr_mask & IB_QP_AV) {
                 err = mlx5_set_path(dev, qp, &attr->ah_attr, &context->pri_path,
                                     attr_mask & IB_QP_PORT ? attr->port_num : qp->port,
-                                    attr_mask, 0, attr);
+                                    attr_mask, 0, attr, false);
                 if (err)
                         goto out;
         }
@@ -2288,7 +2292,9 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         if (attr_mask & IB_QP_ALT_PATH) {
                 err = mlx5_set_path(dev, qp, &attr->alt_ah_attr,
                                     &context->alt_path,
-                                    attr->alt_port_num, attr_mask, 0, attr);
+                                    attr->alt_port_num,
+                                    attr_mask | IB_QP_PKEY_INDEX | IB_QP_TIMEOUT,
+                                    0, attr, true);
                 if (err)
                         goto out;
         }
@@ -3326,10 +3332,11 @@ static u8 get_fence(u8 fence, struct ib_send_wr *wr)
                         return MLX5_FENCE_MODE_SMALL_AND_FENCE;
                 else
                         return fence;
-
-        } else {
-                return 0;
+        } else if (unlikely(wr->send_flags & IB_SEND_FENCE)) {
+                return MLX5_FENCE_MODE_FENCE;
         }
+
+        return 0;
 }
 
 static int begin_wqe(struct mlx5_ib_qp *qp, void **seg,
@@ -4013,11 +4020,12 @@ static int query_qp_attr(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
         if (qp->ibqp.qp_type == IB_QPT_RC || qp->ibqp.qp_type == IB_QPT_UC) {
                 to_ib_ah_attr(dev, &qp_attr->ah_attr, &context->pri_path);
                 to_ib_ah_attr(dev, &qp_attr->alt_ah_attr, &context->alt_path);
-                qp_attr->alt_pkey_index = context->alt_path.pkey_index & 0x7f;
+                qp_attr->alt_pkey_index =
+                        be16_to_cpu(context->alt_path.pkey_index);
                 qp_attr->alt_port_num   = qp_attr->alt_ah_attr.port_num;
         }
 
-        qp_attr->pkey_index = context->pri_path.pkey_index & 0x7f;
+        qp_attr->pkey_index = be16_to_cpu(context->pri_path.pkey_index);
         qp_attr->port_num = context->pri_path.port;
 
         /* qp_attr->en_sqd_async_notify is only applicable in modify qp */
@@ -4079,17 +4087,19 @@ int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
         qp_attr->cap.max_recv_sge    = qp->rq.max_gs;
 
         if (!ibqp->uobject) {
-                qp_attr->cap.max_send_wr  = qp->sq.wqe_cnt;
+                qp_attr->cap.max_send_wr  = qp->sq.max_post;
                 qp_attr->cap.max_send_sge = qp->sq.max_gs;
+                qp_init_attr->qp_context = ibqp->qp_context;
         } else {
                 qp_attr->cap.max_send_wr  = 0;
                 qp_attr->cap.max_send_sge = 0;
         }
 
-        /* We don't support inline sends for kernel QPs (yet), and we
-         * don't know what userspace's value should be.
-         */
-        qp_attr->cap.max_inline_data = 0;
+        qp_init_attr->qp_type = ibqp->qp_type;
+        qp_init_attr->recv_cq = ibqp->recv_cq;
+        qp_init_attr->send_cq = ibqp->send_cq;
+        qp_init_attr->srq = ibqp->srq;
+        qp_attr->cap.max_inline_data = qp->max_inline_data;
 
         qp_init_attr->cap            = qp_attr->cap;
 
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index ff946d5f59e4..382466a90da7 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -2178,6 +2178,11 @@ static ssize_t qib_write(struct file *fp, const char __user *data,
 
         switch (cmd.type) {
         case QIB_CMD_ASSIGN_CTXT:
+                if (rcd) {
+                        ret = -EINVAL;
+                        goto bail;
+                }
+
                 ret = qib_assign_ctxt(fp, &cmd.cmd.user_info);
                 if (ret)
                         goto bail;
diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c
index 7209fbc03ccb..a0b6ebee4d8a 100644
--- a/drivers/infiniband/hw/usnic/usnic_uiom.c
+++ b/drivers/infiniband/hw/usnic/usnic_uiom.c
@@ -36,7 +36,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/sched.h>
 #include <linux/hugetlb.h>
-#include <linux/dma-attrs.h>
 #include <linux/iommu.h>
 #include <linux/workqueue.h>
 #include <linux/list.h>
@@ -112,10 +111,6 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable,
         int i;
         int flags;
         dma_addr_t pa;
-        DEFINE_DMA_ATTRS(attrs);
-
-        if (dmasync)
-                dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs);
 
         if (!can_do_mlock())
                 return -EPERM;
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 5fa4d4d81ee0..41ba7e9cadaa 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -369,8 +369,8 @@ static int alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
                         /* wrap to first map page, invert bit 0 */
                         offset = qpt->incr | ((offset & 1) ^ 1);
                 }
-                /* there can be no bits at shift and below */
-                WARN_ON(offset & (rdi->dparms.qos_shift - 1));
+                /* there can be no set bits in low-order QoS bits */
+                WARN_ON(offset & (BIT(rdi->dparms.qos_shift) - 1));
                 qpn = mk_qpn(qpt, map, offset);
         }
 
@@ -502,6 +502,12 @@ static void rvt_remove_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp)
  */
 static void rvt_reset_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp,
                   enum ib_qp_type type)
+        __releases(&qp->s_lock)
+        __releases(&qp->s_hlock)
+        __releases(&qp->r_lock)
+        __acquires(&qp->r_lock)
+        __acquires(&qp->s_hlock)
+        __acquires(&qp->s_lock)
 {
         if (qp->state != IB_QPS_RESET) {
                 qp->state = IB_QPS_RESET;
@@ -570,12 +576,6 @@ static void rvt_reset_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp,
         qp->s_ssn = 1;
         qp->s_lsn = 0;
         qp->s_mig_state = IB_MIG_MIGRATED;
-        if (qp->s_ack_queue)
-                memset(
-                        qp->s_ack_queue,
-                        0,
-                        rvt_max_atomic(rdi) *
-                                sizeof(*qp->s_ack_queue));
         qp->r_head_ack_queue = 0;
         qp->s_tail_ack_queue = 0;
         qp->s_num_rd_atomic = 0;
@@ -699,8 +699,10 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                  * initialization that is needed.
                  */
                 priv = rdi->driver_f.qp_priv_alloc(rdi, qp, gfp);
-                if (!priv)
+                if (IS_ERR(priv)) {
+                        ret = priv;
                         goto bail_qp;
+                }
                 qp->priv = priv;
                 qp->timeout_jiffies =
                         usecs_to_jiffies((4096UL * (1UL << qp->timeout)) /
diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index e1cc2cc42f25..30c4fda7a05a 100644
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -501,9 +501,7 @@ static noinline int check_support(struct rvt_dev_info *rdi, int verb)
                             !rdi->driver_f.quiesce_qp ||
                             !rdi->driver_f.notify_error_qp ||
                             !rdi->driver_f.mtu_from_qp ||
-                            !rdi->driver_f.mtu_to_path_mtu ||
-                            !rdi->driver_f.shut_down_port ||
-                            !rdi->driver_f.cap_mask_chg)
+                            !rdi->driver_f.mtu_to_path_mtu)
                                 return -EINVAL;
                 break;
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index bab7db6fa9ab..4f7d9b48df64 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -94,6 +94,7 @@ enum {
         IPOIB_NEIGH_TBL_FLUSH     = 12,
         IPOIB_FLAG_DEV_ADDR_SET   = 13,
         IPOIB_FLAG_DEV_ADDR_CTRL  = 14,
+        IPOIB_FLAG_GOING_DOWN     = 15,
 
         IPOIB_MAX_BACKOFF_SECONDS = 16,
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index b2f42835d76d..951d9abcca8b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1486,6 +1486,10 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr,
 {
         struct net_device *dev = to_net_dev(d);
         int ret;
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+
+        if (test_bit(IPOIB_FLAG_GOING_DOWN, &priv->flags))
+                return -EPERM;
 
         if (!rtnl_trylock())
                 return restart_syscall();
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 45c40a17d6a6..dc6d241b9406 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -1015,7 +1015,7 @@ static bool ipoib_dev_addr_changed_valid(struct ipoib_dev_priv *priv)
         if (ib_query_gid(priv->ca, priv->port, 0, &gid0, NULL))
                 return false;
 
-        netif_addr_lock(priv->dev);
+        netif_addr_lock_bh(priv->dev);
 
         /* The subnet prefix may have changed, update it now so we won't have
          * to do it later
@@ -1026,12 +1026,12 @@ static bool ipoib_dev_addr_changed_valid(struct ipoib_dev_priv *priv)
 
         search_gid.global.interface_id = priv->local_gid.global.interface_id;
 
-        netif_addr_unlock(priv->dev);
+        netif_addr_unlock_bh(priv->dev);
 
         err = ib_find_gid(priv->ca, &search_gid, IB_GID_TYPE_IB,
                           priv->dev, &port, &index);
 
-        netif_addr_lock(priv->dev);
+        netif_addr_lock_bh(priv->dev);
 
         if (search_gid.global.interface_id !=
             priv->local_gid.global.interface_id)
@@ -1092,7 +1092,7 @@ static bool ipoib_dev_addr_changed_valid(struct ipoib_dev_priv *priv)
         }
 
 out:
-        netif_addr_unlock(priv->dev);
+        netif_addr_unlock_bh(priv->dev);
 
         return ret;
 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 2d7c16346648..5f58c41ef787 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1206,7 +1206,9 @@ struct ipoib_neigh *ipoib_neigh_get(struct net_device *dev, u8 *daddr)
                                 neigh = NULL;
                                 goto out_unlock;
                         }
-                        neigh->alive = jiffies;
+
+                        if (likely(skb_queue_len(&neigh->queue) < IPOIB_MAX_PATH_REC_QUEUE))
+                                neigh->alive = jiffies;
                         goto out_unlock;
                 }
         }
@@ -1851,7 +1853,7 @@ static void set_base_guid(struct ipoib_dev_priv *priv, union ib_gid *gid)
         struct ipoib_dev_priv *child_priv;
         struct net_device *netdev = priv->dev;
 
-        netif_addr_lock(netdev);
+        netif_addr_lock_bh(netdev);
 
         memcpy(&priv->local_gid.global.interface_id,
                &gid->global.interface_id,
@@ -1859,7 +1861,7 @@ static void set_base_guid(struct ipoib_dev_priv *priv, union ib_gid *gid)
         memcpy(netdev->dev_addr + 4, &priv->local_gid, sizeof(priv->local_gid));
         clear_bit(IPOIB_FLAG_DEV_ADDR_SET, &priv->flags);
 
-        netif_addr_unlock(netdev);
+        netif_addr_unlock_bh(netdev);
 
         if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
                 down_read(&priv->vlan_rwsem);
@@ -1875,7 +1877,7 @@ static int ipoib_check_lladdr(struct net_device *dev,
         union ib_gid *gid = (union ib_gid *)(ss->__data + 4);
         int ret = 0;
 
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
 
         /* Make sure the QPN, reserved and subnet prefix match the current
          * lladdr, it also makes sure the lladdr is unicast.
@@ -1885,7 +1887,7 @@ static int ipoib_check_lladdr(struct net_device *dev,
             gid->global.interface_id == 0)
                 ret = -EINVAL;
 
-        netif_addr_unlock(dev);
+        netif_addr_unlock_bh(dev);
 
         return ret;
 }
@@ -2141,6 +2143,9 @@ static void ipoib_remove_one(struct ib_device *device, void *client_data)
                 ib_unregister_event_handler(&priv->event_handler);
                 flush_workqueue(ipoib_workqueue);
 
+                /* mark interface in the middle of destruction */
+                set_bit(IPOIB_FLAG_GOING_DOWN, &priv->flags);
+
                 rtnl_lock();
                 dev_change_flags(priv->dev, priv->dev->flags & ~IFF_UP);
                 rtnl_unlock();
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 82fbc9442608..d3394b6add24 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -582,13 +582,13 @@ void ipoib_mcast_join_task(struct work_struct *work)
                 return;
         }
         priv->local_lid = port_attr.lid;
-        netif_addr_lock(dev);
+        netif_addr_lock_bh(dev);
 
         if (!test_bit(IPOIB_FLAG_DEV_ADDR_SET, &priv->flags)) {
-                netif_addr_unlock(dev);
+                netif_addr_unlock_bh(dev);
                 return;
         }
-        netif_addr_unlock(dev);
+        netif_addr_unlock_bh(dev);
 
         spin_lock_irq(&priv->lock);
         if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags))
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 64a35595eab8..a2f9f29c6ab5 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -131,6 +131,9 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
 
         ppriv = netdev_priv(pdev);
 
+        if (test_bit(IPOIB_FLAG_GOING_DOWN, &ppriv->flags))
+                return -EPERM;
+
         snprintf(intf_name, sizeof intf_name, "%s.%04x",
                  ppriv->dev->name, pkey);
         priv = ipoib_intf_alloc(intf_name);
@@ -183,6 +186,9 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
 
         ppriv = netdev_priv(pdev);
 
+        if (test_bit(IPOIB_FLAG_GOING_DOWN, &ppriv->flags))
+                return -EPERM;
+
         if (!rtnl_trylock())
                 return restart_syscall();
 
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 646de170ec12..3322ed750172 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1457,7 +1457,6 @@ static int srp_map_sg_fr(struct srp_map_state *state, struct srp_rdma_ch *ch,
 {
         unsigned int sg_offset = 0;
 
-        state->desc = req->indirect_desc;
         state->fr.next = req->fr_list;
         state->fr.end = req->fr_list + ch->target->mr_per_cmd;
         state->sg = scat;
@@ -1489,7 +1488,6 @@ static int srp_map_sg_dma(struct srp_map_state *state, struct srp_rdma_ch *ch,
         struct scatterlist *sg;
         int i;
 
-        state->desc = req->indirect_desc;
         for_each_sg(scat, sg, count, i) {
                 srp_map_desc(state, ib_sg_dma_address(dev->dev, sg),
                              ib_sg_dma_len(dev->dev, sg),
@@ -1655,6 +1653,7 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_rdma_ch *ch,
                                    target->indirect_size, DMA_TO_DEVICE);
 
         memset(&state, 0, sizeof(state));
+        state.desc = req->indirect_desc;
         if (dev->use_fast_reg)
                 ret = srp_map_sg_fr(&state, ch, req, scat, count);
         else if (dev->use_fmr)
@@ -3526,7 +3525,7 @@ static void srp_add_one(struct ib_device *device)
         int mr_page_shift, p;
         u64 max_pages_per_mr;
 
-        srp_dev = kmalloc(sizeof *srp_dev, GFP_KERNEL);
+        srp_dev = kzalloc(sizeof(*srp_dev), GFP_KERNEL);
         if (!srp_dev)
                 return;
 
@@ -3586,8 +3585,6 @@ static void srp_add_one(struct ib_device *device)
                                                    IB_ACCESS_REMOTE_WRITE);
                 if (IS_ERR(srp_dev->global_mr))
                         goto err_pd;
-        } else {
-                srp_dev->global_mr = NULL;
         }
 
         for (p = rdma_start_port(device); p <= rdma_end_port(device); ++p) {
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index e68b20cba70b..4a4155640d51 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1638,8 +1638,7 @@ retry:
          */
         qp_init->cap.max_send_wr = srp_sq_size / 2;
         qp_init->cap.max_rdma_ctxs = srp_sq_size / 2;
-        qp_init->cap.max_send_sge = max(sdev->device->attrs.max_sge_rd,
-                                        sdev->device->attrs.max_sge);
+        qp_init->cap.max_send_sge = SRPT_DEF_SG_PER_WQE;
         qp_init->port_num = ch->sport->port;
 
         ch->qp = ib_create_qp(sdev->pd, qp_init);
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index fee6bfd7ca21..389030487da7 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -106,6 +106,7 @@ enum {
         SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,
 
         SRPT_DEF_SG_TABLESIZE = 128,
+        SRPT_DEF_SG_PER_WQE = 16,
 
         MIN_SRPT_SQ_SIZE = 16,
         DEF_SRPT_SQ_SIZE = 4096,
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 94b68213c50d..5f6b3bcab078 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1941,6 +1941,7 @@ static struct iommu_ops arm_smmu_ops = {
         .attach_dev             = arm_smmu_attach_dev,
         .map                    = arm_smmu_map,
         .unmap                  = arm_smmu_unmap,
+        .map_sg                 = default_iommu_map_sg,
         .iova_to_phys           = arm_smmu_iova_to_phys,
         .add_device             = arm_smmu_add_device,
         .remove_device          = arm_smmu_remove_device,
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a644d0cec2d8..10700945994e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3222,11 +3222,6 @@ static int __init init_dmars(void)
                         }
                 }
 
-                iommu_flush_write_buffer(iommu);
-                iommu_set_root_entry(iommu);
-                iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
-                iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
-
                 if (!ecap_pass_through(iommu->ecap))
                         hw_pass_through = 0;
 #ifdef CONFIG_INTEL_IOMMU_SVM
@@ -3235,6 +3230,18 @@ static int __init init_dmars(void)
 #endif
         }
 
+        /*
+         * Now that qi is enabled on all iommus, set the root entry and flush
+         * caches. This is required on some Intel X58 chipsets, otherwise the
+         * flush_context function will loop forever and the boot hangs.
+         */
+        for_each_active_iommu(iommu, drhd) {
+                iommu_flush_write_buffer(iommu);
+                iommu_set_root_entry(iommu);
+                iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
+                iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
+        }
+
         if (iommu_pass_through)
                 iommu_identity_mapping |= IDENTMAP_ALL;
 
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index c7d6156ff536..25b4627cb57f 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -815,7 +815,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
         dte_addr = virt_to_phys(rk_domain->dt);
         for (i = 0; i < iommu->num_mmu; i++) {
                 rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, dte_addr);
-                rk_iommu_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
+                rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
                 rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK);
         }
 
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 6bd881be24ea..5eb1f9e17a98 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -41,6 +41,7 @@
 
 #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING           (1ULL << 0)
 #define ITS_FLAGS_WORKAROUND_CAVIUM_22375       (1ULL << 1)
+#define ITS_FLAGS_WORKAROUND_CAVIUM_23144       (1ULL << 2)
 
 #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING     (1 << 0)
 
@@ -82,6 +83,7 @@ struct its_node {
         u64                     flags;
         u32                     ite_size;
         u32                     device_ids;
+        int                     numa_node;
 };
 
 #define ITS_ITT_ALIGN           SZ_256
@@ -613,11 +615,23 @@ static void its_unmask_irq(struct irq_data *d)
 static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
                             bool force)
 {
-        unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask);
+        unsigned int cpu;
+        const struct cpumask *cpu_mask = cpu_online_mask;
         struct its_device *its_dev = irq_data_get_irq_chip_data(d);
         struct its_collection *target_col;
         u32 id = its_get_event_id(d);
 
+       /* lpi cannot be routed to a redistributor that is on a foreign node */
+        if (its_dev->its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_23144) {
+                if (its_dev->its->numa_node >= 0) {
+                        cpu_mask = cpumask_of_node(its_dev->its->numa_node);
+                        if (!cpumask_intersects(mask_val, cpu_mask))
+                                return -EINVAL;
+                }
+        }
+
+        cpu = cpumask_any_and(mask_val, cpu_mask);
+
         if (cpu >= nr_cpu_ids)
                 return -EINVAL;
 
@@ -1101,6 +1115,16 @@ static void its_cpu_init_collection(void)
         list_for_each_entry(its, &its_nodes, entry) {
                 u64 target;
 
+                /* avoid cross node collections and its mapping */
+                if (its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_23144) {
+                        struct device_node *cpu_node;
+
+                        cpu_node = of_get_cpu_node(cpu, NULL);
+                        if (its->numa_node != NUMA_NO_NODE &&
+                                its->numa_node != of_node_to_nid(cpu_node))
+                                continue;
+                }
+
                 /*
                  * We now have to bind each collection to its target
                  * redistributor.
@@ -1351,9 +1375,14 @@ static void its_irq_domain_activate(struct irq_domain *domain,
 {
         struct its_device *its_dev = irq_data_get_irq_chip_data(d);
         u32 event = its_get_event_id(d);
+        const struct cpumask *cpu_mask = cpu_online_mask;
+
+        /* get the cpu_mask of local node */
+        if (its_dev->its->numa_node >= 0)
+                cpu_mask = cpumask_of_node(its_dev->its->numa_node);
 
         /* Bind the LPI to the first possible CPU */
-        its_dev->event_map.col_map[event] = cpumask_first(cpu_online_mask);
+        its_dev->event_map.col_map[event] = cpumask_first(cpu_mask);
 
         /* Map the GIC IRQ and event to the device */
         its_send_mapvi(its_dev, d->hwirq, event);
@@ -1443,6 +1472,13 @@ static void __maybe_unused its_enable_quirk_cavium_22375(void *data)
         its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_22375;
 }
 
+static void __maybe_unused its_enable_quirk_cavium_23144(void *data)
+{
+        struct its_node *its = data;
+
+        its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_23144;
+}
+
 static const struct gic_quirk its_quirks[] = {
 #ifdef CONFIG_CAVIUM_ERRATUM_22375
         {
@@ -1452,6 +1488,14 @@ static const struct gic_quirk its_quirks[] = {
                 .init   = its_enable_quirk_cavium_22375,
         },
 #endif
+#ifdef CONFIG_CAVIUM_ERRATUM_23144
+        {
+                .desc   = "ITS: Cavium erratum 23144",
+                .iidr   = 0xa100034c,   /* ThunderX pass 1.x */
+                .mask   = 0xffff0fff,
+                .init   = its_enable_quirk_cavium_23144,
+        },
+#endif
         {
         }
 };
@@ -1514,6 +1558,7 @@ static int __init its_probe(struct device_node *node,
         its->base = its_base;
         its->phys_base = res.start;
         its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1;
+        its->numa_node = of_node_to_nid(node);
 
         its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL);
         if (!its->cmd_base) {
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index fb042ba9a3db..2c5ba0e704bf 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -155,7 +155,7 @@ static void gic_enable_redist(bool enable)
 
         while (count--) {
                 val = readl_relaxed(rbase + GICR_WAKER);
-                if (enable ^ (val & GICR_WAKER_ChildrenAsleep))
+                if (enable ^ (bool)(val & GICR_WAKER_ChildrenAsleep))
                         break;
                 cpu_relax();
                 udelay(1);
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 3b5e10aa48ab..8a4adbeb2b8c 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -746,6 +746,12 @@ static int gic_irq_domain_alloc(struct irq_domain *d, unsigned int virq,
                 /* verify that it doesn't conflict with an IPI irq */
                 if (test_bit(spec->hwirq, ipi_resrv))
                         return -EBUSY;
+
+                hwirq = GIC_SHARED_TO_HWIRQ(spec->hwirq);
+
+                return irq_domain_set_hwirq_and_chip(d, virq, hwirq,
+                                                     &gic_level_irq_controller,
+                                                     NULL);
         } else {
                 base_hwirq = find_first_bit(ipi_resrv, gic_shared_intrs);
                 if (base_hwirq == gic_shared_intrs) {
@@ -867,10 +873,14 @@ static int gic_dev_domain_alloc(struct irq_domain *d, unsigned int virq,
                                                     &gic_level_irq_controller,
                                                     NULL);
                 if (ret)
-                        return ret;
+                        goto error;
         }
 
         return 0;
+
+error:
+        irq_domain_free_irqs_parent(d, virq, nr_irqs);
+        return ret;
 }
 
 void gic_dev_domain_free(struct irq_domain *d, unsigned int virq,
diff --git a/drivers/irqchip/irq-pic32-evic.c b/drivers/irqchip/irq-pic32-evic.c
index e7155db01d55..73addb4b625b 100644
--- a/drivers/irqchip/irq-pic32-evic.c
+++ b/drivers/irqchip/irq-pic32-evic.c
@@ -91,7 +91,7 @@ static int pic32_set_type_edge(struct irq_data *data,
         /* set polarity for external interrupts only */
         for (i = 0; i < ARRAY_SIZE(priv->ext_irqs); i++) {
                 if (priv->ext_irqs[i] == data->hwirq) {
-                        ret = pic32_set_ext_polarity(i + 1, flow_type);
+                        ret = pic32_set_ext_polarity(i, flow_type);
                         if (ret)
                                 return ret;
                 }
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 3495d5d6547f..3bce44893021 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -53,11 +53,12 @@ static void led_timer_function(unsigned long data)
 
         if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) {
                 led_set_brightness_nosleep(led_cdev, LED_OFF);
+                led_cdev->flags &= ~LED_BLINK_SW;
                 return;
         }
 
         if (led_cdev->flags & LED_BLINK_ONESHOT_STOP) {
-                led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
+                led_cdev->flags &=  ~(LED_BLINK_ONESHOT_STOP | LED_BLINK_SW);
                 return;
         }
 
@@ -151,6 +152,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
                 return;
         }
 
+        led_cdev->flags |= LED_BLINK_SW;
         mod_timer(&led_cdev->blink_timer, jiffies + 1);
 }
 
@@ -219,6 +221,7 @@ void led_stop_software_blink(struct led_classdev *led_cdev)
         del_timer_sync(&led_cdev->blink_timer);
         led_cdev->blink_delay_on = 0;
         led_cdev->blink_delay_off = 0;
+        led_cdev->flags &= ~LED_BLINK_SW;
 }
 EXPORT_SYMBOL_GPL(led_stop_software_blink);
 
@@ -226,10 +229,10 @@ void led_set_brightness(struct led_classdev *led_cdev,
                         enum led_brightness brightness)
 {
         /*
-         * In case blinking is on delay brightness setting
+         * If software blink is active, delay brightness setting
          * until the next timer tick.
          */
-        if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) {
+        if (led_cdev->flags & LED_BLINK_SW) {
                 /*
                  * If we need to disable soft blinking delegate this to the
                  * work queue task to avoid problems in case we are called
diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c
index 410c39c62dc7..c9f386213e9e 100644
--- a/drivers/leds/trigger/ledtrig-heartbeat.c
+++ b/drivers/leds/trigger/ledtrig-heartbeat.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/leds.h>
 #include <linux/reboot.h>
+#include <linux/suspend.h>
 #include "../leds.h"
 
 static int panic_heartbeats;
@@ -154,6 +155,30 @@ static struct led_trigger heartbeat_led_trigger = {
         .deactivate = heartbeat_trig_deactivate,
 };
 
+static int heartbeat_pm_notifier(struct notifier_block *nb,
+                                 unsigned long pm_event, void *unused)
+{
+        int rc;
+
+        switch (pm_event) {
+        case PM_SUSPEND_PREPARE:
+        case PM_HIBERNATION_PREPARE:
+        case PM_RESTORE_PREPARE:
+                led_trigger_unregister(&heartbeat_led_trigger);
+                break;
+        case PM_POST_SUSPEND:
+        case PM_POST_HIBERNATION:
+        case PM_POST_RESTORE:
+                rc = led_trigger_register(&heartbeat_led_trigger);
+                if (rc)
+                        pr_err("could not re-register heartbeat trigger\n");
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_DONE;
+}
+
 static int heartbeat_reboot_notifier(struct notifier_block *nb,
                                      unsigned long code, void *unused)
 {
@@ -168,6 +193,10 @@ static int heartbeat_panic_notifier(struct notifier_block *nb,
         return NOTIFY_DONE;
 }
 
+static struct notifier_block heartbeat_pm_nb = {
+        .notifier_call = heartbeat_pm_notifier,
+};
+
 static struct notifier_block heartbeat_reboot_nb = {
         .notifier_call = heartbeat_reboot_notifier,
 };
@@ -184,12 +213,14 @@ static int __init heartbeat_trig_init(void)
                 atomic_notifier_chain_register(&panic_notifier_list,
                                                &heartbeat_panic_nb);
                 register_reboot_notifier(&heartbeat_reboot_nb);
+                register_pm_notifier(&heartbeat_pm_nb);
         }
         return rc;
 }
 
 static void __exit heartbeat_trig_exit(void)
 {
+        unregister_pm_notifier(&heartbeat_pm_nb);
         unregister_reboot_notifier(&heartbeat_reboot_nb);
         atomic_notifier_chain_unregister(&panic_notifier_list,
                                          &heartbeat_panic_nb);
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c
index b73c6e7d28e4..6f2c8522e14a 100644
--- a/drivers/mcb/mcb-core.c
+++ b/drivers/mcb/mcb-core.c
@@ -61,21 +61,36 @@ static int mcb_probe(struct device *dev)
         struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
         struct mcb_device *mdev = to_mcb_device(dev);
         const struct mcb_device_id *found_id;
+        struct module *carrier_mod;
+        int ret;
 
         found_id = mcb_match_id(mdrv->id_table, mdev);
         if (!found_id)
                 return -ENODEV;
 
-        return mdrv->probe(mdev, found_id);
+        carrier_mod = mdev->dev.parent->driver->owner;
+        if (!try_module_get(carrier_mod))
+                return -EINVAL;
+
+        get_device(dev);
+        ret = mdrv->probe(mdev, found_id);
+        if (ret)
+                module_put(carrier_mod);
+
+        return ret;
 }
 
 static int mcb_remove(struct device *dev)
 {
         struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
         struct mcb_device *mdev = to_mcb_device(dev);
+        struct module *carrier_mod;
 
         mdrv->remove(mdev);
 
+        carrier_mod = mdev->dev.parent->driver->owner;
+        module_put(carrier_mod);
+
         put_device(&mdev->dev);
 
         return 0;
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 70c28d19ea04..22cf60991df6 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -45,7 +45,7 @@
 #include <media/v4l2-ioctl.h>
 
 #include <video/omapvrfb.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "omap_voutlib.h"
 #include "omap_voutdef.h"
diff --git a/drivers/media/platform/omap/omap_voutdef.h b/drivers/media/platform/omap/omap_voutdef.h
index 9ccfe1f475a4..94b5d65afb19 100644
--- a/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@ -11,7 +11,7 @@
 #ifndef OMAP_VOUTDEF_H
 #define OMAP_VOUTDEF_H
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>
 
 #define YUYV_BPP        2
diff --git a/drivers/media/platform/omap/omap_voutlib.c b/drivers/media/platform/omap/omap_voutlib.c
index 80b0d88f125c..58a25fdf0cce 100644
--- a/drivers/media/platform/omap/omap_voutlib.c
+++ b/drivers/media/platform/omap/omap_voutlib.c
@@ -26,7 +26,7 @@
 
 #include <linux/dma-mapping.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "omap_voutlib.h"
 
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index d7723ce772b3..c04bc6afb965 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1274,8 +1274,6 @@ struct uvc_xu_control_mapping32 {
 static int uvc_v4l2_get_xu_mapping(struct uvc_xu_control_mapping *kp,
                         const struct uvc_xu_control_mapping32 __user *up)
 {
-        struct uvc_menu_info __user *umenus;
-        struct uvc_menu_info __user *kmenus;
         compat_caddr_t p;
 
         if (!access_ok(VERIFY_READ, up, sizeof(*up)) ||
@@ -1292,17 +1290,7 @@ static int uvc_v4l2_get_xu_mapping(struct uvc_xu_control_mapping *kp,
 
         if (__get_user(p, &up->menu_info))
                 return -EFAULT;
-        umenus = compat_ptr(p);
-        if (!access_ok(VERIFY_READ, umenus, kp->menu_count * sizeof(*umenus)))
-                return -EFAULT;
-
-        kmenus = compat_alloc_user_space(kp->menu_count * sizeof(*kmenus));
-        if (kmenus == NULL)
-                return -EFAULT;
-        kp->menu_info = kmenus;
-
-        if (copy_in_user(kmenus, umenus, kp->menu_count * sizeof(*umenus)))
-                return -EFAULT;
+        kp->menu_info = compat_ptr(p);
 
         return 0;
 }
@@ -1310,10 +1298,6 @@ static int uvc_v4l2_get_xu_mapping(struct uvc_xu_control_mapping *kp,
 static int uvc_v4l2_put_xu_mapping(const struct uvc_xu_control_mapping *kp,
                         struct uvc_xu_control_mapping32 __user *up)
 {
-        struct uvc_menu_info __user *umenus;
-        struct uvc_menu_info __user *kmenus = kp->menu_info;
-        compat_caddr_t p;
-
         if (!access_ok(VERIFY_WRITE, up, sizeof(*up)) ||
             __copy_to_user(up, kp, offsetof(typeof(*up), menu_info)) ||
             __put_user(kp->menu_count, &up->menu_count))
@@ -1322,16 +1306,6 @@ static int uvc_v4l2_put_xu_mapping(const struct uvc_xu_control_mapping *kp,
         if (__clear_user(up->reserved, sizeof(up->reserved)))
                 return -EFAULT;
 
-        if (kp->menu_count == 0)
-                return 0;
-
-        if (get_user(p, &up->menu_info))
-                return -EFAULT;
-        umenus = compat_ptr(p);
-
-        if (copy_in_user(umenus, kmenus, kp->menu_count * sizeof(*umenus)))
-                return -EFAULT;
-
         return 0;
 }
 
@@ -1346,8 +1320,6 @@ struct uvc_xu_control_query32 {
 static int uvc_v4l2_get_xu_query(struct uvc_xu_control_query *kp,
                         const struct uvc_xu_control_query32 __user *up)
 {
-        u8 __user *udata;
-        u8 __user *kdata;
         compat_caddr_t p;
 
         if (!access_ok(VERIFY_READ, up, sizeof(*up)) ||
@@ -1361,17 +1333,7 @@ static int uvc_v4l2_get_xu_query(struct uvc_xu_control_query *kp,
 
         if (__get_user(p, &up->data))
                 return -EFAULT;
-        udata = compat_ptr(p);
-        if (!access_ok(VERIFY_READ, udata, kp->size))
-                return -EFAULT;
-
-        kdata = compat_alloc_user_space(kp->size);
-        if (kdata == NULL)
-                return -EFAULT;
-        kp->data = kdata;
-
-        if (copy_in_user(kdata, udata, kp->size))
-                return -EFAULT;
+        kp->data = compat_ptr(p);
 
         return 0;
 }
@@ -1379,26 +1341,10 @@ static int uvc_v4l2_get_xu_query(struct uvc_xu_control_query *kp,
 static int uvc_v4l2_put_xu_query(const struct uvc_xu_control_query *kp,
                         struct uvc_xu_control_query32 __user *up)
 {
-        u8 __user *udata;
-        u8 __user *kdata = kp->data;
-        compat_caddr_t p;
-
         if (!access_ok(VERIFY_WRITE, up, sizeof(*up)) ||
             __copy_to_user(up, kp, offsetof(typeof(*up), data)))
                 return -EFAULT;
 
-        if (kp->size == 0)
-                return 0;
-
-        if (get_user(p, &up->data))
-                return -EFAULT;
-        udata = compat_ptr(p);
-        if (!access_ok(VERIFY_READ, udata, kp->size))
-                return -EFAULT;
-
-        if (copy_in_user(udata, kdata, kp->size))
-                return -EFAULT;
-
         return 0;
 }
 
@@ -1408,47 +1354,44 @@ static int uvc_v4l2_put_xu_query(const struct uvc_xu_control_query *kp,
 static long uvc_v4l2_compat_ioctl32(struct file *file,
                      unsigned int cmd, unsigned long arg)
 {
+        struct uvc_fh *handle = file->private_data;
         union {
                 struct uvc_xu_control_mapping xmap;
                 struct uvc_xu_control_query xqry;
         } karg;
         void __user *up = compat_ptr(arg);
-        mm_segment_t old_fs;
         long ret;
 
         switch (cmd) {
         case UVCIOC_CTRL_MAP32:
-                cmd = UVCIOC_CTRL_MAP;
                 ret = uvc_v4l2_get_xu_mapping(&karg.xmap, up);
+                if (ret)
+                        return ret;
+                ret = uvc_ioctl_ctrl_map(handle->chain, &karg.xmap);
+                if (ret)
+                        return ret;
+                ret = uvc_v4l2_put_xu_mapping(&karg.xmap, up);
+                if (ret)
+                        return ret;
+
                 break;
 
         case UVCIOC_CTRL_QUERY32:
-                cmd = UVCIOC_CTRL_QUERY;
                 ret = uvc_v4l2_get_xu_query(&karg.xqry, up);
+                if (ret)
+                        return ret;
+                ret = uvc_xu_ctrl_query(handle->chain, &karg.xqry);
+                if (ret)
+                        return ret;
+                ret = uvc_v4l2_put_xu_query(&karg.xqry, up);
+                if (ret)
+                        return ret;
                 break;
 
         default:
                 return -ENOIOCTLCMD;
         }
 
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        ret = video_ioctl2(file, cmd, (unsigned long)&karg);
-        set_fs(old_fs);
-
-        if (ret < 0)
-                return ret;
-
-        switch (cmd) {
-        case UVCIOC_CTRL_MAP:
-                ret = uvc_v4l2_put_xu_mapping(&karg.xmap, up);
-                break;
-
-        case UVCIOC_CTRL_QUERY:
-                ret = uvc_v4l2_put_xu_query(&karg.xqry, up);
-                break;
-        }
-
         return ret;
 }
 #endif
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index ca94bded3386..8bef4331bd51 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -1,7 +1,7 @@
 /*
  * Media Controller ancillary functions
  *
- * Copyright (c) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ * Copyright (c) 2016 Mauro Carvalho Chehab <mchehab@kernel.org>
  * Copyright (C) 2016 Shuah Khan <shuahkh@osg.samsung.com>
  * Copyright (C) 2006-2010 Nokia Corporation
  * Copyright (c) 2016 Intel Corporation.
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index af4884ba6b7c..15508df24e5d 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -398,7 +398,7 @@ static void gpmc_cs_bool_timings(int cs, const struct gpmc_bool_timings *p)
         gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG4,
                            GPMC_CONFIG4_OEEXTRADELAY, p->oe_extra_delay);
         gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG4,
-                           GPMC_CONFIG4_OEEXTRADELAY, p->we_extra_delay);
+                           GPMC_CONFIG4_WEEXTRADELAY, p->we_extra_delay);
         gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG6,
                            GPMC_CONFIG6_CYCLE2CYCLESAMECSEN,
                            p->cycle2cyclesamecsen);
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index eed254da63a8..641c1a566687 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -730,7 +730,7 @@ static void mei_cl_wake_all(struct mei_cl *cl)
         /* synchronized under device mutex */
         if (waitqueue_active(&cl->wait)) {
                 cl_dbg(dev, cl, "Waking up ctrl write clients!\n");
-                wake_up_interruptible(&cl->wait);
+                wake_up(&cl->wait);
         }
 }
 
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index c984321d1881..5d438ad3ee32 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card)
          * switch to HS200 mode if bus width is set successfully.
          */
         err = mmc_select_bus_width(card);
-        if (!err) {
+        if (err >= 0) {
                 val = EXT_CSD_TIMING_HS200 |
                       card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
                 err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         } else if (mmc_card_hs(card)) {
                 /* Select the desired bus width optionally */
                 err = mmc_select_bus_width(card);
-                if (!err) {
+                if (err >= 0) {
                         err = mmc_select_hs_ddr(card);
                         if (err)
                                 goto free_card;
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 7fc8b7aa83f0..2ee4c21ec55e 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -970,8 +970,8 @@ static const struct sunxi_mmc_clk_delay sun9i_mmc_clk_delays[] = {
         [SDXC_CLK_400K]         = { .output = 180, .sample = 180 },
         [SDXC_CLK_25M]          = { .output = 180, .sample =  75 },
         [SDXC_CLK_50M]          = { .output = 150, .sample = 120 },
-        [SDXC_CLK_50M_DDR]      = { .output =  90, .sample = 120 },
-        [SDXC_CLK_50M_DDR_8BIT] = { .output =  90, .sample = 120 },
+        [SDXC_CLK_50M_DDR]      = { .output =  54, .sample =  36 },
+        [SDXC_CLK_50M_DDR_8BIT] = { .output =  72, .sample =  72 },
 };
 
 static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
@@ -1129,11 +1129,6 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
                                   MMC_CAP_1_8V_DDR |
                                   MMC_CAP_ERASE | MMC_CAP_SDIO_IRQ;
 
-        /* TODO MMC DDR is not working on A80 */
-        if (of_device_is_compatible(pdev->dev.of_node,
-                                    "allwinner,sun9i-a80-mmc"))
-                mmc->caps &= ~MMC_CAP_1_8V_DDR;
-
         ret = mmc_of_parse(mmc);
         if (ret)
                 goto error_free_dma;
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 16baeb51b2bd..ef3618299494 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1147,11 +1147,17 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)
  */
 static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev)
 {
-        struct kstat stat;
         int err, minor;
+        struct path path;
+        struct kstat stat;
 
         /* Probably this is an MTD character device node path */
-        err = vfs_stat(mtd_dev, &stat);
+        err = kern_path(mtd_dev, LOOKUP_FOLLOW, &path);
+        if (err)
+                return ERR_PTR(err);
+
+        err = vfs_getattr(&path, &stat);
+        path_put(&path);
         if (err)
                 return ERR_PTR(err);
 
@@ -1160,6 +1166,7 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev)
                 return ERR_PTR(-EINVAL);
 
         minor = MINOR(stat.rdev);
+
         if (minor & 1)
                 /*
                  * Just do not think the "/dev/mtdrX" devices support is need,
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 5780dd1ba79d..ebf517271d29 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -575,6 +575,7 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum,
         int err, idx = vol_id2idx(ubi, vol_id), new_pnum, data_size, tries = 0;
         struct ubi_volume *vol = ubi->volumes[idx];
         struct ubi_vid_hdr *vid_hdr;
+        uint32_t crc;
 
         vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);
         if (!vid_hdr)
@@ -599,14 +600,8 @@ retry:
                 goto out_put;
         }
 
-        vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
-        err = ubi_io_write_vid_hdr(ubi, new_pnum, vid_hdr);
-        if (err) {
-                up_read(&ubi->fm_eba_sem);
-                goto write_error;
-        }
+        ubi_assert(vid_hdr->vol_type == UBI_VID_DYNAMIC);
 
-        data_size = offset + len;
         mutex_lock(&ubi->buf_mutex);
         memset(ubi->peb_buf + offset, 0xFF, len);
 
@@ -621,6 +616,19 @@ retry:
 
         memcpy(ubi->peb_buf + offset, buf, len);
 
+        data_size = offset + len;
+        crc = crc32(UBI_CRC32_INIT, ubi->peb_buf, data_size);
+        vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
+        vid_hdr->copy_flag = 1;
+        vid_hdr->data_size = cpu_to_be32(data_size);
+        vid_hdr->data_crc = cpu_to_be32(crc);
+        err = ubi_io_write_vid_hdr(ubi, new_pnum, vid_hdr);
+        if (err) {
+                mutex_unlock(&ubi->buf_mutex);
+                up_read(&ubi->fm_eba_sem);
+                goto write_error;
+        }
+
         err = ubi_io_write_data(ubi, ubi->peb_buf, new_pnum, 0, data_size);
         if (err) {
                 mutex_unlock(&ubi->buf_mutex);
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 348dbbcbedc8..a9e2cef7c95c 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -302,6 +302,7 @@ EXPORT_SYMBOL_GPL(ubi_open_volume_nm);
 struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
 {
         int error, ubi_num, vol_id;
+        struct path path;
         struct kstat stat;
 
         dbg_gen("open volume %s, mode %d", pathname, mode);
@@ -309,7 +310,12 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
         if (!pathname || !*pathname)
                 return ERR_PTR(-EINVAL);
 
-        error = vfs_stat(pathname, &stat);
+        error = kern_path(pathname, LOOKUP_FOLLOW, &path);
+        if (error)
+                return ERR_PTR(error);
+
+        error = vfs_getattr(&path, &stat);
+        path_put(&path);
         if (error)
                 return ERR_PTR(error);
 
diff --git a/drivers/net/ethernet/arc/emac_mdio.c b/drivers/net/ethernet/arc/emac_mdio.c
index 16419f550eff..058460bdd5a6 100644
--- a/drivers/net/ethernet/arc/emac_mdio.c
+++ b/drivers/net/ethernet/arc/emac_mdio.c
@@ -141,7 +141,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv)
         priv->bus = bus;
         bus->priv = priv;
         bus->parent = priv->dev;
-        bus->name = "Synopsys MII Bus",
+        bus->name = "Synopsys MII Bus";
         bus->read = &arc_mdio_read;
         bus->write = &arc_mdio_write;
         bus->reset = &arc_mdio_reset;
diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h
index 8fc93c5f6abc..d02c4240b7df 100644
--- a/drivers/net/ethernet/atheros/alx/alx.h
+++ b/drivers/net/ethernet/atheros/alx/alx.h
@@ -96,6 +96,10 @@ struct alx_priv {
         unsigned int rx_ringsz;
         unsigned int rxbuf_size;
 
+        struct page  *rx_page;
+        unsigned int rx_page_offset;
+        unsigned int rx_frag_size;
+
         struct napi_struct napi;
         struct alx_tx_queue txq;
         struct alx_rx_queue rxq;
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 9fe8b5e310d1..c98acdc0d14f 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -70,6 +70,35 @@ static void alx_free_txbuf(struct alx_priv *alx, int entry)
         }
 }
 
+static struct sk_buff *alx_alloc_skb(struct alx_priv *alx, gfp_t gfp)
+{
+        struct sk_buff *skb;
+        struct page *page;
+
+        if (alx->rx_frag_size > PAGE_SIZE)
+                return __netdev_alloc_skb(alx->dev, alx->rxbuf_size, gfp);
+
+        page = alx->rx_page;
+        if (!page) {
+                alx->rx_page = page = alloc_page(gfp);
+                if (unlikely(!page))
+                        return NULL;
+                alx->rx_page_offset = 0;
+        }
+
+        skb = build_skb(page_address(page) + alx->rx_page_offset,
+                        alx->rx_frag_size);
+        if (likely(skb)) {
+                alx->rx_page_offset += alx->rx_frag_size;
+                if (alx->rx_page_offset >= PAGE_SIZE)
+                        alx->rx_page = NULL;
+                else
+                        get_page(page);
+        }
+        return skb;
+}
+
+
 static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
 {
         struct alx_rx_queue *rxq = &alx->rxq;
@@ -86,7 +115,7 @@ static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
         while (!cur_buf->skb && next != rxq->read_idx) {
                 struct alx_rfd *rfd = &rxq->rfd[cur];
 
-                skb = __netdev_alloc_skb(alx->dev, alx->rxbuf_size, gfp);
+                skb = alx_alloc_skb(alx, gfp);
                 if (!skb)
                         break;
                 dma = dma_map_single(&alx->hw.pdev->dev,
@@ -124,6 +153,7 @@ static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
                 alx_write_mem16(&alx->hw, ALX_RFD_PIDX, cur);
         }
 
+
         return count;
 }
 
@@ -592,6 +622,11 @@ static void alx_free_rings(struct alx_priv *alx)
         kfree(alx->txq.bufs);
         kfree(alx->rxq.bufs);
 
+        if (alx->rx_page) {
+                put_page(alx->rx_page);
+                alx->rx_page = NULL;
+        }
+
         dma_free_coherent(&alx->hw.pdev->dev,
                           alx->descmem.size,
                           alx->descmem.virt,
@@ -646,6 +681,7 @@ static int alx_request_irq(struct alx_priv *alx)
                                   alx->dev->name, alx);
                 if (!err)
                         goto out;
+
                 /* fall back to legacy interrupt */
                 pci_disable_msi(alx->hw.pdev);
         }
@@ -689,6 +725,7 @@ static int alx_init_sw(struct alx_priv *alx)
         struct pci_dev *pdev = alx->hw.pdev;
         struct alx_hw *hw = &alx->hw;
         int err;
+        unsigned int head_size;
 
         err = alx_identify_hw(alx);
         if (err) {
@@ -704,7 +741,12 @@ static int alx_init_sw(struct alx_priv *alx)
 
         hw->smb_timer = 400;
         hw->mtu = alx->dev->mtu;
+
         alx->rxbuf_size = ALX_MAX_FRAME_LEN(hw->mtu);
+        head_size = SKB_DATA_ALIGN(alx->rxbuf_size + NET_SKB_PAD) +
+                    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+        alx->rx_frag_size = roundup_pow_of_two(head_size);
+
         alx->tx_ringsz = 256;
         alx->rx_ringsz = 512;
         hw->imt = 200;
@@ -806,6 +848,7 @@ static int alx_change_mtu(struct net_device *netdev, int mtu)
 {
         struct alx_priv *alx = netdev_priv(netdev);
         int max_frame = ALX_MAX_FRAME_LEN(mtu);
+        unsigned int head_size;
 
         if ((max_frame < ALX_MIN_FRAME_SIZE) ||
             (max_frame > ALX_MAX_FRAME_SIZE))
@@ -817,6 +860,9 @@ static int alx_change_mtu(struct net_device *netdev, int mtu)
         netdev->mtu = mtu;
         alx->hw.mtu = mtu;
         alx->rxbuf_size = max(max_frame, ALX_DEF_RXBUF_SIZE);
+        head_size = SKB_DATA_ALIGN(alx->rxbuf_size + NET_SKB_PAD) +
+                    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+        alx->rx_frag_size = roundup_pow_of_two(head_size);
         netdev_update_features(netdev);
         if (netif_running(netdev))
                 alx_reinit(alx);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 0a5b770cefaa..a59d55e25d5f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12895,52 +12895,71 @@ static int __bnx2x_vlan_configure_vid(struct bnx2x *bp, u16 vid, bool add)
         return rc;
 }
 
-int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp)
+static int bnx2x_vlan_configure_vid_list(struct bnx2x *bp)
 {
         struct bnx2x_vlan_entry *vlan;
         int rc = 0;
 
-        if (!bp->vlan_cnt) {
-                DP(NETIF_MSG_IFUP, "No need to re-configure vlan filters\n");
-                return 0;
-        }
-
+        /* Configure all non-configured entries */
         list_for_each_entry(vlan, &bp->vlan_reg, link) {
-                /* Prepare for cleanup in case of errors */
-                if (rc) {
-                        vlan->hw = false;
-                        continue;
-                }
-
-                if (!vlan->hw)
+                if (vlan->hw)
                         continue;
 
-                DP(NETIF_MSG_IFUP, "Re-configuring vlan 0x%04x\n", vlan->vid);
+                if (bp->vlan_cnt >= bp->vlan_credit)
+                        return -ENOBUFS;
 
                 rc = __bnx2x_vlan_configure_vid(bp, vlan->vid, true);
                 if (rc) {
-                        BNX2X_ERR("Unable to configure VLAN %d\n", vlan->vid);
-                        vlan->hw = false;
-                        rc = -EINVAL;
-                        continue;
+                        BNX2X_ERR("Unable to config VLAN %d\n", vlan->vid);
+                        return rc;
                 }
+
+                DP(NETIF_MSG_IFUP, "HW configured for VLAN %d\n", vlan->vid);
+                vlan->hw = true;
+                bp->vlan_cnt++;
         }
 
-        return rc;
+        return 0;
+}
+
+static void bnx2x_vlan_configure(struct bnx2x *bp, bool set_rx_mode)
+{
+        bool need_accept_any_vlan;
+
+        need_accept_any_vlan = !!bnx2x_vlan_configure_vid_list(bp);
+
+        if (bp->accept_any_vlan != need_accept_any_vlan) {
+                bp->accept_any_vlan = need_accept_any_vlan;
+                DP(NETIF_MSG_IFUP, "Accept all VLAN %s\n",
+                   bp->accept_any_vlan ? "raised" : "cleared");
+                if (set_rx_mode) {
+                        if (IS_PF(bp))
+                                bnx2x_set_rx_mode_inner(bp);
+                        else
+                                bnx2x_vfpf_storm_rx_mode(bp);
+                }
+        }
+}
+
+int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp)
+{
+        struct bnx2x_vlan_entry *vlan;
+
+        /* The hw forgot all entries after reload */
+        list_for_each_entry(vlan, &bp->vlan_reg, link)
+                vlan->hw = false;
+        bp->vlan_cnt = 0;
+
+        /* Don't set rx mode here. Our caller will do it. */
+        bnx2x_vlan_configure(bp, false);
+
+        return 0;
 }
 
 static int bnx2x_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct bnx2x *bp = netdev_priv(dev);
         struct bnx2x_vlan_entry *vlan;
-        bool hw = false;
-        int rc = 0;
-
-        if (!netif_running(bp->dev)) {
-                DP(NETIF_MSG_IFUP,
-                   "Ignoring VLAN configuration the interface is down\n");
-                return -EFAULT;
-        }
 
         DP(NETIF_MSG_IFUP, "Adding VLAN %d\n", vid);
 
@@ -12948,93 +12967,47 @@ static int bnx2x_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
         if (!vlan)
                 return -ENOMEM;
 
-        bp->vlan_cnt++;
-        if (bp->vlan_cnt > bp->vlan_credit && !bp->accept_any_vlan) {
-                DP(NETIF_MSG_IFUP, "Accept all VLAN raised\n");
-                bp->accept_any_vlan = true;
-                if (IS_PF(bp))
-                        bnx2x_set_rx_mode_inner(bp);
-                else
-                        bnx2x_vfpf_storm_rx_mode(bp);
-        } else if (bp->vlan_cnt <= bp->vlan_credit) {
-                rc = __bnx2x_vlan_configure_vid(bp, vid, true);
-                hw = true;
-        }
-
         vlan->vid = vid;
-        vlan->hw = hw;
+        vlan->hw = false;
+        list_add_tail(&vlan->link, &bp->vlan_reg);
 
-        if (!rc) {
-                list_add(&vlan->link, &bp->vlan_reg);
-        } else {
-                bp->vlan_cnt--;
-                kfree(vlan);
-        }
-
-        DP(NETIF_MSG_IFUP, "Adding VLAN result %d\n", rc);
+        if (netif_running(dev))
+                bnx2x_vlan_configure(bp, true);
 
-        return rc;
+        return 0;
 }
 
 static int bnx2x_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct bnx2x *bp = netdev_priv(dev);
         struct bnx2x_vlan_entry *vlan;
+        bool found = false;
         int rc = 0;
 
-        if (!netif_running(bp->dev)) {
-                DP(NETIF_MSG_IFUP,
-                   "Ignoring VLAN configuration the interface is down\n");
-                return -EFAULT;
-        }
-
         DP(NETIF_MSG_IFUP, "Removing VLAN %d\n", vid);
 
-        if (!bp->vlan_cnt) {
-                BNX2X_ERR("Unable to kill VLAN %d\n", vid);
-                return -EINVAL;
-        }
-
         list_for_each_entry(vlan, &bp->vlan_reg, link)
-                if (vlan->vid == vid)
+                if (vlan->vid == vid) {
+                        found = true;
                         break;
+                }
 
-        if (vlan->vid != vid) {
+        if (!found) {
                 BNX2X_ERR("Unable to kill VLAN %d - not found\n", vid);
                 return -EINVAL;
         }
 
-        if (vlan->hw)
+        if (netif_running(dev) && vlan->hw) {
                 rc = __bnx2x_vlan_configure_vid(bp, vid, false);
+                DP(NETIF_MSG_IFUP, "HW deconfigured for VLAN %d\n", vid);
+                bp->vlan_cnt--;
+        }
 
         list_del(&vlan->link);
         kfree(vlan);
 
-        bp->vlan_cnt--;
-
-        if (bp->vlan_cnt <= bp->vlan_credit && bp->accept_any_vlan) {
-                /* Configure all non-configured entries */
-                list_for_each_entry(vlan, &bp->vlan_reg, link) {
-                        if (vlan->hw)
-                                continue;
-
-                        rc = __bnx2x_vlan_configure_vid(bp, vlan->vid, true);
-                        if (rc) {
-                                BNX2X_ERR("Unable to config VLAN %d\n",
-                                          vlan->vid);
-                                continue;
-                        }
-                        DP(NETIF_MSG_IFUP, "HW configured for VLAN %d\n",
-                           vlan->vid);
-                        vlan->hw = true;
-                }
-                DP(NETIF_MSG_IFUP, "Accept all VLAN Removed\n");
-                bp->accept_any_vlan = false;
-                if (IS_PF(bp))
-                        bnx2x_set_rx_mode_inner(bp);
-                else
-                        bnx2x_vfpf_storm_rx_mode(bp);
-        }
+        if (netif_running(dev))
+                bnx2x_vlan_configure(bp, true);
 
         DP(NETIF_MSG_IFUP, "Removing VLAN result %d\n", rc);
 
@@ -13941,14 +13914,14 @@ static int bnx2x_init_one(struct pci_dev *pdev,
                 bp->doorbells = bnx2x_vf_doorbells(bp);
                 rc = bnx2x_vf_pci_alloc(bp);
                 if (rc)
-                        goto init_one_exit;
+                        goto init_one_freemem;
         } else {
                 doorbell_size = BNX2X_L2_MAX_CID(bp) * (1 << BNX2X_DB_SHIFT);
                 if (doorbell_size > pci_resource_len(pdev, 2)) {
                         dev_err(&bp->pdev->dev,
                                 "Cannot map doorbells, bar size too small, aborting\n");
                         rc = -ENOMEM;
-                        goto init_one_exit;
+                        goto init_one_freemem;
                 }
                 bp->doorbells = ioremap_nocache(pci_resource_start(pdev, 2),
                                                 doorbell_size);
@@ -13957,19 +13930,19 @@ static int bnx2x_init_one(struct pci_dev *pdev,
                 dev_err(&bp->pdev->dev,
                         "Cannot map doorbell space, aborting\n");
                 rc = -ENOMEM;
-                goto init_one_exit;
+                goto init_one_freemem;
         }
 
         if (IS_VF(bp)) {
                 rc = bnx2x_vfpf_acquire(bp, tx_count, rx_count);
                 if (rc)
-                        goto init_one_exit;
+                        goto init_one_freemem;
         }
 
         /* Enable SRIOV if capability found in configuration space */
         rc = bnx2x_iov_init_one(bp, int_mode, BNX2X_MAX_NUM_OF_VFS);
         if (rc)
-                goto init_one_exit;
+                goto init_one_freemem;
 
         /* calc qm_cid_count */
         bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
@@ -13988,7 +13961,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
         rc = bnx2x_set_int_mode(bp);
         if (rc) {
                 dev_err(&pdev->dev, "Cannot set interrupts\n");
-                goto init_one_exit;
+                goto init_one_freemem;
         }
         BNX2X_DEV_INFO("set interrupts successfully\n");
 
@@ -13996,7 +13969,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
         rc = register_netdev(dev);
         if (rc) {
                 dev_err(&pdev->dev, "Cannot register net device\n");
-                goto init_one_exit;
+                goto init_one_freemem;
         }
         BNX2X_DEV_INFO("device name after netdev register %s\n", dev->name);
 
@@ -14029,6 +14002,9 @@ static int bnx2x_init_one(struct pci_dev *pdev,
 
         return 0;
 
+init_one_freemem:
+        bnx2x_free_mem_bp(bp);
+
 init_one_exit:
         bnx2x_disable_pcie_error_reporting(bp);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 72a2efff8e49..c777cde85ce4 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -286,7 +286,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         cpu_to_le32(DB_KEY_TX_PUSH | DB_LONG_TX_PUSH | prod);
                 txr->tx_prod = prod;
 
+                tx_buf->is_push = 1;
                 netdev_tx_sent_queue(txq, skb->len);
+                wmb();  /* Sync is_push and byte queue before pushing data */
 
                 push_len = (length + sizeof(*tx_push) + 7) / 8;
                 if (push_len > 16) {
@@ -298,7 +300,6 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                          push_len);
                 }
 
-                tx_buf->is_push = 1;
                 goto tx_done;
         }
 
@@ -1112,19 +1113,13 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
         if (tpa_info->hash_type != PKT_HASH_TYPE_NONE)
                 skb_set_hash(skb, tpa_info->rss_hash, tpa_info->hash_type);
 
-        if (tpa_info->flags2 & RX_CMP_FLAGS2_META_FORMAT_VLAN) {
-                netdev_features_t features = skb->dev->features;
+        if ((tpa_info->flags2 & RX_CMP_FLAGS2_META_FORMAT_VLAN) &&
+            (skb->dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
                 u16 vlan_proto = tpa_info->metadata >>
                         RX_CMP_FLAGS2_METADATA_TPID_SFT;
+                u16 vtag = tpa_info->metadata & RX_CMP_FLAGS2_METADATA_VID_MASK;
 
-                if (((features & NETIF_F_HW_VLAN_CTAG_RX) &&
-                     vlan_proto == ETH_P_8021Q) ||
-                    ((features & NETIF_F_HW_VLAN_STAG_RX) &&
-                     vlan_proto == ETH_P_8021AD)) {
-                        __vlan_hwaccel_put_tag(skb, htons(vlan_proto),
-                                               tpa_info->metadata &
-                                               RX_CMP_FLAGS2_METADATA_VID_MASK);
-                }
+                __vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);
         }
 
         skb_checksum_none_assert(skb);
@@ -1277,19 +1272,14 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
 
         skb->protocol = eth_type_trans(skb, dev);
 
-        if (rxcmp1->rx_cmp_flags2 &
-            cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)) {
-                netdev_features_t features = skb->dev->features;
+        if ((rxcmp1->rx_cmp_flags2 &
+             cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)) &&
+            (skb->dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
                 u32 meta_data = le32_to_cpu(rxcmp1->rx_cmp_meta_data);
+                u16 vtag = meta_data & RX_CMP_FLAGS2_METADATA_VID_MASK;
                 u16 vlan_proto = meta_data >> RX_CMP_FLAGS2_METADATA_TPID_SFT;
 
-                if (((features & NETIF_F_HW_VLAN_CTAG_RX) &&
-                     vlan_proto == ETH_P_8021Q) ||
-                    ((features & NETIF_F_HW_VLAN_STAG_RX) &&
-                     vlan_proto == ETH_P_8021AD))
-                        __vlan_hwaccel_put_tag(skb, htons(vlan_proto),
-                                               meta_data &
-                                               RX_CMP_FLAGS2_METADATA_VID_MASK);
+                __vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);
         }
 
         skb_checksum_none_assert(skb);
@@ -5466,6 +5456,20 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev,
 
         if (!bnxt_rfs_capable(bp))
                 features &= ~NETIF_F_NTUPLE;
+
+        /* Both CTAG and STAG VLAN accelaration on the RX side have to be
+         * turned on or off together.
+         */
+        if ((features & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) !=
+            (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) {
+                if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
+                        features &= ~(NETIF_F_HW_VLAN_CTAG_RX |
+                                      NETIF_F_HW_VLAN_STAG_RX);
+                else
+                        features |= NETIF_F_HW_VLAN_CTAG_RX |
+                                    NETIF_F_HW_VLAN_STAG_RX;
+        }
+
         return features;
 }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
index a2cdfc1261dc..50812a1d67bd 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
@@ -144,6 +144,7 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN
         CH_PCI_ID_TABLE_FENTRY(0x5015), /* T502-bt */
         CH_PCI_ID_TABLE_FENTRY(0x5016), /* T580-OCP-SO */
         CH_PCI_ID_TABLE_FENTRY(0x5017), /* T520-OCP-SO */
+        CH_PCI_ID_TABLE_FENTRY(0x5018), /* T540-BT */
         CH_PCI_ID_TABLE_FENTRY(0x5080), /* Custom T540-cr */
         CH_PCI_ID_TABLE_FENTRY(0x5081), /* Custom T540-LL-cr */
         CH_PCI_ID_TABLE_FENTRY(0x5082), /* Custom T504-cr */
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 41b010645100..4edb98c3c6c7 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -1195,7 +1195,7 @@ static int ethoc_probe(struct platform_device *pdev)
         priv->mdio = mdiobus_alloc();
         if (!priv->mdio) {
                 ret = -ENOMEM;
-                goto free;
+                goto free2;
         }
 
         priv->mdio->name = "ethoc-mdio";
@@ -1208,7 +1208,7 @@ static int ethoc_probe(struct platform_device *pdev)
         ret = mdiobus_register(priv->mdio);
         if (ret) {
                 dev_err(&netdev->dev, "failed to register MDIO bus\n");
-                goto free;
+                goto free2;
         }
 
         ret = ethoc_mdio_probe(netdev);
@@ -1241,9 +1241,10 @@ error2:
 error:
         mdiobus_unregister(priv->mdio);
         mdiobus_free(priv->mdio);
-free:
+free2:
         if (priv->clk)
                 clk_disable_unprepare(priv->clk);
+free:
         free_netdev(netdev);
 out:
         return ret;
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index 085f9125cf42..06f031715b57 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -205,8 +205,10 @@ static int nps_enet_poll(struct napi_struct *napi, int budget)
                  * re-adding ourselves to the poll list.
                  */
 
-                if (priv->tx_skb && !tx_ctrl_ct)
+                if (priv->tx_skb && !tx_ctrl_ct) {
+                        nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE, 0);
                         napi_reschedule(napi);
+                }
         }
 
         return work_done;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index ca2cccc594fd..fea0f330ddbd 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1197,10 +1197,8 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
                                          fec16_to_cpu(bdp->cbd_datlen),
                                          DMA_TO_DEVICE);
                 bdp->cbd_bufaddr = cpu_to_fec32(0);
-                if (!skb) {
-                        bdp = fec_enet_get_nextdesc(bdp, &txq->bd);
-                        continue;
-                }
+                if (!skb)
+                        goto skb_done;
 
                 /* Check for errors. */
                 if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
@@ -1239,7 +1237,7 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
 
                 /* Free the sk buffer associated with this last transmit */
                 dev_kfree_skb_any(skb);
-
+skb_done:
                 /* Make sure the update to bdp and tx_skbuff are performed
                  * before dirty_tx
                  */
@@ -2418,24 +2416,24 @@ fec_enet_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *ec)
                 return -EOPNOTSUPP;
 
         if (ec->rx_max_coalesced_frames > 255) {
-                pr_err("Rx coalesced frames exceed hardware limiation");
+                pr_err("Rx coalesced frames exceed hardware limitation\n");
                 return -EINVAL;
         }
 
         if (ec->tx_max_coalesced_frames > 255) {
-                pr_err("Tx coalesced frame exceed hardware limiation");
+                pr_err("Tx coalesced frame exceed hardware limitation\n");
                 return -EINVAL;
         }
 
         cycle = fec_enet_us_to_itr_clock(ndev, fep->rx_time_itr);
         if (cycle > 0xFFFF) {
-                pr_err("Rx coalesed usec exceeed hardware limiation");
+                pr_err("Rx coalesced usec exceed hardware limitation\n");
                 return -EINVAL;
         }
 
         cycle = fec_enet_us_to_itr_clock(ndev, fep->tx_time_itr);
         if (cycle > 0xFFFF) {
-                pr_err("Rx coalesed usec exceeed hardware limiation");
+                pr_err("Rx coalesced usec exceed hardware limitation\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 7615e0668acb..2e6785b6e8be 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2440,7 +2440,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                                  tx_queue->tx_ring_size);
 
         if (likely(!nr_frags)) {
-                lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
+                if (likely(!do_tstamp))
+                        lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
         } else {
                 u32 lstatus_start = lstatus;
 
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 3d746c887873..67a648c7d3a9 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -46,7 +46,6 @@ static u32 hns_nic_get_link(struct net_device *net_dev)
         u32 link_stat = priv->link;
         struct hnae_handle *h;
 
-        assert(priv && priv->ae_handle);
         h = priv->ae_handle;
 
         if (priv->phy) {
@@ -646,8 +645,6 @@ static void hns_nic_get_drvinfo(struct net_device *net_dev,
 {
         struct hns_nic_priv *priv = netdev_priv(net_dev);
 
-        assert(priv);
-
         strncpy(drvinfo->version, HNAE_DRIVER_VERSION,
                 sizeof(drvinfo->version));
         drvinfo->version[sizeof(drvinfo->version) - 1] = '\0';
@@ -720,8 +717,6 @@ static int hns_set_pauseparam(struct net_device *net_dev,
         struct hnae_handle *h;
         struct hnae_ae_ops *ops;
 
-        assert(priv || priv->ae_handle);
-
         h = priv->ae_handle;
         ops = h->dev->ops;
 
@@ -780,8 +775,6 @@ static int hns_set_coalesce(struct net_device *net_dev,
         struct hnae_ae_ops *ops;
         int ret;
 
-        assert(priv || priv->ae_handle);
-
         ops = priv->ae_handle->dev->ops;
 
         if (ec->tx_coalesce_usecs != ec->rx_coalesce_usecs)
@@ -1111,8 +1104,6 @@ void hns_get_regs(struct net_device *net_dev, struct ethtool_regs *cmd,
         struct hns_nic_priv *priv = netdev_priv(net_dev);
         struct hnae_ae_ops *ops;
 
-        assert(priv || priv->ae_handle);
-
         ops = priv->ae_handle->dev->ops;
 
         cmd->version = HNS_CHIP_VERSION;
@@ -1135,8 +1126,6 @@ static int hns_get_regs_len(struct net_device *net_dev)
         struct hns_nic_priv *priv = netdev_priv(net_dev);
         struct hnae_ae_ops *ops;
 
-        assert(priv || priv->ae_handle);
-
         ops = priv->ae_handle->dev->ops;
         if (!ops->get_regs_len) {
                 netdev_err(net_dev, "ops->get_regs_len is null!\n");
diff --git a/drivers/net/ethernet/marvell/mvneta_bm.c b/drivers/net/ethernet/marvell/mvneta_bm.c
index 01fccec632ec..466939f8f0cf 100644
--- a/drivers/net/ethernet/marvell/mvneta_bm.c
+++ b/drivers/net/ethernet/marvell/mvneta_bm.c
@@ -189,6 +189,7 @@ struct mvneta_bm_pool *mvneta_bm_pool_use(struct mvneta_bm *priv, u8 pool_id,
                         SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
                 hwbm_pool->construct = mvneta_bm_construct;
                 hwbm_pool->priv = new_pool;
+                spin_lock_init(&hwbm_pool->lock);
 
                 /* Create new pool */
                 err = mvneta_bm_pool_create(priv, new_pool);
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index c984462fad2a..4763252bbf85 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -133,6 +133,8 @@ static int mtk_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)
 static void mtk_phy_link_adjust(struct net_device *dev)
 {
         struct mtk_mac *mac = netdev_priv(dev);
+        u16 lcl_adv = 0, rmt_adv = 0;
+        u8 flowctrl;
         u32 mcr = MAC_MCR_MAX_RX_1536 | MAC_MCR_IPG_CFG |
                   MAC_MCR_FORCE_MODE | MAC_MCR_TX_EN |
                   MAC_MCR_RX_EN | MAC_MCR_BACKOFF_EN |
@@ -150,11 +152,30 @@ static void mtk_phy_link_adjust(struct net_device *dev)
         if (mac->phy_dev->link)
                 mcr |= MAC_MCR_FORCE_LINK;
 
-        if (mac->phy_dev->duplex)
+        if (mac->phy_dev->duplex) {
                 mcr |= MAC_MCR_FORCE_DPX;
 
-        if (mac->phy_dev->pause)
-                mcr |= MAC_MCR_FORCE_RX_FC | MAC_MCR_FORCE_TX_FC;
+                if (mac->phy_dev->pause)
+                        rmt_adv = LPA_PAUSE_CAP;
+                if (mac->phy_dev->asym_pause)
+                        rmt_adv |= LPA_PAUSE_ASYM;
+
+                if (mac->phy_dev->advertising & ADVERTISED_Pause)
+                        lcl_adv |= ADVERTISE_PAUSE_CAP;
+                if (mac->phy_dev->advertising & ADVERTISED_Asym_Pause)
+                        lcl_adv |= ADVERTISE_PAUSE_ASYM;
+
+                flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
+
+                if (flowctrl & FLOW_CTRL_TX)
+                        mcr |= MAC_MCR_FORCE_TX_FC;
+                if (flowctrl & FLOW_CTRL_RX)
+                        mcr |= MAC_MCR_FORCE_RX_FC;
+
+                netif_dbg(mac->hw, link, dev, "rx pause %s, tx pause %s\n",
+                          flowctrl & FLOW_CTRL_RX ? "enabled" : "disabled",
+                          flowctrl & FLOW_CTRL_TX ? "enabled" : "disabled");
+        }
 
         mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
 
@@ -208,10 +229,16 @@ static int mtk_phy_connect(struct mtk_mac *mac)
         u32 val, ge_mode;
 
         np = of_parse_phandle(mac->of_node, "phy-handle", 0);
+        if (!np && of_phy_is_fixed_link(mac->of_node))
+                if (!of_phy_register_fixed_link(mac->of_node))
+                        np = of_node_get(mac->of_node);
         if (!np)
                 return -ENODEV;
 
         switch (of_get_phy_mode(np)) {
+        case PHY_INTERFACE_MODE_RGMII_TXID:
+        case PHY_INTERFACE_MODE_RGMII_RXID:
+        case PHY_INTERFACE_MODE_RGMII_ID:
         case PHY_INTERFACE_MODE_RGMII:
                 ge_mode = 0;
                 break;
@@ -236,7 +263,8 @@ static int mtk_phy_connect(struct mtk_mac *mac)
         mac->phy_dev->autoneg = AUTONEG_ENABLE;
         mac->phy_dev->speed = 0;
         mac->phy_dev->duplex = 0;
-        mac->phy_dev->supported &= PHY_BASIC_FEATURES;
+        mac->phy_dev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause |
+                                   SUPPORTED_Asym_Pause;
         mac->phy_dev->advertising = mac->phy_dev->supported |
                                     ADVERTISED_Autoneg;
         phy_start_aneg(mac->phy_dev);
@@ -280,7 +308,7 @@ static int mtk_mdio_init(struct mtk_eth *eth)
         return 0;
 
 err_free_bus:
-        kfree(eth->mii_bus);
+        mdiobus_free(eth->mii_bus);
 
 err_put_node:
         of_node_put(mii_np);
@@ -295,7 +323,7 @@ static void mtk_mdio_cleanup(struct mtk_eth *eth)
 
         mdiobus_unregister(eth->mii_bus);
         of_node_put(eth->mii_bus->dev.of_node);
-        kfree(eth->mii_bus);
+        mdiobus_free(eth->mii_bus);
 }
 
 static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index c761194bb323..fc95affaf76b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -362,7 +362,7 @@ static void mlx4_en_get_ethtool_stats(struct net_device *dev,
 
         for (i = 0; i < NUM_MAIN_STATS; i++, bitmap_iterator_inc(&it))
                 if (bitmap_iterator_test(&it))
-                        data[index++] = ((unsigned long *)&priv->stats)[i];
+                        data[index++] = ((unsigned long *)&dev->stats)[i];
 
         for (i = 0; i < NUM_PORT_STATS; i++, bitmap_iterator_inc(&it))
                 if (bitmap_iterator_test(&it))
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 92e0624f4cf0..19ceced6736c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1296,15 +1296,16 @@ static void mlx4_en_tx_timeout(struct net_device *dev)
 }
 
 
-static struct net_device_stats *mlx4_en_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *
+mlx4_en_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
 
         spin_lock_bh(&priv->stats_lock);
-        memcpy(&priv->ret_stats, &priv->stats, sizeof(priv->stats));
+        netdev_stats_to_stats64(stats, &dev->stats);
         spin_unlock_bh(&priv->stats_lock);
 
-        return &priv->ret_stats;
+        return stats;
 }
 
 static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
@@ -1876,7 +1877,6 @@ static void mlx4_en_clear_stats(struct net_device *dev)
         if (mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 1))
                 en_dbg(HW, priv, "Failed dumping statistics\n");
 
-        memset(&priv->stats, 0, sizeof(priv->stats));
         memset(&priv->pstats, 0, sizeof(priv->pstats));
         memset(&priv->pkstats, 0, sizeof(priv->pkstats));
         memset(&priv->port_stats, 0, sizeof(priv->port_stats));
@@ -1892,6 +1892,11 @@ static void mlx4_en_clear_stats(struct net_device *dev)
                 priv->tx_ring[i]->bytes = 0;
                 priv->tx_ring[i]->packets = 0;
                 priv->tx_ring[i]->tx_csum = 0;
+                priv->tx_ring[i]->tx_dropped = 0;
+                priv->tx_ring[i]->queue_stopped = 0;
+                priv->tx_ring[i]->wake_queue = 0;
+                priv->tx_ring[i]->tso_packets = 0;
+                priv->tx_ring[i]->xmit_more = 0;
         }
         for (i = 0; i < priv->rx_ring_num; i++) {
                 priv->rx_ring[i]->bytes = 0;
@@ -2482,7 +2487,7 @@ static const struct net_device_ops mlx4_netdev_ops = {
         .ndo_stop               = mlx4_en_close,
         .ndo_start_xmit         = mlx4_en_xmit,
         .ndo_select_queue       = mlx4_en_select_queue,
-        .ndo_get_stats          = mlx4_en_get_stats,
+        .ndo_get_stats64        = mlx4_en_get_stats64,
         .ndo_set_rx_mode        = mlx4_en_set_rx_mode,
         .ndo_set_mac_address    = mlx4_en_set_mac,
         .ndo_validate_addr      = eth_validate_addr,
@@ -2514,7 +2519,7 @@ static const struct net_device_ops mlx4_netdev_ops_master = {
         .ndo_stop               = mlx4_en_close,
         .ndo_start_xmit         = mlx4_en_xmit,
         .ndo_select_queue       = mlx4_en_select_queue,
-        .ndo_get_stats          = mlx4_en_get_stats,
+        .ndo_get_stats64        = mlx4_en_get_stats64,
         .ndo_set_rx_mode        = mlx4_en_set_rx_mode,
         .ndo_set_mac_address    = mlx4_en_set_mac,
         .ndo_validate_addr      = eth_validate_addr,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c
index 20b6c2e678b8..5aa8b751f417 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_port.c
@@ -152,8 +152,9 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
         struct mlx4_counter tmp_counter_stats;
         struct mlx4_en_stat_out_mbox *mlx4_en_stats;
         struct mlx4_en_stat_out_flow_control_mbox *flowstats;
-        struct mlx4_en_priv *priv = netdev_priv(mdev->pndev[port]);
-        struct net_device_stats *stats = &priv->stats;
+        struct net_device *dev = mdev->pndev[port];
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
         struct mlx4_cmd_mailbox *mailbox;
         u64 in_mod = reset << 8 | port;
         int err;
@@ -188,6 +189,7 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
         }
         stats->tx_packets = 0;
         stats->tx_bytes = 0;
+        stats->tx_dropped = 0;
         priv->port_stats.tx_chksum_offload = 0;
         priv->port_stats.queue_stopped = 0;
         priv->port_stats.wake_queue = 0;
@@ -199,6 +201,7 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
 
                 stats->tx_packets += ring->packets;
                 stats->tx_bytes += ring->bytes;
+                stats->tx_dropped += ring->tx_dropped;
                 priv->port_stats.tx_chksum_offload += ring->tx_csum;
                 priv->port_stats.queue_stopped     += ring->queue_stopped;
                 priv->port_stats.wake_queue        += ring->wake_queue;
@@ -237,21 +240,12 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
         stats->multicast = en_stats_adder(&mlx4_en_stats->MCAST_prio_0,
                                           &mlx4_en_stats->MCAST_prio_1,
                                           NUM_PRIORITIES);
-        stats->collisions = 0;
         stats->rx_dropped = be32_to_cpu(mlx4_en_stats->RDROP) +
                             sw_rx_dropped;
         stats->rx_length_errors = be32_to_cpu(mlx4_en_stats->RdropLength);
-        stats->rx_over_errors = 0;
         stats->rx_crc_errors = be32_to_cpu(mlx4_en_stats->RCRC);
-        stats->rx_frame_errors = 0;
         stats->rx_fifo_errors = be32_to_cpu(mlx4_en_stats->RdropOvflw);
-        stats->rx_missed_errors = 0;
-        stats->tx_aborted_errors = 0;
-        stats->tx_carrier_errors = 0;
-        stats->tx_fifo_errors = 0;
-        stats->tx_heartbeat_errors = 0;
-        stats->tx_window_errors = 0;
-        stats->tx_dropped = be32_to_cpu(mlx4_en_stats->TDROP);
+        stats->tx_dropped += be32_to_cpu(mlx4_en_stats->TDROP);
 
         /* RX stats */
         priv->pkstats.rx_multicast_packets = stats->multicast;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index f6e61570cb2c..76aa4d27183c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -726,12 +726,12 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         bool inline_ok;
         u32 ring_cons;
 
-        if (!priv->port_up)
-                goto tx_drop;
-
         tx_ind = skb_get_queue_mapping(skb);
         ring = priv->tx_ring[tx_ind];
 
+        if (!priv->port_up)
+                goto tx_drop;
+
         /* fetch ring->cons far ahead before needing it to avoid stall */
         ring_cons = ACCESS_ONCE(ring->cons);
 
@@ -1030,7 +1030,7 @@ tx_drop_unmap:
 
 tx_drop:
         dev_kfree_skb_any(skb);
-        priv->stats.tx_dropped++;
+        ring->tx_dropped++;
         return NETDEV_TX_OK;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index cc84e09f324a..467d47ed2c39 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -270,6 +270,7 @@ struct mlx4_en_tx_ring {
         unsigned long           tx_csum;
         unsigned long           tso_packets;
         unsigned long           xmit_more;
+        unsigned int            tx_dropped;
         struct mlx4_bf          bf;
         unsigned long           queue_stopped;
 
@@ -482,8 +483,6 @@ struct mlx4_en_priv {
         struct mlx4_en_port_profile *prof;
         struct net_device *dev;
         unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-        struct net_device_stats stats;
-        struct net_device_stats ret_stats;
         struct mlx4_en_port_state port_state;
         spinlock_t stats_lock;
         struct ethtool_flow_id ethtool_rules[MAX_NUM_OF_FS_RULES];
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index b3cc3ab63799..6fc156a3918d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -205,7 +205,9 @@ int mlx4_bf_alloc(struct mlx4_dev *dev, struct mlx4_bf *bf, int node)
                         goto free_uar;
                 }
 
-                uar->bf_map = io_mapping_map_wc(priv->bf_mapping, uar->index << PAGE_SHIFT);
+                uar->bf_map = io_mapping_map_wc(priv->bf_mapping,
+                                                uar->index << PAGE_SHIFT,
+                                                PAGE_SIZE);
                 if (!uar->bf_map) {
                         err = -ENOMEM;
                         goto unamp_uar;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index fd4392999eee..f5c8d5db25a8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3192,10 +3192,7 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
         flush_workqueue(priv->wq);
         if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) {
                 netif_device_detach(netdev);
-                mutex_lock(&priv->state_lock);
-                if (test_bit(MLX5E_STATE_OPENED, &priv->state))
-                        mlx5e_close_locked(netdev);
-                mutex_unlock(&priv->state_lock);
+                mlx5e_close(netdev);
         } else {
                 unregister_netdev(netdev);
         }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index 229ab16fb8d3..b000ddc29553 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -317,7 +317,8 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb)
         while ((sq->pc & wq->sz_m1) > sq->edge)
                 mlx5e_send_nop(sq, false);
 
-        sq->bf_budget = bf ? sq->bf_budget - 1 : 0;
+        if (bf)
+                sq->bf_budget--;
 
         sq->stats.packets++;
         sq->stats.bytes += num_bytes;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index b84a6918a700..aebbd6ccb9fe 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -383,7 +383,7 @@ __esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u32 vport, bool rx_rule,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
                                    0, &dest);
-        if (IS_ERR_OR_NULL(flow_rule)) {
+        if (IS_ERR(flow_rule)) {
                 pr_warn(
                         "FDB: Failed to add flow rule: dmac_v(%pM) dmac_c(%pM) -> vport(%d), err(%ld)\n",
                          dmac_v, dmac_c, vport, PTR_ERR(flow_rule));
@@ -457,7 +457,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
 
         table_size = BIT(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));
         fdb = mlx5_create_flow_table(root_ns, 0, table_size, 0);
-        if (IS_ERR_OR_NULL(fdb)) {
+        if (IS_ERR(fdb)) {
                 err = PTR_ERR(fdb);
                 esw_warn(dev, "Failed to create FDB Table err %d\n", err);
                 goto out;
@@ -474,7 +474,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, table_size - 3);
         eth_broadcast_addr(dmac);
         g = mlx5_create_flow_group(fdb, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create flow group err(%d)\n", err);
                 goto out;
@@ -489,7 +489,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
         eth_zero_addr(dmac);
         dmac[0] = 0x01;
         g = mlx5_create_flow_group(fdb, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create allmulti flow group err(%d)\n", err);
                 goto out;
@@ -506,7 +506,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
         MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, table_size - 1);
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, table_size - 1);
         g = mlx5_create_flow_group(fdb, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create promisc flow group err(%d)\n", err);
                 goto out;
@@ -529,7 +529,7 @@ out:
                 }
         }
 
-        kfree(flow_group_in);
+        kvfree(flow_group_in);
         return err;
 }
 
@@ -651,6 +651,7 @@ static void update_allmulti_vports(struct mlx5_eswitch *esw,
                                         esw_fdb_set_vport_rule(esw,
                                                                mac,
                                                                vport_idx);
+                        iter_vaddr->mc_promisc = true;
                         break;
                 case MLX5_ACTION_DEL:
                         if (!iter_vaddr)
@@ -1060,7 +1061,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
                 return;
 
         acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);
-        if (IS_ERR_OR_NULL(acl)) {
+        if (IS_ERR(acl)) {
                 err = PTR_ERR(acl);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] egress flow Table, err(%d)\n",
                          vport->vport, err);
@@ -1075,7 +1076,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);
 
         vlan_grp = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(vlan_grp)) {
+        if (IS_ERR(vlan_grp)) {
                 err = PTR_ERR(vlan_grp);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] egress allowed vlans flow group, err(%d)\n",
                          vport->vport, err);
@@ -1086,7 +1087,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 1);
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);
         drop_grp = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(drop_grp)) {
+        if (IS_ERR(drop_grp)) {
                 err = PTR_ERR(drop_grp);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] egress drop flow group, err(%d)\n",
                          vport->vport, err);
@@ -1097,7 +1098,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
         vport->egress.drop_grp = drop_grp;
         vport->egress.allowed_vlans_grp = vlan_grp;
 out:
-        kfree(flow_group_in);
+        kvfree(flow_group_in);
         if (err && !IS_ERR_OR_NULL(vlan_grp))
                 mlx5_destroy_flow_group(vlan_grp);
         if (err && !IS_ERR_OR_NULL(acl))
@@ -1174,7 +1175,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
                 return;
 
         acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);
-        if (IS_ERR_OR_NULL(acl)) {
+        if (IS_ERR(acl)) {
                 err = PTR_ERR(acl);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress flow Table, err(%d)\n",
                          vport->vport, err);
@@ -1192,7 +1193,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged spoofchk flow group, err(%d)\n",
                          vport->vport, err);
@@ -1207,7 +1208,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged flow group, err(%d)\n",
                          vport->vport, err);
@@ -1223,7 +1224,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 2);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress spoofchk flow group, err(%d)\n",
                          vport->vport, err);
@@ -1236,7 +1237,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 3);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress drop flow group, err(%d)\n",
                          vport->vport, err);
@@ -1259,7 +1260,7 @@ out:
                         mlx5_destroy_flow_table(vport->ingress.acl);
         }
 
-        kfree(flow_group_in);
+        kvfree(flow_group_in);
 }
 
 static void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,
@@ -1363,7 +1364,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_ALLOW,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->ingress.allow_rule)) {
+        if (IS_ERR(vport->ingress.allow_rule)) {
                 err = PTR_ERR(vport->ingress.allow_rule);
                 pr_warn("vport[%d] configure ingress allow rule, err(%d)\n",
                         vport->vport, err);
@@ -1380,7 +1381,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_DROP,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->ingress.drop_rule)) {
+        if (IS_ERR(vport->ingress.drop_rule)) {
                 err = PTR_ERR(vport->ingress.drop_rule);
                 pr_warn("vport[%d] configure ingress drop rule, err(%d)\n",
                         vport->vport, err);
@@ -1439,7 +1440,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_ALLOW,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->egress.allowed_vlan)) {
+        if (IS_ERR(vport->egress.allowed_vlan)) {
                 err = PTR_ERR(vport->egress.allowed_vlan);
                 pr_warn("vport[%d] configure egress allowed vlan rule failed, err(%d)\n",
                         vport->vport, err);
@@ -1457,7 +1458,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_DROP,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->egress.drop_rule)) {
+        if (IS_ERR(vport->egress.drop_rule)) {
                 err = PTR_ERR(vport->egress.drop_rule);
                 pr_warn("vport[%d] configure egress drop rule failed, err(%d)\n",
                         vport->vport, err);
@@ -1491,14 +1492,11 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, int vport_num,
 
         /* Sync with current vport context */
         vport->enabled_events = enable_events;
-        esw_vport_change_handle_locked(vport);
-
         vport->enabled = true;
 
         /* only PF is trusted by default */
         vport->trusted = (vport_num) ? false : true;
-
-        arm_vport_context_events_cmd(esw->dev, vport_num, enable_events);
+        esw_vport_change_handle_locked(vport);
 
         esw->enabled_vports++;
         esw_debug(esw->dev, "Enabled VPORT(%d)\n", vport_num);
@@ -1728,11 +1726,24 @@ void mlx5_eswitch_vport_event(struct mlx5_eswitch *esw, struct mlx5_eqe *eqe)
         (esw && MLX5_CAP_GEN(esw->dev, vport_group_manager) && mlx5_core_is_pf(esw->dev))
 #define LEGAL_VPORT(esw, vport) (vport >= 0 && vport < esw->total_vports)
 
+static void node_guid_gen_from_mac(u64 *node_guid, u8 mac[ETH_ALEN])
+{
+        ((u8 *)node_guid)[7] = mac[0];
+        ((u8 *)node_guid)[6] = mac[1];
+        ((u8 *)node_guid)[5] = mac[2];
+        ((u8 *)node_guid)[4] = 0xff;
+        ((u8 *)node_guid)[3] = 0xfe;
+        ((u8 *)node_guid)[2] = mac[3];
+        ((u8 *)node_guid)[1] = mac[4];
+        ((u8 *)node_guid)[0] = mac[5];
+}
+
 int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
                                int vport, u8 mac[ETH_ALEN])
 {
-        int err = 0;
         struct mlx5_vport *evport;
+        u64 node_guid;
+        int err = 0;
 
         if (!ESW_ALLOWED(esw))
                 return -EPERM;
@@ -1756,11 +1767,17 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
                 return err;
         }
 
+        node_guid_gen_from_mac(&node_guid, mac);
+        err = mlx5_modify_nic_vport_node_guid(esw->dev, vport, node_guid);
+        if (err)
+                mlx5_core_warn(esw->dev,
+                               "Failed to set vport %d node guid, err = %d. RDMA_CM will not function properly for this VF.\n",
+                               vport, err);
+
         mutex_lock(&esw->state_lock);
         if (evport->enabled)
                 err = esw_vport_ingress_config(esw, evport);
         mutex_unlock(&esw->state_lock);
-
         return err;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 8b5f0b2c0d5c..e912a3d2505e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1292,8 +1292,8 @@ static int update_root_ft_destroy(struct mlx5_flow_table *ft)
                                        ft->id);
                         return err;
                 }
-                root->root_ft = new_root_ft;
         }
+        root->root_ft = new_root_ft;
         return 0;
 }
 
@@ -1767,6 +1767,9 @@ static void cleanup_root_ns(struct mlx5_core_dev *dev)
 
 void mlx5_cleanup_fs(struct mlx5_core_dev *dev)
 {
+        if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
+                return;
+
         cleanup_root_ns(dev);
         cleanup_single_prio_root_ns(dev, dev->priv.fdb_root_ns);
         cleanup_single_prio_root_ns(dev, dev->priv.esw_egress_root_ns);
@@ -1828,29 +1831,36 @@ int mlx5_init_fs(struct mlx5_core_dev *dev)
 {
         int err = 0;
 
+        if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
+                return 0;
+
         err = mlx5_init_fc_stats(dev);
         if (err)
                 return err;
 
-        if (MLX5_CAP_GEN(dev, nic_flow_table)) {
+        if (MLX5_CAP_GEN(dev, nic_flow_table) &&
+            MLX5_CAP_FLOWTABLE_NIC_RX(dev, ft_support)) {
                 err = init_root_ns(dev);
                 if (err)
                         goto err;
         }
+
         if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
-                err = init_fdb_root_ns(dev);
-                if (err)
-                        goto err;
-        }
-        if (MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support)) {
-                err = init_egress_acl_root_ns(dev);
-                if (err)
-                        goto err;
-        }
-        if (MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support)) {
-                err = init_ingress_acl_root_ns(dev);
-                if (err)
-                        goto err;
+                if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {
+                        err = init_fdb_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
+                if (MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support)) {
+                        err = init_egress_acl_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
+                if (MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support)) {
+                        err = init_ingress_acl_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
         }
 
         return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
index b720a274220d..b82d65802d96 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
@@ -418,7 +418,7 @@ int mlx5_core_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn)
         if (out.hdr.status)
                 err = mlx5_cmd_status_to_err(&out.hdr);
         else
-                *xrcdn = be32_to_cpu(out.xrcdn);
+                *xrcdn = be32_to_cpu(out.xrcdn) & 0xffffff;
 
         return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index b69dadcfb897..daf44cd4c566 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -508,6 +508,44 @@ int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid)
 }
 EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_node_guid);
 
+int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
+                                    u32 vport, u64 node_guid)
+{
+        int inlen = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in);
+        void *nic_vport_context;
+        u8 *guid;
+        void *in;
+        int err;
+
+        if (!vport)
+                return -EINVAL;
+        if (!MLX5_CAP_GEN(mdev, vport_group_manager))
+                return -EACCES;
+        if (!MLX5_CAP_ESW(mdev, nic_vport_node_guid_modify))
+                return -ENOTSUPP;
+
+        in = mlx5_vzalloc(inlen);
+        if (!in)
+                return -ENOMEM;
+
+        MLX5_SET(modify_nic_vport_context_in, in,
+                 field_select.node_guid, 1);
+        MLX5_SET(modify_nic_vport_context_in, in, vport_number, vport);
+        MLX5_SET(modify_nic_vport_context_in, in, other_vport, !!vport);
+
+        nic_vport_context = MLX5_ADDR_OF(modify_nic_vport_context_in,
+                                         in, nic_vport_context);
+        guid = MLX5_ADDR_OF(nic_vport_context, nic_vport_context,
+                            node_guid);
+        MLX5_SET64(nic_vport_context, nic_vport_context, node_guid, node_guid);
+
+        err = mlx5_modify_nic_vport_context(mdev, in, inlen);
+
+        kvfree(in);
+
+        return err;
+}
+
 int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
                                         u16 *qkey_viol_cntr)
 {
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 4a7273771028..6f9e3ddff4a8 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -247,15 +247,23 @@ static int mlxsw_sp_port_mtu_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 mtu)
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pmtu), pmtu_pl);
 }
 
-static int mlxsw_sp_port_swid_set(struct mlxsw_sp_port *mlxsw_sp_port, u8 swid)
+static int __mlxsw_sp_port_swid_set(struct mlxsw_sp *mlxsw_sp, u8 local_port,
+                                    u8 swid)
 {
-        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
         char pspa_pl[MLXSW_REG_PSPA_LEN];
 
-        mlxsw_reg_pspa_pack(pspa_pl, swid, mlxsw_sp_port->local_port);
+        mlxsw_reg_pspa_pack(pspa_pl, swid, local_port);
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pspa), pspa_pl);
 }
 
+static int mlxsw_sp_port_swid_set(struct mlxsw_sp_port *mlxsw_sp_port, u8 swid)
+{
+        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+
+        return __mlxsw_sp_port_swid_set(mlxsw_sp, mlxsw_sp_port->local_port,
+                                        swid);
+}
+
 static int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port,
                                      bool enable)
 {
@@ -305,9 +313,9 @@ mlxsw_sp_port_system_port_mapping_set(struct mlxsw_sp_port *mlxsw_sp_port)
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sspr), sspr_pl);
 }
 
-static int __mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp,
-                                           u8 local_port, u8 *p_module,
-                                           u8 *p_width, u8 *p_lane)
+static int mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp,
+                                         u8 local_port, u8 *p_module,
+                                         u8 *p_width, u8 *p_lane)
 {
         char pmlp_pl[MLXSW_REG_PMLP_LEN];
         int err;
@@ -322,16 +330,6 @@ static int __mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp,
         return 0;
 }
 
-static int mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp,
-                                         u8 local_port, u8 *p_module,
-                                         u8 *p_width)
-{
-        u8 lane;
-
-        return __mlxsw_sp_port_module_info_get(mlxsw_sp, local_port, p_module,
-                                               p_width, &lane);
-}
-
 static int mlxsw_sp_port_module_map(struct mlxsw_sp *mlxsw_sp, u8 local_port,
                                     u8 module, u8 width, u8 lane)
 {
@@ -949,17 +947,11 @@ static int mlxsw_sp_port_get_phys_port_name(struct net_device *dev, char *name,
                                             size_t len)
 {
         struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
-        u8 module, width, lane;
+        u8 module = mlxsw_sp_port->mapping.module;
+        u8 width = mlxsw_sp_port->mapping.width;
+        u8 lane = mlxsw_sp_port->mapping.lane;
         int err;
 
-        err = __mlxsw_sp_port_module_info_get(mlxsw_sp_port->mlxsw_sp,
-                                              mlxsw_sp_port->local_port,
-                                              &module, &width, &lane);
-        if (err) {
-                netdev_err(dev, "Failed to retrieve module information\n");
-                return err;
-        }
-
         if (!mlxsw_sp_port->split)
                 err = snprintf(name, len, "p%d", module + 1);
         else
@@ -1681,8 +1673,8 @@ static int mlxsw_sp_port_ets_init(struct mlxsw_sp_port *mlxsw_sp_port)
         return 0;
 }
 
-static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,
-                                  bool split, u8 module, u8 width)
+static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,
+                                bool split, u8 module, u8 width, u8 lane)
 {
         struct mlxsw_sp_port *mlxsw_sp_port;
         struct net_device *dev;
@@ -1697,6 +1689,9 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,
         mlxsw_sp_port->mlxsw_sp = mlxsw_sp;
         mlxsw_sp_port->local_port = local_port;
         mlxsw_sp_port->split = split;
+        mlxsw_sp_port->mapping.module = module;
+        mlxsw_sp_port->mapping.width = width;
+        mlxsw_sp_port->mapping.lane = lane;
         bytes = DIV_ROUND_UP(VLAN_N_VID, BITS_PER_BYTE);
         mlxsw_sp_port->active_vlans = kzalloc(bytes, GFP_KERNEL);
         if (!mlxsw_sp_port->active_vlans) {
@@ -1839,28 +1834,6 @@ err_port_active_vlans_alloc:
         return err;
 }
 
-static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,
-                                bool split, u8 module, u8 width, u8 lane)
-{
-        int err;
-
-        err = mlxsw_sp_port_module_map(mlxsw_sp, local_port, module, width,
-                                       lane);
-        if (err)
-                return err;
-
-        err = __mlxsw_sp_port_create(mlxsw_sp, local_port, split, module,
-                                     width);
-        if (err)
-                goto err_port_create;
-
-        return 0;
-
-err_port_create:
-        mlxsw_sp_port_module_unmap(mlxsw_sp, local_port);
-        return err;
-}
-
 static void mlxsw_sp_port_vports_fini(struct mlxsw_sp_port *mlxsw_sp_port)
 {
         struct net_device *dev = mlxsw_sp_port->dev;
@@ -1909,8 +1882,8 @@ static void mlxsw_sp_ports_remove(struct mlxsw_sp *mlxsw_sp)
 
 static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)
 {
+        u8 module, width, lane;
         size_t alloc_size;
-        u8 module, width;
         int i;
         int err;
 
@@ -1921,13 +1894,14 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)
 
         for (i = 1; i < MLXSW_PORT_MAX_PORTS; i++) {
                 err = mlxsw_sp_port_module_info_get(mlxsw_sp, i, &module,
-                                                    &width);
+                                                    &width, &lane);
                 if (err)
                         goto err_port_module_info_get;
                 if (!width)
                         continue;
                 mlxsw_sp->port_to_module[i] = module;
-                err = __mlxsw_sp_port_create(mlxsw_sp, i, false, module, width);
+                err = mlxsw_sp_port_create(mlxsw_sp, i, false, module, width,
+                                           lane);
                 if (err)
                         goto err_port_create;
         }
@@ -1948,12 +1922,85 @@ static u8 mlxsw_sp_cluster_base_port_get(u8 local_port)
         return local_port - offset;
 }
 
+static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,
+                                      u8 module, unsigned int count)
+{
+        u8 width = MLXSW_PORT_MODULE_MAX_WIDTH / count;
+        int err, i;
+
+        for (i = 0; i < count; i++) {
+                err = mlxsw_sp_port_module_map(mlxsw_sp, base_port + i, module,
+                                               width, i * width);
+                if (err)
+                        goto err_port_module_map;
+        }
+
+        for (i = 0; i < count; i++) {
+                err = __mlxsw_sp_port_swid_set(mlxsw_sp, base_port + i, 0);
+                if (err)
+                        goto err_port_swid_set;
+        }
+
+        for (i = 0; i < count; i++) {
+                err = mlxsw_sp_port_create(mlxsw_sp, base_port + i, true,
+                                           module, width, i * width);
+                if (err)
+                        goto err_port_create;
+        }
+
+        return 0;
+
+err_port_create:
+        for (i--; i >= 0; i--)
+                mlxsw_sp_port_remove(mlxsw_sp, base_port + i);
+        i = count;
+err_port_swid_set:
+        for (i--; i >= 0; i--)
+                __mlxsw_sp_port_swid_set(mlxsw_sp, base_port + i,
+                                         MLXSW_PORT_SWID_DISABLED_PORT);
+        i = count;
+err_port_module_map:
+        for (i--; i >= 0; i--)
+                mlxsw_sp_port_module_unmap(mlxsw_sp, base_port + i);
+        return err;
+}
+
+static void mlxsw_sp_port_unsplit_create(struct mlxsw_sp *mlxsw_sp,
+                                         u8 base_port, unsigned int count)
+{
+        u8 local_port, module, width = MLXSW_PORT_MODULE_MAX_WIDTH;
+        int i;
+
+        /* Split by four means we need to re-create two ports, otherwise
+         * only one.
+         */
+        count = count / 2;
+
+        for (i = 0; i < count; i++) {
+                local_port = base_port + i * 2;
+                module = mlxsw_sp->port_to_module[local_port];
+
+                mlxsw_sp_port_module_map(mlxsw_sp, local_port, module, width,
+                                         0);
+        }
+
+        for (i = 0; i < count; i++)
+                __mlxsw_sp_port_swid_set(mlxsw_sp, base_port + i * 2, 0);
+
+        for (i = 0; i < count; i++) {
+                local_port = base_port + i * 2;
+                module = mlxsw_sp->port_to_module[local_port];
+
+                mlxsw_sp_port_create(mlxsw_sp, local_port, false, module,
+                                     width, 0);
+        }
+}
+
 static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
                                unsigned int count)
 {
         struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
         struct mlxsw_sp_port *mlxsw_sp_port;
-        u8 width = MLXSW_PORT_MODULE_MAX_WIDTH / count;
         u8 module, cur_width, base_port;
         int i;
         int err;
@@ -1965,18 +2012,14 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
                 return -EINVAL;
         }
 
+        module = mlxsw_sp_port->mapping.module;
+        cur_width = mlxsw_sp_port->mapping.width;
+
         if (count != 2 && count != 4) {
                 netdev_err(mlxsw_sp_port->dev, "Port can only be split into 2 or 4 ports\n");
                 return -EINVAL;
         }
 
-        err = mlxsw_sp_port_module_info_get(mlxsw_sp, local_port, &module,
-                                            &cur_width);
-        if (err) {
-                netdev_err(mlxsw_sp_port->dev, "Failed to get port's width\n");
-                return err;
-        }
-
         if (cur_width != MLXSW_PORT_MODULE_MAX_WIDTH) {
                 netdev_err(mlxsw_sp_port->dev, "Port cannot be split further\n");
                 return -EINVAL;
@@ -2001,25 +2044,16 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
         for (i = 0; i < count; i++)
                 mlxsw_sp_port_remove(mlxsw_sp, base_port + i);
 
-        for (i = 0; i < count; i++) {
-                err = mlxsw_sp_port_create(mlxsw_sp, base_port + i, true,
-                                           module, width, i * width);
-                if (err) {
-                        dev_err(mlxsw_sp->bus_info->dev, "Failed to create split port\n");
-                        goto err_port_create;
-                }
+        err = mlxsw_sp_port_split_create(mlxsw_sp, base_port, module, count);
+        if (err) {
+                dev_err(mlxsw_sp->bus_info->dev, "Failed to create split ports\n");
+                goto err_port_split_create;
         }
 
         return 0;
 
-err_port_create:
-        for (i--; i >= 0; i--)
-                mlxsw_sp_port_remove(mlxsw_sp, base_port + i);
-        for (i = 0; i < count / 2; i++) {
-                module = mlxsw_sp->port_to_module[base_port + i * 2];
-                mlxsw_sp_port_create(mlxsw_sp, base_port + i * 2, false,
-                                     module, MLXSW_PORT_MODULE_MAX_WIDTH, 0);
-        }
+err_port_split_create:
+        mlxsw_sp_port_unsplit_create(mlxsw_sp, base_port, count);
         return err;
 }
 
@@ -2027,10 +2061,9 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port)
 {
         struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
         struct mlxsw_sp_port *mlxsw_sp_port;
-        u8 module, cur_width, base_port;
+        u8 cur_width, base_port;
         unsigned int count;
         int i;
-        int err;
 
         mlxsw_sp_port = mlxsw_sp->ports[local_port];
         if (!mlxsw_sp_port) {
@@ -2044,12 +2077,7 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port)
                 return -EINVAL;
         }
 
-        err = mlxsw_sp_port_module_info_get(mlxsw_sp, local_port, &module,
-                                            &cur_width);
-        if (err) {
-                netdev_err(mlxsw_sp_port->dev, "Failed to get port's width\n");
-                return err;
-        }
+        cur_width = mlxsw_sp_port->mapping.width;
         count = cur_width == 1 ? 4 : 2;
 
         base_port = mlxsw_sp_cluster_base_port_get(local_port);
@@ -2061,14 +2089,7 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port)
         for (i = 0; i < count; i++)
                 mlxsw_sp_port_remove(mlxsw_sp, base_port + i);
 
-        for (i = 0; i < count / 2; i++) {
-                module = mlxsw_sp->port_to_module[base_port + i * 2];
-                err = mlxsw_sp_port_create(mlxsw_sp, base_port + i * 2, false,
-                                           module, MLXSW_PORT_MODULE_MAX_WIDTH,
-                                           0);
-                if (err)
-                        dev_err(mlxsw_sp->bus_info->dev, "Failed to reinstantiate port\n");
-        }
+        mlxsw_sp_port_unsplit_create(mlxsw_sp, base_port, count);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index e2c022d3e2f3..13b30eaa13d4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -229,6 +229,11 @@ struct mlxsw_sp_port {
                 struct ieee_maxrate *maxrate;
                 struct ieee_pfc *pfc;
         } dcb;
+        struct {
+                u8 module;
+                u8 width;
+                u8 lane;
+        } mapping;
         /* 802.1Q bridge VLANs */
         unsigned long *active_vlans;
         unsigned long *untagged_vlans;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index cbf58e1f9333..21ec1c2df2c7 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -192,9 +192,10 @@ qed_dcbx_process_tlv(struct qed_hwfn *p_hwfn,
                      struct dcbx_app_priority_entry *p_tbl,
                      u32 pri_tc_tbl, int count, bool dcbx_enabled)
 {
-        u8 tc, priority, priority_map;
+        u8 tc, priority_map;
         enum dcbx_protocol_type type;
         u16 protocol_id;
+        int priority;
         bool enable;
         int i;
 
@@ -221,7 +222,7 @@ qed_dcbx_process_tlv(struct qed_hwfn *p_hwfn,
                          * indication, but we only got here if there was an
                          * app tlv for the protocol, so dcbx must be enabled.
                          */
-                        enable = !!(type == DCBX_PROTOCOL_ETH);
+                        enable = !(type == DCBX_PROTOCOL_ETH);
 
                         qed_dcbx_update_app_info(p_data, p_hwfn, enable, true,
                                                  priority, tc, type);
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 089016f46f26..2d89e8c16b32 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -155,12 +155,14 @@ void qed_resc_free(struct qed_dev *cdev)
         }
 }
 
-static int qed_init_qm_info(struct qed_hwfn *p_hwfn)
+static int qed_init_qm_info(struct qed_hwfn *p_hwfn, bool b_sleepable)
 {
         u8 num_vports, vf_offset = 0, i, vport_id, num_ports, curr_queue = 0;
         struct qed_qm_info *qm_info = &p_hwfn->qm_info;
         struct init_qm_port_params *p_qm_port;
         u16 num_pqs, multi_cos_tcs = 1;
+        u8 pf_wfq = qm_info->pf_wfq;
+        u32 pf_rl = qm_info->pf_rl;
         u16 num_vfs = 0;
 
 #ifdef CONFIG_QED_SRIOV
@@ -182,23 +184,28 @@ static int qed_init_qm_info(struct qed_hwfn *p_hwfn)
 
         /* PQs will be arranged as follows: First per-TC PQ then pure-LB quete.
          */
-        qm_info->qm_pq_params = kzalloc(sizeof(*qm_info->qm_pq_params) *
-                                        num_pqs, GFP_KERNEL);
+        qm_info->qm_pq_params = kcalloc(num_pqs,
+                                        sizeof(struct init_qm_pq_params),
+                                        b_sleepable ? GFP_KERNEL : GFP_ATOMIC);
         if (!qm_info->qm_pq_params)
                 goto alloc_err;
 
-        qm_info->qm_vport_params = kzalloc(sizeof(*qm_info->qm_vport_params) *
-                                           num_vports, GFP_KERNEL);
+        qm_info->qm_vport_params = kcalloc(num_vports,
+                                           sizeof(struct init_qm_vport_params),
+                                           b_sleepable ? GFP_KERNEL
+                                                       : GFP_ATOMIC);
         if (!qm_info->qm_vport_params)
                 goto alloc_err;
 
-        qm_info->qm_port_params = kzalloc(sizeof(*qm_info->qm_port_params) *
-                                          MAX_NUM_PORTS, GFP_KERNEL);
+        qm_info->qm_port_params = kcalloc(MAX_NUM_PORTS,
+                                          sizeof(struct init_qm_port_params),
+                                          b_sleepable ? GFP_KERNEL
+                                                      : GFP_ATOMIC);
         if (!qm_info->qm_port_params)
                 goto alloc_err;
 
-        qm_info->wfq_data = kcalloc(num_vports, sizeof(*qm_info->wfq_data),
-                                    GFP_KERNEL);
+        qm_info->wfq_data = kcalloc(num_vports, sizeof(struct qed_wfq_data),
+                                    b_sleepable ? GFP_KERNEL : GFP_ATOMIC);
         if (!qm_info->wfq_data)
                 goto alloc_err;
 
@@ -264,10 +271,10 @@ static int qed_init_qm_info(struct qed_hwfn *p_hwfn)
         for (i = 0; i < qm_info->num_vports; i++)
                 qm_info->qm_vport_params[i].vport_wfq = 1;
 
-        qm_info->pf_wfq = 0;
-        qm_info->pf_rl = 0;
         qm_info->vport_rl_en = 1;
         qm_info->vport_wfq_en = 1;
+        qm_info->pf_rl = pf_rl;
+        qm_info->pf_wfq = pf_wfq;
 
         return 0;
 
@@ -299,7 +306,7 @@ int qed_qm_reconf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
         qed_qm_info_free(p_hwfn);
 
         /* initialize qed's qm data structure */
-        rc = qed_init_qm_info(p_hwfn);
+        rc = qed_init_qm_info(p_hwfn, false);
         if (rc)
                 return rc;
 
@@ -388,7 +395,7 @@ int qed_resc_alloc(struct qed_dev *cdev)
                         goto alloc_err;
 
                 /* Prepare and process QM requirements */
-                rc = qed_init_qm_info(p_hwfn);
+                rc = qed_init_qm_info(p_hwfn, true);
                 if (rc)
                         goto alloc_err;
 
@@ -581,7 +588,14 @@ static void qed_calc_hw_mode(struct qed_hwfn *p_hwfn)
 
         hw_mode |= 1 << MODE_ASIC;
 
+        if (p_hwfn->cdev->num_hwfns > 1)
+                hw_mode |= 1 << MODE_100G;
+
         p_hwfn->hw_info.hw_mode = hw_mode;
+
+        DP_VERBOSE(p_hwfn, (NETIF_MSG_PROBE | NETIF_MSG_IFUP),
+                   "Configuring function for hw_mode: 0x%08x\n",
+                   p_hwfn->hw_info.hw_mode);
 }
 
 /* Init run time data for all PFs on an engine. */
@@ -821,6 +835,11 @@ int qed_hw_init(struct qed_dev *cdev,
         u32 load_code, param;
         int rc, mfw_rc, i;
 
+        if ((int_mode == QED_INT_MODE_MSI) && (cdev->num_hwfns > 1)) {
+                DP_NOTICE(cdev, "MSI mode is not supported for CMT devices\n");
+                return -EINVAL;
+        }
+
         if (IS_PF(cdev)) {
                 rc = qed_init_fw_data(cdev, bin_fw_data);
                 if (rc != 0)
@@ -2086,6 +2105,13 @@ void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev, u32 min_pf_rate)
 {
         int i;
 
+        if (cdev->num_hwfns > 1) {
+                DP_VERBOSE(cdev,
+                           NETIF_MSG_LINK,
+                           "WFQ configuration is not supported for this device\n");
+                return;
+        }
+
         for_each_hwfn(cdev, i) {
                 struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 8b22f87033ce..61cc6869fa65 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -413,15 +413,17 @@ static int qed_set_int_mode(struct qed_dev *cdev, bool force_mode)
                 /* Fallthrough */
 
         case QED_INT_MODE_MSI:
-                rc = pci_enable_msi(cdev->pdev);
-                if (!rc) {
-                        int_params->out.int_mode = QED_INT_MODE_MSI;
-                        goto out;
-                }
+                if (cdev->num_hwfns == 1) {
+                        rc = pci_enable_msi(cdev->pdev);
+                        if (!rc) {
+                                int_params->out.int_mode = QED_INT_MODE_MSI;
+                                goto out;
+                        }
 
-                DP_NOTICE(cdev, "Failed to enable MSI\n");
-                if (force_mode)
-                        goto out;
+                        DP_NOTICE(cdev, "Failed to enable MSI\n");
+                        if (force_mode)
+                                goto out;
+                }
                 /* Fallthrough */
 
         case QED_INT_MODE_INTA:
@@ -1103,6 +1105,39 @@ static int qed_get_port_type(u32 media_type)
         return port_type;
 }
 
+static int qed_get_link_data(struct qed_hwfn *hwfn,
+                             struct qed_mcp_link_params *params,
+                             struct qed_mcp_link_state *link,
+                             struct qed_mcp_link_capabilities *link_caps)
+{
+        void *p;
+
+        if (!IS_PF(hwfn->cdev)) {
+                qed_vf_get_link_params(hwfn, params);
+                qed_vf_get_link_state(hwfn, link);
+                qed_vf_get_link_caps(hwfn, link_caps);
+
+                return 0;
+        }
+
+        p = qed_mcp_get_link_params(hwfn);
+        if (!p)
+                return -ENXIO;
+        memcpy(params, p, sizeof(*params));
+
+        p = qed_mcp_get_link_state(hwfn);
+        if (!p)
+                return -ENXIO;
+        memcpy(link, p, sizeof(*link));
+
+        p = qed_mcp_get_link_capabilities(hwfn);
+        if (!p)
+                return -ENXIO;
+        memcpy(link_caps, p, sizeof(*link_caps));
+
+        return 0;
+}
+
 static void qed_fill_link(struct qed_hwfn *hwfn,
                           struct qed_link_output *if_link)
 {
@@ -1114,15 +1149,9 @@ static void qed_fill_link(struct qed_hwfn *hwfn,
         memset(if_link, 0, sizeof(*if_link));
 
         /* Prepare source inputs */
-        if (IS_PF(hwfn->cdev)) {
-                memcpy(&params, qed_mcp_get_link_params(hwfn), sizeof(params));
-                memcpy(&link, qed_mcp_get_link_state(hwfn), sizeof(link));
-                memcpy(&link_caps, qed_mcp_get_link_capabilities(hwfn),
-                       sizeof(link_caps));
-        } else {
-                qed_vf_get_link_params(hwfn, &params);
-                qed_vf_get_link_state(hwfn, &link);
-                qed_vf_get_link_caps(hwfn, &link_caps);
+        if (qed_get_link_data(hwfn, &params, &link, &link_caps)) {
+                dev_warn(&hwfn->cdev->pdev->dev, "no link data available\n");
+                return;
         }
 
         /* Set the link parameters to pass to protocol driver */
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.h b/drivers/net/ethernet/qlogic/qed/qed_sriov.h
index c8667c65e685..c90b2b6ad969 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.h
@@ -12,11 +12,13 @@
 #include "qed_vf.h"
 #define QED_VF_ARRAY_LENGTH (3)
 
+#ifdef CONFIG_QED_SRIOV
 #define IS_VF(cdev)             ((cdev)->b_is_vf)
 #define IS_PF(cdev)             (!((cdev)->b_is_vf))
-#ifdef CONFIG_QED_SRIOV
 #define IS_PF_SRIOV(p_hwfn)     (!!((p_hwfn)->cdev->p_iov_info))
 #else
+#define IS_VF(cdev)             (0)
+#define IS_PF(cdev)             (1)
 #define IS_PF_SRIOV(p_hwfn)     (0)
 #endif
 #define IS_PF_SRIOV_ALLOC(p_hwfn)       (!!((p_hwfn)->pf_iov_info))
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 1bc75358cbc4..ad3cae3b7243 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -230,7 +230,10 @@ static int qede_get_sset_count(struct net_device *dev, int stringset)
         case ETH_SS_PRIV_FLAGS:
                 return QEDE_PRI_FLAG_LEN;
         case ETH_SS_TEST:
-                return QEDE_ETHTOOL_TEST_MAX;
+                if (!IS_VF(edev))
+                        return QEDE_ETHTOOL_TEST_MAX;
+                else
+                        return 0;
         default:
                 DP_VERBOSE(edev, QED_MSG_DEBUG,
                            "Unsupported stringset 0x%08x\n", stringset);
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 337e839ca586..5733d1888223 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -87,7 +87,9 @@ static const struct pci_device_id qede_pci_tbl[] = {
         {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_100), QEDE_PRIVATE_PF},
         {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_50), QEDE_PRIVATE_PF},
         {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_25), QEDE_PRIVATE_PF},
+#ifdef CONFIG_QED_SRIOV
         {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_IOV), QEDE_PRIVATE_VF},
+#endif
         { 0 }
 };
 
@@ -1824,7 +1826,7 @@ static int qede_set_vf_rate(struct net_device *dev, int vfidx,
 {
         struct qede_dev *edev = netdev_priv(dev);
 
-        return edev->ops->iov->set_rate(edev->cdev, vfidx, max_tx_rate,
+        return edev->ops->iov->set_rate(edev->cdev, vfidx, min_tx_rate,
                                         max_tx_rate);
 }
 
@@ -2091,6 +2093,29 @@ static void qede_vlan_mark_nonconfigured(struct qede_dev *edev)
         edev->accept_any_vlan = false;
 }
 
+int qede_set_features(struct net_device *dev, netdev_features_t features)
+{
+        struct qede_dev *edev = netdev_priv(dev);
+        netdev_features_t changes = features ^ dev->features;
+        bool need_reload = false;
+
+        /* No action needed if hardware GRO is disabled during driver load */
+        if (changes & NETIF_F_GRO) {
+                if (dev->features & NETIF_F_GRO)
+                        need_reload = !edev->gro_disable;
+                else
+                        need_reload = edev->gro_disable;
+        }
+
+        if (need_reload && netif_running(edev->ndev)) {
+                dev->features = features;
+                qede_reload(edev, NULL, NULL);
+                return 1;
+        }
+
+        return 0;
+}
+
 #ifdef CONFIG_QEDE_VXLAN
 static void qede_add_vxlan_port(struct net_device *dev,
                                 sa_family_t sa_family, __be16 port)
@@ -2175,6 +2200,7 @@ static const struct net_device_ops qede_netdev_ops = {
 #endif
         .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid,
+        .ndo_set_features = qede_set_features,
         .ndo_get_stats64 = qede_get_stats64,
 #ifdef CONFIG_QED_SRIOV
         .ndo_set_vf_link_state = qede_set_vf_link_state,
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 83d72106471c..fd5d1c93b55b 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4846,7 +4846,6 @@ static void ql_eeh_close(struct net_device *ndev)
         }
 
         /* Disabling the timer */
-        del_timer_sync(&qdev->timer);
         ql_cancel_all_work_sync(qdev);
 
         for (i = 0; i < qdev->rss_ring_count; i++)
@@ -4873,6 +4872,7 @@ static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev,
                 return PCI_ERS_RESULT_CAN_RECOVER;
         case pci_channel_io_frozen:
                 netif_device_detach(ndev);
+                del_timer_sync(&qdev->timer);
                 if (netif_running(ndev))
                         ql_eeh_close(ndev);
                 pci_disable_device(pdev);
@@ -4880,6 +4880,7 @@ static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev,
         case pci_channel_io_perm_failure:
                 dev_err(&pdev->dev,
                         "%s: pci_channel_io_perm_failure.\n", __func__);
+                del_timer_sync(&qdev->timer);
                 ql_eeh_close(ndev);
                 set_bit(QL_EEH_FATAL, &qdev->flags);
                 return PCI_ERS_RESULT_DISCONNECT;
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 1681084cc96f..1f309127457d 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -619,6 +619,17 @@ fail:
         return rc;
 }
 
+static void efx_ef10_forget_old_piobufs(struct efx_nic *efx)
+{
+        struct efx_channel *channel;
+        struct efx_tx_queue *tx_queue;
+
+        /* All our existing PIO buffers went away */
+        efx_for_each_channel(channel, efx)
+                efx_for_each_channel_tx_queue(tx_queue, channel)
+                        tx_queue->piobuf = NULL;
+}
+
 #else /* !EFX_USE_PIO */
 
 static int efx_ef10_alloc_piobufs(struct efx_nic *efx, unsigned int n)
@@ -635,6 +646,10 @@ static void efx_ef10_free_piobufs(struct efx_nic *efx)
 {
 }
 
+static void efx_ef10_forget_old_piobufs(struct efx_nic *efx)
+{
+}
+
 #endif /* EFX_USE_PIO */
 
 static void efx_ef10_remove(struct efx_nic *efx)
@@ -1018,6 +1033,7 @@ static void efx_ef10_reset_mc_allocations(struct efx_nic *efx)
         nic_data->must_realloc_vis = true;
         nic_data->must_restore_filters = true;
         nic_data->must_restore_piobufs = true;
+        efx_ef10_forget_old_piobufs(efx);
         nic_data->rx_rss_context = EFX_EF10_RSS_CONTEXT_INVALID;
 
         /* Driver-created vswitches and vports must be re-created */
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 0705ec869487..097f363f1630 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1726,14 +1726,33 @@ static int efx_probe_filters(struct efx_nic *efx)
 
 #ifdef CONFIG_RFS_ACCEL
         if (efx->type->offload_features & NETIF_F_NTUPLE) {
-                efx->rps_flow_id = kcalloc(efx->type->max_rx_ip_filters,
-                                           sizeof(*efx->rps_flow_id),
-                                           GFP_KERNEL);
-                if (!efx->rps_flow_id) {
+                struct efx_channel *channel;
+                int i, success = 1;
+
+                efx_for_each_channel(channel, efx) {
+                        channel->rps_flow_id =
+                                kcalloc(efx->type->max_rx_ip_filters,
+                                        sizeof(*channel->rps_flow_id),
+                                        GFP_KERNEL);
+                        if (!channel->rps_flow_id)
+                                success = 0;
+                        else
+                                for (i = 0;
+                                     i < efx->type->max_rx_ip_filters;
+                                     ++i)
+                                        channel->rps_flow_id[i] =
+                                                RPS_FLOW_ID_INVALID;
+                }
+
+                if (!success) {
+                        efx_for_each_channel(channel, efx)
+                                kfree(channel->rps_flow_id);
                         efx->type->filter_table_remove(efx);
                         rc = -ENOMEM;
                         goto out_unlock;
                 }
+
+                efx->rps_expire_index = efx->rps_expire_channel = 0;
         }
 #endif
 out_unlock:
@@ -1744,7 +1763,10 @@ out_unlock:
 static void efx_remove_filters(struct efx_nic *efx)
 {
 #ifdef CONFIG_RFS_ACCEL
-        kfree(efx->rps_flow_id);
+        struct efx_channel *channel;
+
+        efx_for_each_channel(channel, efx)
+                kfree(channel->rps_flow_id);
 #endif
         down_write(&efx->filter_sem);
         efx->type->filter_table_remove(efx);
diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c
index 7f295c4d7b80..2a9228a6e4a0 100644
--- a/drivers/net/ethernet/sfc/mcdi_port.c
+++ b/drivers/net/ethernet/sfc/mcdi_port.c
@@ -189,11 +189,12 @@ static u32 mcdi_to_ethtool_cap(u32 media, u32 cap)
 
         case MC_CMD_MEDIA_XFP:
         case MC_CMD_MEDIA_SFP_PLUS:
-                result |= SUPPORTED_FIBRE;
-                break;
-
         case MC_CMD_MEDIA_QSFP_PLUS:
                 result |= SUPPORTED_FIBRE;
+                if (cap & (1 << MC_CMD_PHY_CAP_1000FDX_LBN))
+                        result |= SUPPORTED_1000baseT_Full;
+                if (cap & (1 << MC_CMD_PHY_CAP_10000FDX_LBN))
+                        result |= SUPPORTED_10000baseT_Full;
                 if (cap & (1 << MC_CMD_PHY_CAP_40000FDX_LBN))
                         result |= SUPPORTED_40000baseCR4_Full;
                 break;
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 38c422321cda..d13ddf9703ff 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -403,6 +403,8 @@ enum efx_sync_events_state {
  * @event_test_cpu: Last CPU to handle interrupt or test event for this channel
  * @irq_count: Number of IRQs since last adaptive moderation decision
  * @irq_mod_score: IRQ moderation score
+ * @rps_flow_id: Flow IDs of filters allocated for accelerated RFS,
+ *      indexed by filter ID
  * @n_rx_tobe_disc: Count of RX_TOBE_DISC errors
  * @n_rx_ip_hdr_chksum_err: Count of RX IP header checksum errors
  * @n_rx_tcp_udp_chksum_err: Count of RX TCP and UDP checksum errors
@@ -446,6 +448,8 @@ struct efx_channel {
         unsigned int irq_mod_score;
 #ifdef CONFIG_RFS_ACCEL
         unsigned int rfs_filters_added;
+#define RPS_FLOW_ID_INVALID 0xFFFFFFFF
+        u32 *rps_flow_id;
 #endif
 
         unsigned n_rx_tobe_disc;
@@ -889,9 +893,9 @@ struct vfdi_status;
  * @filter_sem: Filter table rw_semaphore, for freeing the table
  * @filter_lock: Filter table lock, for mere content changes
  * @filter_state: Architecture-dependent filter table state
- * @rps_flow_id: Flow IDs of filters allocated for accelerated RFS,
- *      indexed by filter ID
- * @rps_expire_index: Next index to check for expiry in @rps_flow_id
+ * @rps_expire_channel: Next channel to check for expiry
+ * @rps_expire_index: Next index to check for expiry in
+ *      @rps_expire_channel's @rps_flow_id
  * @active_queues: Count of RX and TX queues that haven't been flushed and drained.
  * @rxq_flush_pending: Count of number of receive queues that need to be flushed.
  *      Decremented when the efx_flush_rx_queue() is called.
@@ -1035,7 +1039,7 @@ struct efx_nic {
         spinlock_t filter_lock;
         void *filter_state;
 #ifdef CONFIG_RFS_ACCEL
-        u32 *rps_flow_id;
+        unsigned int rps_expire_channel;
         unsigned int rps_expire_index;
 #endif
 
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index 8956995b2fe7..02b0b5272c14 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -842,33 +842,18 @@ int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_channel *channel;
         struct efx_filter_spec spec;
-        const __be16 *ports;
-        __be16 ether_type;
-        int nhoff;
+        struct flow_keys fk;
         int rc;
 
-        /* The core RPS/RFS code has already parsed and validated
-         * VLAN, IP and transport headers.  We assume they are in the
-         * header area.
-         */
-
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                const struct vlan_hdr *vh =
-                        (const struct vlan_hdr *)skb->data;
+        if (flow_id == RPS_FLOW_ID_INVALID)
+                return -EINVAL;
 
-                /* We can't filter on the IP 5-tuple and the vlan
-                 * together, so just strip the vlan header and filter
-                 * on the IP part.
-                 */
-                EFX_BUG_ON_PARANOID(skb_headlen(skb) < sizeof(*vh));
-                ether_type = vh->h_vlan_encapsulated_proto;
-                nhoff = sizeof(struct vlan_hdr);
-        } else {
-                ether_type = skb->protocol;
-                nhoff = 0;
-        }
+        if (!skb_flow_dissect_flow_keys(skb, &fk, 0))
+                return -EPROTONOSUPPORT;
 
-        if (ether_type != htons(ETH_P_IP) && ether_type != htons(ETH_P_IPV6))
+        if (fk.basic.n_proto != htons(ETH_P_IP) && fk.basic.n_proto != htons(ETH_P_IPV6))
+                return -EPROTONOSUPPORT;
+        if (fk.control.flags & FLOW_DIS_IS_FRAGMENT)
                 return -EPROTONOSUPPORT;
 
         efx_filter_init_rx(&spec, EFX_FILTER_PRI_HINT,
@@ -878,56 +863,41 @@ int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
                 EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_IP_PROTO |
                 EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_LOC_PORT |
                 EFX_FILTER_MATCH_REM_HOST | EFX_FILTER_MATCH_REM_PORT;
-        spec.ether_type = ether_type;
-
-        if (ether_type == htons(ETH_P_IP)) {
-                const struct iphdr *ip =
-                        (const struct iphdr *)(skb->data + nhoff);
-
-                EFX_BUG_ON_PARANOID(skb_headlen(skb) < nhoff + sizeof(*ip));
-                if (ip_is_fragment(ip))
-                        return -EPROTONOSUPPORT;
-                spec.ip_proto = ip->protocol;
-                spec.rem_host[0] = ip->saddr;
-                spec.loc_host[0] = ip->daddr;
-                EFX_BUG_ON_PARANOID(skb_headlen(skb) < nhoff + 4 * ip->ihl + 4);
-                ports = (const __be16 *)(skb->data + nhoff + 4 * ip->ihl);
+        spec.ether_type = fk.basic.n_proto;
+        spec.ip_proto = fk.basic.ip_proto;
+
+        if (fk.basic.n_proto == htons(ETH_P_IP)) {
+                spec.rem_host[0] = fk.addrs.v4addrs.src;
+                spec.loc_host[0] = fk.addrs.v4addrs.dst;
         } else {
-                const struct ipv6hdr *ip6 =
-                        (const struct ipv6hdr *)(skb->data + nhoff);
-
-                EFX_BUG_ON_PARANOID(skb_headlen(skb) <
-                                    nhoff + sizeof(*ip6) + 4);
-                spec.ip_proto = ip6->nexthdr;
-                memcpy(spec.rem_host, &ip6->saddr, sizeof(ip6->saddr));
-                memcpy(spec.loc_host, &ip6->daddr, sizeof(ip6->daddr));
-                ports = (const __be16 *)(ip6 + 1);
+                memcpy(spec.rem_host, &fk.addrs.v6addrs.src, sizeof(struct in6_addr));
+                memcpy(spec.loc_host, &fk.addrs.v6addrs.dst, sizeof(struct in6_addr));
         }
 
-        spec.rem_port = ports[0];
-        spec.loc_port = ports[1];
+        spec.rem_port = fk.ports.src;
+        spec.loc_port = fk.ports.dst;
 
         rc = efx->type->filter_rfs_insert(efx, &spec);
         if (rc < 0)
                 return rc;
 
         /* Remember this so we can check whether to expire the filter later */
-        efx->rps_flow_id[rc] = flow_id;
-        channel = efx_get_channel(efx, skb_get_rx_queue(skb));
+        channel = efx_get_channel(efx, rxq_index);
+        channel->rps_flow_id[rc] = flow_id;
         ++channel->rfs_filters_added;
 
-        if (ether_type == htons(ETH_P_IP))
+        if (spec.ether_type == htons(ETH_P_IP))
                 netif_info(efx, rx_status, efx->net_dev,
                            "steering %s %pI4:%u:%pI4:%u to queue %u [flow %u filter %d]\n",
                            (spec.ip_proto == IPPROTO_TCP) ? "TCP" : "UDP",
-                           spec.rem_host, ntohs(ports[0]), spec.loc_host,
-                           ntohs(ports[1]), rxq_index, flow_id, rc);
+                           spec.rem_host, ntohs(spec.rem_port), spec.loc_host,
+                           ntohs(spec.loc_port), rxq_index, flow_id, rc);
         else
                 netif_info(efx, rx_status, efx->net_dev,
                            "steering %s [%pI6]:%u:[%pI6]:%u to queue %u [flow %u filter %d]\n",
                            (spec.ip_proto == IPPROTO_TCP) ? "TCP" : "UDP",
-                           spec.rem_host, ntohs(ports[0]), spec.loc_host,
-                           ntohs(ports[1]), rxq_index, flow_id, rc);
+                           spec.rem_host, ntohs(spec.rem_port), spec.loc_host,
+                           ntohs(spec.loc_port), rxq_index, flow_id, rc);
 
         return rc;
 }
@@ -935,24 +905,34 @@ int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
 bool __efx_filter_rfs_expire(struct efx_nic *efx, unsigned int quota)
 {
         bool (*expire_one)(struct efx_nic *efx, u32 flow_id, unsigned int index);
-        unsigned int index, size;
+        unsigned int channel_idx, index, size;
         u32 flow_id;
 
         if (!spin_trylock_bh(&efx->filter_lock))
                 return false;
 
         expire_one = efx->type->filter_rfs_expire_one;
+        channel_idx = efx->rps_expire_channel;
         index = efx->rps_expire_index;
         size = efx->type->max_rx_ip_filters;
         while (quota--) {
-                flow_id = efx->rps_flow_id[index];
-                if (expire_one(efx, flow_id, index))
+                struct efx_channel *channel = efx_get_channel(efx, channel_idx);
+                flow_id = channel->rps_flow_id[index];
+
+                if (flow_id != RPS_FLOW_ID_INVALID &&
+                    expire_one(efx, flow_id, index)) {
                         netif_info(efx, rx_status, efx->net_dev,
-                                   "expired filter %d [flow %u]\n",
-                                   index, flow_id);
-                if (++index == size)
+                                   "expired filter %d [queue %u flow %u]\n",
+                                   index, channel_idx, flow_id);
+                        channel->rps_flow_id[index] = RPS_FLOW_ID_INVALID;
+                }
+                if (++index == size) {
+                        if (++channel_idx == efx->n_channels)
+                                channel_idx = 0;
                         index = 0;
+                }
         }
+        efx->rps_expire_channel = channel_idx;
         efx->rps_expire_index = index;
 
         spin_unlock_bh(&efx->filter_lock);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 4f7283d05588..44da877d2483 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -156,7 +156,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw,
                 struct netdev_hw_addr *ha;
 
                 netdev_for_each_uc_addr(ha, dev) {
-                        dwmac4_set_umac_addr(ioaddr, ha->addr, reg);
+                        dwmac4_set_umac_addr(hw, ha->addr, reg);
                         reg++;
                 }
         }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index eac45d0c75e2..a473c182c91d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3450,8 +3450,6 @@ int stmmac_resume(struct device *dev)
         if (!netif_running(ndev))
                 return 0;
 
-        spin_lock_irqsave(&priv->lock, flags);
-
         /* Power Down bit, into the PM register, is cleared
          * automatically as soon as a magic packet or a Wake-up frame
          * is received. Anyway, it's better to manually clear
@@ -3459,7 +3457,9 @@ int stmmac_resume(struct device *dev)
          * from another devices (e.g. serial console).
          */
         if (device_may_wakeup(priv->device)) {
+                spin_lock_irqsave(&priv->lock, flags);
                 priv->hw->mac->pmt(priv->hw, 0);
+                spin_unlock_irqrestore(&priv->lock, flags);
                 priv->irq_wake = 0;
         } else {
                 pinctrl_pm_select_default_state(priv->device);
@@ -3473,6 +3473,8 @@ int stmmac_resume(struct device *dev)
 
         netif_device_attach(ndev);
 
+        spin_lock_irqsave(&priv->lock, flags);
+
         priv->cur_rx = 0;
         priv->dirty_rx = 0;
         priv->dirty_tx = 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 3f83c369f56c..ec295851812b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -297,7 +297,7 @@ int stmmac_mdio_register(struct net_device *ndev)
                 return -ENOMEM;
 
         if (mdio_bus_data->irqs)
-                memcpy(new_bus->irq, mdio_bus_data, sizeof(new_bus->irq));
+                memcpy(new_bus->irq, mdio_bus_data->irqs, sizeof(new_bus->irq));
 
 #ifdef CONFIG_OF
         if (priv->device->of_node)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 4b08a2f52b3e..e6bb0ecb12c7 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1339,7 +1339,7 @@ static int cpsw_ndo_open(struct net_device *ndev)
         if (priv->coal_intvl != 0) {
                 struct ethtool_coalesce coal;
 
-                coal.rx_coalesce_usecs = (priv->coal_intvl << 4);
+                coal.rx_coalesce_usecs = priv->coal_intvl;
                 cpsw_set_coalesce(ndev, &coal);
         }
 
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index a0f64cba86ba..2ace126533cd 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -990,7 +990,7 @@ static void team_port_disable(struct team *team,
 #define TEAM_ENC_FEATURES       (NETIF_F_HW_CSUM | NETIF_F_SG | \
                                  NETIF_F_RXCSUM | NETIF_F_ALL_TSO)
 
-static void __team_compute_features(struct team *team)
+static void ___team_compute_features(struct team *team)
 {
         struct team_port *port;
         u32 vlan_features = TEAM_VLAN_FEATURES & NETIF_F_ALL_FOR_ALL;
@@ -1021,15 +1021,20 @@ static void __team_compute_features(struct team *team)
         team->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
         if (dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM))
                 team->dev->priv_flags |= IFF_XMIT_DST_RELEASE;
+}
 
+static void __team_compute_features(struct team *team)
+{
+        ___team_compute_features(team);
         netdev_change_features(team->dev);
 }
 
 static void team_compute_features(struct team *team)
 {
         mutex_lock(&team->lock);
-        __team_compute_features(team);
+        ___team_compute_features(team);
         mutex_unlock(&team->lock);
+        netdev_change_features(team->dev);
 }
 
 static int team_port_enter(struct team *team, struct team_port *port)
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 36cd7f016a8d..9bbe0161a2f4 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -473,7 +473,7 @@ static void read_bulk_callback(struct urb *urb)
                 goto goon;
         }
 
-        if (!count || count < 4)
+        if (count < 4)
                 goto goon;
 
         rx_status = buf[count - 2];
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index d9d2806a47b1..dc989a8b5afb 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -61,6 +61,8 @@
 #define SUSPEND_ALLMODES                (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
                                          SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
 
+#define CARRIER_CHECK_DELAY (2 * HZ)
+
 struct smsc95xx_priv {
         u32 mac_cr;
         u32 hash_hi;
@@ -69,6 +71,9 @@ struct smsc95xx_priv {
         spinlock_t mac_cr_lock;
         u8 features;
         u8 suspend_flags;
+        bool link_ok;
+        struct delayed_work carrier_check;
+        struct usbnet *dev;
 };
 
 static bool turbo_mode = true;
@@ -624,6 +629,44 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb)
                             intdata);
 }
 
+static void set_carrier(struct usbnet *dev, bool link)
+{
+        struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
+
+        if (pdata->link_ok == link)
+                return;
+
+        pdata->link_ok = link;
+
+        if (link)
+                usbnet_link_change(dev, 1, 0);
+        else
+                usbnet_link_change(dev, 0, 0);
+}
+
+static void check_carrier(struct work_struct *work)
+{
+        struct smsc95xx_priv *pdata = container_of(work, struct smsc95xx_priv,
+                                                carrier_check.work);
+        struct usbnet *dev = pdata->dev;
+        int ret;
+
+        if (pdata->suspend_flags != 0)
+                return;
+
+        ret = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMSR);
+        if (ret < 0) {
+                netdev_warn(dev->net, "Failed to read MII_BMSR\n");
+                return;
+        }
+        if (ret & BMSR_LSTATUS)
+                set_carrier(dev, 1);
+        else
+                set_carrier(dev, 0);
+
+        schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY);
+}
+
 /* Enable or disable Tx & Rx checksum offload engines */
 static int smsc95xx_set_features(struct net_device *netdev,
         netdev_features_t features)
@@ -1165,13 +1208,20 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
         dev->net->flags |= IFF_MULTICAST;
         dev->net->hard_header_len += SMSC95XX_TX_OVERHEAD_CSUM;
         dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
+
+        pdata->dev = dev;
+        INIT_DELAYED_WORK(&pdata->carrier_check, check_carrier);
+        schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY);
+
         return 0;
 }
 
 static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)
 {
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
+
         if (pdata) {
+                cancel_delayed_work(&pdata->carrier_check);
                 netif_dbg(dev, ifdown, dev->net, "free pdata\n");
                 kfree(pdata);
                 pdata = NULL;
@@ -1695,6 +1745,7 @@ static int smsc95xx_resume(struct usb_interface *intf)
 
         /* do this first to ensure it's cleared even in error case */
         pdata->suspend_flags = 0;
+        schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY);
 
         if (suspend_flags & SUSPEND_ALLMODES) {
                 /* clear wake-up sources */
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 49d84e540343..e0638e556fe7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1925,24 +1925,11 @@ static int virtnet_probe(struct virtio_device *vdev)
 
         virtio_device_ready(vdev);
 
-        /* Last of all, set up some receive buffers. */
-        for (i = 0; i < vi->curr_queue_pairs; i++) {
-                try_fill_recv(vi, &vi->rq[i], GFP_KERNEL);
-
-                /* If we didn't even get one input buffer, we're useless. */
-                if (vi->rq[i].vq->num_free ==
-                    virtqueue_get_vring_size(vi->rq[i].vq)) {
-                        free_unused_bufs(vi);
-                        err = -ENOMEM;
-                        goto free_recv_bufs;
-                }
-        }
-
         vi->nb.notifier_call = &virtnet_cpu_callback;
         err = register_hotcpu_notifier(&vi->nb);
         if (err) {
                 pr_debug("virtio_net: registering cpu notifier failed\n");
-                goto free_recv_bufs;
+                goto free_unregister_netdev;
         }
 
         /* Assume link up if device can't report link status,
@@ -1960,10 +1947,9 @@ static int virtnet_probe(struct virtio_device *vdev)
 
         return 0;
 
-free_recv_bufs:
+free_unregister_netdev:
         vi->vdev->config->reset(vdev);
 
-        free_receive_bufs(vi);
         unregister_netdev(dev);
 free_vqs:
         cancel_delayed_work_sync(&vi->refill);
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index db8022ae415b..08885bc8d6db 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1369,7 +1369,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
                                 rcdlro = (struct Vmxnet3_RxCompDescExt *)rcd;
 
                                 segCnt = rcdlro->segCnt;
-                                BUG_ON(segCnt <= 1);
+                                WARN_ON_ONCE(segCnt == 0);
                                 mss = rcdlro->mss;
                                 if (unlikely(segCnt <= 1))
                                         segCnt = 0;
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index c4825392d64b..3d2b64e63408 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -69,10 +69,10 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.4.7.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.4.8.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01040700
+#define VMXNET3_DRIVER_VERSION_NUM      0x01040800
 
 #if defined(CONFIG_PCI_MSI)
         /* RSS only makes sense if MSI-X is supported. */
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 8ff30c3bdfce..f999db2f97b4 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -3086,6 +3086,9 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,
         if (data[IFLA_VXLAN_REMCSUM_NOPARTIAL])
                 conf.flags |= VXLAN_F_REMCSUM_NOPARTIAL;
 
+        if (tb[IFLA_MTU])
+                conf.mtu = nla_get_u32(tb[IFLA_MTU]);
+
         err = vxlan_dev_configure(src_net, dev, &conf);
         switch (err) {
         case -ENODEV:
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index d0631b6cfd53..62f475e31077 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -2540,12 +2540,14 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
                            const u8 *mac, struct station_info *sinfo)
 {
         struct brcmf_if *ifp = netdev_priv(ndev);
+        struct brcmf_scb_val_le scb_val;
         s32 err = 0;
         struct brcmf_sta_info_le sta_info_le;
         u32 sta_flags;
         u32 is_tdls_peer;
         s32 total_rssi;
         s32 count_rssi;
+        int rssi;
         u32 i;
 
         brcmf_dbg(TRACE, "Enter, MAC %pM\n", mac);
@@ -2629,6 +2631,20 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
                         sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
                         total_rssi /= count_rssi;
                         sinfo->signal = total_rssi;
+                } else if (test_bit(BRCMF_VIF_STATUS_CONNECTED,
+                        &ifp->vif->sme_state)) {
+                        memset(&scb_val, 0, sizeof(scb_val));
+                        err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI,
+                                                     &scb_val, sizeof(scb_val));
+                        if (err) {
+                                brcmf_err("Could not get rssi (%d)\n", err);
+                                goto done;
+                        } else {
+                                rssi = le32_to_cpu(scb_val.val);
+                                sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+                                sinfo->signal = rssi;
+                                brcmf_dbg(CONN, "RSSI %d dBm\n", rssi);
+                        }
                 }
         }
 done:
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index 68f1ce02f4bf..2b9a2bc429d6 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@ -1157,6 +1157,8 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
                 brcmu_pkt_buf_free_skb(skb);
                 return;
         }
+
+        skb->protocol = eth_type_trans(skb, ifp->ndev);
         brcmf_netif_rx(ifp, skb);
 }
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 9ed0ed1bf514..4dd5adcdd29b 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2776,6 +2776,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
         if (!info->attrs[HWSIM_ATTR_ADDR_TRANSMITTER] ||
             !info->attrs[HWSIM_ATTR_FLAGS] ||
             !info->attrs[HWSIM_ATTR_COOKIE] ||
+            !info->attrs[HWSIM_ATTR_SIGNAL] ||
             !info->attrs[HWSIM_ATTR_TX_INFO])
                 goto out;
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index 0f48048b8654..3a0faa8fe9d4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -54,7 +54,7 @@ EXPORT_SYMBOL(channel5g_80m);
 void rtl_addr_delay(u32 addr)
 {
         if (addr == 0xfe)
-                msleep(50);
+                mdelay(50);
         else if (addr == 0xfd)
                 msleep(5);
         else if (addr == 0xfc)
@@ -75,7 +75,7 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
                 rtl_addr_delay(addr);
         } else {
                 rtl_set_rfreg(hw, rfpath, addr, mask, data);
-                usleep_range(1, 2);
+                udelay(1);
         }
 }
 EXPORT_SYMBOL(rtl_rfreg_delay);
@@ -86,7 +86,7 @@ void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data)
                 rtl_addr_delay(addr);
         } else {
                 rtl_set_bbreg(hw, addr, MASKDWORD, data);
-                usleep_range(1, 2);
+                udelay(1);
         }
 }
 EXPORT_SYMBOL(rtl_bb_delay);
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 78dca3193ca4..befac5b19490 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1679,9 +1679,14 @@ static int nvme_pci_enable(struct nvme_dev *dev)
 
 static void nvme_dev_unmap(struct nvme_dev *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev->dev);
+        int bars;
+
         if (dev->bar)
                 iounmap(dev->bar);
-        pci_release_regions(to_pci_dev(dev->dev));
+
+        bars = pci_select_bars(pdev, IORESOURCE_MEM);
+        pci_release_selected_regions(pdev, bars);
 }
 
 static void nvme_pci_disable(struct nvme_dev *dev)
@@ -1924,7 +1929,7 @@ static int nvme_dev_map(struct nvme_dev *dev)
 
        return 0;
   release:
-       pci_release_regions(pdev);
+       pci_release_selected_regions(pdev, bars);
        return -ENODEV;
 }
 
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 14f2f8c7c260..33daffc4392c 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -395,7 +395,7 @@ static int unflatten_dt_nodes(const void *blob,
                               struct device_node **nodepp)
 {
         struct device_node *root;
-        int offset = 0, depth = 0;
+        int offset = 0, depth = 0, initial_depth = 0;
 #define FDT_MAX_DEPTH   64
         unsigned int fpsizes[FDT_MAX_DEPTH];
         struct device_node *nps[FDT_MAX_DEPTH];
@@ -405,11 +405,22 @@ static int unflatten_dt_nodes(const void *blob,
         if (nodepp)
                 *nodepp = NULL;
 
+        /*
+         * We're unflattening device sub-tree if @dad is valid. There are
+         * possibly multiple nodes in the first level of depth. We need
+         * set @depth to 1 to make fdt_next_node() happy as it bails
+         * immediately when negative @depth is found. Otherwise, the device
+         * nodes except the first one won't be unflattened successfully.
+         */
+        if (dad)
+                depth = initial_depth = 1;
+
         root = dad;
         fpsizes[depth] = dad ? strlen(of_node_full_name(dad)) : 0;
         nps[depth] = dad;
+
         for (offset = 0;
-             offset >= 0 && depth >= 0;
+             offset >= 0 && depth >= initial_depth;
              offset = fdt_next_node(blob, offset, &depth)) {
                 if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH))
                         continue;
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index e7bfc175b8e1..6ec743faabe8 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -386,13 +386,13 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
 EXPORT_SYMBOL_GPL(of_irq_to_resource);
 
 /**
- * of_irq_get - Decode a node's IRQ and return it as a Linux irq number
+ * of_irq_get - Decode a node's IRQ and return it as a Linux IRQ number
  * @dev: pointer to device tree node
- * @index: zero-based index of the irq
- *
- * Returns Linux irq number on success, or -EPROBE_DEFER if the irq domain
- * is not yet created.
+ * @index: zero-based index of the IRQ
  *
+ * Returns Linux IRQ number on success, or 0 on the IRQ mapping failure, or
+ * -EPROBE_DEFER if the IRQ domain is not yet created, or error code in case
+ * of any other failure.
  */
 int of_irq_get(struct device_node *dev, int index)
 {
@@ -413,12 +413,13 @@ int of_irq_get(struct device_node *dev, int index)
 EXPORT_SYMBOL_GPL(of_irq_get);
 
 /**
- * of_irq_get_byname - Decode a node's IRQ and return it as a Linux irq number
+ * of_irq_get_byname - Decode a node's IRQ and return it as a Linux IRQ number
  * @dev: pointer to device tree node
- * @name: irq name
+ * @name: IRQ name
  *
- * Returns Linux irq number on success, or -EPROBE_DEFER if the irq domain
- * is not yet created, or error code in case of any other failure.
+ * Returns Linux IRQ number on success, or 0 on the IRQ mapping failure, or
+ * -EPROBE_DEFER if the IRQ domain is not yet created, or error code in case
+ * of any other failure.
  */
 int of_irq_get_byname(struct device_node *dev, const char *name)
 {
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index ed01c0172e4a..216648233874 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -127,8 +127,15 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
         }
 
         /* Need adjust the alignment to satisfy the CMA requirement */
-        if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool"))
-                align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));
+        if (IS_ENABLED(CONFIG_CMA)
+            && of_flat_dt_is_compatible(node, "shared-dma-pool")
+            && of_get_flat_dt_prop(node, "reusable", NULL)
+            && !of_get_flat_dt_prop(node, "no-map", NULL)) {
+                unsigned long order =
+                        max_t(unsigned long, MAX_ORDER - 1, pageblock_order);
+
+                align = max(align, (phys_addr_t)PAGE_SIZE << order);
+        }
 
         prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
         if (prop) {
diff --git a/drivers/pci/vc.c b/drivers/pci/vc.c
index dfbab61a1b47..1fa3a3219c45 100644
--- a/drivers/pci/vc.c
+++ b/drivers/pci/vc.c
@@ -221,9 +221,9 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos,
                 else
                         pci_write_config_word(dev, pos + PCI_VC_PORT_CTRL,
                                               *(u16 *)buf);
-                buf += 2;
+                buf += 4;
         }
-        len += 2;
+        len += 4;
 
         /*
          * If we have any Low Priority VCs and a VC Arbitration Table Offset
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index f2d01d4d9364..140436a046c0 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -950,17 +950,14 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
 
                 /* For SPIs, we need to track the affinity per IRQ */
                 if (using_spi) {
-                        if (i >= pdev->num_resources) {
-                                of_node_put(dn);
+                        if (i >= pdev->num_resources)
                                 break;
-                        }
 
                         irqs[i] = cpu;
                 }
 
                 /* Keep track of the CPUs containing this PMU type */
                 cpumask_set_cpu(cpu, &pmu->supported_cpus);
-                of_node_put(dn);
                 i++;
         } while (1);
 
@@ -995,9 +992,6 @@ int arm_pmu_device_probe(struct platform_device *pdev,
 
         armpmu_init(pmu);
 
-        if (!__oprofile_cpu_pmu)
-                __oprofile_cpu_pmu = pmu;
-
         pmu->plat_device = pdev;
 
         if (node && (of_id = of_match_node(of_table, pdev->dev.of_node))) {
@@ -1016,8 +1010,8 @@ int arm_pmu_device_probe(struct platform_device *pdev,
                 if (!ret)
                         ret = init_fn(pmu);
         } else {
-                ret = probe_current_pmu(pmu, probe_table);
                 cpumask_setall(&pmu->supported_cpus);
+                ret = probe_current_pmu(pmu, probe_table);
         }
 
         if (ret) {
@@ -1033,6 +1027,9 @@ int arm_pmu_device_probe(struct platform_device *pdev,
         if (ret)
                 goto out_destroy;
 
+        if (!__oprofile_cpu_pmu)
+                __oprofile_cpu_pmu = pmu;
+
         pr_info("enabled with %s PMU driver, %d counters available\n",
                         pmu->name, pmu->num_events);
 
@@ -1043,6 +1040,7 @@ out_destroy:
 out_free:
         pr_info("%s: failed to register PMU devices!\n",
                 of_node_full_name(node));
+        kfree(pmu->irq_affinity);
         kfree(pmu);
         return ret;
 }
diff --git a/drivers/phy/phy-exynos-mipi-video.c b/drivers/phy/phy-exynos-mipi-video.c
index cc093ebfda94..8b851f718123 100644
--- a/drivers/phy/phy-exynos-mipi-video.c
+++ b/drivers/phy/phy-exynos-mipi-video.c
@@ -233,8 +233,12 @@ static inline int __is_running(const struct exynos_mipi_phy_desc *data,
                         struct exynos_mipi_video_phy *state)
 {
         u32 val;
+        int ret;
+
+        ret = regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
+        if (ret)
+                return 0;
 
-        regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
         return val & data->resetn_val;
 }
 
diff --git a/drivers/phy/phy-ti-pipe3.c b/drivers/phy/phy-ti-pipe3.c
index 0a477d24cf76..bf46844dc387 100644
--- a/drivers/phy/phy-ti-pipe3.c
+++ b/drivers/phy/phy-ti-pipe3.c
@@ -293,11 +293,18 @@ static int ti_pipe3_init(struct phy *x)
                 ret = ti_pipe3_dpll_wait_lock(phy);
         }
 
-        /* Program the DPLL only if not locked */
+        /* SATA has issues if re-programmed when locked */
         val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
-        if (!(val & PLL_LOCK))
-                if (ti_pipe3_dpll_program(phy))
-                        return -EINVAL;
+        if ((val & PLL_LOCK) && of_device_is_compatible(phy->dev->of_node,
+                                                        "ti,phy-pipe3-sata"))
+                return ret;
+
+        /* Program the DPLL */
+        ret = ti_pipe3_dpll_program(phy);
+        if (ret) {
+                ti_pipe3_disable_clocks(phy);
+                return -EINVAL;
+        }
 
         return ret;
 }
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 6b6af6cba454..d9b10a39a2cf 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -463,7 +463,8 @@ static int twl4030_phy_power_on(struct phy *phy)
         twl4030_usb_set_mode(twl, twl->usb_mode);
         if (twl->usb_mode == T2_USB_MODE_ULPI)
                 twl4030_i2c_access(twl, 0);
-        schedule_delayed_work(&twl->id_workaround_work, 0);
+        twl->linkstat = MUSB_UNKNOWN;
+        schedule_delayed_work(&twl->id_workaround_work, HZ);
 
         return 0;
 }
@@ -537,6 +538,7 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
         struct twl4030_usb *twl = _twl;
         enum musb_vbus_id_status status;
         bool status_changed = false;
+        int err;
 
         status = twl4030_usb_linkstat(twl);
 
@@ -567,7 +569,9 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
                         pm_runtime_mark_last_busy(twl->dev);
                         pm_runtime_put_autosuspend(twl->dev);
                 }
-                musb_mailbox(status);
+                err = musb_mailbox(status);
+                if (err)
+                        twl->linkstat = MUSB_UNKNOWN;
         }
 
         /* don't schedule during sleep - irq works right then */
@@ -595,7 +599,8 @@ static int twl4030_phy_init(struct phy *phy)
         struct twl4030_usb *twl = phy_get_drvdata(phy);
 
         pm_runtime_get_sync(twl->dev);
-        schedule_delayed_work(&twl->id_workaround_work, 0);
+        twl->linkstat = MUSB_UNKNOWN;
+        schedule_delayed_work(&twl->id_workaround_work, HZ);
         pm_runtime_mark_last_busy(twl->dev);
         pm_runtime_put_autosuspend(twl->dev);
 
@@ -763,7 +768,8 @@ static int twl4030_usb_remove(struct platform_device *pdev)
         if (cable_present(twl->linkstat))
                 pm_runtime_put_noidle(twl->dev);
         pm_runtime_mark_last_busy(twl->dev);
-        pm_runtime_put_sync_suspend(twl->dev);
+        pm_runtime_dont_use_autosuspend(&pdev->dev);
+        pm_runtime_put_sync(twl->dev);
         pm_runtime_disable(twl->dev);
 
         /* autogate 60MHz ULPI clock,
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 207b13b618cf..a607655d7830 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1256,9 +1256,10 @@ static void mtk_eint_irq_handler(struct irq_desc *desc)
         const struct mtk_desc_pin *pin;
 
         chained_irq_enter(chip, desc);
-        for (eint_num = 0; eint_num < pctl->devdata->ap_num; eint_num += 32) {
+        for (eint_num = 0;
+             eint_num < pctl->devdata->ap_num;
+             eint_num += 32, reg += 4) {
                 status = readl(reg);
-                reg += 4;
                 while (status) {
                         offset = __ffs(status);
                         index = eint_num + offset;
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index ccbfc325c778..38faceff2f08 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -854,7 +854,7 @@ static int nmk_gpio_get_dir(struct gpio_chip *chip, unsigned offset)
 
         clk_enable(nmk_chip->clk);
 
-        dir = !!(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
+        dir = !(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
 
         clk_disable(nmk_chip->clk);
 
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index c06bb85c2839..3ec0025d19e7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -103,7 +103,6 @@ config DELL_SMBIOS
 
 config DELL_LAPTOP
         tristate "Dell Laptop Extras"
-        depends on X86
         depends on DELL_SMBIOS
         depends on DMI
         depends on BACKLIGHT_CLASS_DEVICE
@@ -505,7 +504,7 @@ config THINKPAD_ACPI_HOTKEY_POLL
 
 config SENSORS_HDAPS
         tristate "Thinkpad Hard Drive Active Protection System (hdaps)"
-        depends on INPUT && X86
+        depends on INPUT
         select INPUT_POLLDEV
         default n
         help
@@ -749,7 +748,7 @@ config TOSHIBA_WMI
 
 config ACPI_CMPC
         tristate "CMPC Laptop Extras"
-        depends on X86 && ACPI
+        depends on ACPI
         depends on RFKILL || RFKILL=n
         select INPUT
         select BACKLIGHT_CLASS_DEVICE
@@ -848,7 +847,7 @@ config INTEL_IMR
 
 config INTEL_PMC_CORE
         bool "Intel PMC Core driver"
-        depends on X86 && PCI
+        depends on PCI
         ---help---
           The Intel Platform Controller Hub for Intel Core SoCs provides access
           to Power Management Controller registers via a PCI interface. This
@@ -860,7 +859,7 @@ config INTEL_PMC_CORE
 
 config IBM_RTL
         tristate "Device driver to enable PRTL support"
-        depends on X86 && PCI
+        depends on PCI
         ---help---
          Enable support for IBM Premium Real Time Mode (PRTM).
          This module will allow you the enter and exit PRTM in the BIOS via
@@ -894,7 +893,6 @@ config XO15_EBOOK
 
 config SAMSUNG_LAPTOP
         tristate "Samsung Laptop driver"
-        depends on X86
         depends on RFKILL || RFKILL = n
         depends on ACPI_VIDEO || ACPI_VIDEO = n
         depends on BACKLIGHT_CLASS_DEVICE
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 4a23fbc66b71..d1a091b93192 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -567,6 +567,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv)
 static const struct key_entry ideapad_keymap[] = {
         { KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
         { KE_KEY, 7,  { KEY_CAMERA } },
+        { KE_KEY, 8,  { KEY_MICMUTE } },
         { KE_KEY, 11, { KEY_F16 } },
         { KE_KEY, 13, { KEY_WLAN } },
         { KE_KEY, 16, { KEY_PROG1 } },
@@ -809,6 +810,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
                                 break;
                         case 13:
                         case 11:
+                        case 8:
                         case 7:
                         case 6:
                                 ideapad_input_report(priv, vpc_bit);
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c3bfa1fe95bf..b65ce7519411 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2043,6 +2043,7 @@ static int hotkey_autosleep_ack;
 
 static u32 hotkey_orig_mask;            /* events the BIOS had enabled */
 static u32 hotkey_all_mask;             /* all events supported in fw */
+static u32 hotkey_adaptive_all_mask;    /* all adaptive events supported in fw */
 static u32 hotkey_reserved_mask;        /* events better left disabled */
 static u32 hotkey_driver_mask;          /* events needed by the driver */
 static u32 hotkey_user_mask;            /* events visible to userspace */
@@ -2742,6 +2743,17 @@ static ssize_t hotkey_all_mask_show(struct device *dev,
 
 static DEVICE_ATTR_RO(hotkey_all_mask);
 
+/* sysfs hotkey all_mask ----------------------------------------------- */
+static ssize_t hotkey_adaptive_all_mask_show(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "0x%08x\n",
+                        hotkey_adaptive_all_mask | hotkey_source_mask);
+}
+
+static DEVICE_ATTR_RO(hotkey_adaptive_all_mask);
+
 /* sysfs hotkey recommended_mask --------------------------------------- */
 static ssize_t hotkey_recommended_mask_show(struct device *dev,
                                             struct device_attribute *attr,
@@ -2985,6 +2997,7 @@ static struct attribute *hotkey_attributes[] __initdata = {
         &dev_attr_wakeup_hotunplug_complete.attr,
         &dev_attr_hotkey_mask.attr,
         &dev_attr_hotkey_all_mask.attr,
+        &dev_attr_hotkey_adaptive_all_mask.attr,
         &dev_attr_hotkey_recommended_mask.attr,
 #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
         &dev_attr_hotkey_source_mask.attr,
@@ -3321,20 +3334,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
         if (!tp_features.hotkey)
                 return 1;
 
-        /*
-         * Check if we have an adaptive keyboard, like on the
-         * Lenovo Carbon X1 2014 (2nd Gen).
-         */
-        if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
-                if ((hkeyv >> 8) == 2) {
-                        tp_features.has_adaptive_kbd = true;
-                        res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
-                                        &adaptive_kbd_attr_group);
-                        if (res)
-                                goto err_exit;
-                }
-        }
-
         quirks = tpacpi_check_quirks(tpacpi_hotkey_qtable,
                                      ARRAY_SIZE(tpacpi_hotkey_qtable));
 
@@ -3357,30 +3356,70 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
            A30, R30, R31, T20-22, X20-21, X22-24.  Detected by checking
            for HKEY interface version 0x100 */
         if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
-                if ((hkeyv >> 8) != 1) {
-                        pr_err("unknown version of the HKEY interface: 0x%x\n",
-                               hkeyv);
-                        pr_err("please report this to %s\n", TPACPI_MAIL);
-                } else {
+                vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
+                            "firmware HKEY interface version: 0x%x\n",
+                            hkeyv);
+
+                switch (hkeyv >> 8) {
+                case 1:
                         /*
                          * MHKV 0x100 in A31, R40, R40e,
                          * T4x, X31, and later
                          */
-                        vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
-                                "firmware HKEY interface version: 0x%x\n",
-                                hkeyv);
 
                         /* Paranoia check AND init hotkey_all_mask */
                         if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
                                         "MHKA", "qd")) {
-                                pr_err("missing MHKA handler, "
-                                       "please report this to %s\n",
+                                pr_err("missing MHKA handler, please report this to %s\n",
                                        TPACPI_MAIL);
                                 /* Fallback: pre-init for FN+F3,F4,F12 */
                                 hotkey_all_mask = 0x080cU;
                         } else {
                                 tp_features.hotkey_mask = 1;
                         }
+                        break;
+
+                case 2:
+                        /*
+                         * MHKV 0x200 in X1, T460s, X260, T560, X1 Tablet (2016)
+                         */
+
+                        /* Paranoia check AND init hotkey_all_mask */
+                        if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
+                                        "MHKA", "dd", 1)) {
+                                pr_err("missing MHKA handler, please report this to %s\n",
+                                       TPACPI_MAIL);
+                                /* Fallback: pre-init for FN+F3,F4,F12 */
+                                hotkey_all_mask = 0x080cU;
+                        } else {
+                                tp_features.hotkey_mask = 1;
+                        }
+
+                        /*
+                         * Check if we have an adaptive keyboard, like on the
+                         * Lenovo Carbon X1 2014 (2nd Gen).
+                         */
+                        if (acpi_evalf(hkey_handle, &hotkey_adaptive_all_mask,
+                                       "MHKA", "dd", 2)) {
+                                if (hotkey_adaptive_all_mask != 0) {
+                                        tp_features.has_adaptive_kbd = true;
+                                        res = sysfs_create_group(
+                                                &tpacpi_pdev->dev.kobj,
+                                                &adaptive_kbd_attr_group);
+                                        if (res)
+                                                goto err_exit;
+                                }
+                        } else {
+                                tp_features.has_adaptive_kbd = false;
+                                hotkey_adaptive_all_mask = 0x0U;
+                        }
+                        break;
+
+                default:
+                        pr_err("unknown version of the HKEY interface: 0x%x\n",
+                               hkeyv);
+                        pr_err("please report this to %s\n", TPACPI_MAIL);
+                        break;
                 }
         }
 
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 579fd65299a0..d637c933c8a9 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -208,14 +208,10 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                 break;
 
         case PTP_SYS_OFFSET:
-                sysoff = kmalloc(sizeof(*sysoff), GFP_KERNEL);
-                if (!sysoff) {
-                        err = -ENOMEM;
-                        break;
-                }
-                if (copy_from_user(sysoff, (void __user *)arg,
-                                   sizeof(*sysoff))) {
-                        err = -EFAULT;
+                sysoff = memdup_user((void __user *)arg, sizeof(*sysoff));
+                if (IS_ERR(sysoff)) {
+                        err = PTR_ERR(sysoff);
+                        sysoff = NULL;
                         break;
                 }
                 if (sysoff->n_samples > PTP_MAX_SAMPLES) {
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index dba3843c53b8..ed337a8c34ab 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -457,7 +457,8 @@ int pwm_apply_state(struct pwm_device *pwm, struct pwm_state *state)
 {
         int err;
 
-        if (!pwm)
+        if (!pwm || !state || !state->period ||
+            state->duty_cycle > state->period)
                 return -EINVAL;
 
         if (!memcmp(state, &pwm->state, sizeof(*state)))
diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c
index f994c7eaf41c..14fc011faa32 100644
--- a/drivers/pwm/pwm-atmel-hlcdc.c
+++ b/drivers/pwm/pwm-atmel-hlcdc.c
@@ -272,7 +272,7 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
         chip->chip.of_pwm_n_cells = 3;
         chip->chip.can_sleep = 1;
 
-        ret = pwmchip_add(&chip->chip);
+        ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
         if (ret) {
                 clk_disable_unprepare(hlcdc->periph_clk);
                 return ret;
diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c
index d98599249a05..01695d48dd54 100644
--- a/drivers/pwm/sysfs.c
+++ b/drivers/pwm/sysfs.c
@@ -152,7 +152,7 @@ static ssize_t enable_store(struct device *child,
                 goto unlock;
         }
 
-        pwm_apply_state(pwm, &state);
+        ret = pwm_apply_state(pwm, &state);
 
 unlock:
         mutex_unlock(&export->lock);
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
index 56a17ec5b5ef..526bf23dcb49 100644
--- a/drivers/regulator/qcom_smd-regulator.c
+++ b/drivers/regulator/qcom_smd-regulator.c
@@ -140,6 +140,19 @@ static const struct regulator_ops rpm_smps_ldo_ops = {
         .enable = rpm_reg_enable,
         .disable = rpm_reg_disable,
         .is_enabled = rpm_reg_is_enabled,
+        .list_voltage = regulator_list_voltage_linear_range,
+
+        .get_voltage = rpm_reg_get_voltage,
+        .set_voltage = rpm_reg_set_voltage,
+
+        .set_load = rpm_reg_set_load,
+};
+
+static const struct regulator_ops rpm_smps_ldo_ops_fixed = {
+        .enable = rpm_reg_enable,
+        .disable = rpm_reg_disable,
+        .is_enabled = rpm_reg_is_enabled,
+        .list_voltage = regulator_list_voltage_linear_range,
 
         .get_voltage = rpm_reg_get_voltage,
         .set_voltage = rpm_reg_set_voltage,
@@ -247,7 +260,7 @@ static const struct regulator_desc pm8941_nldo = {
 static const struct regulator_desc pm8941_lnldo = {
         .fixed_uV = 1740000,
         .n_voltages = 1,
-        .ops = &rpm_smps_ldo_ops,
+        .ops = &rpm_smps_ldo_ops_fixed,
 };
 
 static const struct regulator_desc pm8941_switch = {
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index 572816e30095..c139890c1514 100644
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -94,11 +94,14 @@ static int tps51632_dcdc_set_ramp_delay(struct regulator_dev *rdev,
                 int ramp_delay)
 {
         struct tps51632_chip *tps = rdev_get_drvdata(rdev);
-        int bit = ramp_delay/6000;
+        int bit;
         int ret;
 
-        if (bit)
-                bit--;
+        if (ramp_delay == 0)
+                bit = 0;
+        else
+                bit = DIV_ROUND_UP(ramp_delay, 6000) - 1;
+
         ret = regmap_write(tps->regmap, TPS51632_SLEW_REGS, BIT(bit));
         if (ret < 0)
                 dev_err(tps->dev, "SLEW reg write failed, err %d\n", ret);
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index d4c285688ce9..3ddc85e6efd6 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1122,7 +1122,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,
                 } else {
                         struct scsi_cmnd *SCp;
 
-                        SCp = scsi_host_find_tag(SDp->host, SCSI_NO_TAG);
+                        SCp = SDp->current_cmnd;
                         if(unlikely(SCp == NULL)) {
                                 sdev_printk(KERN_ERR, SDp,
                                         "no saved request for untagged cmd\n");
@@ -1826,7 +1826,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
                        slot->tag, slot);
         } else {
                 slot->tag = SCSI_NO_TAG;
-                /* must populate current_cmnd for scsi_host_find_tag to work */
+                /* save current command for reselection */
                 SCp->device->current_cmnd = SCp;
         }
         /* sanity check: some of the commands generated by the mid-layer
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 8f90d9e77104..969c312de1be 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -621,6 +621,11 @@ struct aac_driver_ident
 #define AAC_QUIRK_SCSI_32       0x0020
 
 /*
+ * SRC based adapters support the AifReqEvent functions
+ */
+#define AAC_QUIRK_SRC 0x0040
+
+/*
  *      The adapter interface specs all queues to be located in the same
  *      physically contiguous block. The host structure that defines the
  *      commuication queues will assume they are each a separate physically
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index a943bd230bc2..79871f3519ff 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -236,10 +236,10 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rx_init, "aacraid",  "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Catch All */
         { aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Rocket Catch All */
         { aac_nark_init, "aacraid", "ADAPTEC ", "RAID           ", 2 }, /* Adaptec NEMER/ARK Catch All */
-        { aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 6 (Tupelo) */
-        { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 7 (Denali) */
-        { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 8 */
-        { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec PMC Series 9 */
+        { aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 6 (Tupelo) */
+        { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 7 (Denali) */
+        { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 8 */
+        { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC } /* Adaptec PMC Series 9 */
 };
 
 /**
@@ -1299,7 +1299,8 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         else
                 shost->this_id = shost->max_id;
 
-        aac_intr_normal(aac, 0, 2, 0, NULL);
+        if (aac_drivers[index].quirks & AAC_QUIRK_SRC)
+                aac_intr_normal(aac, 0, 2, 0, NULL);
 
         /*
          * dmb - we may need to move the setting of these parms somewhere else once
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 6a4df5a315e9..6bff13e7afc7 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -7975,13 +7975,14 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
                 ActiveCableEventData =
                     (Mpi26EventDataActiveCableExcept_t *) mpi_reply->EventData;
                 if (ActiveCableEventData->ReasonCode ==
-                                MPI26_EVENT_ACTIVE_CABLE_INSUFFICIENT_POWER)
+                                MPI26_EVENT_ACTIVE_CABLE_INSUFFICIENT_POWER) {
                         pr_info(MPT3SAS_FMT "Currently an active cable with ReceptacleID %d",
                             ioc->name, ActiveCableEventData->ReceptacleID);
                         pr_info("cannot be powered and devices connected to this active cable");
                         pr_info("will not be seen. This active cable");
                         pr_info("requires %d mW of power",
                             ActiveCableEventData->ActiveCablePowerRequirement);
+                }
                 break;
 
         default: /* ignore the rest */
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 3408578b08d6..ff41c310c900 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -230,6 +230,7 @@ static struct {
         {"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
         {"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},
         {"Promise", "", NULL, BLIST_SPARSELUN},
+        {"QEMU", "QEMU CD-ROM", NULL, BLIST_SKIP_VPD_PAGES},
         {"QNAP", "iSCSI Storage", NULL, BLIST_MAX_1024},
         {"SYNOLOGY", "iSCSI Storage", NULL, BLIST_MAX_1024},
         {"QUANTUM", "XP34301", "1071", BLIST_NOTQ},
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a8b610eaa0ca..106a6adbd6f1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1128,7 +1128,6 @@ static int scsi_eh_action(struct scsi_cmnd *scmd, int rtn)
  */
 void scsi_eh_finish_cmd(struct scsi_cmnd *scmd, struct list_head *done_q)
 {
-        scmd->device->host->host_failed--;
         scmd->eh_eflags = 0;
         list_move_tail(&scmd->eh_entry, done_q);
 }
@@ -2227,6 +2226,9 @@ int scsi_error_handler(void *data)
                 else
                         scsi_unjam_host(shost);
 
+                /* All scmds have been handled */
+                shost->host_failed = 0;
+
                 /*
                  * Note - if the above fails completely, the action is to take
                  * individual devices offline and flush the queue of any
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b2e332af0f51..c71344aebdbb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -821,9 +821,12 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
         }
 
         /*
-         * If we finished all bytes in the request we are done now.
+         * special case: failed zero length commands always need to
+         * drop down into the retry code. Otherwise, if we finished
+         * all bytes in the request we are done now.
          */
-        if (!scsi_end_request(req, error, good_bytes, 0))
+        if (!(blk_rq_bytes(req) == 0 && error) &&
+            !scsi_end_request(req, error, good_bytes, 0))
                 return;
 
         /*
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 428c03ef02b2..60bff78e9ead 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1398,11 +1398,15 @@ static int media_not_present(struct scsi_disk *sdkp,
  **/
 static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
 {
-        struct scsi_disk *sdkp = scsi_disk(disk);
-        struct scsi_device *sdp = sdkp->device;
+        struct scsi_disk *sdkp = scsi_disk_get(disk);
+        struct scsi_device *sdp;
         struct scsi_sense_hdr *sshdr = NULL;
         int retval;
 
+        if (!sdkp)
+                return 0;
+
+        sdp = sdkp->device;
         SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_check_events\n"));
 
         /*
@@ -1459,6 +1463,7 @@ out:
         kfree(sshdr);
         retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
         sdp->changed = 0;
+        scsi_disk_put(sdkp);
         return retval;
 }
 
@@ -2862,10 +2867,10 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (sdkp->opt_xfer_blocks &&
             sdkp->opt_xfer_blocks <= dev_max &&
             sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
-            sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_SIZE)
-                rw_max = q->limits.io_opt =
-                        sdkp->opt_xfer_blocks * sdp->sector_size;
-        else
+            logical_to_bytes(sdp, sdkp->opt_xfer_blocks) >= PAGE_SIZE) {
+                q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks);
+                rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
+        } else
                 rw_max = BLK_DEF_MAX_SECTORS;
 
         /* Combine with controller limits */
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 654630bb7d0e..765a6f1ac1b7 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -151,6 +151,11 @@ static inline sector_t logical_to_sectors(struct scsi_device *sdev, sector_t blo
         return blocks << (ilog2(sdev->sector_size) - 9);
 }
 
+static inline unsigned int logical_to_bytes(struct scsi_device *sdev, sector_t blocks)
+{
+        return blocks * sdev->sector_size;
+}
+
 /*
  * A DIF-capable target device can be formatted with different
  * protection schemes.  Currently 0 through 3 are defined:
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index b56885c14839..ebb34dca60df 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -68,7 +68,8 @@ struct sync_timeline {
 
         /* protected by child_list_lock */
         bool                    destroyed;
-        int                     context, value;
+        u64                     context;
+        int                     value;
 
         struct list_head        child_list_head;
         spinlock_t              child_list_lock;
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index bbfee53cfcf5..845e49a52430 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -2521,12 +2521,13 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob)
         return 0;
 
  failed:
-        if (ni)
+        if (ni) {
                 lnet_ni_decref(ni);
+                rej.ibr_cp.ibcp_queue_depth = kiblnd_msg_queue_size(version, ni);
+                rej.ibr_cp.ibcp_max_frags = kiblnd_rdma_frags(version, ni);
+        }
 
         rej.ibr_version             = version;
-        rej.ibr_cp.ibcp_queue_depth = kiblnd_msg_queue_size(version, ni);
-        rej.ibr_cp.ibcp_max_frags = kiblnd_rdma_frags(version, ni);
         kiblnd_reject(cmid, &rej);
 
         return -ECONNREFUSED;
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index c17870cddb5b..fbce1f7e68ca 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -102,7 +102,7 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8  *pbuf)
         if (!efuseTbl)
                 return;
 
-        eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(*eFuseWord));
+        eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
         if (!eFuseWord) {
                 DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
                 goto eFuseWord_failed;
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 87ea3b844951..363f3a34ddce 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2072,7 +2072,8 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 {
         struct hal_ops  *halfunc = &adapt->HalFunc;
 
-        adapt->HalData = kzalloc(sizeof(*adapt->HalData), GFP_KERNEL);
+
+        adapt->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL);
         if (!adapt->HalData)
                 DBG_88E("cant not alloc memory for HAL DATA\n");
 
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 6ceac4f2d4b2..5b4b47ed948b 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -857,14 +857,6 @@ __cpufreq_cooling_register(struct device_node *np,
                 goto free_power_table;
         }
 
-        snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
-                 cpufreq_dev->id);
-
-        cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
-                                                      &cpufreq_cooling_ops);
-        if (IS_ERR(cool_dev))
-                goto remove_idr;
-
         /* Fill freq-table in descending order of frequencies */
         for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) {
                 freq = find_next_max(table, freq);
@@ -877,6 +869,14 @@ __cpufreq_cooling_register(struct device_node *np,
                         pr_debug("%s: freq:%u KHz\n", __func__, freq);
         }
 
+        snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
+                 cpufreq_dev->id);
+
+        cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
+                                                      &cpufreq_cooling_ops);
+        if (IS_ERR(cool_dev))
+                goto remove_idr;
+
         cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
         cpufreq_dev->cool_dev = cool_dev;
 
diff --git a/drivers/thermal/int340x_thermal/int3406_thermal.c b/drivers/thermal/int340x_thermal/int3406_thermal.c
index 13d431cbd29e..a578cd257db4 100644
--- a/drivers/thermal/int340x_thermal/int3406_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3406_thermal.c
@@ -177,7 +177,7 @@ static int int3406_thermal_probe(struct platform_device *pdev)
                 return -ENODEV;
         d->raw_bd = bd;
 
-        ret = acpi_video_get_levels(ACPI_COMPANION(&pdev->dev), &d->br);
+        ret = acpi_video_get_levels(ACPI_COMPANION(&pdev->dev), &d->br, NULL);
         if (ret)
                 return ret;
 
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 82c4d2e45319..95103054c0e4 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -120,17 +120,6 @@ config UNIX98_PTYS
           All modern Linux systems use the Unix98 ptys.  Say Y unless
           you're on an embedded system and want to conserve memory.
 
-config DEVPTS_MULTIPLE_INSTANCES
-        bool "Support multiple instances of devpts"
-        depends on UNIX98_PTYS
-        default n
-        ---help---
-          Enable support for multiple instances of devpts filesystem.
-          If you want to have isolated PTY namespaces (eg: in containers),
-          say Y here.  Otherwise, say N. If enabled, each mount of devpts
-          filesystem with the '-o newinstance' option will create an
-          independent PTY namespace.
-
 config LEGACY_PTYS
         bool "Legacy (BSD) PTY support"
         default y
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index dd4b8417e7f4..f856c4544eea 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -668,7 +668,7 @@ static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
         else
                 fsi = tty->link->driver_data;
         devpts_kill_index(fsi, tty->index);
-        devpts_put_ref(fsi);
+        devpts_release(fsi);
 }
 
 static const struct tty_operations ptm_unix98_ops = {
@@ -733,10 +733,11 @@ static int ptmx_open(struct inode *inode, struct file *filp)
         if (retval)
                 return retval;
 
-        fsi = devpts_get_ref(inode, filp);
-        retval = -ENODEV;
-        if (!fsi)
+        fsi = devpts_acquire(filp);
+        if (IS_ERR(fsi)) {
+                retval = PTR_ERR(fsi);
                 goto out_free_file;
+        }
 
         /* find a device that is not in use. */
         mutex_lock(&devpts_mutex);
@@ -745,7 +746,7 @@ static int ptmx_open(struct inode *inode, struct file *filp)
 
         retval = index;
         if (index < 0)
-                goto out_put_ref;
+                goto out_put_fsi;
 
 
         mutex_lock(&tty_mutex);
@@ -789,8 +790,8 @@ err_release:
         return retval;
 out:
         devpts_kill_index(fsi, index);
-out_put_ref:
-        devpts_put_ref(fsi);
+out_put_fsi:
+        devpts_release(fsi);
 out_free_file:
         tty_free_file(filp);
         return retval;
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 6dc810bce295..944a6dca0fcb 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Creative SB Audigy 2 NX */
         { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* USB3503 */
+        { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* Microsoft Wireless Laser Mouse 6000 Receiver */
         { USB_DEVICE(0x045e, 0x00e1), .driver_info = USB_QUIRK_RESET_RESUME },
 
@@ -173,6 +176,10 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* MAYA44USB sound device */
         { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* ASUS Base Station(T100) */
+        { USB_DEVICE(0x0b05, 0x17e0), .driver_info =
+                        USB_QUIRK_IGNORE_REMOTE_WAKEUP },
+
         /* Action Semiconductor flash disk */
         { USB_DEVICE(0x10d6, 0x2200), .driver_info =
                         USB_QUIRK_STRING_FETCH_255 },
@@ -188,26 +195,22 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x1908, 0x1315), .driver_info =
                         USB_QUIRK_HONOR_BNUMINTERFACES },
 
-        /* INTEL VALUE SSD */
-        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* USB3503 */
-        { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* ASUS Base Station(T100) */
-        { USB_DEVICE(0x0b05, 0x17e0), .driver_info =
-                        USB_QUIRK_IGNORE_REMOTE_WAKEUP },
-
         /* Protocol and OTG Electrical Test Device */
         { USB_DEVICE(0x1a0a, 0x0200), .driver_info =
                         USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },
 
+        /* Acer C120 LED Projector */
+        { USB_DEVICE(0x1de1, 0xc102), .driver_info = USB_QUIRK_NO_LPM },
+
         /* Blackmagic Design Intensity Shuttle */
         { USB_DEVICE(0x1edb, 0xbd3b), .driver_info = USB_QUIRK_NO_LPM },
 
         /* Blackmagic Design UltraStudio SDI */
         { USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
 
+        /* INTEL VALUE SSD */
+        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
+
         { }  /* terminating entry must be last */
 };
 
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 3c58d633ce80..dec0b21fc626 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -64,6 +64,17 @@
         DWC2_TRACE_SCHEDULER_VB(pr_fmt("%s: SCH: " fmt),                \
                                 dev_name(hsotg->dev), ##__VA_ARGS__)
 
+#ifdef CONFIG_MIPS
+/*
+ * There are some MIPS machines that can run in either big-endian
+ * or little-endian mode and that use the dwc2 register without
+ * a byteswap in both ways.
+ * Unlike other architectures, MIPS apparently does not require a
+ * barrier before the __raw_writel() to synchronize with DMA but does
+ * require the barrier after the __raw_writel() to serialize a set of
+ * writes. This set of operations was added specifically for MIPS and
+ * should only be used there.
+ */
 static inline u32 dwc2_readl(const void __iomem *addr)
 {
         u32 value = __raw_readl(addr);
@@ -90,6 +101,22 @@ static inline void dwc2_writel(u32 value, void __iomem *addr)
         pr_info("INFO:: wrote %08x to %p\n", value, addr);
 #endif
 }
+#else
+/* Normal architectures just use readl/write */
+static inline u32 dwc2_readl(const void __iomem *addr)
+{
+        return readl(addr);
+}
+
+static inline void dwc2_writel(u32 value, void __iomem *addr)
+{
+        writel(value, addr);
+
+#ifdef DWC2_LOG_WRITES
+        pr_info("info:: wrote %08x to %p\n", value, addr);
+#endif
+}
+#endif
 
 /* Maximum number of Endpoints/HostChannels */
 #define MAX_EPS_CHANNELS        16
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 4c5e3005e1dc..26cf09d0fe3c 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -1018,7 +1018,7 @@ static int dwc2_hsotg_process_req_status(struct dwc2_hsotg *hsotg,
         return 1;
 }
 
-static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value);
+static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now);
 
 /**
  * get_ep_head - return the first request on the endpoint
@@ -1094,7 +1094,7 @@ static int dwc2_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
                 case USB_ENDPOINT_HALT:
                         halted = ep->halted;
 
-                        dwc2_hsotg_ep_sethalt(&ep->ep, set);
+                        dwc2_hsotg_ep_sethalt(&ep->ep, set, true);
 
                         ret = dwc2_hsotg_send_reply(hsotg, ep0, NULL, 0);
                         if (ret) {
@@ -2948,8 +2948,13 @@ static int dwc2_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
  * dwc2_hsotg_ep_sethalt - set halt on a given endpoint
  * @ep: The endpoint to set halt.
  * @value: Set or unset the halt.
+ * @now: If true, stall the endpoint now. Otherwise return -EAGAIN if
+ *       the endpoint is busy processing requests.
+ *
+ * We need to stall the endpoint immediately if request comes from set_feature
+ * protocol command handler.
  */
-static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value)
+static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now)
 {
         struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
         struct dwc2_hsotg *hs = hs_ep->parent;
@@ -2969,6 +2974,17 @@ static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value)
                 return 0;
         }
 
+        if (hs_ep->isochronous) {
+                dev_err(hs->dev, "%s is Isochronous Endpoint\n", ep->name);
+                return -EINVAL;
+        }
+
+        if (!now && value && !list_empty(&hs_ep->queue)) {
+                dev_dbg(hs->dev, "%s request is pending, cannot halt\n",
+                        ep->name);
+                return -EAGAIN;
+        }
+
         if (hs_ep->dir_in) {
                 epreg = DIEPCTL(index);
                 epctl = dwc2_readl(hs->regs + epreg);
@@ -3020,7 +3036,7 @@ static int dwc2_hsotg_ep_sethalt_lock(struct usb_ep *ep, int value)
         int ret = 0;
 
         spin_lock_irqsave(&hs->lock, flags);
-        ret = dwc2_hsotg_ep_sethalt(ep, value);
+        ret = dwc2_hsotg_ep_sethalt(ep, value, false);
         spin_unlock_irqrestore(&hs->lock, flags);
 
         return ret;
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 7ddf9449a063..654050684f4f 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -402,6 +402,7 @@
 #define DWC3_DEPCMD_GET_RSC_IDX(x)      (((x) >> DWC3_DEPCMD_PARAM_SHIFT) & 0x7f)
 #define DWC3_DEPCMD_STATUS(x)           (((x) >> 12) & 0x0F)
 #define DWC3_DEPCMD_HIPRI_FORCERM       (1 << 11)
+#define DWC3_DEPCMD_CLEARPENDIN         (1 << 11)
 #define DWC3_DEPCMD_CMDACT              (1 << 10)
 #define DWC3_DEPCMD_CMDIOC              (1 << 8)
 
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index dd5cb5577dca..2f1fb7e7aa54 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -128,12 +128,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, exynos);
 
-        ret = dwc3_exynos_register_phys(exynos);
-        if (ret) {
-                dev_err(dev, "couldn't register PHYs\n");
-                return ret;
-        }
-
         exynos->dev     = dev;
 
         exynos->clk = devm_clk_get(dev, "usbdrd30");
@@ -183,20 +177,29 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
                 goto err3;
         }
 
+        ret = dwc3_exynos_register_phys(exynos);
+        if (ret) {
+                dev_err(dev, "couldn't register PHYs\n");
+                goto err4;
+        }
+
         if (node) {
                 ret = of_platform_populate(node, NULL, NULL, dev);
                 if (ret) {
                         dev_err(dev, "failed to add dwc3 core\n");
-                        goto err4;
+                        goto err5;
                 }
         } else {
                 dev_err(dev, "no device node, failed to add dwc3 core\n");
                 ret = -ENODEV;
-                goto err4;
+                goto err5;
         }
 
         return 0;
 
+err5:
+        platform_device_unregister(exynos->usb2_phy);
+        platform_device_unregister(exynos->usb3_phy);
 err4:
         regulator_disable(exynos->vdd10);
 err3:
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 5c0adb9c6fb2..50d6ae6f88bc 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -129,12 +129,18 @@ static int st_dwc3_drd_init(struct st_dwc3 *dwc3_data)
         switch (dwc3_data->dr_mode) {
         case USB_DR_MODE_PERIPHERAL:
 
-                val &= ~(USB3_FORCE_VBUSVALID | USB3_DELAY_VBUSVALID
+                val &= ~(USB3_DELAY_VBUSVALID
                         | USB3_SEL_FORCE_OPMODE | USB3_FORCE_OPMODE(0x3)
                         | USB3_SEL_FORCE_DPPULLDOWN2 | USB3_FORCE_DPPULLDOWN2
                         | USB3_SEL_FORCE_DMPULLDOWN2 | USB3_FORCE_DMPULLDOWN2);
 
-                val |= USB3_DEVICE_NOT_HOST;
+                /*
+                 * USB3_PORT2_FORCE_VBUSVALID When '1' and when
+                 * USB3_PORT2_DEVICE_NOT_HOST = 1, forces VBUSVLDEXT2 input
+                 * of the pico PHY to 1.
+                 */
+
+                val |= USB3_DEVICE_NOT_HOST | USB3_FORCE_VBUSVALID;
                 break;
 
         case USB_DR_MODE_HOST:
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 9a7d0bd15dc3..07248ff1be5c 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -347,6 +347,28 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
         return ret;
 }
 
+static int dwc3_send_clear_stall_ep_cmd(struct dwc3_ep *dep)
+{
+        struct dwc3 *dwc = dep->dwc;
+        struct dwc3_gadget_ep_cmd_params params;
+        u32 cmd = DWC3_DEPCMD_CLEARSTALL;
+
+        /*
+         * As of core revision 2.60a the recommended programming model
+         * is to set the ClearPendIN bit when issuing a Clear Stall EP
+         * command for IN endpoints. This is to prevent an issue where
+         * some (non-compliant) hosts may not send ACK TPs for pending
+         * IN transfers due to a mishandled error condition. Synopsys
+         * STAR 9000614252.
+         */
+        if (dep->direction && (dwc->revision >= DWC3_REVISION_260A))
+                cmd |= DWC3_DEPCMD_CLEARPENDIN;
+
+        memset(&params, 0, sizeof(params));
+
+        return dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, &params);
+}
+
 static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep,
                 struct dwc3_trb *trb)
 {
@@ -1314,8 +1336,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
                 else
                         dep->flags |= DWC3_EP_STALL;
         } else {
-                ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
-                        DWC3_DEPCMD_CLEARSTALL, &params);
+                ret = dwc3_send_clear_stall_ep_cmd(dep);
                 if (ret)
                         dev_err(dwc->dev, "failed to clear STALL on %s\n",
                                         dep->name);
@@ -2247,7 +2268,6 @@ static void dwc3_clear_stall_all_ep(struct dwc3 *dwc)
 
         for (epnum = 1; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
                 struct dwc3_ep *dep;
-                struct dwc3_gadget_ep_cmd_params params;
                 int ret;
 
                 dep = dwc->eps[epnum];
@@ -2259,9 +2279,7 @@ static void dwc3_clear_stall_all_ep(struct dwc3 *dwc)
 
                 dep->flags &= ~DWC3_EP_STALL;
 
-                memset(&params, 0, sizeof(params));
-                ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
-                                DWC3_DEPCMD_CLEARSTALL, &params);
+                ret = dwc3_send_clear_stall_ep_cmd(dep);
                 WARN_ON_ONCE(ret);
         }
 }
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d67de0d22a2b..eb648485a58c 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1868,14 +1868,19 @@ unknown:
                                 }
                                 break;
                         }
-                        req->length = value;
-                        req->context = cdev;
-                        req->zero = value < w_length;
-                        value = composite_ep0_queue(cdev, req, GFP_ATOMIC);
-                        if (value < 0) {
-                                DBG(cdev, "ep_queue --> %d\n", value);
-                                req->status = 0;
-                                composite_setup_complete(gadget->ep0, req);
+
+                        if (value >= 0) {
+                                req->length = value;
+                                req->context = cdev;
+                                req->zero = value < w_length;
+                                value = composite_ep0_queue(cdev, req,
+                                                            GFP_ATOMIC);
+                                if (value < 0) {
+                                        DBG(cdev, "ep_queue --> %d\n", value);
+                                        req->status = 0;
+                                        composite_setup_complete(gadget->ep0,
+                                                                 req);
+                                }
                         }
                         return value;
                 }
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index b6f60ca8a035..70cf3477f951 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1401,6 +1401,7 @@ static const struct usb_gadget_driver configfs_driver_template = {
                 .owner          = THIS_MODULE,
                 .name           = "configfs-gadget",
         },
+        .match_existing_only = 1,
 };
 
 static struct config_group *gadgets_make(
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 73515d54e1cc..cc33d2667408 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -2051,7 +2051,7 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_type type,
 
                 if (len < sizeof(*d) ||
                     d->bFirstInterfaceNumber >= ffs->interfaces_count ||
-                    d->Reserved1)
+                    !d->Reserved1)
                         return -EINVAL;
                 for (i = 0; i < ARRAY_SIZE(d->Reserved2); ++i)
                         if (d->Reserved2[i])
@@ -2729,6 +2729,7 @@ static int _ffs_func_bind(struct usb_configuration *c,
                 func->ffs->ss_descs_count;
 
         int fs_len, hs_len, ss_len, ret, i;
+        struct ffs_ep *eps_ptr;
 
         /* Make it a single chunk, less management later on */
         vla_group(d);
@@ -2777,12 +2778,9 @@ static int _ffs_func_bind(struct usb_configuration *c,
                ffs->raw_descs_length);
 
         memset(vla_ptr(vlabuf, d, inums), 0xff, d_inums__sz);
-        for (ret = ffs->eps_count; ret; --ret) {
-                struct ffs_ep *ptr;
-
-                ptr = vla_ptr(vlabuf, d, eps);
-                ptr[ret].num = -1;
-        }
+        eps_ptr = vla_ptr(vlabuf, d, eps);
+        for (i = 0; i < ffs->eps_count; i++)
+                eps_ptr[i].num = -1;
 
         /* Save pointers
          * d_eps == vlabuf, func->eps used to kfree vlabuf later
@@ -2851,7 +2849,7 @@ static int _ffs_func_bind(struct usb_configuration *c,
                 goto error;
 
         func->function.os_desc_table = vla_ptr(vlabuf, d, os_desc_table);
-        if (c->cdev->use_os_string)
+        if (c->cdev->use_os_string) {
                 for (i = 0; i < ffs->interfaces_count; ++i) {
                         struct usb_os_desc *desc;
 
@@ -2862,13 +2860,15 @@ static int _ffs_func_bind(struct usb_configuration *c,
                                 vla_ptr(vlabuf, d, ext_compat) + i * 16;
                         INIT_LIST_HEAD(&desc->ext_prop);
                 }
-        ret = ffs_do_os_descs(ffs->ms_os_descs_count,
-                              vla_ptr(vlabuf, d, raw_descs) +
-                              fs_len + hs_len + ss_len,
-                              d_raw_descs__sz - fs_len - hs_len - ss_len,
-                              __ffs_func_bind_do_os_desc, func);
-        if (unlikely(ret < 0))
-                goto error;
+                ret = ffs_do_os_descs(ffs->ms_os_descs_count,
+                                      vla_ptr(vlabuf, d, raw_descs) +
+                                      fs_len + hs_len + ss_len,
+                                      d_raw_descs__sz - fs_len - hs_len -
+                                      ss_len,
+                                      __ffs_func_bind_do_os_desc, func);
+                if (unlikely(ret < 0))
+                        goto error;
+        }
         func->function.os_desc_n =
                 c->cdev->use_os_string ? ffs->interfaces_count : 0;
 
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index c45104e3a64b..64706a789580 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -161,14 +161,6 @@ static struct usb_endpoint_descriptor hs_ep_out_desc = {
         .wMaxPacketSize =       cpu_to_le16(512)
 };
 
-static struct usb_qualifier_descriptor dev_qualifier = {
-        .bLength =              sizeof(dev_qualifier),
-        .bDescriptorType =      USB_DT_DEVICE_QUALIFIER,
-        .bcdUSB =               cpu_to_le16(0x0200),
-        .bDeviceClass =         USB_CLASS_PRINTER,
-        .bNumConfigurations =   1
-};
-
 static struct usb_descriptor_header *hs_printer_function[] = {
         (struct usb_descriptor_header *) &intf_desc,
         (struct usb_descriptor_header *) &hs_ep_in_desc,
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 35fe3c80cfc0..197f73386fac 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1445,16 +1445,18 @@ static void usbg_drop_tpg(struct se_portal_group *se_tpg)
         for (i = 0; i < TPG_INSTANCES; ++i)
                 if (tpg_instances[i].tpg == tpg)
                         break;
-        if (i < TPG_INSTANCES)
+        if (i < TPG_INSTANCES) {
                 tpg_instances[i].tpg = NULL;
-        opts = container_of(tpg_instances[i].func_inst,
-                struct f_tcm_opts, func_inst);
-        mutex_lock(&opts->dep_lock);
-        if (opts->has_dep)
-                module_put(opts->dependent);
-        else
-                configfs_undepend_item_unlocked(&opts->func_inst.group.cg_item);
-        mutex_unlock(&opts->dep_lock);
+                opts = container_of(tpg_instances[i].func_inst,
+                        struct f_tcm_opts, func_inst);
+                mutex_lock(&opts->dep_lock);
+                if (opts->has_dep)
+                        module_put(opts->dependent);
+                else
+                        configfs_undepend_item_unlocked(
+                                &opts->func_inst.group.cg_item);
+                mutex_unlock(&opts->dep_lock);
+        }
         mutex_unlock(&tpg_instances_lock);
 
         kfree(tpg);
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index 186d4b162524..cd214ec8a601 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -598,18 +598,6 @@ static struct usb_gadget_strings *fn_strings[] = {
         NULL,
 };
 
-static struct usb_qualifier_descriptor devqual_desc = {
-        .bLength = sizeof devqual_desc,
-        .bDescriptorType = USB_DT_DEVICE_QUALIFIER,
-
-        .bcdUSB = cpu_to_le16(0x200),
-        .bDeviceClass = USB_CLASS_MISC,
-        .bDeviceSubClass = 0x02,
-        .bDeviceProtocol = 0x01,
-        .bNumConfigurations = 1,
-        .bRESERVED = 0,
-};
-
 static struct usb_interface_assoc_descriptor iad_desc = {
         .bLength = sizeof iad_desc,
         .bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
@@ -1292,6 +1280,7 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr)
 
         if (control_selector == UAC2_CS_CONTROL_SAM_FREQ) {
                 struct cntrl_cur_lay3 c;
+                memset(&c, 0, sizeof(struct cntrl_cur_lay3));
 
                 if (entity_id == USB_IN_CLK_ID)
                         c.dCUR = p_srate;
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index d62683017cf3..990df221c629 100644
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -83,9 +83,7 @@ EXPORT_SYMBOL_GPL(fsg_fs_function);
  * USB 2.0 devices need to expose both high speed and full speed
  * descriptors, unless they only run at full speed.
  *
- * That means alternate endpoint descriptors (bigger packets)
- * and a "device qualifier" ... plus more construction options
- * for the configuration descriptor.
+ * That means alternate endpoint descriptors (bigger packets).
  */
 struct usb_endpoint_descriptor fsg_hs_bulk_in_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index e64479f882a5..aa3707bdebb4 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -938,8 +938,11 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
                         struct usb_ep           *ep = dev->gadget->ep0;
                         struct usb_request      *req = dev->req;
 
-                        if ((retval = setup_req (ep, req, 0)) == 0)
-                                retval = usb_ep_queue (ep, req, GFP_ATOMIC);
+                        if ((retval = setup_req (ep, req, 0)) == 0) {
+                                spin_unlock_irq (&dev->lock);
+                                retval = usb_ep_queue (ep, req, GFP_KERNEL);
+                                spin_lock_irq (&dev->lock);
+                        }
                         dev->state = STATE_DEV_CONNECTED;
 
                         /* assume that was SET_CONFIGURATION */
@@ -1457,8 +1460,11 @@ delegate:
                                                         w_length);
                                 if (value < 0)
                                         break;
+
+                                spin_unlock (&dev->lock);
                                 value = usb_ep_queue (gadget->ep0, dev->req,
-                                                        GFP_ATOMIC);
+                                                        GFP_KERNEL);
+                                spin_lock (&dev->lock);
                                 if (value < 0) {
                                         clean_req (gadget->ep0, dev->req);
                                         break;
@@ -1481,11 +1487,14 @@ delegate:
         if (value >= 0 && dev->state != STATE_DEV_SETUP) {
                 req->length = value;
                 req->zero = value < w_length;
-                value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
+
+                spin_unlock (&dev->lock);
+                value = usb_ep_queue (gadget->ep0, req, GFP_KERNEL);
                 if (value < 0) {
                         DBG (dev, "ep_queue --> %d\n", value);
                         req->status = 0;
                 }
+                return value;
         }
 
         /* device stalls when value < 0 */
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 6e8300d6a737..e1b2dcebdc2e 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -603,11 +603,15 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
                 }
         }
 
-        list_add_tail(&driver->pending, &gadget_driver_pending_list);
-        pr_info("udc-core: couldn't find an available UDC - added [%s] to list of pending drivers\n",
-                driver->function);
+        if (!driver->match_existing_only) {
+                list_add_tail(&driver->pending, &gadget_driver_pending_list);
+                pr_info("udc-core: couldn't find an available UDC - added [%s] to list of pending drivers\n",
+                        driver->function);
+                ret = 0;
+        }
+
         mutex_unlock(&udc_lock);
-        return 0;
+        return ret;
 found:
         ret = udc_bind_to_driver(udc, driver);
         mutex_unlock(&udc_lock);
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index ae1b6e69eb96..a962b89b65a6 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -368,6 +368,15 @@ static void ehci_shutdown(struct usb_hcd *hcd)
 {
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
+        /**
+         * Protect the system from crashing at system shutdown in cases where
+         * usb host is not added yet from OTG controller driver.
+         * As ehci_setup() not done yet, so stop accessing registers or
+         * variables initialized in ehci_setup()
+         */
+        if (!ehci->sbrn)
+                return;
+
         spin_lock_irq(&ehci->lock);
         ehci->shutdown = true;
         ehci->rh_state = EHCI_RH_STOPPING;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index ffc90295a95f..74f62d68f013 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -872,15 +872,23 @@ int ehci_hub_control(
 ) {
         struct ehci_hcd *ehci = hcd_to_ehci (hcd);
         int             ports = HCS_N_PORTS (ehci->hcs_params);
-        u32 __iomem     *status_reg = &ehci->regs->port_status[
-                                (wIndex & 0xff) - 1];
-        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[(wIndex & 0xff) - 1];
+        u32 __iomem     *status_reg, *hostpc_reg;
         u32             temp, temp1, status;
         unsigned long   flags;
         int             retval = 0;
         unsigned        selector;
 
         /*
+         * Avoid underflow while calculating (wIndex & 0xff) - 1.
+         * The compiler might deduce that wIndex can never be 0 and then
+         * optimize away the tests for !wIndex below.
+         */
+        temp = wIndex & 0xff;
+        temp -= (temp > 0);
+        status_reg = &ehci->regs->port_status[temp];
+        hostpc_reg = &ehci->regs->hostpc[temp];
+
+        /*
          * FIXME:  support SetPortFeatures USB_PORT_FEAT_INDICATOR.
          * HCS_INDICATOR may say we can change LEDs to off/amber/green.
          * (track current state ourselves) ... blink for diagnostics,
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index d3afc89d00f5..2f8d3af811ce 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -179,22 +179,32 @@ static int ehci_msm_remove(struct platform_device *pdev)
 static int ehci_msm_pm_suspend(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
         bool do_wakeup = device_may_wakeup(dev);
 
         dev_dbg(dev, "ehci-msm PM suspend\n");
 
-        return ehci_suspend(hcd, do_wakeup);
+        /* Only call ehci_suspend if ehci_setup has been done */
+        if (ehci->sbrn)
+                return ehci_suspend(hcd, do_wakeup);
+
+        return 0;
 }
 
 static int ehci_msm_pm_resume(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
         dev_dbg(dev, "ehci-msm PM resume\n");
-        ehci_resume(hcd, false);
+
+        /* Only call ehci_resume if ehci_setup has been done */
+        if (ehci->sbrn)
+                ehci_resume(hcd, false);
 
         return 0;
 }
+
 #else
 #define ehci_msm_pm_suspend     NULL
 #define ehci_msm_pm_resume      NULL
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 4031b372008e..9a3d7db5be57 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -81,15 +81,23 @@ static int tegra_reset_usb_controller(struct platform_device *pdev)
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
         struct tegra_ehci_hcd *tegra =
                 (struct tegra_ehci_hcd *)hcd_to_ehci(hcd)->priv;
+        bool has_utmi_pad_registers = false;
 
         phy_np = of_parse_phandle(pdev->dev.of_node, "nvidia,phy", 0);
         if (!phy_np)
                 return -ENOENT;
 
+        if (of_property_read_bool(phy_np, "nvidia,has-utmi-pad-registers"))
+                has_utmi_pad_registers = true;
+
         if (!usb1_reset_attempted) {
                 struct reset_control *usb1_reset;
 
-                usb1_reset = of_reset_control_get(phy_np, "usb");
+                if (!has_utmi_pad_registers)
+                        usb1_reset = of_reset_control_get(phy_np, "utmi-pads");
+                else
+                        usb1_reset = tegra->rst;
+
                 if (IS_ERR(usb1_reset)) {
                         dev_warn(&pdev->dev,
                                  "can't get utmi-pads reset from the PHY\n");
@@ -99,13 +107,15 @@ static int tegra_reset_usb_controller(struct platform_device *pdev)
                         reset_control_assert(usb1_reset);
                         udelay(1);
                         reset_control_deassert(usb1_reset);
+
+                        if (!has_utmi_pad_registers)
+                                reset_control_put(usb1_reset);
                 }
 
-                reset_control_put(usb1_reset);
                 usb1_reset_attempted = true;
         }
 
-        if (!of_property_read_bool(phy_np, "nvidia,has-utmi-pad-registers")) {
+        if (!has_utmi_pad_registers) {
                 reset_control_assert(tegra->rst);
                 udelay(1);
                 reset_control_deassert(tegra->rst);
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index d029bbe9eb36..641fed609911 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -183,7 +183,6 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
 {
         int     branch;
 
-        ed->state = ED_OPER;
         ed->ed_prev = NULL;
         ed->ed_next = NULL;
         ed->hwNextED = 0;
@@ -259,6 +258,8 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
         /* the HC may not see the schedule updates yet, but if it does
          * then they'll be properly ordered.
          */
+
+        ed->state = ED_OPER;
         return 0;
 }
 
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 48672fac7ff3..c10972fcc8e4 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -37,6 +37,7 @@
 /* Device for a quirk */
 #define PCI_VENDOR_ID_FRESCO_LOGIC      0x1b73
 #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK  0x1000
+#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1009       0x1009
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400       0x1400
 
 #define PCI_VENDOR_ID_ETRON             0x1b6f
@@ -114,6 +115,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                 xhci->quirks |= XHCI_TRUST_TX_LENGTH;
         }
 
+        if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
+                        pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1009)
+                xhci->quirks |= XHCI_BROKEN_STREAMS;
+
         if (pdev->vendor == PCI_VENDOR_ID_NEC)
                 xhci->quirks |= XHCI_NEC_HOST;
 
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 676ea458148b..1f3f981fe7f8 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -196,6 +196,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
                 ret = clk_prepare_enable(clk);
                 if (ret)
                         goto put_hcd;
+        } else if (PTR_ERR(clk) == -EPROBE_DEFER) {
+                ret = -EPROBE_DEFER;
+                goto put_hcd;
         }
 
         xhci = hcd_to_xhci(hcd);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 52deae4b7eac..d7d502578d79 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -290,6 +290,14 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
 
         temp_64 = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
         xhci->cmd_ring_state = CMD_RING_STATE_ABORTED;
+
+        /*
+         * Writing the CMD_RING_ABORT bit should cause a cmd completion event,
+         * however on some host hw the CMD_RING_RUNNING bit is correctly cleared
+         * but the completion event in never sent. Use the cmd timeout timer to
+         * handle those cases. Use twice the time to cover the bit polling retry
+         */
+        mod_timer(&xhci->cmd_timer, jiffies + (2 * XHCI_CMD_DEFAULT_TIMEOUT));
         xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,
                         &xhci->op_regs->cmd_ring);
 
@@ -314,6 +322,7 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
 
                 xhci_err(xhci, "Stopped the command ring failed, "
                                 "maybe the host is dead\n");
+                del_timer(&xhci->cmd_timer);
                 xhci->xhc_state |= XHCI_STATE_DYING;
                 xhci_quiesce(xhci);
                 xhci_halt(xhci);
@@ -1246,22 +1255,21 @@ void xhci_handle_command_timeout(unsigned long data)
         int ret;
         unsigned long flags;
         u64 hw_ring_state;
-        struct xhci_command *cur_cmd = NULL;
+        bool second_timeout = false;
         xhci = (struct xhci_hcd *) data;
 
         /* mark this command to be cancelled */
         spin_lock_irqsave(&xhci->lock, flags);
         if (xhci->current_cmd) {
-                cur_cmd = xhci->current_cmd;
-                cur_cmd->status = COMP_CMD_ABORT;
+                if (xhci->current_cmd->status == COMP_CMD_ABORT)
+                        second_timeout = true;
+                xhci->current_cmd->status = COMP_CMD_ABORT;
         }
 
-
         /* Make sure command ring is running before aborting it */
         hw_ring_state = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
         if ((xhci->cmd_ring_state & CMD_RING_STATE_RUNNING) &&
             (hw_ring_state & CMD_RING_RUNNING))  {
-
                 spin_unlock_irqrestore(&xhci->lock, flags);
                 xhci_dbg(xhci, "Command timeout\n");
                 ret = xhci_abort_cmd_ring(xhci);
@@ -1273,6 +1281,15 @@ void xhci_handle_command_timeout(unsigned long data)
                 }
                 return;
         }
+
+        /* command ring failed to restart, or host removed. Bail out */
+        if (second_timeout || xhci->xhc_state & XHCI_STATE_REMOVING) {
+                spin_unlock_irqrestore(&xhci->lock, flags);
+                xhci_dbg(xhci, "command timed out twice, ring start fail?\n");
+                xhci_cleanup_command_queue(xhci);
+                return;
+        }
+
         /* command timeout on stopped ring, ring can't be aborted */
         xhci_dbg(xhci, "Command timeout on stopped ring\n");
         xhci_handle_stopped_cmd_ring(xhci, xhci->current_cmd);
@@ -2721,7 +2738,8 @@ hw_died:
                 writel(irq_pending, &xhci->ir_set->irq_pending);
         }
 
-        if (xhci->xhc_state & XHCI_STATE_DYING) {
+        if (xhci->xhc_state & XHCI_STATE_DYING ||
+            xhci->xhc_state & XHCI_STATE_HALTED) {
                 xhci_dbg(xhci, "xHCI dying, ignoring interrupt. "
                                 "Shouldn't IRQs be disabled?\n");
                 /* Clear the event handler busy flag (RW1C);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index fa7e1ef36cd9..f2f9518c53ab 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -685,20 +685,23 @@ void xhci_stop(struct usb_hcd *hcd)
         u32 temp;
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
 
-        if (xhci->xhc_state & XHCI_STATE_HALTED)
-                return;
-
         mutex_lock(&xhci->mutex);
-        spin_lock_irq(&xhci->lock);
-        xhci->xhc_state |= XHCI_STATE_HALTED;
-        xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
 
-        /* Make sure the xHC is halted for a USB3 roothub
-         * (xhci_stop() could be called as part of failed init).
-         */
-        xhci_halt(xhci);
-        xhci_reset(xhci);
-        spin_unlock_irq(&xhci->lock);
+        if (!(xhci->xhc_state & XHCI_STATE_HALTED)) {
+                spin_lock_irq(&xhci->lock);
+
+                xhci->xhc_state |= XHCI_STATE_HALTED;
+                xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
+                xhci_halt(xhci);
+                xhci_reset(xhci);
+
+                spin_unlock_irq(&xhci->lock);
+        }
+
+        if (!usb_hcd_is_primary_hcd(hcd)) {
+                mutex_unlock(&xhci->mutex);
+                return;
+        }
 
         xhci_cleanup_msix(xhci);
 
@@ -4886,7 +4889,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
                 xhci->hcc_params2 = readl(&xhci->cap_regs->hcc_params2);
         xhci_print_registers(xhci);
 
-        xhci->quirks = quirks;
+        xhci->quirks |= quirks;
 
         get_quirks(dev, xhci);
 
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 39fd95833eb8..f824336def5c 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1090,29 +1090,6 @@ void musb_stop(struct musb *musb)
         musb_platform_try_idle(musb, 0);
 }
 
-static void musb_shutdown(struct platform_device *pdev)
-{
-        struct musb     *musb = dev_to_musb(&pdev->dev);
-        unsigned long   flags;
-
-        pm_runtime_get_sync(musb->controller);
-
-        musb_host_cleanup(musb);
-        musb_gadget_cleanup(musb);
-
-        spin_lock_irqsave(&musb->lock, flags);
-        musb_platform_disable(musb);
-        musb_generic_disable(musb);
-        spin_unlock_irqrestore(&musb->lock, flags);
-
-        musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
-        musb_platform_exit(musb);
-
-        pm_runtime_put(musb->controller);
-        /* FIXME power down */
-}
-
-
 /*-------------------------------------------------------------------------*/
 
 /*
@@ -1702,7 +1679,7 @@ EXPORT_SYMBOL_GPL(musb_dma_completion);
 #define use_dma                 0
 #endif
 
-static void (*musb_phy_callback)(enum musb_vbus_id_status status);
+static int (*musb_phy_callback)(enum musb_vbus_id_status status);
 
 /*
  * musb_mailbox - optional phy notifier function
@@ -1711,11 +1688,12 @@ static void (*musb_phy_callback)(enum musb_vbus_id_status status);
  * Optionally gets called from the USB PHY. Note that the USB PHY must be
  * disabled at the point the phy_callback is registered or unregistered.
  */
-void musb_mailbox(enum musb_vbus_id_status status)
+int musb_mailbox(enum musb_vbus_id_status status)
 {
         if (musb_phy_callback)
-                musb_phy_callback(status);
+                return musb_phy_callback(status);
 
+        return -ENODEV;
 };
 EXPORT_SYMBOL_GPL(musb_mailbox);
 
@@ -2028,11 +2006,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         musb_readl = musb_default_readl;
         musb_writel = musb_default_writel;
 
-        /* We need musb_read/write functions initialized for PM */
-        pm_runtime_use_autosuspend(musb->controller);
-        pm_runtime_set_autosuspend_delay(musb->controller, 200);
-        pm_runtime_enable(musb->controller);
-
         /* The musb_platform_init() call:
          *   - adjusts musb->mregs
          *   - sets the musb->isr
@@ -2134,6 +2107,16 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (musb->ops->phy_callback)
                 musb_phy_callback = musb->ops->phy_callback;
 
+        /*
+         * We need musb_read/write functions initialized for PM.
+         * Note that at least 2430 glue needs autosuspend delay
+         * somewhere above 300 ms for the hardware to idle properly
+         * after disconnecting the cable in host mode. Let's use
+         * 500 ms for some margin.
+         */
+        pm_runtime_use_autosuspend(musb->controller);
+        pm_runtime_set_autosuspend_delay(musb->controller, 500);
+        pm_runtime_enable(musb->controller);
         pm_runtime_get_sync(musb->controller);
 
         status = usb_phy_init(musb->xceiv);
@@ -2237,13 +2220,8 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (status)
                 goto fail5;
 
-        pm_runtime_put(musb->controller);
-
-        /*
-         * For why this is currently needed, see commit 3e43a0725637
-         * ("usb: musb: core: add pm_runtime_irq_safe()")
-         */
-        pm_runtime_irq_safe(musb->controller);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
 
         return 0;
 
@@ -2265,7 +2243,9 @@ fail2_5:
         usb_phy_shutdown(musb->xceiv);
 
 err_usb_phy_init:
+        pm_runtime_dont_use_autosuspend(musb->controller);
         pm_runtime_put_sync(musb->controller);
+        pm_runtime_disable(musb->controller);
 
 fail2:
         if (musb->irq_wake)
@@ -2273,7 +2253,6 @@ fail2:
         musb_platform_exit(musb);
 
 fail1:
-        pm_runtime_disable(musb->controller);
         dev_err(musb->controller,
                 "musb_init_controller failed with status %d\n", status);
 
@@ -2312,6 +2291,7 @@ static int musb_remove(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
         struct musb     *musb = dev_to_musb(dev);
+        unsigned long   flags;
 
         /* this gets called on rmmod.
          *  - Host mode: host may still be active
@@ -2319,17 +2299,26 @@ static int musb_remove(struct platform_device *pdev)
          *  - OTG mode: both roles are deactivated (or never-activated)
          */
         musb_exit_debugfs(musb);
-        musb_shutdown(pdev);
-        musb_phy_callback = NULL;
-
-        if (musb->dma_controller)
-                musb_dma_controller_destroy(musb->dma_controller);
-
-        usb_phy_shutdown(musb->xceiv);
 
         cancel_work_sync(&musb->irq_work);
         cancel_delayed_work_sync(&musb->finish_resume_work);
         cancel_delayed_work_sync(&musb->deassert_reset_work);
+        pm_runtime_get_sync(musb->controller);
+        musb_host_cleanup(musb);
+        musb_gadget_cleanup(musb);
+        spin_lock_irqsave(&musb->lock, flags);
+        musb_platform_disable(musb);
+        musb_generic_disable(musb);
+        spin_unlock_irqrestore(&musb->lock, flags);
+        musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
+        pm_runtime_dont_use_autosuspend(musb->controller);
+        pm_runtime_put_sync(musb->controller);
+        pm_runtime_disable(musb->controller);
+        musb_platform_exit(musb);
+        musb_phy_callback = NULL;
+        if (musb->dma_controller)
+                musb_dma_controller_destroy(musb->dma_controller);
+        usb_phy_shutdown(musb->xceiv);
         musb_free(musb);
         device_init_wakeup(dev, 0);
         return 0;
@@ -2429,7 +2418,8 @@ static void musb_restore_context(struct musb *musb)
         musb_writew(musb_base, MUSB_INTRTXE, musb->intrtxe);
         musb_writew(musb_base, MUSB_INTRRXE, musb->intrrxe);
         musb_writeb(musb_base, MUSB_INTRUSBE, musb->context.intrusbe);
-        musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);
+        if (musb->context.devctl & MUSB_DEVCTL_SESSION)
+                musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);
 
         for (i = 0; i < musb->config->num_eps; ++i) {
                 struct musb_hw_ep       *hw_ep;
@@ -2612,7 +2602,6 @@ static struct platform_driver musb_driver = {
         },
         .probe          = musb_probe,
         .remove         = musb_remove,
-        .shutdown       = musb_shutdown,
 };
 
 module_platform_driver(musb_driver);
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index b6afe9e43305..b55a776b03eb 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -215,7 +215,7 @@ struct musb_platform_ops {
                                 dma_addr_t *dma_addr, u32 *len);
         void    (*pre_root_reset_end)(struct musb *musb);
         void    (*post_root_reset_end)(struct musb *musb);
-        void    (*phy_callback)(enum musb_vbus_id_status status);
+        int     (*phy_callback)(enum musb_vbus_id_status status);
 };
 
 /*
@@ -312,6 +312,7 @@ struct musb {
         struct work_struct      irq_work;
         struct delayed_work     deassert_reset_work;
         struct delayed_work     finish_resume_work;
+        struct delayed_work     gadget_work;
         u16                     hwvers;
 
         u16                     intrrxe;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 152865b36522..af2a3a7addf9 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1656,6 +1656,20 @@ static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         return usb_phy_set_power(musb->xceiv, mA);
 }
 
+static void musb_gadget_work(struct work_struct *work)
+{
+        struct musb *musb;
+        unsigned long flags;
+
+        musb = container_of(work, struct musb, gadget_work.work);
+        pm_runtime_get_sync(musb->controller);
+        spin_lock_irqsave(&musb->lock, flags);
+        musb_pullup(musb, musb->softconnect);
+        spin_unlock_irqrestore(&musb->lock, flags);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
+}
+
 static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
 {
         struct musb     *musb = gadget_to_musb(gadget);
@@ -1663,20 +1677,16 @@ static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
 
         is_on = !!is_on;
 
-        pm_runtime_get_sync(musb->controller);
-
         /* NOTE: this assumes we are sensing vbus; we'd rather
          * not pullup unless the B-session is active.
          */
         spin_lock_irqsave(&musb->lock, flags);
         if (is_on != musb->softconnect) {
                 musb->softconnect = is_on;
-                musb_pullup(musb, is_on);
+                schedule_delayed_work(&musb->gadget_work, 0);
         }
         spin_unlock_irqrestore(&musb->lock, flags);
 
-        pm_runtime_put(musb->controller);
-
         return 0;
 }
 
@@ -1845,7 +1855,7 @@ int musb_gadget_setup(struct musb *musb)
 #elif IS_ENABLED(CONFIG_USB_MUSB_GADGET)
         musb->g.is_otg = 0;
 #endif
-
+        INIT_DELAYED_WORK(&musb->gadget_work, musb_gadget_work);
         musb_g_init_endpoints(musb);
 
         musb->is_active = 0;
@@ -1866,6 +1876,8 @@ void musb_gadget_cleanup(struct musb *musb)
 {
         if (musb->port_mode == MUSB_PORT_MODE_HOST)
                 return;
+
+        cancel_delayed_work_sync(&musb->gadget_work);
         usb_del_gadget_udc(&musb->g);
 }
 
@@ -1914,8 +1926,8 @@ static int musb_gadget_start(struct usb_gadget *g,
         if (musb->xceiv->last_event == USB_EVENT_ID)
                 musb_platform_set_vbus(musb, 1);
 
-        if (musb->xceiv->last_event == USB_EVENT_NONE)
-                pm_runtime_put(musb->controller);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
 
         return 0;
 
@@ -1934,8 +1946,7 @@ static int musb_gadget_stop(struct usb_gadget *g)
         struct musb     *musb = gadget_to_musb(g);
         unsigned long   flags;
 
-        if (musb->xceiv->last_event == USB_EVENT_NONE)
-                pm_runtime_get_sync(musb->controller);
+        pm_runtime_get_sync(musb->controller);
 
         /*
          * REVISIT always use otg_set_peripheral() here too;
@@ -1963,7 +1974,8 @@ static int musb_gadget_stop(struct usb_gadget *g)
          * that currently misbehaves.
          */
 
-        pm_runtime_put(musb->controller);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
 
         return 0;
 }
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 2f8ad7f1f482..d227a71d85e1 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -434,7 +434,13 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
                 }
         }
 
-        if (qh != NULL && qh->is_ready) {
+        /*
+         * The pipe must be broken if current urb->status is set, so don't
+         * start next urb.
+         * TODO: to minimize the risk of regression, only check urb->status
+         * for RX, until we have a test case to understand the behavior of TX.
+         */
+        if ((!status || !is_in) && qh && qh->is_ready) {
                 dev_dbg(musb->controller, "... next ep%d %cX urb %p\n",
                     hw_ep->epnum, is_in ? 'R' : 'T', next_urb(qh));
                 musb_start_urb(musb, is_in, qh);
@@ -594,14 +600,13 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, u8 epnum)
                 musb_writew(ep->regs, MUSB_TXCSR, 0);
 
         /* scrub all previous state, clearing toggle */
-        } else {
-                csr = musb_readw(ep->regs, MUSB_RXCSR);
-                if (csr & MUSB_RXCSR_RXPKTRDY)
-                        WARNING("rx%d, packet/%d ready?\n", ep->epnum,
-                                musb_readw(ep->regs, MUSB_RXCOUNT));
-
-                musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
         }
+        csr = musb_readw(ep->regs, MUSB_RXCSR);
+        if (csr & MUSB_RXCSR_RXPKTRDY)
+                WARNING("rx%d, packet/%d ready?\n", ep->epnum,
+                        musb_readw(ep->regs, MUSB_RXCOUNT));
+
+        musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
 
         /* target addr and (for multipoint) hub addr/port */
         if (musb->is_multipoint) {
@@ -627,7 +632,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, u8 epnum)
         ep->rx_reinit = 0;
 }
 
-static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
+static void musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
                 struct musb_hw_ep *hw_ep, struct musb_qh *qh,
                 struct urb *urb, u32 offset,
                 u32 *length, u8 *mode)
@@ -664,23 +669,18 @@ static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
         }
         channel->desired_mode = *mode;
         musb_writew(epio, MUSB_TXCSR, csr);
-
-        return 0;
 }
 
-static int musb_tx_dma_set_mode_cppi_tusb(struct dma_controller *dma,
-                                          struct musb_hw_ep *hw_ep,
-                                          struct musb_qh *qh,
-                                          struct urb *urb,
-                                          u32 offset,
-                                          u32 *length,
-                                          u8 *mode)
+static void musb_tx_dma_set_mode_cppi_tusb(struct dma_controller *dma,
+                                           struct musb_hw_ep *hw_ep,
+                                           struct musb_qh *qh,
+                                           struct urb *urb,
+                                           u32 offset,
+                                           u32 *length,
+                                           u8 *mode)
 {
         struct dma_channel *channel = hw_ep->tx_channel;
 
-        if (!is_cppi_enabled(hw_ep->musb) && !tusb_dma_omap(hw_ep->musb))
-                return -ENODEV;
-
         channel->actual_len = 0;
 
         /*
@@ -688,8 +688,6 @@ static int musb_tx_dma_set_mode_cppi_tusb(struct dma_controller *dma,
          * to identify the zero-length-final-packet case.
          */
         *mode = (urb->transfer_flags & URB_ZERO_PACKET) ? 1 : 0;
-
-        return 0;
 }
 
 static bool musb_tx_dma_program(struct dma_controller *dma,
@@ -699,15 +697,14 @@ static bool musb_tx_dma_program(struct dma_controller *dma,
         struct dma_channel      *channel = hw_ep->tx_channel;
         u16                     pkt_size = qh->maxpacket;
         u8                      mode;
-        int                     res;
 
         if (musb_dma_inventra(hw_ep->musb) || musb_dma_ux500(hw_ep->musb))
-                res = musb_tx_dma_set_mode_mentor(dma, hw_ep, qh, urb,
-                                                 offset, &length, &mode);
+                musb_tx_dma_set_mode_mentor(dma, hw_ep, qh, urb, offset,
+                                            &length, &mode);
+        else if (is_cppi_enabled(hw_ep->musb) || tusb_dma_omap(hw_ep->musb))
+                musb_tx_dma_set_mode_cppi_tusb(dma, hw_ep, qh, urb, offset,
+                                               &length, &mode);
         else
-                res = musb_tx_dma_set_mode_cppi_tusb(dma, hw_ep, qh, urb,
-                                                     offset, &length, &mode);
-        if (res)
                 return false;
 
         qh->segsize = length;
@@ -995,9 +992,15 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep,
         if (is_in) {
                 dma = is_dma_capable() ? ep->rx_channel : NULL;
 
-                /* clear nak timeout bit */
+                /*
+                 * Need to stop the transaction by clearing REQPKT first
+                 * then the NAK Timeout bit ref MUSBMHDRC USB 2.0 HIGH-SPEED
+                 * DUAL-ROLE CONTROLLER Programmer's Guide, section 9.2.2
+                 */
                 rx_csr = musb_readw(epio, MUSB_RXCSR);
                 rx_csr |= MUSB_RXCSR_H_WZC_BITS;
+                rx_csr &= ~MUSB_RXCSR_H_REQPKT;
+                musb_writew(epio, MUSB_RXCSR, rx_csr);
                 rx_csr &= ~MUSB_RXCSR_DATAERROR;
                 musb_writew(epio, MUSB_RXCSR, rx_csr);
 
@@ -1551,7 +1554,7 @@ static int musb_rx_dma_iso_cppi41(struct dma_controller *dma,
                                   struct urb *urb,
                                   size_t len)
 {
-        struct dma_channel *channel = hw_ep->tx_channel;
+        struct dma_channel *channel = hw_ep->rx_channel;
         void __iomem *epio = hw_ep->regs;
         dma_addr_t *buf;
         u32 length, res;
@@ -1870,6 +1873,9 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                 status = -EPROTO;
                 musb_writeb(epio, MUSB_RXINTERVAL, 0);
 
+                rx_csr &= ~MUSB_RXCSR_H_ERROR;
+                musb_writew(epio, MUSB_RXCSR, rx_csr);
+
         } else if (rx_csr & MUSB_RXCSR_DATAERROR) {
 
                 if (USB_ENDPOINT_XFER_ISOC != qh->type) {
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c84e0322c108..0b4cec940386 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -49,97 +49,14 @@ struct omap2430_glue {
         enum musb_vbus_id_status status;
         struct work_struct      omap_musb_mailbox_work;
         struct device           *control_otghs;
+        bool                    cable_connected;
+        bool                    enabled;
+        bool                    powered;
 };
 #define glue_to_musb(g)         platform_get_drvdata(g->musb)
 
 static struct omap2430_glue     *_glue;
 
-static struct timer_list musb_idle_timer;
-
-static void musb_do_idle(unsigned long _musb)
-{
-        struct musb     *musb = (void *)_musb;
-        unsigned long   flags;
-        u8      power;
-        u8      devctl;
-
-        spin_lock_irqsave(&musb->lock, flags);
-
-        switch (musb->xceiv->otg->state) {
-        case OTG_STATE_A_WAIT_BCON:
-
-                devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-                if (devctl & MUSB_DEVCTL_BDEVICE) {
-                        musb->xceiv->otg->state = OTG_STATE_B_IDLE;
-                        MUSB_DEV_MODE(musb);
-                } else {
-                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
-                        MUSB_HST_MODE(musb);
-                }
-                break;
-        case OTG_STATE_A_SUSPEND:
-                /* finish RESUME signaling? */
-                if (musb->port1_status & MUSB_PORT_STAT_RESUME) {
-                        power = musb_readb(musb->mregs, MUSB_POWER);
-                        power &= ~MUSB_POWER_RESUME;
-                        dev_dbg(musb->controller, "root port resume stopped, power %02x\n", power);
-                        musb_writeb(musb->mregs, MUSB_POWER, power);
-                        musb->is_active = 1;
-                        musb->port1_status &= ~(USB_PORT_STAT_SUSPEND
-                                                | MUSB_PORT_STAT_RESUME);
-                        musb->port1_status |= USB_PORT_STAT_C_SUSPEND << 16;
-                        usb_hcd_poll_rh_status(musb->hcd);
-                        /* NOTE: it might really be A_WAIT_BCON ... */
-                        musb->xceiv->otg->state = OTG_STATE_A_HOST;
-                }
-                break;
-        case OTG_STATE_A_HOST:
-                devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-                if (devctl &  MUSB_DEVCTL_BDEVICE)
-                        musb->xceiv->otg->state = OTG_STATE_B_IDLE;
-                else
-                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_BCON;
-        default:
-                break;
-        }
-        spin_unlock_irqrestore(&musb->lock, flags);
-}
-
-
-static void omap2430_musb_try_idle(struct musb *musb, unsigned long timeout)
-{
-        unsigned long           default_timeout = jiffies + msecs_to_jiffies(3);
-        static unsigned long    last_timer;
-
-        if (timeout == 0)
-                timeout = default_timeout;
-
-        /* Never idle if active, or when VBUS timeout is not set as host */
-        if (musb->is_active || ((musb->a_wait_bcon == 0)
-                        && (musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON))) {
-                dev_dbg(musb->controller, "%s active, deleting timer\n",
-                        usb_otg_state_string(musb->xceiv->otg->state));
-                del_timer(&musb_idle_timer);
-                last_timer = jiffies;
-                return;
-        }
-
-        if (time_after(last_timer, timeout)) {
-                if (!timer_pending(&musb_idle_timer))
-                        last_timer = timeout;
-                else {
-                        dev_dbg(musb->controller, "Longer idle timer already pending, ignoring\n");
-                        return;
-                }
-        }
-        last_timer = timeout;
-
-        dev_dbg(musb->controller, "%s inactive, for idle timer for %lu ms\n",
-                usb_otg_state_string(musb->xceiv->otg->state),
-                (unsigned long)jiffies_to_msecs(timeout - jiffies));
-        mod_timer(&musb_idle_timer, timeout);
-}
-
 static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 {
         struct usb_otg  *otg = musb->xceiv->otg;
@@ -205,16 +122,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                 musb_readb(musb->mregs, MUSB_DEVCTL));
 }
 
-static int omap2430_musb_set_mode(struct musb *musb, u8 musb_mode)
-{
-        u8      devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-
-        devctl |= MUSB_DEVCTL_SESSION;
-        musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
-
-        return 0;
-}
-
 static inline void omap2430_low_level_exit(struct musb *musb)
 {
         u32 l;
@@ -234,22 +141,63 @@ static inline void omap2430_low_level_init(struct musb *musb)
         musb_writel(musb->mregs, OTG_FORCESTDBY, l);
 }
 
-static void omap2430_musb_mailbox(enum musb_vbus_id_status status)
+/*
+ * We can get multiple cable events so we need to keep track
+ * of the power state. Only keep power enabled if USB cable is
+ * connected and a gadget is started.
+ */
+static void omap2430_set_power(struct musb *musb, bool enabled, bool cable)
+{
+        struct device *dev = musb->controller;
+        struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
+        bool power_up;
+        int res;
+
+        if (glue->enabled != enabled)
+                glue->enabled = enabled;
+
+        if (glue->cable_connected != cable)
+                glue->cable_connected = cable;
+
+        power_up = glue->enabled && glue->cable_connected;
+        if (power_up == glue->powered) {
+                dev_warn(musb->controller, "power state already %i\n",
+                         power_up);
+                return;
+        }
+
+        glue->powered = power_up;
+
+        if (power_up) {
+                res = pm_runtime_get_sync(musb->controller);
+                if (res < 0) {
+                        dev_err(musb->controller, "could not enable: %i", res);
+                        glue->powered = false;
+                }
+        } else {
+                pm_runtime_mark_last_busy(musb->controller);
+                pm_runtime_put_autosuspend(musb->controller);
+        }
+}
+
+static int omap2430_musb_mailbox(enum musb_vbus_id_status status)
 {
         struct omap2430_glue    *glue = _glue;
 
         if (!glue) {
                 pr_err("%s: musb core is not yet initialized\n", __func__);
-                return;
+                return -EPROBE_DEFER;
         }
         glue->status = status;
 
         if (!glue_to_musb(glue)) {
                 pr_err("%s: musb core is not yet ready\n", __func__);
-                return;
+                return -EPROBE_DEFER;
         }
 
         schedule_work(&glue->omap_musb_mailbox_work);
+
+        return 0;
 }
 
 static void omap_musb_set_mailbox(struct omap2430_glue *glue)
@@ -259,6 +207,13 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
         struct musb_hdrc_platform_data *pdata = dev_get_platdata(dev);
         struct omap_musb_board_data *data = pdata->board_data;
         struct usb_otg *otg = musb->xceiv->otg;
+        bool cable_connected;
+
+        cable_connected = ((glue->status == MUSB_ID_GROUND) ||
+                           (glue->status == MUSB_VBUS_VALID));
+
+        if (cable_connected)
+                omap2430_set_power(musb, glue->enabled, cable_connected);
 
         switch (glue->status) {
         case MUSB_ID_GROUND:
@@ -268,7 +223,6 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                 musb->xceiv->last_event = USB_EVENT_ID;
                 if (musb->gadget_driver) {
-                        pm_runtime_get_sync(dev);
                         omap_control_usb_set_mode(glue->control_otghs,
                                 USB_MODE_HOST);
                         omap2430_musb_set_vbus(musb, 1);
@@ -281,8 +235,6 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 otg->default_a = false;
                 musb->xceiv->otg->state = OTG_STATE_B_IDLE;
                 musb->xceiv->last_event = USB_EVENT_VBUS;
-                if (musb->gadget_driver)
-                        pm_runtime_get_sync(dev);
                 omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
                 break;
 
@@ -291,11 +243,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 dev_dbg(dev, "VBUS Disconnect\n");
 
                 musb->xceiv->last_event = USB_EVENT_NONE;
-                if (musb->gadget_driver) {
+                if (musb->gadget_driver)
                         omap2430_musb_set_vbus(musb, 0);
-                        pm_runtime_mark_last_busy(dev);
-                        pm_runtime_put_autosuspend(dev);
-                }
 
                 if (data->interface_type == MUSB_INTERFACE_UTMI)
                         otg_set_vbus(musb->xceiv->otg, 0);
@@ -307,6 +256,9 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 dev_dbg(dev, "ID float\n");
         }
 
+        if (!cable_connected)
+                omap2430_set_power(musb, glue->enabled, cable_connected);
+
         atomic_notifier_call_chain(&musb->xceiv->notifier,
                         musb->xceiv->last_event, NULL);
 }
@@ -316,13 +268,8 @@ static void omap_musb_mailbox_work(struct work_struct *mailbox_work)
 {
         struct omap2430_glue *glue = container_of(mailbox_work,
                                 struct omap2430_glue, omap_musb_mailbox_work);
-        struct musb *musb = glue_to_musb(glue);
-        struct device *dev = musb->controller;
 
-        pm_runtime_get_sync(dev);
         omap_musb_set_mailbox(glue);
-        pm_runtime_mark_last_busy(dev);
-        pm_runtime_put_autosuspend(dev);
 }
 
 static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
@@ -389,23 +336,7 @@ static int omap2430_musb_init(struct musb *musb)
                 return PTR_ERR(musb->phy);
         }
         musb->isr = omap2430_musb_interrupt;
-
-        /*
-         * Enable runtime PM for musb parent (this driver). We can't
-         * do it earlier as struct musb is not yet allocated and we
-         * need to touch the musb registers for runtime PM.
-         */
-        pm_runtime_enable(glue->dev);
-        status = pm_runtime_get_sync(glue->dev);
-        if (status < 0)
-                goto err1;
-
-        status = pm_runtime_get_sync(dev);
-        if (status < 0) {
-                dev_err(dev, "pm_runtime_get_sync FAILED %d\n", status);
-                pm_runtime_put_sync(glue->dev);
-                goto err1;
-        }
+        phy_init(musb->phy);
 
         l = musb_readl(musb->mregs, OTG_INTERFSEL);
 
@@ -427,20 +358,10 @@ static int omap2430_musb_init(struct musb *musb)
                         musb_readl(musb->mregs, OTG_INTERFSEL),
                         musb_readl(musb->mregs, OTG_SIMENABLE));
 
-        setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb);
-
         if (glue->status != MUSB_UNKNOWN)
                 omap_musb_set_mailbox(glue);
 
-        phy_init(musb->phy);
-        phy_power_on(musb->phy);
-
-        pm_runtime_put_noidle(musb->controller);
-        pm_runtime_put_noidle(glue->dev);
         return 0;
-
-err1:
-        return status;
 }
 
 static void omap2430_musb_enable(struct musb *musb)
@@ -452,6 +373,11 @@ static void omap2430_musb_enable(struct musb *musb)
         struct musb_hdrc_platform_data *pdata = dev_get_platdata(dev);
         struct omap_musb_board_data *data = pdata->board_data;
 
+        if (!WARN_ON(!musb->phy))
+                phy_power_on(musb->phy);
+
+        omap2430_set_power(musb, true, glue->cable_connected);
+
         switch (glue->status) {
 
         case MUSB_ID_GROUND:
@@ -487,18 +413,25 @@ static void omap2430_musb_disable(struct musb *musb)
         struct device *dev = musb->controller;
         struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
+        if (!WARN_ON(!musb->phy))
+                phy_power_off(musb->phy);
+
         if (glue->status != MUSB_UNKNOWN)
                 omap_control_usb_set_mode(glue->control_otghs,
                         USB_MODE_DISCONNECT);
+
+        omap2430_set_power(musb, false, glue->cable_connected);
 }
 
 static int omap2430_musb_exit(struct musb *musb)
 {
-        del_timer_sync(&musb_idle_timer);
+        struct device *dev = musb->controller;
+        struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
         omap2430_low_level_exit(musb);
-        phy_power_off(musb->phy);
         phy_exit(musb->phy);
+        musb->phy = NULL;
+        cancel_work_sync(&glue->omap_musb_mailbox_work);
 
         return 0;
 }
@@ -512,9 +445,6 @@ static const struct musb_platform_ops omap2430_ops = {
         .init           = omap2430_musb_init,
         .exit           = omap2430_musb_exit,
 
-        .set_mode       = omap2430_musb_set_mode,
-        .try_idle       = omap2430_musb_try_idle,
-
         .set_vbus       = omap2430_musb_set_vbus,
 
         .enable         = omap2430_musb_enable,
@@ -639,11 +569,9 @@ static int omap2430_probe(struct platform_device *pdev)
                 goto err2;
         }
 
-        /*
-         * Note that we cannot enable PM runtime yet for this
-         * driver as we need struct musb initialized first.
-         * See omap2430_musb_init above.
-         */
+        pm_runtime_enable(glue->dev);
+        pm_runtime_use_autosuspend(glue->dev);
+        pm_runtime_set_autosuspend_delay(glue->dev, 500);
 
         ret = platform_device_add(musb);
         if (ret) {
@@ -662,12 +590,14 @@ err0:
 
 static int omap2430_remove(struct platform_device *pdev)
 {
-        struct omap2430_glue            *glue = platform_get_drvdata(pdev);
+        struct omap2430_glue *glue = platform_get_drvdata(pdev);
+        struct musb *musb = glue_to_musb(glue);
 
         pm_runtime_get_sync(glue->dev);
-        cancel_work_sync(&glue->omap_musb_mailbox_work);
         platform_device_unregister(glue->musb);
+        omap2430_set_power(musb, false, false);
         pm_runtime_put_sync(glue->dev);
+        pm_runtime_dont_use_autosuspend(glue->dev);
         pm_runtime_disable(glue->dev);
 
         return 0;
@@ -680,12 +610,13 @@ static int omap2430_runtime_suspend(struct device *dev)
         struct omap2430_glue            *glue = dev_get_drvdata(dev);
         struct musb                     *musb = glue_to_musb(glue);
 
-        if (musb) {
-                musb->context.otg_interfsel = musb_readl(musb->mregs,
-                                OTG_INTERFSEL);
+        if (!musb)
+                return 0;
 
-                omap2430_low_level_exit(musb);
-        }
+        musb->context.otg_interfsel = musb_readl(musb->mregs,
+                                                 OTG_INTERFSEL);
+
+        omap2430_low_level_exit(musb);
 
         return 0;
 }
@@ -696,7 +627,7 @@ static int omap2430_runtime_resume(struct device *dev)
         struct musb                     *musb = glue_to_musb(glue);
 
         if (!musb)
-                return -EPROBE_DEFER;
+                return 0;
 
         omap2430_low_level_init(musb);
         musb_writel(musb->mregs, OTG_INTERFSEL,
@@ -738,18 +669,8 @@ static struct platform_driver omap2430_driver = {
         },
 };
 
+module_platform_driver(omap2430_driver);
+
 MODULE_DESCRIPTION("OMAP2PLUS MUSB Glue Layer");
 MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
 MODULE_LICENSE("GPL v2");
-
-static int __init omap2430_init(void)
-{
-        return platform_driver_register(&omap2430_driver);
-}
-subsys_initcall(omap2430_init);
-
-static void __exit omap2430_exit(void)
-{
-        platform_driver_unregister(&omap2430_driver);
-}
-module_exit(omap2430_exit);
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index fdab4232cfbf..76500515dd8b 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -80,7 +80,8 @@ static struct musb *sunxi_musb;
 
 struct sunxi_glue {
         struct device           *dev;
-        struct platform_device  *musb;
+        struct musb             *musb;
+        struct platform_device  *musb_pdev;
         struct clk              *clk;
         struct reset_control    *rst;
         struct phy              *phy;
@@ -102,7 +103,7 @@ static void sunxi_musb_work(struct work_struct *work)
                 return;
 
         if (test_and_clear_bit(SUNXI_MUSB_FL_HOSTMODE_PEND, &glue->flags)) {
-                struct musb *musb = platform_get_drvdata(glue->musb);
+                struct musb *musb = glue->musb;
                 unsigned long flags;
                 u8 devctl;
 
@@ -112,7 +113,7 @@ static void sunxi_musb_work(struct work_struct *work)
                 if (test_bit(SUNXI_MUSB_FL_HOSTMODE, &glue->flags)) {
                         set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
                         musb->xceiv->otg->default_a = 1;
-                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
+                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                         MUSB_HST_MODE(musb);
                         devctl |= MUSB_DEVCTL_SESSION;
                 } else {
@@ -145,10 +146,12 @@ static void sunxi_musb_set_vbus(struct musb *musb, int is_on)
 {
         struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
 
-        if (is_on)
+        if (is_on) {
                 set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
-        else
+                musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
+        } else {
                 clear_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
+        }
 
         schedule_work(&glue->work);
 }
@@ -264,15 +267,6 @@ static int sunxi_musb_init(struct musb *musb)
         if (ret)
                 goto error_unregister_notifier;
 
-        if (musb->port_mode == MUSB_PORT_MODE_HOST) {
-                ret = phy_power_on(glue->phy);
-                if (ret)
-                        goto error_phy_exit;
-                set_bit(SUNXI_MUSB_FL_PHY_ON, &glue->flags);
-                /* Stop musb work from turning vbus off again */
-                set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
-        }
-
         musb->isr = sunxi_musb_interrupt;
 
         /* Stop the musb-core from doing runtime pm (not supported on sunxi) */
@@ -280,8 +274,6 @@ static int sunxi_musb_init(struct musb *musb)
 
         return 0;
 
-error_phy_exit:
-        phy_exit(glue->phy);
 error_unregister_notifier:
         if (musb->port_mode == MUSB_PORT_MODE_DUAL_ROLE)
                 extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST,
@@ -323,10 +315,31 @@ static int sunxi_musb_exit(struct musb *musb)
         return 0;
 }
 
+static int sunxi_set_mode(struct musb *musb, u8 mode)
+{
+        struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
+        int ret;
+
+        if (mode == MUSB_HOST) {
+                ret = phy_power_on(glue->phy);
+                if (ret)
+                        return ret;
+
+                set_bit(SUNXI_MUSB_FL_PHY_ON, &glue->flags);
+                /* Stop musb work from turning vbus off again */
+                set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
+                musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
+        }
+
+        return 0;
+}
+
 static void sunxi_musb_enable(struct musb *musb)
 {
         struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
 
+        glue->musb = musb;
+
         /* musb_core does not call us in a balanced manner */
         if (test_and_set_bit(SUNXI_MUSB_FL_ENABLED, &glue->flags))
                 return;
@@ -569,6 +582,7 @@ static const struct musb_platform_ops sunxi_musb_ops = {
         .exit           = sunxi_musb_exit,
         .enable         = sunxi_musb_enable,
         .disable        = sunxi_musb_disable,
+        .set_mode       = sunxi_set_mode,
         .fifo_offset    = sunxi_musb_fifo_offset,
         .ep_offset      = sunxi_musb_ep_offset,
         .busctl_offset  = sunxi_musb_busctl_offset,
@@ -721,9 +735,9 @@ static int sunxi_musb_probe(struct platform_device *pdev)
         pinfo.data      = &pdata;
         pinfo.size_data = sizeof(pdata);
 
-        glue->musb = platform_device_register_full(&pinfo);
-        if (IS_ERR(glue->musb)) {
-                ret = PTR_ERR(glue->musb);
+        glue->musb_pdev = platform_device_register_full(&pinfo);
+        if (IS_ERR(glue->musb_pdev)) {
+                ret = PTR_ERR(glue->musb_pdev);
                 dev_err(&pdev->dev, "Error registering musb dev: %d\n", ret);
                 goto err_unregister_usb_phy;
         }
@@ -740,7 +754,7 @@ static int sunxi_musb_remove(struct platform_device *pdev)
         struct sunxi_glue *glue = platform_get_drvdata(pdev);
         struct platform_device *usb_phy = glue->usb_phy;
 
-        platform_device_unregister(glue->musb); /* Frees glue ! */
+        platform_device_unregister(glue->musb_pdev);
         usb_phy_generic_unregister(usb_phy);
 
         return 0;
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 24e2b3cf1867..a72e8d670adc 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -97,6 +97,9 @@ struct twl6030_usb {
 
         struct regulator                *usb3v3;
 
+        /* used to check initial cable status after probe */
+        struct delayed_work     get_status_work;
+
         /* used to set vbus, in atomic path */
         struct work_struct      set_vbus_work;
 
@@ -227,12 +230,16 @@ static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
                         twl->asleep = 1;
                         status = MUSB_VBUS_VALID;
                         twl->linkstat = status;
-                        musb_mailbox(status);
+                        ret = musb_mailbox(status);
+                        if (ret)
+                                twl->linkstat = MUSB_UNKNOWN;
                 } else {
                         if (twl->linkstat != MUSB_UNKNOWN) {
                                 status = MUSB_VBUS_OFF;
                                 twl->linkstat = status;
-                                musb_mailbox(status);
+                                ret = musb_mailbox(status);
+                                if (ret)
+                                        twl->linkstat = MUSB_UNKNOWN;
                                 if (twl->asleep) {
                                         regulator_disable(twl->usb3v3);
                                         twl->asleep = 0;
@@ -264,7 +271,9 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
                 twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
                 status = MUSB_ID_GROUND;
                 twl->linkstat = status;
-                musb_mailbox(status);
+                ret = musb_mailbox(status);
+                if (ret)
+                        twl->linkstat = MUSB_UNKNOWN;
         } else  {
                 twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_CLR);
                 twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
@@ -274,6 +283,15 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
         return IRQ_HANDLED;
 }
 
+static void twl6030_status_work(struct work_struct *work)
+{
+        struct twl6030_usb *twl = container_of(work, struct twl6030_usb,
+                                               get_status_work.work);
+
+        twl6030_usb_irq(twl->irq2, twl);
+        twl6030_usbotg_irq(twl->irq1, twl);
+}
+
 static int twl6030_enable_irq(struct twl6030_usb *twl)
 {
         twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
@@ -284,8 +302,6 @@ static int twl6030_enable_irq(struct twl6030_usb *twl)
                                 REG_INT_MSK_LINE_C);
         twl6030_interrupt_unmask(TWL6030_CHARGER_CTRL_INT_MASK,
                                 REG_INT_MSK_STS_C);
-        twl6030_usb_irq(twl->irq2, twl);
-        twl6030_usbotg_irq(twl->irq1, twl);
 
         return 0;
 }
@@ -371,6 +387,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
                 dev_warn(&pdev->dev, "could not create sysfs file\n");
 
         INIT_WORK(&twl->set_vbus_work, otg_set_vbus_work);
+        INIT_DELAYED_WORK(&twl->get_status_work, twl6030_status_work);
 
         status = request_threaded_irq(twl->irq1, NULL, twl6030_usbotg_irq,
                         IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -395,6 +412,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
 
         twl->asleep = 0;
         twl6030_enable_irq(twl);
+        schedule_delayed_work(&twl->get_status_work, HZ);
         dev_info(&pdev->dev, "Initialized TWL6030 USB module\n");
 
         return 0;
@@ -404,6 +422,7 @@ static int twl6030_usb_remove(struct platform_device *pdev)
 {
         struct twl6030_usb *twl = platform_get_drvdata(pdev);
 
+        cancel_delayed_work(&twl->get_status_work);
         twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
                 REG_INT_MSK_LINE_C);
         twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 2eddbe538cda..5608af4a369d 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -2007,6 +2007,7 @@ static void mos7720_release(struct usb_serial *serial)
                                     urblist_entry)
                         usb_unlink_urb(urbtrack->urb);
                 spin_unlock_irqrestore(&mos_parport->listlock, flags);
+                parport_del_port(mos_parport->pp);
 
                 kref_put(&mos_parport->ref_count, destroy_mos_parport);
         }
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 4d49fce406e1..5ef014ba6ae8 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -836,6 +836,7 @@ static int uas_slave_configure(struct scsi_device *sdev)
         if (devinfo->flags & US_FL_BROKEN_FUA)
                 sdev->broken_fua = 1;
 
+        scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
         return 0;
 }
 
@@ -848,7 +849,6 @@ static struct scsi_host_template uas_host_template = {
         .slave_configure = uas_slave_configure,
         .eh_abort_handler = uas_eh_abort_handler,
         .eh_bus_reset_handler = uas_eh_bus_reset_handler,
-        .can_queue = MAX_CMNDS,
         .this_id = -1,
         .sg_tablesize = SG_NONE,
         .skip_settle_delay = 1,
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index fca51105974e..2e0450bec1b1 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -941,7 +941,7 @@ static void vhci_stop(struct usb_hcd *hcd)
 
 static int vhci_get_frame_number(struct usb_hcd *hcd)
 {
-        pr_err("Not yet implemented\n");
+        dev_err_ratelimited(&hcd->self.root_hub->dev, "Not yet implemented\n");
         return 0;
 }
 
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index 93601407dab8..688691d9058d 100644
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -749,7 +749,8 @@ static int vfio_vpd_config_write(struct vfio_pci_device *vdev, int pos,
                 if (pci_write_vpd(pdev, addr & ~PCI_VPD_ADDR_F, 4, &data) != 4)
                         return count;
         } else {
-                if (pci_read_vpd(pdev, addr, 4, &data) != 4)
+                data = 0;
+                if (pci_read_vpd(pdev, addr, 4, &data) < 0)
                         return count;
                 *pdata = cpu_to_le32(data);
         }
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index e9ea3fef144a..15ecfc9c5f6c 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -228,9 +228,9 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd)
 
 static void vfio_intx_disable(struct vfio_pci_device *vdev)
 {
-        vfio_intx_set_signal(vdev, -1);
         vfio_virqfd_disable(&vdev->ctx[0].unmask);
         vfio_virqfd_disable(&vdev->ctx[0].mask);
+        vfio_intx_set_signal(vdev, -1);
         vdev->irq_type = VFIO_PCI_NUM_IRQS;
         vdev->num_ctx = 0;
         kfree(vdev->ctx);
@@ -401,13 +401,13 @@ static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix)
         struct pci_dev *pdev = vdev->pdev;
         int i;
 
-        vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix);
-
         for (i = 0; i < vdev->num_ctx; i++) {
                 vfio_virqfd_disable(&vdev->ctx[i].unmask);
                 vfio_virqfd_disable(&vdev->ctx[i].mask);
         }
 
+        vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix);
+
         if (msix) {
                 pci_disable_msix(vdev->pdev);
                 kfree(vdev->msix);
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 15a65823aad9..2ba19424e4a1 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -515,7 +515,7 @@ static int map_try_harder(struct vfio_domain *domain, dma_addr_t iova,
                           unsigned long pfn, long npage, int prot)
 {
         long i;
-        int ret;
+        int ret = 0;
 
         for (i = 0; i < npage; i++, pfn++, iova += PAGE_SIZE) {
                 ret = iommu_map(domain->domain, iova,
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
index 8511c648a15c..9d78411a3bf7 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omap-panel-data.h>
 
 struct panel_drv_data {
@@ -25,7 +25,6 @@ struct panel_drv_data {
 
         struct omap_video_timings timings;
 
-        enum omap_dss_venc_type connector_type;
         bool invert_polarity;
 };
 
@@ -45,10 +44,6 @@ static const struct omap_video_timings tvc_pal_timings = {
 
 static const struct of_device_id tvc_of_match[];
 
-struct tvc_of_data {
-        enum omap_dss_venc_type connector_type;
-};
-
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
 
 static int tvc_connect(struct omap_dss_device *dssdev)
@@ -99,7 +94,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
         in->ops.atv->set_timings(in, &ddata->timings);
 
         if (!ddata->dev->of_node) {
-                in->ops.atv->set_type(in, ddata->connector_type);
+                in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
 
                 in->ops.atv->invert_vid_out_polarity(in,
                         ddata->invert_polarity);
@@ -207,7 +202,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
 
         ddata->in = in;
 
-        ddata->connector_type = pdata->connector_type;
         ddata->invert_polarity = pdata->invert_polarity;
 
         dssdev = &ddata->dssdev;
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
index d811e6dcaef7..06e1db34541e 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
@@ -16,8 +16,7 @@
 
 #include <drm/drm_edid.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 static const struct omap_video_timings dvic_default_timings = {
         .x_res          = 640,
@@ -236,46 +235,6 @@ static struct omap_dss_driver dvic_driver = {
         .detect         = dvic_detect,
 };
 
-static int dvic_probe_pdata(struct platform_device *pdev)
-{
-        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-        struct connector_dvi_platform_data *pdata;
-        struct omap_dss_device *in, *dssdev;
-        int i2c_bus_num;
-
-        pdata = dev_get_platdata(&pdev->dev);
-        i2c_bus_num = pdata->i2c_bus_num;
-
-        if (i2c_bus_num != -1) {
-                struct i2c_adapter *adapter;
-
-                adapter = i2c_get_adapter(i2c_bus_num);
-                if (!adapter) {
-                        dev_err(&pdev->dev,
-                                        "Failed to get I2C adapter, bus %d\n",
-                                        i2c_bus_num);
-                        return -EPROBE_DEFER;
-                }
-
-                ddata->i2c_adapter = adapter;
-        }
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                i2c_put_adapter(ddata->i2c_adapter);
-
-                dev_err(&pdev->dev, "Failed to find video source\n");
-                return -EPROBE_DEFER;
-        }
-
-        ddata->in = in;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int dvic_probe_of(struct platform_device *pdev)
 {
         struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -313,23 +272,18 @@ static int dvic_probe(struct platform_device *pdev)
         struct omap_dss_device *dssdev;
         int r;
 
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
         ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
         if (!ddata)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, ddata);
 
-        if (dev_get_platdata(&pdev->dev)) {
-                r = dvic_probe_pdata(pdev);
-                if (r)
-                        return r;
-        } else if (pdev->dev.of_node) {
-                r = dvic_probe_of(pdev);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = dvic_probe_of(pdev);
+        if (r)
+                return r;
 
         ddata->timings = dvic_default_timings;
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
index 6ee4129bc0c0..58d5803ede67 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@@ -17,8 +17,7 @@
 
 #include <drm/drm_edid.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 static const struct omap_video_timings hdmic_default_timings = {
         .x_res          = 640,
@@ -206,30 +205,6 @@ static struct omap_dss_driver hdmic_driver = {
         .set_hdmi_infoframe     = hdmic_set_infoframe,
 };
 
-static int hdmic_probe_pdata(struct platform_device *pdev)
-{
-        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-        struct connector_hdmi_platform_data *pdata;
-        struct omap_dss_device *in, *dssdev;
-
-        pdata = dev_get_platdata(&pdev->dev);
-
-        ddata->hpd_gpio = -ENODEV;
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&pdev->dev, "Failed to find video source\n");
-                return -EPROBE_DEFER;
-        }
-
-        ddata->in = in;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int hdmic_probe_of(struct platform_device *pdev)
 {
         struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -261,6 +236,9 @@ static int hdmic_probe(struct platform_device *pdev)
         struct omap_dss_device *dssdev;
         int r;
 
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
         ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
         if (!ddata)
                 return -ENOMEM;
@@ -268,17 +246,9 @@ static int hdmic_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, ddata);
         ddata->dev = &pdev->dev;
 
-        if (dev_get_platdata(&pdev->dev)) {
-                r = hdmic_probe_pdata(pdev);
-                if (r)
-                        return r;
-        } else if (pdev->dev.of_node) {
-                r = hdmic_probe_of(pdev);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = hdmic_probe_of(pdev);
+        if (r)
+                return r;
 
         if (gpio_is_valid(ddata->hpd_gpio)) {
                 r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
index 8c246c213e06..a9a67167cc3d 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
index d9048b3df495..8c0953d069b7 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
@@ -15,8 +15,7 @@
 #include <linux/slab.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
@@ -166,32 +165,6 @@ static const struct omapdss_dvi_ops tfp410_dvi_ops = {
         .get_timings    = tfp410_get_timings,
 };
 
-static int tfp410_probe_pdata(struct platform_device *pdev)
-{
-        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-        struct encoder_tfp410_platform_data *pdata;
-        struct omap_dss_device *dssdev, *in;
-
-        pdata = dev_get_platdata(&pdev->dev);
-
-        ddata->pd_gpio = pdata->power_down_gpio;
-
-        ddata->data_lines = pdata->data_lines;
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&pdev->dev, "Failed to find video source\n");
-                return -ENODEV;
-        }
-
-        ddata->in = in;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int tfp410_probe_of(struct platform_device *pdev)
 {
         struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -225,23 +198,18 @@ static int tfp410_probe(struct platform_device *pdev)
         struct omap_dss_device *dssdev;
         int r;
 
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
         ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
         if (!ddata)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, ddata);
 
-        if (dev_get_platdata(&pdev->dev)) {
-                r = tfp410_probe_pdata(pdev);
-                if (r)
-                        return r;
-        } else if (pdev->dev.of_node) {
-                r = tfp410_probe_of(pdev);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = tfp410_probe_of(pdev);
+        if (r)
+                return r;
 
         if (gpio_is_valid(ddata->pd_gpio)) {
                 r = devm_gpio_request_one(&pdev->dev, ddata->pd_gpio,
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
index 677e2545fcbe..80dc47347e21 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
@@ -16,8 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
index e780fd4f8b46..ace3d818afe5 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
@@ -16,7 +16,7 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omap-panel-data.h>
 #include <video/of_display_timing.h>
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
index 3414c2609320..b58012b82b6f 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
@@ -25,8 +25,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 #include <video/mipi_display.h>
 
 /* DSI Virtual channel. Hardcoded for now. */
@@ -1127,40 +1126,6 @@ static struct omap_dss_driver dsicm_ops = {
         .memory_read    = dsicm_memory_read,
 };
 
-static int dsicm_probe_pdata(struct platform_device *pdev)
-{
-        const struct panel_dsicm_platform_data *pdata;
-        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-        struct omap_dss_device *dssdev, *in;
-
-        pdata = dev_get_platdata(&pdev->dev);
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&pdev->dev, "failed to find video source\n");
-                return -EPROBE_DEFER;
-        }
-        ddata->in = in;
-
-        ddata->reset_gpio = pdata->reset_gpio;
-
-        if (pdata->use_ext_te)
-                ddata->ext_te_gpio = pdata->ext_te_gpio;
-        else
-                ddata->ext_te_gpio = -1;
-
-        ddata->ulps_timeout = pdata->ulps_timeout;
-
-        ddata->use_dsi_backlight = pdata->use_dsi_backlight;
-
-        ddata->pin_config = pdata->pin_config;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int dsicm_probe_of(struct platform_device *pdev)
 {
         struct device_node *node = pdev->dev.of_node;
@@ -1207,6 +1172,9 @@ static int dsicm_probe(struct platform_device *pdev)
 
         dev_dbg(dev, "probe\n");
 
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
         ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
         if (!ddata)
                 return -ENOMEM;
@@ -1214,17 +1182,9 @@ static int dsicm_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, ddata);
         ddata->pdev = pdev;
 
-        if (dev_get_platdata(dev)) {
-                r = dsicm_probe_pdata(pdev);
-                if (r)
-                        return r;
-        } else if (pdev->dev.of_node) {
-                r = dsicm_probe_of(pdev);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = dsicm_probe_of(pdev);
+        if (r)
+                return r;
 
         ddata->timings.x_res = 864;
         ddata->timings.y_res = 480;
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
index 18eb60e9c9ec..f14691ce8d02 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
@@ -16,8 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 static struct omap_video_timings lb035q02_timings = {
         .x_res = 320,
@@ -240,44 +239,6 @@ static struct omap_dss_driver lb035q02_ops = {
         .get_resolution = omapdss_default_get_resolution,
 };
 
-static int lb035q02_probe_pdata(struct spi_device *spi)
-{
-        const struct panel_lb035q02_platform_data *pdata;
-        struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-        struct omap_dss_device *dssdev, *in;
-        int r;
-
-        pdata = dev_get_platdata(&spi->dev);
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&spi->dev, "failed to find video source '%s'\n",
-                                pdata->source);
-                return -EPROBE_DEFER;
-        }
-
-        ddata->in = in;
-
-        ddata->data_lines = pdata->data_lines;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        r = devm_gpio_request_one(&spi->dev, pdata->enable_gpio,
-                                        GPIOF_OUT_INIT_LOW, "panel enable");
-        if (r)
-                goto err_gpio;
-
-        ddata->enable_gpio = gpio_to_desc(pdata->enable_gpio);
-
-        ddata->backlight_gpio = pdata->backlight_gpio;
-
-        return 0;
-err_gpio:
-        omap_dss_put_device(ddata->in);
-        return r;
-}
-
 static int lb035q02_probe_of(struct spi_device *spi)
 {
         struct device_node *node = spi->dev.of_node;
@@ -312,6 +273,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
         struct omap_dss_device *dssdev;
         int r;
 
+        if (!spi->dev.of_node)
+                return -ENODEV;
+
         ddata = devm_kzalloc(&spi->dev, sizeof(*ddata), GFP_KERNEL);
         if (ddata == NULL)
                 return -ENOMEM;
@@ -320,17 +284,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
 
         ddata->spi = spi;
 
-        if (dev_get_platdata(&spi->dev)) {
-                r = lb035q02_probe_pdata(spi);
-                if (r)
-                        return r;
-        } else if (spi->dev.of_node) {
-                r = lb035q02_probe_of(spi);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = lb035q02_probe_of(spi);
+        if (r)
+                return r;
 
         if (gpio_is_valid(ddata->backlight_gpio)) {
                 r = devm_gpio_request_one(&spi->dev, ddata->backlight_gpio,
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
index 8a928c9a2fc9..a2cbadd3eca3 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
@@ -18,8 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 struct panel_drv_data {
         struct omap_dss_device  dssdev;
@@ -233,33 +232,6 @@ static struct omap_dss_driver nec_8048_ops = {
 };
 
 
-static int nec_8048_probe_pdata(struct spi_device *spi)
-{
-        const struct panel_nec_nl8048hl11_platform_data *pdata;
-        struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-        struct omap_dss_device *dssdev, *in;
-
-        pdata = dev_get_platdata(&spi->dev);
-
-        ddata->qvga_gpio = pdata->qvga_gpio;
-        ddata->res_gpio = pdata->res_gpio;
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&spi->dev, "failed to find video source '%s'\n",
-                                pdata->source);
-                return -EPROBE_DEFER;
-        }
-        ddata->in = in;
-
-        ddata->data_lines = pdata->data_lines;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int nec_8048_probe_of(struct spi_device *spi)
 {
         struct device_node *node = spi->dev.of_node;
@@ -296,6 +268,9 @@ static int nec_8048_probe(struct spi_device *spi)
 
         dev_dbg(&spi->dev, "%s\n", __func__);
 
+        if (!spi->dev.of_node)
+                return -ENODEV;
+
         spi->mode = SPI_MODE_0;
         spi->bits_per_word = 32;
 
@@ -315,17 +290,9 @@ static int nec_8048_probe(struct spi_device *spi)
 
         ddata->spi = spi;
 
-        if (dev_get_platdata(&spi->dev)) {
-                r = nec_8048_probe_pdata(spi);
-                if (r)
-                        return r;
-        } else if (spi->dev.of_node) {
-                r = nec_8048_probe_of(spi);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = nec_8048_probe_of(spi);
+        if (r)
+                return r;
 
         if (gpio_is_valid(ddata->qvga_gpio)) {
                 r = devm_gpio_request_one(&spi->dev, ddata->qvga_gpio,
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
index 1954ec913ce5..a8be18a87fa0 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
@@ -17,8 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
@@ -197,69 +196,6 @@ static struct omap_dss_driver sharp_ls_ops = {
         .get_resolution = omapdss_default_get_resolution,
 };
 
-static int sharp_ls_get_gpio(struct device *dev, int gpio, unsigned long flags,
-                  char *desc, struct gpio_desc **gpiod)
-{
-        int r;
-
-        r = devm_gpio_request_one(dev, gpio, flags, desc);
-        if (r) {
-                *gpiod = NULL;
-                return r == -ENOENT ? 0 : r;
-        }
-
-        *gpiod = gpio_to_desc(gpio);
-
-        return 0;
-}
-
-static int sharp_ls_probe_pdata(struct platform_device *pdev)
-{
-        const struct panel_sharp_ls037v7dw01_platform_data *pdata;
-        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-        struct omap_dss_device *dssdev, *in;
-        int r;
-
-        pdata = dev_get_platdata(&pdev->dev);
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&pdev->dev, "failed to find video source '%s'\n",
-                                pdata->source);
-                return -EPROBE_DEFER;
-        }
-
-        ddata->in = in;
-
-        ddata->data_lines = pdata->data_lines;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        r = sharp_ls_get_gpio(&pdev->dev, pdata->mo_gpio, GPIOF_OUT_INIT_LOW,
-                "lcd MO", &ddata->mo_gpio);
-        if (r)
-                return r;
-        r = sharp_ls_get_gpio(&pdev->dev, pdata->lr_gpio, GPIOF_OUT_INIT_HIGH,
-                "lcd LR", &ddata->lr_gpio);
-        if (r)
-                return r;
-        r = sharp_ls_get_gpio(&pdev->dev, pdata->ud_gpio, GPIOF_OUT_INIT_HIGH,
-                "lcd UD", &ddata->ud_gpio);
-        if (r)
-                return r;
-        r = sharp_ls_get_gpio(&pdev->dev, pdata->resb_gpio, GPIOF_OUT_INIT_LOW,
-                "lcd RESB", &ddata->resb_gpio);
-        if (r)
-                return r;
-        r = sharp_ls_get_gpio(&pdev->dev, pdata->ini_gpio, GPIOF_OUT_INIT_LOW,
-                "lcd INI", &ddata->ini_gpio);
-        if (r)
-                return r;
-
-        return 0;
-}
-
 static  int sharp_ls_get_gpio_of(struct device *dev, int index, int val,
         const char *desc, struct gpio_desc **gpiod)
 {
@@ -330,23 +266,18 @@ static int sharp_ls_probe(struct platform_device *pdev)
         struct omap_dss_device *dssdev;
         int r;
 
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
         ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
         if (ddata == NULL)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, ddata);
 
-        if (dev_get_platdata(&pdev->dev)) {
-                r = sharp_ls_probe_pdata(pdev);
-                if (r)
-                        return r;
-        } else if (pdev->dev.of_node) {
-                r = sharp_ls_probe_of(pdev);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = sharp_ls_probe_of(pdev);
+        if (r)
+                return r;
 
         ddata->videomode = sharp_ls_timings;
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
index 31efcca801bd..468560a6daae 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
@@ -33,7 +33,7 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omap-panel-data.h>
 
 #define MIPID_CMD_READ_DISP_ID          0x04
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
index 4d657f3ab679..b529a8c2b652 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
@@ -28,8 +28,7 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio.h>
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 struct panel_drv_data {
         struct omap_dss_device dssdev;
@@ -365,31 +364,6 @@ static struct omap_dss_driver td028ttec1_ops = {
         .check_timings  = td028ttec1_panel_check_timings,
 };
 
-static int td028ttec1_panel_probe_pdata(struct spi_device *spi)
-{
-        const struct panel_tpo_td028ttec1_platform_data *pdata;
-        struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-        struct omap_dss_device *dssdev, *in;
-
-        pdata = dev_get_platdata(&spi->dev);
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&spi->dev, "failed to find video source '%s'\n",
-                                pdata->source);
-                return -EPROBE_DEFER;
-        }
-
-        ddata->in = in;
-
-        ddata->data_lines = pdata->data_lines;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int td028ttec1_probe_of(struct spi_device *spi)
 {
         struct device_node *node = spi->dev.of_node;
@@ -415,6 +389,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
 
         dev_dbg(&spi->dev, "%s\n", __func__);
 
+        if (!spi->dev.of_node)
+                return -ENODEV;
+
         spi->bits_per_word = 9;
         spi->mode = SPI_MODE_3;
 
@@ -432,17 +409,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
 
         ddata->spi_dev = spi;
 
-        if (dev_get_platdata(&spi->dev)) {
-                r = td028ttec1_panel_probe_pdata(spi);
-                if (r)
-                        return r;
-        } else if (spi->dev.of_node) {
-                r = td028ttec1_probe_of(spi);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = td028ttec1_probe_of(spi);
+        if (r)
+                return r;
 
         ddata->videomode = td028ttec1_panel_timings;
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
index 68e3b68a2920..51e628b85f4a 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
@@ -19,8 +19,7 @@
 #include <linux/slab.h>
 #include <linux/of_gpio.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include <video/omapfb_dss.h>
 
 #define TPO_R02_MODE(x)         ((x) & 7)
 #define TPO_R02_MODE_800x480    7
@@ -465,32 +464,6 @@ static struct omap_dss_driver tpo_td043_ops = {
 };
 
 
-static int tpo_td043_probe_pdata(struct spi_device *spi)
-{
-        const struct panel_tpo_td043mtea1_platform_data *pdata;
-        struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-        struct omap_dss_device *dssdev, *in;
-
-        pdata = dev_get_platdata(&spi->dev);
-
-        ddata->nreset_gpio = pdata->nreset_gpio;
-
-        in = omap_dss_find_output(pdata->source);
-        if (in == NULL) {
-                dev_err(&spi->dev, "failed to find video source '%s'\n",
-                                pdata->source);
-                return -EPROBE_DEFER;
-        }
-        ddata->in = in;
-
-        ddata->data_lines = pdata->data_lines;
-
-        dssdev = &ddata->dssdev;
-        dssdev->name = pdata->name;
-
-        return 0;
-}
-
 static int tpo_td043_probe_of(struct spi_device *spi)
 {
         struct device_node *node = spi->dev.of_node;
@@ -524,6 +497,9 @@ static int tpo_td043_probe(struct spi_device *spi)
 
         dev_dbg(&spi->dev, "%s\n", __func__);
 
+        if (!spi->dev.of_node)
+                return -ENODEV;
+
         spi->bits_per_word = 16;
         spi->mode = SPI_MODE_0;
 
@@ -541,17 +517,9 @@ static int tpo_td043_probe(struct spi_device *spi)
 
         ddata->spi = spi;
 
-        if (dev_get_platdata(&spi->dev)) {
-                r = tpo_td043_probe_pdata(spi);
-                if (r)
-                        return r;
-        } else if (spi->dev.of_node) {
-                r = tpo_td043_probe_of(spi);
-                if (r)
-                        return r;
-        } else {
-                return -ENODEV;
-        }
+        r = tpo_td043_probe_of(spi);
+        if (r)
+                return r;
 
         ddata->mode = TPO_R02_MODE_800x480;
         memcpy(ddata->gamma, tpo_td043_def_gamma, sizeof(ddata->gamma));
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/apply.c b/drivers/video/fbdev/omap2/omapfb/dss/apply.c
index 663ccc3bf4e5..2481f4871f66 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/apply.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/apply.c
@@ -23,7 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index 5a87179b7312..29de4827589d 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -35,7 +35,7 @@
 #include <linux/suspend.h>
 #include <linux/slab.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
@@ -208,8 +208,6 @@ static int __init omap_dss_probe(struct platform_device *pdev)
                 core.default_display_name = def_disp_name;
         else if (pdata->default_display_name)
                 core.default_display_name = pdata->default_display_name;
-        else if (pdata->default_device)
-                core.default_display_name = pdata->default_device->name;
 
         register_pm_notifier(&omap_dss_pm_notif_block);
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
index 6607db37a5e4..3691bde4ce0a 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/seq_file.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index 5491e304f4fe..7a75dfda9845 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -41,7 +41,7 @@
 #include <linux/of.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
index 038c15b04215..59c9a5c47ca9 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
@@ -18,7 +18,7 @@
  */
 
 #include <linux/kernel.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dispc.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c b/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
index 75b5286029ee..b3fdbfd0b82d 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
@@ -25,7 +25,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysfs.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"
 
 static ssize_t display_name_show(struct omap_dss_device *dssdev, char *buf)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/display.c b/drivers/video/fbdev/omap2/omapfb/dss/display.c
index ef5b9027985d..dd5468695c43 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/display.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/display.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"
 #include "dss_features.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dpi.c b/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
index 7953e6a52346..da09806b940c 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
@@ -34,7 +34,7 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index d63e59807707..9e4800a4e3d1 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -42,7 +42,7 @@
 #include <linux/of_platform.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/mipi_display.h>
 
 #include "dss.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
index bf407b6ba15c..d356a252ab4a 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
@@ -18,7 +18,7 @@
 #include <linux/of.h>
 #include <linux/seq_file.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
index 0078c4d1fc31..47d7f69ad9ad 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
@@ -41,7 +41,7 @@
 #include <linux/suspend.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.h b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
index 0184a8461df1..a3cc0ca8f9d2 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
@@ -73,6 +73,17 @@
 #define FLD_MOD(orig, val, start, end) \
         (((orig) & ~FLD_MASK(start, end)) | FLD_VAL(val, start, end))
 
+enum omap_dss_clk_source {
+        OMAP_DSS_CLK_SRC_FCK = 0,               /* OMAP2/3: DSS1_ALWON_FCLK
+                                                 * OMAP4: DSS_FCLK */
+        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC,   /* OMAP3: DSI1_PLL_FCLK
+                                                 * OMAP4: PLL1_CLK1 */
+        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI,     /* OMAP3: DSI2_PLL_FCLK
+                                                 * OMAP4: PLL1_CLK2 */
+        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC,  /* OMAP4: PLL2_CLK1 */
+        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,    /* OMAP4: PLL2_CLK2 */
+};
+
 enum dss_io_pad_mode {
         DSS_IO_PAD_MODE_RESET,
         DSS_IO_PAD_MODE_RFBI,
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss_features.c b/drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
index c886a2927f73..8fc843b56b26 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
@@ -23,7 +23,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
index 53616b02b613..f6de87e078b0 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
@@ -23,7 +23,8 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/hdmi.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
+#include <sound/omap-hdmi-audio.h>
 
 #include "dss.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
index 2e71aec838b1..926a6f20dbb2 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@ -33,7 +33,7 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/component.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <sound/omap-hdmi-audio.h>
 
 #include "hdmi4_core.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
index aade6d99662a..0ee829a165c3 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@@ -38,7 +38,7 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/component.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <sound/omap-hdmi-audio.h>
 
 #include "hdmi5_core.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
index 8ea531d2652c..bbfe7e2d4332 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
@@ -51,8 +51,8 @@ static void hdmi_core_ddc_init(struct hdmi_core_data *core)
 {
         void __iomem *base = core->base;
         const unsigned long long iclk = 266000000;      /* DSS L3 ICLK */
-        const unsigned ss_scl_high = 4000;              /* ns */
-        const unsigned ss_scl_low = 4700;               /* ns */
+        const unsigned ss_scl_high = 4600;              /* ns */
+        const unsigned ss_scl_low = 5400;               /* ns */
         const unsigned fs_scl_high = 600;               /* ns */
         const unsigned fs_scl_low = 1300;               /* ns */
         const unsigned sda_hold = 1000;                 /* ns */
@@ -442,7 +442,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core,
 
         c = (ptr[1] >> 6) & 0x3;
         m = (ptr[1] >> 4) & 0x3;
-        r = (ptr[1] >> 0) & 0x3;
+        r = (ptr[1] >> 0) & 0xf;
 
         itc = (ptr[2] >> 7) & 0x1;
         ec = (ptr[2] >> 4) & 0x7;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
index 1b8fcc6c4ba1..189a5ad125a3 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
@@ -4,7 +4,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/of.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "hdmi.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
index 1f5d19c119ce..9a13c35fd6d8 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
@@ -13,7 +13,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "hdmi.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
index 06e23a7c432c..eac3665aba6c 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "hdmi.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
index 7c544bc56fb5..705373e4cf38 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
@@ -14,7 +14,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "hdmi.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c b/drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
index a7414fb12830..9e2a67fdf4d2 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/manager.c b/drivers/video/fbdev/omap2/omapfb/dss/manager.c
index 08a67f4f6a20..69f86d2cc274 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/manager.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/manager.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
@@ -69,7 +69,6 @@ int dss_init_overlay_managers(void)
                         break;
                 }
 
-                mgr->caps = 0;
                 mgr->supported_displays =
                         dss_feat_get_supported_displays(mgr->id);
                 mgr->supported_outputs =
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/output.c b/drivers/video/fbdev/omap2/omapfb/dss/output.c
index 16072159bd24..bed9a978269d 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/output.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/output.c
@@ -21,7 +21,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c b/drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
index 4cc5ddebfb34..f1f6c0aea752 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
@@ -26,7 +26,7 @@
 #include <linux/kobject.h>
 #include <linux/platform_device.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
index 2f7cee985cdd..d6c5d75d2ef8 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
@@ -30,7 +30,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/pll.c b/drivers/video/fbdev/omap2/omapfb/dss/pll.c
index f974ddcd3b6e..0564c5606cd0 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/pll.c
@@ -22,7 +22,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/sched.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
index aea6a1d0fb20..562b0c4ae0c6 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
@@ -38,7 +38,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"
 
 struct rfbi_reg { u16 idx; };
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/sdi.c b/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
index d747cc6b59e1..c4be732a4714 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
@@ -29,7 +29,7 @@
 #include <linux/of.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"
 
 static struct {
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
index 26e0ee30adf8..392464da12e4 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@@ -37,7 +37,7 @@
 #include <linux/of.h>
 #include <linux/component.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c b/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
index b1ec59e42940..a890540f2037 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #include "dss.h"
 #include "dss_features.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
index 9ddfdd63b84c..ef69273074ba 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
@@ -30,7 +30,7 @@
 #include <linux/export.h>
 #include <linux/sizes.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>
 
 #include "omapfb.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index d3af01c94a58..2fb90cb6803f 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/omapfb.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>
 
 #include "omapfb.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c b/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
index 18fa9e1d0033..8087a009c54f 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
@@ -29,7 +29,7 @@
 #include <linux/mm.h>
 #include <linux/omapfb.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>
 
 #include "omapfb.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb.h b/drivers/video/fbdev/omap2/omapfb/omapfb.h
index 623cd872a367..bcb9ff4a607d 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb.h
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb.h
@@ -31,7 +31,7 @@
 #include <linux/dma-attrs.h>
 #include <linux/dma-mapping.h>
 
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 
 #ifdef DEBUG
 extern bool omapfb_debug;
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b54f26c55dfd..b4b3e256491b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -746,7 +746,7 @@ config ALIM7101_WDT
 
 config EBC_C384_WDT
         tristate "WinSystems EBC-C384 Watchdog Timer"
-        depends on X86 && ISA
+        depends on X86 && ISA_BUS_API
         select WATCHDOG_CORE
         help
           Enables watchdog timer support for the watchdog timer on the
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index d46839f51e73..e4db19e88ab1 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -151,8 +151,6 @@ static DECLARE_WAIT_QUEUE_HEAD(balloon_wq);
 static void balloon_process(struct work_struct *work);
 static DECLARE_DELAYED_WORK(balloon_worker, balloon_process);
 
-static void release_memory_resource(struct resource *resource);
-
 /* When ballooning out (allocating memory to return to Xen) we don't really
    want the kernel to try too hard since that can trigger the oom killer. */
 #define GFP_BALLOON \
@@ -248,6 +246,19 @@ static enum bp_state update_schedule(enum bp_state state)
 }
 
 #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
+static void release_memory_resource(struct resource *resource)
+{
+        if (!resource)
+                return;
+
+        /*
+         * No need to reset region to identity mapped since we now
+         * know that no I/O can be in this region
+         */
+        release_resource(resource);
+        kfree(resource);
+}
+
 static struct resource *additional_memory_resource(phys_addr_t size)
 {
         struct resource *res;
@@ -286,19 +297,6 @@ static struct resource *additional_memory_resource(phys_addr_t size)
         return res;
 }
 
-static void release_memory_resource(struct resource *resource)
-{
-        if (!resource)
-                return;
-
-        /*
-         * No need to reset region to identity mapped since we now
-         * know that no I/O can be in this region
-         */
-        release_resource(resource);
-        kfree(resource);
-}
-
 static enum bp_state reserve_additional_memory(void)
 {
         long credit;
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index 8e67336f8ddd..6a25533da237 100644
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -183,8 +183,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
                 field_start = OFFSET(cfg_entry);
                 field_end = OFFSET(cfg_entry) + field->size;
 
-                if ((req_start >= field_start && req_start < field_end)
-                    || (req_end > field_start && req_end <= field_end)) {
+                 if (req_end > field_start && field_end > req_start) {
                         err = conf_space_read(dev, cfg_entry, field_start,
                                               &tmp_val);
                         if (err)
@@ -230,8 +229,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
                 field_start = OFFSET(cfg_entry);
                 field_end = OFFSET(cfg_entry) + field->size;
 
-                if ((req_start >= field_start && req_start < field_end)
-                    || (req_end > field_start && req_end <= field_end)) {
+                 if (req_end > field_start && field_end > req_start) {
                         tmp_val = 0;
 
                         err = xen_pcibk_config_read(dev, field_start,
diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c
index ad3d17d29c81..9ead1c2ff1dd 100644
--- a/drivers/xen/xen-pciback/conf_space_header.c
+++ b/drivers/xen/xen-pciback/conf_space_header.c
@@ -145,7 +145,7 @@ static int rom_write(struct pci_dev *dev, int offset, u32 value, void *data)
         /* A write to obtain the length must happen as a 32-bit write.
          * This does not (yet) support writing individual bytes
          */
-        if (value == ~PCI_ROM_ADDRESS_ENABLE)
+        if ((value | ~PCI_ROM_ADDRESS_MASK) == ~0U)
                 bar->which = 1;
         else {
                 u32 tmpval;
@@ -225,38 +225,42 @@ static inline void read_dev_bar(struct pci_dev *dev,
                            (PCI_BASE_ADDRESS_SPACE_MEMORY |
                                 PCI_BASE_ADDRESS_MEM_TYPE_64))) {
                         bar_info->val = res[pos - 1].start >> 32;
-                        bar_info->len_val = res[pos - 1].end >> 32;
+                        bar_info->len_val = -resource_size(&res[pos - 1]) >> 32;
                         return;
                 }
         }
 
+        if (!res[pos].flags ||
+            (res[pos].flags & (IORESOURCE_DISABLED | IORESOURCE_UNSET |
+                               IORESOURCE_BUSY)))
+                return;
+
         bar_info->val = res[pos].start |
                         (res[pos].flags & PCI_REGION_FLAG_MASK);
-        bar_info->len_val = resource_size(&res[pos]);
+        bar_info->len_val = -resource_size(&res[pos]) |
+                            (res[pos].flags & PCI_REGION_FLAG_MASK);
 }
 
 static void *bar_init(struct pci_dev *dev, int offset)
 {
-        struct pci_bar_info *bar = kmalloc(sizeof(*bar), GFP_KERNEL);
+        struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL);
 
         if (!bar)
                 return ERR_PTR(-ENOMEM);
 
         read_dev_bar(dev, bar, offset, ~0);
-        bar->which = 0;
 
         return bar;
 }
 
 static void *rom_init(struct pci_dev *dev, int offset)
 {
-        struct pci_bar_info *bar = kmalloc(sizeof(*bar), GFP_KERNEL);
+        struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL);
 
         if (!bar)
                 return ERR_PTR(-ENOMEM);
 
         read_dev_bar(dev, bar, offset, ~PCI_ROM_ADDRESS_ENABLE);
-        bar->which = 0;
 
         return bar;
 }
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index f0d268b97d19..a439548de785 100644
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -70,9 +70,13 @@ struct autofs_info {
 };
 
 #define AUTOFS_INF_EXPIRING     (1<<0) /* dentry in the process of expiring */
-#define AUTOFS_INF_NO_RCU       (1<<1) /* the dentry is being considered
+#define AUTOFS_INF_WANT_EXPIRE  (1<<1) /* the dentry is being considered
                                         * for expiry, so RCU_walk is
-                                        * not permitted
+                                        * not permitted.  If it progresses to
+                                        * actual expiry attempt, the flag is
+                                        * not cleared when EXPIRING is set -
+                                        * in that case it gets cleared only
+                                        * when it comes to clearing EXPIRING.
                                         */
 #define AUTOFS_INF_PENDING      (1<<2) /* dentry pending mount */
 
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 9510d8d2e9cd..b493909e7492 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -316,19 +316,17 @@ struct dentry *autofs4_expire_direct(struct super_block *sb,
         if (ino->flags & AUTOFS_INF_PENDING)
                 goto out;
         if (!autofs4_direct_busy(mnt, root, timeout, do_now)) {
-                ino->flags |= AUTOFS_INF_NO_RCU;
+                ino->flags |= AUTOFS_INF_WANT_EXPIRE;
                 spin_unlock(&sbi->fs_lock);
                 synchronize_rcu();
                 spin_lock(&sbi->fs_lock);
                 if (!autofs4_direct_busy(mnt, root, timeout, do_now)) {
                         ino->flags |= AUTOFS_INF_EXPIRING;
-                        smp_mb();
-                        ino->flags &= ~AUTOFS_INF_NO_RCU;
                         init_completion(&ino->expire_complete);
                         spin_unlock(&sbi->fs_lock);
                         return root;
                 }
-                ino->flags &= ~AUTOFS_INF_NO_RCU;
+                ino->flags &= ~AUTOFS_INF_WANT_EXPIRE;
         }
 out:
         spin_unlock(&sbi->fs_lock);
@@ -446,7 +444,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
         while ((dentry = get_next_positive_subdir(dentry, root))) {
                 spin_lock(&sbi->fs_lock);
                 ino = autofs4_dentry_ino(dentry);
-                if (ino->flags & AUTOFS_INF_NO_RCU)
+                if (ino->flags & AUTOFS_INF_WANT_EXPIRE)
                         expired = NULL;
                 else
                         expired = should_expire(dentry, mnt, timeout, how);
@@ -455,7 +453,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
                         continue;
                 }
                 ino = autofs4_dentry_ino(expired);
-                ino->flags |= AUTOFS_INF_NO_RCU;
+                ino->flags |= AUTOFS_INF_WANT_EXPIRE;
                 spin_unlock(&sbi->fs_lock);
                 synchronize_rcu();
                 spin_lock(&sbi->fs_lock);
@@ -465,7 +463,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
                         goto found;
                 }
 
-                ino->flags &= ~AUTOFS_INF_NO_RCU;
+                ino->flags &= ~AUTOFS_INF_WANT_EXPIRE;
                 if (expired != dentry)
                         dput(expired);
                 spin_unlock(&sbi->fs_lock);
@@ -475,17 +473,8 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
 found:
         pr_debug("returning %p %pd\n", expired, expired);
         ino->flags |= AUTOFS_INF_EXPIRING;
-        smp_mb();
-        ino->flags &= ~AUTOFS_INF_NO_RCU;
         init_completion(&ino->expire_complete);
         spin_unlock(&sbi->fs_lock);
-        spin_lock(&sbi->lookup_lock);
-        spin_lock(&expired->d_parent->d_lock);
-        spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED);
-        list_move(&expired->d_parent->d_subdirs, &expired->d_child);
-        spin_unlock(&expired->d_lock);
-        spin_unlock(&expired->d_parent->d_lock);
-        spin_unlock(&sbi->lookup_lock);
         return expired;
 }
 
@@ -496,7 +485,7 @@ int autofs4_expire_wait(struct dentry *dentry, int rcu_walk)
         int status;
 
         /* Block on any pending expire */
-        if (!(ino->flags & (AUTOFS_INF_EXPIRING | AUTOFS_INF_NO_RCU)))
+        if (!(ino->flags & AUTOFS_INF_WANT_EXPIRE))
                 return 0;
         if (rcu_walk)
                 return -ECHILD;
@@ -554,7 +543,7 @@ int autofs4_expire_run(struct super_block *sb,
         ino = autofs4_dentry_ino(dentry);
         /* avoid rapid-fire expire attempts if expiry fails */
         ino->last_used = now;
-        ino->flags &= ~AUTOFS_INF_EXPIRING;
+        ino->flags &= ~(AUTOFS_INF_EXPIRING|AUTOFS_INF_WANT_EXPIRE);
         complete_all(&ino->expire_complete);
         spin_unlock(&sbi->fs_lock);
 
@@ -583,7 +572,7 @@ int autofs4_do_expire_multi(struct super_block *sb, struct vfsmount *mnt,
                 spin_lock(&sbi->fs_lock);
                 /* avoid rapid-fire expire attempts if expiry fails */
                 ino->last_used = now;
-                ino->flags &= ~AUTOFS_INF_EXPIRING;
+                ino->flags &= ~(AUTOFS_INF_EXPIRING|AUTOFS_INF_WANT_EXPIRE);
                 complete_all(&ino->expire_complete);
                 spin_unlock(&sbi->fs_lock);
                 dput(dentry);
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 78bd80298528..3767f6641af1 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -458,7 +458,7 @@ static int autofs4_d_manage(struct dentry *dentry, bool rcu_walk)
                  */
                 struct inode *inode;
 
-                if (ino->flags & (AUTOFS_INF_EXPIRING | AUTOFS_INF_NO_RCU))
+                if (ino->flags & AUTOFS_INF_WANT_EXPIRE)
                         return 0;
                 if (d_mountpoint(dentry))
                         return 0;
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 0146d911f468..631f1554c87b 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -66,11 +66,12 @@ static int autofs4_write(struct autofs_sb_info *sbi,
         set_fs(KERNEL_DS);
 
         mutex_lock(&sbi->pipe_mutex);
-        wr = __vfs_write(file, data, bytes, &file->f_pos);
-        while (bytes && wr) {
+        while (bytes) {
+                wr = __vfs_write(file, data, bytes, &file->f_pos);
+                if (wr <= 0)
+                        break;
                 data += wr;
                 bytes -= wr;
-                wr = __vfs_write(file, data, bytes, &file->f_pos);
         }
         mutex_unlock(&sbi->pipe_mutex);
 
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index e158b22ef32f..a7a28110dc80 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -2275,7 +2275,7 @@ static int elf_core_dump(struct coredump_params *cprm)
                 goto end_coredump;
 
         /* Align to page */
-        if (!dump_skip(cprm, dataoff - cprm->file->f_pos))
+        if (!dump_skip(cprm, dataoff - cprm->pos))
                 goto end_coredump;
 
         for (i = 0, vma = first_vma(current, gate_vma); vma != NULL;
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 71ade0e556b7..203589311bf8 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1787,7 +1787,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
                                 goto end_coredump;
         }
 
-        if (!dump_skip(cprm, dataoff - cprm->file->f_pos))
+        if (!dump_skip(cprm, dataoff - cprm->pos))
                 goto end_coredump;
 
         if (!elf_fdpic_dump_segments(cprm))
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index b677a6ea6001..7706c8dc5fa6 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2645,7 +2645,7 @@ static void btrfsic_dump_tree_sub(const struct btrfsic_state *state,
          * This algorithm is recursive because the amount of used stack space
          * is very small and the max recursion depth is limited.
          */
-        indent_add = sprintf(buf, "%c-%llu(%s/%llu/%d)",
+        indent_add = sprintf(buf, "%c-%llu(%s/%llu/%u)",
                              btrfsic_get_block_type(state, block),
                              block->logical_bytenr, block->dev_state->name,
                              block->dev_bytenr, block->mirror_num);
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 427c36b430a6..a85cf7d23309 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1373,7 +1373,8 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
 
         if (tm->op == MOD_LOG_KEY_REMOVE_WHILE_FREEING) {
                 BUG_ON(tm->slot != 0);
-                eb_rewin = alloc_dummy_extent_buffer(fs_info, eb->start);
+                eb_rewin = alloc_dummy_extent_buffer(fs_info, eb->start,
+                                                eb->len);
                 if (!eb_rewin) {
                         btrfs_tree_read_unlock_blocking(eb);
                         free_extent_buffer(eb);
@@ -1454,7 +1455,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
         } else if (old_root) {
                 btrfs_tree_read_unlock(eb_root);
                 free_extent_buffer(eb_root);
-                eb = alloc_dummy_extent_buffer(root->fs_info, logical);
+                eb = alloc_dummy_extent_buffer(root->fs_info, logical,
+                                        root->nodesize);
         } else {
                 btrfs_set_lock_blocking_rw(eb_root, BTRFS_READ_LOCK);
                 eb = btrfs_clone_extent_buffer(eb_root);
@@ -1552,6 +1554,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
                        trans->transid, root->fs_info->generation);
 
         if (!should_cow_block(trans, root, buf)) {
+                trans->dirty = true;
                 *cow_ret = buf;
                 return 0;
         }
@@ -1783,10 +1786,12 @@ static noinline int generic_bin_search(struct extent_buffer *eb,
                         if (!err) {
                                 tmp = (struct btrfs_disk_key *)(kaddr + offset -
                                                         map_start);
-                        } else {
+                        } else if (err == 1) {
                                 read_extent_buffer(eb, &unaligned,
                                                    offset, sizeof(unaligned));
                                 tmp = &unaligned;
+                        } else {
+                                return err;
                         }
 
                 } else {
@@ -2510,6 +2515,8 @@ read_block_for_search(struct btrfs_trans_handle *trans,
                 if (!btrfs_buffer_uptodate(tmp, 0, 0))
                         ret = -EIO;
                 free_extent_buffer(tmp);
+        } else {
+                ret = PTR_ERR(tmp);
         }
         return ret;
 }
@@ -2773,8 +2780,10 @@ again:
                          * then we don't want to set the path blocking,
                          * so we test it here
                          */
-                        if (!should_cow_block(trans, root, b))
+                        if (!should_cow_block(trans, root, b)) {
+                                trans->dirty = true;
                                 goto cow_done;
+                        }
 
                         /*
                          * must have write locks on this node and the
@@ -2823,6 +2832,8 @@ cow_done:
                 }
 
                 ret = key_search(b, key, level, &prev_cmp, &slot);
+                if (ret < 0)
+                        goto done;
 
                 if (level != 0) {
                         int dec = 0;
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 101c3cfd3f7c..4274a7bfdaed 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2518,7 +2518,7 @@ void btrfs_put_block_group(struct btrfs_block_group_cache *cache);
 int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root, unsigned long count);
 int btrfs_async_run_delayed_refs(struct btrfs_root *root,
-                                 unsigned long count, int wait);
+                                 unsigned long count, u64 transid, int wait);
 int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len);
 int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root, u64 bytenr,
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 61561c2a3f96..d3aaabbfada0 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1606,15 +1606,23 @@ int btrfs_inode_delayed_dir_index_count(struct inode *inode)
         return 0;
 }
 
-void btrfs_get_delayed_items(struct inode *inode, struct list_head *ins_list,
-                             struct list_head *del_list)
+bool btrfs_readdir_get_delayed_items(struct inode *inode,
+                                     struct list_head *ins_list,
+                                     struct list_head *del_list)
 {
         struct btrfs_delayed_node *delayed_node;
         struct btrfs_delayed_item *item;
 
         delayed_node = btrfs_get_delayed_node(inode);
         if (!delayed_node)
-                return;
+                return false;
+
+        /*
+         * We can only do one readdir with delayed items at a time because of
+         * item->readdir_list.
+         */
+        inode_unlock_shared(inode);
+        inode_lock(inode);
 
         mutex_lock(&delayed_node->mutex);
         item = __btrfs_first_delayed_insertion_item(delayed_node);
@@ -1641,10 +1649,13 @@ void btrfs_get_delayed_items(struct inode *inode, struct list_head *ins_list,
          * requeue or dequeue this delayed node.
          */
         atomic_dec(&delayed_node->refs);
+
+        return true;
 }
 
-void btrfs_put_delayed_items(struct list_head *ins_list,
-                             struct list_head *del_list)
+void btrfs_readdir_put_delayed_items(struct inode *inode,
+                                     struct list_head *ins_list,
+                                     struct list_head *del_list)
 {
         struct btrfs_delayed_item *curr, *next;
 
@@ -1659,6 +1670,12 @@ void btrfs_put_delayed_items(struct list_head *ins_list,
                 if (atomic_dec_and_test(&curr->refs))
                         kfree(curr);
         }
+
+        /*
+         * The VFS is going to do up_read(), so we need to downgrade back to a
+         * read lock.
+         */
+        downgrade_write(&inode->i_rwsem);
 }
 
 int btrfs_should_delete_dir_index(struct list_head *del_list,
diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index 0167853c84ae..2495b3d4075f 100644
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -137,10 +137,12 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root);
 void btrfs_destroy_delayed_inodes(struct btrfs_root *root);
 
 /* Used for readdir() */
-void btrfs_get_delayed_items(struct inode *inode, struct list_head *ins_list,
-                             struct list_head *del_list);
-void btrfs_put_delayed_items(struct list_head *ins_list,
-                             struct list_head *del_list);
+bool btrfs_readdir_get_delayed_items(struct inode *inode,
+                                     struct list_head *ins_list,
+                                     struct list_head *del_list);
+void btrfs_readdir_put_delayed_items(struct inode *inode,
+                                     struct list_head *ins_list,
+                                     struct list_head *del_list);
 int btrfs_should_delete_dir_index(struct list_head *del_list,
                                   u64 index);
 int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 6628fca9f4ed..60ce1190307b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1098,7 +1098,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr)
         struct inode *btree_inode = root->fs_info->btree_inode;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
+        if (IS_ERR(buf))
                 return;
         read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,
                                  buf, 0, WAIT_NONE, btree_get_extent, 0);
@@ -1114,7 +1114,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
         int ret;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
+        if (IS_ERR(buf))
                 return 0;
 
         set_bit(EXTENT_BUFFER_READAHEAD, &buf->bflags);
@@ -1147,7 +1147,8 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
                                                  u64 bytenr)
 {
         if (btrfs_test_is_dummy_root(root))
-                return alloc_test_extent_buffer(root->fs_info, bytenr);
+                return alloc_test_extent_buffer(root->fs_info, bytenr,
+                                root->nodesize);
         return alloc_extent_buffer(root->fs_info, bytenr);
 }
 
@@ -1171,8 +1172,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
         int ret;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
-                return ERR_PTR(-ENOMEM);
+        if (IS_ERR(buf))
+                return buf;
 
         ret = btree_read_extent_buffer_pages(root, buf, 0, parent_transid);
         if (ret) {
@@ -1314,14 +1315,16 @@ static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info,
 
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
 /* Should only be used by the testing infrastructure */
-struct btrfs_root *btrfs_alloc_dummy_root(void)
+struct btrfs_root *btrfs_alloc_dummy_root(u32 sectorsize, u32 nodesize)
 {
         struct btrfs_root *root;
 
         root = btrfs_alloc_root(NULL, GFP_KERNEL);
         if (!root)
                 return ERR_PTR(-ENOMEM);
-        __setup_root(4096, 4096, 4096, root, NULL, 1);
+        /* We don't use the stripesize in selftest, set it as sectorsize */
+        __setup_root(nodesize, sectorsize, sectorsize, root, NULL,
+                        BTRFS_ROOT_TREE_OBJECTID);
         set_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state);
         root->alloc_bytenr = 0;
 
@@ -1803,6 +1806,13 @@ static int cleaner_kthread(void *arg)
                 if (btrfs_need_cleaner_sleep(root))
                         goto sleep;
 
+                /*
+                 * Do not do anything if we might cause open_ctree() to block
+                 * before we have finished mounting the filesystem.
+                 */
+                if (!root->fs_info->open)
+                        goto sleep;
+
                 if (!mutex_trylock(&root->fs_info->cleaner_mutex))
                         goto sleep;
 
@@ -2517,7 +2527,6 @@ int open_ctree(struct super_block *sb,
         int num_backups_tried = 0;
         int backup_index = 0;
         int max_active;
-        bool cleaner_mutex_locked = false;
 
         tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
         chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
@@ -2797,7 +2806,7 @@ int open_ctree(struct super_block *sb,
 
         nodesize = btrfs_super_nodesize(disk_super);
         sectorsize = btrfs_super_sectorsize(disk_super);
-        stripesize = btrfs_super_stripesize(disk_super);
+        stripesize = sectorsize;
         fs_info->dirty_metadata_batch = nodesize * (1 + ilog2(nr_cpu_ids));
         fs_info->delalloc_batch = sectorsize * 512 * (1 + ilog2(nr_cpu_ids));
 
@@ -2996,13 +3005,6 @@ retry_root_backup:
                 goto fail_sysfs;
         }
 
-        /*
-         * Hold the cleaner_mutex thread here so that we don't block
-         * for a long time on btrfs_recover_relocation.  cleaner_kthread
-         * will wait for us to finish mounting the filesystem.
-         */
-        mutex_lock(&fs_info->cleaner_mutex);
-        cleaner_mutex_locked = true;
         fs_info->cleaner_kthread = kthread_run(cleaner_kthread, tree_root,
                                                "btrfs-cleaner");
         if (IS_ERR(fs_info->cleaner_kthread))
@@ -3062,8 +3064,10 @@ retry_root_backup:
                 ret = btrfs_cleanup_fs_roots(fs_info);
                 if (ret)
                         goto fail_qgroup;
-                /* We locked cleaner_mutex before creating cleaner_kthread. */
+
+                mutex_lock(&fs_info->cleaner_mutex);
                 ret = btrfs_recover_relocation(tree_root);
+                mutex_unlock(&fs_info->cleaner_mutex);
                 if (ret < 0) {
                         btrfs_warn(fs_info, "failed to recover relocation: %d",
                                         ret);
@@ -3071,8 +3075,6 @@ retry_root_backup:
                         goto fail_qgroup;
                 }
         }
-        mutex_unlock(&fs_info->cleaner_mutex);
-        cleaner_mutex_locked = false;
 
         location.objectid = BTRFS_FS_TREE_OBJECTID;
         location.type = BTRFS_ROOT_ITEM_KEY;
@@ -3186,10 +3188,6 @@ fail_cleaner:
         filemap_write_and_wait(fs_info->btree_inode->i_mapping);
 
 fail_sysfs:
-        if (cleaner_mutex_locked) {
-                mutex_unlock(&fs_info->cleaner_mutex);
-                cleaner_mutex_locked = false;
-        }
         btrfs_sysfs_remove_mounted(fs_info);
 
 fail_fsdev_sysfs:
@@ -4130,6 +4128,16 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
          * Hint to catch really bogus numbers, bitflips or so, more exact checks are
          * done later
          */
+        if (btrfs_super_bytes_used(sb) < 6 * btrfs_super_nodesize(sb)) {
+                btrfs_err(fs_info, "bytes_used is too small %llu",
+                       btrfs_super_bytes_used(sb));
+                ret = -EINVAL;
+        }
+        if (!is_power_of_2(btrfs_super_stripesize(sb))) {
+                btrfs_err(fs_info, "invalid stripesize %u",
+                       btrfs_super_stripesize(sb));
+                ret = -EINVAL;
+        }
         if (btrfs_super_num_devices(sb) > (1UL << 31))
                 printk(KERN_WARNING "BTRFS: suspicious number of devices: %llu\n",
                                 btrfs_super_num_devices(sb));
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 8e79d0070bcf..acba821499a9 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -90,7 +90,7 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,
 void btrfs_free_fs_root(struct btrfs_root *root);
 
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
-struct btrfs_root *btrfs_alloc_dummy_root(void);
+struct btrfs_root *btrfs_alloc_dummy_root(u32 sectorsize, u32 nodesize);
 #endif
 
 /*
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a400951e8678..82b912a293ab 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2042,6 +2042,11 @@ int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
         struct btrfs_bio *bbio = NULL;
 
 
+        /*
+         * Avoid races with device replace and make sure our bbio has devices
+         * associated to its stripes that don't go away while we are discarding.
+         */
+        btrfs_bio_counter_inc_blocked(root->fs_info);
         /* Tell the block device(s) that the sectors can be discarded */
         ret = btrfs_map_block(root->fs_info, REQ_DISCARD,
                               bytenr, &num_bytes, &bbio, 0);
@@ -2074,6 +2079,7 @@ int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
                 }
                 btrfs_put_bbio(bbio);
         }
+        btrfs_bio_counter_dec(root->fs_info);
 
         if (actual_bytes)
                 *actual_bytes = discarded_bytes;
@@ -2829,6 +2835,7 @@ int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans,
 
 struct async_delayed_refs {
         struct btrfs_root *root;
+        u64 transid;
         int count;
         int error;
         int sync;
@@ -2844,6 +2851,10 @@ static void delayed_ref_async_start(struct btrfs_work *work)
 
         async = container_of(work, struct async_delayed_refs, work);
 
+        /* if the commit is already started, we don't need to wait here */
+        if (btrfs_transaction_blocked(async->root->fs_info))
+                goto done;
+
         trans = btrfs_join_transaction(async->root);
         if (IS_ERR(trans)) {
                 async->error = PTR_ERR(trans);
@@ -2855,10 +2866,15 @@ static void delayed_ref_async_start(struct btrfs_work *work)
          * wait on delayed refs
          */
         trans->sync = true;
+
+        /* Don't bother flushing if we got into a different transaction */
+        if (trans->transid > async->transid)
+                goto end;
+
         ret = btrfs_run_delayed_refs(trans, async->root, async->count);
         if (ret)
                 async->error = ret;
-
+end:
         ret = btrfs_end_transaction(trans, async->root);
         if (ret && !async->error)
                 async->error = ret;
@@ -2870,7 +2886,7 @@ done:
 }
 
 int btrfs_async_run_delayed_refs(struct btrfs_root *root,
-                                 unsigned long count, int wait)
+                                 unsigned long count, u64 transid, int wait)
 {
         struct async_delayed_refs *async;
         int ret;
@@ -2882,6 +2898,7 @@ int btrfs_async_run_delayed_refs(struct btrfs_root *root,
         async->root = root->fs_info->tree_root;
         async->count = count;
         async->error = 0;
+        async->transid = transid;
         if (wait)
                 async->sync = 1;
         else
@@ -8010,8 +8027,9 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
         struct extent_buffer *buf;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
-                return ERR_PTR(-ENOMEM);
+        if (IS_ERR(buf))
+                return buf;
+
         btrfs_set_header_generation(buf, trans->transid);
         btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);
         btrfs_tree_lock(buf);
@@ -8038,7 +8056,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                 set_extent_dirty(&trans->transaction->dirty_pages, buf->start,
                          buf->start + buf->len - 1, GFP_NOFS);
         }
-        trans->blocks_used++;
+        trans->dirty = true;
         /* this returns a buffer locked for blocking */
         return buf;
 }
@@ -8653,8 +8671,9 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
         next = btrfs_find_tree_block(root->fs_info, bytenr);
         if (!next) {
                 next = btrfs_find_create_tree_block(root, bytenr);
-                if (!next)
-                        return -ENOMEM;
+                if (IS_ERR(next))
+                        return PTR_ERR(next);
+
                 btrfs_set_buffer_lockdep_class(root->root_key.objectid, next,
                                                level - 1);
                 reada = 1;
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 3cd57825c75f..75533adef998 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2025,9 +2025,16 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
         bio->bi_iter.bi_size = 0;
         map_length = length;
 
+        /*
+         * Avoid races with device replace and make sure our bbio has devices
+         * associated to its stripes that don't go away while we are doing the
+         * read repair operation.
+         */
+        btrfs_bio_counter_inc_blocked(fs_info);
         ret = btrfs_map_block(fs_info, WRITE, logical,
                               &map_length, &bbio, mirror_num);
         if (ret) {
+                btrfs_bio_counter_dec(fs_info);
                 bio_put(bio);
                 return -EIO;
         }
@@ -2037,6 +2044,7 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
         dev = bbio->stripes[mirror_num-1].dev;
         btrfs_put_bbio(bbio);
         if (!dev || !dev->bdev || !dev->writeable) {
+                btrfs_bio_counter_dec(fs_info);
                 bio_put(bio);
                 return -EIO;
         }
@@ -2045,6 +2053,7 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
 
         if (btrfsic_submit_bio_wait(WRITE_SYNC, bio)) {
                 /* try to remap that extent elsewhere? */
+                btrfs_bio_counter_dec(fs_info);
                 bio_put(bio);
                 btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS);
                 return -EIO;
@@ -2054,6 +2063,7 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
                 "read error corrected: ino %llu off %llu (dev %s sector %llu)",
                                   btrfs_ino(inode), start,
                                   rcu_str_deref(dev->name), sector);
+        btrfs_bio_counter_dec(fs_info);
         bio_put(bio);
         return 0;
 }
@@ -4718,16 +4728,16 @@ err:
 }
 
 struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
-                                                u64 start)
+                                                u64 start, u32 nodesize)
 {
         unsigned long len;
 
         if (!fs_info) {
                 /*
                  * Called only from tests that don't always have a fs_info
-                 * available, but we know that nodesize is 4096
+                 * available
                  */
-                len = 4096;
+                len = nodesize;
         } else {
                 len = fs_info->tree_root->nodesize;
         }
@@ -4823,7 +4833,7 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,
 
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
 struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
-                                               u64 start)
+                                        u64 start, u32 nodesize)
 {
         struct extent_buffer *eb, *exists = NULL;
         int ret;
@@ -4831,7 +4841,7 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
         eb = find_extent_buffer(fs_info, start);
         if (eb)
                 return eb;
-        eb = alloc_dummy_extent_buffer(fs_info, start);
+        eb = alloc_dummy_extent_buffer(fs_info, start, nodesize);
         if (!eb)
                 return NULL;
         eb->fs_info = fs_info;
@@ -4882,18 +4892,25 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
         int uptodate = 1;
         int ret;
 
+        if (!IS_ALIGNED(start, fs_info->tree_root->sectorsize)) {
+                btrfs_err(fs_info, "bad tree block start %llu", start);
+                return ERR_PTR(-EINVAL);
+        }
+
         eb = find_extent_buffer(fs_info, start);
         if (eb)
                 return eb;
 
         eb = __alloc_extent_buffer(fs_info, start, len);
         if (!eb)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         for (i = 0; i < num_pages; i++, index++) {
                 p = find_or_create_page(mapping, index, GFP_NOFS|__GFP_NOFAIL);
-                if (!p)
+                if (!p) {
+                        exists = ERR_PTR(-ENOMEM);
                         goto free_eb;
+                }
 
                 spin_lock(&mapping->private_lock);
                 if (PagePrivate(p)) {
@@ -4938,8 +4955,10 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
                 set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
 again:
         ret = radix_tree_preload(GFP_NOFS);
-        if (ret)
+        if (ret) {
+                exists = ERR_PTR(ret);
                 goto free_eb;
+        }
 
         spin_lock(&fs_info->buffer_lock);
         ret = radix_tree_insert(&fs_info->buffer_radix,
@@ -5323,6 +5342,11 @@ int read_extent_buffer_to_user(struct extent_buffer *eb, void __user *dstv,
         return ret;
 }
 
+/*
+ * return 0 if the item is found within a page.
+ * return 1 if the item spans two pages.
+ * return -EINVAL otherwise.
+ */
 int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,
                                unsigned long min_len, char **map,
                                unsigned long *map_start,
@@ -5337,7 +5361,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,
                 PAGE_SHIFT;
 
         if (i != end_i)
-                return -EINVAL;
+                return 1;
 
         if (i == 0) {
                 offset = start_offset;
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 1baf19c9b79d..c0c1c4fef6ce 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -348,7 +348,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
 struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
                                                   u64 start, unsigned long len);
 struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
-                                                u64 start);
+                                                u64 start, u32 nodesize);
 struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src);
 struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,
                                          u64 start);
@@ -468,5 +468,5 @@ noinline u64 find_lock_delalloc_range(struct inode *inode,
                                       u64 *end, u64 max_bytes);
 #endif
 struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
-                                               u64 start);
+                                               u64 start, u32 nodesize);
 #endif
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index e0c9bd3fb02d..2234e88cf674 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1534,30 +1534,30 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                 reserve_bytes = round_up(write_bytes + sector_offset,
                                 root->sectorsize);
 
-                if ((BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
-                                              BTRFS_INODE_PREALLOC)) &&
-                    check_can_nocow(inode, pos, &write_bytes) > 0) {
-                        /*
-                         * For nodata cow case, no need to reserve
-                         * data space.
-                         */
-                        only_release_metadata = true;
-                        /*
-                         * our prealloc extent may be smaller than
-                         * write_bytes, so scale down.
-                         */
-                        num_pages = DIV_ROUND_UP(write_bytes + offset,
-                                                 PAGE_SIZE);
-                        reserve_bytes = round_up(write_bytes + sector_offset,
-                                        root->sectorsize);
-                        goto reserve_metadata;
-                }
-
                 ret = btrfs_check_data_free_space(inode, pos, write_bytes);
-                if (ret < 0)
-                        break;
+                if (ret < 0) {
+                        if ((BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
+                                                      BTRFS_INODE_PREALLOC)) &&
+                            check_can_nocow(inode, pos, &write_bytes) > 0) {
+                                /*
+                                 * For nodata cow case, no need to reserve
+                                 * data space.
+                                 */
+                                only_release_metadata = true;
+                                /*
+                                 * our prealloc extent may be smaller than
+                                 * write_bytes, so scale down.
+                                 */
+                                num_pages = DIV_ROUND_UP(write_bytes + offset,
+                                                         PAGE_SIZE);
+                                reserve_bytes = round_up(write_bytes +
+                                                         sector_offset,
+                                                         root->sectorsize);
+                        } else {
+                                break;
+                        }
+                }
 
-reserve_metadata:
                 ret = btrfs_delalloc_reserve_metadata(inode, reserve_bytes);
                 if (ret) {
                         if (!only_release_metadata)
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index c6dc1183f542..69d270f6602c 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -29,7 +29,7 @@
 #include "inode-map.h"
 #include "volumes.h"
 
-#define BITS_PER_BITMAP         (PAGE_SIZE * 8)
+#define BITS_PER_BITMAP         (PAGE_SIZE * 8UL)
 #define MAX_CACHE_BYTES_PER_GIG SZ_32K
 
 struct btrfs_trim_range {
@@ -1415,11 +1415,11 @@ static inline u64 offset_to_bitmap(struct btrfs_free_space_ctl *ctl,
                                    u64 offset)
 {
         u64 bitmap_start;
-        u32 bytes_per_bitmap;
+        u64 bytes_per_bitmap;
 
         bytes_per_bitmap = BITS_PER_BITMAP * ctl->unit;
         bitmap_start = offset - ctl->start;
-        bitmap_start = div_u64(bitmap_start, bytes_per_bitmap);
+        bitmap_start = div64_u64(bitmap_start, bytes_per_bitmap);
         bitmap_start *= bytes_per_bitmap;
         bitmap_start += ctl->start;
 
@@ -1638,10 +1638,10 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl)
         u64 bitmap_bytes;
         u64 extent_bytes;
         u64 size = block_group->key.offset;
-        u32 bytes_per_bg = BITS_PER_BITMAP * ctl->unit;
-        u32 max_bitmaps = div_u64(size + bytes_per_bg - 1, bytes_per_bg);
+        u64 bytes_per_bg = BITS_PER_BITMAP * ctl->unit;
+        u64 max_bitmaps = div64_u64(size + bytes_per_bg - 1, bytes_per_bg);
 
-        max_bitmaps = max_t(u32, max_bitmaps, 1);
+        max_bitmaps = max_t(u64, max_bitmaps, 1);
 
         ASSERT(ctl->total_bitmaps <= max_bitmaps);
 
@@ -1660,7 +1660,7 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl)
          * sure we don't go over our overall goal of MAX_CACHE_BYTES_PER_GIG as
          * we add more bitmaps.
          */
-        bitmap_bytes = (ctl->total_bitmaps + 1) * PAGE_SIZE;
+        bitmap_bytes = (ctl->total_bitmaps + 1) * ctl->unit;
 
         if (bitmap_bytes >= max_bytes) {
                 ctl->extents_thresh = 0;
@@ -3662,7 +3662,7 @@ have_info:
                         if (tmp->offset + tmp->bytes < offset)
                                 break;
                         if (offset + bytes < tmp->offset) {
-                                n = rb_prev(&info->offset_index);
+                                n = rb_prev(&tmp->offset_index);
                                 continue;
                         }
                         info = tmp;
@@ -3676,7 +3676,7 @@ have_info:
                         if (offset + bytes < tmp->offset)
                                 break;
                         if (tmp->offset + tmp->bytes < offset) {
-                                n = rb_next(&info->offset_index);
+                                n = rb_next(&tmp->offset_index);
                                 continue;
                         }
                         info = tmp;
diff --git a/fs/btrfs/hash.c b/fs/btrfs/hash.c
index aae520b2aee5..a97fdc156a03 100644
--- a/fs/btrfs/hash.c
+++ b/fs/btrfs/hash.c
@@ -24,6 +24,11 @@ int __init btrfs_hash_init(void)
         return PTR_ERR_OR_ZERO(tfm);
 }
 
+const char* btrfs_crc32c_impl(void)
+{
+        return crypto_tfm_alg_driver_name(crypto_shash_tfm(tfm));
+}
+
 void btrfs_hash_exit(void)
 {
         crypto_free_shash(tfm);
diff --git a/fs/btrfs/hash.h b/fs/btrfs/hash.h
index 118a2316e5d3..c3a2ec554361 100644
--- a/fs/btrfs/hash.h
+++ b/fs/btrfs/hash.h
@@ -22,6 +22,7 @@
 int __init btrfs_hash_init(void);
 
 void btrfs_hash_exit(void);
+const char* btrfs_crc32c_impl(void);
 
 u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length);
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 270499598ed4..4421954720b8 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3271,7 +3271,16 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
         /* grab metadata reservation from transaction handle */
         if (reserve) {
                 ret = btrfs_orphan_reserve_metadata(trans, inode);
-                BUG_ON(ret); /* -ENOSPC in reservation; Logic error? JDM */
+                ASSERT(!ret);
+                if (ret) {
+                        atomic_dec(&root->orphan_inodes);
+                        clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
+                                  &BTRFS_I(inode)->runtime_flags);
+                        if (insert)
+                                clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
+                                          &BTRFS_I(inode)->runtime_flags);
+                        return ret;
+                }
         }
 
         /* insert an orphan item to track this unlinked/truncated file */
@@ -4549,6 +4558,7 @@ delete:
                         BUG_ON(ret);
                         if (btrfs_should_throttle_delayed_refs(trans, root))
                                 btrfs_async_run_delayed_refs(root,
+                                                             trans->transid,
                                         trans->delayed_ref_updates * 2, 0);
                         if (be_nice) {
                                 if (truncate_space_check(trans, root,
@@ -5748,6 +5758,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
         int name_len;
         int is_curr = 0;        /* ctx->pos points to the current index? */
         bool emitted;
+        bool put = false;
 
         /* FIXME, use a real flag for deciding about the key type */
         if (root->fs_info->tree_root == root)
@@ -5765,7 +5776,8 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
         if (key_type == BTRFS_DIR_INDEX_KEY) {
                 INIT_LIST_HEAD(&ins_list);
                 INIT_LIST_HEAD(&del_list);
-                btrfs_get_delayed_items(inode, &ins_list, &del_list);
+                put = btrfs_readdir_get_delayed_items(inode, &ins_list,
+                                                      &del_list);
         }
 
         key.type = key_type;
@@ -5912,8 +5924,8 @@ next:
 nopos:
         ret = 0;
 err:
-        if (key_type == BTRFS_DIR_INDEX_KEY)
-                btrfs_put_delayed_items(&ins_list, &del_list);
+        if (put)
+                btrfs_readdir_put_delayed_items(inode, &ins_list, &del_list);
         btrfs_free_path(path);
         return ret;
 }
@@ -6979,7 +6991,18 @@ insert:
                  * existing will always be non-NULL, since there must be
                  * extent causing the -EEXIST.
                  */
-                if (start >= extent_map_end(existing) ||
+                if (existing->start == em->start &&
+                    extent_map_end(existing) == extent_map_end(em) &&
+                    em->block_start == existing->block_start) {
+                        /*
+                         * these two extents are the same, it happens
+                         * with inlines especially
+                         */
+                        free_extent_map(em);
+                        em = existing;
+                        err = 0;
+
+                } else if (start >= extent_map_end(existing) ||
                     start <= existing->start) {
                         /*
                          * The existing extent map is the one nearest to
@@ -10514,7 +10537,7 @@ static const struct inode_operations btrfs_dir_ro_inode_operations = {
 static const struct file_operations btrfs_dir_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = generic_read_dir,
-        .iterate        = btrfs_real_readdir,
+        .iterate_shared = btrfs_real_readdir,
         .unlocked_ioctl = btrfs_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = btrfs_compat_ioctl,
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 559170464d7c..aca8264f4a49 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -718,12 +718,13 @@ int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr,
         return count;
 }
 
-void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,
+int btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,
                               const u64 range_start, const u64 range_len)
 {
         struct btrfs_root *root;
         struct list_head splice;
         int done;
+        int total_done = 0;
 
         INIT_LIST_HEAD(&splice);
 
@@ -742,6 +743,7 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,
                 done = btrfs_wait_ordered_extents(root, nr,
                                                   range_start, range_len);
                 btrfs_put_fs_root(root);
+                total_done += done;
 
                 spin_lock(&fs_info->ordered_root_lock);
                 if (nr != -1) {
@@ -752,6 +754,8 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,
         list_splice_tail(&splice, &fs_info->ordered_roots);
         spin_unlock(&fs_info->ordered_root_lock);
         mutex_unlock(&fs_info->ordered_operations_mutex);
+
+        return total_done;
 }
 
 /*
@@ -964,6 +968,7 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset,
         struct rb_node *prev = NULL;
         struct btrfs_ordered_extent *test;
         int ret = 1;
+        u64 orig_offset = offset;
 
         spin_lock_irq(&tree->lock);
         if (ordered) {
@@ -979,7 +984,7 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset,
 
         /* truncate file */
         if (disk_i_size > i_size) {
-                BTRFS_I(inode)->disk_i_size = i_size;
+                BTRFS_I(inode)->disk_i_size = orig_offset;
                 ret = 0;
                 goto out;
         }
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 2049c9be85ee..451507776ff5 100644
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -199,7 +199,7 @@ int btrfs_find_ordered_sum(struct inode *inode, u64 offset, u64 disk_bytenr,
                            u32 *sum, int len);
 int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr,
                                const u64 range_start, const u64 range_len);
-void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,
+int btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,
                               const u64 range_start, const u64 range_len);
 void btrfs_get_logged_extents(struct inode *inode,
                               struct list_head *logged_list,
diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 298631eaee78..8428db7cd88f 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -761,12 +761,14 @@ static void __reada_start_machine(struct btrfs_fs_info *fs_info)
 
         do {
                 enqueued = 0;
+                mutex_lock(&fs_devices->device_list_mutex);
                 list_for_each_entry(device, &fs_devices->devices, dev_list) {
                         if (atomic_read(&device->reada_in_flight) <
                             MAX_IN_FLIGHT)
                                 enqueued += reada_start_machine_dev(fs_info,
                                                                     device);
                 }
+                mutex_unlock(&fs_devices->device_list_mutex);
                 total += enqueued;
         } while (enqueued && total < 10000);
 
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 46d847f66e4b..70427ef66b04 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -3582,6 +3582,46 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
                  */
                 scrub_pause_on(fs_info);
                 ret = btrfs_inc_block_group_ro(root, cache);
+                if (!ret && is_dev_replace) {
+                        /*
+                         * If we are doing a device replace wait for any tasks
+                         * that started dellaloc right before we set the block
+                         * group to RO mode, as they might have just allocated
+                         * an extent from it or decided they could do a nocow
+                         * write. And if any such tasks did that, wait for their
+                         * ordered extents to complete and then commit the
+                         * current transaction, so that we can later see the new
+                         * extent items in the extent tree - the ordered extents
+                         * create delayed data references (for cow writes) when
+                         * they complete, which will be run and insert the
+                         * corresponding extent items into the extent tree when
+                         * we commit the transaction they used when running
+                         * inode.c:btrfs_finish_ordered_io(). We later use
+                         * the commit root of the extent tree to find extents
+                         * to copy from the srcdev into the tgtdev, and we don't
+                         * want to miss any new extents.
+                         */
+                        btrfs_wait_block_group_reservations(cache);
+                        btrfs_wait_nocow_writers(cache);
+                        ret = btrfs_wait_ordered_roots(fs_info, -1,
+                                                       cache->key.objectid,
+                                                       cache->key.offset);
+                        if (ret > 0) {
+                                struct btrfs_trans_handle *trans;
+
+                                trans = btrfs_join_transaction(root);
+                                if (IS_ERR(trans))
+                                        ret = PTR_ERR(trans);
+                                else
+                                        ret = btrfs_commit_transaction(trans,
+                                                                       root);
+                                if (ret) {
+                                        scrub_pause_off(fs_info);
+                                        btrfs_put_block_group(cache);
+                                        break;
+                                }
+                        }
+                }
                 scrub_pause_off(fs_info);
 
                 if (ret == 0) {
@@ -3602,9 +3642,11 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
                         break;
                 }
 
+                btrfs_dev_replace_lock(&fs_info->dev_replace, 1);
                 dev_replace->cursor_right = found_key.offset + length;
                 dev_replace->cursor_left = found_key.offset;
                 dev_replace->item_needs_writeback = 1;
+                btrfs_dev_replace_unlock(&fs_info->dev_replace, 1);
                 ret = scrub_chunk(sctx, scrub_dev, chunk_offset, length,
                                   found_key.offset, cache, is_dev_replace);
 
@@ -3640,6 +3682,11 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
 
                 scrub_pause_off(fs_info);
 
+                btrfs_dev_replace_lock(&fs_info->dev_replace, 1);
+                dev_replace->cursor_left = dev_replace->cursor_right;
+                dev_replace->item_needs_writeback = 1;
+                btrfs_dev_replace_unlock(&fs_info->dev_replace, 1);
+
                 if (ro_set)
                         btrfs_dec_block_group_ro(root, cache);
 
@@ -3677,9 +3724,6 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
                         ret = -ENOMEM;
                         break;
                 }
-
-                dev_replace->cursor_left = dev_replace->cursor_right;
-                dev_replace->item_needs_writeback = 1;
 skip:
                 key.offset = found_key.offset + length;
                 btrfs_release_path(path);
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4e59a91a11e0..60e7179ed4b7 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -235,7 +235,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
         trans->aborted = errno;
         /* Nothing used. The other threads that have joined this
          * transaction may be able to continue. */
-        if (!trans->blocks_used && list_empty(&trans->new_bgs)) {
+        if (!trans->dirty && list_empty(&trans->new_bgs)) {
                 const char *errstr;
 
                 errstr = btrfs_decode_error(errno);
@@ -1807,6 +1807,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
                         }
                 }
                 sb->s_flags &= ~MS_RDONLY;
+
+                fs_info->open = 1;
         }
 out:
         wake_up_process(fs_info->transaction_kthread);
@@ -2303,7 +2305,7 @@ static void btrfs_interface_exit(void)
 
 static void btrfs_print_mod_info(void)
 {
-        printk(KERN_INFO "Btrfs loaded"
+        printk(KERN_INFO "Btrfs loaded, crc32c=%s"
 #ifdef CONFIG_BTRFS_DEBUG
                         ", debug=on"
 #endif
@@ -2313,33 +2315,48 @@ static void btrfs_print_mod_info(void)
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
                         ", integrity-checker=on"
 #endif
-                        "\n");
+                        "\n",
+                        btrfs_crc32c_impl());
 }
 
 static int btrfs_run_sanity_tests(void)
 {
-        int ret;
-
+        int ret, i;
+        u32 sectorsize, nodesize;
+        u32 test_sectorsize[] = {
+                PAGE_SIZE,
+        };
         ret = btrfs_init_test_fs();
         if (ret)
                 return ret;
-
-        ret = btrfs_test_free_space_cache();
-        if (ret)
-                goto out;
-        ret = btrfs_test_extent_buffer_operations();
-        if (ret)
-                goto out;
-        ret = btrfs_test_extent_io();
-        if (ret)
-                goto out;
-        ret = btrfs_test_inodes();
-        if (ret)
-                goto out;
-        ret = btrfs_test_qgroups();
-        if (ret)
-                goto out;
-        ret = btrfs_test_free_space_tree();
+        for (i = 0; i < ARRAY_SIZE(test_sectorsize); i++) {
+                sectorsize = test_sectorsize[i];
+                for (nodesize = sectorsize;
+                     nodesize <= BTRFS_MAX_METADATA_BLOCKSIZE;
+                     nodesize <<= 1) {
+                        pr_info("BTRFS: selftest: sectorsize: %u  nodesize: %u\n",
+                                sectorsize, nodesize);
+                        ret = btrfs_test_free_space_cache(sectorsize, nodesize);
+                        if (ret)
+                                goto out;
+                        ret = btrfs_test_extent_buffer_operations(sectorsize,
+                                nodesize);
+                        if (ret)
+                                goto out;
+                        ret = btrfs_test_extent_io(sectorsize, nodesize);
+                        if (ret)
+                                goto out;
+                        ret = btrfs_test_inodes(sectorsize, nodesize);
+                        if (ret)
+                                goto out;
+                        ret = btrfs_test_qgroups(sectorsize, nodesize);
+                        if (ret)
+                                goto out;
+                        ret = btrfs_test_free_space_tree(sectorsize, nodesize);
+                        if (ret)
+                                goto out;
+                }
+        }
 out:
         btrfs_destroy_test_fs();
         return ret;
diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index f54bf450bad3..02223f3f78f4 100644
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -68,7 +68,7 @@ int btrfs_init_test_fs(void)
         if (IS_ERR(test_mnt)) {
                 printk(KERN_ERR "btrfs: cannot mount test file system\n");
                 unregister_filesystem(&test_type);
-                return ret;
+                return PTR_ERR(test_mnt);
         }
         return 0;
 }
@@ -175,7 +175,7 @@ void btrfs_free_dummy_root(struct btrfs_root *root)
 }
 
 struct btrfs_block_group_cache *
-btrfs_alloc_dummy_block_group(unsigned long length)
+btrfs_alloc_dummy_block_group(unsigned long length, u32 sectorsize)
 {
         struct btrfs_block_group_cache *cache;
 
@@ -192,8 +192,8 @@ btrfs_alloc_dummy_block_group(unsigned long length)
         cache->key.objectid = 0;
         cache->key.offset = length;
         cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
-        cache->sectorsize = 4096;
-        cache->full_stripe_len = 4096;
+        cache->sectorsize = sectorsize;
+        cache->full_stripe_len = sectorsize;
 
         INIT_LIST_HEAD(&cache->list);
         INIT_LIST_HEAD(&cache->cluster_list);
diff --git a/fs/btrfs/tests/btrfs-tests.h b/fs/btrfs/tests/btrfs-tests.h
index 054b8c73c951..66fb6b701eb7 100644
--- a/fs/btrfs/tests/btrfs-tests.h
+++ b/fs/btrfs/tests/btrfs-tests.h
@@ -26,27 +26,28 @@
 struct btrfs_root;
 struct btrfs_trans_handle;
 
-int btrfs_test_free_space_cache(void);
-int btrfs_test_extent_buffer_operations(void);
-int btrfs_test_extent_io(void);
-int btrfs_test_inodes(void);
-int btrfs_test_qgroups(void);
-int btrfs_test_free_space_tree(void);
+int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize);
+int btrfs_test_extent_buffer_operations(u32 sectorsize, u32 nodesize);
+int btrfs_test_extent_io(u32 sectorsize, u32 nodesize);
+int btrfs_test_inodes(u32 sectorsize, u32 nodesize);
+int btrfs_test_qgroups(u32 sectorsize, u32 nodesize);
+int btrfs_test_free_space_tree(u32 sectorsize, u32 nodesize);
 int btrfs_init_test_fs(void);
 void btrfs_destroy_test_fs(void);
 struct inode *btrfs_new_test_inode(void);
 struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(void);
 void btrfs_free_dummy_root(struct btrfs_root *root);
 struct btrfs_block_group_cache *
-btrfs_alloc_dummy_block_group(unsigned long length);
+btrfs_alloc_dummy_block_group(unsigned long length, u32 sectorsize);
 void btrfs_free_dummy_block_group(struct btrfs_block_group_cache *cache);
 void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans);
 #else
-static inline int btrfs_test_free_space_cache(void)
+static inline int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize)
 {
         return 0;
 }
-static inline int btrfs_test_extent_buffer_operations(void)
+static inline int btrfs_test_extent_buffer_operations(u32 sectorsize,
+        u32 nodesize)
 {
         return 0;
 }
@@ -57,19 +58,19 @@ static inline int btrfs_init_test_fs(void)
 static inline void btrfs_destroy_test_fs(void)
 {
 }
-static inline int btrfs_test_extent_io(void)
+static inline int btrfs_test_extent_io(u32 sectorsize, u32 nodesize)
 {
         return 0;
 }
-static inline int btrfs_test_inodes(void)
+static inline int btrfs_test_inodes(u32 sectorsize, u32 nodesize)
 {
         return 0;
 }
-static inline int btrfs_test_qgroups(void)
+static inline int btrfs_test_qgroups(u32 sectorsize, u32 nodesize)
 {
         return 0;
 }
-static inline int btrfs_test_free_space_tree(void)
+static inline int btrfs_test_free_space_tree(u32 sectorsize, u32 nodesize)
 {
         return 0;
 }
diff --git a/fs/btrfs/tests/extent-buffer-tests.c b/fs/btrfs/tests/extent-buffer-tests.c
index f51963a8f929..4f8cbd1ec5ee 100644
--- a/fs/btrfs/tests/extent-buffer-tests.c
+++ b/fs/btrfs/tests/extent-buffer-tests.c
@@ -22,7 +22,7 @@
 #include "../extent_io.h"
 #include "../disk-io.h"
 
-static int test_btrfs_split_item(void)
+static int test_btrfs_split_item(u32 sectorsize, u32 nodesize)
 {
         struct btrfs_path *path;
         struct btrfs_root *root;
@@ -40,7 +40,7 @@ static int test_btrfs_split_item(void)
 
         test_msg("Running btrfs_split_item tests\n");
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 test_msg("Could not allocate root\n");
                 return PTR_ERR(root);
@@ -53,7 +53,8 @@ static int test_btrfs_split_item(void)
                 return -ENOMEM;
         }
 
-        path->nodes[0] = eb = alloc_dummy_extent_buffer(NULL, 4096);
+        path->nodes[0] = eb = alloc_dummy_extent_buffer(NULL, nodesize,
+                                                        nodesize);
         if (!eb) {
                 test_msg("Could not allocate dummy buffer\n");
                 ret = -ENOMEM;
@@ -222,8 +223,8 @@ out:
         return ret;
 }
 
-int btrfs_test_extent_buffer_operations(void)
+int btrfs_test_extent_buffer_operations(u32 sectorsize, u32 nodesize)
 {
-        test_msg("Running extent buffer operation tests");
-        return test_btrfs_split_item();
+        test_msg("Running extent buffer operation tests\n");
+        return test_btrfs_split_item(sectorsize, nodesize);
 }
diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 55724607f79b..d19ab0317283 100644
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/sizes.h>
 #include "btrfs-tests.h"
+#include "../ctree.h"
 #include "../extent_io.h"
 
 #define PROCESS_UNLOCK          (1 << 0)
@@ -65,7 +66,7 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end,
         return count;
 }
 
-static int test_find_delalloc(void)
+static int test_find_delalloc(u32 sectorsize)
 {
         struct inode *inode;
         struct extent_io_tree tmp;
@@ -113,7 +114,7 @@ static int test_find_delalloc(void)
          * |--- delalloc ---|
          * |---  search  ---|
          */
-        set_extent_delalloc(&tmp, 0, 4095, NULL);
+        set_extent_delalloc(&tmp, 0, sectorsize - 1, NULL);
         start = 0;
         end = 0;
         found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
@@ -122,9 +123,9 @@ static int test_find_delalloc(void)
                 test_msg("Should have found at least one delalloc\n");
                 goto out_bits;
         }
-        if (start != 0 || end != 4095) {
-                test_msg("Expected start 0 end 4095, got start %Lu end %Lu\n",
-                         start, end);
+        if (start != 0 || end != (sectorsize - 1)) {
+                test_msg("Expected start 0 end %u, got start %llu end %llu\n",
+                        sectorsize - 1, start, end);
                 goto out_bits;
         }
         unlock_extent(&tmp, start, end);
@@ -144,7 +145,7 @@ static int test_find_delalloc(void)
                 test_msg("Couldn't find the locked page\n");
                 goto out_bits;
         }
-        set_extent_delalloc(&tmp, 4096, max_bytes - 1, NULL);
+        set_extent_delalloc(&tmp, sectorsize, max_bytes - 1, NULL);
         start = test_start;
         end = 0;
         found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
@@ -172,7 +173,7 @@ static int test_find_delalloc(void)
          * |--- delalloc ---|
          *                    |--- search ---|
          */
-        test_start = max_bytes + 4096;
+        test_start = max_bytes + sectorsize;
         locked_page = find_lock_page(inode->i_mapping, test_start >>
                                      PAGE_SHIFT);
         if (!locked_page) {
@@ -272,6 +273,16 @@ out:
         return ret;
 }
 
+/**
+ * test_bit_in_byte - Determine whether a bit is set in a byte
+ * @nr: bit number to test
+ * @addr: Address to start counting from
+ */
+static inline int test_bit_in_byte(int nr, const u8 *addr)
+{
+        return 1UL & (addr[nr / BITS_PER_BYTE] >> (nr & (BITS_PER_BYTE - 1)));
+}
+
 static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
                              unsigned long len)
 {
@@ -298,25 +309,29 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
                 return -EINVAL;
         }
 
-        bitmap_set(bitmap, (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,
-                   sizeof(long) * BITS_PER_BYTE);
-        extent_buffer_bitmap_set(eb, PAGE_SIZE - sizeof(long) / 2, 0,
-                                 sizeof(long) * BITS_PER_BYTE);
-        if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {
-                test_msg("Setting straddling pages failed\n");
-                return -EINVAL;
-        }
+        /* Straddling pages test */
+        if (len > PAGE_SIZE) {
+                bitmap_set(bitmap,
+                        (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,
+                        sizeof(long) * BITS_PER_BYTE);
+                extent_buffer_bitmap_set(eb, PAGE_SIZE - sizeof(long) / 2, 0,
+                                        sizeof(long) * BITS_PER_BYTE);
+                if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {
+                        test_msg("Setting straddling pages failed\n");
+                        return -EINVAL;
+                }
 
-        bitmap_set(bitmap, 0, len * BITS_PER_BYTE);
-        bitmap_clear(bitmap,
-                     (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,
-                     sizeof(long) * BITS_PER_BYTE);
-        extent_buffer_bitmap_set(eb, 0, 0, len * BITS_PER_BYTE);
-        extent_buffer_bitmap_clear(eb, PAGE_SIZE - sizeof(long) / 2, 0,
-                                   sizeof(long) * BITS_PER_BYTE);
-        if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {
-                test_msg("Clearing straddling pages failed\n");
-                return -EINVAL;
+                bitmap_set(bitmap, 0, len * BITS_PER_BYTE);
+                bitmap_clear(bitmap,
+                        (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,
+                        sizeof(long) * BITS_PER_BYTE);
+                extent_buffer_bitmap_set(eb, 0, 0, len * BITS_PER_BYTE);
+                extent_buffer_bitmap_clear(eb, PAGE_SIZE - sizeof(long) / 2, 0,
+                                        sizeof(long) * BITS_PER_BYTE);
+                if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {
+                        test_msg("Clearing straddling pages failed\n");
+                        return -EINVAL;
+                }
         }
 
         /*
@@ -333,7 +348,7 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
         for (i = 0; i < len * BITS_PER_BYTE; i++) {
                 int bit, bit1;
 
-                bit = !!test_bit(i, bitmap);
+                bit = !!test_bit_in_byte(i, (u8 *)bitmap);
                 bit1 = !!extent_buffer_test_bit(eb, 0, i);
                 if (bit1 != bit) {
                         test_msg("Testing bit pattern failed\n");
@@ -351,15 +366,22 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
         return 0;
 }
 
-static int test_eb_bitmaps(void)
+static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
 {
-        unsigned long len = PAGE_SIZE * 4;
+        unsigned long len;
         unsigned long *bitmap;
         struct extent_buffer *eb;
         int ret;
 
         test_msg("Running extent buffer bitmap tests\n");
 
+        /*
+         * In ppc64, sectorsize can be 64K, thus 4 * 64K will be larger than
+         * BTRFS_MAX_METADATA_BLOCKSIZE.
+         */
+        len = (sectorsize < BTRFS_MAX_METADATA_BLOCKSIZE)
+                ? sectorsize * 4 : sectorsize;
+
         bitmap = kmalloc(len, GFP_KERNEL);
         if (!bitmap) {
                 test_msg("Couldn't allocate test bitmap\n");
@@ -379,7 +401,7 @@ static int test_eb_bitmaps(void)
 
         /* Do it over again with an extent buffer which isn't page-aligned. */
         free_extent_buffer(eb);
-        eb = __alloc_dummy_extent_buffer(NULL, PAGE_SIZE / 2, len);
+        eb = __alloc_dummy_extent_buffer(NULL, nodesize / 2, len);
         if (!eb) {
                 test_msg("Couldn't allocate test extent buffer\n");
                 kfree(bitmap);
@@ -393,17 +415,17 @@ out:
         return ret;
 }
 
-int btrfs_test_extent_io(void)
+int btrfs_test_extent_io(u32 sectorsize, u32 nodesize)
 {
         int ret;
 
         test_msg("Running extent I/O tests\n");
 
-        ret = test_find_delalloc();
+        ret = test_find_delalloc(sectorsize);
         if (ret)
                 goto out;
 
-        ret = test_eb_bitmaps();
+        ret = test_eb_bitmaps(sectorsize, nodesize);
 out:
         test_msg("Extent I/O tests finished\n");
         return ret;
diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
index 0eeb8f3d6b67..3956bb2ff84c 100644
--- a/fs/btrfs/tests/free-space-tests.c
+++ b/fs/btrfs/tests/free-space-tests.c
@@ -22,7 +22,7 @@
 #include "../disk-io.h"
 #include "../free-space-cache.h"
 
-#define BITS_PER_BITMAP         (PAGE_SIZE * 8)
+#define BITS_PER_BITMAP         (PAGE_SIZE * 8UL)
 
 /*
  * This test just does basic sanity checking, making sure we can add an extent
@@ -99,7 +99,8 @@ static int test_extents(struct btrfs_block_group_cache *cache)
         return 0;
 }
 
-static int test_bitmaps(struct btrfs_block_group_cache *cache)
+static int test_bitmaps(struct btrfs_block_group_cache *cache,
+                        u32 sectorsize)
 {
         u64 next_bitmap_offset;
         int ret;
@@ -139,7 +140,7 @@ static int test_bitmaps(struct btrfs_block_group_cache *cache)
          * The first bitmap we have starts at offset 0 so the next one is just
          * at the end of the first bitmap.
          */
-        next_bitmap_offset = (u64)(BITS_PER_BITMAP * 4096);
+        next_bitmap_offset = (u64)(BITS_PER_BITMAP * sectorsize);
 
         /* Test a bit straddling two bitmaps */
         ret = test_add_free_space_entry(cache, next_bitmap_offset - SZ_2M,
@@ -167,9 +168,10 @@ static int test_bitmaps(struct btrfs_block_group_cache *cache)
 }
 
 /* This is the high grade jackassery */
-static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
+static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache,
+                                    u32 sectorsize)
 {
-        u64 bitmap_offset = (u64)(BITS_PER_BITMAP * 4096);
+        u64 bitmap_offset = (u64)(BITS_PER_BITMAP * sectorsize);
         int ret;
 
         test_msg("Running bitmap and extent tests\n");
@@ -401,7 +403,8 @@ static int check_cache_empty(struct btrfs_block_group_cache *cache)
  * requests.
  */
 static int
-test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
+test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache,
+                                       u32 sectorsize)
 {
         int ret;
         u64 offset;
@@ -539,7 +542,7 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
          * The goal is to test that the bitmap entry space stealing doesn't
          * steal this space region.
          */
-        ret = btrfs_add_free_space(cache, SZ_128M + SZ_16M, 4096);
+        ret = btrfs_add_free_space(cache, SZ_128M + SZ_16M, sectorsize);
         if (ret) {
                 test_msg("Error adding free space: %d\n", ret);
                 return ret;
@@ -597,8 +600,8 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
                 return -ENOENT;
         }
 
-        if (cache->free_space_ctl->free_space != (SZ_1M + 4096)) {
-                test_msg("Cache free space is not 1Mb + 4Kb\n");
+        if (cache->free_space_ctl->free_space != (SZ_1M + sectorsize)) {
+                test_msg("Cache free space is not 1Mb + %u\n", sectorsize);
                 return -EINVAL;
         }
 
@@ -611,22 +614,25 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
                 return -EINVAL;
         }
 
-        /* All that remains is a 4Kb free space region in a bitmap. Confirm. */
+        /*
+         * All that remains is a sectorsize free space region in a bitmap.
+         * Confirm.
+         */
         ret = check_num_extents_and_bitmaps(cache, 1, 1);
         if (ret)
                 return ret;
 
-        if (cache->free_space_ctl->free_space != 4096) {
-                test_msg("Cache free space is not 4Kb\n");
+        if (cache->free_space_ctl->free_space != sectorsize) {
+                test_msg("Cache free space is not %u\n", sectorsize);
                 return -EINVAL;
         }
 
         offset = btrfs_find_space_for_alloc(cache,
-                                            0, 4096, 0,
+                                            0, sectorsize, 0,
                                             &max_extent_size);
         if (offset != (SZ_128M + SZ_16M)) {
-                test_msg("Failed to allocate 4Kb from space cache, returned offset is: %llu\n",
-                         offset);
+                test_msg("Failed to allocate %u, returned offset : %llu\n",
+                         sectorsize, offset);
                 return -EINVAL;
         }
 
@@ -733,7 +739,7 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
          * The goal is to test that the bitmap entry space stealing doesn't
          * steal this space region.
          */
-        ret = btrfs_add_free_space(cache, SZ_32M, 8192);
+        ret = btrfs_add_free_space(cache, SZ_32M, 2 * sectorsize);
         if (ret) {
                 test_msg("Error adding free space: %d\n", ret);
                 return ret;
@@ -757,7 +763,7 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
 
         /*
          * Confirm that our extent entry didn't stole all free space from the
-         * bitmap, because of the small 8Kb free space region.
+         * bitmap, because of the small 2 * sectorsize free space region.
          */
         ret = check_num_extents_and_bitmaps(cache, 2, 1);
         if (ret)
@@ -783,8 +789,8 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
                 return -ENOENT;
         }
 
-        if (cache->free_space_ctl->free_space != (SZ_1M + 8192)) {
-                test_msg("Cache free space is not 1Mb + 8Kb\n");
+        if (cache->free_space_ctl->free_space != (SZ_1M + 2 * sectorsize)) {
+                test_msg("Cache free space is not 1Mb + %u\n", 2 * sectorsize);
                 return -EINVAL;
         }
 
@@ -796,21 +802,25 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
                 return -EINVAL;
         }
 
-        /* All that remains is a 8Kb free space region in a bitmap. Confirm. */
+        /*
+         * All that remains is 2 * sectorsize free space region
+         * in a bitmap. Confirm.
+         */
         ret = check_num_extents_and_bitmaps(cache, 1, 1);
         if (ret)
                 return ret;
 
-        if (cache->free_space_ctl->free_space != 8192) {
-                test_msg("Cache free space is not 8Kb\n");
+        if (cache->free_space_ctl->free_space != 2 * sectorsize) {
+                test_msg("Cache free space is not %u\n", 2 * sectorsize);
                 return -EINVAL;
         }
 
         offset = btrfs_find_space_for_alloc(cache,
-                                            0, 8192, 0,
+                                            0, 2 * sectorsize, 0,
                                             &max_extent_size);
         if (offset != SZ_32M) {
-                test_msg("Failed to allocate 8Kb from space cache, returned offset is: %llu\n",
+                test_msg("Failed to allocate %u, offset: %llu\n",
+                         2 * sectorsize,
                          offset);
                 return -EINVAL;
         }
@@ -825,7 +835,7 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
         return 0;
 }
 
-int btrfs_test_free_space_cache(void)
+int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize)
 {
         struct btrfs_block_group_cache *cache;
         struct btrfs_root *root = NULL;
@@ -833,13 +843,19 @@ int btrfs_test_free_space_cache(void)
 
         test_msg("Running btrfs free space cache tests\n");
 
-        cache = btrfs_alloc_dummy_block_group(1024 * 1024 * 1024);
+        /*
+         * For ppc64 (with 64k page size), bytes per bitmap might be
+         * larger than 1G.  To make bitmap test available in ppc64,
+         * alloc dummy block group whose size cross bitmaps.
+         */
+        cache = btrfs_alloc_dummy_block_group(BITS_PER_BITMAP * sectorsize
+                                        + PAGE_SIZE, sectorsize);
         if (!cache) {
                 test_msg("Couldn't run the tests\n");
                 return 0;
         }
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 ret = PTR_ERR(root);
                 goto out;
@@ -855,14 +871,14 @@ int btrfs_test_free_space_cache(void)
         ret = test_extents(cache);
         if (ret)
                 goto out;
-        ret = test_bitmaps(cache);
+        ret = test_bitmaps(cache, sectorsize);
         if (ret)
                 goto out;
-        ret = test_bitmaps_and_extents(cache);
+        ret = test_bitmaps_and_extents(cache, sectorsize);
         if (ret)
                 goto out;
 
-        ret = test_steal_space_from_bitmap_to_extent(cache);
+        ret = test_steal_space_from_bitmap_to_extent(cache, sectorsize);
 out:
         btrfs_free_dummy_block_group(cache);
         btrfs_free_dummy_root(root);
diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c
index 7cea4462acd5..aac507085ab0 100644
--- a/fs/btrfs/tests/free-space-tree-tests.c
+++ b/fs/btrfs/tests/free-space-tree-tests.c
@@ -16,6 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <linux/types.h>
 #include "btrfs-tests.h"
 #include "../ctree.h"
 #include "../disk-io.h"
@@ -30,7 +31,7 @@ struct free_space_extent {
  * The test cases align their operations to this in order to hit some of the
  * edge cases in the bitmap code.
  */
-#define BITMAP_RANGE (BTRFS_FREE_SPACE_BITMAP_BITS * 4096)
+#define BITMAP_RANGE (BTRFS_FREE_SPACE_BITMAP_BITS * PAGE_SIZE)
 
 static int __check_free_space_extents(struct btrfs_trans_handle *trans,
                                       struct btrfs_fs_info *fs_info,
@@ -439,7 +440,8 @@ typedef int (*test_func_t)(struct btrfs_trans_handle *,
                            struct btrfs_block_group_cache *,
                            struct btrfs_path *);
 
-static int run_test(test_func_t test_func, int bitmaps)
+static int run_test(test_func_t test_func, int bitmaps,
+                u32 sectorsize, u32 nodesize)
 {
         struct btrfs_root *root = NULL;
         struct btrfs_block_group_cache *cache = NULL;
@@ -447,7 +449,7 @@ static int run_test(test_func_t test_func, int bitmaps)
         struct btrfs_path *path = NULL;
         int ret;
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 test_msg("Couldn't allocate dummy root\n");
                 ret = PTR_ERR(root);
@@ -466,7 +468,8 @@ static int run_test(test_func_t test_func, int bitmaps)
         root->fs_info->free_space_root = root;
         root->fs_info->tree_root = root;
 
-        root->node = alloc_test_extent_buffer(root->fs_info, 4096);
+        root->node = alloc_test_extent_buffer(root->fs_info,
+                nodesize, nodesize);
         if (!root->node) {
                 test_msg("Couldn't allocate dummy buffer\n");
                 ret = -ENOMEM;
@@ -474,9 +477,9 @@ static int run_test(test_func_t test_func, int bitmaps)
         }
         btrfs_set_header_level(root->node, 0);
         btrfs_set_header_nritems(root->node, 0);
-        root->alloc_bytenr += 8192;
+        root->alloc_bytenr += 2 * nodesize;
 
-        cache = btrfs_alloc_dummy_block_group(8 * BITMAP_RANGE);
+        cache = btrfs_alloc_dummy_block_group(8 * BITMAP_RANGE, sectorsize);
         if (!cache) {
                 test_msg("Couldn't allocate dummy block group cache\n");
                 ret = -ENOMEM;
@@ -534,17 +537,18 @@ out:
         return ret;
 }
 
-static int run_test_both_formats(test_func_t test_func)
+static int run_test_both_formats(test_func_t test_func,
+        u32 sectorsize, u32 nodesize)
 {
         int ret;
 
-        ret = run_test(test_func, 0);
+        ret = run_test(test_func, 0, sectorsize, nodesize);
         if (ret)
                 return ret;
-        return run_test(test_func, 1);
+        return run_test(test_func, 1, sectorsize, nodesize);
 }
 
-int btrfs_test_free_space_tree(void)
+int btrfs_test_free_space_tree(u32 sectorsize, u32 nodesize)
 {
         test_func_t tests[] = {
                 test_empty_block_group,
@@ -561,9 +565,11 @@ int btrfs_test_free_space_tree(void)
 
         test_msg("Running free space tree tests\n");
         for (i = 0; i < ARRAY_SIZE(tests); i++) {
-                int ret = run_test_both_formats(tests[i]);
+                int ret = run_test_both_formats(tests[i], sectorsize,
+                        nodesize);
                 if (ret) {
-                        test_msg("%pf failed\n", tests[i]);
+                        test_msg("%pf : sectorsize %u failed\n",
+                                tests[i], sectorsize);
                         return ret;
                 }
         }
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index 8a25fe8b7c45..29648c0a39f1 100644
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -16,6 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <linux/types.h>
 #include "btrfs-tests.h"
 #include "../ctree.h"
 #include "../btrfs_inode.h"
@@ -86,19 +87,19 @@ static void insert_inode_item_key(struct btrfs_root *root)
  * diagram of how the extents will look though this may not be possible we still
  * want to make sure everything acts normally (the last number is not inclusive)
  *
- * [0 - 5][5 -  6][6 - 10][10 - 4096][  4096 - 8192 ][8192 - 12288]
- * [hole ][inline][ hole ][ regular ][regular1 split][    hole    ]
+ * [0 - 5][5 -  6][     6 - 4096     ][ 4096 - 4100][4100 - 8195][8195 - 12291]
+ * [hole ][inline][hole but no extent][  hole   ][   regular ][regular1 split]
  *
- * [ 12288 - 20480][20480 - 24576][  24576 - 28672  ][28672 - 36864][36864 - 45056]
- * [regular1 split][   prealloc1 ][prealloc1 written][   prealloc1 ][ compressed  ]
+ * [12291 - 16387][16387 - 24579][24579 - 28675][ 28675 - 32771][32771 - 36867 ]
+ * [    hole    ][regular1 split][   prealloc ][   prealloc1  ][prealloc1 written]
  *
- * [45056 - 49152][49152-53248][53248-61440][61440-65536][     65536+81920   ]
- * [ compressed1 ][  regular  ][compressed1][  regular  ][ hole but no extent]
+ * [36867 - 45059][45059 - 53251][53251 - 57347][57347 - 61443][61443- 69635]
+ * [  prealloc1  ][ compressed  ][ compressed1 ][    regular  ][ compressed1]
  *
- * [81920-86016]
- * [  regular  ]
+ * [69635-73731][   73731 - 86019   ][86019-90115]
+ * [  regular  ][ hole but no extent][  regular  ]
  */
-static void setup_file_extents(struct btrfs_root *root)
+static void setup_file_extents(struct btrfs_root *root, u32 sectorsize)
 {
         int slot = 0;
         u64 disk_bytenr = SZ_1M;
@@ -119,7 +120,7 @@ static void setup_file_extents(struct btrfs_root *root)
         insert_extent(root, offset, 1, 1, 0, 0, 0, BTRFS_FILE_EXTENT_INLINE, 0,
                       slot);
         slot++;
-        offset = 4096;
+        offset = sectorsize;
 
         /* Now another hole */
         insert_extent(root, offset, 4, 4, 0, 0, 0, BTRFS_FILE_EXTENT_REG, 0,
@@ -128,99 +129,106 @@ static void setup_file_extents(struct btrfs_root *root)
         offset += 4;
 
         /* Now for a regular extent */
-        insert_extent(root, offset, 4095, 4095, 0, disk_bytenr, 4096,
-                      BTRFS_FILE_EXTENT_REG, 0, slot);
+        insert_extent(root, offset, sectorsize - 1, sectorsize - 1, 0,
+                      disk_bytenr, sectorsize, BTRFS_FILE_EXTENT_REG, 0, slot);
         slot++;
-        disk_bytenr += 4096;
-        offset += 4095;
+        disk_bytenr += sectorsize;
+        offset += sectorsize - 1;
 
         /*
          * Now for 3 extents that were split from a hole punch so we test
          * offsets properly.
          */
-        insert_extent(root, offset, 4096, 16384, 0, disk_bytenr, 16384,
-                      BTRFS_FILE_EXTENT_REG, 0, slot);
+        insert_extent(root, offset, sectorsize, 4 * sectorsize, 0, disk_bytenr,
+                      4 * sectorsize, BTRFS_FILE_EXTENT_REG, 0, slot);
         slot++;
-        offset += 4096;
-        insert_extent(root, offset, 4096, 4096, 0, 0, 0, BTRFS_FILE_EXTENT_REG,
-                      0, slot);
+        offset += sectorsize;
+        insert_extent(root, offset, sectorsize, sectorsize, 0, 0, 0,
+                      BTRFS_FILE_EXTENT_REG, 0, slot);
         slot++;
-        offset += 4096;
-        insert_extent(root, offset, 8192, 16384, 8192, disk_bytenr, 16384,
+        offset += sectorsize;
+        insert_extent(root, offset, 2 * sectorsize, 4 * sectorsize,
+                      2 * sectorsize, disk_bytenr, 4 * sectorsize,
                       BTRFS_FILE_EXTENT_REG, 0, slot);
         slot++;
-        offset += 8192;
-        disk_bytenr += 16384;
+        offset += 2 * sectorsize;
+        disk_bytenr += 4 * sectorsize;
 
         /* Now for a unwritten prealloc extent */
-        insert_extent(root, offset, 4096, 4096, 0, disk_bytenr, 4096,
-                      BTRFS_FILE_EXTENT_PREALLOC, 0, slot);
+        insert_extent(root, offset, sectorsize, sectorsize, 0, disk_bytenr,
+                sectorsize, BTRFS_FILE_EXTENT_PREALLOC, 0, slot);
         slot++;
-        offset += 4096;
+        offset += sectorsize;
 
         /*
          * We want to jack up disk_bytenr a little more so the em stuff doesn't
          * merge our records.
          */
-        disk_bytenr += 8192;
+        disk_bytenr += 2 * sectorsize;
 
         /*
          * Now for a partially written prealloc extent, basically the same as
          * the hole punch example above.  Ram_bytes never changes when you mark
          * extents written btw.
          */
-        insert_extent(root, offset, 4096, 16384, 0, disk_bytenr, 16384,
-                      BTRFS_FILE_EXTENT_PREALLOC, 0, slot);
+        insert_extent(root, offset, sectorsize, 4 * sectorsize, 0, disk_bytenr,
+                      4 * sectorsize, BTRFS_FILE_EXTENT_PREALLOC, 0, slot);
         slot++;
-        offset += 4096;
-        insert_extent(root, offset, 4096, 16384, 4096, disk_bytenr, 16384,
-                      BTRFS_FILE_EXTENT_REG, 0, slot);
+        offset += sectorsize;
+        insert_extent(root, offset, sectorsize, 4 * sectorsize, sectorsize,
+                      disk_bytenr, 4 * sectorsize, BTRFS_FILE_EXTENT_REG, 0,
+                      slot);
         slot++;
-        offset += 4096;
-        insert_extent(root, offset, 8192, 16384, 8192, disk_bytenr, 16384,
+        offset += sectorsize;
+        insert_extent(root, offset, 2 * sectorsize, 4 * sectorsize,
+                      2 * sectorsize, disk_bytenr, 4 * sectorsize,
                       BTRFS_FILE_EXTENT_PREALLOC, 0, slot);
         slot++;
-        offset += 8192;
-        disk_bytenr += 16384;
+        offset += 2 * sectorsize;
+        disk_bytenr += 4 * sectorsize;
 
         /* Now a normal compressed extent */
-        insert_extent(root, offset, 8192, 8192, 0, disk_bytenr, 4096,
-                      BTRFS_FILE_EXTENT_REG, BTRFS_COMPRESS_ZLIB, slot);
+        insert_extent(root, offset, 2 * sectorsize, 2 * sectorsize, 0,
+                      disk_bytenr, sectorsize, BTRFS_FILE_EXTENT_REG,
+                      BTRFS_COMPRESS_ZLIB, slot);
         slot++;
-        offset += 8192;
+        offset += 2 * sectorsize;
         /* No merges */
-        disk_bytenr += 8192;
+        disk_bytenr += 2 * sectorsize;
 
         /* Now a split compressed extent */
-        insert_extent(root, offset, 4096, 16384, 0, disk_bytenr, 4096,
-                      BTRFS_FILE_EXTENT_REG, BTRFS_COMPRESS_ZLIB, slot);
+        insert_extent(root, offset, sectorsize, 4 * sectorsize, 0, disk_bytenr,
+                      sectorsize, BTRFS_FILE_EXTENT_REG,
+                      BTRFS_COMPRESS_ZLIB, slot);
         slot++;
-        offset += 4096;
-        insert_extent(root, offset, 4096, 4096, 0, disk_bytenr + 4096, 4096,
+        offset += sectorsize;
+        insert_extent(root, offset, sectorsize, sectorsize, 0,
+                      disk_bytenr + sectorsize, sectorsize,
                       BTRFS_FILE_EXTENT_REG, 0, slot);
         slot++;
-        offset += 4096;
-        insert_extent(root, offset, 8192, 16384, 8192, disk_bytenr, 4096,
+        offset += sectorsize;
+        insert_extent(root, offset, 2 * sectorsize, 4 * sectorsize,
+                      2 * sectorsize, disk_bytenr, sectorsize,
                       BTRFS_FILE_EXTENT_REG, BTRFS_COMPRESS_ZLIB, slot);
         slot++;
-        offset += 8192;
-        disk_bytenr += 8192;
+        offset += 2 * sectorsize;
+        disk_bytenr += 2 * sectorsize;
 
         /* Now extents that have a hole but no hole extent */
-        insert_extent(root, offset, 4096, 4096, 0, disk_bytenr, 4096,
-                      BTRFS_FILE_EXTENT_REG, 0, slot);
+        insert_extent(root, offset, sectorsize, sectorsize, 0, disk_bytenr,
+                      sectorsize, BTRFS_FILE_EXTENT_REG, 0, slot);
         slot++;
-        offset += 16384;
-        disk_bytenr += 4096;
-        insert_extent(root, offset, 4096, 4096, 0, disk_bytenr, 4096,
-                      BTRFS_FILE_EXTENT_REG, 0, slot);
+        offset += 4 * sectorsize;
+        disk_bytenr += sectorsize;
+        insert_extent(root, offset, sectorsize, sectorsize, 0, disk_bytenr,
+                      sectorsize, BTRFS_FILE_EXTENT_REG, 0, slot);
 }
 
 static unsigned long prealloc_only = 0;
 static unsigned long compressed_only = 0;
 static unsigned long vacancy_only = 0;
 
-static noinline int test_btrfs_get_extent(void)
+static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
 {
         struct inode *inode = NULL;
         struct btrfs_root *root = NULL;
@@ -240,7 +248,7 @@ static noinline int test_btrfs_get_extent(void)
         BTRFS_I(inode)->location.objectid = BTRFS_FIRST_FREE_OBJECTID;
         BTRFS_I(inode)->location.offset = 0;
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 test_msg("Couldn't allocate root\n");
                 goto out;
@@ -256,7 +264,7 @@ static noinline int test_btrfs_get_extent(void)
                 goto out;
         }
 
-        root->node = alloc_dummy_extent_buffer(NULL, 4096);
+        root->node = alloc_dummy_extent_buffer(NULL, nodesize, nodesize);
         if (!root->node) {
                 test_msg("Couldn't allocate dummy buffer\n");
                 goto out;
@@ -273,7 +281,7 @@ static noinline int test_btrfs_get_extent(void)
 
         /* First with no extents */
         BTRFS_I(inode)->root = root;
-        em = btrfs_get_extent(inode, NULL, 0, 0, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, 0, sectorsize, 0);
         if (IS_ERR(em)) {
                 em = NULL;
                 test_msg("Got an error when we shouldn't have\n");
@@ -295,7 +303,7 @@ static noinline int test_btrfs_get_extent(void)
          * setup_file_extents, so if you change anything there you need to
          * update the comment and update the expected values below.
          */
-        setup_file_extents(root);
+        setup_file_extents(root, sectorsize);
 
         em = btrfs_get_extent(inode, NULL, 0, 0, (u64)-1, 0);
         if (IS_ERR(em)) {
@@ -318,7 +326,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -327,7 +335,8 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected an inline, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4091) {
+
+        if (em->start != offset || em->len != (sectorsize - 5)) {
                 test_msg("Unexpected extent wanted start %llu len 1, got start "
                          "%llu len %llu\n", offset, em->start, em->len);
                 goto out;
@@ -344,7 +353,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -366,7 +375,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* Regular extent */
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -375,7 +384,7 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4095) {
+        if (em->start != offset || em->len != sectorsize - 1) {
                 test_msg("Unexpected extent wanted start %llu len 4095, got "
                          "start %llu len %llu\n", offset, em->start, em->len);
                 goto out;
@@ -393,7 +402,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* The next 3 are split extents */
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -402,9 +411,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -421,7 +431,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -430,9 +440,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a hole, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -442,7 +453,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -451,9 +462,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 8192) {
-                test_msg("Unexpected extent wanted start %llu len 8192, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != 2 * sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, 2 * sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -475,7 +487,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* Prealloc extent */
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -484,9 +496,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != prealloc_only) {
@@ -503,7 +516,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* The next 3 are a half written prealloc extent */
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -512,9 +525,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != prealloc_only) {
@@ -532,7 +546,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -541,9 +555,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -564,7 +579,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -573,9 +588,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 8192) {
-                test_msg("Unexpected extent wanted start %llu len 8192, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != 2 * sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, 2 * sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != prealloc_only) {
@@ -598,7 +614,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* Now for the compressed extent */
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -607,9 +623,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 8192) {
-                test_msg("Unexpected extent wanted start %llu len 8192, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != 2 * sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u,"
+                        "got start %llu len %llu\n",
+                        offset, 2 * sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != compressed_only) {
@@ -631,7 +648,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* Split compressed extent */
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -640,9 +657,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u,"
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != compressed_only) {
@@ -665,7 +683,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -674,9 +692,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -691,7 +710,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -701,9 +720,10 @@ static noinline int test_btrfs_get_extent(void)
                          disk_bytenr, em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 8192) {
-                test_msg("Unexpected extent wanted start %llu len 8192, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != 2 * sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, 2 * sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != compressed_only) {
@@ -725,7 +745,7 @@ static noinline int test_btrfs_get_extent(void)
         free_extent_map(em);
 
         /* A hole between regular extents but no hole extent */
-        em = btrfs_get_extent(inode, NULL, 0, offset + 6, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset + 6, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -734,9 +754,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -765,9 +786,10 @@ static noinline int test_btrfs_get_extent(void)
          * length of the actual hole, if this changes we'll have to change this
          * test.
          */
-        if (em->start != offset || em->len != 12288) {
-                test_msg("Unexpected extent wanted start %llu len 12288, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != 3 * sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u, "
+                        "got start %llu len %llu\n",
+                        offset, 3 * sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != vacancy_only) {
@@ -783,7 +805,7 @@ static noinline int test_btrfs_get_extent(void)
         offset = em->start + em->len;
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, offset, 4096, 0);
+        em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -792,9 +814,10 @@ static noinline int test_btrfs_get_extent(void)
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != offset || em->len != 4096) {
-                test_msg("Unexpected extent wanted start %llu len 4096, got "
-                         "start %llu len %llu\n", offset, em->start, em->len);
+        if (em->start != offset || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %llu len %u,"
+                        "got start %llu len %llu\n",
+                        offset, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -815,7 +838,7 @@ out:
         return ret;
 }
 
-static int test_hole_first(void)
+static int test_hole_first(u32 sectorsize, u32 nodesize)
 {
         struct inode *inode = NULL;
         struct btrfs_root *root = NULL;
@@ -832,7 +855,7 @@ static int test_hole_first(void)
         BTRFS_I(inode)->location.objectid = BTRFS_FIRST_FREE_OBJECTID;
         BTRFS_I(inode)->location.offset = 0;
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 test_msg("Couldn't allocate root\n");
                 goto out;
@@ -844,7 +867,7 @@ static int test_hole_first(void)
                 goto out;
         }
 
-        root->node = alloc_dummy_extent_buffer(NULL, 4096);
+        root->node = alloc_dummy_extent_buffer(NULL, nodesize, nodesize);
         if (!root->node) {
                 test_msg("Couldn't allocate dummy buffer\n");
                 goto out;
@@ -861,9 +884,9 @@ static int test_hole_first(void)
          * btrfs_get_extent.
          */
         insert_inode_item_key(root);
-        insert_extent(root, 4096, 4096, 4096, 0, 4096, 4096,
-                      BTRFS_FILE_EXTENT_REG, 0, 1);
-        em = btrfs_get_extent(inode, NULL, 0, 0, 8192, 0);
+        insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize,
+                      sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1);
+        em = btrfs_get_extent(inode, NULL, 0, 0, 2 * sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
@@ -872,9 +895,10 @@ static int test_hole_first(void)
                 test_msg("Expected a hole, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != 0 || em->len != 4096) {
-                test_msg("Unexpected extent wanted start 0 len 4096, got start "
-                         "%llu len %llu\n", em->start, em->len);
+        if (em->start != 0 || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start 0 len %u, "
+                        "got start %llu len %llu\n",
+                        sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != vacancy_only) {
@@ -884,18 +908,19 @@ static int test_hole_first(void)
         }
         free_extent_map(em);
 
-        em = btrfs_get_extent(inode, NULL, 0, 4096, 8192, 0);
+        em = btrfs_get_extent(inode, NULL, 0, sectorsize, 2 * sectorsize, 0);
         if (IS_ERR(em)) {
                 test_msg("Got an error when we shouldn't have\n");
                 goto out;
         }
-        if (em->block_start != 4096) {
+        if (em->block_start != sectorsize) {
                 test_msg("Expected a real extent, got %llu\n", em->block_start);
                 goto out;
         }
-        if (em->start != 4096 || em->len != 4096) {
-                test_msg("Unexpected extent wanted start 4096 len 4096, got "
-                         "start %llu len %llu\n", em->start, em->len);
+        if (em->start != sectorsize || em->len != sectorsize) {
+                test_msg("Unexpected extent wanted start %u len %u, "
+                        "got start %llu len %llu\n",
+                        sectorsize, sectorsize, em->start, em->len);
                 goto out;
         }
         if (em->flags != 0) {
@@ -912,7 +937,7 @@ out:
         return ret;
 }
 
-static int test_extent_accounting(void)
+static int test_extent_accounting(u32 sectorsize, u32 nodesize)
 {
         struct inode *inode = NULL;
         struct btrfs_root *root = NULL;
@@ -924,7 +949,7 @@ static int test_extent_accounting(void)
                 return ret;
         }
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 test_msg("Couldn't allocate root\n");
                 goto out;
@@ -954,10 +979,11 @@ static int test_extent_accounting(void)
                 goto out;
         }
 
-        /* [BTRFS_MAX_EXTENT_SIZE][4k] */
+        /* [BTRFS_MAX_EXTENT_SIZE][sectorsize] */
         BTRFS_I(inode)->outstanding_extents++;
         ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE,
-                                        BTRFS_MAX_EXTENT_SIZE + 4095, NULL);
+                                        BTRFS_MAX_EXTENT_SIZE + sectorsize - 1,
+                                        NULL);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -969,10 +995,10 @@ static int test_extent_accounting(void)
                 goto out;
         }
 
-        /* [BTRFS_MAX_EXTENT_SIZE/2][4K HOLE][the rest] */
+        /* [BTRFS_MAX_EXTENT_SIZE/2][sectorsize HOLE][the rest] */
         ret = clear_extent_bit(&BTRFS_I(inode)->io_tree,
                                BTRFS_MAX_EXTENT_SIZE >> 1,
-                               (BTRFS_MAX_EXTENT_SIZE >> 1) + 4095,
+                               (BTRFS_MAX_EXTENT_SIZE >> 1) + sectorsize - 1,
                                EXTENT_DELALLOC | EXTENT_DIRTY |
                                EXTENT_UPTODATE | EXTENT_DO_ACCOUNTING, 0, 0,
                                NULL, GFP_KERNEL);
@@ -987,10 +1013,11 @@ static int test_extent_accounting(void)
                 goto out;
         }
 
-        /* [BTRFS_MAX_EXTENT_SIZE][4K] */
+        /* [BTRFS_MAX_EXTENT_SIZE][sectorsize] */
         BTRFS_I(inode)->outstanding_extents++;
         ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE >> 1,
-                                        (BTRFS_MAX_EXTENT_SIZE >> 1) + 4095,
+                                        (BTRFS_MAX_EXTENT_SIZE >> 1)
+                                        + sectorsize - 1,
                                         NULL);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
@@ -1004,16 +1031,17 @@ static int test_extent_accounting(void)
         }
 
         /*
-         * [BTRFS_MAX_EXTENT_SIZE+4K][4K HOLE][BTRFS_MAX_EXTENT_SIZE+4K]
+         * [BTRFS_MAX_EXTENT_SIZE+sectorsize][sectorsize HOLE][BTRFS_MAX_EXTENT_SIZE+sectorsize]
          *
          * I'm artificially adding 2 to outstanding_extents because in the
          * buffered IO case we'd add things up as we go, but I don't feel like
          * doing that here, this isn't the interesting case we want to test.
          */
         BTRFS_I(inode)->outstanding_extents += 2;
-        ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE + 8192,
-                                        (BTRFS_MAX_EXTENT_SIZE << 1) + 12287,
-                                        NULL);
+        ret = btrfs_set_extent_delalloc(inode,
+                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize,
+                        (BTRFS_MAX_EXTENT_SIZE << 1) + 3 * sectorsize - 1,
+                        NULL);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1025,10 +1053,13 @@ static int test_extent_accounting(void)
                 goto out;
         }
 
-        /* [BTRFS_MAX_EXTENT_SIZE+4k][4k][BTRFS_MAX_EXTENT_SIZE+4k] */
+        /*
+        * [BTRFS_MAX_EXTENT_SIZE+sectorsize][sectorsize][BTRFS_MAX_EXTENT_SIZE+sectorsize]
+        */
         BTRFS_I(inode)->outstanding_extents++;
-        ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE+4096,
-                                        BTRFS_MAX_EXTENT_SIZE+8191, NULL);
+        ret = btrfs_set_extent_delalloc(inode,
+                        BTRFS_MAX_EXTENT_SIZE + sectorsize,
+                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, NULL);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1042,8 +1073,8 @@ static int test_extent_accounting(void)
 
         /* [BTRFS_MAX_EXTENT_SIZE+4k][4K HOLE][BTRFS_MAX_EXTENT_SIZE+4k] */
         ret = clear_extent_bit(&BTRFS_I(inode)->io_tree,
-                               BTRFS_MAX_EXTENT_SIZE+4096,
-                               BTRFS_MAX_EXTENT_SIZE+8191,
+                               BTRFS_MAX_EXTENT_SIZE + sectorsize,
+                               BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1,
                                EXTENT_DIRTY | EXTENT_DELALLOC |
                                EXTENT_DO_ACCOUNTING | EXTENT_UPTODATE, 0, 0,
                                NULL, GFP_KERNEL);
@@ -1063,8 +1094,9 @@ static int test_extent_accounting(void)
          * might fail and I'd rather satisfy my paranoia at this point.
          */
         BTRFS_I(inode)->outstanding_extents++;
-        ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE+4096,
-                                        BTRFS_MAX_EXTENT_SIZE+8191, NULL);
+        ret = btrfs_set_extent_delalloc(inode,
+                        BTRFS_MAX_EXTENT_SIZE + sectorsize,
+                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, NULL);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1103,7 +1135,7 @@ out:
         return ret;
 }
 
-int btrfs_test_inodes(void)
+int btrfs_test_inodes(u32 sectorsize, u32 nodesize)
 {
         int ret;
 
@@ -1112,13 +1144,13 @@ int btrfs_test_inodes(void)
         set_bit(EXTENT_FLAG_PREALLOC, &prealloc_only);
 
         test_msg("Running btrfs_get_extent tests\n");
-        ret = test_btrfs_get_extent();
+        ret = test_btrfs_get_extent(sectorsize, nodesize);
         if (ret)
                 return ret;
         test_msg("Running hole first btrfs_get_extent test\n");
-        ret = test_hole_first();
+        ret = test_hole_first(sectorsize, nodesize);
         if (ret)
                 return ret;
         test_msg("Running outstanding_extents tests\n");
-        return test_extent_accounting();
+        return test_extent_accounting(sectorsize, nodesize);
 }
diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index 8aa4ded31326..57a12c0d680b 100644
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -16,6 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <linux/types.h>
 #include "btrfs-tests.h"
 #include "../ctree.h"
 #include "../transaction.h"
@@ -216,7 +217,8 @@ static int remove_extent_ref(struct btrfs_root *root, u64 bytenr,
         return ret;
 }
 
-static int test_no_shared_qgroup(struct btrfs_root *root)
+static int test_no_shared_qgroup(struct btrfs_root *root,
+                u32 sectorsize, u32 nodesize)
 {
         struct btrfs_trans_handle trans;
         struct btrfs_fs_info *fs_info = root->fs_info;
@@ -227,7 +229,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root)
         btrfs_init_dummy_trans(&trans);
 
         test_msg("Qgroup basic add\n");
-        ret = btrfs_create_qgroup(NULL, fs_info, 5);
+        ret = btrfs_create_qgroup(NULL, fs_info, BTRFS_FS_TREE_OBJECTID);
         if (ret) {
                 test_msg("Couldn't create a qgroup %d\n", ret);
                 return ret;
@@ -238,18 +240,19 @@ static int test_no_shared_qgroup(struct btrfs_root *root)
          * we can only call btrfs_qgroup_account_extent() directly to test
          * quota.
          */
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &old_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots);
         if (ret) {
                 ulist_free(old_roots);
                 test_msg("Couldn't find old roots: %d\n", ret);
                 return ret;
         }
 
-        ret = insert_normal_tree_ref(root, 4096, 4096, 0, 5);
+        ret = insert_normal_tree_ref(root, nodesize, nodesize, 0,
+                                BTRFS_FS_TREE_OBJECTID);
         if (ret)
                 return ret;
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &new_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots);
         if (ret) {
                 ulist_free(old_roots);
                 ulist_free(new_roots);
@@ -257,32 +260,33 @@ static int test_no_shared_qgroup(struct btrfs_root *root)
                 return ret;
         }
 
-        ret = btrfs_qgroup_account_extent(&trans, fs_info, 4096, 4096,
-                                          old_roots, new_roots);
+        ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
+                                          nodesize, old_roots, new_roots);
         if (ret) {
                 test_msg("Couldn't account space for a qgroup %d\n", ret);
                 return ret;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 5, 4096, 4096)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID,
+                                nodesize, nodesize)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
         old_roots = NULL;
         new_roots = NULL;
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &old_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots);
         if (ret) {
                 ulist_free(old_roots);
                 test_msg("Couldn't find old roots: %d\n", ret);
                 return ret;
         }
 
-        ret = remove_extent_item(root, 4096, 4096);
+        ret = remove_extent_item(root, nodesize, nodesize);
         if (ret)
                 return -EINVAL;
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &new_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots);
         if (ret) {
                 ulist_free(old_roots);
                 ulist_free(new_roots);
@@ -290,14 +294,14 @@ static int test_no_shared_qgroup(struct btrfs_root *root)
                 return ret;
         }
 
-        ret = btrfs_qgroup_account_extent(&trans, fs_info, 4096, 4096,
-                                          old_roots, new_roots);
+        ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
+                                          nodesize, old_roots, new_roots);
         if (ret) {
                 test_msg("Couldn't account space for a qgroup %d\n", ret);
                 return -EINVAL;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 5, 0, 0)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID, 0, 0)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
@@ -310,7 +314,8 @@ static int test_no_shared_qgroup(struct btrfs_root *root)
  * right, also remove one of the roots and make sure the exclusive count is
  * adjusted properly.
  */
-static int test_multiple_refs(struct btrfs_root *root)
+static int test_multiple_refs(struct btrfs_root *root,
+                u32 sectorsize, u32 nodesize)
 {
         struct btrfs_trans_handle trans;
         struct btrfs_fs_info *fs_info = root->fs_info;
@@ -322,25 +327,29 @@ static int test_multiple_refs(struct btrfs_root *root)
 
         test_msg("Qgroup multiple refs test\n");
 
-        /* We have 5 created already from the previous test */
-        ret = btrfs_create_qgroup(NULL, fs_info, 256);
+        /*
+         * We have BTRFS_FS_TREE_OBJECTID created already from the
+         * previous test.
+         */
+        ret = btrfs_create_qgroup(NULL, fs_info, BTRFS_FIRST_FREE_OBJECTID);
         if (ret) {
                 test_msg("Couldn't create a qgroup %d\n", ret);
                 return ret;
         }
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &old_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots);
         if (ret) {
                 ulist_free(old_roots);
                 test_msg("Couldn't find old roots: %d\n", ret);
                 return ret;
         }
 
-        ret = insert_normal_tree_ref(root, 4096, 4096, 0, 5);
+        ret = insert_normal_tree_ref(root, nodesize, nodesize, 0,
+                                BTRFS_FS_TREE_OBJECTID);
         if (ret)
                 return ret;
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &new_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots);
         if (ret) {
                 ulist_free(old_roots);
                 ulist_free(new_roots);
@@ -348,30 +357,32 @@ static int test_multiple_refs(struct btrfs_root *root)
                 return ret;
         }
 
-        ret = btrfs_qgroup_account_extent(&trans, fs_info, 4096, 4096,
-                                          old_roots, new_roots);
+        ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
+                                          nodesize, old_roots, new_roots);
         if (ret) {
                 test_msg("Couldn't account space for a qgroup %d\n", ret);
                 return ret;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 5, 4096, 4096)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID,
+                                       nodesize, nodesize)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &old_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots);
         if (ret) {
                 ulist_free(old_roots);
                 test_msg("Couldn't find old roots: %d\n", ret);
                 return ret;
         }
 
-        ret = add_tree_ref(root, 4096, 4096, 0, 256);
+        ret = add_tree_ref(root, nodesize, nodesize, 0,
+                        BTRFS_FIRST_FREE_OBJECTID);
         if (ret)
                 return ret;
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &new_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots);
         if (ret) {
                 ulist_free(old_roots);
                 ulist_free(new_roots);
@@ -379,35 +390,38 @@ static int test_multiple_refs(struct btrfs_root *root)
                 return ret;
         }
 
-        ret = btrfs_qgroup_account_extent(&trans, fs_info, 4096, 4096,
-                                          old_roots, new_roots);
+        ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
+                                          nodesize, old_roots, new_roots);
         if (ret) {
                 test_msg("Couldn't account space for a qgroup %d\n", ret);
                 return ret;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 5, 4096, 0)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID,
+                                        nodesize, 0)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 256, 4096, 0)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FIRST_FREE_OBJECTID,
+                                        nodesize, 0)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &old_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots);
         if (ret) {
                 ulist_free(old_roots);
                 test_msg("Couldn't find old roots: %d\n", ret);
                 return ret;
         }
 
-        ret = remove_extent_ref(root, 4096, 4096, 0, 256);
+        ret = remove_extent_ref(root, nodesize, nodesize, 0,
+                                BTRFS_FIRST_FREE_OBJECTID);
         if (ret)
                 return ret;
 
-        ret = btrfs_find_all_roots(&trans, fs_info, 4096, 0, &new_roots);
+        ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots);
         if (ret) {
                 ulist_free(old_roots);
                 ulist_free(new_roots);
@@ -415,19 +429,21 @@ static int test_multiple_refs(struct btrfs_root *root)
                 return ret;
         }
 
-        ret = btrfs_qgroup_account_extent(&trans, fs_info, 4096, 4096,
-                                          old_roots, new_roots);
+        ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
+                                          nodesize, old_roots, new_roots);
         if (ret) {
                 test_msg("Couldn't account space for a qgroup %d\n", ret);
                 return ret;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 256, 0, 0)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FIRST_FREE_OBJECTID,
+                                        0, 0)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
 
-        if (btrfs_verify_qgroup_counts(fs_info, 5, 4096, 4096)) {
+        if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID,
+                                        nodesize, nodesize)) {
                 test_msg("Qgroup counts didn't match expected values\n");
                 return -EINVAL;
         }
@@ -435,13 +451,13 @@ static int test_multiple_refs(struct btrfs_root *root)
         return 0;
 }
 
-int btrfs_test_qgroups(void)
+int btrfs_test_qgroups(u32 sectorsize, u32 nodesize)
 {
         struct btrfs_root *root;
         struct btrfs_root *tmp_root;
         int ret = 0;
 
-        root = btrfs_alloc_dummy_root();
+        root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(root)) {
                 test_msg("Couldn't allocate root\n");
                 return PTR_ERR(root);
@@ -468,7 +484,8 @@ int btrfs_test_qgroups(void)
          * Can't use bytenr 0, some things freak out
          * *cough*backref walking code*cough*
          */
-        root->node = alloc_test_extent_buffer(root->fs_info, 4096);
+        root->node = alloc_test_extent_buffer(root->fs_info, nodesize,
+                                        nodesize);
         if (!root->node) {
                 test_msg("Couldn't allocate dummy buffer\n");
                 ret = -ENOMEM;
@@ -476,16 +493,16 @@ int btrfs_test_qgroups(void)
         }
         btrfs_set_header_level(root->node, 0);
         btrfs_set_header_nritems(root->node, 0);
-        root->alloc_bytenr += 8192;
+        root->alloc_bytenr += 2 * nodesize;
 
-        tmp_root = btrfs_alloc_dummy_root();
+        tmp_root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(tmp_root)) {
                 test_msg("Couldn't allocate a fs root\n");
                 ret = PTR_ERR(tmp_root);
                 goto out;
         }
 
-        tmp_root->root_key.objectid = 5;
+        tmp_root->root_key.objectid = BTRFS_FS_TREE_OBJECTID;
         root->fs_info->fs_root = tmp_root;
         ret = btrfs_insert_fs_root(root->fs_info, tmp_root);
         if (ret) {
@@ -493,14 +510,14 @@ int btrfs_test_qgroups(void)
                 goto out;
         }
 
-        tmp_root = btrfs_alloc_dummy_root();
+        tmp_root = btrfs_alloc_dummy_root(sectorsize, nodesize);
         if (IS_ERR(tmp_root)) {
                 test_msg("Couldn't allocate a fs root\n");
                 ret = PTR_ERR(tmp_root);
                 goto out;
         }
 
-        tmp_root->root_key.objectid = 256;
+        tmp_root->root_key.objectid = BTRFS_FIRST_FREE_OBJECTID;
         ret = btrfs_insert_fs_root(root->fs_info, tmp_root);
         if (ret) {
                 test_msg("Couldn't insert fs root %d\n", ret);
@@ -508,10 +525,10 @@ int btrfs_test_qgroups(void)
         }
 
         test_msg("Running qgroup tests\n");
-        ret = test_no_shared_qgroup(root);
+        ret = test_no_shared_qgroup(root, sectorsize, nodesize);
         if (ret)
                 goto out;
-        ret = test_multiple_refs(root);
+        ret = test_multiple_refs(root, sectorsize, nodesize);
 out:
         btrfs_free_dummy_root(root);
         return ret;
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index f6e24cb423ae..948aa186b353 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -818,6 +818,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
 {
         struct btrfs_transaction *cur_trans = trans->transaction;
         struct btrfs_fs_info *info = root->fs_info;
+        u64 transid = trans->transid;
         unsigned long cur = trans->delayed_ref_updates;
         int lock = (trans->type != TRANS_JOIN_NOLOCK);
         int err = 0;
@@ -905,7 +906,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
 
         kmem_cache_free(btrfs_trans_handle_cachep, trans);
         if (must_run_delayed_refs) {
-                btrfs_async_run_delayed_refs(root, cur,
+                btrfs_async_run_delayed_refs(root, cur, transid,
                                              must_run_delayed_refs == 1);
         }
         return err;
@@ -1311,11 +1312,6 @@ int btrfs_defrag_root(struct btrfs_root *root)
         return ret;
 }
 
-/* Bisesctability fixup, remove in 4.8 */
-#ifndef btrfs_std_error
-#define btrfs_std_error btrfs_handle_fs_error
-#endif
-
 /*
  * Do all special snapshot related qgroup dirty hack.
  *
@@ -1385,7 +1381,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
         switch_commit_roots(trans->transaction, fs_info);
         ret = btrfs_write_and_wait_transaction(trans, src);
         if (ret)
-                btrfs_std_error(fs_info, ret,
+                btrfs_handle_fs_error(fs_info, ret,
                         "Error while writing out transaction for qgroup");
 
 out:
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 9fe0ec2bf0fe..c5abee4f01ad 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -110,7 +110,6 @@ struct btrfs_trans_handle {
         u64 chunk_bytes_reserved;
         unsigned long use_count;
         unsigned long blocks_reserved;
-        unsigned long blocks_used;
         unsigned long delayed_ref_updates;
         struct btrfs_transaction *transaction;
         struct btrfs_block_rsv *block_rsv;
@@ -121,6 +120,7 @@ struct btrfs_trans_handle {
         bool can_flush_pending_bgs;
         bool reloc_reserved;
         bool sync;
+        bool dirty;
         unsigned int type;
         /*
          * this root is only needed to validate that the root passed to
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index b7665af471d8..c05f69a8ec42 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2422,8 +2422,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
                 root_owner = btrfs_header_owner(parent);
 
                 next = btrfs_find_create_tree_block(root, bytenr);
-                if (!next)
-                        return -ENOMEM;
+                if (IS_ERR(next))
+                        return PTR_ERR(next);
 
                 if (*level == 1) {
                         ret = wc->process_func(root, next, wc, ptr_gen);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index bdc62561ede8..589f128173b1 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2761,6 +2761,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
         u64 dev_extent_len = 0;
         u64 chunk_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
         int i, ret = 0;
+        struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
 
         /* Just in case */
         root = root->fs_info->chunk_root;
@@ -2787,12 +2788,19 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
         check_system_chunk(trans, extent_root, map->type);
         unlock_chunks(root->fs_info->chunk_root);
 
+        /*
+         * Take the device list mutex to prevent races with the final phase of
+         * a device replace operation that replaces the device object associated
+         * with map stripes (dev-replace.c:btrfs_dev_replace_finishing()).
+         */
+        mutex_lock(&fs_devices->device_list_mutex);
         for (i = 0; i < map->num_stripes; i++) {
                 struct btrfs_device *device = map->stripes[i].dev;
                 ret = btrfs_free_dev_extent(trans, device,
                                             map->stripes[i].physical,
                                             &dev_extent_len);
                 if (ret) {
+                        mutex_unlock(&fs_devices->device_list_mutex);
                         btrfs_abort_transaction(trans, root, ret);
                         goto out;
                 }
@@ -2811,11 +2819,14 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
                 if (map->stripes[i].dev) {
                         ret = btrfs_update_device(trans, map->stripes[i].dev);
                         if (ret) {
+                                mutex_unlock(&fs_devices->device_list_mutex);
                                 btrfs_abort_transaction(trans, root, ret);
                                 goto out;
                         }
                 }
         }
+        mutex_unlock(&fs_devices->device_list_mutex);
+
         ret = btrfs_free_chunk(trans, root, chunk_objectid, chunk_offset);
         if (ret) {
                 btrfs_abort_transaction(trans, root, ret);
@@ -4230,6 +4241,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
         if (IS_ERR(uuid_root)) {
                 ret = PTR_ERR(uuid_root);
                 btrfs_abort_transaction(trans, tree_root, ret);
+                btrfs_end_transaction(trans, tree_root);
                 return ret;
         }
 
@@ -4682,12 +4694,12 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 
         if (type & BTRFS_BLOCK_GROUP_RAID5) {
                 raid_stripe_len = find_raid56_stripe_len(ndevs - 1,
-                                 btrfs_super_stripesize(info->super_copy));
+                                                extent_root->stripesize);
                 data_stripes = num_stripes - 1;
         }
         if (type & BTRFS_BLOCK_GROUP_RAID6) {
                 raid_stripe_len = find_raid56_stripe_len(ndevs - 2,
-                                 btrfs_super_stripesize(info->super_copy));
+                                                extent_root->stripesize);
                 data_stripes = num_stripes - 2;
         }
 
@@ -5762,20 +5774,17 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
                         }
                 }
                 if (found) {
-                        if (physical_of_found + map->stripe_len <=
-                            dev_replace->cursor_left) {
-                                struct btrfs_bio_stripe *tgtdev_stripe =
-                                        bbio->stripes + num_stripes;
+                        struct btrfs_bio_stripe *tgtdev_stripe =
+                                bbio->stripes + num_stripes;
 
-                                tgtdev_stripe->physical = physical_of_found;
-                                tgtdev_stripe->length =
-                                        bbio->stripes[index_srcdev].length;
-                                tgtdev_stripe->dev = dev_replace->tgtdev;
-                                bbio->tgtdev_map[index_srcdev] = num_stripes;
+                        tgtdev_stripe->physical = physical_of_found;
+                        tgtdev_stripe->length =
+                                bbio->stripes[index_srcdev].length;
+                        tgtdev_stripe->dev = dev_replace->tgtdev;
+                        bbio->tgtdev_map[index_srcdev] = num_stripes;
 
-                                tgtdev_indexes++;
-                                num_stripes++;
-                        }
+                        tgtdev_indexes++;
+                        num_stripes++;
                 }
         }
 
@@ -6250,27 +6259,23 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
         return dev;
 }
 
-static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
-                          struct extent_buffer *leaf,
-                          struct btrfs_chunk *chunk)
+/* Return -EIO if any error, otherwise return 0. */
+static int btrfs_check_chunk_valid(struct btrfs_root *root,
+                                   struct extent_buffer *leaf,
+                                   struct btrfs_chunk *chunk, u64 logical)
 {
-        struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree;
-        struct map_lookup *map;
-        struct extent_map *em;
-        u64 logical;
         u64 length;
         u64 stripe_len;
-        u64 devid;
-        u8 uuid[BTRFS_UUID_SIZE];
-        int num_stripes;
-        int ret;
-        int i;
+        u16 num_stripes;
+        u16 sub_stripes;
+        u64 type;
 
-        logical = key->offset;
         length = btrfs_chunk_length(leaf, chunk);
         stripe_len = btrfs_chunk_stripe_len(leaf, chunk);
         num_stripes = btrfs_chunk_num_stripes(leaf, chunk);
-        /* Validation check */
+        sub_stripes = btrfs_chunk_sub_stripes(leaf, chunk);
+        type = btrfs_chunk_type(leaf, chunk);
+
         if (!num_stripes) {
                 btrfs_err(root->fs_info, "invalid chunk num_stripes: %u",
                           num_stripes);
@@ -6281,6 +6286,11 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
                           "invalid chunk logical %llu", logical);
                 return -EIO;
         }
+        if (btrfs_chunk_sector_size(leaf, chunk) != root->sectorsize) {
+                btrfs_err(root->fs_info, "invalid chunk sectorsize %u",
+                          btrfs_chunk_sector_size(leaf, chunk));
+                return -EIO;
+        }
         if (!length || !IS_ALIGNED(length, root->sectorsize)) {
                 btrfs_err(root->fs_info,
                         "invalid chunk length %llu", length);
@@ -6292,13 +6302,54 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
                 return -EIO;
         }
         if (~(BTRFS_BLOCK_GROUP_TYPE_MASK | BTRFS_BLOCK_GROUP_PROFILE_MASK) &
-            btrfs_chunk_type(leaf, chunk)) {
+            type) {
                 btrfs_err(root->fs_info, "unrecognized chunk type: %llu",
                           ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
                             BTRFS_BLOCK_GROUP_PROFILE_MASK) &
                           btrfs_chunk_type(leaf, chunk));
                 return -EIO;
         }
+        if ((type & BTRFS_BLOCK_GROUP_RAID10 && sub_stripes != 2) ||
+            (type & BTRFS_BLOCK_GROUP_RAID1 && num_stripes < 1) ||
+            (type & BTRFS_BLOCK_GROUP_RAID5 && num_stripes < 2) ||
+            (type & BTRFS_BLOCK_GROUP_RAID6 && num_stripes < 3) ||
+            (type & BTRFS_BLOCK_GROUP_DUP && num_stripes > 2) ||
+            ((type & BTRFS_BLOCK_GROUP_PROFILE_MASK) == 0 &&
+             num_stripes != 1)) {
+                btrfs_err(root->fs_info,
+                        "invalid num_stripes:sub_stripes %u:%u for profile %llu",
+                        num_stripes, sub_stripes,
+                        type & BTRFS_BLOCK_GROUP_PROFILE_MASK);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
+                          struct extent_buffer *leaf,
+                          struct btrfs_chunk *chunk)
+{
+        struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree;
+        struct map_lookup *map;
+        struct extent_map *em;
+        u64 logical;
+        u64 length;
+        u64 stripe_len;
+        u64 devid;
+        u8 uuid[BTRFS_UUID_SIZE];
+        int num_stripes;
+        int ret;
+        int i;
+
+        logical = key->offset;
+        length = btrfs_chunk_length(leaf, chunk);
+        stripe_len = btrfs_chunk_stripe_len(leaf, chunk);
+        num_stripes = btrfs_chunk_num_stripes(leaf, chunk);
+
+        ret = btrfs_check_chunk_valid(root, leaf, chunk, logical);
+        if (ret)
+                return ret;
 
         read_lock(&map_tree->map_tree.lock);
         em = lookup_extent_mapping(&map_tree->map_tree, logical, 1);
@@ -6546,6 +6597,7 @@ int btrfs_read_sys_array(struct btrfs_root *root)
         u32 array_size;
         u32 len = 0;
         u32 cur_offset;
+        u64 type;
         struct btrfs_key key;
 
         ASSERT(BTRFS_SUPER_INFO_SIZE <= root->nodesize);
@@ -6555,8 +6607,8 @@ int btrfs_read_sys_array(struct btrfs_root *root)
          * overallocate but we can keep it as-is, only the first page is used.
          */
         sb = btrfs_find_create_tree_block(root, BTRFS_SUPER_INFO_OFFSET);
-        if (!sb)
-                return -ENOMEM;
+        if (IS_ERR(sb))
+                return PTR_ERR(sb);
         set_extent_buffer_uptodate(sb);
         btrfs_set_buffer_lockdep_class(root->root_key.objectid, sb, 0);
         /*
@@ -6612,6 +6664,15 @@ int btrfs_read_sys_array(struct btrfs_root *root)
                                 break;
                         }
 
+                        type = btrfs_chunk_type(sb, chunk);
+                        if ((type & BTRFS_BLOCK_GROUP_SYSTEM) == 0) {
+                                btrfs_err(root->fs_info,
+                            "invalid chunk type %llu in sys_array at offset %u",
+                                        type, cur_offset);
+                                ret = -EIO;
+                                break;
+                        }
+
                         len = btrfs_chunk_item_size(num_stripes);
                         if (cur_offset + len > array_size)
                                 goto out_short_read;
@@ -6630,12 +6691,14 @@ int btrfs_read_sys_array(struct btrfs_root *root)
                 sb_array_offset += len;
                 cur_offset += len;
         }
+        clear_extent_buffer_uptodate(sb);
         free_extent_buffer_stale(sb);
         return ret;
 
 out_short_read:
         printk(KERN_ERR "BTRFS: sys_array too short to read %u bytes at offset %u\n",
                         len, cur_offset);
+        clear_extent_buffer_uptodate(sb);
         free_extent_buffer_stale(sb);
         return -EIO;
 }
@@ -6648,6 +6711,7 @@ int btrfs_read_chunk_tree(struct btrfs_root *root)
         struct btrfs_key found_key;
         int ret;
         int slot;
+        u64 total_dev = 0;
 
         root = root->fs_info->chunk_root;
 
@@ -6689,6 +6753,7 @@ int btrfs_read_chunk_tree(struct btrfs_root *root)
                         ret = read_one_dev(root, leaf, dev_item);
                         if (ret)
                                 goto error;
+                        total_dev++;
                 } else if (found_key.type == BTRFS_CHUNK_ITEM_KEY) {
                         struct btrfs_chunk *chunk;
                         chunk = btrfs_item_ptr(leaf, slot, struct btrfs_chunk);
@@ -6698,6 +6763,28 @@ int btrfs_read_chunk_tree(struct btrfs_root *root)
                 }
                 path->slots[0]++;
         }
+
+        /*
+         * After loading chunk tree, we've got all device information,
+         * do another round of validation checks.
+         */
+        if (total_dev != root->fs_info->fs_devices->total_devices) {
+                btrfs_err(root->fs_info,
+           "super_num_devices %llu mismatch with num_devices %llu found here",
+                          btrfs_super_num_devices(root->fs_info->super_copy),
+                          total_dev);
+                ret = -EINVAL;
+                goto error;
+        }
+        if (btrfs_super_total_bytes(root->fs_info->super_copy) <
+            root->fs_info->fs_devices->total_rw_bytes) {
+                btrfs_err(root->fs_info,
+        "super_total_bytes %llu mismatch with fs_devices total_rw_bytes %llu",
+                          btrfs_super_total_bytes(root->fs_info->super_copy),
+                          root->fs_info->fs_devices->total_rw_bytes);
+                ret = -EINVAL;
+                goto error;
+        }
         ret = 0;
 error:
         unlock_chunks(root);
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 861d611b8c05..ce5f345d70f5 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -380,7 +380,7 @@ static void cachefiles_sync_cache(struct fscache_cache *_cache)
  * check if the backing cache is updated to FS-Cache
  * - called by FS-Cache when evaluates if need to invalidate the cache
  */
-static bool cachefiles_check_consistency(struct fscache_operation *op)
+static int cachefiles_check_consistency(struct fscache_operation *op)
 {
         struct cachefiles_object *object;
         struct cachefiles_cache *cache;
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index eeb71e5de27a..26a9d10d75e9 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -276,8 +276,10 @@ static void finish_read(struct ceph_osd_request *req)
         for (i = 0; i < num_pages; i++) {
                 struct page *page = osd_data->pages[i];
 
-                if (rc < 0 && rc != -ENOENT)
+                if (rc < 0 && rc != -ENOENT) {
+                        ceph_fscache_readpage_cancel(inode, page);
                         goto unlock;
+                }
                 if (bytes < (int)PAGE_SIZE) {
                         /* zero (remainder of) page */
                         int s = bytes < 0 ? 0 : bytes;
@@ -535,8 +537,6 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
             CONGESTION_ON_THRESH(fsc->mount_options->congestion_kb))
                 set_bdi_congested(&fsc->backing_dev_info, BLK_RW_ASYNC);
 
-        ceph_readpage_to_fscache(inode, page);
-
         set_page_writeback(page);
         err = ceph_osdc_writepages(osdc, ceph_vino(inode),
                                    &ci->i_layout, snapc,
diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index c052b5bf219b..238c55b01723 100644
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -25,6 +25,7 @@
 #include "cache.h"
 
 struct ceph_aux_inode {
+        u64             version;
         struct timespec mtime;
         loff_t          size;
 };
@@ -69,15 +70,8 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc)
         fsc->fscache = fscache_acquire_cookie(ceph_cache_netfs.primary_index,
                                               &ceph_fscache_fsid_object_def,
                                               fsc, true);
-
-        if (fsc->fscache == NULL) {
+        if (!fsc->fscache)
                 pr_err("Unable to resgister fsid: %p fscache cookie", fsc);
-                return 0;
-        }
-
-        fsc->revalidate_wq = alloc_workqueue("ceph-revalidate", 0, 1);
-        if (fsc->revalidate_wq == NULL)
-                return -ENOMEM;
 
         return 0;
 }
@@ -105,6 +99,7 @@ static uint16_t ceph_fscache_inode_get_aux(const void *cookie_netfs_data,
         const struct inode* inode = &ci->vfs_inode;
 
         memset(&aux, 0, sizeof(aux));
+        aux.version = ci->i_version;
         aux.mtime = inode->i_mtime;
         aux.size = i_size_read(inode);
 
@@ -131,6 +126,7 @@ static enum fscache_checkaux ceph_fscache_inode_check_aux(
                 return FSCACHE_CHECKAUX_OBSOLETE;
 
         memset(&aux, 0, sizeof(aux));
+        aux.version = ci->i_version;
         aux.mtime = inode->i_mtime;
         aux.size = i_size_read(inode);
 
@@ -181,32 +177,26 @@ static const struct fscache_cookie_def ceph_fscache_inode_object_def = {
         .now_uncached   = ceph_fscache_inode_now_uncached,
 };
 
-void ceph_fscache_register_inode_cookie(struct ceph_fs_client* fsc,
-                                        struct ceph_inode_info* ci)
+void ceph_fscache_register_inode_cookie(struct inode *inode)
 {
-        struct inode* inode = &ci->vfs_inode;
+        struct ceph_inode_info *ci = ceph_inode(inode);
+        struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
 
         /* No caching for filesystem */
         if (fsc->fscache == NULL)
                 return;
 
         /* Only cache for regular files that are read only */
-        if ((ci->vfs_inode.i_mode & S_IFREG) == 0)
+        if (!S_ISREG(inode->i_mode))
                 return;
 
-        /* Avoid multiple racing open requests */
-        inode_lock(inode);
-
-        if (ci->fscache)
-                goto done;
-
-        ci->fscache = fscache_acquire_cookie(fsc->fscache,
-                                             &ceph_fscache_inode_object_def,
-                                             ci, true);
-        fscache_check_consistency(ci->fscache);
-done:
+        inode_lock_nested(inode, I_MUTEX_CHILD);
+        if (!ci->fscache) {
+                ci->fscache = fscache_acquire_cookie(fsc->fscache,
+                                        &ceph_fscache_inode_object_def,
+                                        ci, false);
+        }
         inode_unlock(inode);
-
 }
 
 void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci)
@@ -222,6 +212,34 @@ void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci)
         fscache_relinquish_cookie(cookie, 0);
 }
 
+static bool ceph_fscache_can_enable(void *data)
+{
+        struct inode *inode = data;
+        return !inode_is_open_for_write(inode);
+}
+
+void ceph_fscache_file_set_cookie(struct inode *inode, struct file *filp)
+{
+        struct ceph_inode_info *ci = ceph_inode(inode);
+
+        if (!fscache_cookie_valid(ci->fscache))
+                return;
+
+        if (inode_is_open_for_write(inode)) {
+                dout("fscache_file_set_cookie %p %p disabling cache\n",
+                     inode, filp);
+                fscache_disable_cookie(ci->fscache, false);
+                fscache_uncache_all_inode_pages(ci->fscache, inode);
+        } else {
+                fscache_enable_cookie(ci->fscache, ceph_fscache_can_enable,
+                                inode);
+                if (fscache_cookie_enabled(ci->fscache)) {
+                        dout("fscache_file_set_cookie %p %p enabing cache\n",
+                             inode, filp);
+                }
+        }
+}
+
 static void ceph_vfs_readpage_complete(struct page *page, void *data, int error)
 {
         if (!error)
@@ -238,8 +256,7 @@ static void ceph_vfs_readpage_complete_unlock(struct page *page, void *data, int
 
 static inline bool cache_valid(struct ceph_inode_info *ci)
 {
-        return ((ceph_caps_issued(ci) & CEPH_CAP_FILE_CACHE) &&
-                (ci->i_fscache_gen == ci->i_rdcache_gen));
+        return ci->i_fscache_gen == ci->i_rdcache_gen;
 }
 
 
@@ -332,69 +349,27 @@ void ceph_invalidate_fscache_page(struct inode* inode, struct page *page)
 
 void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc)
 {
-        if (fsc->revalidate_wq)
-                destroy_workqueue(fsc->revalidate_wq);
-
         fscache_relinquish_cookie(fsc->fscache, 0);
         fsc->fscache = NULL;
 }
 
-static void ceph_revalidate_work(struct work_struct *work)
-{
-        int issued;
-        u32 orig_gen;
-        struct ceph_inode_info *ci = container_of(work, struct ceph_inode_info,
-                                                  i_revalidate_work);
-        struct inode *inode = &ci->vfs_inode;
-
-        spin_lock(&ci->i_ceph_lock);
-        issued = __ceph_caps_issued(ci, NULL);
-        orig_gen = ci->i_rdcache_gen;
-        spin_unlock(&ci->i_ceph_lock);
-
-        if (!(issued & CEPH_CAP_FILE_CACHE)) {
-                dout("revalidate_work lost cache before validation %p\n",
-                     inode);
-                goto out;
-        }
-
-        if (!fscache_check_consistency(ci->fscache))
-                fscache_invalidate(ci->fscache);
-
-        spin_lock(&ci->i_ceph_lock);
-        /* Update the new valid generation (backwards sanity check too) */
-        if (orig_gen > ci->i_fscache_gen) {
-                ci->i_fscache_gen = orig_gen;
-        }
-        spin_unlock(&ci->i_ceph_lock);
-
-out:
-        iput(&ci->vfs_inode);
-}
-
-void ceph_queue_revalidate(struct inode *inode)
+/*
+ * caller should hold CEPH_CAP_FILE_{RD,CACHE}
+ */
+void ceph_fscache_revalidate_cookie(struct ceph_inode_info *ci)
 {
-        struct ceph_fs_client *fsc = ceph_sb_to_client(inode->i_sb);
-        struct ceph_inode_info *ci = ceph_inode(inode);
-
-        if (fsc->revalidate_wq == NULL || ci->fscache == NULL)
+        if (cache_valid(ci))
                 return;
 
-        ihold(inode);
-
-        if (queue_work(ceph_sb_to_client(inode->i_sb)->revalidate_wq,
-                       &ci->i_revalidate_work)) {
-                dout("ceph_queue_revalidate %p\n", inode);
-        } else {
-                dout("ceph_queue_revalidate %p failed\n)", inode);
-                iput(inode);
+        /* resue i_truncate_mutex. There should be no pending
+         * truncate while the caller holds CEPH_CAP_FILE_RD */
+        mutex_lock(&ci->i_truncate_mutex);
+        if (!cache_valid(ci)) {
+                if (fscache_check_consistency(ci->fscache))
+                        fscache_invalidate(ci->fscache);
+                spin_lock(&ci->i_ceph_lock);
+                ci->i_fscache_gen = ci->i_rdcache_gen;
+                spin_unlock(&ci->i_ceph_lock);
         }
-}
-
-void ceph_fscache_inode_init(struct ceph_inode_info *ci)
-{
-        ci->fscache = NULL;
-        /* The first load is verifed cookie open time */
-        ci->i_fscache_gen = 1;
-        INIT_WORK(&ci->i_revalidate_work, ceph_revalidate_work);
+        mutex_unlock(&ci->i_truncate_mutex);
 }
diff --git a/fs/ceph/cache.h b/fs/ceph/cache.h
index 5ac591bd012b..7e72c7594f0c 100644
--- a/fs/ceph/cache.h
+++ b/fs/ceph/cache.h
@@ -34,10 +34,10 @@ void ceph_fscache_unregister(void);
 int ceph_fscache_register_fs(struct ceph_fs_client* fsc);
 void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc);
 
-void ceph_fscache_inode_init(struct ceph_inode_info *ci);
-void ceph_fscache_register_inode_cookie(struct ceph_fs_client* fsc,
-                                        struct ceph_inode_info* ci);
+void ceph_fscache_register_inode_cookie(struct inode *inode);
 void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci);
+void ceph_fscache_file_set_cookie(struct inode *inode, struct file *filp);
+void ceph_fscache_revalidate_cookie(struct ceph_inode_info *ci);
 
 int ceph_readpage_from_fscache(struct inode *inode, struct page *page);
 int ceph_readpages_from_fscache(struct inode *inode,
@@ -46,12 +46,11 @@ int ceph_readpages_from_fscache(struct inode *inode,
                                 unsigned *nr_pages);
 void ceph_readpage_to_fscache(struct inode *inode, struct page *page);
 void ceph_invalidate_fscache_page(struct inode* inode, struct page *page);
-void ceph_queue_revalidate(struct inode *inode);
 
-static inline void ceph_fscache_update_objectsize(struct inode *inode)
+static inline void ceph_fscache_inode_init(struct ceph_inode_info *ci)
 {
-        struct ceph_inode_info *ci = ceph_inode(inode);
-        fscache_attr_changed(ci->fscache);
+        ci->fscache = NULL;
+        ci->i_fscache_gen = 0;
 }
 
 static inline void ceph_fscache_invalidate(struct inode *inode)
@@ -88,6 +87,11 @@ static inline void ceph_fscache_readpages_cancel(struct inode *inode,
         return fscache_readpages_cancel(ci->fscache, pages);
 }
 
+static inline void ceph_disable_fscache_readpage(struct ceph_inode_info *ci)
+{
+        ci->i_fscache_gen = ci->i_rdcache_gen - 1;
+}
+
 #else
 
 static inline int ceph_fscache_register(void)
@@ -112,8 +116,20 @@ static inline void ceph_fscache_inode_init(struct ceph_inode_info *ci)
 {
 }
 
-static inline void ceph_fscache_register_inode_cookie(struct ceph_fs_client* parent_fsc,
-                                                      struct ceph_inode_info* ci)
+static inline void ceph_fscache_register_inode_cookie(struct inode *inode)
+{
+}
+
+static inline void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci)
+{
+}
+
+static inline void ceph_fscache_file_set_cookie(struct inode *inode,
+                                                struct file *filp)
+{
+}
+
+static inline void ceph_fscache_revalidate_cookie(struct ceph_inode_info *ci)
 {
 }
 
@@ -141,10 +157,6 @@ static inline void ceph_readpage_to_fscache(struct inode *inode,
 {
 }
 
-static inline void ceph_fscache_update_objectsize(struct inode *inode)
-{
-}
-
 static inline void ceph_fscache_invalidate(struct inode *inode)
 {
 }
@@ -154,10 +166,6 @@ static inline void ceph_invalidate_fscache_page(struct inode *inode,
 {
 }
 
-static inline void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci)
-{
-}
-
 static inline int ceph_release_fscache_page(struct page *page, gfp_t gfp)
 {
         return 1;
@@ -173,7 +181,7 @@ static inline void ceph_fscache_readpages_cancel(struct inode *inode,
 {
 }
 
-static inline void ceph_queue_revalidate(struct inode *inode)
+static inline void ceph_disable_fscache_readpage(struct ceph_inode_info *ci)
 {
 }
 
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index c17b5d76d75e..6f60d0a3d0f9 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2393,6 +2393,9 @@ again:
                                 snap_rwsem_locked = true;
                         }
                         *got = need | (have & want);
+                        if ((need & CEPH_CAP_FILE_RD) &&
+                            !(*got & CEPH_CAP_FILE_CACHE))
+                                ceph_disable_fscache_readpage(ci);
                         __take_cap_refs(ci, *got, true);
                         ret = 1;
                 }
@@ -2554,6 +2557,9 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want,
                 break;
         }
 
+        if ((_got & CEPH_CAP_FILE_RD) && (_got & CEPH_CAP_FILE_CACHE))
+                ceph_fscache_revalidate_cookie(ci);
+
         *got = _got;
         return 0;
 }
@@ -2795,7 +2801,6 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
         bool writeback = false;
         bool queue_trunc = false;
         bool queue_invalidate = false;
-        bool queue_revalidate = false;
         bool deleted_inode = false;
         bool fill_inline = false;
 
@@ -2837,8 +2842,6 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
                                 ci->i_rdcache_revoking = ci->i_rdcache_gen;
                         }
                 }
-
-                ceph_fscache_invalidate(inode);
         }
 
         /* side effects now are allowed */
@@ -2880,11 +2883,6 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
                 }
         }
 
-        /* Do we need to revalidate our fscache cookie. Don't bother on the
-         * first cache cap as we already validate at cookie creation time. */
-        if ((issued & CEPH_CAP_FILE_CACHE) && ci->i_rdcache_gen > 1)
-                queue_revalidate = true;
-
         if (newcaps & CEPH_CAP_ANY_RD) {
                 /* ctime/mtime/atime? */
                 ceph_decode_timespec(&mtime, &grant->mtime);
@@ -2993,11 +2991,8 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
         if (fill_inline)
                 ceph_fill_inline_data(inode, NULL, inline_data, inline_len);
 
-        if (queue_trunc) {
+        if (queue_trunc)
                 ceph_queue_vmtruncate(inode);
-                ceph_queue_revalidate(inode);
-        } else if (queue_revalidate)
-                ceph_queue_revalidate(inode);
 
         if (writeback)
                 /*
@@ -3199,10 +3194,8 @@ static void handle_cap_trunc(struct inode *inode,
                                           truncate_seq, truncate_size, size);
         spin_unlock(&ci->i_ceph_lock);
 
-        if (queue_trunc) {
+        if (queue_trunc)
                 ceph_queue_vmtruncate(inode);
-                ceph_fscache_invalidate(inode);
-        }
 }
 
 /*
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index a888df6f2d71..ce2f5795e44b 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -137,23 +137,11 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
 {
         struct ceph_file_info *cf;
         int ret = 0;
-        struct ceph_inode_info *ci = ceph_inode(inode);
-        struct ceph_fs_client *fsc = ceph_sb_to_client(inode->i_sb);
-        struct ceph_mds_client *mdsc = fsc->mdsc;
 
         switch (inode->i_mode & S_IFMT) {
         case S_IFREG:
-                /* First file open request creates the cookie, we want to keep
-                 * this cookie around for the filetime of the inode as not to
-                 * have to worry about fscache register / revoke / operation
-                 * races.
-                 *
-                 * Also, if we know the operation is going to invalidate data
-                 * (non readonly) just nuke the cache right away.
-                 */
-                ceph_fscache_register_inode_cookie(mdsc->fsc, ci);
-                if ((fmode & CEPH_FILE_MODE_WR))
-                        ceph_fscache_invalidate(inode);
+                ceph_fscache_register_inode_cookie(inode);
+                ceph_fscache_file_set_cookie(inode, file);
         case S_IFDIR:
                 dout("init_file %p %p 0%o (regular)\n", inode, file,
                      inode->i_mode);
@@ -1349,7 +1337,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
         }
 
 retry_snap:
-        if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL)) {
+        if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL)) {
                 err = -ENOSPC;
                 goto out;
         }
@@ -1407,7 +1395,6 @@ retry_snap:
                         iov_iter_advance(from, written);
                 ceph_put_snap_context(snapc);
         } else {
-                loff_t old_size = i_size_read(inode);
                 /*
                  * No need to acquire the i_truncate_mutex. Because
                  * the MDS revokes Fwb caps before sending truncate
@@ -1418,8 +1405,6 @@ retry_snap:
                 written = generic_perform_write(file, from, pos);
                 if (likely(written >= 0))
                         iocb->ki_pos = pos + written;
-                if (i_size_read(inode) > old_size)
-                        ceph_fscache_update_objectsize(inode);
                 inode_unlock(inode);
         }
 
@@ -1440,7 +1425,7 @@ retry_snap:
         ceph_put_cap_refs(ci, got);
 
         if (written >= 0) {
-                if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_NEARFULL))
+                if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_NEARFULL))
                         iocb->ki_flags |= IOCB_DSYNC;
 
                 written = generic_write_sync(iocb, written);
@@ -1672,8 +1657,8 @@ static long ceph_fallocate(struct file *file, int mode,
                 goto unlock;
         }
 
-        if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) &&
-                !(mode & FALLOC_FL_PUNCH_HOLE)) {
+        if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) &&
+            !(mode & FALLOC_FL_PUNCH_HOLE)) {
                 ret = -ENOSPC;
                 goto unlock;
         }
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 0130a8592191..0168b49fb6ad 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -103,7 +103,6 @@ struct ceph_fs_client {
 
 #ifdef CONFIG_CEPH_FSCACHE
         struct fscache_cookie *fscache;
-        struct workqueue_struct *revalidate_wq;
 #endif
 };
 
@@ -360,8 +359,7 @@ struct ceph_inode_info {
 
 #ifdef CONFIG_CEPH_FSCACHE
         struct fscache_cookie *fscache;
-        u32 i_fscache_gen; /* sequence, for delayed fscache validate */
-        struct work_struct i_revalidate_work;
+        u32 i_fscache_gen;
 #endif
         struct inode vfs_inode; /* at end */
 };
diff --git a/fs/coredump.c b/fs/coredump.c
index 38a7ab87e10a..281b768000e6 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -794,6 +794,7 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
                         return 0;
                 file->f_pos = pos;
                 cprm->written += n;
+                cprm->pos += n;
                 nr -= n;
         }
         return 1;
@@ -808,6 +809,7 @@ int dump_skip(struct coredump_params *cprm, size_t nr)
                 if (dump_interrupted() ||
                     file->f_op->llseek(file, nr, SEEK_CUR) < 0)
                         return 0;
+                cprm->pos += nr;
                 return 1;
         } else {
                 while (nr > PAGE_SIZE) {
@@ -822,7 +824,7 @@ EXPORT_SYMBOL(dump_skip);
 
 int dump_align(struct coredump_params *cprm, int align)
 {
-        unsigned mod = cprm->file->f_pos & (align - 1);
+        unsigned mod = cprm->pos & (align - 1);
         if (align & (align - 1))
                 return 0;
         return mod ? dump_skip(cprm, align - mod) : 1;
diff --git a/fs/dcache.c b/fs/dcache.c
index ad4a542e9bab..d6847d7b123d 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -507,6 +507,44 @@ void d_drop(struct dentry *dentry)
 }
 EXPORT_SYMBOL(d_drop);
 
+static inline void dentry_unlist(struct dentry *dentry, struct dentry *parent)
+{
+        struct dentry *next;
+        /*
+         * Inform d_walk() and shrink_dentry_list() that we are no longer
+         * attached to the dentry tree
+         */
+        dentry->d_flags |= DCACHE_DENTRY_KILLED;
+        if (unlikely(list_empty(&dentry->d_child)))
+                return;
+        __list_del_entry(&dentry->d_child);
+        /*
+         * Cursors can move around the list of children.  While we'd been
+         * a normal list member, it didn't matter - ->d_child.next would've
+         * been updated.  However, from now on it won't be and for the
+         * things like d_walk() it might end up with a nasty surprise.
+         * Normally d_walk() doesn't care about cursors moving around -
+         * ->d_lock on parent prevents that and since a cursor has no children
+         * of its own, we get through it without ever unlocking the parent.
+         * There is one exception, though - if we ascend from a child that
+         * gets killed as soon as we unlock it, the next sibling is found
+         * using the value left in its ->d_child.next.  And if _that_
+         * pointed to a cursor, and cursor got moved (e.g. by lseek())
+         * before d_walk() regains parent->d_lock, we'll end up skipping
+         * everything the cursor had been moved past.
+         *
+         * Solution: make sure that the pointer left behind in ->d_child.next
+         * points to something that won't be moving around.  I.e. skip the
+         * cursors.
+         */
+        while (dentry->d_child.next != &parent->d_subdirs) {
+                next = list_entry(dentry->d_child.next, struct dentry, d_child);
+                if (likely(!(next->d_flags & DCACHE_DENTRY_CURSOR)))
+                        break;
+                dentry->d_child.next = next->d_child.next;
+        }
+}
+
 static void __dentry_kill(struct dentry *dentry)
 {
         struct dentry *parent = NULL;
@@ -532,12 +570,7 @@ static void __dentry_kill(struct dentry *dentry)
         }
         /* if it was on the hash then remove it */
         __d_drop(dentry);
-        __list_del_entry(&dentry->d_child);
-        /*
-         * Inform d_walk() that we are no longer attached to the
-         * dentry tree
-         */
-        dentry->d_flags |= DCACHE_DENTRY_KILLED;
+        dentry_unlist(dentry, parent);
         if (parent)
                 spin_unlock(&parent->d_lock);
         dentry_iput(dentry);
@@ -1203,6 +1236,9 @@ resume:
                 struct dentry *dentry = list_entry(tmp, struct dentry, d_child);
                 next = tmp->next;
 
+                if (unlikely(dentry->d_flags & DCACHE_DENTRY_CURSOR))
+                        continue;
+
                 spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
 
                 ret = enter(data, dentry);
@@ -1636,7 +1672,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
         struct dentry *dentry = __d_alloc(parent->d_sb, name);
         if (!dentry)
                 return NULL;
-
+        dentry->d_flags |= DCACHE_RCUACCESS;
         spin_lock(&parent->d_lock);
         /*
          * don't need child lock because it is not subject
@@ -1651,6 +1687,16 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
 }
 EXPORT_SYMBOL(d_alloc);
 
+struct dentry *d_alloc_cursor(struct dentry * parent)
+{
+        struct dentry *dentry = __d_alloc(parent->d_sb, NULL);
+        if (dentry) {
+                dentry->d_flags |= DCACHE_RCUACCESS | DCACHE_DENTRY_CURSOR;
+                dentry->d_parent = dget(parent);
+        }
+        return dentry;
+}
+
 /**
  * d_alloc_pseudo - allocate a dentry (for lookup-less filesystems)
  * @sb: the superblock
@@ -2358,7 +2404,6 @@ static void __d_rehash(struct dentry * entry, struct hlist_bl_head *b)
 {
         BUG_ON(!d_unhashed(entry));
         hlist_bl_lock(b);
-        entry->d_flags |= DCACHE_RCUACCESS;
         hlist_bl_add_head_rcu(&entry->d_hash, b);
         hlist_bl_unlock(b);
 }
@@ -2458,7 +2503,6 @@ retry:
                 rcu_read_unlock();
                 goto retry;
         }
-        rcu_read_unlock();
         /*
          * No changes for the parent since the beginning of d_lookup().
          * Since all removals from the chain happen with hlist_bl_lock(),
@@ -2471,8 +2515,6 @@ retry:
                         continue;
                 if (dentry->d_parent != parent)
                         continue;
-                if (d_unhashed(dentry))
-                        continue;
                 if (parent->d_flags & DCACHE_OP_COMPARE) {
                         int tlen = dentry->d_name.len;
                         const char *tname = dentry->d_name.name;
@@ -2484,9 +2526,18 @@ retry:
                         if (dentry_cmp(dentry, str, len))
                                 continue;
                 }
-                dget(dentry);
                 hlist_bl_unlock(b);
-                /* somebody is doing lookup for it right now; wait for it */
+                /* now we can try to grab a reference */
+                if (!lockref_get_not_dead(&dentry->d_lockref)) {
+                        rcu_read_unlock();
+                        goto retry;
+                }
+
+                rcu_read_unlock();
+                /*
+                 * somebody is likely to be still doing lookup for it;
+                 * wait for them to finish
+                 */
                 spin_lock(&dentry->d_lock);
                 d_wait_lookup(dentry);
                 /*
@@ -2517,6 +2568,7 @@ retry:
                 dput(new);
                 return dentry;
         }
+        rcu_read_unlock();
         /* we can't take ->d_lock here; it's OK, though. */
         new->d_flags |= DCACHE_PAR_LOOKUP;
         new->d_wait = wq;
@@ -2843,6 +2895,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target,
         /* ... and switch them in the tree */
         if (IS_ROOT(dentry)) {
                 /* splicing a tree */
+                dentry->d_flags |= DCACHE_RCUACCESS;
                 dentry->d_parent = target->d_parent;
                 target->d_parent = target;
                 list_del_init(&target->d_child);
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 9c1c9a01b7e5..592059f88e04 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -127,7 +127,6 @@ static int open_proxy_open(struct inode *inode, struct file *filp)
                 r = real_fops->open(inode, filp);
 
 out:
-        fops_put(real_fops);
         debugfs_use_file_finish(srcu_idx);
         return r;
 }
@@ -262,8 +261,10 @@ static int full_proxy_open(struct inode *inode, struct file *filp)
 
         if (real_fops->open) {
                 r = real_fops->open(inode, filp);
-
-                if (filp->f_op != proxy_fops) {
+                if (r) {
+                        replace_fops(filp, d_inode(dentry)->i_fop);
+                        goto free_proxy;
+                } else if (filp->f_op != proxy_fops) {
                         /* No protection against file removal anymore. */
                         WARN(1, "debugfs file owner replaced proxy fops: %pd",
                                 dentry);
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 0b2954d7172d..37c134a132c7 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -95,8 +95,6 @@ static struct ctl_table pty_root_table[] = {
 
 static DEFINE_MUTEX(allocated_ptys_lock);
 
-static struct vfsmount *devpts_mnt;
-
 struct pts_mount_opts {
         int setuid;
         int setgid;
@@ -104,7 +102,7 @@ struct pts_mount_opts {
         kgid_t   gid;
         umode_t mode;
         umode_t ptmxmode;
-        int newinstance;
+        int reserve;
         int max;
 };
 
@@ -117,11 +115,9 @@ static const match_table_t tokens = {
         {Opt_uid, "uid=%u"},
         {Opt_gid, "gid=%u"},
         {Opt_mode, "mode=%o"},
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
         {Opt_ptmxmode, "ptmxmode=%o"},
         {Opt_newinstance, "newinstance"},
         {Opt_max, "max=%d"},
-#endif
         {Opt_err, NULL}
 };
 
@@ -137,15 +133,48 @@ static inline struct pts_fs_info *DEVPTS_SB(struct super_block *sb)
         return sb->s_fs_info;
 }
 
-static inline struct super_block *pts_sb_from_inode(struct inode *inode)
+struct pts_fs_info *devpts_acquire(struct file *filp)
 {
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
-        if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)
-                return inode->i_sb;
-#endif
-        if (!devpts_mnt)
-                return NULL;
-        return devpts_mnt->mnt_sb;
+        struct pts_fs_info *result;
+        struct path path;
+        struct super_block *sb;
+        int err;
+
+        path = filp->f_path;
+        path_get(&path);
+
+        /* Has the devpts filesystem already been found? */
+        sb = path.mnt->mnt_sb;
+        if (sb->s_magic != DEVPTS_SUPER_MAGIC) {
+                /* Is a devpts filesystem at "pts" in the same directory? */
+                err = path_pts(&path);
+                if (err) {
+                        result = ERR_PTR(err);
+                        goto out;
+                }
+
+                /* Is the path the root of a devpts filesystem? */
+                result = ERR_PTR(-ENODEV);
+                sb = path.mnt->mnt_sb;
+                if ((sb->s_magic != DEVPTS_SUPER_MAGIC) ||
+                    (path.mnt->mnt_root != sb->s_root))
+                        goto out;
+        }
+
+        /*
+         * pty code needs to hold extra references in case of last /dev/tty close
+         */
+        atomic_inc(&sb->s_active);
+        result = DEVPTS_SB(sb);
+
+out:
+        path_put(&path);
+        return result;
+}
+
+void devpts_release(struct pts_fs_info *fsi)
+{
+        deactivate_super(fsi->sb);
 }
 
 #define PARSE_MOUNT     0
@@ -154,9 +183,7 @@ static inline struct super_block *pts_sb_from_inode(struct inode *inode)
 /*
  * parse_mount_options():
  *      Set @opts to mount options specified in @data. If an option is not
- *      specified in @data, set it to its default value. The exception is
- *      'newinstance' option which can only be set/cleared on a mount (i.e.
- *      cannot be changed during remount).
+ *      specified in @data, set it to its default value.
  *
  * Note: @data may be NULL (in which case all options are set to default).
  */
@@ -174,9 +201,12 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
         opts->ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;
         opts->max     = NR_UNIX98_PTY_MAX;
 
-        /* newinstance makes sense only on initial mount */
+        /* Only allow instances mounted from the initial mount
+         * namespace to tap the reserve pool of ptys.
+         */
         if (op == PARSE_MOUNT)
-                opts->newinstance = 0;
+                opts->reserve =
+                        (current->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns);
 
         while ((p = strsep(&data, ",")) != NULL) {
                 substring_t args[MAX_OPT_ARGS];
@@ -211,16 +241,12 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
                                 return -EINVAL;
                         opts->mode = option & S_IALLUGO;
                         break;
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
                 case Opt_ptmxmode:
                         if (match_octal(&args[0], &option))
                                 return -EINVAL;
                         opts->ptmxmode = option & S_IALLUGO;
                         break;
                 case Opt_newinstance:
-                        /* newinstance makes sense only on initial mount */
-                        if (op == PARSE_MOUNT)
-                                opts->newinstance = 1;
                         break;
                 case Opt_max:
                         if (match_int(&args[0], &option) ||
@@ -228,7 +254,6 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
                                 return -EINVAL;
                         opts->max = option;
                         break;
-#endif
                 default:
                         pr_err("called with bogus options\n");
                         return -EINVAL;
@@ -238,7 +263,6 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
         return 0;
 }
 
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
 static int mknod_ptmx(struct super_block *sb)
 {
         int mode;
@@ -305,12 +329,6 @@ static void update_ptmx_mode(struct pts_fs_info *fsi)
                 inode->i_mode = S_IFCHR|fsi->mount_opts.ptmxmode;
         }
 }
-#else
-static inline void update_ptmx_mode(struct pts_fs_info *fsi)
-{
-        return;
-}
-#endif
 
 static int devpts_remount(struct super_block *sb, int *flags, char *data)
 {
@@ -344,11 +362,9 @@ static int devpts_show_options(struct seq_file *seq, struct dentry *root)
                 seq_printf(seq, ",gid=%u",
                            from_kgid_munged(&init_user_ns, opts->gid));
         seq_printf(seq, ",mode=%03o", opts->mode);
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
         seq_printf(seq, ",ptmxmode=%03o", opts->ptmxmode);
         if (opts->max < NR_UNIX98_PTY_MAX)
                 seq_printf(seq, ",max=%d", opts->max);
-#endif
 
         return 0;
 }
@@ -410,40 +426,11 @@ fail:
         return -ENOMEM;
 }
 
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
-static int compare_init_pts_sb(struct super_block *s, void *p)
-{
-        if (devpts_mnt)
-                return devpts_mnt->mnt_sb == s;
-        return 0;
-}
-
 /*
  * devpts_mount()
  *
- *     If the '-o newinstance' mount option was specified, mount a new
- *     (private) instance of devpts.  PTYs created in this instance are
- *     independent of the PTYs in other devpts instances.
- *
- *     If the '-o newinstance' option was not specified, mount/remount the
- *     initial kernel mount of devpts.  This type of mount gives the
- *     legacy, single-instance semantics.
- *
- *     The 'newinstance' option is needed to support multiple namespace
- *     semantics in devpts while preserving backward compatibility of the
- *     current 'single-namespace' semantics. i.e all mounts of devpts
- *     without the 'newinstance' mount option should bind to the initial
- *     kernel mount, like mount_single().
- *
- *     Mounts with 'newinstance' option create a new, private namespace.
- *
- *     NOTE:
- *
- *     For single-mount semantics, devpts cannot use mount_single(),
- *     because mount_single()/sget() find and use the super-block from
- *     the most recent mount of devpts. But that recent mount may be a
- *     'newinstance' mount and mount_single() would pick the newinstance
- *     super-block instead of the initial super-block.
+ *     Mount a new (private) instance of devpts.  PTYs created in this
+ *     instance are independent of the PTYs in other devpts instances.
  */
 static struct dentry *devpts_mount(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data)
@@ -456,18 +443,7 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type,
         if (error)
                 return ERR_PTR(error);
 
-        /* Require newinstance for all user namespace mounts to ensure
-         * the mount options are not changed.
-         */
-        if ((current_user_ns() != &init_user_ns) && !opts.newinstance)
-                return ERR_PTR(-EINVAL);
-
-        if (opts.newinstance)
-                s = sget(fs_type, NULL, set_anon_super, flags, NULL);
-        else
-                s = sget(fs_type, compare_init_pts_sb, set_anon_super, flags,
-                         NULL);
-
+        s = sget(fs_type, NULL, set_anon_super, flags, NULL);
         if (IS_ERR(s))
                 return ERR_CAST(s);
 
@@ -491,18 +467,6 @@ out_undo_sget:
         return ERR_PTR(error);
 }
 
-#else
-/*
- * This supports only the legacy single-instance semantics (no
- * multiple-instance semantics)
- */
-static struct dentry *devpts_mount(struct file_system_type *fs_type, int flags,
-                const char *dev_name, void *data)
-{
-        return mount_single(fs_type, flags, data, devpts_fill_super);
-}
-#endif
-
 static void devpts_kill_sb(struct super_block *sb)
 {
         struct pts_fs_info *fsi = DEVPTS_SB(sb);
@@ -516,9 +480,7 @@ static struct file_system_type devpts_fs_type = {
         .name           = "devpts",
         .mount          = devpts_mount,
         .kill_sb        = devpts_kill_sb,
-#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
         .fs_flags       = FS_USERNS_MOUNT | FS_USERNS_DEV_MOUNT,
-#endif
 };
 
 /*
@@ -531,16 +493,13 @@ int devpts_new_index(struct pts_fs_info *fsi)
         int index;
         int ida_ret;
 
-        if (!fsi)
-                return -ENODEV;
-
 retry:
         if (!ida_pre_get(&fsi->allocated_ptys, GFP_KERNEL))
                 return -ENOMEM;
 
         mutex_lock(&allocated_ptys_lock);
-        if (pty_count >= pty_limit -
-                        (fsi->mount_opts.newinstance ? pty_reserve : 0)) {
+        if (pty_count >= (pty_limit -
+                          (fsi->mount_opts.reserve ? 0 : pty_reserve))) {
                 mutex_unlock(&allocated_ptys_lock);
                 return -ENOSPC;
         }
@@ -571,30 +530,6 @@ void devpts_kill_index(struct pts_fs_info *fsi, int idx)
         mutex_unlock(&allocated_ptys_lock);
 }
 
-/*
- * pty code needs to hold extra references in case of last /dev/tty close
- */
-struct pts_fs_info *devpts_get_ref(struct inode *ptmx_inode, struct file *file)
-{
-        struct super_block *sb;
-        struct pts_fs_info *fsi;
-
-        sb = pts_sb_from_inode(ptmx_inode);
-        if (!sb)
-                return NULL;
-        fsi = DEVPTS_SB(sb);
-        if (!fsi)
-                return NULL;
-
-        atomic_inc(&sb->s_active);
-        return fsi;
-}
-
-void devpts_put_ref(struct pts_fs_info *fsi)
-{
-        deactivate_super(fsi->sb);
-}
-
 /**
  * devpts_pty_new -- create a new inode in /dev/pts/
  * @ptmx_inode: inode of the master
@@ -607,16 +542,12 @@ void devpts_put_ref(struct pts_fs_info *fsi)
 struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
 {
         struct dentry *dentry;
-        struct super_block *sb;
+        struct super_block *sb = fsi->sb;
         struct inode *inode;
         struct dentry *root;
         struct pts_mount_opts *opts;
         char s[12];
 
-        if (!fsi)
-                return ERR_PTR(-ENODEV);
-
-        sb = fsi->sb;
         root = sb->s_root;
         opts = &fsi->mount_opts;
 
@@ -676,20 +607,8 @@ void devpts_pty_kill(struct dentry *dentry)
 static int __init init_devpts_fs(void)
 {
         int err = register_filesystem(&devpts_fs_type);
-        struct ctl_table_header *table;
-
         if (!err) {
-                struct vfsmount *mnt;
-
-                table = register_sysctl_table(pty_root_table);
-                mnt = kern_mount(&devpts_fs_type);
-                if (IS_ERR(mnt)) {
-                        err = PTR_ERR(mnt);
-                        unregister_filesystem(&devpts_fs_type);
-                        unregister_sysctl_table(table);
-                } else {
-                        devpts_mnt = mnt;
-                }
+                register_sysctl_table(pty_root_table);
         }
         return err;
 }
diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c
index 866bb18efefe..e818f5ac7a26 100644
--- a/fs/ecryptfs/kthread.c
+++ b/fs/ecryptfs/kthread.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/mount.h>
+#include <linux/file.h>
 #include "ecryptfs_kernel.h"
 
 struct ecryptfs_open_req {
@@ -147,7 +148,7 @@ int ecryptfs_privileged_open(struct file **lower_file,
         flags |= IS_RDONLY(d_inode(lower_dentry)) ? O_RDONLY : O_RDWR;
         (*lower_file) = dentry_open(&req.path, flags, cred);
         if (!IS_ERR(*lower_file))
-                goto out;
+                goto have_file;
         if ((flags & O_ACCMODE) == O_RDONLY) {
                 rc = PTR_ERR((*lower_file));
                 goto out;
@@ -165,8 +166,16 @@ int ecryptfs_privileged_open(struct file **lower_file,
         mutex_unlock(&ecryptfs_kthread_ctl.mux);
         wake_up(&ecryptfs_kthread_ctl.wait);
         wait_for_completion(&req.done);
-        if (IS_ERR(*lower_file))
+        if (IS_ERR(*lower_file)) {
                 rc = PTR_ERR(*lower_file);
+                goto out;
+        }
+have_file:
+        if ((*lower_file)->f_op->mmap == NULL) {
+                fput(*lower_file);
+                *lower_file = NULL;
+                rc = -EMEDIUMTYPE;
+        }
 out:
         return rc;
 }
diff --git a/fs/fscache/page.c b/fs/fscache/page.c
index 3078b679fcd1..c8c4f79c7ce1 100644
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
@@ -887,6 +887,8 @@ void fscache_invalidate_writes(struct fscache_cookie *cookie)
                         put_page(results[i]);
         }
 
+        wake_up_bit(&cookie->flags, 0);
+
         _leave("");
 }
 
diff --git a/fs/internal.h b/fs/internal.h
index b71deeecea17..f57ced528cde 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -130,6 +130,7 @@ extern int invalidate_inodes(struct super_block *, bool);
 extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
 extern int d_set_mounted(struct dentry *dentry);
 extern long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc);
+extern struct dentry *d_alloc_cursor(struct dentry *);
 
 /*
  * read_write.c
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index b31852f76f46..e3ca4b4cac84 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2329,18 +2329,10 @@ void *jbd2_alloc(size_t size, gfp_t flags)
 
         BUG_ON(size & (size-1)); /* Must be a power of 2 */
 
-        flags |= __GFP_REPEAT;
-        if (size == PAGE_SIZE)
-                ptr = (void *)__get_free_pages(flags, 0);
-        else if (size > PAGE_SIZE) {
-                int order = get_order(size);
-
-                if (order < 3)
-                        ptr = (void *)__get_free_pages(flags, order);
-                else
-                        ptr = vmalloc(size);
-        } else
+        if (size < PAGE_SIZE)
                 ptr = kmem_cache_alloc(get_slab(size), flags);
+        else
+                ptr = (void *)__get_free_pages(flags, get_order(size));
 
         /* Check alignment; SLUB has gotten this wrong in the past,
          * and this can lead to user data corruption! */
@@ -2351,20 +2343,10 @@ void *jbd2_alloc(size_t size, gfp_t flags)
 
 void jbd2_free(void *ptr, size_t size)
 {
-        if (size == PAGE_SIZE) {
-                free_pages((unsigned long)ptr, 0);
-                return;
-        }
-        if (size > PAGE_SIZE) {
-                int order = get_order(size);
-
-                if (order < 3)
-                        free_pages((unsigned long)ptr, order);
-                else
-                        vfree(ptr);
-                return;
-        }
-        kmem_cache_free(get_slab(size), ptr);
+        if (size < PAGE_SIZE)
+                kmem_cache_free(get_slab(size), ptr);
+        else
+                free_pages((unsigned long)ptr, get_order(size));
 };
 
 /*
diff --git a/fs/libfs.c b/fs/libfs.c
index 3db2721144c2..cedeacbae303 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -71,9 +71,7 @@ EXPORT_SYMBOL(simple_lookup);
 
 int dcache_dir_open(struct inode *inode, struct file *file)
 {
-        static struct qstr cursor_name = QSTR_INIT(".", 1);
-
-        file->private_data = d_alloc(file->f_path.dentry, &cursor_name);
+        file->private_data = d_alloc_cursor(file->f_path.dentry);
 
         return file->private_data ? 0 : -ENOMEM;
 }
diff --git a/fs/namei.c b/fs/namei.c
index 4c4f95ac8aa5..70580ab1445c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1416,21 +1416,28 @@ static void follow_mount(struct path *path)
         }
 }
 
+static int path_parent_directory(struct path *path)
+{
+        struct dentry *old = path->dentry;
+        /* rare case of legitimate dget_parent()... */
+        path->dentry = dget_parent(path->dentry);
+        dput(old);
+        if (unlikely(!path_connected(path)))
+                return -ENOENT;
+        return 0;
+}
+
 static int follow_dotdot(struct nameidata *nd)
 {
         while(1) {
-                struct dentry *old = nd->path.dentry;
-
                 if (nd->path.dentry == nd->root.dentry &&
                     nd->path.mnt == nd->root.mnt) {
                         break;
                 }
                 if (nd->path.dentry != nd->path.mnt->mnt_root) {
-                        /* rare case of legitimate dget_parent()... */
-                        nd->path.dentry = dget_parent(nd->path.dentry);
-                        dput(old);
-                        if (unlikely(!path_connected(&nd->path)))
-                                return -ENOENT;
+                        int ret = path_parent_directory(&nd->path);
+                        if (ret)
+                                return ret;
                         break;
                 }
                 if (!follow_up(&nd->path))
@@ -2514,6 +2521,34 @@ struct dentry *lookup_one_len_unlocked(const char *name,
 }
 EXPORT_SYMBOL(lookup_one_len_unlocked);
 
+#ifdef CONFIG_UNIX98_PTYS
+int path_pts(struct path *path)
+{
+        /* Find something mounted on "pts" in the same directory as
+         * the input path.
+         */
+        struct dentry *child, *parent;
+        struct qstr this;
+        int ret;
+
+        ret = path_parent_directory(path);
+        if (ret)
+                return ret;
+
+        parent = path->dentry;
+        this.name = "pts";
+        this.len = 3;
+        child = d_hash_and_lookup(parent, &this);
+        if (!child)
+                return -ENOENT;
+
+        path->dentry = child;
+        dput(parent);
+        follow_mount(path);
+        return 0;
+}
+#endif
+
 int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
                  struct path *path, int *empty)
 {
@@ -2995,9 +3030,13 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
                         }
                         if (*opened & FILE_CREATED)
                                 fsnotify_create(dir, dentry);
-                        path->dentry = dentry;
-                        path->mnt = nd->path.mnt;
-                        return 1;
+                        if (unlikely(d_is_negative(dentry))) {
+                                error = -ENOENT;
+                        } else {
+                                path->dentry = dentry;
+                                path->mnt = nd->path.mnt;
+                                return 1;
+                        }
                 }
         }
         dput(dentry);
@@ -3166,9 +3205,7 @@ static int do_last(struct nameidata *nd,
         int acc_mode = op->acc_mode;
         unsigned seq;
         struct inode *inode;
-        struct path save_parent = { .dentry = NULL, .mnt = NULL };
         struct path path;
-        bool retried = false;
         int error;
 
         nd->flags &= ~LOOKUP_PARENT;
@@ -3211,7 +3248,6 @@ static int do_last(struct nameidata *nd,
                         return -EISDIR;
         }
 
-retry_lookup:
         if (open_flag & (O_CREAT | O_TRUNC | O_WRONLY | O_RDWR)) {
                 error = mnt_want_write(nd->path.mnt);
                 if (!error)
@@ -3263,6 +3299,10 @@ retry_lookup:
                 got_write = false;
         }
 
+        error = follow_managed(&path, nd);
+        if (unlikely(error < 0))
+                return error;
+
         if (unlikely(d_is_negative(path.dentry))) {
                 path_to_nameidata(&path, nd);
                 return -ENOENT;
@@ -3278,10 +3318,6 @@ retry_lookup:
                 return -EEXIST;
         }
 
-        error = follow_managed(&path, nd);
-        if (unlikely(error < 0))
-                return error;
-
         seq = 0;        /* out of RCU mode, so the value doesn't matter */
         inode = d_backing_inode(path.dentry);
 finish_lookup:
@@ -3292,23 +3328,14 @@ finish_lookup:
         if (unlikely(error))
                 return error;
 
-        if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path.mnt) {
-                path_to_nameidata(&path, nd);
-        } else {
-                save_parent.dentry = nd->path.dentry;
-                save_parent.mnt = mntget(path.mnt);
-                nd->path.dentry = path.dentry;
-
-        }
+        path_to_nameidata(&path, nd);
         nd->inode = inode;
         nd->seq = seq;
         /* Why this, you ask?  _Now_ we might have grown LOOKUP_JUMPED... */
 finish_open:
         error = complete_walk(nd);
-        if (error) {
-                path_put(&save_parent);
+        if (error)
                 return error;
-        }
         audit_inode(nd->name, nd->path.dentry, 0);
         error = -EISDIR;
         if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
@@ -3331,13 +3358,9 @@ finish_open_created:
                 goto out;
         BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
         error = vfs_open(&nd->path, file, current_cred());
-        if (!error) {
-                *opened |= FILE_OPENED;
-        } else {
-                if (error == -EOPENSTALE)
-                        goto stale_open;
+        if (error)
                 goto out;
-        }
+        *opened |= FILE_OPENED;
 opened:
         error = open_check_o_direct(file);
         if (!error)
@@ -3353,26 +3376,7 @@ out:
         }
         if (got_write)
                 mnt_drop_write(nd->path.mnt);
-        path_put(&save_parent);
         return error;
-
-stale_open:
-        /* If no saved parent or already retried then can't retry */
-        if (!save_parent.dentry || retried)
-                goto out;
-
-        BUG_ON(save_parent.dentry != dir);
-        path_put(&nd->path);
-        nd->path = save_parent;
-        nd->inode = dir->d_inode;
-        save_parent.mnt = NULL;
-        save_parent.dentry = NULL;
-        if (got_write) {
-                mnt_drop_write(nd->path.mnt);
-                got_write = false;
-        }
-        retried = true;
-        goto retry_lookup;
 }
 
 static int do_tmpfile(struct nameidata *nd, unsigned flags,
diff --git a/fs/namespace.c b/fs/namespace.c
index 4fb1691b4355..783004af5707 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2409,8 +2409,10 @@ static int do_new_mount(struct path *path, const char *fstype, int flags,
                         mnt_flags |= MNT_NODEV | MNT_LOCK_NODEV;
                 }
                 if (type->fs_flags & FS_USERNS_VISIBLE) {
-                        if (!fs_fully_visible(type, &mnt_flags))
+                        if (!fs_fully_visible(type, &mnt_flags)) {
+                                put_filesystem(type);
                                 return -EPERM;
+                        }
                 }
         }
 
@@ -3245,6 +3247,10 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
                 if (mnt->mnt.mnt_sb->s_iflags & SB_I_NOEXEC)
                         mnt_flags &= ~(MNT_LOCK_NOSUID | MNT_LOCK_NOEXEC);
 
+                /* Don't miss readonly hidden in the superblock flags */
+                if (mnt->mnt.mnt_sb->s_flags & MS_RDONLY)
+                        mnt_flags |= MNT_LOCK_READONLY;
+
                 /* Verify the mount flags are equal to or more permissive
                  * than the proposed new mount.
                  */
@@ -3271,7 +3277,7 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
                 list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) {
                         struct inode *inode = child->mnt_mountpoint->d_inode;
                         /* Only worry about locked mounts */
-                        if (!(mnt_flags & MNT_LOCKED))
+                        if (!(child->mnt.mnt_flags & MNT_LOCKED))
                                 continue;
                         /* Is the directory permanetly empty? */
                         if (!is_empty_dir_inode(inode))
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index e55b5242614d..31f3df193bdb 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -290,7 +290,7 @@ out_free_buf:
         return error;
 }
 
-#define NFSD_MDS_PR_KEY         0x0100000000000000
+#define NFSD_MDS_PR_KEY         0x0100000000000000ULL
 
 /*
  * We use the client ID as a unique key for the reservations.
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 1580ea6fd64d..d08cd88155c7 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -104,22 +104,21 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,
                 goto out;
 
         inode = d_inode(fh->fh_dentry);
-        if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {
-                error = -EOPNOTSUPP;
-                goto out_errno;
-        }
 
         error = fh_want_write(fh);
         if (error)
                 goto out_errno;
 
-        error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);
+        fh_lock(fh);
+
+        error = set_posix_acl(inode, ACL_TYPE_ACCESS, argp->acl_access);
         if (error)
-                goto out_drop_write;
-        error = inode->i_op->set_acl(inode, argp->acl_default,
-                                     ACL_TYPE_DEFAULT);
+                goto out_drop_lock;
+        error = set_posix_acl(inode, ACL_TYPE_DEFAULT, argp->acl_default);
         if (error)
-                goto out_drop_write;
+                goto out_drop_lock;
+
+        fh_unlock(fh);
 
         fh_drop_write(fh);
 
@@ -131,7 +130,8 @@ out:
         posix_acl_release(argp->acl_access);
         posix_acl_release(argp->acl_default);
         return nfserr;
-out_drop_write:
+out_drop_lock:
+        fh_unlock(fh);
         fh_drop_write(fh);
 out_errno:
         nfserr = nfserrno(error);
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
index 01df4cd7c753..0c890347cde3 100644
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@@ -95,22 +95,20 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp,
                 goto out;
 
         inode = d_inode(fh->fh_dentry);
-        if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {
-                error = -EOPNOTSUPP;
-                goto out_errno;
-        }
 
         error = fh_want_write(fh);
         if (error)
                 goto out_errno;
 
-        error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);
+        fh_lock(fh);
+
+        error = set_posix_acl(inode, ACL_TYPE_ACCESS, argp->acl_access);
         if (error)
-                goto out_drop_write;
-        error = inode->i_op->set_acl(inode, argp->acl_default,
-                                     ACL_TYPE_DEFAULT);
+                goto out_drop_lock;
+        error = set_posix_acl(inode, ACL_TYPE_DEFAULT, argp->acl_default);
 
-out_drop_write:
+out_drop_lock:
+        fh_unlock(fh);
         fh_drop_write(fh);
 out_errno:
         nfserr = nfserrno(error);
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 6adabd6049b7..71292a0d6f09 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -770,9 +770,6 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
         dentry = fhp->fh_dentry;
         inode = d_inode(dentry);
 
-        if (!inode->i_op->set_acl || !IS_POSIXACL(inode))
-                return nfserr_attrnotsupp;
-
         if (S_ISDIR(inode->i_mode))
                 flags = NFS4_ACL_DIR;
 
@@ -782,16 +779,19 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
         if (host_error < 0)
                 goto out_nfserr;
 
-        host_error = inode->i_op->set_acl(inode, pacl, ACL_TYPE_ACCESS);
+        fh_lock(fhp);
+
+        host_error = set_posix_acl(inode, ACL_TYPE_ACCESS, pacl);
         if (host_error < 0)
-                goto out_release;
+                goto out_drop_lock;
 
         if (S_ISDIR(inode->i_mode)) {
-                host_error = inode->i_op->set_acl(inode, dpacl,
-                                                  ACL_TYPE_DEFAULT);
+                host_error = set_posix_acl(inode, ACL_TYPE_DEFAULT, dpacl);
         }
 
-out_release:
+out_drop_lock:
+        fh_unlock(fhp);
+
         posix_acl_release(pacl);
         posix_acl_release(dpacl);
 out_nfserr:
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 7389cb1d7409..04c68d900324 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -710,22 +710,6 @@ static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc
         }
 }
 
-static struct rpc_clnt *create_backchannel_client(struct rpc_create_args *args)
-{
-        struct rpc_xprt *xprt;
-
-        if (args->protocol != XPRT_TRANSPORT_BC_TCP)
-                return rpc_create(args);
-
-        xprt = args->bc_xprt->xpt_bc_xprt;
-        if (xprt) {
-                xprt_get(xprt);
-                return rpc_create_xprt(args, xprt);
-        }
-
-        return rpc_create(args);
-}
-
 static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses)
 {
         int maxtime = max_cb_time(clp->net);
@@ -768,7 +752,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 args.authflavor = ses->se_cb_sec.flavor;
         }
         /* Create RPC client */
-        client = create_backchannel_client(&args);
+        client = rpc_create(&args);
         if (IS_ERR(client)) {
                 dprintk("NFSD: couldn't create callback client: %ld\n",
                         PTR_ERR(client));
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f5f82e145018..70d0b9b33031 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3480,12 +3480,17 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open,
 }
 
 static struct nfs4_ol_stateid *
-init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
-                struct nfsd4_open *open)
+init_open_stateid(struct nfs4_file *fp, struct nfsd4_open *open)
 {
 
         struct nfs4_openowner *oo = open->op_openowner;
         struct nfs4_ol_stateid *retstp = NULL;
+        struct nfs4_ol_stateid *stp;
+
+        stp = open->op_stp;
+        /* We are moving these outside of the spinlocks to avoid the warnings */
+        mutex_init(&stp->st_mutex);
+        mutex_lock(&stp->st_mutex);
 
         spin_lock(&oo->oo_owner.so_client->cl_lock);
         spin_lock(&fp->fi_lock);
@@ -3493,6 +3498,8 @@ init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
         retstp = nfsd4_find_existing_open(fp, open);
         if (retstp)
                 goto out_unlock;
+
+        open->op_stp = NULL;
         atomic_inc(&stp->st_stid.sc_count);
         stp->st_stid.sc_type = NFS4_OPEN_STID;
         INIT_LIST_HEAD(&stp->st_locks);
@@ -3502,14 +3509,19 @@ init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
         stp->st_access_bmap = 0;
         stp->st_deny_bmap = 0;
         stp->st_openstp = NULL;
-        init_rwsem(&stp->st_rwsem);
         list_add(&stp->st_perstateowner, &oo->oo_owner.so_stateids);
         list_add(&stp->st_perfile, &fp->fi_stateids);
 
 out_unlock:
         spin_unlock(&fp->fi_lock);
         spin_unlock(&oo->oo_owner.so_client->cl_lock);
-        return retstp;
+        if (retstp) {
+                mutex_lock(&retstp->st_mutex);
+                /* To keep mutex tracking happy */
+                mutex_unlock(&stp->st_mutex);
+                stp = retstp;
+        }
+        return stp;
 }
 
 /*
@@ -4305,7 +4317,6 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
         struct nfs4_client *cl = open->op_openowner->oo_owner.so_client;
         struct nfs4_file *fp = NULL;
         struct nfs4_ol_stateid *stp = NULL;
-        struct nfs4_ol_stateid *swapstp = NULL;
         struct nfs4_delegation *dp = NULL;
         __be32 status;
 
@@ -4335,32 +4346,28 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
          */
         if (stp) {
                 /* Stateid was found, this is an OPEN upgrade */
-                down_read(&stp->st_rwsem);
+                mutex_lock(&stp->st_mutex);
                 status = nfs4_upgrade_open(rqstp, fp, current_fh, stp, open);
                 if (status) {
-                        up_read(&stp->st_rwsem);
+                        mutex_unlock(&stp->st_mutex);
                         goto out;
                 }
         } else {
-                stp = open->op_stp;
-                open->op_stp = NULL;
-                swapstp = init_open_stateid(stp, fp, open);
-                if (swapstp) {
-                        nfs4_put_stid(&stp->st_stid);
-                        stp = swapstp;
-                        down_read(&stp->st_rwsem);
+                /* stp is returned locked. */
+                stp = init_open_stateid(fp, open);
+                /* See if we lost the race to some other thread */
+                if (stp->st_access_bmap != 0) {
                         status = nfs4_upgrade_open(rqstp, fp, current_fh,
                                                 stp, open);
                         if (status) {
-                                up_read(&stp->st_rwsem);
+                                mutex_unlock(&stp->st_mutex);
                                 goto out;
                         }
                         goto upgrade_out;
                 }
-                down_read(&stp->st_rwsem);
                 status = nfs4_get_vfs_file(rqstp, fp, current_fh, stp, open);
                 if (status) {
-                        up_read(&stp->st_rwsem);
+                        mutex_unlock(&stp->st_mutex);
                         release_open_stateid(stp);
                         goto out;
                 }
@@ -4372,7 +4379,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
         }
 upgrade_out:
         nfs4_inc_and_copy_stateid(&open->op_stateid, &stp->st_stid);
-        up_read(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
 
         if (nfsd4_has_session(&resp->cstate)) {
                 if (open->op_deleg_want & NFS4_SHARE_WANT_NO_DELEG) {
@@ -4977,12 +4984,12 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_
                  * revoked delegations are kept only for free_stateid.
                  */
                 return nfserr_bad_stateid;
-        down_write(&stp->st_rwsem);
+        mutex_lock(&stp->st_mutex);
         status = check_stateid_generation(stateid, &stp->st_stid.sc_stateid, nfsd4_has_session(cstate));
         if (status == nfs_ok)
                 status = nfs4_check_fh(current_fh, &stp->st_stid);
         if (status != nfs_ok)
-                up_write(&stp->st_rwsem);
+                mutex_unlock(&stp->st_mutex);
         return status;
 }
 
@@ -5030,7 +5037,7 @@ static __be32 nfs4_preprocess_confirmed_seqid_op(struct nfsd4_compound_state *cs
                 return status;
         oo = openowner(stp->st_stateowner);
         if (!(oo->oo_flags & NFS4_OO_CONFIRMED)) {
-                up_write(&stp->st_rwsem);
+                mutex_unlock(&stp->st_mutex);
                 nfs4_put_stid(&stp->st_stid);
                 return nfserr_bad_stateid;
         }
@@ -5062,12 +5069,12 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         oo = openowner(stp->st_stateowner);
         status = nfserr_bad_stateid;
         if (oo->oo_flags & NFS4_OO_CONFIRMED) {
-                up_write(&stp->st_rwsem);
+                mutex_unlock(&stp->st_mutex);
                 goto put_stateid;
         }
         oo->oo_flags |= NFS4_OO_CONFIRMED;
         nfs4_inc_and_copy_stateid(&oc->oc_resp_stateid, &stp->st_stid);
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
         dprintk("NFSD: %s: success, seqid=%d stateid=" STATEID_FMT "\n",
                 __func__, oc->oc_seqid, STATEID_VAL(&stp->st_stid.sc_stateid));
 
@@ -5143,7 +5150,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
         nfs4_inc_and_copy_stateid(&od->od_stateid, &stp->st_stid);
         status = nfs_ok;
 put_stateid:
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
         nfs4_put_stid(&stp->st_stid);
 out:
         nfsd4_bump_seqid(cstate, status);
@@ -5196,7 +5203,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         if (status)
                 goto out; 
         nfs4_inc_and_copy_stateid(&close->cl_stateid, &stp->st_stid);
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
 
         nfsd4_close_open_stateid(stp);
 
@@ -5422,7 +5429,7 @@ init_lock_stateid(struct nfs4_ol_stateid *stp, struct nfs4_lockowner *lo,
         stp->st_access_bmap = 0;
         stp->st_deny_bmap = open_stp->st_deny_bmap;
         stp->st_openstp = open_stp;
-        init_rwsem(&stp->st_rwsem);
+        mutex_init(&stp->st_mutex);
         list_add(&stp->st_locks, &open_stp->st_locks);
         list_add(&stp->st_perstateowner, &lo->lo_owner.so_stateids);
         spin_lock(&fp->fi_lock);
@@ -5591,7 +5598,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                                         &open_stp, nn);
                 if (status)
                         goto out;
-                up_write(&open_stp->st_rwsem);
+                mutex_unlock(&open_stp->st_mutex);
                 open_sop = openowner(open_stp->st_stateowner);
                 status = nfserr_bad_stateid;
                 if (!same_clid(&open_sop->oo_owner.so_client->cl_clientid,
@@ -5600,7 +5607,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 status = lookup_or_create_lock_state(cstate, open_stp, lock,
                                                         &lock_stp, &new);
                 if (status == nfs_ok)
-                        down_write(&lock_stp->st_rwsem);
+                        mutex_lock(&lock_stp->st_mutex);
         } else {
                 status = nfs4_preprocess_seqid_op(cstate,
                                        lock->lk_old_lock_seqid,
@@ -5704,7 +5711,7 @@ out:
                     seqid_mutating_err(ntohl(status)))
                         lock_sop->lo_owner.so_seqid++;
 
-                up_write(&lock_stp->st_rwsem);
+                mutex_unlock(&lock_stp->st_mutex);
 
                 /*
                  * If this is a new, never-before-used stateid, and we are
@@ -5874,7 +5881,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 fput:
         fput(filp);
 put_stateid:
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
         nfs4_put_stid(&stp->st_stid);
 out:
         nfsd4_bump_seqid(cstate, status);
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 986e51e5ceac..64053eadeb81 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -535,7 +535,7 @@ struct nfs4_ol_stateid {
         unsigned char                   st_access_bmap;
         unsigned char                   st_deny_bmap;
         struct nfs4_ol_stateid          *st_openstp;
-        struct rw_semaphore             st_rwsem;
+        struct mutex                    st_mutex;
 };
 
 static inline struct nfs4_ol_stateid *openlockstateid(struct nfs4_stid *s)
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 809bd2de7ad0..e9fd241b9a0a 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -439,7 +439,7 @@ static int nilfs_valid_sb(struct nilfs_super_block *sbp)
         if (!sbp || le16_to_cpu(sbp->s_magic) != NILFS_SUPER_MAGIC)
                 return 0;
         bytes = le16_to_cpu(sbp->s_bytes);
-        if (bytes > BLOCK_SIZE)
+        if (bytes < sumoff + 4 || bytes > BLOCK_SIZE)
                 return 0;
         crc = crc32_le(le32_to_cpu(sbp->s_crc_seed), (unsigned char *)sbp,
                        sumoff);
diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
index e27e6527912b..4342c7ee7d20 100644
--- a/fs/ocfs2/Makefile
+++ b/fs/ocfs2/Makefile
@@ -1,7 +1,5 @@
 ccflags-y := -Ifs/ocfs2
 
-ccflags-y += -DCATCH_BH_JBD_RACES
-
 obj-$(CONFIG_OCFS2_FS) +=       \
         ocfs2.o                 \
         ocfs2_stackglue.o
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
index fe50ded1b4ce..498641eed2db 100644
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -139,11 +139,16 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
 
                 lock_buffer(bh);
                 if (buffer_jbd(bh)) {
+#ifdef CATCH_BH_JBD_RACES
                         mlog(ML_ERROR,
                              "block %llu had the JBD bit set "
                              "while I was in lock_buffer!",
                              (unsigned long long)bh->b_blocknr);
                         BUG();
+#else
+                        unlock_buffer(bh);
+                        continue;
+#endif
                 }
 
                 clear_buffer_uptodate(bh);
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 22f0253a3567..c2a6b0894022 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -405,12 +405,21 @@ static int ovl_create_or_link(struct dentry *dentry, int mode, dev_t rdev,
                 err = ovl_create_upper(dentry, inode, &stat, link, hardlink);
         } else {
                 const struct cred *old_cred;
+                struct cred *override_cred;
 
                 old_cred = ovl_override_creds(dentry->d_sb);
 
-                err = ovl_create_over_whiteout(dentry, inode, &stat, link,
-                                               hardlink);
+                err = -ENOMEM;
+                override_cred = prepare_creds();
+                if (override_cred) {
+                        override_cred->fsuid = old_cred->fsuid;
+                        override_cred->fsgid = old_cred->fsgid;
+                        put_cred(override_creds(override_cred));
+                        put_cred(override_cred);
 
+                        err = ovl_create_over_whiteout(dentry, inode, &stat,
+                                                       link, hardlink);
+                }
                 revert_creds(old_cred);
         }
 
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 0ed7c4012437..1dbeab6cf96e 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -238,41 +238,27 @@ out:
         return err;
 }
 
-static bool ovl_need_xattr_filter(struct dentry *dentry,
-                                  enum ovl_path_type type)
-{
-        if ((type & (__OVL_PATH_PURE | __OVL_PATH_UPPER)) == __OVL_PATH_UPPER)
-                return S_ISDIR(dentry->d_inode->i_mode);
-        else
-                return false;
-}
-
 ssize_t ovl_getxattr(struct dentry *dentry, struct inode *inode,
                      const char *name, void *value, size_t size)
 {
-        struct path realpath;
-        enum ovl_path_type type = ovl_path_real(dentry, &realpath);
+        struct dentry *realdentry = ovl_dentry_real(dentry);
 
-        if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
+        if (ovl_is_private_xattr(name))
                 return -ENODATA;
 
-        return vfs_getxattr(realpath.dentry, name, value, size);
+        return vfs_getxattr(realdentry, name, value, size);
 }
 
 ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
 {
-        struct path realpath;
-        enum ovl_path_type type = ovl_path_real(dentry, &realpath);
+        struct dentry *realdentry = ovl_dentry_real(dentry);
         ssize_t res;
         int off;
 
-        res = vfs_listxattr(realpath.dentry, list, size);
+        res = vfs_listxattr(realdentry, list, size);
         if (res <= 0 || size == 0)
                 return res;
 
-        if (!ovl_need_xattr_filter(dentry, type))
-                return res;
-
         /* filter out private xattrs */
         for (off = 0; off < res;) {
                 char *s = list + off;
@@ -302,7 +288,7 @@ int ovl_removexattr(struct dentry *dentry, const char *name)
                 goto out;
 
         err = -ENODATA;
-        if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
+        if (ovl_is_private_xattr(name))
                 goto out_drop_write;
 
         if (!OVL_TYPE_UPPER(type)) {
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 8a4a266beff3..edc452c2a563 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -820,39 +820,43 @@ posix_acl_xattr_get(const struct xattr_handler *handler,
         return error;
 }
 
-static int
-posix_acl_xattr_set(const struct xattr_handler *handler,
-                    struct dentry *unused, struct inode *inode,
-                    const char *name, const void *value,
-                    size_t size, int flags)
+int
+set_posix_acl(struct inode *inode, int type, struct posix_acl *acl)
 {
-        struct posix_acl *acl = NULL;
-        int ret;
-
         if (!IS_POSIXACL(inode))
                 return -EOPNOTSUPP;
         if (!inode->i_op->set_acl)
                 return -EOPNOTSUPP;
 
-        if (handler->flags == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
-                return value ? -EACCES : 0;
+        if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
+                return acl ? -EACCES : 0;
         if (!inode_owner_or_capable(inode))
                 return -EPERM;
 
+        if (acl) {
+                int ret = posix_acl_valid(acl);
+                if (ret)
+                        return ret;
+        }
+        return inode->i_op->set_acl(inode, acl, type);
+}
+EXPORT_SYMBOL(set_posix_acl);
+
+static int
+posix_acl_xattr_set(const struct xattr_handler *handler,
+                    struct dentry *unused, struct inode *inode,
+                    const char *name, const void *value,
+                    size_t size, int flags)
+{
+        struct posix_acl *acl = NULL;
+        int ret;
+
         if (value) {
                 acl = posix_acl_from_xattr(&init_user_ns, value, size);
                 if (IS_ERR(acl))
                         return PTR_ERR(acl);
-
-                if (acl) {
-                        ret = posix_acl_valid(acl);
-                        if (ret)
-                                goto out;
-                }
         }
-
-        ret = inode->i_op->set_acl(inode, acl, handler->flags);
-out:
+        ret = set_posix_acl(inode, handler->flags, acl);
         posix_acl_release(acl);
         return ret;
 }
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 55bc7d6c8aac..06702783bf40 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -121,6 +121,13 @@ static struct dentry *proc_mount(struct file_system_type *fs_type,
         if (IS_ERR(sb))
                 return ERR_CAST(sb);
 
+        /*
+         * procfs isn't actually a stacking filesystem; however, there is
+         * too much magic going on inside it to permit stacking things on
+         * top of it
+         */
+        sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
+
         if (!proc_parse_options(options, ns)) {
                 deactivate_locked_super(sb);
                 return ERR_PTR(-EINVAL);
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index b8f2d1e8c645..c72c16c5a60f 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1393,7 +1393,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
         unsigned long safe_mask = 0;
         unsigned int commit_max_age = (unsigned int)-1;
         struct reiserfs_journal *journal = SB_JOURNAL(s);
-        char *new_opts = kstrdup(arg, GFP_KERNEL);
+        char *new_opts;
         int err;
         char *qf_names[REISERFS_MAXQUOTAS];
         unsigned int qfmt = 0;
@@ -1401,6 +1401,10 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
         int i;
 #endif
 
+        new_opts = kstrdup(arg, GFP_KERNEL);
+        if (arg && !new_opts)
+                return -ENOMEM;
+
         sync_filesystem(s);
         reiserfs_write_lock(s);
 
@@ -1546,7 +1550,8 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
         }
 
 out_ok_unlocked:
-        replace_mount_options(s, new_opts);
+        if (new_opts)
+                replace_mount_options(s, new_opts);
         return 0;
 
 out_err_unlock:
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 08316972ff93..7bbf420d1289 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -52,6 +52,7 @@
 #include "ubifs.h"
 #include <linux/mount.h>
 #include <linux/slab.h>
+#include <linux/migrate.h>
 
 static int read_block(struct inode *inode, void *addr, unsigned int block,
                       struct ubifs_data_node *dn)
@@ -1452,6 +1453,26 @@ static int ubifs_set_page_dirty(struct page *page)
         return ret;
 }
 
+#ifdef CONFIG_MIGRATION
+static int ubifs_migrate_page(struct address_space *mapping,
+                struct page *newpage, struct page *page, enum migrate_mode mode)
+{
+        int rc;
+
+        rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0);
+        if (rc != MIGRATEPAGE_SUCCESS)
+                return rc;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                SetPagePrivate(newpage);
+        }
+
+        migrate_page_copy(newpage, page);
+        return MIGRATEPAGE_SUCCESS;
+}
+#endif
+
 static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags)
 {
         /*
@@ -1591,6 +1612,9 @@ const struct address_space_operations ubifs_file_address_operations = {
         .write_end      = ubifs_write_end,
         .invalidatepage = ubifs_invalidatepage,
         .set_page_dirty = ubifs_set_page_dirty,
+#ifdef CONFIG_MIGRATION
+        .migratepage    = ubifs_migrate_page,
+#endif
         .releasepage    = ubifs_releasepage,
 };
 
diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index 5f861ed287c3..888c364b2fe9 100644
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -295,7 +295,8 @@ static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block,
                 map = &UDF_SB(sb)->s_partmaps[partition];
                 /* map to sparable/physical partition desc */
                 phyblock = udf_get_pblock(sb, eloc.logicalBlockNum,
-                        map->s_partition_num, ext_offset + offset);
+                        map->s_type_specific.s_metadata.s_phys_partition_ref,
+                        ext_offset + offset);
         }
 
         brelse(epos.bh);
@@ -317,14 +318,18 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
         mdata = &map->s_type_specific.s_metadata;
         inode = mdata->s_metadata_fe ? : mdata->s_mirror_fe;
 
-        /* We shouldn't mount such media... */
-        BUG_ON(!inode);
+        if (!inode)
+                return 0xFFFFFFFF;
+
         retblk = udf_try_read_meta(inode, block, partition, offset);
         if (retblk == 0xFFFFFFFF && mdata->s_metadata_fe) {
                 udf_warn(sb, "error reading from METADATA, trying to read from MIRROR\n");
                 if (!(mdata->s_flags & MF_MIRROR_FE_LOADED)) {
                         mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb,
-                                mdata->s_mirror_file_loc, map->s_partition_num);
+                                mdata->s_mirror_file_loc,
+                                mdata->s_phys_partition_ref);
+                        if (IS_ERR(mdata->s_mirror_fe))
+                                mdata->s_mirror_fe = NULL;
                         mdata->s_flags |= MF_MIRROR_FE_LOADED;
                 }
 
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 5e2c8c814e1b..4942549e7dc8 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -951,13 +951,13 @@ out2:
 }
 
 struct inode *udf_find_metadata_inode_efe(struct super_block *sb,
-                                        u32 meta_file_loc, u32 partition_num)
+                                        u32 meta_file_loc, u32 partition_ref)
 {
         struct kernel_lb_addr addr;
         struct inode *metadata_fe;
 
         addr.logicalBlockNum = meta_file_loc;
-        addr.partitionReferenceNum = partition_num;
+        addr.partitionReferenceNum = partition_ref;
 
         metadata_fe = udf_iget_special(sb, &addr);
 
@@ -974,7 +974,8 @@ struct inode *udf_find_metadata_inode_efe(struct super_block *sb,
         return metadata_fe;
 }
 
-static int udf_load_metadata_files(struct super_block *sb, int partition)
+static int udf_load_metadata_files(struct super_block *sb, int partition,
+                                   int type1_index)
 {
         struct udf_sb_info *sbi = UDF_SB(sb);
         struct udf_part_map *map;
@@ -984,20 +985,21 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
 
         map = &sbi->s_partmaps[partition];
         mdata = &map->s_type_specific.s_metadata;
+        mdata->s_phys_partition_ref = type1_index;
 
         /* metadata address */
         udf_debug("Metadata file location: block = %d part = %d\n",
-                  mdata->s_meta_file_loc, map->s_partition_num);
+                  mdata->s_meta_file_loc, mdata->s_phys_partition_ref);
 
         fe = udf_find_metadata_inode_efe(sb, mdata->s_meta_file_loc,
-                                         map->s_partition_num);
+                                         mdata->s_phys_partition_ref);
         if (IS_ERR(fe)) {
                 /* mirror file entry */
                 udf_debug("Mirror metadata file location: block = %d part = %d\n",
-                          mdata->s_mirror_file_loc, map->s_partition_num);
+                          mdata->s_mirror_file_loc, mdata->s_phys_partition_ref);
 
                 fe = udf_find_metadata_inode_efe(sb, mdata->s_mirror_file_loc,
-                                                 map->s_partition_num);
+                                                 mdata->s_phys_partition_ref);
 
                 if (IS_ERR(fe)) {
                         udf_err(sb, "Both metadata and mirror metadata inode efe can not found\n");
@@ -1015,7 +1017,7 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
         */
         if (mdata->s_bitmap_file_loc != 0xFFFFFFFF) {
                 addr.logicalBlockNum = mdata->s_bitmap_file_loc;
-                addr.partitionReferenceNum = map->s_partition_num;
+                addr.partitionReferenceNum = mdata->s_phys_partition_ref;
 
                 udf_debug("Bitmap file location: block = %d part = %d\n",
                           addr.logicalBlockNum, addr.partitionReferenceNum);
@@ -1283,7 +1285,7 @@ static int udf_load_partdesc(struct super_block *sb, sector_t block)
         p = (struct partitionDesc *)bh->b_data;
         partitionNumber = le16_to_cpu(p->partitionNumber);
 
-        /* First scan for TYPE1, SPARABLE and METADATA partitions */
+        /* First scan for TYPE1 and SPARABLE partitions */
         for (i = 0; i < sbi->s_partitions; i++) {
                 map = &sbi->s_partmaps[i];
                 udf_debug("Searching map: (%d == %d)\n",
@@ -1333,7 +1335,7 @@ static int udf_load_partdesc(struct super_block *sb, sector_t block)
                 goto out_bh;
 
         if (map->s_partition_type == UDF_METADATA_MAP25) {
-                ret = udf_load_metadata_files(sb, i);
+                ret = udf_load_metadata_files(sb, i, type1_idx);
                 if (ret < 0) {
                         udf_err(sb, "error loading MetaData partition map %d\n",
                                 i);
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index 27b5335730c9..c13875d669c0 100644
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -61,6 +61,11 @@ struct udf_meta_data {
         __u32   s_bitmap_file_loc;
         __u32   s_alloc_unit_size;
         __u16   s_align_unit_size;
+        /*
+         * Partition Reference Number of the associated physical / sparable
+         * partition
+         */
+        __u16   s_phys_partition_ref;
         int     s_flags;
         struct inode *s_metadata_fe;
         struct inode *s_mirror_fe;
diff --git a/include/acpi/video.h b/include/acpi/video.h
index 70a41f742037..5731ccb42585 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -51,7 +51,8 @@ extern void acpi_video_set_dmi_backlight_type(enum acpi_backlight_type type);
  */
 extern bool acpi_video_handles_brightness_key_presses(void);
 extern int acpi_video_get_levels(struct acpi_device *device,
-                                 struct acpi_video_device_brightness **dev_br);
+                                 struct acpi_video_device_brightness **dev_br,
+                                 int *pmax_level);
 #else
 static inline int acpi_video_register(void) { return 0; }
 static inline void acpi_video_unregister(void) { return; }
@@ -72,7 +73,8 @@ static inline bool acpi_video_handles_brightness_key_presses(void)
         return false;
 }
 static inline int acpi_video_get_levels(struct acpi_device *device,
-                        struct acpi_video_device_brightness **dev_br)
+                        struct acpi_video_device_brightness **dev_br,
+                        int *pmax_level)
 {
         return -ENODEV;
 }
diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h
index 6bd05700d8c9..05f05f17a7c2 100644
--- a/include/asm-generic/qspinlock.h
+++ b/include/asm-generic/qspinlock.h
@@ -22,37 +22,33 @@
 #include <asm-generic/qspinlock_types.h>
 
 /**
+ * queued_spin_unlock_wait - wait until the _current_ lock holder releases the lock
+ * @lock : Pointer to queued spinlock structure
+ *
+ * There is a very slight possibility of live-lock if the lockers keep coming
+ * and the waiter is just unfortunate enough to not see any unlock state.
+ */
+#ifndef queued_spin_unlock_wait
+extern void queued_spin_unlock_wait(struct qspinlock *lock);
+#endif
+
+/**
  * queued_spin_is_locked - is the spinlock locked?
  * @lock: Pointer to queued spinlock structure
  * Return: 1 if it is locked, 0 otherwise
  */
+#ifndef queued_spin_is_locked
 static __always_inline int queued_spin_is_locked(struct qspinlock *lock)
 {
         /*
-         * queued_spin_lock_slowpath() can ACQUIRE the lock before
-         * issuing the unordered store that sets _Q_LOCKED_VAL.
-         *
-         * See both smp_cond_acquire() sites for more detail.
-         *
-         * This however means that in code like:
-         *
-         *   spin_lock(A)               spin_lock(B)
-         *   spin_unlock_wait(B)        spin_is_locked(A)
-         *   do_something()             do_something()
-         *
-         * Both CPUs can end up running do_something() because the store
-         * setting _Q_LOCKED_VAL will pass through the loads in
-         * spin_unlock_wait() and/or spin_is_locked().
+         * See queued_spin_unlock_wait().
          *
-         * Avoid this by issuing a full memory barrier between the spin_lock()
-         * and the loads in spin_unlock_wait() and spin_is_locked().
-         *
-         * Note that regular mutual exclusion doesn't care about this
-         * delayed store.
+         * Any !0 state indicates it is locked, even if _Q_LOCKED_VAL
+         * isn't immediately observable.
          */
-        smp_mb();
-        return atomic_read(&lock->val) & _Q_LOCKED_MASK;
+        return atomic_read(&lock->val);
 }
+#endif
 
 /**
  * queued_spin_value_unlocked - is the spinlock structure unlocked?
@@ -122,21 +118,6 @@ static __always_inline void queued_spin_unlock(struct qspinlock *lock)
 }
 #endif
 
-/**
- * queued_spin_unlock_wait - wait until current lock holder releases the lock
- * @lock : Pointer to queued spinlock structure
- *
- * There is a very slight possibility of live-lock if the lockers keep coming
- * and the waiter is just unfortunate enough to not see any unlock state.
- */
-static inline void queued_spin_unlock_wait(struct qspinlock *lock)
-{
-        /* See queued_spin_is_locked() */
-        smp_mb();
-        while (atomic_read(&lock->val) & _Q_LOCKED_MASK)
-                cpu_relax();
-}
-
 #ifndef virt_spin_lock
 static __always_inline bool virt_spin_lock(struct qspinlock *lock)
 {
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 84f1a8eefbdb..cf918e3e6afb 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -52,10 +52,12 @@
 #include <linux/poll.h>
 #include <linux/ratelimit.h>
 #include <linux/sched.h>
+#include <linux/seqlock.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
+#include <linux/fence.h>
 
 #include <asm/mman.h>
 #include <asm/pgalloc.h>
@@ -66,6 +68,7 @@
 
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_global.h>
 #include <drm/drm_hashtab.h>
 #include <drm/drm_mem_util.h>
@@ -83,6 +86,7 @@ struct drm_local_map;
 struct drm_device_dma;
 struct drm_dma_handle;
 struct drm_gem_object;
+struct drm_master;
 
 struct device_node;
 struct videomode;
@@ -281,13 +285,14 @@ struct drm_ioctl_desc {
 
 /* Event queued up for userspace to read */
 struct drm_pending_event {
+        struct completion *completion;
         struct drm_event *event;
+        struct fence *fence;
         struct list_head link;
         struct list_head pending_link;
         struct drm_file *file_priv;
         pid_t pid; /* pid of requester, no guarantee it's valid by the time
                       we deliver the event, for tracing only */
-        void (*destroy)(struct drm_pending_event *event);
 };
 
 /* initial implementaton using a linked list - todo hashtab */
@@ -299,8 +304,6 @@ struct drm_prime_file_private {
 /** File private data */
 struct drm_file {
         unsigned authenticated :1;
-        /* Whether we're master for a minor. Protected by master_mutex */
-        unsigned is_master :1;
         /* true when the client has asked us to expose stereo 3D mode flags */
         unsigned stereo_allowed :1;
         /*
@@ -311,10 +314,10 @@ struct drm_file {
         /* true if client understands atomic properties */
         unsigned atomic:1;
         /*
-         * This client is allowed to gain master privileges for @master.
+         * This client is the creator of @master.
          * Protected by struct drm_device::master_mutex.
          */
-        unsigned allowed_master:1;
+        unsigned is_master:1;
 
         struct pid *pid;
         kuid_t uid;
@@ -332,7 +335,7 @@ struct drm_file {
         void *driver_priv;
 
         struct drm_master *master; /* master this node is currently associated with
-                                      N.B. not always minor->master */
+                                      N.B. not always dev->master */
         /**
          * fbs - List of framebuffers associated with this file.
          *
@@ -371,32 +374,6 @@ struct drm_lock_data {
         int idle_has_lock;
 };
 
-/**
- * struct drm_master - drm master structure
- *
- * @refcount: Refcount for this master object.
- * @minor: Link back to minor char device we are master for. Immutable.
- * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
- * @unique_len: Length of unique field. Protected by drm_global_mutex.
- * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
- * @lock: DRI lock information.
- * @driver_priv: Pointer to driver-private information.
- */
-struct drm_master {
-        struct kref refcount;
-        struct drm_minor *minor;
-        char *unique;
-        int unique_len;
-        struct idr magic_map;
-        struct drm_lock_data lock;
-        void *driver_priv;
-};
-
-/* Size of ringbuffer for vblank timestamps. Just double-buffer
- * in initial implementation.
- */
-#define DRM_VBLANKTIME_RBSIZE 2
-
 /* Flags and return codes for get_vblank_timestamp() driver function. */
 #define DRM_CALLED_FROM_VBLIRQ 1
 #define DRM_VBLANKTIME_SCANOUTPOS_METHOD (1 << 0)
@@ -420,8 +397,6 @@ struct drm_driver {
         void (*postclose) (struct drm_device *, struct drm_file *);
         void (*lastclose) (struct drm_device *);
         int (*unload) (struct drm_device *);
-        int (*suspend) (struct drm_device *, pm_message_t state);
-        int (*resume) (struct drm_device *);
         int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
         int (*dma_quiescent) (struct drm_device *);
         int (*context_dtor) (struct drm_device *dev, int context);
@@ -434,7 +409,7 @@ struct drm_driver {
          *
          * Driver callback for fetching a raw hardware vblank counter for @crtc.
          * If a device doesn't have a hardware counter, the driver can simply
-         * return the value of drm_vblank_count. The DRM core will account for
+         * use drm_vblank_no_hw_counter() function. The DRM core will account for
          * missed vblank events while interrupts where disabled based on system
          * timestamps.
          *
@@ -452,8 +427,8 @@ struct drm_driver {
          * @pipe: which irq to enable
          *
          * Enable vblank interrupts for @crtc.  If the device doesn't have
-         * a hardware vblank counter, this routine should be a no-op, since
-         * interrupts will have to stay on to keep the count accurate.
+         * a hardware vblank counter, the driver should use the
+         * drm_vblank_no_hw_counter() function that keeps a virtual counter.
          *
          * RETURNS
          * Zero on success, appropriate errno if the given @crtc's vblank
@@ -467,8 +442,8 @@ struct drm_driver {
          * @pipe: which irq to enable
          *
          * Disable vblank interrupts for @crtc.  If the device doesn't have
-         * a hardware vblank counter, this routine should be a no-op, since
-         * interrupts will have to stay on to keep the count accurate.
+         * a hardware vblank counter, the driver should use the
+         * drm_vblank_no_hw_counter() function that keeps a virtual counter.
          */
         void (*disable_vblank) (struct drm_device *dev, unsigned int pipe);
 
@@ -573,8 +548,7 @@ struct drm_driver {
 
         int (*master_set)(struct drm_device *dev, struct drm_file *file_priv,
                           bool from_open);
-        void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv,
-                            bool from_release);
+        void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv);
 
         int (*debugfs_init)(struct drm_minor *minor);
         void (*debugfs_cleanup)(struct drm_minor *minor);
@@ -708,9 +682,6 @@ struct drm_minor {
 
         struct list_head debugfs_list;
         struct mutex debugfs_lock; /* Protects debugfs_list. */
-
-        /* currently active master for this node. Protected by master_mutex */
-        struct drm_master *master;
 };
 
 
@@ -725,10 +696,10 @@ struct drm_vblank_crtc {
         wait_queue_head_t queue;        /**< VBLANK wait queue */
         struct timer_list disable_timer;                /* delayed disable timer */
 
-        /* vblank counter, protected by dev->vblank_time_lock for writes */
-        u32 count;
-        /* vblank timestamps, protected by dev->vblank_time_lock for writes */
-        struct timeval time[DRM_VBLANKTIME_RBSIZE];
+        seqlock_t seqlock;              /* protects vblank count and time */
+
+        u32 count;                      /* vblank counter */
+        struct timeval time;            /* vblank timestamp */
 
         atomic_t refcount;              /* number of users of vblank interruptsper crtc */
         u32 last;                       /* protected by dev->vbl_lock, used */
@@ -759,6 +730,10 @@ struct drm_device {
         struct drm_minor *control;              /**< Control node */
         struct drm_minor *primary;              /**< Primary node */
         struct drm_minor *render;               /**< Render node */
+
+        /* currently active master for this device. Protected by master_mutex */
+        struct drm_master *master;
+
         atomic_t unplugged;                     /**< Flag whether dev is dead */
         struct inode *anon_inode;               /**< inode for private address-space */
         char *unique;                           /**< unique name of the device */
@@ -928,7 +903,6 @@ int drm_open(struct inode *inode, struct file *filp);
 ssize_t drm_read(struct file *filp, char __user *buffer,
                  size_t count, loff_t *offset);
 int drm_release(struct inode *inode, struct file *filp);
-int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv);
 unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 int drm_event_reserve_init_locked(struct drm_device *dev,
                                   struct drm_file *file_priv,
@@ -972,18 +946,12 @@ extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
                                      struct timeval *vblanktime);
 extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
                                           struct timeval *vblanktime);
-extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
-                                  struct drm_pending_vblank_event *e);
 extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
                                        struct drm_pending_vblank_event *e);
-extern void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe,
-                                 struct drm_pending_vblank_event *e);
 extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
                                       struct drm_pending_vblank_event *e);
 extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
 extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
-extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe);
-extern void drm_vblank_put(struct drm_device *dev, unsigned int pipe);
 extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
 extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
@@ -994,6 +962,7 @@ extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_reset(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
+extern u32 drm_accurate_vblank_count(struct drm_crtc *crtc);
 extern u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe);
 
 extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
@@ -1020,14 +989,10 @@ static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc
 extern void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe);
 extern void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe);
 
-                                /* Stub support (drm_stub.h) */
-extern struct drm_master *drm_master_get(struct drm_master *master);
-extern void drm_master_put(struct drm_master **master);
-
-extern void drm_put_dev(struct drm_device *dev);
-extern void drm_unplug_dev(struct drm_device *dev);
+/* drm_drv.c */
+void drm_put_dev(struct drm_device *dev);
+void drm_unplug_dev(struct drm_device *dev);
 extern unsigned int drm_debug;
-extern bool drm_atomic;
 
                                 /* Debugfs support */
 #if defined(CONFIG_DEBUG_FS)
@@ -1078,11 +1043,13 @@ extern void drm_sysfs_hotplug_event(struct drm_device *dev);
 
 struct drm_device *drm_dev_alloc(struct drm_driver *driver,
                                  struct device *parent);
+int drm_dev_init(struct drm_device *dev,
+                 struct drm_driver *driver,
+                 struct device *parent);
 void drm_dev_ref(struct drm_device *dev);
 void drm_dev_unref(struct drm_device *dev);
 int drm_dev_register(struct drm_device *dev, unsigned long flags);
 void drm_dev_unregister(struct drm_device *dev);
-int drm_dev_set_unique(struct drm_device *dev, const char *name);
 
 struct drm_minor *drm_minor_acquire(unsigned int minor_id);
 void drm_minor_release(struct drm_minor *minor);
@@ -1135,7 +1102,6 @@ extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
 
 /* platform section */
 extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);
-extern int drm_platform_set_busid(struct drm_device *d, struct drm_master *m);
 
 /* returns true if currently okay to sleep */
 static __inline__ bool drm_can_sleep(void)
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 92c84e9ab09a..856a9c85a838 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -30,6 +30,12 @@
 
 #include <drm/drm_crtc.h>
 
+void drm_crtc_commit_put(struct drm_crtc_commit *commit);
+static inline void drm_crtc_commit_get(struct drm_crtc_commit *commit)
+{
+        kref_get(&commit->ref);
+}
+
 struct drm_atomic_state * __must_check
 drm_atomic_state_alloc(struct drm_device *dev);
 void drm_atomic_state_clear(struct drm_atomic_state *state);
@@ -71,7 +77,7 @@ static inline struct drm_crtc_state *
 drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
                                    struct drm_crtc *crtc)
 {
-        return state->crtc_states[drm_crtc_index(crtc)];
+        return state->crtcs[drm_crtc_index(crtc)].state;
 }
 
 /**
@@ -86,7 +92,7 @@ static inline struct drm_plane_state *
 drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
                                     struct drm_plane *plane)
 {
-        return state->plane_states[drm_plane_index(plane)];
+        return state->planes[drm_plane_index(plane)].state;
 }
 
 /**
@@ -106,7 +112,43 @@ drm_atomic_get_existing_connector_state(struct drm_atomic_state *state,
         if (index >= state->num_connector)
                 return NULL;
 
-        return state->connector_states[index];
+        return state->connectors[index].state;
+}
+
+/**
+ * __drm_atomic_get_current_plane_state - get current plane state
+ * @state: global atomic state object
+ * @plane: plane to grab
+ *
+ * This function returns the plane state for the given plane, either from
+ * @state, or if the plane isn't part of the atomic state update, from @plane.
+ * This is useful in atomic check callbacks, when drivers need to peek at, but
+ * not change, state of other planes, since it avoids threading an error code
+ * back up the call chain.
+ *
+ * WARNING:
+ *
+ * Note that this function is in general unsafe since it doesn't check for the
+ * required locking for access state structures. Drivers must ensure that it is
+ * safe to access the returned state structure through other means. One common
+ * example is when planes are fixed to a single CRTC, and the driver knows that
+ * the CRTC lock is held already. In that case holding the CRTC lock gives a
+ * read-lock on all planes connected to that CRTC. But if planes can be
+ * reassigned things get more tricky. In that case it's better to use
+ * drm_atomic_get_plane_state and wire up full error handling.
+ *
+ * Returns:
+ *
+ * Read-only pointer to the current plane state.
+ */
+static inline const struct drm_plane_state *
+__drm_atomic_get_current_plane_state(struct drm_atomic_state *state,
+                                     struct drm_plane *plane)
+{
+        if (state->planes[drm_plane_index(plane)].state)
+                return state->planes[drm_plane_index(plane)].state;
+
+        return plane->state;
 }
 
 int __must_check
@@ -139,29 +181,39 @@ int __must_check drm_atomic_check_only(struct drm_atomic_state *state);
 int __must_check drm_atomic_commit(struct drm_atomic_state *state);
 int __must_check drm_atomic_nonblocking_commit(struct drm_atomic_state *state);
 
-#define for_each_connector_in_state(state, connector, connector_state, __i) \
+#define for_each_connector_in_state(__state, connector, connector_state, __i) \
         for ((__i) = 0;                                                 \
-             (__i) < (state)->num_connector &&                          \
-             ((connector) = (state)->connectors[__i],                   \
-             (connector_state) = (state)->connector_states[__i], 1);    \
+             (__i) < (__state)->num_connector &&                                \
+             ((connector) = (__state)->connectors[__i].ptr,                     \
+             (connector_state) = (__state)->connectors[__i].state, 1);  \
              (__i)++)                                                   \
                 for_each_if (connector)
 
-#define for_each_crtc_in_state(state, crtc, crtc_state, __i)    \
+#define for_each_crtc_in_state(__state, crtc, crtc_state, __i)  \
         for ((__i) = 0;                                         \
-             (__i) < (state)->dev->mode_config.num_crtc &&      \
-             ((crtc) = (state)->crtcs[__i],                     \
-             (crtc_state) = (state)->crtc_states[__i], 1);      \
+             (__i) < (__state)->dev->mode_config.num_crtc &&    \
+             ((crtc) = (__state)->crtcs[__i].ptr,                       \
+             (crtc_state) = (__state)->crtcs[__i].state, 1);    \
              (__i)++)                                           \
                 for_each_if (crtc_state)
 
-#define for_each_plane_in_state(state, plane, plane_state, __i)         \
+#define for_each_plane_in_state(__state, plane, plane_state, __i)               \
         for ((__i) = 0;                                                 \
-             (__i) < (state)->dev->mode_config.num_total_plane &&       \
-             ((plane) = (state)->planes[__i],                           \
-             (plane_state) = (state)->plane_states[__i], 1);            \
+             (__i) < (__state)->dev->mode_config.num_total_plane &&     \
+             ((plane) = (__state)->planes[__i].ptr,                             \
+             (plane_state) = (__state)->planes[__i].state, 1);          \
              (__i)++)                                                   \
                 for_each_if (plane_state)
+
+/**
+ * drm_atomic_crtc_needs_modeset - compute combined modeset need
+ * @state: &drm_crtc_state for the CRTC
+ *
+ * To give drivers flexibility struct &drm_crtc_state has 3 booleans to track
+ * whether the state CRTC changed enough to need a full modeset cycle:
+ * connectors_changed, mode_changed and active_change. This helper simply
+ * combines these three to compute the overall need for a modeset for @state.
+ */
 static inline bool
 drm_atomic_crtc_needs_modeset(struct drm_crtc_state *state)
 {
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index d473dcc91f54..d86ae5dcd7b4 100644
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -38,6 +38,7 @@ int drm_atomic_helper_check_planes(struct drm_device *dev,
                                struct drm_atomic_state *state);
 int drm_atomic_helper_check(struct drm_device *dev,
                             struct drm_atomic_state *state);
+void drm_atomic_helper_commit_tail(struct drm_atomic_state *state);
 int drm_atomic_helper_commit(struct drm_device *dev,
                              struct drm_atomic_state *state,
                              bool nonblock);
@@ -71,8 +72,15 @@ void drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_sta
 void drm_atomic_helper_disable_planes_on_crtc(struct drm_crtc *crtc,
                                               bool atomic);
 
-void drm_atomic_helper_swap_state(struct drm_device *dev,
-                                  struct drm_atomic_state *state);
+void drm_atomic_helper_swap_state(struct drm_atomic_state *state,
+                                  bool stall);
+
+/* nonblocking commit helpers */
+int drm_atomic_helper_setup_commit(struct drm_atomic_state *state,
+                                   bool nonblock);
+void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *state);
+void drm_atomic_helper_commit_hw_done(struct drm_atomic_state *state);
+void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *state);
 
 /* implementations for legacy interfaces */
 int drm_atomic_helper_update_plane(struct drm_plane *plane,
@@ -147,9 +155,9 @@ void
 __drm_atomic_helper_connector_destroy_state(struct drm_connector_state *state);
 void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
                                           struct drm_connector_state *state);
-void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
-                                        u16 *red, u16 *green, u16 *blue,
-                                        uint32_t start, uint32_t size);
+int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
+                                       u16 *red, u16 *green, u16 *blue,
+                                       uint32_t size);
 
 /**
  * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC
@@ -159,7 +167,7 @@ void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
  * This iterates over the current state, useful (for example) when applying
  * atomic state after it has been checked and swapped.  To iterate over the
  * planes which *will* be attached (for ->atomic_check()) see
- * drm_crtc_for_each_pending_plane()
+ * drm_atomic_crtc_state_for_each_plane().
  */
 #define drm_atomic_crtc_for_each_plane(plane, crtc) \
         drm_for_each_plane_mask(plane, (crtc)->dev, (crtc)->state->plane_mask)
@@ -171,11 +179,31 @@ void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
  *
  * Similar to drm_crtc_for_each_plane(), but iterates the planes that will be
  * attached if the specified state is applied.  Useful during (for example)
- * ->atomic_check() operations, to validate the incoming state
+ * ->atomic_check() operations, to validate the incoming state.
  */
 #define drm_atomic_crtc_state_for_each_plane(plane, crtc_state) \
         drm_for_each_plane_mask(plane, (crtc_state)->state->dev, (crtc_state)->plane_mask)
 
+/**
+ * drm_crtc_atomic_state_for_each_plane_state - iterate over attached planes in new state
+ * @plane: the loop cursor
+ * @plane_state: loop cursor for the plane's state, must be const
+ * @crtc_state: the incoming crtc-state
+ *
+ * Similar to drm_crtc_for_each_plane(), but iterates the planes that will be
+ * attached if the specified state is applied.  Useful during (for example)
+ * ->atomic_check() operations, to validate the incoming state.
+ *
+ * Compared to just drm_atomic_crtc_state_for_each_plane() this also fills in a
+ * const plane_state. This is useful when a driver just wants to peek at other
+ * active planes on this crtc, but does not need to change it.
+ */
+#define drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) \
+        drm_for_each_plane_mask(plane, (crtc_state)->state->dev, (crtc_state)->plane_mask) \
+                for_each_if ((plane_state = \
+                              __drm_atomic_get_current_plane_state((crtc_state)->state, \
+                                                                   plane)))
+
 /*
  * drm_atomic_plane_disabling - check whether a plane is being disabled
  * @plane: plane object
diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h
new file mode 100644
index 000000000000..610223b0481b
--- /dev/null
+++ b/include/drm/drm_auth.h
@@ -0,0 +1,59 @@
+/*
+ * Internal Header for the Direct Rendering Manager
+ *
+ * Copyright 2016 Intel Corporation
+ *
+ * Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+ *
+ * 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
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
+ */
+
+#ifndef _DRM_AUTH_H_
+#define _DRM_AUTH_H_
+
+/**
+ * struct drm_master - drm master structure
+ *
+ * @refcount: Refcount for this master object.
+ * @dev: Link back to the DRM device
+ * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
+ * @unique_len: Length of unique field. Protected by drm_global_mutex.
+ * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
+ * @lock: DRI lock information.
+ * @driver_priv: Pointer to driver-private information.
+ *
+ * Note that master structures are only relevant for the legacy/primary device
+ * nodes, hence there can only be one per device, not one per drm_minor.
+ */
+struct drm_master {
+        struct kref refcount;
+        struct drm_device *dev;
+        char *unique;
+        int unique_len;
+        struct idr magic_map;
+        struct drm_lock_data lock;
+        void *driver_priv;
+};
+
+struct drm_master *drm_master_get(struct drm_master *master);
+void drm_master_put(struct drm_master **master);
+bool drm_is_current_master(struct drm_file *fpriv);
+
+#endif
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index d1559cd04e3d..f5469d3a46dd 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -44,6 +44,7 @@ struct drm_file;
 struct drm_clip_rect;
 struct device_node;
 struct fence;
+struct edid;
 
 struct drm_mode_object {
         uint32_t id;
@@ -253,6 +254,8 @@ struct drm_framebuffer {
         int bits_per_pixel;
         int flags;
         uint32_t pixel_format; /* fourcc format */
+        int hot_x;
+        int hot_y;
         struct list_head filp_head;
 };
 
@@ -314,6 +317,7 @@ struct drm_plane_helper_funcs;
  *      update to ensure framebuffer cleanup isn't done too early
  * @adjusted_mode: for use by helpers and drivers to compute adjusted mode timings
  * @mode: current mode timings
+ * @mode_blob: &drm_property_blob for @mode
  * @degamma_lut: Lookup table for converting framebuffer pixel data
  *      before apply the conversion matrix
  * @ctm: Transformation matrix
@@ -478,8 +482,8 @@ struct drm_crtc_funcs {
          * going on, which should eventually be unified to just one set of
          * hooks.
          */
-        void (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
-                          uint32_t start, uint32_t size);
+        int (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
+                         uint32_t size);
 
         /**
          * @destroy:
@@ -701,6 +705,32 @@ struct drm_crtc_funcs {
                                    const struct drm_crtc_state *state,
                                    struct drm_property *property,
                                    uint64_t *val);
+
+        /**
+         * @late_register:
+         *
+         * This optional hook can be used to register additional userspace
+         * interfaces attached to the crtc like debugfs interfaces.
+         * It is called late in the driver load sequence from drm_dev_register().
+         * Everything added from this callback should be unregistered in
+         * the early_unregister callback.
+         *
+         * Returns:
+         *
+         * 0 on success, or a negative error code on failure.
+         */
+        int (*late_register)(struct drm_crtc *crtc);
+
+        /**
+         * @early_unregister:
+         *
+         * This optional hook should be used to unregister the additional
+         * userspace interfaces attached to the crtc from
+         * late_unregister(). It is called from drm_dev_unregister(),
+         * early in the driver unload sequence to disable userspace access
+         * before data structures are torndown.
+         */
+        void (*early_unregister)(struct drm_crtc *crtc);
 };
 
 /**
@@ -708,6 +738,7 @@ struct drm_crtc_funcs {
  * @dev: parent DRM device
  * @port: OF node used by drm_of_find_possible_crtcs()
  * @head: list management
+ * @name: human readable name, can be overwritten by the driver
  * @mutex: per-CRTC locking
  * @base: base KMS object for ID tracking etc.
  * @primary: primary plane for this CRTC
@@ -724,9 +755,6 @@ struct drm_crtc_funcs {
  * @gamma_store: gamma ramp values
  * @helper_private: mid-layer private data
  * @properties: property tracking for this CRTC
- * @state: current atomic state for this CRTC
- * @acquire_ctx: per-CRTC implicit acquire context used by atomic drivers for
- *      legacy IOCTLs
  *
  * Each CRTC may have one or more connectors associated with it.  This structure
  * allows the CRTC to be controlled.
@@ -738,12 +766,13 @@ struct drm_crtc {
 
         char *name;
 
-        /*
-         * crtc mutex
+        /**
+         * @mutex:
          *
          * This provides a read lock for the overall crtc state (mode, dpms
          * state, ...) and a write lock for everything which can be update
-         * without a full modeset (fb, cursor data, ...)
+         * without a full modeset (fb, cursor data, crtc properties ...). Full
+         * modeset also need to grab dev->mode_config.connection_mutex.
          */
         struct drm_modeset_lock mutex;
 
@@ -753,6 +782,9 @@ struct drm_crtc {
         struct drm_plane *primary;
         struct drm_plane *cursor;
 
+        /* position inside the mode_config.list, can be used as a [] idx */
+        unsigned index;
+
         /* position of cursor plane on crtc */
         int cursor_x;
         int cursor_y;
@@ -779,11 +811,37 @@ struct drm_crtc {
 
         struct drm_object_properties properties;
 
+        /**
+         * @state:
+         *
+         * Current atomic state for this CRTC.
+         */
         struct drm_crtc_state *state;
 
-        /*
-         * For legacy crtc IOCTLs so that atomic drivers can get at the locking
-         * acquire context.
+        /**
+         * @commit_list:
+         *
+         * List of &drm_crtc_commit structures tracking pending commits.
+         * Protected by @commit_lock. This list doesn't hold its own full
+         * reference, but burrows it from the ongoing commit. Commit entries
+         * must be removed from this list once the commit is fully completed,
+         * but before it's correspoding &drm_atomic_state gets destroyed.
+         */
+        struct list_head commit_list;
+
+        /**
+         * @commit_lock:
+         *
+         * Spinlock to protect @commit_list.
+         */
+        spinlock_t commit_lock;
+
+        /**
+         * @acquire_ctx:
+         *
+         * Per-CRTC implicit acquire context used by atomic drivers for legacy
+         * IOCTLs, so that atomic drivers can get at the locking acquire
+         * context.
          */
         struct drm_modeset_acquire_ctx *acquire_ctx;
 };
@@ -926,6 +984,33 @@ struct drm_connector_funcs {
                              uint64_t val);
 
         /**
+         * @late_register:
+         *
+         * This optional hook can be used to register additional userspace
+         * interfaces attached to the connector, light backlight control, i2c,
+         * DP aux or similar interfaces. It is called late in the driver load
+         * sequence from drm_connector_register() when registering all the
+         * core drm connector interfaces. Everything added from this callback
+         * should be unregistered in the early_unregister callback.
+         *
+         * Returns:
+         *
+         * 0 on success, or a negative error code on failure.
+         */
+        int (*late_register)(struct drm_connector *connector);
+
+        /**
+         * @early_unregister:
+         *
+         * This optional hook should be used to unregister the additional
+         * userspace interfaces attached to the connector from
+         * late_unregister(). It is called from drm_connector_unregister(),
+         * early in the driver unload sequence to disable userspace access
+         * before data structures are torndown.
+         */
+        void (*early_unregister)(struct drm_connector *connector);
+
+        /**
          * @destroy:
          *
          * Clean up connector resources. This is called at driver unload time
@@ -1069,6 +1154,32 @@ struct drm_encoder_funcs {
          * hotplugged in DRM.
          */
         void (*destroy)(struct drm_encoder *encoder);
+
+        /**
+         * @late_register:
+         *
+         * This optional hook can be used to register additional userspace
+         * interfaces attached to the encoder like debugfs interfaces.
+         * It is called late in the driver load sequence from drm_dev_register().
+         * Everything added from this callback should be unregistered in
+         * the early_unregister callback.
+         *
+         * Returns:
+         *
+         * 0 on success, or a negative error code on failure.
+         */
+        int (*late_register)(struct drm_encoder *encoder);
+
+        /**
+         * @early_unregister:
+         *
+         * This optional hook should be used to unregister the additional
+         * userspace interfaces attached to the encoder from
+         * late_unregister(). It is called from drm_dev_unregister(),
+         * early in the driver unload sequence to disable userspace access
+         * before data structures are torndown.
+         */
+        void (*early_unregister)(struct drm_encoder *encoder);
 };
 
 #define DRM_CONNECTOR_MAX_ENCODER 3
@@ -1078,7 +1189,7 @@ struct drm_encoder_funcs {
  * @dev: parent DRM device
  * @head: list management
  * @base: base KMS object
- * @name: encoder name
+ * @name: human readable name, can be overwritten by the driver
  * @encoder_type: one of the %DRM_MODE_ENCODER_<foo> types in drm_mode.h
  * @possible_crtcs: bitmask of potential CRTC bindings
  * @possible_clones: bitmask of potential sibling encoders for cloning
@@ -1097,6 +1208,10 @@ struct drm_encoder {
         struct drm_mode_object base;
         char *name;
         int encoder_type;
+
+        /* position inside the mode_config.list, can be used as a [] idx */
+        unsigned index;
+
         uint32_t possible_crtcs;
         uint32_t possible_clones;
 
@@ -1124,12 +1239,14 @@ struct drm_encoder {
  * @attr: sysfs attributes
  * @head: list management
  * @base: base KMS object
- * @name: connector name
+ * @name: human readable name, can be overwritten by the driver
+ * @connector_id: compacted connector id useful indexing arrays
  * @connector_type: one of the %DRM_MODE_CONNECTOR_<foo> types from drm_mode.h
  * @connector_type_id: index into connector type enum
  * @interlace_allowed: can this connector handle interlaced modes?
  * @doublescan_allowed: can this connector handle doublescan?
  * @stereo_allowed: can this connector handle stereo modes?
+ * @registered: is this connector exposed (registered) with userspace?
  * @modes: modes available on this connector (from fill_modes() + user)
  * @status: one of the drm_connector_status enums (connected, not, or unknown)
  * @probed_modes: list of modes derived directly from the display
@@ -1137,7 +1254,6 @@ struct drm_encoder {
  * @funcs: connector control functions
  * @edid_blob_ptr: DRM property containing EDID if present
  * @properties: property tracking for this connector
- * @path_blob_ptr: DRM blob property data for the DP MST path property
  * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling
  * @dpms: current dpms state
  * @helper_private: mid-layer private data
@@ -1187,6 +1303,7 @@ struct drm_connector {
         bool interlace_allowed;
         bool doublescan_allowed;
         bool stereo_allowed;
+        bool registered;
         struct list_head modes; /* list of modes on this connector */
 
         enum drm_connector_status status;
@@ -1200,8 +1317,23 @@ struct drm_connector {
         struct drm_property_blob *edid_blob_ptr;
         struct drm_object_properties properties;
 
+        /**
+         * @path_blob_ptr:
+         *
+         * DRM blob property data for the DP MST path property.
+         */
         struct drm_property_blob *path_blob_ptr;
 
+        /**
+         * @tile_blob_ptr:
+         *
+         * DRM blob property data for the tile property (used mostly by DP MST).
+         * This is meant for screens which are driven through separate display
+         * pipelines represented by &drm_crtc, which might not be running with
+         * genlocked clocks. For tiled panels which are genlocked, like
+         * dual-link LVDS or dual-link DSI, the driver should try to not expose
+         * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
+         */
         struct drm_property_blob *tile_blob_ptr;
 
         uint8_t polled; /* DRM_CONNECTOR_POLL_* */
@@ -1263,6 +1395,7 @@ struct drm_connector {
  *      plane (in 16.16)
  * @src_w: width of visible portion of plane (in 16.16)
  * @src_h: height of visible portion of plane (in 16.16)
+ * @rotation: rotation of the plane
  * @state: backpointer to global drm_atomic_state
  */
 struct drm_plane_state {
@@ -1490,6 +1623,31 @@ struct drm_plane_funcs {
                                    const struct drm_plane_state *state,
                                    struct drm_property *property,
                                    uint64_t *val);
+        /**
+         * @late_register:
+         *
+         * This optional hook can be used to register additional userspace
+         * interfaces attached to the plane like debugfs interfaces.
+         * It is called late in the driver load sequence from drm_dev_register().
+         * Everything added from this callback should be unregistered in
+         * the early_unregister callback.
+         *
+         * Returns:
+         *
+         * 0 on success, or a negative error code on failure.
+         */
+        int (*late_register)(struct drm_plane *plane);
+
+        /**
+         * @early_unregister:
+         *
+         * This optional hook should be used to unregister the additional
+         * userspace interfaces attached to the plane from
+         * late_unregister(). It is called from drm_dev_unregister(),
+         * early in the driver unload sequence to disable userspace access
+         * before data structures are torndown.
+         */
+        void (*early_unregister)(struct drm_plane *plane);
 };
 
 enum drm_plane_type {
@@ -1503,6 +1661,7 @@ enum drm_plane_type {
  * struct drm_plane - central DRM plane control structure
  * @dev: DRM device this plane belongs to
  * @head: for list management
+ * @name: human readable name, can be overwritten by the driver
  * @base: base mode object
  * @possible_crtcs: pipes this plane can be bound to
  * @format_types: array of formats supported by this plane
@@ -1516,6 +1675,7 @@ enum drm_plane_type {
  * @properties: property tracking for this plane
  * @type: type of plane (overlay, primary, cursor)
  * @state: current atomic state for this plane
+ * @helper_private: mid-layer private data
  */
 struct drm_plane {
         struct drm_device *dev;
@@ -1523,6 +1683,13 @@ struct drm_plane {
 
         char *name;
 
+        /**
+         * @mutex:
+         *
+         * Protects modeset plane state, together with the mutex of &drm_crtc
+         * this plane is linked to (when active, getting actived or getting
+         * disabled).
+         */
         struct drm_modeset_lock mutex;
 
         struct drm_mode_object base;
@@ -1543,6 +1710,9 @@ struct drm_plane {
 
         enum drm_plane_type type;
 
+        /* position inside the mode_config.list, can be used as a [] idx */
+        unsigned index;
+
         const struct drm_plane_helper_funcs *helper_private;
 
         struct drm_plane_state *state;
@@ -1694,18 +1864,136 @@ struct drm_bridge {
 };
 
 /**
+ * struct drm_crtc_commit - track modeset commits on a CRTC
+ *
+ * This structure is used to track pending modeset changes and atomic commit on
+ * a per-CRTC basis. Since updating the list should never block this structure
+ * is reference counted to allow waiters to safely wait on an event to complete,
+ * without holding any locks.
+ *
+ * It has 3 different events in total to allow a fine-grained synchronization
+ * between outstanding updates::
+ *
+ *      atomic commit thread                    hardware
+ *
+ *      write new state into hardware   ---->   ...
+ *      signal hw_done
+ *                                              switch to new state on next
+ *      ...                                     v/hblank
+ *
+ *      wait for buffers to show up             ...
+ *
+ *      ...                                     send completion irq
+ *                                              irq handler signals flip_done
+ *      cleanup old buffers
+ *
+ *      signal cleanup_done
+ *
+ *      wait for flip_done              <----
+ *      clean up atomic state
+ *
+ * The important bit to know is that cleanup_done is the terminal event, but the
+ * ordering between flip_done and hw_done is entirely up to the specific driver
+ * and modeset state change.
+ *
+ * For an implementation of how to use this look at
+ * drm_atomic_helper_setup_commit() from the atomic helper library.
+ */
+struct drm_crtc_commit {
+        /**
+         * @crtc:
+         *
+         * DRM CRTC for this commit.
+         */
+        struct drm_crtc *crtc;
+
+        /**
+         * @ref:
+         *
+         * Reference count for this structure. Needed to allow blocking on
+         * completions without the risk of the completion disappearing
+         * meanwhile.
+         */
+        struct kref ref;
+
+        /**
+         * @flip_done:
+         *
+         * Will be signaled when the hardware has flipped to the new set of
+         * buffers. Signals at the same time as when the drm event for this
+         * commit is sent to userspace, or when an out-fence is singalled. Note
+         * that for most hardware, in most cases this happens after @hw_done is
+         * signalled.
+         */
+        struct completion flip_done;
+
+        /**
+         * @hw_done:
+         *
+         * Will be signalled when all hw register changes for this commit have
+         * been written out. Especially when disabling a pipe this can be much
+         * later than than @flip_done, since that can signal already when the
+         * screen goes black, whereas to fully shut down a pipe more register
+         * I/O is required.
+         *
+         * Note that this does not need to include separately reference-counted
+         * resources like backing storage buffer pinning, or runtime pm
+         * management.
+         */
+        struct completion hw_done;
+
+        /**
+         * @cleanup_done:
+         *
+         * Will be signalled after old buffers have been cleaned up by calling
+         * drm_atomic_helper_cleanup_planes(). Since this can only happen after
+         * a vblank wait completed it might be a bit later. This completion is
+         * useful to throttle updates and avoid hardware updates getting ahead
+         * of the buffer cleanup too much.
+         */
+        struct completion cleanup_done;
+
+        /**
+         * @commit_entry:
+         *
+         * Entry on the per-CRTC commit_list. Protected by crtc->commit_lock.
+         */
+        struct list_head commit_entry;
+
+        /**
+         * @event:
+         *
+         * &drm_pending_vblank_event pointer to clean up private events.
+         */
+        struct drm_pending_vblank_event *event;
+};
+
+struct __drm_planes_state {
+        struct drm_plane *ptr;
+        struct drm_plane_state *state;
+};
+
+struct __drm_crtcs_state {
+        struct drm_crtc *ptr;
+        struct drm_crtc_state *state;
+        struct drm_crtc_commit *commit;
+};
+
+struct __drm_connnectors_state {
+        struct drm_connector *ptr;
+        struct drm_connector_state *state;
+};
+
+/**
  * struct drm_atomic_state - the global state object for atomic updates
  * @dev: parent DRM device
  * @allow_modeset: allow full modeset
  * @legacy_cursor_update: hint to enforce legacy cursor IOCTL semantics
  * @legacy_set_config: Disable conflicting encoders instead of failing with -EINVAL.
- * @planes: pointer to array of plane pointers
- * @plane_states: pointer to array of plane states pointers
+ * @planes: pointer to array of structures with per-plane data
  * @crtcs: pointer to array of CRTC pointers
- * @crtc_states: pointer to array of CRTC states pointers
  * @num_connector: size of the @connectors and @connector_states arrays
- * @connectors: pointer to array of connector pointers
- * @connector_states: pointer to array of connector states pointers
+ * @connectors: pointer to array of structures with per-connector data
  * @acquire_ctx: acquire context for this atomic modeset state update
  */
 struct drm_atomic_state {
@@ -1713,15 +2001,20 @@ struct drm_atomic_state {
         bool allow_modeset : 1;
         bool legacy_cursor_update : 1;
         bool legacy_set_config : 1;
-        struct drm_plane **planes;
-        struct drm_plane_state **plane_states;
-        struct drm_crtc **crtcs;
-        struct drm_crtc_state **crtc_states;
+        struct __drm_planes_state *planes;
+        struct __drm_crtcs_state *crtcs;
         int num_connector;
-        struct drm_connector **connectors;
-        struct drm_connector_state **connector_states;
+        struct __drm_connnectors_state *connectors;
 
         struct drm_modeset_acquire_ctx *acquire_ctx;
+
+        /**
+         * @commit_work:
+         *
+         * Work item which can be used by the driver or helpers to execute the
+         * commit without blocking.
+         */
+        struct work_struct commit_work;
 };
 
 
@@ -2022,8 +2315,6 @@ struct drm_mode_config_funcs {
  * @connection_mutex: ww mutex protecting connector state and routing
  * @acquire_ctx: global implicit acquire context used by atomic drivers for
  *      legacy IOCTLs
- * @idr_mutex: mutex for KMS ID allocation and management
- * @crtc_idr: main KMS ID tracking object
  * @fb_lock: mutex to protect fb state and lists
  * @num_fb: number of fbs available
  * @fb_list: list of framebuffers available
@@ -2045,6 +2336,7 @@ struct drm_mode_config_funcs {
  * @fb_base: base address of the framebuffer
  * @poll_enabled: track polling support for this device
  * @poll_running: track polling status for this device
+ * @delayed_event: track delayed poll uevent deliver for this device
  * @output_poll_work: delayed work for polling in process context
  * @property_blob_list: list of all the blob property objects
  * @blob_lock: mutex for blob property allocation and management
@@ -2063,6 +2355,7 @@ struct drm_mode_config_funcs {
  * @async_page_flip: does this device support async flips on the primary plane?
  * @cursor_width: hint to userspace for max cursor width
  * @cursor_height: hint to userspace for max cursor height
+ * @helper_private: mid-layer private data
  *
  * Core mode resource tracking structure.  All CRTC, encoders, and connectors
  * enumerated by the driver are added here, as are global properties.  Some
@@ -2072,10 +2365,30 @@ struct drm_mode_config {
         struct mutex mutex; /* protects configuration (mode lists etc.) */
         struct drm_modeset_lock connection_mutex; /* protects connector->encoder and encoder->crtc links */
         struct drm_modeset_acquire_ctx *acquire_ctx; /* for legacy _lock_all() / _unlock_all() */
-        struct mutex idr_mutex; /* for IDR management */
-        struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */
-        struct idr tile_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */
-        /* this is limited to one for now */
+
+        /**
+         * @idr_mutex:
+         *
+         * Mutex for KMS ID allocation and management. Protects both @crtc_idr
+         * and @tile_idr.
+         */
+        struct mutex idr_mutex;
+
+        /**
+         * @crtc_idr:
+         *
+         * Main KMS ID tracking object. Use this idr for all IDs, fb, crtc,
+         * connector, modes - just makes life easier to have only one.
+         */
+        struct idr crtc_idr;
+
+        /**
+         * @tile_idr:
+         *
+         * Use this idr for allocating new IDs for tiled sinks like use in some
+         * high-res DP MST screens.
+         */
+        struct idr tile_idr;
 
         struct mutex fb_lock; /* proctects global and per-file fb lists */
         int num_fb;
@@ -2177,11 +2490,17 @@ struct drm_mode_config {
         /* whether async page flip is supported or not */
         bool async_page_flip;
 
-        /* whether the driver supports fb modifiers */
+        /**
+         * @allow_fb_modifiers:
+         *
+         * Whether the driver supports fb modifiers in the ADDFB2.1 ioctl call.
+         */
         bool allow_fb_modifiers;
 
         /* cursor size */
         uint32_t cursor_width, cursor_height;
+
+        struct drm_mode_config_helper_funcs *helper_private;
 };
 
 /**
@@ -2230,7 +2549,18 @@ int drm_crtc_init_with_planes(struct drm_device *dev,
                               const struct drm_crtc_funcs *funcs,
                               const char *name, ...);
 extern void drm_crtc_cleanup(struct drm_crtc *crtc);
-extern unsigned int drm_crtc_index(struct drm_crtc *crtc);
+
+/**
+ * drm_crtc_index - find the index of a registered CRTC
+ * @crtc: CRTC to find index for
+ *
+ * Given a registered CRTC, return the index of that CRTC within a DRM
+ * device's list of CRTCs.
+ */
+static inline unsigned int drm_crtc_index(struct drm_crtc *crtc)
+{
+        return crtc->index;
+}
 
 /**
  * drm_crtc_mask - find the mask of a registered CRTC
@@ -2244,12 +2574,10 @@ static inline uint32_t drm_crtc_mask(struct drm_crtc *crtc)
         return 1 << drm_crtc_index(crtc);
 }
 
-extern void drm_connector_ida_init(void);
-extern void drm_connector_ida_destroy(void);
-extern int drm_connector_init(struct drm_device *dev,
-                              struct drm_connector *connector,
-                              const struct drm_connector_funcs *funcs,
-                              int connector_type);
+int drm_connector_init(struct drm_device *dev,
+                       struct drm_connector *connector,
+                       const struct drm_connector_funcs *funcs,
+                       int connector_type);
 int drm_connector_register(struct drm_connector *connector);
 void drm_connector_unregister(struct drm_connector *connector);
 
@@ -2263,28 +2591,23 @@ static inline unsigned drm_connector_index(struct drm_connector *connector)
 extern int drm_connector_register_all(struct drm_device *dev);
 extern void drm_connector_unregister_all(struct drm_device *dev);
 
-extern int drm_bridge_add(struct drm_bridge *bridge);
-extern void drm_bridge_remove(struct drm_bridge *bridge);
-extern struct drm_bridge *of_drm_find_bridge(struct device_node *np);
-extern int drm_bridge_attach(struct drm_device *dev, struct drm_bridge *bridge);
-
-bool drm_bridge_mode_fixup(struct drm_bridge *bridge,
-                        const struct drm_display_mode *mode,
-                        struct drm_display_mode *adjusted_mode);
-void drm_bridge_disable(struct drm_bridge *bridge);
-void drm_bridge_post_disable(struct drm_bridge *bridge);
-void drm_bridge_mode_set(struct drm_bridge *bridge,
-                        struct drm_display_mode *mode,
-                        struct drm_display_mode *adjusted_mode);
-void drm_bridge_pre_enable(struct drm_bridge *bridge);
-void drm_bridge_enable(struct drm_bridge *bridge);
-
 extern __printf(5, 6)
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type, const char *name, ...);
-extern unsigned int drm_encoder_index(struct drm_encoder *encoder);
+
+/**
+ * drm_encoder_index - find the index of a registered encoder
+ * @encoder: encoder to find index for
+ *
+ * Given a registered encoder, return the index of that encoder within a DRM
+ * device's list of encoders.
+ */
+static inline unsigned int drm_encoder_index(struct drm_encoder *encoder)
+{
+        return encoder->index;
+}
 
 /**
  * drm_encoder_crtc_ok - can a given crtc drive a given encoder?
@@ -2315,17 +2638,22 @@ extern int drm_plane_init(struct drm_device *dev,
                           const uint32_t *formats, unsigned int format_count,
                           bool is_primary);
 extern void drm_plane_cleanup(struct drm_plane *plane);
-extern unsigned int drm_plane_index(struct drm_plane *plane);
+
+/**
+ * drm_plane_index - find the index of a registered plane
+ * @plane: plane to find index for
+ *
+ * Given a registered plane, return the index of that plane within a DRM
+ * device's list of planes.
+ */
+static inline unsigned int drm_plane_index(struct drm_plane *plane)
+{
+        return plane->index;
+}
 extern struct drm_plane * drm_plane_from_index(struct drm_device *dev, int idx);
 extern void drm_plane_force_disable(struct drm_plane *plane);
-extern int drm_plane_check_pixel_format(const struct drm_plane *plane,
-                                        u32 format);
 extern void drm_crtc_get_hv_timing(const struct drm_display_mode *mode,
                                    int *hdisplay, int *vdisplay);
-extern int drm_crtc_check_viewport(const struct drm_crtc *crtc,
-                                   int x, int y,
-                                   const struct drm_display_mode *mode,
-                                   const struct drm_framebuffer *fb);
 
 extern void drm_encoder_cleanup(struct drm_encoder *encoder);
 
@@ -2336,16 +2664,6 @@ extern const char *drm_get_dvi_i_subconnector_name(int val);
 extern const char *drm_get_dvi_i_select_name(int val);
 extern const char *drm_get_tv_subconnector_name(int val);
 extern const char *drm_get_tv_select_name(int val);
-extern void drm_fb_release(struct drm_file *file_priv);
-extern void drm_property_destroy_user_blobs(struct drm_device *dev,
-                                            struct drm_file *file_priv);
-extern bool drm_probe_ddc(struct i2c_adapter *adapter);
-extern struct edid *drm_get_edid(struct drm_connector *connector,
-                                 struct i2c_adapter *adapter);
-extern struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
-                                            struct i2c_adapter *adapter);
-extern struct edid *drm_edid_duplicate(const struct edid *edid);
-extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
 extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_reset(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
@@ -2369,13 +2687,6 @@ static inline bool drm_property_type_is(struct drm_property *property,
         return property->flags & type;
 }
 
-static inline bool drm_property_type_valid(struct drm_property *property)
-{
-        if (property->flags & DRM_MODE_PROP_EXTENDED_TYPE)
-                return !(property->flags & DRM_MODE_PROP_LEGACY_TYPE);
-        return !!(property->flags & DRM_MODE_PROP_LEGACY_TYPE);
-}
-
 extern int drm_object_property_set_value(struct drm_mode_object *obj,
                                          struct drm_property *property,
                                          uint64_t val);
@@ -2433,86 +2744,15 @@ extern int drm_mode_create_scaling_mode_property(struct drm_device *dev);
 extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
 extern int drm_mode_create_dirty_info_property(struct drm_device *dev);
 extern int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
-extern bool drm_property_change_valid_get(struct drm_property *property,
-                                         uint64_t value, struct drm_mode_object **ref);
-extern void drm_property_change_valid_put(struct drm_property *property,
-                struct drm_mode_object *ref);
 
 extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
                                              struct drm_encoder *encoder);
 extern int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
                                          int gamma_size);
-extern struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
-                uint32_t id, uint32_t type);
-void drm_mode_object_reference(struct drm_mode_object *obj);
-void drm_mode_object_unreference(struct drm_mode_object *obj);
 
-/* IOCTLs */
-extern int drm_mode_getresources(struct drm_device *dev,
-                                 void *data, struct drm_file *file_priv);
-extern int drm_mode_getplane_res(struct drm_device *dev, void *data,
-                                   struct drm_file *file_priv);
-extern int drm_mode_getcrtc(struct drm_device *dev,
-                            void *data, struct drm_file *file_priv);
-extern int drm_mode_getconnector(struct drm_device *dev,
-                              void *data, struct drm_file *file_priv);
 extern int drm_mode_set_config_internal(struct drm_mode_set *set);
-extern int drm_mode_setcrtc(struct drm_device *dev,
-                            void *data, struct drm_file *file_priv);
-extern int drm_mode_getplane(struct drm_device *dev,
-                               void *data, struct drm_file *file_priv);
-extern int drm_mode_setplane(struct drm_device *dev,
-                               void *data, struct drm_file *file_priv);
-extern int drm_mode_cursor_ioctl(struct drm_device *dev,
-                                void *data, struct drm_file *file_priv);
-extern int drm_mode_cursor2_ioctl(struct drm_device *dev,
-                                void *data, struct drm_file *file_priv);
-extern int drm_mode_addfb(struct drm_device *dev,
-                          void *data, struct drm_file *file_priv);
-extern int drm_mode_addfb2(struct drm_device *dev,
-                           void *data, struct drm_file *file_priv);
+
 extern uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth);
-extern int drm_mode_rmfb(struct drm_device *dev,
-                         void *data, struct drm_file *file_priv);
-extern int drm_mode_getfb(struct drm_device *dev,
-                          void *data, struct drm_file *file_priv);
-extern int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
-                                  void *data, struct drm_file *file_priv);
-
-extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
-                                      void *data, struct drm_file *file_priv);
-extern int drm_mode_getblob_ioctl(struct drm_device *dev,
-                                  void *data, struct drm_file *file_priv);
-extern int drm_mode_createblob_ioctl(struct drm_device *dev,
-                                     void *data, struct drm_file *file_priv);
-extern int drm_mode_destroyblob_ioctl(struct drm_device *dev,
-                                      void *data, struct drm_file *file_priv);
-extern int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
-                                              void *data, struct drm_file *file_priv);
-extern int drm_mode_getencoder(struct drm_device *dev,
-                               void *data, struct drm_file *file_priv);
-extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
-                                    void *data, struct drm_file *file_priv);
-extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
-                                    void *data, struct drm_file *file_priv);
-extern u8 drm_match_cea_mode(const struct drm_display_mode *to_match);
-extern enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code);
-extern bool drm_detect_hdmi_monitor(struct edid *edid);
-extern bool drm_detect_monitor_audio(struct edid *edid);
-extern bool drm_rgb_quant_range_selectable(struct edid *edid);
-extern int drm_mode_page_flip_ioctl(struct drm_device *dev,
-                                    void *data, struct drm_file *file_priv);
-extern int drm_add_modes_noedid(struct drm_connector *connector,
-                                int hdisplay, int vdisplay);
-extern void drm_set_preferred_mode(struct drm_connector *connector,
-                                   int hpref, int vpref);
-
-extern int drm_edid_header_is_valid(const u8 *raw_edid);
-extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
-                                 bool *edid_corrupt);
-extern bool drm_edid_is_valid(struct edid *edid);
-extern void drm_edid_get_monitor_name(struct edid *edid, char *name,
-                                      int buflen);
 
 extern struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev,
                                                          char topology[8]);
@@ -2520,41 +2760,24 @@ extern struct drm_tile_group *drm_mode_get_tile_group(struct drm_device *dev,
                                                char topology[8]);
 extern void drm_mode_put_tile_group(struct drm_device *dev,
                                    struct drm_tile_group *tg);
-struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
-                                           int hsize, int vsize, int fresh,
-                                           bool rb);
 
-extern int drm_mode_create_dumb_ioctl(struct drm_device *dev,
-                                      void *data, struct drm_file *file_priv);
-extern int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,
-                                    void *data, struct drm_file *file_priv);
-extern int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
-                                      void *data, struct drm_file *file_priv);
-extern int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
-                                             struct drm_file *file_priv);
-extern int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
-                                           struct drm_file *file_priv);
 extern int drm_mode_plane_set_obj_prop(struct drm_plane *plane,
                                        struct drm_property *property,
                                        uint64_t value);
-extern int drm_mode_atomic_ioctl(struct drm_device *dev,
-                                 void *data, struct drm_file *file_priv);
-
-extern void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
-                                 int *bpp);
-extern int drm_format_num_planes(uint32_t format);
-extern int drm_format_plane_cpp(uint32_t format, int plane);
-extern int drm_format_horz_chroma_subsampling(uint32_t format);
-extern int drm_format_vert_chroma_subsampling(uint32_t format);
-extern int drm_format_plane_width(int width, uint32_t format, int plane);
-extern int drm_format_plane_height(int height, uint32_t format, int plane);
-extern const char *drm_get_format_name(uint32_t format);
+
 extern struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
                                                               unsigned int supported_rotations);
 extern unsigned int drm_rotation_simplify(unsigned int rotation,
                                           unsigned int supported_rotations);
-
+extern void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
+                                       uint degamma_lut_size,
+                                       bool has_ctm,
+                                       uint gamma_lut_size);
 /* Helpers */
+struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
+                                             uint32_t id, uint32_t type);
+void drm_mode_object_reference(struct drm_mode_object *obj);
+void drm_mode_object_unreference(struct drm_mode_object *obj);
 
 static inline struct drm_plane *drm_plane_find(struct drm_device *dev,
                 uint32_t id)
@@ -2720,4 +2943,50 @@ assert_drm_connector_list_read_locked(struct drm_mode_config *mode_config)
              &fb->head != (&(dev)->mode_config.fb_list);                        \
              fb = list_next_entry(fb, head))
 
+/* drm_edid.c */
+bool drm_probe_ddc(struct i2c_adapter *adapter);
+struct edid *drm_get_edid(struct drm_connector *connector,
+                          struct i2c_adapter *adapter);
+struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
+                                     struct i2c_adapter *adapter);
+struct edid *drm_edid_duplicate(const struct edid *edid);
+int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
+
+u8 drm_match_cea_mode(const struct drm_display_mode *to_match);
+enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code);
+bool drm_detect_hdmi_monitor(struct edid *edid);
+bool drm_detect_monitor_audio(struct edid *edid);
+bool drm_rgb_quant_range_selectable(struct edid *edid);
+int drm_add_modes_noedid(struct drm_connector *connector,
+                         int hdisplay, int vdisplay);
+void drm_set_preferred_mode(struct drm_connector *connector,
+                            int hpref, int vpref);
+
+int drm_edid_header_is_valid(const u8 *raw_edid);
+bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
+                          bool *edid_corrupt);
+bool drm_edid_is_valid(struct edid *edid);
+void drm_edid_get_monitor_name(struct edid *edid, char *name,
+                               int buflen);
+struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
+                                           int hsize, int vsize, int fresh,
+                                           bool rb);
+
+/* drm_bridge.c */
+extern int drm_bridge_add(struct drm_bridge *bridge);
+extern void drm_bridge_remove(struct drm_bridge *bridge);
+extern struct drm_bridge *of_drm_find_bridge(struct device_node *np);
+extern int drm_bridge_attach(struct drm_device *dev, struct drm_bridge *bridge);
+
+bool drm_bridge_mode_fixup(struct drm_bridge *bridge,
+                        const struct drm_display_mode *mode,
+                        struct drm_display_mode *adjusted_mode);
+void drm_bridge_disable(struct drm_bridge *bridge);
+void drm_bridge_post_disable(struct drm_bridge *bridge);
+void drm_bridge_mode_set(struct drm_bridge *bridge,
+                        struct drm_display_mode *mode,
+                        struct drm_display_mode *adjusted_mode);
+void drm_bridge_pre_enable(struct drm_bridge *bridge);
+void drm_bridge_enable(struct drm_bridge *bridge);
+
 #endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 97fa894d4ee2..4b37afa2b73b 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -48,9 +48,6 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                                      struct drm_display_mode *mode,
                                      int x, int y,
                                      struct drm_framebuffer *old_fb);
-extern void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc,
-                                              int degamma_lut_size,
-                                              int gamma_lut_size);
 extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
 extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
 
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 9d03f167007b..4d85cf2874af 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -622,6 +622,7 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI
 #define DP_BRANCH_OUI_HEADER_SIZE       0xc
 #define DP_RECEIVER_CAP_SIZE            0xf
 #define EDP_PSR_RECEIVER_CAP_SIZE       2
+#define EDP_DISPLAY_CTL_CAP_SIZE        3
 
 void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
 void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
@@ -804,6 +805,7 @@ int drm_dp_link_power_up(struct drm_dp_aux *aux, struct drm_dp_link *link);
 int drm_dp_link_power_down(struct drm_dp_aux *aux, struct drm_dp_link *link);
 int drm_dp_link_configure(struct drm_dp_aux *aux, struct drm_dp_link *link);
 
+void drm_dp_aux_init(struct drm_dp_aux *aux);
 int drm_dp_aux_register(struct drm_dp_aux *aux);
 void drm_dp_aux_unregister(struct drm_dp_aux *aux);
 
diff --git a/include/drm/drm_fb_cma_helper.h b/include/drm/drm_fb_cma_helper.h
index fd0dde9f0a6d..f313211f8ed5 100644
--- a/include/drm/drm_fb_cma_helper.h
+++ b/include/drm/drm_fb_cma_helper.h
@@ -23,6 +23,7 @@ void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma);
 
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
+void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, int state);
 int drm_fbdev_cma_create_with_funcs(struct drm_fb_helper *helper,
         struct drm_fb_helper_surface_size *sizes,
         const struct drm_framebuffer_funcs *funcs);
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 5b4aa35026a3..db8d4780eaa2 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -212,17 +212,6 @@ struct drm_fb_helper {
          * needs to be reprobe when fbdev is in control again.
          */
         bool delayed_hotplug;
-
-        /**
-         * @atomic:
-         *
-         * Use atomic updates for restore_fbdev_mode(), etc.  This defaults to
-         * true if driver has DRIVER_ATOMIC feature flag, but drivers can
-         * override it to true after drm_fb_helper_init() if they support atomic
-         * modeset but do not yet advertise DRIVER_ATOMIC (note that fb-helper
-         * does not require ASYNC commits).
-         */
-        bool atomic;
 };
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
new file mode 100644
index 000000000000..7f90a396cf2b
--- /dev/null
+++ b/include/drm/drm_fourcc.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+#ifndef __DRM_FOURCC_H__
+#define __DRM_FOURCC_H__
+
+#include <linux/types.h>
+#include <uapi/drm/drm_fourcc.h>
+
+void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth, int *bpp);
+int drm_format_num_planes(uint32_t format);
+int drm_format_plane_cpp(uint32_t format, int plane);
+int drm_format_horz_chroma_subsampling(uint32_t format);
+int drm_format_vert_chroma_subsampling(uint32_t format);
+int drm_format_plane_width(int width, uint32_t format, int plane);
+int drm_format_plane_height(int height, uint32_t format, int plane);
+const char *drm_get_format_name(uint32_t format);
+
+#endif /* __DRM_FOURCC_H__ */
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
index a5ef2c7e40f8..cf0e7d89bcdf 100644
--- a/include/drm/drm_legacy.h
+++ b/include/drm/drm_legacy.h
@@ -1,6 +1,8 @@
 #ifndef __DRM_DRM_LEGACY_H__
 #define __DRM_DRM_LEGACY_H__
 
+#include <drm/drm_auth.h>
+
 /*
  * Legacy driver interfaces for the Direct Rendering Manager
  *
diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h
index 7a9840f8b38e..72f5b15e0738 100644
--- a/include/drm/drm_mipi_dsi.h
+++ b/include/drm/drm_mipi_dsi.h
@@ -180,6 +180,8 @@ struct mipi_dsi_device {
         unsigned long mode_flags;
 };
 
+#define MIPI_DSI_MODULE_PREFIX "mipi-dsi:"
+
 static inline struct mipi_dsi_device *to_mipi_dsi_device(struct device *dev)
 {
         return container_of(dev, struct mipi_dsi_device, dev);
@@ -263,6 +265,7 @@ int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start,
                                     u16 end);
 int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start,
                                   u16 end);
+int mipi_dsi_set_tear_scanline(struct mipi_dsi_device *dsi, u16 param);
 int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi);
 int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,
                              enum mipi_dsi_dcs_tear_mode mode);
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 625966a906f2..ff481770d76b 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -169,6 +169,8 @@ enum drm_mode_status {
  *
  * The horizontal and vertical timings are defined per the following diagram.
  *
+ * ::
+ *
  *
  *               Active                 Front           Sync           Back
  *              Region                 Porch                          Porch
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index d4619dc2eecb..b55f21857a98 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -736,6 +736,11 @@ struct drm_connector_helper_funcs {
          * inspect dynamic configuration state should instead use
          * @atomic_best_encoder.
          *
+         * You can leave this function to NULL if the connector is only
+         * attached to a single encoder and you are using the atomic helpers.
+         * In this case, the core will call drm_atomic_helper_best_encoder()
+         * for you.
+         *
          * RETURNS:
          *
          * Encoder that should be used for the given connector and connector
@@ -752,8 +757,9 @@ struct drm_connector_helper_funcs {
          * need to select the best encoder depending upon the desired
          * configuration and can't select it statically.
          *
-         * This function is used by drm_atomic_helper_check_modeset() and either
-         * this or @best_encoder is required.
+         * This function is used by drm_atomic_helper_check_modeset().
+         * If it is not implemented, the core will fallback to @best_encoder
+         * (or drm_atomic_helper_best_encoder() if @best_encoder is NULL).
          *
          * NOTE:
          *
@@ -925,4 +931,43 @@ static inline void drm_plane_helper_add(struct drm_plane *plane,
         plane->helper_private = funcs;
 }
 
+/**
+ * struct drm_mode_config_helper_funcs - global modeset helper operations
+ *
+ * These helper functions are used by the atomic helpers.
+ */
+struct drm_mode_config_helper_funcs {
+        /**
+         * @atomic_commit_tail:
+         *
+         * This hook is used by the default atomic_commit() hook implemented in
+         * drm_atomic_helper_commit() together with the nonblocking commit
+         * helpers (see drm_atomic_helper_setup_commit() for a starting point)
+         * to implement blocking and nonblocking commits easily. It is not used
+         * by the atomic helpers
+         *
+         * This hook should first commit the given atomic state to the hardware.
+         * But drivers can add more waiting calls at the start of their
+         * implementation, e.g. to wait for driver-internal request for implicit
+         * syncing, before starting to commit the update to the hardware.
+         *
+         * After the atomic update is committed to the hardware this hook needs
+         * to call drm_atomic_helper_commit_hw_done(). Then wait for the upate
+         * to be executed by the hardware, for example using
+         * drm_atomic_helper_wait_for_vblanks(), and then clean up the old
+         * framebuffers using drm_atomic_helper_cleanup_planes().
+         *
+         * When disabling a CRTC this hook _must_ stall for the commit to
+         * complete. Vblank waits don't work on disabled CRTC, hence the core
+         * can't take care of this. And it also can't rely on the vblank event,
+         * since that can be signalled already when the screen shows black,
+         * which can happen much earlier than the last hardware access needed to
+         * shut off the display pipeline completely.
+         *
+         * This hook is optional, the default implementation is
+         * drm_atomic_helper_commit_tail().
+         */
+        void (*atomic_commit_tail)(struct drm_atomic_state *state);
+};
+
 #endif
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
index 4421f3f4ca8d..0e0c3573cce0 100644
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
@@ -46,6 +46,7 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
                                   struct drm_rect *src,
                                   struct drm_rect *dest,
                                   const struct drm_rect *clip,
+                                  unsigned int rotation,
                                   int min_scale,
                                   int max_scale,
                                   bool can_position,
diff --git a/include/drm/drm_simple_kms_helper.h b/include/drm/drm_simple_kms_helper.h
new file mode 100644
index 000000000000..269039722f91
--- /dev/null
+++ b/include/drm/drm_simple_kms_helper.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2016 Noralf Trønnes
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __LINUX_DRM_SIMPLE_KMS_HELPER_H
+#define __LINUX_DRM_SIMPLE_KMS_HELPER_H
+
+struct drm_simple_display_pipe;
+
+/**
+ * struct drm_simple_display_pipe_funcs - helper operations for a simple
+ *                                        display pipeline
+ */
+struct drm_simple_display_pipe_funcs {
+        /**
+         * @enable:
+         *
+         * This function should be used to enable the pipeline.
+         * It is called when the underlying crtc is enabled.
+         * This hook is optional.
+         */
+        void (*enable)(struct drm_simple_display_pipe *pipe,
+                       struct drm_crtc_state *crtc_state);
+        /**
+         * @disable:
+         *
+         * This function should be used to disable the pipeline.
+         * It is called when the underlying crtc is disabled.
+         * This hook is optional.
+         */
+        void (*disable)(struct drm_simple_display_pipe *pipe);
+
+        /**
+         * @check:
+         *
+         * This function is called in the check phase of an atomic update,
+         * specifically when the underlying plane is checked.
+         * The simple display pipeline helpers already check that the plane is
+         * not scaled, fills the entire visible area and is always enabled
+         * when the crtc is also enabled.
+         * This hook is optional.
+         *
+         * RETURNS:
+         *
+         * 0 on success, -EINVAL if the state or the transition can't be
+         * supported, -ENOMEM on memory allocation failure and -EDEADLK if an
+         * attempt to obtain another state object ran into a &drm_modeset_lock
+         * deadlock.
+         */
+        int (*check)(struct drm_simple_display_pipe *pipe,
+                     struct drm_plane_state *plane_state,
+                     struct drm_crtc_state *crtc_state);
+        /**
+         * @update:
+         *
+         * This function is called when the underlying plane state is updated.
+         * This hook is optional.
+         */
+        void (*update)(struct drm_simple_display_pipe *pipe,
+                       struct drm_plane_state *plane_state);
+};
+
+/**
+ * struct drm_simple_display_pipe - simple display pipeline
+ * @crtc: CRTC control structure
+ * @plane: Plane control structure
+ * @encoder: Encoder control structure
+ * @connector: Connector control structure
+ * @funcs: Pipeline control functions (optional)
+ *
+ * Simple display pipeline with plane, crtc and encoder collapsed into one
+ * entity. It should be initialized by calling drm_simple_display_pipe_init().
+ */
+struct drm_simple_display_pipe {
+        struct drm_crtc crtc;
+        struct drm_plane plane;
+        struct drm_encoder encoder;
+        struct drm_connector *connector;
+
+        const struct drm_simple_display_pipe_funcs *funcs;
+};
+
+int drm_simple_display_pipe_init(struct drm_device *dev,
+                        struct drm_simple_display_pipe *pipe,
+                        const struct drm_simple_display_pipe_funcs *funcs,
+                        const uint32_t *formats, unsigned int format_count,
+                        struct drm_connector *connector);
+
+#endif /* __LINUX_DRM_SIMPLE_KMS_HELPER_H */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 595f85c392ac..b1755f8db36b 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -92,4 +92,7 @@ extern bool i915_gpu_turbo_disable(void);
 #define    I845_TSEG_SIZE_512K  (2 << 1)
 #define    I845_TSEG_SIZE_1M    (3 << 1)
 
+#define INTEL_BSM 0x5c
+#define   INTEL_BSM_MASK (0xFFFF << 20)
+
 #endif                          /* _I915_DRM_H_ */
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index 9e9bddaa58a5..f49edecd66a3 100644
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -13,6 +13,9 @@ void intel_gmch_remove(void);
 bool intel_enable_gtt(void);
 
 void intel_gtt_chipset_flush(void);
+void intel_gtt_insert_page(dma_addr_t addr,
+                           unsigned int pg,
+                           unsigned int flags);
 void intel_gtt_insert_sg_entries(struct sg_table *st,
                                  unsigned int pg_start,
                                  unsigned int flags);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 576e4639ca60..314b3caa701c 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -65,6 +65,7 @@ struct coredump_params {
         unsigned long limit;
         unsigned long mm_flags;
         loff_t written;
+        loff_t pos;
 };
 
 /*
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 19b14862d3e0..1b3b6e155392 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -279,6 +279,11 @@ struct ceph_osd_client {
         struct workqueue_struct *notify_wq;
 };
 
+static inline bool ceph_osdmap_flag(struct ceph_osd_client *osdc, int flag)
+{
+        return osdc->osdmap->flags & flag;
+}
+
 extern int ceph_osdc_setup(void);
 extern void ceph_osdc_cleanup(void);
 
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index ddc426b22d81..9ccf4dbe55f8 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -189,11 +189,6 @@ static inline bool ceph_osd_is_down(struct ceph_osdmap *map, int osd)
         return !ceph_osd_is_up(map, osd);
 }
 
-static inline bool ceph_osdmap_flag(struct ceph_osdmap *map, int flag)
-{
-        return map && (map->flags & flag);
-}
-
 extern char *ceph_osdmap_state_str(char *str, int len, int state);
 extern u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd);
 
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0c72204c75fc..fb39d5add173 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -25,7 +25,7 @@
 #define CLK_SET_PARENT_GATE     BIT(1) /* must be gated across re-parent */
 #define CLK_SET_RATE_PARENT     BIT(2) /* propagate rate change up one level */
 #define CLK_IGNORE_UNUSED       BIT(3) /* do not gate even if unused */
-#define CLK_IS_ROOT             BIT(4) /* Deprecated: Don't use */
+                                /* unused */
 #define CLK_IS_BASIC            BIT(5) /* Basic clk, can't do a to_clk_foo() */
 #define CLK_GET_RATE_NOCACHE    BIT(6) /* do not use the cached clk rate */
 #define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 786ad32631a6..07b83d32f66c 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -152,6 +152,8 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev);
 extern int cpuidle_play_dead(void);
 
 extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);
+static inline struct cpuidle_device *cpuidle_get_device(void)
+{return __this_cpu_read(cpuidle_devices); }
 #else
 static inline void disable_cpuidle(void) { }
 static inline bool cpuidle_not_available(struct cpuidle_driver *drv,
@@ -187,6 +189,7 @@ static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
 static inline int cpuidle_play_dead(void) {return -ENODEV; }
 static inline struct cpuidle_driver *cpuidle_get_cpu_driver(
         struct cpuidle_device *dev) {return NULL; }
+static inline struct cpuidle_device *cpuidle_get_device(void) {return NULL; }
 #endif
 
 #if defined(CONFIG_CPU_IDLE) && defined(CONFIG_SUSPEND)
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 484c8792da82..f53fa055021a 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -212,6 +212,7 @@ struct dentry_operations {
 #define DCACHE_OP_REAL                  0x08000000
 
 #define DCACHE_PAR_LOOKUP               0x10000000 /* being looked up (with parent locked shared) */
+#define DCACHE_DENTRY_CURSOR            0x20000000
 
 extern seqlock_t rename_lock;
 
@@ -575,5 +576,17 @@ static inline struct inode *vfs_select_inode(struct dentry *dentry,
         return inode;
 }
 
+/**
+ * d_real_inode - Return the real inode
+ * @dentry: The dentry to query
+ *
+ * If dentry is on an union/overlay, then return the underlying, real inode.
+ * Otherwise return d_inode().
+ */
+static inline struct inode *d_real_inode(struct dentry *dentry)
+{
+        return d_backing_inode(d_real(dentry));
+}
+
 
 #endif  /* __LINUX_DCACHE_H */
diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h
index 5871f292b596..277ab9af9ac2 100644
--- a/include/linux/devpts_fs.h
+++ b/include/linux/devpts_fs.h
@@ -15,13 +15,12 @@
 
 #include <linux/errno.h>
 
-struct pts_fs_info;
-
 #ifdef CONFIG_UNIX98_PTYS
 
-/* Look up a pts fs info and get a ref to it */
-struct pts_fs_info *devpts_get_ref(struct inode *, struct file *);
-void devpts_put_ref(struct pts_fs_info *);
+struct pts_fs_info;
+
+struct pts_fs_info *devpts_acquire(struct file *);
+void devpts_release(struct pts_fs_info *);
 
 int devpts_new_index(struct pts_fs_info *);
 void devpts_kill_index(struct pts_fs_info *, int);
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 3fe90d494edb..e0b0741ae671 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -112,19 +112,24 @@ struct dma_buf_ops {
  * @file: file pointer used for sharing buffers across, and for refcounting.
  * @attachments: list of dma_buf_attachment that denotes all devices attached.
  * @ops: dma_buf_ops associated with this buffer object.
+ * @lock: used internally to serialize list manipulation, attach/detach and vmap/unmap
+ * @vmapping_counter: used internally to refcnt the vmaps
+ * @vmap_ptr: the current vmap ptr if vmapping_counter > 0
  * @exp_name: name of the exporter; useful for debugging.
  * @owner: pointer to exporter module; used for refcounting when exporter is a
  *         kernel module.
  * @list_node: node for dma_buf accounting and debugging.
  * @priv: exporter specific private data for this buffer object.
  * @resv: reservation object linked to this dma-buf
+ * @poll: for userspace poll support
+ * @cb_excl: for userspace poll support
+ * @cb_shared: for userspace poll support
  */
 struct dma_buf {
         size_t size;
         struct file *file;
         struct list_head attachments;
         const struct dma_buf_ops *ops;
-        /* mutex to serialize list manipulation, attach/detach and vmap/unmap */
         struct mutex lock;
         unsigned vmapping_counter;
         void *vmap_ptr;
@@ -188,9 +193,11 @@ struct dma_buf_export_info {
 
 /**
  * helper macro for exporters; zeros and fills in most common values
+ *
+ * @name: export-info name
  */
-#define DEFINE_DMA_BUF_EXPORT_INFO(a)   \
-        struct dma_buf_export_info a = { .exp_name = KBUILD_MODNAME, \
+#define DEFINE_DMA_BUF_EXPORT_INFO(name)        \
+        struct dma_buf_export_info name = { .exp_name = KBUILD_MODNAME, \
                                          .owner = THIS_MODULE }
 
 /**
@@ -235,6 +242,4 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *,
                  unsigned long);
 void *dma_buf_vmap(struct dma_buf *);
 void dma_buf_vunmap(struct dma_buf *, void *vaddr);
-int dma_buf_debugfs_create_file(const char *name,
-                                int (*write)(struct seq_file *));
 #endif /* __DMA_BUF_H__ */
diff --git a/include/linux/efi.h b/include/linux/efi.h
index c2db3ca22217..f196dd0b0f2f 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1005,7 +1005,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
 /* Iterate through an efi_memory_map */
 #define for_each_efi_memory_desc_in_map(m, md)                             \
         for ((md) = (m)->map;                                              \
-             (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+             ((void *)(md) + (m)->desc_size) <= (m)->map_end;              \
              (md) = (void *)(md) + (m)->desc_size)
 
 /**
diff --git a/include/linux/fence-array.h b/include/linux/fence-array.h
new file mode 100644
index 000000000000..86baaa45567c
--- /dev/null
+++ b/include/linux/fence-array.h
@@ -0,0 +1,73 @@
+/*
+ * fence-array: aggregates fence to be waited together
+ *
+ * Copyright (C) 2016 Collabora Ltd
+ * Copyright (C) 2016 Advanced Micro Devices, Inc.
+ * Authors:
+ *      Gustavo Padovan <gustavo@padovan.org>
+ *      Christian König <christian.koenig@amd.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#ifndef __LINUX_FENCE_ARRAY_H
+#define __LINUX_FENCE_ARRAY_H
+
+#include <linux/fence.h>
+
+/**
+ * struct fence_array_cb - callback helper for fence array
+ * @cb: fence callback structure for signaling
+ * @array: reference to the parent fence array object
+ */
+struct fence_array_cb {
+        struct fence_cb cb;
+        struct fence_array *array;
+};
+
+/**
+ * struct fence_array - fence to represent an array of fences
+ * @base: fence base class
+ * @lock: spinlock for fence handling
+ * @num_fences: number of fences in the array
+ * @num_pending: fences in the array still pending
+ * @fences: array of the fences
+ */
+struct fence_array {
+        struct fence base;
+
+        spinlock_t lock;
+        unsigned num_fences;
+        atomic_t num_pending;
+        struct fence **fences;
+};
+
+extern const struct fence_ops fence_array_ops;
+
+/**
+ * to_fence_array - cast a fence to a fence_array
+ * @fence: fence to cast to a fence_array
+ *
+ * Returns NULL if the fence is not a fence_array,
+ * or the fence_array otherwise.
+ */
+static inline struct fence_array *to_fence_array(struct fence *fence)
+{
+        if (fence->ops != &fence_array_ops)
+                return NULL;
+
+        return container_of(fence, struct fence_array, base);
+}
+
+struct fence_array *fence_array_create(int num_fences, struct fence **fences,
+                                       u64 context, unsigned seqno,
+                                       bool signal_on_any);
+
+#endif /* __LINUX_FENCE_ARRAY_H */
diff --git a/include/linux/fence.h b/include/linux/fence.h
index 2b17698b60b8..44d945e96473 100644
--- a/include/linux/fence.h
+++ b/include/linux/fence.h
@@ -49,6 +49,8 @@ struct fence_cb;
  * @timestamp: Timestamp when the fence was signaled.
  * @status: Optional, only valid if < 0, must be set before calling
  * fence_signal, indicates that the fence has completed with an error.
+ * @child_list: list of children fences
+ * @active_list: list of active fences
  *
  * the flags member must be manipulated and read using the appropriate
  * atomic ops (bit_*), so taking the spinlock will not be needed most
@@ -75,7 +77,8 @@ struct fence {
         struct rcu_head rcu;
         struct list_head cb_list;
         spinlock_t *lock;
-        unsigned context, seqno;
+        u64 context;
+        unsigned seqno;
         unsigned long flags;
         ktime_t timestamp;
         int status;
@@ -178,7 +181,7 @@ struct fence_ops {
 };
 
 void fence_init(struct fence *fence, const struct fence_ops *ops,
-                spinlock_t *lock, unsigned context, unsigned seqno);
+                spinlock_t *lock, u64 context, unsigned seqno);
 
 void fence_release(struct kref *kref);
 void fence_free(struct fence *fence);
@@ -352,27 +355,27 @@ static inline signed long fence_wait(struct fence *fence, bool intr)
         return ret < 0 ? ret : 0;
 }
 
-unsigned fence_context_alloc(unsigned num);
+u64 fence_context_alloc(unsigned num);
 
 #define FENCE_TRACE(f, fmt, args...) \
         do {                                                            \
                 struct fence *__ff = (f);                               \
                 if (config_enabled(CONFIG_FENCE_TRACE))                 \
-                        pr_info("f %u#%u: " fmt,                        \
+                        pr_info("f %llu#%u: " fmt,                      \
                                 __ff->context, __ff->seqno, ##args);    \
         } while (0)
 
 #define FENCE_WARN(f, fmt, args...) \
         do {                                                            \
                 struct fence *__ff = (f);                               \
-                pr_warn("f %u#%u: " fmt, __ff->context, __ff->seqno,    \
+                pr_warn("f %llu#%u: " fmt, __ff->context, __ff->seqno,  \
                          ##args);                                       \
         } while (0)
 
 #define FENCE_ERR(f, fmt, args...) \
         do {                                                            \
                 struct fence *__ff = (f);                               \
-                pr_err("f %u#%u: " fmt, __ff->context, __ff->seqno,     \
+                pr_err("f %llu#%u: " fmt, __ff->context, __ff->seqno,   \
                         ##args);                                        \
         } while (0)
 
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index 604e1526cd00..13ba552e6c09 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -241,7 +241,7 @@ struct fscache_cache_ops {
 
         /* check the consistency between the backing cache and the FS-Cache
          * cookie */
-        bool (*check_consistency)(struct fscache_operation *op);
+        int (*check_consistency)(struct fscache_operation *op);
 
         /* store the updated auxiliary data on an object */
         void (*update_object)(struct fscache_object *object);
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index d029ffac0d69..99403b19092f 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -223,6 +223,8 @@ struct st_sensor_settings {
  * @get_irq_data_ready: Function to get the IRQ used for data ready signal.
  * @tf: Transfer function structure used by I/O operations.
  * @tb: Transfer buffers and mutex used by I/O operations.
+ * @hw_irq_trigger: if we're using the hardware interrupt on the sensor.
+ * @hw_timestamp: Latest timestamp from the interrupt handler, when in use.
  */
 struct st_sensor_data {
         struct device *dev;
@@ -247,6 +249,9 @@ struct st_sensor_data {
 
         const struct st_sensor_transfer_function *tf;
         struct st_sensor_transfer_buffer tb;
+
+        bool hw_irq_trigger;
+        s64 hw_timestamp;
 };
 
 #ifdef CONFIG_IIO_BUFFER
@@ -260,7 +265,8 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                                 const struct iio_trigger_ops *trigger_ops);
 
 void st_sensors_deallocate_trigger(struct iio_dev *indio_dev);
-
+int st_sensors_validate_device(struct iio_trigger *trig,
+                               struct iio_dev *indio_dev);
 #else
 static inline int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                                 const struct iio_trigger_ops *trigger_ops)
@@ -271,6 +277,7 @@ static inline void st_sensors_deallocate_trigger(struct iio_dev *indio_dev)
 {
         return;
 }
+#define st_sensors_validate_device NULL
 #endif
 
 int st_sensors_init_sensor(struct iio_dev *indio_dev,
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index f2cb8d45513d..f8834f820ec2 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -190,7 +190,7 @@ extern struct task_group root_task_group;
 #define INIT_TASK(tsk)  \
 {                                                                       \
         .state          = 0,                                            \
-        .stack          = &init_thread_info,                            \
+        .stack          = init_stack,                                   \
         .usage          = ATOMIC_INIT(2),                               \
         .flags          = PF_KTHREAD,                                   \
         .prio           = MAX_PRIO-20,                                  \
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index e399029b68c5..645ad06b5d52 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -100,14 +100,16 @@ io_mapping_unmap_atomic(void __iomem *vaddr)
 }
 
 static inline void __iomem *
-io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
+io_mapping_map_wc(struct io_mapping *mapping,
+                  unsigned long offset,
+                  unsigned long size)
 {
         resource_size_t phys_addr;
 
         BUG_ON(offset >= mapping->size);
         phys_addr = mapping->base + offset;
 
-        return ioremap_wc(phys_addr, PAGE_SIZE);
+        return ioremap_wc(phys_addr, size);
 }
 
 static inline void
@@ -155,7 +157,9 @@ io_mapping_unmap_atomic(void __iomem *vaddr)
 
 /* Non-atomic map/unmap */
 static inline void __iomem *
-io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
+io_mapping_map_wc(struct io_mapping *mapping,
+                  unsigned long offset,
+                  unsigned long size)
 {
         return ((char __force __iomem *) mapping) + offset;
 }
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index bfbd707de390..dc493e0f0ff7 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -305,12 +305,12 @@
 #define ICC_SGI1R_AFFINITY_1_SHIFT      16
 #define ICC_SGI1R_AFFINITY_1_MASK       (0xff << ICC_SGI1R_AFFINITY_1_SHIFT)
 #define ICC_SGI1R_SGI_ID_SHIFT          24
-#define ICC_SGI1R_SGI_ID_MASK           (0xff << ICC_SGI1R_SGI_ID_SHIFT)
+#define ICC_SGI1R_SGI_ID_MASK           (0xfULL << ICC_SGI1R_SGI_ID_SHIFT)
 #define ICC_SGI1R_AFFINITY_2_SHIFT      32
-#define ICC_SGI1R_AFFINITY_2_MASK       (0xffULL << ICC_SGI1R_AFFINITY_1_SHIFT)
+#define ICC_SGI1R_AFFINITY_2_MASK       (0xffULL << ICC_SGI1R_AFFINITY_2_SHIFT)
 #define ICC_SGI1R_IRQ_ROUTING_MODE_BIT  40
 #define ICC_SGI1R_AFFINITY_3_SHIFT      48
-#define ICC_SGI1R_AFFINITY_3_MASK       (0xffULL << ICC_SGI1R_AFFINITY_1_SHIFT)
+#define ICC_SGI1R_AFFINITY_3_MASK       (0xffULL << ICC_SGI1R_AFFINITY_3_SHIFT)
 
 #include <asm/arch_gicv3.h>
 
diff --git a/include/linux/isa.h b/include/linux/isa.h
index 5ab85281230b..f2d0258414cf 100644
--- a/include/linux/isa.h
+++ b/include/linux/isa.h
@@ -6,6 +6,7 @@
 #define __LINUX_ISA_H
 
 #include <linux/device.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 struct isa_driver {
@@ -22,13 +23,13 @@ struct isa_driver {
 
 #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
 
-#ifdef CONFIG_ISA
+#ifdef CONFIG_ISA_BUS_API
 int isa_register_driver(struct isa_driver *, unsigned int);
 void isa_unregister_driver(struct isa_driver *);
 #else
 static inline int isa_register_driver(struct isa_driver *d, unsigned int i)
 {
-        return 0;
+        return -ENODEV;
 }
 
 static inline void isa_unregister_driver(struct isa_driver *d)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 0536524bb9eb..68904469fba1 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -117,13 +117,18 @@ struct module;
 
 #include <linux/atomic.h>
 
+#ifdef HAVE_JUMP_LABEL
+
 static inline int static_key_count(struct static_key *key)
 {
-        return atomic_read(&key->enabled);
+        /*
+         * -1 means the first static_key_slow_inc() is in progress.
+         *  static_key_enabled() must return true, so return 1 here.
+         */
+        int n = atomic_read(&key->enabled);
+        return n >= 0 ? n : 1;
 }
 
-#ifdef HAVE_JUMP_LABEL
-
 #define JUMP_TYPE_FALSE 0UL
 #define JUMP_TYPE_TRUE  1UL
 #define JUMP_TYPE_MASK  1UL
@@ -162,6 +167,11 @@ extern void jump_label_apply_nops(struct module *mod);
 
 #else  /* !HAVE_JUMP_LABEL */
 
+static inline int static_key_count(struct static_key *key)
+{
+        return atomic_read(&key->enabled);
+}
+
 static __always_inline void jump_label_init(void)
 {
         static_key_initialized = true;
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index 611927f5870d..ac4b3c46a84d 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -59,14 +59,13 @@ void kasan_poison_object_data(struct kmem_cache *cache, void *object);
 
 void kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags);
 void kasan_kfree_large(const void *ptr);
-void kasan_kfree(void *ptr);
+void kasan_poison_kfree(void *ptr);
 void kasan_kmalloc(struct kmem_cache *s, const void *object, size_t size,
                   gfp_t flags);
 void kasan_krealloc(const void *object, size_t new_size, gfp_t flags);
 
 void kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags);
 bool kasan_slab_free(struct kmem_cache *s, void *object);
-void kasan_poison_slab_free(struct kmem_cache *s, void *object);
 
 struct kasan_cache {
         int alloc_meta_offset;
@@ -76,6 +75,9 @@ struct kasan_cache {
 int kasan_module_alloc(void *addr, size_t size);
 void kasan_free_shadow(const struct vm_struct *vm);
 
+size_t ksize(const void *);
+static inline void kasan_unpoison_slab(const void *ptr) { ksize(ptr); }
+
 #else /* CONFIG_KASAN */
 
 static inline void kasan_unpoison_shadow(const void *address, size_t size) {}
@@ -102,7 +104,7 @@ static inline void kasan_poison_object_data(struct kmem_cache *cache,
 
 static inline void kasan_kmalloc_large(void *ptr, size_t size, gfp_t flags) {}
 static inline void kasan_kfree_large(const void *ptr) {}
-static inline void kasan_kfree(void *ptr) {}
+static inline void kasan_poison_kfree(void *ptr) {}
 static inline void kasan_kmalloc(struct kmem_cache *s, const void *object,
                                 size_t size, gfp_t flags) {}
 static inline void kasan_krealloc(const void *object, size_t new_size,
@@ -114,11 +116,12 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object)
 {
         return false;
 }
-static inline void kasan_poison_slab_free(struct kmem_cache *s, void *object) {}
 
 static inline int kasan_module_alloc(void *addr, size_t size) { return 0; }
 static inline void kasan_free_shadow(const struct vm_struct *vm) {}
 
+static inline void kasan_unpoison_slab(const void *ptr) { }
+
 #endif /* CONFIG_KASAN */
 
 #endif /* LINUX_KASAN_H */
diff --git a/include/linux/leds.h b/include/linux/leds.h
index d2b13066e781..e5e7f2e80a54 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -42,15 +42,16 @@ struct led_classdev {
 #define LED_UNREGISTERING       (1 << 1)
         /* Upper 16 bits reflect control information */
 #define LED_CORE_SUSPENDRESUME  (1 << 16)
-#define LED_BLINK_ONESHOT       (1 << 17)
-#define LED_BLINK_ONESHOT_STOP  (1 << 18)
-#define LED_BLINK_INVERT        (1 << 19)
-#define LED_BLINK_BRIGHTNESS_CHANGE (1 << 20)
-#define LED_BLINK_DISABLE       (1 << 21)
-#define LED_SYSFS_DISABLE       (1 << 22)
-#define LED_DEV_CAP_FLASH       (1 << 23)
-#define LED_HW_PLUGGABLE        (1 << 24)
-#define LED_PANIC_INDICATOR     (1 << 25)
+#define LED_BLINK_SW            (1 << 17)
+#define LED_BLINK_ONESHOT       (1 << 18)
+#define LED_BLINK_ONESHOT_STOP  (1 << 19)
+#define LED_BLINK_INVERT        (1 << 20)
+#define LED_BLINK_BRIGHTNESS_CHANGE (1 << 21)
+#define LED_BLINK_DISABLE       (1 << 22)
+#define LED_SYSFS_DISABLE       (1 << 23)
+#define LED_DEV_CAP_FLASH       (1 << 24)
+#define LED_HW_PLUGGABLE        (1 << 25)
+#define LED_PANIC_INDICATOR     (1 << 26)
 
         /* Set LED brightness level
          * Must not sleep. Use brightness_set_blocking for drivers
@@ -72,8 +73,8 @@ struct led_classdev {
          * and if both are zero then a sensible default should be chosen.
          * The call should adjust the timings in that case and if it can't
          * match the values specified exactly.
-         * Deactivate blinking again when the brightness is set to a fixed
-         * value via the brightness_set() callback.
+         * Deactivate blinking again when the brightness is set to LED_OFF
+         * via the brightness_set() callback.
          */
         int             (*blink_set)(struct led_classdev *led_cdev,
                                      unsigned long *delay_on,
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 035abdf62cfe..73a48479892d 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -1240,8 +1240,6 @@ struct mlx5_destroy_psv_out {
         u8                      rsvd[8];
 };
 
-#define MLX5_CMD_OP_MAX 0x920
-
 enum {
         VPORT_STATE_DOWN                = 0x0,
         VPORT_STATE_UP                  = 0x1,
@@ -1369,6 +1367,12 @@ enum mlx5_cap_type {
 #define MLX5_CAP_FLOWTABLE_MAX(mdev, cap) \
         MLX5_GET(flow_table_nic_cap, mdev->hca_caps_max[MLX5_CAP_FLOW_TABLE], cap)
 
+#define MLX5_CAP_FLOWTABLE_NIC_RX(mdev, cap) \
+        MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_receive.cap)
+
+#define MLX5_CAP_FLOWTABLE_NIC_RX_MAX(mdev, cap) \
+        MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive.cap)
+
 #define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \
         MLX5_GET(flow_table_eswitch_cap, \
                  mdev->hca_caps_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 9a05cd7e5890..e955a2859009 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -205,7 +205,8 @@ enum {
         MLX5_CMD_OP_ALLOC_FLOW_COUNTER            = 0x939,
         MLX5_CMD_OP_DEALLOC_FLOW_COUNTER          = 0x93a,
         MLX5_CMD_OP_QUERY_FLOW_COUNTER            = 0x93b,
-        MLX5_CMD_OP_MODIFY_FLOW_TABLE             = 0x93c
+        MLX5_CMD_OP_MODIFY_FLOW_TABLE             = 0x93c,
+        MLX5_CMD_OP_MAX
 };
 
 struct mlx5_ifc_flow_table_fields_supported_bits {
@@ -500,7 +501,9 @@ struct mlx5_ifc_e_switch_cap_bits {
         u8         vport_svlan_insert[0x1];
         u8         vport_cvlan_insert_if_not_exist[0x1];
         u8         vport_cvlan_insert_overwrite[0x1];
-        u8         reserved_at_5[0x1b];
+        u8         reserved_at_5[0x19];
+        u8         nic_vport_node_guid_modify[0x1];
+        u8         nic_vport_port_guid_modify[0x1];
 
         u8         reserved_at_20[0x7e0];
 };
@@ -4583,7 +4586,10 @@ struct mlx5_ifc_modify_nic_vport_context_out_bits {
 };
 
 struct mlx5_ifc_modify_nic_vport_field_select_bits {
-        u8         reserved_at_0[0x19];
+        u8         reserved_at_0[0x16];
+        u8         node_guid[0x1];
+        u8         port_guid[0x1];
+        u8         reserved_at_18[0x1];
         u8         mtu[0x1];
         u8         change_event[0x1];
         u8         promisc[0x1];
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 64221027bf1f..ab310819ac36 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -172,6 +172,7 @@ enum {
 enum {
         MLX5_FENCE_MODE_NONE                    = 0 << 5,
         MLX5_FENCE_MODE_INITIATOR_SMALL         = 1 << 5,
+        MLX5_FENCE_MODE_FENCE                   = 2 << 5,
         MLX5_FENCE_MODE_STRONG_ORDERING         = 3 << 5,
         MLX5_FENCE_MODE_SMALL_AND_FENCE         = 4 << 5,
 };
@@ -460,10 +461,9 @@ struct mlx5_core_qp {
 };
 
 struct mlx5_qp_path {
-        u8                      fl;
+        u8                      fl_free_ar;
         u8                      rsvd3;
-        u8                      free_ar;
-        u8                      pkey_index;
+        __be16                  pkey_index;
         u8                      rsvd0;
         u8                      grh_mlid;
         __be16                  rlid;
@@ -560,6 +560,7 @@ struct mlx5_modify_qp_mbox_in {
         __be32                  optparam;
         u8                      rsvd0[4];
         struct mlx5_qp_context  ctx;
+        u8                      rsvd2[16];
 };
 
 struct mlx5_modify_qp_mbox_out {
diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h
index 301da4a5e6bf..6c16c198f680 100644
--- a/include/linux/mlx5/vport.h
+++ b/include/linux/mlx5/vport.h
@@ -50,6 +50,8 @@ int mlx5_modify_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 mtu);
 int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,
                                            u64 *system_image_guid);
 int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);
+int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
+                                    u32 vport, u64 node_guid);
 int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
                                         u16 *qkey_viol_cntr);
 int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5df5feb49575..ece042dfe23c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -602,7 +602,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
 }
 
 void do_set_pte(struct vm_area_struct *vma, unsigned long address,
-                struct page *page, pte_t *pte, bool write, bool anon, bool old);
+                struct page *page, pte_t *pte, bool write, bool anon);
 #endif
 
 /*
diff --git a/include/linux/namei.h b/include/linux/namei.h
index ec5ec2818a28..d3d0398f2a1b 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -45,6 +45,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_ROOT             0x2000
 #define LOOKUP_EMPTY            0x4000
 
+extern int path_pts(struct path *path);
+
 extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);
 
 static inline int user_path_at(int dfd, const char __user *name, unsigned flags,
diff --git a/include/linux/of.h b/include/linux/of.h
index c7292e8ea080..74eb28cadbef 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -614,7 +614,7 @@ static inline struct device_node *of_parse_phandle(const struct device_node *np,
         return NULL;
 }
 
-static inline int of_parse_phandle_with_args(struct device_node *np,
+static inline int of_parse_phandle_with_args(const struct device_node *np,
                                              const char *list_name,
                                              const char *cells_name,
                                              int index,
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index f6e9e85164e8..b969e9443962 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -8,7 +8,7 @@ struct pci_dev;
 struct of_phandle_args;
 struct device_node;
 
-#ifdef CONFIG_OF
+#ifdef CONFIG_OF_PCI
 int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq);
 struct device_node *of_pci_find_child_device(struct device_node *parent,
                                              unsigned int devfn);
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
index ad2f67054372..c201060e0c6d 100644
--- a/include/linux/of_reserved_mem.h
+++ b/include/linux/of_reserved_mem.h
@@ -31,6 +31,13 @@ typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem);
 int of_reserved_mem_device_init(struct device *dev);
 void of_reserved_mem_device_release(struct device *dev);
 
+int early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
+                                             phys_addr_t align,
+                                             phys_addr_t start,
+                                             phys_addr_t end,
+                                             bool nomap,
+                                             phys_addr_t *res_base);
+
 void fdt_init_reserved_mem(void);
 void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
                                phys_addr_t base, phys_addr_t size);
diff --git a/include/linux/page_idle.h b/include/linux/page_idle.h
index bf268fa92c5b..fec40271339f 100644
--- a/include/linux/page_idle.h
+++ b/include/linux/page_idle.h
@@ -46,33 +46,62 @@ extern struct page_ext_operations page_idle_ops;
 
 static inline bool page_is_young(struct page *page)
 {
-        return test_bit(PAGE_EXT_YOUNG, &lookup_page_ext(page)->flags);
+        struct page_ext *page_ext = lookup_page_ext(page);
+
+        if (unlikely(!page_ext))
+                return false;
+
+        return test_bit(PAGE_EXT_YOUNG, &page_ext->flags);
 }
 
 static inline void set_page_young(struct page *page)
 {
-        set_bit(PAGE_EXT_YOUNG, &lookup_page_ext(page)->flags);
+        struct page_ext *page_ext = lookup_page_ext(page);
+
+        if (unlikely(!page_ext))
+                return;
+
+        set_bit(PAGE_EXT_YOUNG, &page_ext->flags);
 }
 
 static inline bool test_and_clear_page_young(struct page *page)
 {
-        return test_and_clear_bit(PAGE_EXT_YOUNG,
-                                  &lookup_page_ext(page)->flags);
+        struct page_ext *page_ext = lookup_page_ext(page);
+
+        if (unlikely(!page_ext))
+                return false;
+
+        return test_and_clear_bit(PAGE_EXT_YOUNG, &page_ext->flags);
 }
 
 static inline bool page_is_idle(struct page *page)
 {
-        return test_bit(PAGE_EXT_IDLE, &lookup_page_ext(page)->flags);
+        struct page_ext *page_ext = lookup_page_ext(page);
+
+        if (unlikely(!page_ext))
+                return false;
+
+        return test_bit(PAGE_EXT_IDLE, &page_ext->flags);
 }
 
 static inline void set_page_idle(struct page *page)
 {
-        set_bit(PAGE_EXT_IDLE, &lookup_page_ext(page)->flags);
+        struct page_ext *page_ext = lookup_page_ext(page);
+
+        if (unlikely(!page_ext))
+                return;
+
+        set_bit(PAGE_EXT_IDLE, &page_ext->flags);
 }
 
 static inline void clear_page_idle(struct page *page)
 {
-        clear_bit(PAGE_EXT_IDLE, &lookup_page_ext(page)->flags);
+        struct page_ext *page_ext = lookup_page_ext(page);
+
+        if (unlikely(!page_ext))
+                return;
+
+        clear_bit(PAGE_EXT_IDLE, &page_ext->flags);
 }
 #endif /* CONFIG_64BIT */
 
diff --git a/include/linux/platform_data/omapdss.h b/include/linux/platform_data/omapdss.h
new file mode 100644
index 000000000000..679177929045
--- /dev/null
+++ b/include/linux/platform_data/omapdss.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 Texas Instruments, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __OMAPDSS_PDATA_H
+#define __OMAPDSS_PDATA_H
+
+enum omapdss_version {
+        OMAPDSS_VER_UNKNOWN = 0,
+        OMAPDSS_VER_OMAP24xx,
+        OMAPDSS_VER_OMAP34xx_ES1,       /* OMAP3430 ES1.0, 2.0 */
+        OMAPDSS_VER_OMAP34xx_ES3,       /* OMAP3430 ES3.0+ */
+        OMAPDSS_VER_OMAP3630,
+        OMAPDSS_VER_AM35xx,
+        OMAPDSS_VER_OMAP4430_ES1,       /* OMAP4430 ES1.0 */
+        OMAPDSS_VER_OMAP4430_ES2,       /* OMAP4430 ES2.0, 2.1, 2.2 */
+        OMAPDSS_VER_OMAP4,              /* All other OMAP4s */
+        OMAPDSS_VER_OMAP5,
+        OMAPDSS_VER_AM43xx,
+        OMAPDSS_VER_DRA7xx,
+};
+
+/* Board specific data */
+struct omap_dss_board_info {
+        const char *default_display_name;
+        int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask);
+        void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask);
+        int (*set_min_bus_tput)(struct device *dev, unsigned long r);
+        enum omapdss_version version;
+};
+
+#endif /* __OMAPDSS_PDATA_H */
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 17018f3c066e..908b67c847cd 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -235,6 +235,9 @@ static inline int pwm_config(struct pwm_device *pwm, int duty_ns,
         if (!pwm)
                 return -EINVAL;
 
+        if (duty_ns < 0 || period_ns < 0)
+                return -EINVAL;
+
         pwm_get_state(pwm, &state);
         if (state.duty_cycle == duty_ns && state.period == period_ns)
                 return 0;
diff --git a/include/linux/reservation.h b/include/linux/reservation.h
index 49d057655d62..b0f305e77b7f 100644
--- a/include/linux/reservation.h
+++ b/include/linux/reservation.h
@@ -49,12 +49,27 @@ extern struct ww_class reservation_ww_class;
 extern struct lock_class_key reservation_seqcount_class;
 extern const char reservation_seqcount_string[];
 
+/**
+ * struct reservation_object_list - a list of shared fences
+ * @rcu: for internal use
+ * @shared_count: table of shared fences
+ * @shared_max: for growing shared fence table
+ * @shared: shared fence table
+ */
 struct reservation_object_list {
         struct rcu_head rcu;
         u32 shared_count, shared_max;
         struct fence __rcu *shared[];
 };
 
+/**
+ * struct reservation_object - a reservation object manages fences for a buffer
+ * @lock: update side lock
+ * @seq: sequence count for managing RCU read-side synchronization
+ * @fence_excl: the exclusive fence, if there is one currently
+ * @fence: list of current shared fences
+ * @staged: staged copy of shared fences for RCU updates
+ */
 struct reservation_object {
         struct ww_mutex lock;
         seqcount_t seq;
@@ -68,6 +83,10 @@ struct reservation_object {
 #define reservation_object_assert_held(obj) \
         lockdep_assert_held(&(obj)->lock.base)
 
+/**
+ * reservation_object_init - initialize a reservation object
+ * @obj: the reservation object
+ */
 static inline void
 reservation_object_init(struct reservation_object *obj)
 {
@@ -79,6 +98,10 @@ reservation_object_init(struct reservation_object *obj)
         obj->staged = NULL;
 }
 
+/**
+ * reservation_object_fini - destroys a reservation object
+ * @obj: the reservation object
+ */
 static inline void
 reservation_object_fini(struct reservation_object *obj)
 {
@@ -106,6 +129,14 @@ reservation_object_fini(struct reservation_object *obj)
         ww_mutex_destroy(&obj->lock);
 }
 
+/**
+ * reservation_object_get_list - get the reservation object's
+ * shared fence list, with update-side lock held
+ * @obj: the reservation object
+ *
+ * Returns the shared fence list.  Does NOT take references to
+ * the fence.  The obj->lock must be held.
+ */
 static inline struct reservation_object_list *
 reservation_object_get_list(struct reservation_object *obj)
 {
@@ -113,6 +144,17 @@ reservation_object_get_list(struct reservation_object *obj)
                                          reservation_object_held(obj));
 }
 
+/**
+ * reservation_object_get_excl - get the reservation object's
+ * exclusive fence, with update-side lock held
+ * @obj: the reservation object
+ *
+ * Returns the exclusive fence (if any).  Does NOT take a
+ * reference.  The obj->lock must be held.
+ *
+ * RETURNS
+ * The exclusive fence or NULL
+ */
 static inline struct fence *
 reservation_object_get_excl(struct reservation_object *obj)
 {
@@ -120,6 +162,17 @@ reservation_object_get_excl(struct reservation_object *obj)
                                          reservation_object_held(obj));
 }
 
+/**
+ * reservation_object_get_excl_rcu - get the reservation object's
+ * exclusive fence, without lock held.
+ * @obj: the reservation object
+ *
+ * If there is an exclusive fence, this atomically increments it's
+ * reference count and returns it.
+ *
+ * RETURNS
+ * The exclusive fence or NULL if none
+ */
 static inline struct fence *
 reservation_object_get_excl_rcu(struct reservation_object *obj)
 {
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 6e42ada26345..253538f29ade 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -3007,7 +3007,7 @@ static inline int object_is_on_stack(void *obj)
         return (obj >= stack) && (obj < (stack + THREAD_SIZE));
 }
 
-extern void thread_info_cache_init(void);
+extern void thread_stack_cache_init(void);
 
 #ifdef CONFIG_DEBUG_STACK_USAGE
 static inline unsigned long stack_not_used(struct task_struct *p)
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index dacb5e711994..de1f64318fc4 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -765,6 +765,8 @@ struct sctp_info {
         __u8    sctpi_s_disable_fragments;
         __u8    sctpi_s_v4mapped;
         __u8    sctpi_s_frag_interleave;
+        __u32   sctpi_s_type;
+        __u32   __reserved3;
 };
 
 struct sctp_infox {
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 7973a821ac58..ead97654c4e9 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -277,7 +277,10 @@ static inline void raw_write_seqcount_barrier(seqcount_t *s)
 
 static inline int raw_read_seqcount_latch(seqcount_t *s)
 {
-        return lockless_dereference(s)->sequence;
+        int seq = READ_ONCE(s->sequence);
+        /* Pairs with the first smp_wmb() in raw_write_seqcount_latch() */
+        smp_read_barrier_depends();
+        return seq;
 }
 
 /**
@@ -331,7 +334,7 @@ static inline int raw_read_seqcount_latch(seqcount_t *s)
  *      unsigned seq, idx;
  *
  *      do {
- *              seq = lockless_dereference(latch)->seq;
+ *              seq = raw_read_seqcount_latch(&latch->seq);
  *
  *              idx = seq & 0x01;
  *              entry = data_query(latch->data[idx], ...);
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 19c659d1c0f8..b6810c92b8bb 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -137,8 +137,6 @@ struct rpc_create_args {
 #define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT      (1UL << 9)
 
 struct rpc_clnt *rpc_create(struct rpc_create_args *args);
-struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
-                                        struct rpc_xprt *xprt);
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
                                 const struct rpc_program *, u32);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index b7dabc4baafd..79ba50856707 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -84,6 +84,7 @@ struct svc_xprt {
 
         struct net              *xpt_net;
         struct rpc_xprt         *xpt_bc_xprt;   /* NFSv4.1 backchannel */
+        struct rpc_xprt_switch  *xpt_bc_xps;    /* NFSv4.1 backchannel */
 };
 
 static inline void unregister_xpt_user(struct svc_xprt *xpt, struct svc_xpt_user *u)
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 5aa3834619a8..5e3e1b63dbb3 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -297,6 +297,7 @@ struct xprt_create {
         size_t                  addrlen;
         const char              *servername;
         struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
+        struct rpc_xprt_switch  *bc_xps;
         unsigned int            flags;
 };
 
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index e45abe7db9a6..ee517bef0db0 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -335,6 +335,8 @@ struct thermal_genl_event {
  * @get_trend: a pointer to a function that reads the sensor temperature trend.
  * @set_emul_temp: a pointer to a function that sets sensor emulated
  *                 temperature.
+ * @set_trip_temp: a pointer to a function that sets the trip temperature on
+ *                 hardware.
  */
 struct thermal_zone_of_device_ops {
         int (*get_temp)(void *, int *);
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 37dbacf84849..816b7543f81b 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -21,6 +21,9 @@ static inline int do_sys_settimeofday(const struct timespec *tv,
         struct timespec64 ts64;
 
         if (!tv)
+                return do_sys_settimeofday64(NULL, tz);
+
+        if (!timespec_valid(tv))
                 return -EINVAL;
 
         ts64 = timespec_to_timespec64(*tv);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 457651bf45b0..fefe8b06a63d 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -1034,6 +1034,8 @@ static inline int usb_gadget_activate(struct usb_gadget *gadget)
  * @udc_name: A name of UDC this driver should be bound to. If udc_name is NULL,
  *      this driver will be bound to any available UDC.
  * @pending: UDC core private data used for deferred probe of this driver.
+ * @match_existing_only: If udc is not found, return an error and don't add this
+ *      gadget driver to list of pending driver
  *
  * Devices are disabled till a gadget driver successfully bind()s, which
  * means the driver will handle setup() requests needed to enumerate (and
@@ -1097,6 +1099,7 @@ struct usb_gadget_driver {
 
         char                    *udc_name;
         struct list_head        pending;
+        unsigned                match_existing_only:1;
 };
 
 
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 0b3da40a525e..d315c8907869 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -142,10 +142,11 @@ enum musb_vbus_id_status {
 };
 
 #if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
-void musb_mailbox(enum musb_vbus_id_status status);
+int musb_mailbox(enum musb_vbus_id_status status);
 #else
-static inline void musb_mailbox(enum musb_vbus_id_status status)
+static inline int musb_mailbox(enum musb_vbus_id_status status)
 {
+        return 0;
 }
 #endif
 
diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index b39a5f3153bd..960bedbdec87 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -165,6 +165,7 @@ int vga_switcheroo_unlock_ddc(struct pci_dev *pdev);
 
 int vga_switcheroo_process_delayed_switch(void);
 
+bool vga_switcheroo_client_probe_defer(struct pci_dev *pdev);
 enum vga_switcheroo_state vga_switcheroo_get_client_state(struct pci_dev *dev);
 
 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
@@ -188,6 +189,7 @@ static inline enum vga_switcheroo_handler_flags_t vga_switcheroo_handler_flags(v
 static inline int vga_switcheroo_lock_ddc(struct pci_dev *pdev) { return -ENODEV; }
 static inline int vga_switcheroo_unlock_ddc(struct pci_dev *pdev) { return -ENODEV; }
 static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
+static inline bool vga_switcheroo_client_probe_defer(struct pci_dev *pdev) { return false; }
 static inline enum vga_switcheroo_state vga_switcheroo_get_client_state(struct pci_dev *dev) { return VGA_SWITCHEROO_ON; }
 
 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 98a938aabdfb..7a8d6037a4bb 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -1,7 +1,7 @@
 /*
  * v4l2-mc.h - Media Controller V4L2 types and prototypes
  *
- * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@kernel.org>
  * Copyright (C) 2006-2010 Nokia Corporation
  * Copyright (c) 2016 Intel Corporation.
  *
diff --git a/include/net/compat.h b/include/net/compat.h
index 48103cf94e97..13de0ccaa059 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -42,6 +42,7 @@ int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
 
 int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *,
                       struct sockaddr __user **, struct iovec **);
+struct sock_fprog __user *get_compat_bpf_fprog(char __user *optval);
 asmlinkage long compat_sys_sendmsg(int, struct compat_msghdr __user *,
                                    unsigned int);
 asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *,
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index d325c81332e3..43a5a0e4524c 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -63,6 +63,8 @@ struct ip6_tnl_encap_ops {
                             u8 *protocol, struct flowi6 *fl6);
 };
 
+#ifdef CONFIG_INET
+
 extern const struct ip6_tnl_encap_ops __rcu *
                 ip6tun_encaps[MAX_IPTUN_ENCAP_OPS];
 
@@ -138,7 +140,6 @@ struct net *ip6_tnl_get_link_net(const struct net_device *dev);
 int ip6_tnl_get_iflink(const struct net_device *dev);
 int ip6_tnl_change_mtu(struct net_device *dev, int new_mtu);
 
-#ifdef CONFIG_INET
 static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
                                   struct net_device *dev)
 {
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index af4c10ebb241..cd6018a9ee24 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1232,7 +1232,7 @@ void ip_vs_conn_expire_now(struct ip_vs_conn *cp);
 const char *ip_vs_state_name(__u16 proto, int state);
 
 void ip_vs_tcp_conn_listen(struct ip_vs_conn *cp);
-int ip_vs_check_template(struct ip_vs_conn *ct);
+int ip_vs_check_template(struct ip_vs_conn *ct, struct ip_vs_dest *cdest);
 void ip_vs_random_dropentry(struct netns_ipvs *ipvs);
 int ip_vs_conn_init(void);
 void ip_vs_conn_cleanup(void);
diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
index 9c5638ad872e..0dbce55437f2 100644
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
@@ -28,8 +28,8 @@ struct nf_queue_handler {
                                                 struct nf_hook_ops *ops);
 };
 
-void nf_register_queue_handler(const struct nf_queue_handler *qh);
-void nf_unregister_queue_handler(void);
+void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh);
+void nf_unregister_queue_handler(struct net *net);
 void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
 
 void nf_queue_entry_get_refs(struct nf_queue_entry *entry);
diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h
index 38aa4983e2a9..36d723579af2 100644
--- a/include/net/netns/netfilter.h
+++ b/include/net/netns/netfilter.h
@@ -5,11 +5,13 @@
 
 struct proc_dir_entry;
 struct nf_logger;
+struct nf_queue_handler;
 
 struct netns_nf {
 #if defined CONFIG_PROC_FS
         struct proc_dir_entry *proc_netfilter;
 #endif
+        const struct nf_queue_handler __rcu *queue_handler;
         const struct nf_logger __rcu *nf_loggers[NFPROTO_NUMPROTO];
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *nf_log_dir_header;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 0f7efa88f210..3722dda0199d 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -392,16 +392,20 @@ struct tc_cls_u32_offload {
         };
 };
 
-static inline bool tc_should_offload(struct net_device *dev, u32 flags)
+static inline bool tc_should_offload(const struct net_device *dev,
+                                     const struct tcf_proto *tp, u32 flags)
 {
+        const struct Qdisc *sch = tp->q;
+        const struct Qdisc_class_ops *cops = sch->ops->cl_ops;
+
         if (!(dev->features & NETIF_F_HW_TC))
                 return false;
-
         if (flags & TCA_CLS_FLAGS_SKIP_HW)
                 return false;
-
         if (!dev->netdev_ops->ndo_setup_tc)
                 return false;
+        if (cops && cops->tcf_cl_offload)
+                return cops->tcf_cl_offload(tp->classid);
 
         return true;
 }
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 401038d2f9b8..fea53f4d92ca 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -61,6 +61,7 @@ psched_tdiff_bounded(psched_time_t tv1, psched_time_t tv2, psched_time_t bound)
 }
 
 struct qdisc_watchdog {
+        u64             last_expires;
         struct hrtimer  timer;
         struct Qdisc    *qdisc;
 };
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index a1fd76c22a59..62d553184e91 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -168,6 +168,7 @@ struct Qdisc_class_ops {
 
         /* Filter manipulation */
         struct tcf_proto __rcu ** (*tcf_chain)(struct Qdisc *, unsigned long);
+        bool                    (*tcf_cl_offload)(u32 classid);
         unsigned long           (*bind_tcf)(struct Qdisc *, unsigned long,
                                         u32 classid);
         void                    (*unbind_tcf)(struct Qdisc *, unsigned long);
@@ -691,9 +692,11 @@ static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)
         /* we can reuse ->gso_skb because peek isn't called for root qdiscs */
         if (!sch->gso_skb) {
                 sch->gso_skb = sch->dequeue(sch);
-                if (sch->gso_skb)
+                if (sch->gso_skb) {
                         /* it's still part of the queue */
+                        qdisc_qstats_backlog_inc(sch, sch->gso_skb);
                         sch->q.qlen++;
+                }
         }
 
         return sch->gso_skb;
@@ -706,6 +709,7 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
 
         if (skb) {
                 sch->gso_skb = NULL;
+                qdisc_qstats_backlog_dec(sch, skb);
                 sch->q.qlen--;
         } else {
                 skb = sch->dequeue(sch);
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 432bed510369..7e440d41487a 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -217,10 +217,10 @@ enum ib_device_cap_flags {
         IB_DEVICE_CROSS_CHANNEL         = (1 << 27),
         IB_DEVICE_MANAGED_FLOW_STEERING         = (1 << 29),
         IB_DEVICE_SIGNATURE_HANDOVER            = (1 << 30),
-        IB_DEVICE_ON_DEMAND_PAGING              = (1 << 31),
+        IB_DEVICE_ON_DEMAND_PAGING              = (1ULL << 31),
         IB_DEVICE_SG_GAPS_REG                   = (1ULL << 32),
-        IB_DEVICE_VIRTUAL_FUNCTION              = ((u64)1 << 33),
-        IB_DEVICE_RAW_SCATTER_FCS               = ((u64)1 << 34),
+        IB_DEVICE_VIRTUAL_FUNCTION              = (1ULL << 33),
+        IB_DEVICE_RAW_SCATTER_FCS               = (1ULL << 34),
 };
 
 enum ib_signature_prot_cap {
diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 16274e2133cd..9c9a27d42aaa 100644
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -203,7 +203,9 @@ struct rvt_driver_provided {
 
         /*
          * Allocate a private queue pair data structure for driver specific
-         * information which is opaque to rdmavt.
+         * information which is opaque to rdmavt.  Errors are returned via
+         * ERR_PTR(err).  The driver is free to return NULL or a valid
+         * pointer.
          */
         void * (*qp_priv_alloc)(struct rvt_dev_info *rdi, struct rvt_qp *qp,
                                 gfp_t gfp);
diff --git a/include/sound/omap-hdmi-audio.h b/include/sound/omap-hdmi-audio.h
index afdb416898e0..1df2ff61a4dd 100644
--- a/include/sound/omap-hdmi-audio.h
+++ b/include/sound/omap-hdmi-audio.h
@@ -16,11 +16,16 @@
  *
  */
 
-#include <video/omapdss.h>
-
 #ifndef __OMAP_HDMI_AUDIO_H__
 #define __OMAP_HDMI_AUDIO_H__
 
+#include <linux/platform_data/omapdss.h>
+
+struct omap_dss_audio {
+        struct snd_aes_iec958 *iec;
+        struct snd_cea_861_aud_if *cea;
+};
+
 struct omap_hdmi_audio_ops {
         int (*audio_startup)(struct device *dev,
                              void (*abort_cb)(struct device *dev));
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index 23c6960e94a4..2bdd1e3e7007 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 {
         };
         union {
                 char name[BTRFS_SUBVOL_NAME_MAX + 1];
-                u64 devid;
+                __u64 devid;
         };
 };
 
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 9222db8ccccc..5f030b46cff4 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1353,6 +1353,15 @@ enum ethtool_link_mode_bit_indices {
         ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,
         ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
         ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
+        ETHTOOL_LINK_MODE_25000baseCR_Full_BIT  = 31,
+        ETHTOOL_LINK_MODE_25000baseKR_Full_BIT  = 32,
+        ETHTOOL_LINK_MODE_25000baseSR_Full_BIT  = 33,
+        ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,
+        ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT = 35,
+        ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT        = 36,
+        ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT        = 37,
+        ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT        = 38,
+        ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT    = 39,
 
         /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
          * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1361,7 +1370,7 @@ enum ethtool_link_mode_bit_indices {
          */
 
         __ETHTOOL_LINK_MODE_LAST
-          = ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT,
+          = ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,
 };
 
 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name)      \
diff --git a/include/uapi/linux/gtp.h b/include/uapi/linux/gtp.h
index ca1054dd8249..72a04a0e8cce 100644
--- a/include/uapi/linux/gtp.h
+++ b/include/uapi/linux/gtp.h
@@ -1,5 +1,5 @@
 #ifndef _UAPI_LINUX_GTP_H_
-#define _UAPI_LINUX_GTP_H__
+#define _UAPI_LINUX_GTP_H_
 
 enum gtp_genl_cmds {
         GTP_CMD_NEWPDP,
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index eba5914ba5d1..f4297c8a42fe 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -145,6 +145,8 @@ enum {
         TCA_POLICE_PEAKRATE,
         TCA_POLICE_AVRATE,
         TCA_POLICE_RESULT,
+        TCA_POLICE_TM,
+        TCA_POLICE_PAD,
         __TCA_POLICE_MAX
 #define TCA_POLICE_RESULT TCA_POLICE_RESULT
 };
@@ -173,7 +175,7 @@ enum {
         TCA_U32_DIVISOR,
         TCA_U32_SEL,
         TCA_U32_POLICE,
-        TCA_U32_ACT,   
+        TCA_U32_ACT,
         TCA_U32_INDEV,
         TCA_U32_PCNT,
         TCA_U32_MARK,
diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild
index a7f27704f980..691984cb0b91 100644
--- a/include/uapi/sound/Kbuild
+++ b/include/uapi/sound/Kbuild
@@ -1,5 +1,6 @@
 # UAPI Header export list
 header-y += asequencer.h
+header-y += asoc.h
 header-y += asound.h
 header-y += asound_fm.h
 header-y += compress_offload.h
@@ -10,3 +11,5 @@ header-y += hdsp.h
 header-y += hdspm.h
 header-y += sb16_csp.h
 header-y += sfnt_info.h
+header-y += tlv.h
+header-y += usb_stream.h
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 56830d1dc762..e7003ee6e063 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -27,59 +27,18 @@
 #ifndef __OMAP_PANEL_DATA_H
 #define __OMAP_PANEL_DATA_H
 
-#include <video/omapdss.h>
 #include <video/display_timing.h>
 
-struct omap_dss_device;
-
-/**
- * encoder_tfp410 platform data
- * @name: name for this display entity
- * @power_down_gpio: gpio number for PD pin (or -1 if not available)
- * @data_lines: number of DPI datalines
- */
-struct encoder_tfp410_platform_data {
-        const char *name;
-        const char *source;
-        int power_down_gpio;
-        int data_lines;
-};
-
-
-/**
- * connector_dvi platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @i2c_bus_num: i2c bus number to be used for reading EDID
- */
-struct connector_dvi_platform_data {
-        const char *name;
-        const char *source;
-        int i2c_bus_num;
-};
-
-/**
- * connector_hdmi platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- */
-struct connector_hdmi_platform_data {
-        const char *name;
-        const char *source;
-};
-
 /**
  * connector_atv platform data
  * @name: name for this display entity
  * @source: name of the display entity used as a video source
- * @connector_type: composite/svideo
  * @invert_polarity: invert signal polarity
  */
 struct connector_atv_platform_data {
         const char *name;
         const char *source;
 
-        enum omap_dss_venc_type connector_type;
         bool invert_polarity;
 };
 
@@ -105,33 +64,6 @@ struct panel_dpi_platform_data {
 };
 
 /**
- * panel_dsicm platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @reset_gpio: gpio to reset the panel (or -1)
- * @use_ext_te: use external TE GPIO
- * @ext_te_gpio: external TE GPIO
- * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
- * @use_dsi_backlight: true if panel uses DSI command to control backlight
- * @pin_config: DSI pin configuration
- */
-struct panel_dsicm_platform_data {
-        const char *name;
-        const char *source;
-
-        int reset_gpio;
-
-        bool use_ext_te;
-        int ext_te_gpio;
-
-        unsigned ulps_timeout;
-
-        bool use_dsi_backlight;
-
-        struct omap_dsi_pin_config pin_config;
-};
-
-/**
  * panel_acx565akm platform data
  * @name: name for this display entity
  * @source: name of the display entity used as a video source
@@ -147,93 +79,4 @@ struct panel_acx565akm_platform_data {
         int datapairs;
 };
 
-/**
- * panel_lb035q02 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @backlight_gpio: gpio to enable/disable the backlight (or -1)
- * @enable_gpio: gpio to enable/disable the panel (or -1)
- */
-struct panel_lb035q02_platform_data {
-        const char *name;
-        const char *source;
-
-        int data_lines;
-
-        int backlight_gpio;
-        int enable_gpio;
-};
-
-/**
- * panel_sharp_ls037v7dw01 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @resb_gpio: reset signal GPIO
- * @ini_gpio: power on control GPIO
- * @mo_gpio: selection for resolution(VGA/QVGA) GPIO
- * @lr_gpio: selection for horizontal scanning direction GPIO
- * @ud_gpio: selection for vertical scanning direction GPIO
- */
-struct panel_sharp_ls037v7dw01_platform_data {
-        const char *name;
-        const char *source;
-
-        int data_lines;
-
-        int resb_gpio;
-        int ini_gpio;
-        int mo_gpio;
-        int lr_gpio;
-        int ud_gpio;
-};
-
-/**
- * panel-tpo-td043mtea1 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @nreset_gpio: reset signal
- */
-struct panel_tpo_td043mtea1_platform_data {
-        const char *name;
-        const char *source;
-
-        int data_lines;
-
-        int nreset_gpio;
-};
-
-/**
- * panel-nec-nl8048hl11 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @res_gpio: reset signal
- * @qvga_gpio: selection for resolution(QVGA/WVGA)
- */
-struct panel_nec_nl8048hl11_platform_data {
-        const char *name;
-        const char *source;
-
-        int data_lines;
-
-        int res_gpio;
-        int qvga_gpio;
-};
-
-/**
- * panel-tpo-td028ttec1 platform data
- * @name: name for display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- */
-struct panel_tpo_td028ttec1_platform_data {
-        const char *name;
-        const char *source;
-
-        int data_lines;
-};
-
 #endif /* __OMAP_PANEL_DATA_H */
diff --git a/include/video/omapdss.h b/include/video/omapfb_dss.h
index 8e14ad7327c9..1d38901d599d 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapfb_dss.h
@@ -1,27 +1,20 @@
 /*
- * Copyright (C) 2008 Nokia Corporation
- * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ * Copyright (C) 2016 Texas Instruments, Inc.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  */
 
-#ifndef __OMAP_OMAPDSS_H
-#define __OMAP_OMAPDSS_H
+#ifndef __OMAPFB_DSS_H
+#define __OMAPFB_DSS_H
 
 #include <linux/list.h>
 #include <linux/kobject.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/platform_data/omapdss.h>
 
 #include <video/videomode.h>
 
@@ -167,11 +160,6 @@ enum omap_dss_display_state {
         OMAP_DSS_DISPLAY_ACTIVE,
 };
 
-struct omap_dss_audio {
-        struct snd_aes_iec958 *iec;
-        struct snd_cea_861_aud_if *cea;
-};
-
 enum omap_dss_rotation_type {
         OMAP_DSS_ROT_DMA        = 1 << 0,
         OMAP_DSS_ROT_VRFB       = 1 << 1,
@@ -195,25 +183,6 @@ enum omap_overlay_caps {
         OMAP_DSS_OVL_CAP_REPLICATION = 1 << 5,
 };
 
-enum omap_overlay_manager_caps {
-        OMAP_DSS_DUMMY_VALUE, /* add a dummy value to prevent compiler error */
-};
-
-enum omap_dss_clk_source {
-        OMAP_DSS_CLK_SRC_FCK = 0,               /* OMAP2/3: DSS1_ALWON_FCLK
-                                                 * OMAP4: DSS_FCLK */
-        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC,   /* OMAP3: DSI1_PLL_FCLK
-                                                 * OMAP4: PLL1_CLK1 */
-        OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI,     /* OMAP3: DSI2_PLL_FCLK
-                                                 * OMAP4: PLL1_CLK2 */
-        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC,  /* OMAP4: PLL2_CLK1 */
-        OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,    /* OMAP4: PLL2_CLK2 */
-};
-
-enum omap_hdmi_flags {
-        OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0,
-};
-
 enum omap_dss_output_id {
         OMAP_DSS_OUTPUT_DPI     = 1 << 0,
         OMAP_DSS_OUTPUT_DBI     = 1 << 1,
@@ -303,36 +272,6 @@ struct omap_dss_dsi_config {
         enum omap_dss_dsi_trans_mode trans_mode;
 };
 
-enum omapdss_version {
-        OMAPDSS_VER_UNKNOWN = 0,
-        OMAPDSS_VER_OMAP24xx,
-        OMAPDSS_VER_OMAP34xx_ES1,       /* OMAP3430 ES1.0, 2.0 */
-        OMAPDSS_VER_OMAP34xx_ES3,       /* OMAP3430 ES3.0+ */
-        OMAPDSS_VER_OMAP3630,
-        OMAPDSS_VER_AM35xx,
-        OMAPDSS_VER_OMAP4430_ES1,       /* OMAP4430 ES1.0 */
-        OMAPDSS_VER_OMAP4430_ES2,       /* OMAP4430 ES2.0, 2.1, 2.2 */
-        OMAPDSS_VER_OMAP4,              /* All other OMAP4s */
-        OMAPDSS_VER_OMAP5,
-        OMAPDSS_VER_AM43xx,
-        OMAPDSS_VER_DRA7xx,
-};
-
-/* Board specific data */
-struct omap_dss_board_info {
-        int num_devices;
-        struct omap_dss_device **devices;
-        struct omap_dss_device *default_device;
-        const char *default_display_name;
-        int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask);
-        void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask);
-        int (*set_min_bus_tput)(struct device *dev, unsigned long r);
-        enum omapdss_version version;
-};
-
-/* Init with the board info */
-extern int omap_display_init(struct omap_dss_board_info *board_data);
-
 struct omap_video_timings {
         /* Unit: pixels */
         u16 x_res;
@@ -463,7 +402,6 @@ struct omap_overlay_manager {
         /* static fields */
         const char *name;
         enum omap_channel id;
-        enum omap_overlay_manager_caps caps;
         struct list_head overlays;
         enum omap_display_type supported_displays;
         enum omap_dss_output_id supported_outputs;
@@ -919,4 +857,4 @@ omapdss_of_get_first_endpoint(const struct device_node *parent);
 struct omap_dss_device *
 omapdss_of_find_source_for_first_ep(struct device_node *node);
 
-#endif
+#endif /* __OMAPFB_DSS_H */
diff --git a/init/main.c b/init/main.c
index 4c17fda5c2ff..eae02aa03c9e 100644
--- a/init/main.c
+++ b/init/main.c
@@ -453,7 +453,7 @@ void __init __weak smp_setup_processor_id(void)
 }
 
 # if THREAD_SIZE >= PAGE_SIZE
-void __init __weak thread_info_cache_init(void)
+void __init __weak thread_stack_cache_init(void)
 {
 }
 #endif
@@ -627,7 +627,7 @@ asmlinkage __visible void __init start_kernel(void)
         /* Should be run before the first non-init thread is created */
         init_espfix_bsp();
 #endif
-        thread_info_cache_init();
+        thread_stack_cache_init();
         cred_init();
         fork_init();
         proc_caches_init();
@@ -708,11 +708,13 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
 {
         struct blacklist_entry *entry;
         char fn_name[KSYM_SYMBOL_LEN];
+        unsigned long addr;
 
         if (list_empty(&blacklisted_initcalls))
                 return false;
 
-        sprint_symbol_no_offset(fn_name, (unsigned long)fn);
+        addr = (unsigned long) dereference_function_descriptor(fn);
+        sprint_symbol_no_offset(fn_name, addr);
 
         list_for_each_entry(entry, &blacklisted_initcalls, next) {
                 if (!strcmp(fn_name, entry->buf)) {
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 04be7021f848..318858edb1cd 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -365,7 +365,6 @@ static struct file_system_type bpf_fs_type = {
         .name           = "bpf",
         .mount          = bpf_mount,
         .kill_sb        = kill_litter_super,
-        .fs_flags       = FS_USERNS_MOUNT,
 };
 
 MODULE_ALIAS_FS("bpf");
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 274450efea90..9c51ec3f0f44 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3862,10 +3862,8 @@ static void _free_event(struct perf_event *event)
         if (event->ctx)
                 put_ctx(event->ctx);
 
-        if (event->pmu) {
-                exclusive_event_destroy(event);
-                module_put(event->pmu->module);
-        }
+        exclusive_event_destroy(event);
+        module_put(event->pmu->module);
 
         call_rcu(&event->rcu_head, free_event_rcu);
 }
diff --git a/kernel/fork.c b/kernel/fork.c
index 5c2c355aa97f..4a7ec0c6c88c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -148,18 +148,18 @@ static inline void free_task_struct(struct task_struct *tsk)
 }
 #endif
 
-void __weak arch_release_thread_info(struct thread_info *ti)
+void __weak arch_release_thread_stack(unsigned long *stack)
 {
 }
 
-#ifndef CONFIG_ARCH_THREAD_INFO_ALLOCATOR
+#ifndef CONFIG_ARCH_THREAD_STACK_ALLOCATOR
 
 /*
  * Allocate pages if THREAD_SIZE is >= PAGE_SIZE, otherwise use a
  * kmemcache based allocator.
  */
 # if THREAD_SIZE >= PAGE_SIZE
-static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
+static unsigned long *alloc_thread_stack_node(struct task_struct *tsk,
                                                   int node)
 {
         struct page *page = alloc_kmem_pages_node(node, THREADINFO_GFP,
@@ -172,33 +172,33 @@ static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
         return page ? page_address(page) : NULL;
 }
 
-static inline void free_thread_info(struct thread_info *ti)
+static inline void free_thread_stack(unsigned long *stack)
 {
-        struct page *page = virt_to_page(ti);
+        struct page *page = virt_to_page(stack);
 
         memcg_kmem_update_page_stat(page, MEMCG_KERNEL_STACK,
                                     -(1 << THREAD_SIZE_ORDER));
         __free_kmem_pages(page, THREAD_SIZE_ORDER);
 }
 # else
-static struct kmem_cache *thread_info_cache;
+static struct kmem_cache *thread_stack_cache;
 
-static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
+static unsigned long *alloc_thread_stack_node(struct task_struct *tsk,
                                                   int node)
 {
-        return kmem_cache_alloc_node(thread_info_cache, THREADINFO_GFP, node);
+        return kmem_cache_alloc_node(thread_stack_cache, THREADINFO_GFP, node);
 }
 
-static void free_thread_info(struct thread_info *ti)
+static void free_thread_stack(unsigned long *stack)
 {
-        kmem_cache_free(thread_info_cache, ti);
+        kmem_cache_free(thread_stack_cache, stack);
 }
 
-void thread_info_cache_init(void)
+void thread_stack_cache_init(void)
 {
-        thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
+        thread_stack_cache = kmem_cache_create("thread_stack", THREAD_SIZE,
                                               THREAD_SIZE, 0, NULL);
-        BUG_ON(thread_info_cache == NULL);
+        BUG_ON(thread_stack_cache == NULL);
 }
 # endif
 #endif
@@ -221,9 +221,9 @@ struct kmem_cache *vm_area_cachep;
 /* SLAB cache for mm_struct structures (tsk->mm) */
 static struct kmem_cache *mm_cachep;
 
-static void account_kernel_stack(struct thread_info *ti, int account)
+static void account_kernel_stack(unsigned long *stack, int account)
 {
-        struct zone *zone = page_zone(virt_to_page(ti));
+        struct zone *zone = page_zone(virt_to_page(stack));
 
         mod_zone_page_state(zone, NR_KERNEL_STACK, account);
 }
@@ -231,8 +231,8 @@ static void account_kernel_stack(struct thread_info *ti, int account)
 void free_task(struct task_struct *tsk)
 {
         account_kernel_stack(tsk->stack, -1);
-        arch_release_thread_info(tsk->stack);
-        free_thread_info(tsk->stack);
+        arch_release_thread_stack(tsk->stack);
+        free_thread_stack(tsk->stack);
         rt_mutex_debug_task_free(tsk);
         ftrace_graph_exit_task(tsk);
         put_seccomp_filter(tsk);
@@ -343,7 +343,7 @@ void set_task_stack_end_magic(struct task_struct *tsk)
 static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
 {
         struct task_struct *tsk;
-        struct thread_info *ti;
+        unsigned long *stack;
         int err;
 
         if (node == NUMA_NO_NODE)
@@ -352,15 +352,15 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
         if (!tsk)
                 return NULL;
 
-        ti = alloc_thread_info_node(tsk, node);
-        if (!ti)
+        stack = alloc_thread_stack_node(tsk, node);
+        if (!stack)
                 goto free_tsk;
 
         err = arch_dup_task_struct(tsk, orig);
         if (err)
-                goto free_ti;
+                goto free_stack;
 
-        tsk->stack = ti;
+        tsk->stack = stack;
 #ifdef CONFIG_SECCOMP
         /*
          * We must handle setting up seccomp filters once we're under
@@ -392,14 +392,14 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
         tsk->task_frag.page = NULL;
         tsk->wake_q.next = NULL;
 
-        account_kernel_stack(ti, 1);
+        account_kernel_stack(stack, 1);
 
         kcov_task_init(tsk);
 
         return tsk;
 
-free_ti:
-        free_thread_info(ti);
+free_stack:
+        free_thread_stack(stack);
 free_tsk:
         free_task_struct(tsk);
         return NULL;
diff --git a/kernel/futex.c b/kernel/futex.c
index ee25f5ba4aca..33664f70e2d2 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -469,7 +469,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
 {
         unsigned long address = (unsigned long)uaddr;
         struct mm_struct *mm = current->mm;
-        struct page *page;
+        struct page *page, *tail;
         struct address_space *mapping;
         int err, ro = 0;
 
@@ -530,7 +530,15 @@ again:
          * considered here and page lock forces unnecessarily serialization
          * From this point on, mapping will be re-verified if necessary and
          * page lock will be acquired only if it is unavoidable
-         */
+         *
+         * Mapping checks require the head page for any compound page so the
+         * head page and mapping is looked up now. For anonymous pages, it
+         * does not matter if the page splits in the future as the key is
+         * based on the address. For filesystem-backed pages, the tail is
+         * required as the index of the page determines the key. For
+         * base pages, there is no tail page and tail == page.
+         */
+        tail = page;
         page = compound_head(page);
         mapping = READ_ONCE(page->mapping);
 
@@ -654,7 +662,7 @@ again:
 
                 key->both.offset |= FUT_OFF_INODE; /* inode-based key */
                 key->shared.inode = inode;
-                key->shared.pgoff = basepage_index(page);
+                key->shared.pgoff = basepage_index(tail);
                 rcu_read_unlock();
         }
 
diff --git a/kernel/irq/ipi.c b/kernel/irq/ipi.c
index c42742208e5e..89b49f6773f0 100644
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -125,7 +125,7 @@ int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest)
 
         domain = data->domain;
         if (WARN_ON(domain == NULL))
-                return;
+                return -EINVAL;
 
         if (!irq_domain_is_ipi(domain)) {
                 pr_warn("Trying to destroy a non IPI domain!\n");
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 05254eeb4b4e..4b353e0be121 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -58,13 +58,36 @@ static void jump_label_update(struct static_key *key);
 
 void static_key_slow_inc(struct static_key *key)
 {
+        int v, v1;
+
         STATIC_KEY_CHECK_USE();
-        if (atomic_inc_not_zero(&key->enabled))
-                return;
+
+        /*
+         * Careful if we get concurrent static_key_slow_inc() calls;
+         * later calls must wait for the first one to _finish_ the
+         * jump_label_update() process.  At the same time, however,
+         * the jump_label_update() call below wants to see
+         * static_key_enabled(&key) for jumps to be updated properly.
+         *
+         * So give a special meaning to negative key->enabled: it sends
+         * static_key_slow_inc() down the slow path, and it is non-zero
+         * so it counts as "enabled" in jump_label_update().  Note that
+         * atomic_inc_unless_negative() checks >= 0, so roll our own.
+         */
+        for (v = atomic_read(&key->enabled); v > 0; v = v1) {
+                v1 = atomic_cmpxchg(&key->enabled, v, v + 1);
+                if (likely(v1 == v))
+                        return;
+        }
 
         jump_label_lock();
-        if (atomic_inc_return(&key->enabled) == 1)
+        if (atomic_read(&key->enabled) == 0) {
+                atomic_set(&key->enabled, -1);
                 jump_label_update(key);
+                atomic_set(&key->enabled, 1);
+        } else {
+                atomic_inc(&key->enabled);
+        }
         jump_label_unlock();
 }
 EXPORT_SYMBOL_GPL(static_key_slow_inc);
@@ -72,6 +95,13 @@ EXPORT_SYMBOL_GPL(static_key_slow_inc);
 static void __static_key_slow_dec(struct static_key *key,
                 unsigned long rate_limit, struct delayed_work *work)
 {
+        /*
+         * The negative count check is valid even when a negative
+         * key->enabled is in use by static_key_slow_inc(); a
+         * __static_key_slow_dec() before the first static_key_slow_inc()
+         * returns is unbalanced, because all other static_key_slow_inc()
+         * instances block while the update is in progress.
+         */
         if (!atomic_dec_and_mutex_lock(&key->enabled, &jump_label_mutex)) {
                 WARN(atomic_read(&key->enabled) < 0,
                      "jump label: negative count!\n");
diff --git a/kernel/kcov.c b/kernel/kcov.c
index a02f2dddd1d7..8d44b3fea9d0 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -264,7 +264,12 @@ static const struct file_operations kcov_fops = {
 
 static int __init kcov_init(void)
 {
-        if (!debugfs_create_file("kcov", 0600, NULL, NULL, &kcov_fops)) {
+        /*
+         * The kcov debugfs file won't ever get removed and thus,
+         * there is no need to protect it against removal races. The
+         * use of debugfs_create_file_unsafe() is actually safe here.
+         */
+        if (!debugfs_create_file_unsafe("kcov", 0600, NULL, NULL, &kcov_fops)) {
                 pr_err("failed to create kcov in debugfs\n");
                 return -ENOMEM;
         }
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
index 3ef3736002d8..9c951fade415 100644
--- a/kernel/locking/mutex-debug.c
+++ b/kernel/locking/mutex-debug.c
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
 }
 
 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
-                            struct thread_info *ti)
+                            struct task_struct *task)
 {
         SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
 
         /* Mark the current thread as blocked on the lock: */
-        ti->task->blocked_on = waiter;
+        task->blocked_on = waiter;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
-                         struct thread_info *ti)
+                         struct task_struct *task)
 {
         DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
-        DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
-        DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
-        ti->task->blocked_on = NULL;
+        DEBUG_LOCKS_WARN_ON(waiter->task != task);
+        DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
+        task->blocked_on = NULL;
 
         list_del_init(&waiter->list);
         waiter->task = NULL;
diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
index 0799fd3e4cfa..d06ae3bb46c5 100644
--- a/kernel/locking/mutex-debug.h
+++ b/kernel/locking/mutex-debug.h
@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
 extern void debug_mutex_add_waiter(struct mutex *lock,
                                    struct mutex_waiter *waiter,
-                                   struct thread_info *ti);
+                                   struct task_struct *task);
 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
-                                struct thread_info *ti);
+                                struct task_struct *task);
 extern void debug_mutex_unlock(struct mutex *lock);
 extern void debug_mutex_init(struct mutex *lock, const char *name,
                              struct lock_class_key *key);
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index e364b424b019..a70b90db3909 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -486,9 +486,6 @@ __ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx)
         if (!hold_ctx)
                 return 0;
 
-        if (unlikely(ctx == hold_ctx))
-                return -EALREADY;
-
         if (ctx->stamp - hold_ctx->stamp <= LONG_MAX &&
             (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) {
 #ifdef CONFIG_DEBUG_MUTEXES
@@ -514,6 +511,12 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
         unsigned long flags;
         int ret;
 
+        if (use_ww_ctx) {
+                struct ww_mutex *ww = container_of(lock, struct ww_mutex, base);
+                if (unlikely(ww_ctx == READ_ONCE(ww->ctx)))
+                        return -EALREADY;
+        }
+
         preempt_disable();
         mutex_acquire_nest(&lock->dep_map, subclass, 0, nest_lock, ip);
 
@@ -534,7 +537,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
                 goto skip_wait;
 
         debug_mutex_lock_common(lock, &waiter);
-        debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
+        debug_mutex_add_waiter(lock, &waiter, task);
 
         /* add waiting tasks to the end of the waitqueue (FIFO): */
         list_add_tail(&waiter.list, &lock->wait_list);
@@ -581,7 +584,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
         }
         __set_task_state(task, TASK_RUNNING);
 
-        mutex_remove_waiter(lock, &waiter, current_thread_info());
+        mutex_remove_waiter(lock, &waiter, task);
         /* set it to 0 if there are no waiters left: */
         if (likely(list_empty(&lock->wait_list)))
                 atomic_set(&lock->count, 0);
@@ -602,7 +605,7 @@ skip_wait:
         return 0;
 
 err:
-        mutex_remove_waiter(lock, &waiter, task_thread_info(task));
+        mutex_remove_waiter(lock, &waiter, task);
         spin_unlock_mutex(&lock->wait_lock, flags);
         debug_mutex_free_waiter(&waiter);
         mutex_release(&lock->dep_map, 1, ip);
diff --git a/kernel/locking/mutex.h b/kernel/locking/mutex.h
index 5cda397607f2..a68bae5e852a 100644
--- a/kernel/locking/mutex.h
+++ b/kernel/locking/mutex.h
@@ -13,7 +13,7 @@
                 do { spin_lock(lock); (void)(flags); } while (0)
 #define spin_unlock_mutex(lock, flags) \
                 do { spin_unlock(lock); (void)(flags); } while (0)
-#define mutex_remove_waiter(lock, waiter, ti) \
+#define mutex_remove_waiter(lock, waiter, task) \
                 __list_del((waiter)->list.prev, (waiter)->list.next)
 
 #ifdef CONFIG_MUTEX_SPIN_ON_OWNER
diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c
index ce2f75e32ae1..5fc8c311b8fe 100644
--- a/kernel/locking/qspinlock.c
+++ b/kernel/locking/qspinlock.c
@@ -267,6 +267,66 @@ static __always_inline u32  __pv_wait_head_or_lock(struct qspinlock *lock,
 #define queued_spin_lock_slowpath       native_queued_spin_lock_slowpath
 #endif
 
+/*
+ * queued_spin_lock_slowpath() can (load-)ACQUIRE the lock before
+ * issuing an _unordered_ store to set _Q_LOCKED_VAL.
+ *
+ * This means that the store can be delayed, but no later than the
+ * store-release from the unlock. This means that simply observing
+ * _Q_LOCKED_VAL is not sufficient to determine if the lock is acquired.
+ *
+ * There are two paths that can issue the unordered store:
+ *
+ *  (1) clear_pending_set_locked():     *,1,0 -> *,0,1
+ *
+ *  (2) set_locked():                   t,0,0 -> t,0,1 ; t != 0
+ *      atomic_cmpxchg_relaxed():       t,0,0 -> 0,0,1
+ *
+ * However, in both cases we have other !0 state we've set before to queue
+ * ourseves:
+ *
+ * For (1) we have the atomic_cmpxchg_acquire() that set _Q_PENDING_VAL, our
+ * load is constrained by that ACQUIRE to not pass before that, and thus must
+ * observe the store.
+ *
+ * For (2) we have a more intersting scenario. We enqueue ourselves using
+ * xchg_tail(), which ends up being a RELEASE. This in itself is not
+ * sufficient, however that is followed by an smp_cond_acquire() on the same
+ * word, giving a RELEASE->ACQUIRE ordering. This again constrains our load and
+ * guarantees we must observe that store.
+ *
+ * Therefore both cases have other !0 state that is observable before the
+ * unordered locked byte store comes through. This means we can use that to
+ * wait for the lock store, and then wait for an unlock.
+ */
+#ifndef queued_spin_unlock_wait
+void queued_spin_unlock_wait(struct qspinlock *lock)
+{
+        u32 val;
+
+        for (;;) {
+                val = atomic_read(&lock->val);
+
+                if (!val) /* not locked, we're done */
+                        goto done;
+
+                if (val & _Q_LOCKED_MASK) /* locked, go wait for unlock */
+                        break;
+
+                /* not locked, but pending, wait until we observe the lock */
+                cpu_relax();
+        }
+
+        /* any unlock is good */
+        while (atomic_read(&lock->val) & _Q_LOCKED_MASK)
+                cpu_relax();
+
+done:
+        smp_rmb(); /* CTRL + RMB -> ACQUIRE */
+}
+EXPORT_SYMBOL(queued_spin_unlock_wait);
+#endif
+
 #endif /* _GEN_PV_LOCK_SLOWPATH */
 
 /**
diff --git a/kernel/power/process.c b/kernel/power/process.c
index df058bed53ce..0c2ee9761d57 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -146,6 +146,18 @@ int freeze_processes(void)
         if (!error && !oom_killer_disable())
                 error = -EBUSY;
 
+        /*
+         * There is a hard to fix race between oom_reaper kernel thread
+         * and oom_killer_disable. oom_reaper calls exit_oom_victim
+         * before the victim reaches exit_mm so try to freeze all the tasks
+         * again and catch such a left over task.
+         */
+        if (!error) {
+                pr_info("Double checking all user space processes after OOM killer disable... ");
+                error = try_to_freeze_tasks(true);
+                pr_cont("\n");
+        }
+
         if (error)
                 thaw_processes();
         return error;
diff --git a/kernel/relay.c b/kernel/relay.c
index 074994bcfa9b..04d7cf3ef8cf 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -614,6 +614,7 @@ free_bufs:
 
         kref_put(&chan->kref, relay_destroy_channel);
         mutex_unlock(&relay_channels_mutex);
+        kfree(chan);
         return NULL;
 }
 EXPORT_SYMBOL_GPL(relay_open);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 7f2cae4620c7..51d7105f529a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1536,7 +1536,9 @@ static int select_fallback_rq(int cpu, struct task_struct *p)
         for (;;) {
                 /* Any allowed, online CPU? */
                 for_each_cpu(dest_cpu, tsk_cpus_allowed(p)) {
-                        if (!cpu_active(dest_cpu))
+                        if (!(p->flags & PF_KTHREAD) && !cpu_active(dest_cpu))
+                                continue;
+                        if (!cpu_online(dest_cpu))
                                 continue;
                         goto out;
                 }
@@ -2253,9 +2255,11 @@ int sysctl_numa_balancing(struct ctl_table *table, int write,
 #endif
 #endif
 
+#ifdef CONFIG_SCHEDSTATS
+
 DEFINE_STATIC_KEY_FALSE(sched_schedstats);
+static bool __initdata __sched_schedstats = false;
 
-#ifdef CONFIG_SCHEDSTATS
 static void set_schedstats(bool enabled)
 {
         if (enabled)
@@ -2278,11 +2282,16 @@ static int __init setup_schedstats(char *str)
         if (!str)
                 goto out;
 
+        /*
+         * This code is called before jump labels have been set up, so we can't
+         * change the static branch directly just yet.  Instead set a temporary
+         * variable so init_schedstats() can do it later.
+         */
         if (!strcmp(str, "enable")) {
-                set_schedstats(true);
+                __sched_schedstats = true;
                 ret = 1;
         } else if (!strcmp(str, "disable")) {
-                set_schedstats(false);
+                __sched_schedstats = false;
                 ret = 1;
         }
 out:
@@ -2293,6 +2302,11 @@ out:
 }
 __setup("schedstats=", setup_schedstats);
 
+static void __init init_schedstats(void)
+{
+        set_schedstats(__sched_schedstats);
+}
+
 #ifdef CONFIG_PROC_SYSCTL
 int sysctl_schedstats(struct ctl_table *table, int write,
                          void __user *buffer, size_t *lenp, loff_t *ppos)
@@ -2313,8 +2327,10 @@ int sysctl_schedstats(struct ctl_table *table, int write,
                 set_schedstats(state);
         return err;
 }
-#endif
-#endif
+#endif /* CONFIG_PROC_SYSCTL */
+#else  /* !CONFIG_SCHEDSTATS */
+static inline void init_schedstats(void) {}
+#endif /* CONFIG_SCHEDSTATS */
 
 /*
  * fork()/clone()-time setup:
@@ -2521,10 +2537,9 @@ void wake_up_new_task(struct task_struct *p)
          */
         set_task_cpu(p, select_task_rq(p, task_cpu(p), SD_BALANCE_FORK, 0));
 #endif
-        /* Post initialize new task's util average when its cfs_rq is set */
+        rq = __task_rq_lock(p, &rf);
         post_init_entity_util_avg(&p->se);
 
-        rq = __task_rq_lock(p, &rf);
         activate_task(rq, p, 0);
         p->on_rq = TASK_ON_RQ_QUEUED;
         trace_sched_wakeup_new(p);
@@ -3156,7 +3171,8 @@ static noinline void __schedule_bug(struct task_struct *prev)
 static inline void schedule_debug(struct task_struct *prev)
 {
 #ifdef CONFIG_SCHED_STACK_END_CHECK
-        BUG_ON(task_stack_end_corrupted(prev));
+        if (task_stack_end_corrupted(prev))
+                panic("corrupted stack end detected inside scheduler\n");
 #endif
 
         if (unlikely(in_atomic_preempt_off())) {
@@ -5133,14 +5149,16 @@ void show_state_filter(unsigned long state_filter)
                 /*
                  * reset the NMI-timeout, listing all files on a slow
                  * console might take a lot of time:
+                 * Also, reset softlockup watchdogs on all CPUs, because
+                 * another CPU might be blocked waiting for us to process
+                 * an IPI.
                  */
                 touch_nmi_watchdog();
+                touch_all_softlockup_watchdogs();
                 if (!state_filter || (p->state & state_filter))
                         sched_show_task(p);
         }
 
-        touch_all_softlockup_watchdogs();
-
 #ifdef CONFIG_SCHED_DEBUG
         if (!state_filter)
                 sysrq_sched_debug_show();
@@ -7487,6 +7505,8 @@ void __init sched_init(void)
 #endif
         init_sched_fair_class();
 
+        init_schedstats();
+
         scheduler_running = 1;
 }
 
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index cf905f655ba1..0368c393a336 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -427,19 +427,12 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
                 SPLIT_NS(p->se.vruntime),
                 (long long)(p->nvcsw + p->nivcsw),
                 p->prio);
-#ifdef CONFIG_SCHEDSTATS
-        if (schedstat_enabled()) {
-                SEQ_printf(m, "%9Ld.%06ld %9Ld.%06ld %9Ld.%06ld",
-                        SPLIT_NS(p->se.statistics.wait_sum),
-                        SPLIT_NS(p->se.sum_exec_runtime),
-                        SPLIT_NS(p->se.statistics.sum_sleep_runtime));
-        }
-#else
+
         SEQ_printf(m, "%9Ld.%06ld %9Ld.%06ld %9Ld.%06ld",
-                0LL, 0L,
+                SPLIT_NS(schedstat_val(p, se.statistics.wait_sum)),
                 SPLIT_NS(p->se.sum_exec_runtime),
-                0LL, 0L);
-#endif
+                SPLIT_NS(schedstat_val(p, se.statistics.sum_sleep_runtime)));
+
 #ifdef CONFIG_NUMA_BALANCING
         SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p));
 #endif
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 218f8e83db73..bdcbeea90c95 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2904,6 +2904,23 @@ static inline void cfs_rq_util_change(struct cfs_rq *cfs_rq)
         }
 }
 
+/*
+ * Unsigned subtract and clamp on underflow.
+ *
+ * Explicitly do a load-store to ensure the intermediate value never hits
+ * memory. This allows lockless observations without ever seeing the negative
+ * values.
+ */
+#define sub_positive(_ptr, _val) do {                           \
+        typeof(_ptr) ptr = (_ptr);                              \
+        typeof(*ptr) val = (_val);                              \
+        typeof(*ptr) res, var = READ_ONCE(*ptr);                \
+        res = var - val;                                        \
+        if (res > var)                                          \
+                res = 0;                                        \
+        WRITE_ONCE(*ptr, res);                                  \
+} while (0)
+
 /* Group cfs_rq's load_avg is used for task_h_load and update_cfs_share */
 static inline int
 update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq, bool update_freq)
@@ -2913,15 +2930,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq, bool update_freq)
 
         if (atomic_long_read(&cfs_rq->removed_load_avg)) {
                 s64 r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
-                sa->load_avg = max_t(long, sa->load_avg - r, 0);
-                sa->load_sum = max_t(s64, sa->load_sum - r * LOAD_AVG_MAX, 0);
+                sub_positive(&sa->load_avg, r);
+                sub_positive(&sa->load_sum, r * LOAD_AVG_MAX);
                 removed_load = 1;
         }
 
         if (atomic_long_read(&cfs_rq->removed_util_avg)) {
                 long r = atomic_long_xchg(&cfs_rq->removed_util_avg, 0);
-                sa->util_avg = max_t(long, sa->util_avg - r, 0);
-                sa->util_sum = max_t(s32, sa->util_sum - r * LOAD_AVG_MAX, 0);
+                sub_positive(&sa->util_avg, r);
+                sub_positive(&sa->util_sum, r * LOAD_AVG_MAX);
                 removed_util = 1;
         }
 
@@ -2994,10 +3011,10 @@ static void detach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *s
                           &se->avg, se->on_rq * scale_load_down(se->load.weight),
                           cfs_rq->curr == se, NULL);
 
-        cfs_rq->avg.load_avg = max_t(long, cfs_rq->avg.load_avg - se->avg.load_avg, 0);
-        cfs_rq->avg.load_sum = max_t(s64,  cfs_rq->avg.load_sum - se->avg.load_sum, 0);
-        cfs_rq->avg.util_avg = max_t(long, cfs_rq->avg.util_avg - se->avg.util_avg, 0);
-        cfs_rq->avg.util_sum = max_t(s32,  cfs_rq->avg.util_sum - se->avg.util_sum, 0);
+        sub_positive(&cfs_rq->avg.load_avg, se->avg.load_avg);
+        sub_positive(&cfs_rq->avg.load_sum, se->avg.load_sum);
+        sub_positive(&cfs_rq->avg.util_avg, se->avg.util_avg);
+        sub_positive(&cfs_rq->avg.util_sum, se->avg.util_sum);
 
         cfs_rq_util_change(cfs_rq);
 }
@@ -3246,7 +3263,7 @@ static inline void check_schedstat_required(void)
                         trace_sched_stat_iowait_enabled()  ||
                         trace_sched_stat_blocked_enabled() ||
                         trace_sched_stat_runtime_enabled())  {
-                pr_warn_once("Scheduler tracepoints stat_sleep, stat_iowait, "
+                printk_deferred_once("Scheduler tracepoints stat_sleep, stat_iowait, "
                              "stat_blocked and stat_runtime require the "
                              "kernel parameter schedstats=enabled or "
                              "kernel.sched_schedstats=1\n");
@@ -4185,6 +4202,26 @@ static void check_enqueue_throttle(struct cfs_rq *cfs_rq)
         if (!cfs_bandwidth_used())
                 return;
 
+        /* Synchronize hierarchical throttle counter: */
+        if (unlikely(!cfs_rq->throttle_uptodate)) {
+                struct rq *rq = rq_of(cfs_rq);
+                struct cfs_rq *pcfs_rq;
+                struct task_group *tg;
+
+                cfs_rq->throttle_uptodate = 1;
+
+                /* Get closest up-to-date node, because leaves go first: */
+                for (tg = cfs_rq->tg->parent; tg; tg = tg->parent) {
+                        pcfs_rq = tg->cfs_rq[cpu_of(rq)];
+                        if (pcfs_rq->throttle_uptodate)
+                                break;
+                }
+                if (tg) {
+                        cfs_rq->throttle_count = pcfs_rq->throttle_count;
+                        cfs_rq->throttled_clock_task = rq_clock_task(rq);
+                }
+        }
+
         /* an active group must be handled by the update_curr()->put() path */
         if (!cfs_rq->runtime_enabled || cfs_rq->curr)
                 return;
@@ -4500,15 +4537,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
 
                 /* Don't dequeue parent if it has other entities besides us */
                 if (cfs_rq->load.weight) {
+                        /* Avoid re-evaluating load for this entity: */
+                        se = parent_entity(se);
                         /*
                          * Bias pick_next to pick a task from this cfs_rq, as
                          * p is sleeping when it is within its sched_slice.
                          */
-                        if (task_sleep && parent_entity(se))
-                                set_next_buddy(parent_entity(se));
-
-                        /* avoid re-evaluating load for this entity */
-                        se = parent_entity(se);
+                        if (task_sleep && se && !throttled_hierarchy(cfs_rq))
+                                set_next_buddy(se);
                         break;
                 }
                 flags |= DEQUEUE_SLEEP;
@@ -8496,8 +8532,9 @@ void free_fair_sched_group(struct task_group *tg)
 
 int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
 {
-        struct cfs_rq *cfs_rq;
         struct sched_entity *se;
+        struct cfs_rq *cfs_rq;
+        struct rq *rq;
         int i;
 
         tg->cfs_rq = kzalloc(sizeof(cfs_rq) * nr_cpu_ids, GFP_KERNEL);
@@ -8512,6 +8549,8 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
         init_cfs_bandwidth(tg_cfs_bandwidth(tg));
 
         for_each_possible_cpu(i) {
+                rq = cpu_rq(i);
+
                 cfs_rq = kzalloc_node(sizeof(struct cfs_rq),
                                       GFP_KERNEL, cpu_to_node(i));
                 if (!cfs_rq)
@@ -8525,7 +8564,10 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
                 init_cfs_rq(cfs_rq);
                 init_tg_cfs_entry(tg, cfs_rq, se, i, parent->se[i]);
                 init_entity_runnable_average(se);
+
+                raw_spin_lock_irq(&rq->lock);
                 post_init_entity_util_avg(se);
+                raw_spin_unlock_irq(&rq->lock);
         }
 
         return 1;
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index bd12c6c714ec..c5aeedf4e93a 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -127,7 +127,7 @@ static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
  */
 static void cpuidle_idle_call(void)
 {
-        struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
+        struct cpuidle_device *dev = cpuidle_get_device();
         struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
         int next_state, entered_state;
 
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 72f1f3087b04..7cbeb92a1cb9 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -437,7 +437,7 @@ struct cfs_rq {
 
         u64 throttled_clock, throttled_clock_task;
         u64 throttled_clock_task_time;
-        int throttled, throttle_count;
+        int throttled, throttle_count, throttle_uptodate;
         struct list_head throttled_list;
 #endif /* CONFIG_CFS_BANDWIDTH */
 #endif /* CONFIG_FAIR_GROUP_SCHED */
diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
index 70b3b6a20fb0..78955cbea31c 100644
--- a/kernel/sched/stats.h
+++ b/kernel/sched/stats.h
@@ -33,6 +33,8 @@ rq_sched_info_dequeued(struct rq *rq, unsigned long long delta)
 # define schedstat_inc(rq, field)       do { if (schedstat_enabled()) { (rq)->field++; } } while (0)
 # define schedstat_add(rq, field, amt)  do { if (schedstat_enabled()) { (rq)->field += (amt); } } while (0)
 # define schedstat_set(var, val)        do { if (schedstat_enabled()) { var = (val); } } while (0)
+# define schedstat_val(rq, field)       ((schedstat_enabled()) ? (rq)->field : 0)
+
 #else /* !CONFIG_SCHEDSTATS */
 static inline void
 rq_sched_info_arrive(struct rq *rq, unsigned long long delta)
@@ -47,6 +49,7 @@ rq_sched_info_depart(struct rq *rq, unsigned long long delta)
 # define schedstat_inc(rq, field)       do { } while (0)
 # define schedstat_add(rq, field, amt)  do { } while (0)
 # define schedstat_set(var, val)        do { } while (0)
+# define schedstat_val(rq, field)       0
 #endif
 
 #ifdef CONFIG_SCHED_INFO
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 8c7392c4fdbd..e99df0ff1d42 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -425,6 +425,7 @@ void destroy_hrtimer_on_stack(struct hrtimer *timer)
 {
         debug_object_free(timer, &hrtimer_debug_descr);
 }
+EXPORT_SYMBOL_GPL(destroy_hrtimer_on_stack);
 
 #else
 static inline void debug_hrtimer_init(struct hrtimer *timer) { }
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 780bcbe1d4de..720b7bb01d43 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -198,7 +198,7 @@ static u64 bpf_perf_event_read(u64 r1, u64 index, u64 r3, u64 r4, u64 r5)
         if (unlikely(index >= array->map.max_entries))
                 return -E2BIG;
 
-        file = (struct file *)array->ptrs[index];
+        file = READ_ONCE(array->ptrs[index]);
         if (unlikely(!file))
                 return -ENOENT;
 
@@ -247,7 +247,7 @@ static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 flags, u64 r4, u64 size)
         if (unlikely(index >= array->map.max_entries))
                 return -E2BIG;
 
-        file = (struct file *)array->ptrs[index];
+        file = READ_ONCE(array->ptrs[index]);
         if (unlikely(!file))
                 return -ENOENT;
 
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index f96f0383f6c6..ad1d6164e946 100644
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -36,6 +36,10 @@ struct trace_bprintk_fmt {
 static inline struct trace_bprintk_fmt *lookup_format(const char *fmt)
 {
         struct trace_bprintk_fmt *pos;
+
+        if (!fmt)
+                return ERR_PTR(-EINVAL);
+
         list_for_each_entry(pos, &trace_bprintk_fmt_list, list) {
                 if (!strcmp(pos->fmt, fmt))
                         return pos;
@@ -57,7 +61,8 @@ void hold_module_trace_bprintk_format(const char **start, const char **end)
         for (iter = start; iter < end; iter++) {
                 struct trace_bprintk_fmt *tb_fmt = lookup_format(*iter);
                 if (tb_fmt) {
-                        *iter = tb_fmt->fmt;
+                        if (!IS_ERR(tb_fmt))
+                                *iter = tb_fmt->fmt;
                         continue;
                 }
 
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 77d7d034bac3..b9cfdbfae9aa 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1841,6 +1841,9 @@ config TEST_BITMAP
 
           If unsure, say N.
 
+config TEST_UUID
+        tristate "Test functions located in the uuid module at runtime"
+
 config TEST_RHASHTABLE
         tristate "Perform selftest on resizable hash table"
         default n
diff --git a/lib/Makefile b/lib/Makefile
index 499fb354d627..ff6a7a6c6395 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -58,6 +58,7 @@ obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o
 obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o
 obj-$(CONFIG_TEST_PRINTF) += test_printf.o
 obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o
+obj-$(CONFIG_TEST_UUID) += test_uuid.o
 
 ifeq ($(CONFIG_DEBUG_KOBJECT),y)
 CFLAGS_kobject.o += -DDEBUG
diff --git a/lib/test_uuid.c b/lib/test_uuid.c
new file mode 100644
index 000000000000..547d3127a3cf
--- /dev/null
+++ b/lib/test_uuid.c
@@ -0,0 +1,133 @@
+/*
+ * Test cases for lib/uuid.c module.
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/uuid.h>
+
+struct test_uuid_data {
+        const char *uuid;
+        uuid_le le;
+        uuid_be be;
+};
+
+static const struct test_uuid_data test_uuid_test_data[] = {
+        {
+                .uuid = "c33f4995-3701-450e-9fbf-206a2e98e576",
+                .le = UUID_LE(0xc33f4995, 0x3701, 0x450e, 0x9f, 0xbf, 0x20, 0x6a, 0x2e, 0x98, 0xe5, 0x76),
+                .be = UUID_BE(0xc33f4995, 0x3701, 0x450e, 0x9f, 0xbf, 0x20, 0x6a, 0x2e, 0x98, 0xe5, 0x76),
+        },
+        {
+                .uuid = "64b4371c-77c1-48f9-8221-29f054fc023b",
+                .le = UUID_LE(0x64b4371c, 0x77c1, 0x48f9, 0x82, 0x21, 0x29, 0xf0, 0x54, 0xfc, 0x02, 0x3b),
+                .be = UUID_BE(0x64b4371c, 0x77c1, 0x48f9, 0x82, 0x21, 0x29, 0xf0, 0x54, 0xfc, 0x02, 0x3b),
+        },
+        {
+                .uuid = "0cb4ddff-a545-4401-9d06-688af53e7f84",
+                .le = UUID_LE(0x0cb4ddff, 0xa545, 0x4401, 0x9d, 0x06, 0x68, 0x8a, 0xf5, 0x3e, 0x7f, 0x84),
+                .be = UUID_BE(0x0cb4ddff, 0xa545, 0x4401, 0x9d, 0x06, 0x68, 0x8a, 0xf5, 0x3e, 0x7f, 0x84),
+        },
+};
+
+static const char * const test_uuid_wrong_data[] = {
+        "c33f4995-3701-450e-9fbf206a2e98e576 ", /* no hyphen(s) */
+        "64b4371c-77c1-48f9-8221-29f054XX023b", /* invalid character(s) */
+        "0cb4ddff-a545-4401-9d06-688af53e",     /* not enough data */
+};
+
+static unsigned total_tests __initdata;
+static unsigned failed_tests __initdata;
+
+static void __init test_uuid_failed(const char *prefix, bool wrong, bool be,
+                                    const char *data, const char *actual)
+{
+        pr_err("%s test #%u %s %s data: '%s'\n",
+               prefix,
+               total_tests,
+               wrong ? "passed on wrong" : "failed on",
+               be ? "BE" : "LE",
+               data);
+        if (actual && *actual)
+                pr_err("%s test #%u actual data: '%s'\n",
+                       prefix,
+                       total_tests,
+                       actual);
+        failed_tests++;
+}
+
+static void __init test_uuid_test(const struct test_uuid_data *data)
+{
+        uuid_le le;
+        uuid_be be;
+        char buf[48];
+
+        /* LE */
+        total_tests++;
+        if (uuid_le_to_bin(data->uuid, &le))
+                test_uuid_failed("conversion", false, false, data->uuid, NULL);
+
+        total_tests++;
+        if (uuid_le_cmp(data->le, le)) {
+                sprintf(buf, "%pUl", &le);
+                test_uuid_failed("cmp", false, false, data->uuid, buf);
+        }
+
+        /* BE */
+        total_tests++;
+        if (uuid_be_to_bin(data->uuid, &be))
+                test_uuid_failed("conversion", false, true, data->uuid, NULL);
+
+        total_tests++;
+        if (uuid_be_cmp(data->be, be)) {
+                sprintf(buf, "%pUb", &be);
+                test_uuid_failed("cmp", false, true, data->uuid, buf);
+        }
+}
+
+static void __init test_uuid_wrong(const char *data)
+{
+        uuid_le le;
+        uuid_be be;
+
+        /* LE */
+        total_tests++;
+        if (!uuid_le_to_bin(data, &le))
+                test_uuid_failed("negative", true, false, data, NULL);
+
+        /* BE */
+        total_tests++;
+        if (!uuid_be_to_bin(data, &be))
+                test_uuid_failed("negative", true, true, data, NULL);
+}
+
+static int __init test_uuid_init(void)
+{
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(test_uuid_test_data); i++)
+                test_uuid_test(&test_uuid_test_data[i]);
+
+        for (i = 0; i < ARRAY_SIZE(test_uuid_wrong_data); i++)
+                test_uuid_wrong(test_uuid_wrong_data[i]);
+
+        if (failed_tests == 0)
+                pr_info("all %u tests passed\n", total_tests);
+        else
+                pr_err("failed %u out of %u tests\n", failed_tests, total_tests);
+
+        return failed_tests ? -EINVAL : 0;
+}
+module_init(test_uuid_init);
+
+static void __exit test_uuid_exit(void)
+{
+        /* do nothing */
+}
+module_exit(test_uuid_exit);
+
+MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/uuid.c b/lib/uuid.c
index e116ae5fa00f..37687af77ff8 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -106,8 +106,8 @@ static int __uuid_to_bin(const char *uuid, __u8 b[16], const u8 ei[16])
                 return -EINVAL;
 
         for (i = 0; i < 16; i++) {
-                int hi = hex_to_bin(uuid[si[i]] + 0);
-                int lo = hex_to_bin(uuid[si[i]] + 1);
+                int hi = hex_to_bin(uuid[si[i] + 0]);
+                int lo = hex_to_bin(uuid[si[i] + 1]);
 
                 b[ei[i]] = (hi << 4) | lo;
         }
diff --git a/mm/compaction.c b/mm/compaction.c
index 1427366ad673..79bfe0e06907 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -441,25 +441,23 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
 
                 /* Found a free page, break it into order-0 pages */
                 isolated = split_free_page(page);
+                if (!isolated)
+                        break;
+
                 total_isolated += isolated;
+                cc->nr_freepages += isolated;
                 for (i = 0; i < isolated; i++) {
                         list_add(&page->lru, freelist);
                         page++;
                 }
-
-                /* If a page was split, advance to the end of it */
-                if (isolated) {
-                        cc->nr_freepages += isolated;
-                        if (!strict &&
-                                cc->nr_migratepages <= cc->nr_freepages) {
-                                blockpfn += isolated;
-                                break;
-                        }
-
-                        blockpfn += isolated - 1;
-                        cursor += isolated - 1;
-                        continue;
+                if (!strict && cc->nr_migratepages <= cc->nr_freepages) {
+                        blockpfn += isolated;
+                        break;
                 }
+                /* Advance to the end of split page */
+                blockpfn += isolated - 1;
+                cursor += isolated - 1;
+                continue;
 
 isolate_fail:
                 if (strict)
@@ -469,6 +467,9 @@ isolate_fail:
 
         }
 
+        if (locked)
+                spin_unlock_irqrestore(&cc->zone->lock, flags);
+
         /*
          * There is a tiny chance that we have read bogus compound_order(),
          * so be careful to not go outside of the pageblock.
@@ -490,9 +491,6 @@ isolate_fail:
         if (strict && blockpfn < end_pfn)
                 total_isolated = 0;
 
-        if (locked)
-                spin_unlock_irqrestore(&cc->zone->lock, flags);
-
         /* Update the pageblock-skip if the whole pageblock was scanned */
         if (blockpfn == end_pfn)
                 update_pageblock_skip(cc, valid_page, total_isolated, false);
@@ -1011,6 +1009,7 @@ static void isolate_freepages(struct compact_control *cc)
                                 block_end_pfn = block_start_pfn,
                                 block_start_pfn -= pageblock_nr_pages,
                                 isolate_start_pfn = block_start_pfn) {
+                unsigned long isolated;
 
                 /*
                  * This can iterate a massively long zone without finding any
@@ -1035,8 +1034,12 @@ static void isolate_freepages(struct compact_control *cc)
                         continue;
 
                 /* Found a block suitable for isolating free pages from. */
-                isolate_freepages_block(cc, &isolate_start_pfn,
-                                        block_end_pfn, freelist, false);
+                isolated = isolate_freepages_block(cc, &isolate_start_pfn,
+                                                block_end_pfn, freelist, false);
+                /* If isolation failed early, do not continue needlessly */
+                if (!isolated && isolate_start_pfn < block_end_pfn &&
+                    cc->nr_migratepages > cc->nr_freepages)
+                        break;
 
                 /*
                  * If we isolated enough freepages, or aborted due to async
diff --git a/mm/fadvise.c b/mm/fadvise.c
index b8024fa7101d..6c707bfe02fd 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -126,6 +126,17 @@ SYSCALL_DEFINE4(fadvise64_64, int, fd, loff_t, offset, loff_t, len, int, advice)
                  */
                 start_index = (offset+(PAGE_SIZE-1)) >> PAGE_SHIFT;
                 end_index = (endbyte >> PAGE_SHIFT);
+                if ((endbyte & ~PAGE_MASK) != ~PAGE_MASK) {
+                        /* First page is tricky as 0 - 1 = -1, but pgoff_t
+                         * is unsigned, so the end_index >= start_index
+                         * check below would be true and we'll discard the whole
+                         * file cache which is not what was asked.
+                         */
+                        if (end_index == 0)
+                                break;
+
+                        end_index--;
+                }
 
                 if (end_index >= start_index) {
                         unsigned long count = invalidate_mapping_pages(mapping,
diff --git a/mm/filemap.c b/mm/filemap.c
index 00ae878b2a38..20f3b1f33f0e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2186,7 +2186,7 @@ repeat:
                 if (file->f_ra.mmap_miss > 0)
                         file->f_ra.mmap_miss--;
                 addr = address + (page->index - vmf->pgoff) * PAGE_SIZE;
-                do_set_pte(vma, addr, page, pte, false, false, true);
+                do_set_pte(vma, addr, page, pte, false, false);
                 unlock_page(page);
                 goto next;
 unlock:
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index d26162e81fea..c1f3c0be150a 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -832,8 +832,27 @@ static bool vma_has_reserves(struct vm_area_struct *vma, long chg)
          * Only the process that called mmap() has reserves for
          * private mappings.
          */
-        if (is_vma_resv_set(vma, HPAGE_RESV_OWNER))
-                return true;
+        if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) {
+                /*
+                 * Like the shared case above, a hole punch or truncate
+                 * could have been performed on the private mapping.
+                 * Examine the value of chg to determine if reserves
+                 * actually exist or were previously consumed.
+                 * Very Subtle - The value of chg comes from a previous
+                 * call to vma_needs_reserves().  The reserve map for
+                 * private mappings has different (opposite) semantics
+                 * than that of shared mappings.  vma_needs_reserves()
+                 * has already taken this difference in semantics into
+                 * account.  Therefore, the meaning of chg is the same
+                 * as in the shared case above.  Code could easily be
+                 * combined, but keeping it separate draws attention to
+                 * subtle differences.
+                 */
+                if (chg)
+                        return false;
+                else
+                        return true;
+        }
 
         return false;
 }
@@ -1011,6 +1030,7 @@ static void destroy_compound_gigantic_page(struct page *page,
         int nr_pages = 1 << order;
         struct page *p = page + 1;
 
+        atomic_set(compound_mapcount_ptr(page), 0);
         for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
                 clear_compound_head(p);
                 set_page_refcounted(p);
@@ -1816,6 +1836,25 @@ static long __vma_reservation_common(struct hstate *h,
 
         if (vma->vm_flags & VM_MAYSHARE)
                 return ret;
+        else if (is_vma_resv_set(vma, HPAGE_RESV_OWNER) && ret >= 0) {
+                /*
+                 * In most cases, reserves always exist for private mappings.
+                 * However, a file associated with mapping could have been
+                 * hole punched or truncated after reserves were consumed.
+                 * As subsequent fault on such a range will not use reserves.
+                 * Subtle - The reserve map for private mappings has the
+                 * opposite meaning than that of shared mappings.  If NO
+                 * entry is in the reserve map, it means a reservation exists.
+                 * If an entry exists in the reserve map, it means the
+                 * reservation has already been consumed.  As a result, the
+                 * return value of this routine is the opposite of the
+                 * value returned from reserve map manipulation routines above.
+                 */
+                if (ret)
+                        return 0;
+                else
+                        return 1;
+        }
         else
                 return ret < 0 ? ret : 0;
 }
@@ -4190,7 +4229,6 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
                 if (saddr) {
                         spte = huge_pte_offset(svma->vm_mm, saddr);
                         if (spte) {
-                                mm_inc_nr_pmds(mm);
                                 get_page(virt_to_page(spte));
                                 break;
                         }
@@ -4205,9 +4243,9 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
         if (pud_none(*pud)) {
                 pud_populate(mm, pud,
                                 (pmd_t *)((unsigned long)spte & PAGE_MASK));
+                mm_inc_nr_pmds(mm);
         } else {
                 put_page(virt_to_page(spte));
-                mm_inc_nr_pmds(mm);
         }
         spin_unlock(ptl);
 out:
diff --git a/mm/internal.h b/mm/internal.h
index a37e5b6f9d25..2524ec880e24 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -24,7 +24,8 @@
  */
 #define GFP_RECLAIM_MASK (__GFP_RECLAIM|__GFP_HIGH|__GFP_IO|__GFP_FS|\
                         __GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\
-                        __GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC)
+                        __GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC|\
+                        __GFP_ATOMIC)
 
 /* The GFP flags allowed during early boot */
 #define GFP_BOOT_MASK (__GFP_BITS_MASK & ~(__GFP_RECLAIM|__GFP_IO|__GFP_FS))
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
index 18b6a2b8d183..6845f9294696 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -508,7 +508,7 @@ void kasan_slab_alloc(struct kmem_cache *cache, void *object, gfp_t flags)
         kasan_kmalloc(cache, object, cache->object_size, flags);
 }
 
-void kasan_poison_slab_free(struct kmem_cache *cache, void *object)
+static void kasan_poison_slab_free(struct kmem_cache *cache, void *object)
 {
         unsigned long size = cache->object_size;
         unsigned long rounded_up_size = round_up(size, KASAN_SHADOW_SCALE_SIZE);
@@ -626,7 +626,7 @@ void kasan_krealloc(const void *object, size_t size, gfp_t flags)
                 kasan_kmalloc(page->slab_cache, object, size, flags);
 }
 
-void kasan_kfree(void *ptr)
+void kasan_poison_kfree(void *ptr)
 {
         struct page *page;
 
@@ -636,7 +636,7 @@ void kasan_kfree(void *ptr)
                 kasan_poison_shadow(ptr, PAGE_SIZE << compound_order(page),
                                 KASAN_FREE_PAGE);
         else
-                kasan_slab_free(page->slab_cache, ptr);
+                kasan_poison_slab_free(page->slab_cache, ptr);
 }
 
 void kasan_kfree_large(const void *ptr)
@@ -763,8 +763,8 @@ static int kasan_mem_notifier(struct notifier_block *nb,
 
 static int __init kasan_memhotplug_init(void)
 {
-        pr_err("WARNING: KASAN doesn't support memory hot-add\n");
-        pr_err("Memory hot-add will be disabled\n");
+        pr_info("WARNING: KASAN doesn't support memory hot-add\n");
+        pr_info("Memory hot-add will be disabled\n");
 
         hotplug_memory_notifier(kasan_mem_notifier, 0);
 
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index e6429926e957..04320d3adbef 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -307,8 +307,10 @@ static void hex_dump_object(struct seq_file *seq,
         len = min_t(size_t, object->size, HEX_MAX_LINES * HEX_ROW_SIZE);
 
         seq_printf(seq, "  hex dump (first %zu bytes):\n", len);
+        kasan_disable_current();
         seq_hex_dump(seq, "    ", DUMP_PREFIX_NONE, HEX_ROW_SIZE,
                      HEX_GROUP_SIZE, ptr, len, HEX_ASCII);
+        kasan_enable_current();
 }
 
 /*
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 925b431f3f03..ac8664db3823 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1608,7 +1608,7 @@ static void memcg_oom_recover(struct mem_cgroup *memcg)
 
 static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
 {
-        if (!current->memcg_may_oom || current->memcg_in_oom)
+        if (!current->memcg_may_oom)
                 return;
         /*
          * We are in the middle of the charge context here, so we
@@ -2896,6 +2896,7 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
          * ordering is imposed by list_lru_node->lock taken by
          * memcg_drain_all_list_lrus().
          */
+        rcu_read_lock(); /* can be called from css_free w/o cgroup_mutex */
         css_for_each_descendant_pre(css, &memcg->css) {
                 child = mem_cgroup_from_css(css);
                 BUG_ON(child->kmemcg_id != kmemcg_id);
@@ -2903,6 +2904,8 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
                 if (!memcg->use_hierarchy)
                         break;
         }
+        rcu_read_unlock();
+
         memcg_drain_all_list_lrus(kmemcg_id, parent->kmemcg_id);
 
         memcg_free_cache_id(kmemcg_id);
@@ -4200,7 +4203,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
         return &memcg->css;
 fail:
         mem_cgroup_free(memcg);
-        return NULL;
+        return ERR_PTR(-ENOMEM);
 }
 
 static int
@@ -5541,6 +5544,7 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
         struct mem_cgroup *memcg;
         unsigned int nr_pages;
         bool compound;
+        unsigned long flags;
 
         VM_BUG_ON_PAGE(!PageLocked(oldpage), oldpage);
         VM_BUG_ON_PAGE(!PageLocked(newpage), newpage);
@@ -5571,10 +5575,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
 
         commit_charge(newpage, memcg, false);
 
-        local_irq_disable();
+        local_irq_save(flags);
         mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
         memcg_check_events(memcg, newpage);
-        local_irq_enable();
+        local_irq_restore(flags);
 }
 
 DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
diff --git a/mm/memory.c b/mm/memory.c
index 15322b73636b..cd1f29e4897e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2877,7 +2877,7 @@ static int __do_fault(struct vm_area_struct *vma, unsigned long address,
  * vm_ops->map_pages.
  */
 void do_set_pte(struct vm_area_struct *vma, unsigned long address,
-                struct page *page, pte_t *pte, bool write, bool anon, bool old)
+                struct page *page, pte_t *pte, bool write, bool anon)
 {
         pte_t entry;
 
@@ -2885,8 +2885,6 @@ void do_set_pte(struct vm_area_struct *vma, unsigned long address,
         entry = mk_pte(page, vma->vm_page_prot);
         if (write)
                 entry = maybe_mkwrite(pte_mkdirty(entry), vma);
-        if (old)
-                entry = pte_mkold(entry);
         if (anon) {
                 inc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);
                 page_add_new_anon_rmap(page, vma, address, false);
@@ -2900,16 +2898,8 @@ void do_set_pte(struct vm_area_struct *vma, unsigned long address,
         update_mmu_cache(vma, address, pte);
 }
 
-/*
- * If architecture emulates "accessed" or "young" bit without HW support,
- * there is no much gain with fault_around.
- */
 static unsigned long fault_around_bytes __read_mostly =
-#ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
-        PAGE_SIZE;
-#else
         rounddown_pow_of_two(65536);
-#endif
 
 #ifdef CONFIG_DEBUG_FS
 static int fault_around_bytes_get(void *data, u64 *val)
@@ -3032,20 +3022,9 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
          */
         if (vma->vm_ops->map_pages && fault_around_bytes >> PAGE_SHIFT > 1) {
                 pte = pte_offset_map_lock(mm, pmd, address, &ptl);
-                if (!pte_same(*pte, orig_pte))
-                        goto unlock_out;
                 do_fault_around(vma, address, pte, pgoff, flags);
-                /* Check if the fault is handled by faultaround */
-                if (!pte_same(*pte, orig_pte)) {
-                        /*
-                         * Faultaround produce old pte, but the pte we've
-                         * handler fault for should be young.
-                         */
-                        pte_t entry = pte_mkyoung(*pte);
-                        if (ptep_set_access_flags(vma, address, pte, entry, 0))
-                                update_mmu_cache(vma, address, pte);
+                if (!pte_same(*pte, orig_pte))
                         goto unlock_out;
-                }
                 pte_unmap_unlock(pte, ptl);
         }
 
@@ -3060,7 +3039,7 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 put_page(fault_page);
                 return ret;
         }
-        do_set_pte(vma, address, fault_page, pte, false, false, false);
+        do_set_pte(vma, address, fault_page, pte, false, false);
         unlock_page(fault_page);
 unlock_out:
         pte_unmap_unlock(pte, ptl);
@@ -3111,7 +3090,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 }
                 goto uncharge_out;
         }
-        do_set_pte(vma, address, new_page, pte, true, true, false);
+        do_set_pte(vma, address, new_page, pte, true, true);
         mem_cgroup_commit_charge(new_page, memcg, false, false);
         lru_cache_add_active_or_unevictable(new_page, vma);
         pte_unmap_unlock(pte, ptl);
@@ -3164,7 +3143,7 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 put_page(fault_page);
                 return ret;
         }
-        do_set_pte(vma, address, fault_page, pte, true, false, false);
+        do_set_pte(vma, address, fault_page, pte, true, false);
         pte_unmap_unlock(pte, ptl);
 
         if (set_page_dirty(fault_page))
diff --git a/mm/mempool.c b/mm/mempool.c
index 9e075f829d0d..8f65464da5de 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -104,20 +104,16 @@ static inline void poison_element(mempool_t *pool, void *element)
 
 static void kasan_poison_element(mempool_t *pool, void *element)
 {
-        if (pool->alloc == mempool_alloc_slab)
-                kasan_poison_slab_free(pool->pool_data, element);
-        if (pool->alloc == mempool_kmalloc)
-                kasan_kfree(element);
+        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
+                kasan_poison_kfree(element);
         if (pool->alloc == mempool_alloc_pages)
                 kasan_free_pages(element, (unsigned long)pool->pool_data);
 }
 
 static void kasan_unpoison_element(mempool_t *pool, void *element, gfp_t flags)
 {
-        if (pool->alloc == mempool_alloc_slab)
-                kasan_slab_alloc(pool->pool_data, element, flags);
-        if (pool->alloc == mempool_kmalloc)
-                kasan_krealloc(element, (size_t)pool->pool_data, flags);
+        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
+                kasan_unpoison_slab(element);
         if (pool->alloc == mempool_alloc_pages)
                 kasan_alloc_pages(element, (unsigned long)pool->pool_data);
 }
diff --git a/mm/migrate.c b/mm/migrate.c
index 9baf41c877ff..bd3fdc202e8b 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -431,6 +431,7 @@ int migrate_page_move_mapping(struct address_space *mapping,
 
         return MIGRATEPAGE_SUCCESS;
 }
+EXPORT_SYMBOL(migrate_page_move_mapping);
 
 /*
  * The expected number of remaining references is the same as that
@@ -586,6 +587,7 @@ void migrate_page_copy(struct page *newpage, struct page *page)
 
         mem_cgroup_migrate(page, newpage);
 }
+EXPORT_SYMBOL(migrate_page_copy);
 
 /************************************************************
  *                    Migration functions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index dfb1ab61fb23..ddf74487f848 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -474,13 +474,8 @@ static bool __oom_reap_task(struct task_struct *tsk)
         p = find_lock_task_mm(tsk);
         if (!p)
                 goto unlock_oom;
-
         mm = p->mm;
-        if (!atomic_inc_not_zero(&mm->mm_users)) {
-                task_unlock(p);
-                goto unlock_oom;
-        }
-
+        atomic_inc(&mm->mm_users);
         task_unlock(p);
 
         if (!down_read_trylock(&mm->mmap_sem)) {
@@ -625,8 +620,6 @@ void try_oom_reaper(struct task_struct *tsk)
         if (atomic_read(&mm->mm_users) > 1) {
                 rcu_read_lock();
                 for_each_process(p) {
-                        bool exiting;
-
                         if (!process_shares_mm(p, mm))
                                 continue;
                         if (fatal_signal_pending(p))
@@ -636,10 +629,7 @@ void try_oom_reaper(struct task_struct *tsk)
                          * If the task is exiting make sure the whole thread group
                          * is exiting and cannot acces mm anymore.
                          */
-                        spin_lock_irq(&p->sighand->siglock);
-                        exiting = signal_group_exit(p->signal);
-                        spin_unlock_irq(&p->sighand->siglock);
-                        if (exiting)
+                        if (signal_group_exit(p->signal))
                                 continue;
 
                         /* Give up */
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index b9956fdee8f5..e2481949494c 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -373,8 +373,9 @@ static void domain_dirty_limits(struct dirty_throttle_control *dtc)
         struct dirty_throttle_control *gdtc = mdtc_gdtc(dtc);
         unsigned long bytes = vm_dirty_bytes;
         unsigned long bg_bytes = dirty_background_bytes;
-        unsigned long ratio = vm_dirty_ratio;
-        unsigned long bg_ratio = dirty_background_ratio;
+        /* convert ratios to per-PAGE_SIZE for higher precision */
+        unsigned long ratio = (vm_dirty_ratio * PAGE_SIZE) / 100;
+        unsigned long bg_ratio = (dirty_background_ratio * PAGE_SIZE) / 100;
         unsigned long thresh;
         unsigned long bg_thresh;
         struct task_struct *tsk;
@@ -386,26 +387,28 @@ static void domain_dirty_limits(struct dirty_throttle_control *dtc)
                 /*
                  * The byte settings can't be applied directly to memcg
                  * domains.  Convert them to ratios by scaling against
-                 * globally available memory.
+                 * globally available memory.  As the ratios are in
+                 * per-PAGE_SIZE, they can be obtained by dividing bytes by
+                 * number of pages.
                  */
                 if (bytes)
-                        ratio = min(DIV_ROUND_UP(bytes, PAGE_SIZE) * 100 /
-                                    global_avail, 100UL);
+                        ratio = min(DIV_ROUND_UP(bytes, global_avail),
+                                    PAGE_SIZE);
                 if (bg_bytes)
-                        bg_ratio = min(DIV_ROUND_UP(bg_bytes, PAGE_SIZE) * 100 /
-                                       global_avail, 100UL);
+                        bg_ratio = min(DIV_ROUND_UP(bg_bytes, global_avail),
+                                       PAGE_SIZE);
                 bytes = bg_bytes = 0;
         }
 
         if (bytes)
                 thresh = DIV_ROUND_UP(bytes, PAGE_SIZE);
         else
-                thresh = (ratio * available_memory) / 100;
+                thresh = (ratio * available_memory) / PAGE_SIZE;
 
         if (bg_bytes)
                 bg_thresh = DIV_ROUND_UP(bg_bytes, PAGE_SIZE);
         else
-                bg_thresh = (bg_ratio * available_memory) / 100;
+                bg_thresh = (bg_ratio * available_memory) / PAGE_SIZE;
 
         if (bg_thresh >= thresh)
                 bg_thresh = thresh / 2;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f8f3bfc435ee..6903b695ebae 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -656,6 +656,9 @@ static inline void set_page_guard(struct zone *zone, struct page *page,
                 return;
 
         page_ext = lookup_page_ext(page);
+        if (unlikely(!page_ext))
+                return;
+
         __set_bit(PAGE_EXT_DEBUG_GUARD, &page_ext->flags);
 
         INIT_LIST_HEAD(&page->lru);
@@ -673,6 +676,9 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
                 return;
 
         page_ext = lookup_page_ext(page);
+        if (unlikely(!page_ext))
+                return;
+
         __clear_bit(PAGE_EXT_DEBUG_GUARD, &page_ext->flags);
 
         set_page_private(page, 0);
@@ -2609,11 +2615,12 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
                                 page = list_last_entry(list, struct page, lru);
                         else
                                 page = list_first_entry(list, struct page, lru);
-                } while (page && check_new_pcp(page));
 
-                __dec_zone_state(zone, NR_ALLOC_BATCH);
-                list_del(&page->lru);
-                pcp->count--;
+                        __dec_zone_state(zone, NR_ALLOC_BATCH);
+                        list_del(&page->lru);
+                        pcp->count--;
+
+                } while (check_new_pcp(page));
         } else {
                 /*
                  * We most definitely don't want callers attempting to
@@ -3023,6 +3030,7 @@ reset_fair:
                 apply_fair = false;
                 fair_skipped = false;
                 reset_alloc_batches(ac->preferred_zoneref->zone);
+                z = ac->preferred_zoneref;
                 goto zonelist_scan;
         }
 
@@ -3596,6 +3604,17 @@ retry:
          */
         alloc_flags = gfp_to_alloc_flags(gfp_mask);
 
+        /*
+         * Reset the zonelist iterators if memory policies can be ignored.
+         * These allocations are high priority and system rather than user
+         * orientated.
+         */
+        if ((alloc_flags & ALLOC_NO_WATERMARKS) || !(alloc_flags & ALLOC_CPUSET)) {
+                ac->zonelist = node_zonelist(numa_node_id(), gfp_mask);
+                ac->preferred_zoneref = first_zones_zonelist(ac->zonelist,
+                                        ac->high_zoneidx, ac->nodemask);
+        }
+
         /* This is the last chance, in general, before the goto nopage. */
         page = get_page_from_freelist(gfp_mask, order,
                                 alloc_flags & ~ALLOC_NO_WATERMARKS, ac);
@@ -3604,12 +3623,6 @@ retry:
 
         /* Allocate without watermarks if the context allows */
         if (alloc_flags & ALLOC_NO_WATERMARKS) {
-                /*
-                 * Ignore mempolicies if ALLOC_NO_WATERMARKS on the grounds
-                 * the allocation is high priority and these type of
-                 * allocations are system rather than user orientated
-                 */
-                ac->zonelist = node_zonelist(numa_node_id(), gfp_mask);
                 page = get_page_from_freelist(gfp_mask, order,
                                                 ALLOC_NO_WATERMARKS, ac);
                 if (page)
@@ -3808,7 +3821,11 @@ retry_cpuset:
         /* Dirty zone balancing only done in the fast path */
         ac.spread_dirty_pages = (gfp_mask & __GFP_WRITE);
 
-        /* The preferred zone is used for statistics later */
+        /*
+         * The preferred zone is used for statistics but crucially it is
+         * also used as the starting point for the zonelist iterator. It
+         * may get reset for allocations that ignore memory policies.
+         */
         ac.preferred_zoneref = first_zones_zonelist(ac.zonelist,
                                         ac.high_zoneidx, ac.nodemask);
         if (!ac.preferred_zoneref) {
diff --git a/mm/page_owner.c b/mm/page_owner.c
index 792b56da13d8..fedeba88c9cb 100644
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -55,6 +55,8 @@ void __reset_page_owner(struct page *page, unsigned int order)
 
         for (i = 0; i < (1 << order); i++) {
                 page_ext = lookup_page_ext(page + i);
+                if (unlikely(!page_ext))
+                        continue;
                 __clear_bit(PAGE_EXT_OWNER, &page_ext->flags);
         }
 }
@@ -62,6 +64,7 @@ void __reset_page_owner(struct page *page, unsigned int order)
 void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask)
 {
         struct page_ext *page_ext = lookup_page_ext(page);
+
         struct stack_trace trace = {
                 .nr_entries = 0,
                 .max_entries = ARRAY_SIZE(page_ext->trace_entries),
@@ -69,6 +72,9 @@ void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask)
                 .skip = 3,
         };
 
+        if (unlikely(!page_ext))
+                return;
+
         save_stack_trace(&trace);
 
         page_ext->order = order;
@@ -82,6 +88,8 @@ void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask)
 void __set_page_owner_migrate_reason(struct page *page, int reason)
 {
         struct page_ext *page_ext = lookup_page_ext(page);
+        if (unlikely(!page_ext))
+                return;
 
         page_ext->last_migrate_reason = reason;
 }
@@ -89,6 +97,12 @@ void __set_page_owner_migrate_reason(struct page *page, int reason)
 gfp_t __get_page_owner_gfp(struct page *page)
 {
         struct page_ext *page_ext = lookup_page_ext(page);
+        if (unlikely(!page_ext))
+                /*
+                 * The caller just returns 0 if no valid gfp
+                 * So return 0 here too.
+                 */
+                return 0;
 
         return page_ext->gfp_mask;
 }
@@ -99,6 +113,9 @@ void __copy_page_owner(struct page *oldpage, struct page *newpage)
         struct page_ext *new_ext = lookup_page_ext(newpage);
         int i;
 
+        if (unlikely(!old_ext || !new_ext))
+                return;
+
         new_ext->order = old_ext->order;
         new_ext->gfp_mask = old_ext->gfp_mask;
         new_ext->nr_entries = old_ext->nr_entries;
@@ -190,8 +207,15 @@ void __dump_page_owner(struct page *page)
                 .nr_entries = page_ext->nr_entries,
                 .entries = &page_ext->trace_entries[0],
         };
-        gfp_t gfp_mask = page_ext->gfp_mask;
-        int mt = gfpflags_to_migratetype(gfp_mask);
+        gfp_t gfp_mask;
+        int mt;
+
+        if (unlikely(!page_ext)) {
+                pr_alert("There is not page extension available.\n");
+                return;
+        }
+        gfp_mask = page_ext->gfp_mask;
+        mt = gfpflags_to_migratetype(gfp_mask);
 
         if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags)) {
                 pr_alert("page_owner info is not active (free page?)\n");
@@ -251,6 +275,8 @@ read_page_owner(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 }
 
                 page_ext = lookup_page_ext(page);
+                if (unlikely(!page_ext))
+                        continue;
 
                 /*
                  * Some pages could be missed by concurrent allocation or free,
@@ -317,6 +343,8 @@ static void init_pages_in_zone(pg_data_t *pgdat, struct zone *zone)
                                 continue;
 
                         page_ext = lookup_page_ext(page);
+                        if (unlikely(!page_ext))
+                                continue;
 
                         /* Maybe overraping zone */
                         if (test_bit(PAGE_EXT_OWNER, &page_ext->flags))
diff --git a/mm/page_poison.c b/mm/page_poison.c
index 1eae5fad2446..2e647c65916b 100644
--- a/mm/page_poison.c
+++ b/mm/page_poison.c
@@ -54,6 +54,9 @@ static inline void set_page_poison(struct page *page)
         struct page_ext *page_ext;
 
         page_ext = lookup_page_ext(page);
+        if (unlikely(!page_ext))
+                return;
+
         __set_bit(PAGE_EXT_DEBUG_POISON, &page_ext->flags);
 }
 
@@ -62,6 +65,9 @@ static inline void clear_page_poison(struct page *page)
         struct page_ext *page_ext;
 
         page_ext = lookup_page_ext(page);
+        if (unlikely(!page_ext))
+                return;
+
         __clear_bit(PAGE_EXT_DEBUG_POISON, &page_ext->flags);
 }
 
@@ -70,7 +76,7 @@ bool page_is_poisoned(struct page *page)
         struct page_ext *page_ext;
 
         page_ext = lookup_page_ext(page);
-        if (!page_ext)
+        if (unlikely(!page_ext))
                 return false;
 
         return test_bit(PAGE_EXT_DEBUG_POISON, &page_ext->flags);
diff --git a/mm/percpu.c b/mm/percpu.c
index 0c59684f1ff2..9903830aaebb 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -112,7 +112,7 @@ struct pcpu_chunk {
         int                     map_used;       /* # of map entries used before the sentry */
         int                     map_alloc;      /* # of map entries allocated */
         int                     *map;           /* allocation map */
-        struct work_struct      map_extend_work;/* async ->map[] extension */
+        struct list_head        map_extend_list;/* on pcpu_map_extend_chunks */
 
         void                    *data;          /* chunk data */
         int                     first_free;     /* no free below this */
@@ -162,10 +162,13 @@ static struct pcpu_chunk *pcpu_reserved_chunk;
 static int pcpu_reserved_chunk_limit;
 
 static DEFINE_SPINLOCK(pcpu_lock);      /* all internal data structures */
-static DEFINE_MUTEX(pcpu_alloc_mutex);  /* chunk create/destroy, [de]pop */
+static DEFINE_MUTEX(pcpu_alloc_mutex);  /* chunk create/destroy, [de]pop, map ext */
 
 static struct list_head *pcpu_slot __read_mostly; /* chunk list slots */
 
+/* chunks which need their map areas extended, protected by pcpu_lock */
+static LIST_HEAD(pcpu_map_extend_chunks);
+
 /*
  * The number of empty populated pages, protected by pcpu_lock.  The
  * reserved chunk doesn't contribute to the count.
@@ -395,13 +398,19 @@ static int pcpu_need_to_extend(struct pcpu_chunk *chunk, bool is_atomic)
 {
         int margin, new_alloc;
 
+        lockdep_assert_held(&pcpu_lock);
+
         if (is_atomic) {
                 margin = 3;
 
                 if (chunk->map_alloc <
-                    chunk->map_used + PCPU_ATOMIC_MAP_MARGIN_LOW &&
-                    pcpu_async_enabled)
-                        schedule_work(&chunk->map_extend_work);
+                    chunk->map_used + PCPU_ATOMIC_MAP_MARGIN_LOW) {
+                        if (list_empty(&chunk->map_extend_list)) {
+                                list_add_tail(&chunk->map_extend_list,
+                                              &pcpu_map_extend_chunks);
+                                pcpu_schedule_balance_work();
+                        }
+                }
         } else {
                 margin = PCPU_ATOMIC_MAP_MARGIN_HIGH;
         }
@@ -435,6 +444,8 @@ static int pcpu_extend_area_map(struct pcpu_chunk *chunk, int new_alloc)
         size_t old_size = 0, new_size = new_alloc * sizeof(new[0]);
         unsigned long flags;
 
+        lockdep_assert_held(&pcpu_alloc_mutex);
+
         new = pcpu_mem_zalloc(new_size);
         if (!new)
                 return -ENOMEM;
@@ -467,20 +478,6 @@ out_unlock:
         return 0;
 }
 
-static void pcpu_map_extend_workfn(struct work_struct *work)
-{
-        struct pcpu_chunk *chunk = container_of(work, struct pcpu_chunk,
-                                                map_extend_work);
-        int new_alloc;
-
-        spin_lock_irq(&pcpu_lock);
-        new_alloc = pcpu_need_to_extend(chunk, false);
-        spin_unlock_irq(&pcpu_lock);
-
-        if (new_alloc)
-                pcpu_extend_area_map(chunk, new_alloc);
-}
-
 /**
  * pcpu_fit_in_area - try to fit the requested allocation in a candidate area
  * @chunk: chunk the candidate area belongs to
@@ -740,7 +737,7 @@ static struct pcpu_chunk *pcpu_alloc_chunk(void)
         chunk->map_used = 1;
 
         INIT_LIST_HEAD(&chunk->list);
-        INIT_WORK(&chunk->map_extend_work, pcpu_map_extend_workfn);
+        INIT_LIST_HEAD(&chunk->map_extend_list);
         chunk->free_size = pcpu_unit_size;
         chunk->contig_hint = pcpu_unit_size;
 
@@ -895,6 +892,9 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved,
                 return NULL;
         }
 
+        if (!is_atomic)
+                mutex_lock(&pcpu_alloc_mutex);
+
         spin_lock_irqsave(&pcpu_lock, flags);
 
         /* serve reserved allocations from the reserved chunk if available */
@@ -967,12 +967,9 @@ restart:
         if (is_atomic)
                 goto fail;
 
-        mutex_lock(&pcpu_alloc_mutex);
-
         if (list_empty(&pcpu_slot[pcpu_nr_slots - 1])) {
                 chunk = pcpu_create_chunk();
                 if (!chunk) {
-                        mutex_unlock(&pcpu_alloc_mutex);
                         err = "failed to allocate new chunk";
                         goto fail;
                 }
@@ -983,7 +980,6 @@ restart:
                 spin_lock_irqsave(&pcpu_lock, flags);
         }
 
-        mutex_unlock(&pcpu_alloc_mutex);
         goto restart;
 
 area_found:
@@ -993,8 +989,6 @@ area_found:
         if (!is_atomic) {
                 int page_start, page_end, rs, re;
 
-                mutex_lock(&pcpu_alloc_mutex);
-
                 page_start = PFN_DOWN(off);
                 page_end = PFN_UP(off + size);
 
@@ -1005,7 +999,6 @@ area_found:
 
                         spin_lock_irqsave(&pcpu_lock, flags);
                         if (ret) {
-                                mutex_unlock(&pcpu_alloc_mutex);
                                 pcpu_free_area(chunk, off, &occ_pages);
                                 err = "failed to populate";
                                 goto fail_unlock;
@@ -1045,6 +1038,8 @@ fail:
                 /* see the flag handling in pcpu_blance_workfn() */
                 pcpu_atomic_alloc_failed = true;
                 pcpu_schedule_balance_work();
+        } else {
+                mutex_unlock(&pcpu_alloc_mutex);
         }
         return NULL;
 }
@@ -1129,6 +1124,7 @@ static void pcpu_balance_workfn(struct work_struct *work)
                 if (chunk == list_first_entry(free_head, struct pcpu_chunk, list))
                         continue;
 
+                list_del_init(&chunk->map_extend_list);
                 list_move(&chunk->list, &to_free);
         }
 
@@ -1146,6 +1142,25 @@ static void pcpu_balance_workfn(struct work_struct *work)
                 pcpu_destroy_chunk(chunk);
         }
 
+        /* service chunks which requested async area map extension */
+        do {
+                int new_alloc = 0;
+
+                spin_lock_irq(&pcpu_lock);
+
+                chunk = list_first_entry_or_null(&pcpu_map_extend_chunks,
+                                        struct pcpu_chunk, map_extend_list);
+                if (chunk) {
+                        list_del_init(&chunk->map_extend_list);
+                        new_alloc = pcpu_need_to_extend(chunk, false);
+                }
+
+                spin_unlock_irq(&pcpu_lock);
+
+                if (new_alloc)
+                        pcpu_extend_area_map(chunk, new_alloc);
+        } while (chunk);
+
         /*
          * Ensure there are certain number of free populated pages for
          * atomic allocs.  Fill up from the most packed so that atomic
@@ -1644,7 +1659,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
          */
         schunk = memblock_virt_alloc(pcpu_chunk_struct_size, 0);
         INIT_LIST_HEAD(&schunk->list);
-        INIT_WORK(&schunk->map_extend_work, pcpu_map_extend_workfn);
+        INIT_LIST_HEAD(&schunk->map_extend_list);
         schunk->base_addr = base_addr;
         schunk->map = smap;
         schunk->map_alloc = ARRAY_SIZE(smap);
@@ -1673,7 +1688,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
         if (dyn_size) {
                 dchunk = memblock_virt_alloc(pcpu_chunk_struct_size, 0);
                 INIT_LIST_HEAD(&dchunk->list);
-                INIT_WORK(&dchunk->map_extend_work, pcpu_map_extend_workfn);
+                INIT_LIST_HEAD(&dchunk->map_extend_list);
                 dchunk->base_addr = base_addr;
                 dchunk->map = dmap;
                 dchunk->map_alloc = ARRAY_SIZE(dmap);
diff --git a/mm/shmem.c b/mm/shmem.c
index a36144909b28..24463b67b6ef 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2227,7 +2227,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
                         /* Remove the !PageUptodate pages we added */
                         shmem_undo_range(inode,
                                 (loff_t)start << PAGE_SHIFT,
-                                (loff_t)index << PAGE_SHIFT, true);
+                                ((loff_t)index << PAGE_SHIFT) - 1, true);
                         goto undone;
                 }
 
diff --git a/mm/swap.c b/mm/swap.c
index 95916142fc46..90530ff8ed16 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -242,7 +242,7 @@ void rotate_reclaimable_page(struct page *page)
                 get_page(page);
                 local_irq_save(flags);
                 pvec = this_cpu_ptr(&lru_rotate_pvecs);
-                if (!pagevec_add(pvec, page))
+                if (!pagevec_add(pvec, page) || PageCompound(page))
                         pagevec_move_tail(pvec);
                 local_irq_restore(flags);
         }
@@ -296,7 +296,7 @@ void activate_page(struct page *page)
                 struct pagevec *pvec = &get_cpu_var(activate_page_pvecs);
 
                 get_page(page);
-                if (!pagevec_add(pvec, page))
+                if (!pagevec_add(pvec, page) || PageCompound(page))
                         pagevec_lru_move_fn(pvec, __activate_page, NULL);
                 put_cpu_var(activate_page_pvecs);
         }
@@ -391,9 +391,8 @@ static void __lru_cache_add(struct page *page)
         struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
 
         get_page(page);
-        if (!pagevec_space(pvec))
+        if (!pagevec_add(pvec, page) || PageCompound(page))
                 __pagevec_lru_add(pvec);
-        pagevec_add(pvec, page);
         put_cpu_var(lru_add_pvec);
 }
 
@@ -628,7 +627,7 @@ void deactivate_file_page(struct page *page)
         if (likely(get_page_unless_zero(page))) {
                 struct pagevec *pvec = &get_cpu_var(lru_deactivate_file_pvecs);
 
-                if (!pagevec_add(pvec, page))
+                if (!pagevec_add(pvec, page) || PageCompound(page))
                         pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);
                 put_cpu_var(lru_deactivate_file_pvecs);
         }
@@ -648,7 +647,7 @@ void deactivate_page(struct page *page)
                 struct pagevec *pvec = &get_cpu_var(lru_deactivate_pvecs);
 
                 get_page(page);
-                if (!pagevec_add(pvec, page))
+                if (!pagevec_add(pvec, page) || PageCompound(page))
                         pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);
                 put_cpu_var(lru_deactivate_pvecs);
         }
@@ -667,6 +666,24 @@ static void lru_add_drain_per_cpu(struct work_struct *dummy)
 
 static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
 
+/*
+ * lru_add_drain_wq is used to do lru_add_drain_all() from a WQ_MEM_RECLAIM
+ * workqueue, aiding in getting memory freed.
+ */
+static struct workqueue_struct *lru_add_drain_wq;
+
+static int __init lru_init(void)
+{
+        lru_add_drain_wq = alloc_workqueue("lru-add-drain", WQ_MEM_RECLAIM, 0);
+
+        if (WARN(!lru_add_drain_wq,
+                "Failed to create workqueue lru_add_drain_wq"))
+                return -ENOMEM;
+
+        return 0;
+}
+early_initcall(lru_init);
+
 void lru_add_drain_all(void)
 {
         static DEFINE_MUTEX(lock);
@@ -686,7 +703,7 @@ void lru_add_drain_all(void)
                     pagevec_count(&per_cpu(lru_deactivate_pvecs, cpu)) ||
                     need_activate_page_drain(cpu)) {
                         INIT_WORK(work, lru_add_drain_per_cpu);
-                        schedule_work_on(cpu, work);
+                        queue_work_on(cpu, lru_add_drain_wq, work);
                         cpumask_set_cpu(cpu, &has_work);
                 }
         }
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 0d457e7db8d6..c99463ac02fb 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -252,7 +252,10 @@ static inline void free_swap_cache(struct page *page)
 void free_page_and_swap_cache(struct page *page)
 {
         free_swap_cache(page);
-        put_page(page);
+        if (is_huge_zero_page(page))
+                put_huge_zero_page();
+        else
+                put_page(page);
 }
 
 /*
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index cf7ad1a53be0..e11475cdeb7a 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1105,7 +1105,7 @@ EXPORT_SYMBOL_GPL(vm_unmap_aliases);
  */
 void vm_unmap_ram(const void *mem, unsigned int count)
 {
-        unsigned long size = count << PAGE_SHIFT;
+        unsigned long size = (unsigned long)count << PAGE_SHIFT;
         unsigned long addr = (unsigned long)mem;
 
         BUG_ON(!addr);
@@ -1140,7 +1140,7 @@ EXPORT_SYMBOL(vm_unmap_ram);
  */
 void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot)
 {
-        unsigned long size = count << PAGE_SHIFT;
+        unsigned long size = (unsigned long)count << PAGE_SHIFT;
         unsigned long addr;
         void *mem;
 
@@ -1574,14 +1574,15 @@ void *vmap(struct page **pages, unsigned int count,
                 unsigned long flags, pgprot_t prot)
 {
         struct vm_struct *area;
+        unsigned long size;             /* In bytes */
 
         might_sleep();
 
         if (count > totalram_pages)
                 return NULL;
 
-        area = get_vm_area_caller((count << PAGE_SHIFT), flags,
-                                        __builtin_return_address(0));
+        size = (unsigned long)count << PAGE_SHIFT;
+        area = get_vm_area_caller(size, flags, __builtin_return_address(0));
         if (!area)
                 return NULL;
 
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 77e42ef388c2..cb2a67bb4158 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1061,6 +1061,8 @@ static void pagetypeinfo_showmixedcount_print(struct seq_file *m,
                                 continue;
 
                         page_ext = lookup_page_ext(page);
+                        if (unlikely(!page_ext))
+                                continue;
 
                         if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags))
                                 continue;
diff --git a/mm/z3fold.c b/mm/z3fold.c
index 34917d55d311..8f9e89ca1d31 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -412,7 +412,7 @@ static void z3fold_free(struct z3fold_pool *pool, unsigned long handle)
                 /* HEADLESS page stored */
                 bud = HEADLESS;
         } else {
-                bud = (handle - zhdr->first_num) & BUDDY_MASK;
+                bud = handle_to_buddy(handle);
 
                 switch (bud) {
                 case FIRST:
@@ -572,15 +572,19 @@ next:
                         pool->pages_nr--;
                         spin_unlock(&pool->lock);
                         return 0;
-                } else if (zhdr->first_chunks != 0 &&
-                           zhdr->last_chunks != 0 && zhdr->middle_chunks != 0) {
-                        /* Full, add to buddied list */
-                        list_add(&zhdr->buddy, &pool->buddied);
-                } else if (!test_bit(PAGE_HEADLESS, &page->private)) {
-                        z3fold_compact_page(zhdr);
-                        /* add to unbuddied list */
-                        freechunks = num_free_chunks(zhdr);
-                        list_add(&zhdr->buddy, &pool->unbuddied[freechunks]);
+                }  else if (!test_bit(PAGE_HEADLESS, &page->private)) {
+                        if (zhdr->first_chunks != 0 &&
+                            zhdr->last_chunks != 0 &&
+                            zhdr->middle_chunks != 0) {
+                                /* Full, add to buddied list */
+                                list_add(&zhdr->buddy, &pool->buddied);
+                        } else {
+                                z3fold_compact_page(zhdr);
+                                /* add to unbuddied list */
+                                freechunks = num_free_chunks(zhdr);
+                                list_add(&zhdr->buddy,
+                                         &pool->unbuddied[freechunks]);
+                        }
                 }
 
                 /* add to beginning of LRU */
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index a1e273af6fc8..82a116ba590e 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -290,6 +290,10 @@ static void vlan_sync_address(struct net_device *dev,
         if (ether_addr_equal(vlan->real_dev_addr, dev->dev_addr))
                 return;
 
+        /* vlan continues to inherit address of lower device */
+        if (vlan_dev_inherit_address(vlandev, dev))
+                goto out;
+
         /* vlan address was different from the old address and is equal to
          * the new address */
         if (!ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
@@ -302,6 +306,7 @@ static void vlan_sync_address(struct net_device *dev,
             !ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
                 dev_uc_add(dev, vlandev->dev_addr);
 
+out:
         ether_addr_copy(vlan->real_dev_addr, dev->dev_addr);
 }
 
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 9d010a09ab98..cc1557978066 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -109,6 +109,8 @@ int vlan_check_real_dev(struct net_device *real_dev,
 void vlan_setup(struct net_device *dev);
 int register_vlan_dev(struct net_device *dev);
 void unregister_vlan_dev(struct net_device *dev, struct list_head *head);
+bool vlan_dev_inherit_address(struct net_device *dev,
+                              struct net_device *real_dev);
 
 static inline u32 vlan_get_ingress_priority(struct net_device *dev,
                                             u16 vlan_tci)
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index e7e62570bdb8..86ae75b77390 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -245,6 +245,17 @@ void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)
         strncpy(result, vlan_dev_priv(dev)->real_dev->name, 23);
 }
 
+bool vlan_dev_inherit_address(struct net_device *dev,
+                              struct net_device *real_dev)
+{
+        if (dev->addr_assign_type != NET_ADDR_STOLEN)
+                return false;
+
+        ether_addr_copy(dev->dev_addr, real_dev->dev_addr);
+        call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
+        return true;
+}
+
 static int vlan_dev_open(struct net_device *dev)
 {
         struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
@@ -255,7 +266,8 @@ static int vlan_dev_open(struct net_device *dev)
             !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
                 return -ENETDOWN;
 
-        if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) {
+        if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr) &&
+            !vlan_dev_inherit_address(dev, real_dev)) {
                 err = dev_uc_add(real_dev, dev->dev_addr);
                 if (err < 0)
                         goto out;
@@ -560,8 +572,10 @@ static int vlan_dev_init(struct net_device *dev)
         /* ipv6 shared card related stuff */
         dev->dev_id = real_dev->dev_id;
 
-        if (is_zero_ether_addr(dev->dev_addr))
-                eth_hw_addr_inherit(dev, real_dev);
+        if (is_zero_ether_addr(dev->dev_addr)) {
+                ether_addr_copy(dev->dev_addr, real_dev->dev_addr);
+                dev->addr_assign_type = NET_ADDR_STOLEN;
+        }
         if (is_zero_ether_addr(dev->broadcast))
                 memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
 
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 4fd6af47383a..adb6e3d21b1e 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -124,7 +124,7 @@ as_indicate_complete:
                 break;
         case as_addparty:
         case as_dropparty:
-                sk->sk_err_soft = msg->reply;
+                sk->sk_err_soft = -msg->reply;
                                         /* < 0 failure, otherwise ep_ref */
                 clear_bit(ATM_VF_WAITING, &vcc->flags);
                 break;
diff --git a/net/atm/svc.c b/net/atm/svc.c
index 3fa0a9ee98d1..878563a8354d 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -546,7 +546,7 @@ static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr,
                 schedule();
         }
         finish_wait(sk_sleep(sk), &wait);
-        error = xchg(&sk->sk_err_soft, 0);
+        error = -xchg(&sk->sk_err_soft, 0);
 out:
         release_sock(sk);
         return error;
@@ -573,7 +573,7 @@ static int svc_dropparty(struct socket *sock, int ep_ref)
                 error = -EUNATCH;
                 goto out;
         }
-        error = xchg(&sk->sk_err_soft, 0);
+        error = -xchg(&sk->sk_err_soft, 0);
 out:
         release_sock(sk);
         return error;
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index dcea4f4c62b3..c18080ad4085 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -279,6 +279,8 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr)
          * change from under us.
          */
         list_for_each_entry(v, &vg->vlan_list, vlist) {
+                if (!br_vlan_should_use(v))
+                        continue;
                 f = __br_fdb_get(br, br->dev->dev_addr, v->vid);
                 if (f && f->is_local && !f->dst)
                         fdb_delete_local(br, NULL, f);
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 0160d7d09a1e..89469592076c 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1276,9 +1276,9 @@ static bool target_should_be_paused(struct ceph_osd_client *osdc,
                                     const struct ceph_osd_request_target *t,
                                     struct ceph_pg_pool_info *pi)
 {
-        bool pauserd = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD);
-        bool pausewr = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR) ||
-                       ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||
+        bool pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD);
+        bool pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) ||
+                       ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||
                        __pool_full(pi);
 
         WARN_ON(pi->id != t->base_oloc.pool);
@@ -1303,8 +1303,7 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
         bool force_resend = false;
         bool need_check_tiering = false;
         bool need_resend = false;
-        bool sort_bitwise = ceph_osdmap_flag(osdc->osdmap,
-                                             CEPH_OSDMAP_SORTBITWISE);
+        bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);
         enum calc_target_result ct_res;
         int ret;
 
@@ -1540,9 +1539,9 @@ static void encode_request(struct ceph_osd_request *req, struct ceph_msg *msg)
          */
         msg->hdr.data_off = cpu_to_le16(req->r_data_offset);
 
-        dout("%s req %p oid %*pE oid_len %d front %zu data %u\n", __func__,
-             req, req->r_t.target_oid.name_len, req->r_t.target_oid.name,
-             req->r_t.target_oid.name_len, msg->front.iov_len, data_len);
+        dout("%s req %p oid %s oid_len %d front %zu data %u\n", __func__,
+             req, req->r_t.target_oid.name, req->r_t.target_oid.name_len,
+             msg->front.iov_len, data_len);
 }
 
 /*
@@ -1590,9 +1589,9 @@ static void maybe_request_map(struct ceph_osd_client *osdc)
         verify_osdc_locked(osdc);
         WARN_ON(!osdc->osdmap->epoch);
 
-        if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||
-            ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD) ||
-            ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR)) {
+        if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||
+            ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD) ||
+            ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR)) {
                 dout("%s osdc %p continuous\n", __func__, osdc);
                 continuous = true;
         } else {
@@ -1629,19 +1628,19 @@ again:
         }
 
         if ((req->r_flags & CEPH_OSD_FLAG_WRITE) &&
-            ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR)) {
+            ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR)) {
                 dout("req %p pausewr\n", req);
                 req->r_t.paused = true;
                 maybe_request_map(osdc);
         } else if ((req->r_flags & CEPH_OSD_FLAG_READ) &&
-                   ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD)) {
+                   ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD)) {
                 dout("req %p pauserd\n", req);
                 req->r_t.paused = true;
                 maybe_request_map(osdc);
         } else if ((req->r_flags & CEPH_OSD_FLAG_WRITE) &&
                    !(req->r_flags & (CEPH_OSD_FLAG_FULL_TRY |
                                      CEPH_OSD_FLAG_FULL_FORCE)) &&
-                   (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||
+                   (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||
                     pool_full(osdc, req->r_t.base_oloc.pool))) {
                 dout("req %p full/pool_full\n", req);
                 pr_warn_ratelimited("FULL or reached pool quota\n");
@@ -2280,7 +2279,7 @@ static void send_linger_ping(struct ceph_osd_linger_request *lreq)
         struct ceph_osd_request *req = lreq->ping_req;
         struct ceph_osd_req_op *op = &req->r_ops[0];
 
-        if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD)) {
+        if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD)) {
                 dout("%s PAUSERD\n", __func__);
                 return;
         }
@@ -2893,6 +2892,9 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg)
                         dout("req %p tid %llu cb\n", req, req->r_tid);
                         __complete_request(req);
                 }
+                if (m.flags & CEPH_OSD_FLAG_ONDISK)
+                        complete_all(&req->r_safe_completion);
+                ceph_osdc_put_request(req);
         } else {
                 if (req->r_unsafe_callback) {
                         dout("req %p tid %llu unsafe-cb\n", req, req->r_tid);
@@ -2901,10 +2903,7 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg)
                         WARN_ON(1);
                 }
         }
-        if (m.flags & CEPH_OSD_FLAG_ONDISK)
-                complete_all(&req->r_safe_completion);
 
-        ceph_osdc_put_request(req);
         return;
 
 fail_request:
@@ -3050,7 +3049,7 @@ static int handle_one_map(struct ceph_osd_client *osdc,
         bool skipped_map = false;
         bool was_full;
 
-        was_full = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL);
+        was_full = ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL);
         set_pool_was_full(osdc);
 
         if (incremental)
@@ -3088,7 +3087,7 @@ static int handle_one_map(struct ceph_osd_client *osdc,
                 osdc->osdmap = newmap;
         }
 
-        was_full &= !ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL);
+        was_full &= !ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL);
         scan_requests(&osdc->homeless_osd, skipped_map, was_full, true,
                       need_resend, need_resend_linger);
 
@@ -3174,9 +3173,9 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
         if (ceph_check_fsid(osdc->client, &fsid) < 0)
                 goto bad;
 
-        was_pauserd = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD);
-        was_pausewr = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR) ||
-                      ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||
+        was_pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD);
+        was_pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) ||
+                      ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||
                       have_pool_full(osdc);
 
         /* incremental maps */
@@ -3238,9 +3237,9 @@ done:
          * we find out when we are no longer full and stop returning
          * ENOSPC.
          */
-        pauserd = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD);
-        pausewr = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR) ||
-                  ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||
+        pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD);
+        pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) ||
+                  ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||
                   have_pool_full(osdc);
         if (was_pauserd || was_pausewr || pauserd || pausewr)
                 maybe_request_map(osdc);
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index cde52e94732f..03062bb763b3 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -1778,8 +1778,8 @@ int ceph_object_locator_to_pg(struct ceph_osdmap *osdmap,
         raw_pgid->seed = ceph_str_hash(pi->object_hash, oid->name,
                                        oid->name_len);
 
-        dout("%s %*pE -> raw_pgid %llu.%x\n", __func__, oid->name_len,
-             oid->name, raw_pgid->pool, raw_pgid->seed);
+        dout("%s %s -> raw_pgid %llu.%x\n", __func__, oid->name,
+             raw_pgid->pool, raw_pgid->seed);
         return 0;
 }
 EXPORT_SYMBOL(ceph_object_locator_to_pg);
diff --git a/net/compat.c b/net/compat.c
index 5cfd26a0006f..1cd2ec046164 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -309,8 +309,8 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
         __scm_destroy(scm);
 }
 
-static int do_set_attach_filter(struct socket *sock, int level, int optname,
-                                char __user *optval, unsigned int optlen)
+/* allocate a 64-bit sock_fprog on the user stack for duration of syscall. */
+struct sock_fprog __user *get_compat_bpf_fprog(char __user *optval)
 {
         struct compat_sock_fprog __user *fprog32 = (struct compat_sock_fprog __user *)optval;
         struct sock_fprog __user *kfprog = compat_alloc_user_space(sizeof(struct sock_fprog));
@@ -323,6 +323,19 @@ static int do_set_attach_filter(struct socket *sock, int level, int optname,
             __get_user(ptr, &fprog32->filter) ||
             __put_user(len, &kfprog->len) ||
             __put_user(compat_ptr(ptr), &kfprog->filter))
+                return NULL;
+
+        return kfprog;
+}
+EXPORT_SYMBOL_GPL(get_compat_bpf_fprog);
+
+static int do_set_attach_filter(struct socket *sock, int level, int optname,
+                                char __user *optval, unsigned int optlen)
+{
+        struct sock_fprog __user *kfprog;
+
+        kfprog = get_compat_bpf_fprog(optval);
+        if (!kfprog)
                 return -EFAULT;
 
         return sock_setsockopt(sock, level, optname, (char __user *)kfprog,
@@ -354,7 +367,8 @@ static int do_set_sock_timeout(struct socket *sock, int level,
 static int compat_sock_setsockopt(struct socket *sock, int level, int optname,
                                 char __user *optval, unsigned int optlen)
 {
-        if (optname == SO_ATTACH_FILTER)
+        if (optname == SO_ATTACH_FILTER ||
+            optname == SO_ATTACH_REUSEPORT_CBPF)
                 return do_set_attach_filter(sock, level, optname,
                                             optval, optlen);
         if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
index f96ee8b9478d..be873e4e3125 100644
--- a/net/core/gen_stats.c
+++ b/net/core/gen_stats.c
@@ -47,6 +47,7 @@ nla_put_failure:
  * @xstats_type: TLV type for backward compatibility xstats TLV
  * @lock: statistics lock
  * @d: dumping handle
+ * @padattr: padding attribute
  *
  * Initializes the dumping handle, grabs the statistic lock and appends
  * an empty TLV header to the socket buffer for use a container for all
@@ -87,6 +88,7 @@ EXPORT_SYMBOL(gnet_stats_start_copy_compat);
  * @type: TLV type for top level statistic TLV
  * @lock: statistics lock
  * @d: dumping handle
+ * @padattr: padding attribute
  *
  * Initializes the dumping handle, grabs the statistic lock and appends
  * an empty TLV header to the socket buffer for use a container for all
diff --git a/net/core/hwbm.c b/net/core/hwbm.c
index 941c28486896..2cab489ae62e 100644
--- a/net/core/hwbm.c
+++ b/net/core/hwbm.c
@@ -55,18 +55,21 @@ int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num, gfp_t gfp)
         spin_lock_irqsave(&bm_pool->lock, flags);
         if (bm_pool->buf_num == bm_pool->size) {
                 pr_warn("pool already filled\n");
+                spin_unlock_irqrestore(&bm_pool->lock, flags);
                 return bm_pool->buf_num;
         }
 
         if (buf_num + bm_pool->buf_num > bm_pool->size) {
                 pr_warn("cannot allocate %d buffers for pool\n",
                         buf_num);
+                spin_unlock_irqrestore(&bm_pool->lock, flags);
                 return 0;
         }
 
         if ((buf_num + bm_pool->buf_num) < bm_pool->buf_num) {
                 pr_warn("Adding %d buffers to the %d current buffers will overflow\n",
                         buf_num,  bm_pool->buf_num);
+                spin_unlock_irqrestore(&bm_pool->lock, flags);
                 return 0;
         }
 
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 2b3f76fe65f4..7a0b616557ab 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -24,6 +24,7 @@
 #include <linux/jiffies.h>
 #include <linux/pm_runtime.h>
 #include <linux/of.h>
+#include <linux/of_net.h>
 
 #include "net-sysfs.h"
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8604ae245960..8b02df0d354d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2245,10 +2245,8 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
         hrtimer_set_expires(&t.timer, spin_until);
 
         remaining = ktime_to_ns(hrtimer_expires_remaining(&t.timer));
-        if (remaining <= 0) {
-                pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay);
-                return;
-        }
+        if (remaining <= 0)
+                goto out;
 
         start_time = ktime_get();
         if (remaining < 100000) {
@@ -2273,7 +2271,9 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
         }
 
         pkt_dev->idle_acc += ktime_to_ns(ktime_sub(end_time, start_time));
+out:
         pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay);
+        destroy_hrtimer_on_stack(&t.timer);
 }
 
 static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev)
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index ca207dbf673b..116187b5c267 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -1289,8 +1289,8 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla,
                                      nl802154_dev_addr_policy))
                 return -EINVAL;
 
-        if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] &&
-            !attrs[NL802154_DEV_ADDR_ATTR_MODE] &&
+        if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] ||
+            !attrs[NL802154_DEV_ADDR_ATTR_MODE] ||
             !(attrs[NL802154_DEV_ADDR_ATTR_SHORT] ||
               attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]))
                 return -EINVAL;
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 377424ea17a4..d39e9e47a26e 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1681,6 +1681,14 @@ static __net_init int inet_init_net(struct net *net)
          */
         net->ipv4.ping_group_range.range[0] = make_kgid(&init_user_ns, 1);
         net->ipv4.ping_group_range.range[1] = make_kgid(&init_user_ns, 0);
+
+        /* Default values for sysctl-controlled parameters.
+         * We set them here, in case sysctl is not compiled.
+         */
+        net->ipv4.sysctl_ip_default_ttl = IPDEFTTL;
+        net->ipv4.sysctl_ip_dynaddr = 0;
+        net->ipv4.sysctl_ip_early_demux = 1;
+
         return 0;
 }
 
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index bb0419582b8d..1cb67de106fe 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -999,10 +999,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
         if (!net->ipv4.sysctl_local_reserved_ports)
                 goto err_ports;
 
-        net->ipv4.sysctl_ip_default_ttl = IPDEFTTL;
-        net->ipv4.sysctl_ip_dynaddr = 0;
-        net->ipv4.sysctl_ip_early_demux = 1;
-
         return 0;
 
 err_ports:
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d56c0559b477..0ff31d97d485 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1618,12 +1618,12 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 }
         }
 
-        if (rcu_access_pointer(sk->sk_filter)) {
-                if (udp_lib_checksum_complete(skb))
+        if (rcu_access_pointer(sk->sk_filter) &&
+            udp_lib_checksum_complete(skb))
                         goto csum_error;
-                if (sk_filter(sk, skb))
-                        goto drop;
-        }
+
+        if (sk_filter(sk, skb))
+                goto drop;
 
         udp_csum_pull_header(skb);
         if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 3f8411328de5..2343e4f2e0bf 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -232,6 +232,15 @@ config IPV6_GRE
 
           Saying M here will produce a module called ip6_gre. If unsure, say N.
 
+config IPV6_FOU
+        tristate
+        default NET_FOU && IPV6
+
+config IPV6_FOU_TUNNEL
+        tristate
+        default NET_FOU_IP_TUNNELS && IPV6_FOU
+        select IPV6_TUNNEL
+
 config IPV6_MULTIPLE_TABLES
         bool "IPv6: Multiple Routing Tables"
         select FIB_RULES
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 7ec3129c9ace..6d8ea099213e 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_IPV6_VTI) += ip6_vti.o
 obj-$(CONFIG_IPV6_SIT) += sit.o
 obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
 obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
-obj-$(CONFIG_NET_FOU) += fou6.o
+obj-$(CONFIG_IPV6_FOU) += fou6.o
 
 obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o
 obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
diff --git a/net/ipv6/fou6.c b/net/ipv6/fou6.c
index c972d0b52579..9ea249b9451e 100644
--- a/net/ipv6/fou6.c
+++ b/net/ipv6/fou6.c
@@ -69,7 +69,7 @@ int gue6_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,
 }
 EXPORT_SYMBOL(gue6_build_header);
 
-#ifdef CONFIG_NET_FOU_IP_TUNNELS
+#if IS_ENABLED(CONFIG_IPV6_FOU_TUNNEL)
 
 static const struct ip6_tnl_encap_ops fou_ip6tun_ops = {
         .encap_hlen = fou_encap_hlen,
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index af503f518278..fdc9de276ab1 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -712,6 +712,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu)
         fl6->daddr = p->raddr;
         fl6->flowi6_oif = p->link;
         fl6->flowlabel = 0;
+        fl6->flowi6_proto = IPPROTO_GRE;
 
         if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS))
                 fl6->flowlabel |= IPV6_TCLASS_MASK & p->flowinfo;
@@ -1027,6 +1028,8 @@ static int ip6gre_tunnel_init_common(struct net_device *dev)
 
         dev->hard_header_len = LL_MAX_HEADER + t_hlen;
         dev->mtu = ETH_DATA_LEN - t_hlen;
+        if (dev->type == ARPHRD_ETHER)
+                dev->mtu -= ETH_HLEN;
         if (!(tunnel->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
                 dev->mtu -= 8;
 
@@ -1253,6 +1256,8 @@ static int ip6gre_tap_init(struct net_device *dev)
         if (ret)
                 return ret;
 
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
+
         tunnel = netdev_priv(dev);
 
         ip6gre_tnl_link_config(tunnel, 1);
@@ -1286,6 +1291,7 @@ static void ip6gre_tap_setup(struct net_device *dev)
 
         dev->features |= NETIF_F_NETNS_LOCAL;
         dev->priv_flags &= ~IFF_TX_SKB_SHARING;
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 }
 
 static bool ip6gre_netlink_encap_parms(struct nlattr *data[],
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index cbf127ae7c67..635b8d340cdb 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1071,17 +1071,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
                                          const struct in6_addr *final_dst)
 {
         struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
-        int err;
 
         dst = ip6_sk_dst_check(sk, dst, fl6);
+        if (!dst)
+                dst = ip6_dst_lookup_flow(sk, fl6, final_dst);
 
-        err = ip6_dst_lookup_tail(sock_net(sk), sk, &dst, fl6);
-        if (err)
-                return ERR_PTR(err);
-        if (final_dst)
-                fl6->daddr = *final_dst;
-
-        return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);
+        return dst;
 }
 EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow);
 
diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c
index 6989c70ae29f..4a84b5ad9ecb 100644
--- a/net/ipv6/netfilter/nf_dup_ipv6.c
+++ b/net/ipv6/netfilter/nf_dup_ipv6.c
@@ -33,6 +33,7 @@ static bool nf_dup_ipv6_route(struct net *net, struct sk_buff *skb,
         fl6.daddr = *gw;
         fl6.flowlabel = (__force __be32)(((iph->flow_lbl[0] & 0xF) << 16) |
                         (iph->flow_lbl[1] << 8) | iph->flow_lbl[2]);
+        fl6.flowi6_flags = FLOWI_FLAG_KNOWN_NH;
         dst = ip6_route_output(net, NULL, &fl6);
         if (dst->error) {
                 dst_release(dst);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 79e33e02f11a..f36c2d076fce 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1721,7 +1721,9 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
         destp = ntohs(inet->inet_dport);
         srcp  = ntohs(inet->inet_sport);
 
-        if (icsk->icsk_pending == ICSK_TIME_RETRANS) {
+        if (icsk->icsk_pending == ICSK_TIME_RETRANS ||
+            icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS ||
+            icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) {
                 timer_active    = 1;
                 timer_expires   = icsk->icsk_timeout;
         } else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 2da1896af934..f421c9f23c5b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -653,12 +653,12 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 }
         }
 
-        if (rcu_access_pointer(sk->sk_filter)) {
-                if (udp_lib_checksum_complete(skb))
-                        goto csum_error;
-                if (sk_filter(sk, skb))
-                        goto drop;
-        }
+        if (rcu_access_pointer(sk->sk_filter) &&
+            udp_lib_checksum_complete(skb))
+                goto csum_error;
+
+        if (sk_filter(sk, skb))
+                goto drop;
 
         udp_csum_pull_header(skb);
         if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 6edfa9980314..1e40dacaa137 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1581,7 +1581,7 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32
         /* Mark socket as an encapsulation socket. See net/ipv4/udp.c */
         tunnel->encap = encap;
         if (encap == L2TP_ENCAPTYPE_UDP) {
-                struct udp_tunnel_sock_cfg udp_cfg;
+                struct udp_tunnel_sock_cfg udp_cfg = { };
 
                 udp_cfg.sk_user_data = tunnel;
                 udp_cfg.encap_type = UDP_ENCAP_L2TPINUDP;
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index c6f5df1bed12..6c54e03fe9c1 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -128,6 +128,7 @@ static inline struct sock *l2tp_ip6_bind_lookup(struct net *net,
  */
 static int l2tp_ip6_recv(struct sk_buff *skb)
 {
+        struct net *net = dev_net(skb->dev);
         struct sock *sk;
         u32 session_id;
         u32 tunnel_id;
@@ -154,7 +155,7 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
         }
 
         /* Ok, this is a data packet. Lookup the session. */
-        session = l2tp_session_find(&init_net, NULL, session_id);
+        session = l2tp_session_find(net, NULL, session_id);
         if (session == NULL)
                 goto discard;
 
@@ -188,14 +189,14 @@ pass_up:
                 goto discard;
 
         tunnel_id = ntohl(*(__be32 *) &skb->data[4]);
-        tunnel = l2tp_tunnel_find(&init_net, tunnel_id);
+        tunnel = l2tp_tunnel_find(net, tunnel_id);
         if (tunnel != NULL)
                 sk = tunnel->sock;
         else {
                 struct ipv6hdr *iph = ipv6_hdr(skb);
 
                 read_lock_bh(&l2tp_ip6_lock);
-                sk = __l2tp_ip6_bind_lookup(&init_net, &iph->daddr,
+                sk = __l2tp_ip6_bind_lookup(net, &iph->daddr,
                                             0, tunnel_id);
                 read_unlock_bh(&l2tp_ip6_lock);
         }
@@ -263,6 +264,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         struct inet_sock *inet = inet_sk(sk);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct sockaddr_l2tpip6 *addr = (struct sockaddr_l2tpip6 *) uaddr;
+        struct net *net = sock_net(sk);
         __be32 v4addr = 0;
         int addr_type;
         int err;
@@ -286,7 +288,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 
         err = -EADDRINUSE;
         read_lock_bh(&l2tp_ip6_lock);
-        if (__l2tp_ip6_bind_lookup(&init_net, &addr->l2tp_addr,
+        if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr,
                                    sk->sk_bound_dev_if, addr->l2tp_conn_id))
                 goto out_in_use;
         read_unlock_bh(&l2tp_ip6_lock);
@@ -456,7 +458,7 @@ static int l2tp_ip6_backlog_recv(struct sock *sk, struct sk_buff *skb)
         return 0;
 
 drop:
-        IP_INC_STATS(&init_net, IPSTATS_MIB_INDISCARDS);
+        IP_INC_STATS(sock_net(sk), IPSTATS_MIB_INDISCARDS);
         kfree_skb(skb);
         return -1;
 }
diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c
index 5dba899131b3..182470847fcf 100644
--- a/net/lapb/lapb_in.c
+++ b/net/lapb/lapb_in.c
@@ -444,10 +444,9 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_FRMR:
-                lapb_dbg(1, "(%p) S3 RX FRMR(%d) %02X %02X %02X %02X %02X\n",
+                lapb_dbg(1, "(%p) S3 RX FRMR(%d) %5ph\n",
                          lapb->dev, frame->pf,
-                         skb->data[0], skb->data[1], skb->data[2],
-                         skb->data[3], skb->data[4]);
+                         skb->data);
                 lapb_establish_data_link(lapb);
                 lapb_dbg(0, "(%p) S3 -> S1\n", lapb->dev);
                 lapb_requeue_frames(lapb);
diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c
index ba4d015bd1a6..482c94d9d958 100644
--- a/net/lapb/lapb_out.c
+++ b/net/lapb/lapb_out.c
@@ -148,9 +148,7 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type)
                 }
         }
 
-        lapb_dbg(2, "(%p) S%d TX %02X %02X %02X\n",
-                 lapb->dev, lapb->state,
-                 skb->data[0], skb->data[1], skb->data[2]);
+        lapb_dbg(2, "(%p) S%d TX %3ph\n", lapb->dev, lapb->state, skb->data);
 
         if (!lapb_data_transmit(lapb, skb))
                 kfree_skb(skb);
diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c
index 9d0a426eccbb..3c1914df641f 100644
--- a/net/lapb/lapb_subr.c
+++ b/net/lapb/lapb_subr.c
@@ -113,9 +113,7 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         frame->type = LAPB_ILLEGAL;
 
-        lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n",
-                 lapb->dev, lapb->state,
-                 skb->data[0], skb->data[1], skb->data[2]);
+        lapb_dbg(2, "(%p) S%d RX %3ph\n", lapb->dev, lapb->state, skb->data);
 
         /* We always need to look at 2 bytes, sometimes we need
          * to look at 3 and those cases are handled below.
@@ -284,10 +282,9 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
                 dptr++;
                 *dptr++ = lapb->frmr_type;
 
-                lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
+                lapb_dbg(1, "(%p) S%d TX FRMR %5ph\n",
                          lapb->dev, lapb->state,
-                         skb->data[1], skb->data[2], skb->data[3],
-                         skb->data[4], skb->data[5]);
+                         &skb->data[1]);
         } else {
                 dptr    = skb_put(skb, 4);
                 *dptr++ = LAPB_FRMR;
@@ -299,9 +296,8 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
                 dptr++;
                 *dptr++ = lapb->frmr_type;
 
-                lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n",
-                         lapb->dev, lapb->state, skb->data[1],
-                         skb->data[2], skb->data[3]);
+                lapb_dbg(1, "(%p) S%d TX FRMR %3ph\n",
+                         lapb->dev, lapb->state, &skb->data[1]);
         }
 
         lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE);
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 4c6404e1ad6e..21b1fdf5d01d 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -161,6 +161,10 @@ void mesh_sta_cleanup(struct sta_info *sta)
                 del_timer_sync(&sta->mesh->plink_timer);
         }
 
+        /* make sure no readers can access nexthop sta from here on */
+        mesh_path_flush_by_nexthop(sta);
+        synchronize_net();
+
         if (changed)
                 ieee80211_mbss_info_change_notify(sdata, changed);
 }
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index c8b8ccc370eb..78b0ef32dddd 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -280,7 +280,7 @@ struct ieee80211_fast_tx {
         u8 sa_offs, da_offs, pn_offs;
         u8 band;
         u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
-               sizeof(rfc1042_header)];
+               sizeof(rfc1042_header)] __aligned(2);
 
         struct rcu_head rcu_head;
 };
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 2cb3c626cd43..096a45103f14 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -762,7 +762,7 @@ static int expire_quiescent_template(struct netns_ipvs *ipvs,
  *      If available, return 1, otherwise invalidate this connection
  *      template and return 0.
  */
-int ip_vs_check_template(struct ip_vs_conn *ct)
+int ip_vs_check_template(struct ip_vs_conn *ct, struct ip_vs_dest *cdest)
 {
         struct ip_vs_dest *dest = ct->dest;
         struct netns_ipvs *ipvs = ct->ipvs;
@@ -772,7 +772,8 @@ int ip_vs_check_template(struct ip_vs_conn *ct)
          */
         if ((dest == NULL) ||
             !(dest->flags & IP_VS_DEST_F_AVAILABLE) ||
-            expire_quiescent_template(ipvs, dest)) {
+            expire_quiescent_template(ipvs, dest) ||
+            (cdest && (dest != cdest))) {
                 IP_VS_DBG_BUF(9, "check_template: dest not available for "
                               "protocol %s s:%s:%d v:%s:%d "
                               "-> d:%s:%d\n",
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 1207f20d24e4..2c1b498a7a27 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -321,7 +321,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc,
 
         /* Check if a template already exists */
         ct = ip_vs_ct_in_get(&param);
-        if (!ct || !ip_vs_check_template(ct)) {
+        if (!ct || !ip_vs_check_template(ct, NULL)) {
                 struct ip_vs_scheduler *sched;
 
                 /*
@@ -1154,7 +1154,8 @@ struct ip_vs_conn *ip_vs_new_conn_out(struct ip_vs_service *svc,
                                                   vport, &param) < 0)
                         return NULL;
                 ct = ip_vs_ct_in_get(&param);
-                if (!ct) {
+                /* check if template exists and points to the same dest */
+                if (!ct || !ip_vs_check_template(ct, dest)) {
                         ct = ip_vs_conn_new(&param, dest->af, daddr, dport,
                                             IP_VS_CONN_F_TEMPLATE, dest, 0);
                         if (!ct) {
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 883c691ec8d0..19efeba02abb 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -632,6 +632,7 @@ static int __init nf_conntrack_ftp_init(void)
                         if (ret) {
                                 pr_err("failed to register helper for pf: %d port: %d\n",
                                        ftp[i][j].tuple.src.l3num, ports[i]);
+                                ports_c = i;
                                 nf_conntrack_ftp_fini();
                                 return ret;
                         }
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index f703adb7e5f7..196cb39649e1 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -361,9 +361,10 @@ EXPORT_SYMBOL_GPL(nf_ct_helper_log);
 
 int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
 {
-        int ret = 0;
-        struct nf_conntrack_helper *cur;
+        struct nf_conntrack_tuple_mask mask = { .src.u.all = htons(0xFFFF) };
         unsigned int h = helper_hash(&me->tuple);
+        struct nf_conntrack_helper *cur;
+        int ret = 0;
 
         BUG_ON(me->expect_policy == NULL);
         BUG_ON(me->expect_class_max >= NF_CT_MAX_EXPECT_CLASSES);
@@ -371,9 +372,7 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
 
         mutex_lock(&nf_ct_helper_mutex);
         hlist_for_each_entry(cur, &nf_ct_helper_hash[h], hnode) {
-                if (strncmp(cur->name, me->name, NF_CT_HELPER_NAME_LEN) == 0 &&
-                    cur->tuple.src.l3num == me->tuple.src.l3num &&
-                    cur->tuple.dst.protonum == me->tuple.dst.protonum) {
+                if (nf_ct_tuple_src_mask_cmp(&cur->tuple, &me->tuple, &mask)) {
                         ret = -EEXIST;
                         goto out;
                 }
diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 8b6da2719600..f97ac61d2536 100644
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -271,6 +271,7 @@ static int __init nf_conntrack_irc_init(void)
                 if (ret) {
                         pr_err("failed to register helper for pf: %u port: %u\n",
                                irc[i].tuple.src.l3num, ports[i]);
+                        ports_c = i;
                         nf_conntrack_irc_fini();
                         return ret;
                 }
diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c
index 7523a575f6d1..3fcbaab83b3d 100644
--- a/net/netfilter/nf_conntrack_sane.c
+++ b/net/netfilter/nf_conntrack_sane.c
@@ -223,6 +223,7 @@ static int __init nf_conntrack_sane_init(void)
                         if (ret) {
                                 pr_err("failed to register helper for pf: %d port: %d\n",
                                        sane[i][j].tuple.src.l3num, ports[i]);
+                                ports_c = i;
                                 nf_conntrack_sane_fini();
                                 return ret;
                         }
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 3e06402739e0..f72ba5587588 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1669,6 +1669,7 @@ static int __init nf_conntrack_sip_init(void)
                         if (ret) {
                                 pr_err("failed to register helper for pf: %u port: %u\n",
                                        sip[i][j].tuple.src.l3num, ports[i]);
+                                ports_c = i;
                                 nf_conntrack_sip_fini();
                                 return ret;
                         }
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index f87e84ebcec3..c026c472ea80 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -487,8 +487,6 @@ static struct ctl_table nf_ct_sysctl_table[] = {
         { }
 };
 
-#define NET_NF_CONNTRACK_MAX 2089
-
 static struct ctl_table nf_ct_netfilter_table[] = {
         {
                 .procname       = "nf_conntrack_max",
diff --git a/net/netfilter/nf_conntrack_tftp.c b/net/netfilter/nf_conntrack_tftp.c
index 36f964066461..2e65b5430fba 100644
--- a/net/netfilter/nf_conntrack_tftp.c
+++ b/net/netfilter/nf_conntrack_tftp.c
@@ -142,6 +142,7 @@ static int __init nf_conntrack_tftp_init(void)
                         if (ret) {
                                 pr_err("failed to register helper for pf: %u port: %u\n",
                                        tftp[i][j].tuple.src.l3num, ports[i]);
+                                ports_c = i;
                                 nf_conntrack_tftp_fini();
                                 return ret;
                         }
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 5baa8e24e6ac..b19ad20a705c 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -26,23 +26,21 @@
  * Once the queue is registered it must reinject all packets it
  * receives, no matter what.
  */
-static const struct nf_queue_handler __rcu *queue_handler __read_mostly;
 
 /* return EBUSY when somebody else is registered, return EEXIST if the
  * same handler is registered, return 0 in case of success. */
-void nf_register_queue_handler(const struct nf_queue_handler *qh)
+void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh)
 {
         /* should never happen, we only have one queueing backend in kernel */
-        WARN_ON(rcu_access_pointer(queue_handler));
-        rcu_assign_pointer(queue_handler, qh);
+        WARN_ON(rcu_access_pointer(net->nf.queue_handler));
+        rcu_assign_pointer(net->nf.queue_handler, qh);
 }
 EXPORT_SYMBOL(nf_register_queue_handler);
 
 /* The caller must flush their queue before this */
-void nf_unregister_queue_handler(void)
+void nf_unregister_queue_handler(struct net *net)
 {
-        RCU_INIT_POINTER(queue_handler, NULL);
-        synchronize_rcu();
+        RCU_INIT_POINTER(net->nf.queue_handler, NULL);
 }
 EXPORT_SYMBOL(nf_unregister_queue_handler);
 
@@ -103,7 +101,7 @@ void nf_queue_nf_hook_drop(struct net *net, struct nf_hook_ops *ops)
         const struct nf_queue_handler *qh;
 
         rcu_read_lock();
-        qh = rcu_dereference(queue_handler);
+        qh = rcu_dereference(net->nf.queue_handler);
         if (qh)
                 qh->nf_hook_drop(net, ops);
         rcu_read_unlock();
@@ -122,9 +120,10 @@ int nf_queue(struct sk_buff *skb,
         struct nf_queue_entry *entry = NULL;
         const struct nf_afinfo *afinfo;
         const struct nf_queue_handler *qh;
+        struct net *net = state->net;
 
         /* QUEUE == DROP if no one is waiting, to be safe. */
-        qh = rcu_dereference(queue_handler);
+        qh = rcu_dereference(net->nf.queue_handler);
         if (!qh) {
                 status = -ESRCH;
                 goto err;
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 4d292b933b5c..7b7aa871a174 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2647,6 +2647,8 @@ static int nf_tables_getset(struct net *net, struct sock *nlsk,
         /* Only accept unspec with dump */
         if (nfmsg->nfgen_family == NFPROTO_UNSPEC)
                 return -EAFNOSUPPORT;
+        if (!nla[NFTA_SET_TABLE])
+                return -EINVAL;
 
         set = nf_tables_set_lookup(ctx.table, nla[NFTA_SET_NAME]);
         if (IS_ERR(set))
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index aa93877ab6e2..5d36a0926b4a 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -557,7 +557,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
 
         if (entskb->tstamp.tv64) {
                 struct nfqnl_msg_packet_timestamp ts;
-                struct timespec64 kts = ktime_to_timespec64(skb->tstamp);
+                struct timespec64 kts = ktime_to_timespec64(entskb->tstamp);
 
                 ts.sec = cpu_to_be64(kts.tv_sec);
                 ts.usec = cpu_to_be64(kts.tv_nsec / NSEC_PER_USEC);
@@ -1482,21 +1482,29 @@ static int __net_init nfnl_queue_net_init(struct net *net)
                          net->nf.proc_netfilter, &nfqnl_file_ops))
                 return -ENOMEM;
 #endif
+        nf_register_queue_handler(net, &nfqh);
         return 0;
 }
 
 static void __net_exit nfnl_queue_net_exit(struct net *net)
 {
+        nf_unregister_queue_handler(net);
 #ifdef CONFIG_PROC_FS
         remove_proc_entry("nfnetlink_queue", net->nf.proc_netfilter);
 #endif
 }
 
+static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list)
+{
+        synchronize_rcu();
+}
+
 static struct pernet_operations nfnl_queue_net_ops = {
-        .init   = nfnl_queue_net_init,
-        .exit   = nfnl_queue_net_exit,
-        .id     = &nfnl_queue_net_id,
-        .size   = sizeof(struct nfnl_queue_net),
+        .init           = nfnl_queue_net_init,
+        .exit           = nfnl_queue_net_exit,
+        .exit_batch     = nfnl_queue_net_exit_batch,
+        .id             = &nfnl_queue_net_id,
+        .size           = sizeof(struct nfnl_queue_net),
 };
 
 static int __init nfnetlink_queue_init(void)
@@ -1517,7 +1525,6 @@ static int __init nfnetlink_queue_init(void)
         }
 
         register_netdevice_notifier(&nfqnl_dev_notifier);
-        nf_register_queue_handler(&nfqh);
         return status;
 
 cleanup_netlink_notifier:
@@ -1529,7 +1536,6 @@ out:
 
 static void __exit nfnetlink_queue_fini(void)
 {
-        nf_unregister_queue_handler();
         unregister_netdevice_notifier(&nfqnl_dev_notifier);
         nfnetlink_subsys_unregister(&nfqnl_subsys);
         netlink_unregister_notifier(&nfqnl_rtnl_notifier);
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index c69c892231d7..2675d580c490 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -612,7 +612,7 @@ int xt_compat_check_entry_offsets(const void *base, const char *elems,
                 return -EINVAL;
 
         if (strcmp(t->u.user.name, XT_STANDARD_TARGET) == 0 &&
-            target_offset + sizeof(struct compat_xt_standard_target) != next_offset)
+            COMPAT_XT_ALIGN(target_offset + sizeof(struct compat_xt_standard_target)) != next_offset)
                 return -EINVAL;
 
         /* compat_xt_entry match has less strict aligment requirements,
@@ -694,7 +694,7 @@ int xt_check_entry_offsets(const void *base,
                 return -EINVAL;
 
         if (strcmp(t->u.user.name, XT_STANDARD_TARGET) == 0 &&
-            target_offset + sizeof(struct xt_standard_target) != next_offset)
+            XT_ALIGN(target_offset + sizeof(struct xt_standard_target)) != next_offset)
                 return -EINVAL;
 
         return xt_check_entry_match(elems, base + target_offset,
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 879185fe183f..9a3eb7a0ebf4 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -137,11 +137,23 @@ static bool is_flow_key_valid(const struct sw_flow_key *key)
         return !!key->eth.type;
 }
 
+static void update_ethertype(struct sk_buff *skb, struct ethhdr *hdr,
+                             __be16 ethertype)
+{
+        if (skb->ip_summed == CHECKSUM_COMPLETE) {
+                __be16 diff[] = { ~(hdr->h_proto), ethertype };
+
+                skb->csum = ~csum_partial((char *)diff, sizeof(diff),
+                                        ~skb->csum);
+        }
+
+        hdr->h_proto = ethertype;
+}
+
 static int push_mpls(struct sk_buff *skb, struct sw_flow_key *key,
                      const struct ovs_action_push_mpls *mpls)
 {
         __be32 *new_mpls_lse;
-        struct ethhdr *hdr;
 
         /* Networking stack do not allow simultaneous Tunnel and MPLS GSO. */
         if (skb->encapsulation)
@@ -160,9 +172,7 @@ static int push_mpls(struct sk_buff *skb, struct sw_flow_key *key,
 
         skb_postpush_rcsum(skb, new_mpls_lse, MPLS_HLEN);
 
-        hdr = eth_hdr(skb);
-        hdr->h_proto = mpls->mpls_ethertype;
-
+        update_ethertype(skb, eth_hdr(skb), mpls->mpls_ethertype);
         if (!skb->inner_protocol)
                 skb_set_inner_protocol(skb, skb->protocol);
         skb->protocol = mpls->mpls_ethertype;
@@ -193,7 +203,7 @@ static int pop_mpls(struct sk_buff *skb, struct sw_flow_key *key,
          * field correctly in the presence of VLAN tags.
          */
         hdr = (struct ethhdr *)(skb_mpls_header(skb) - ETH_HLEN);
-        hdr->h_proto = ethertype;
+        update_ethertype(skb, hdr, ethertype);
         if (eth_p_mpls(skb->protocol))
                 skb->protocol = ethertype;
 
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 4040eb92d9c9..9bff6ef16fa7 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -93,6 +93,7 @@
 #include <net/inet_common.h>
 #endif
 #include <linux/bpf.h>
+#include <net/compat.h>
 
 #include "internal.h"
 
@@ -3940,6 +3941,27 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 }
 
 
+#ifdef CONFIG_COMPAT
+static int compat_packet_setsockopt(struct socket *sock, int level, int optname,
+                                    char __user *optval, unsigned int optlen)
+{
+        struct packet_sock *po = pkt_sk(sock->sk);
+
+        if (level != SOL_PACKET)
+                return -ENOPROTOOPT;
+
+        if (optname == PACKET_FANOUT_DATA &&
+            po->fanout && po->fanout->type == PACKET_FANOUT_CBPF) {
+                optval = (char __user *)get_compat_bpf_fprog(optval);
+                if (!optval)
+                        return -EFAULT;
+                optlen = sizeof(struct sock_fprog);
+        }
+
+        return packet_setsockopt(sock, level, optname, optval, optlen);
+}
+#endif
+
 static int packet_notifier(struct notifier_block *this,
                            unsigned long msg, void *ptr)
 {
@@ -4416,6 +4438,9 @@ static const struct proto_ops packet_ops = {
         .shutdown =     sock_no_shutdown,
         .setsockopt =   packet_setsockopt,
         .getsockopt =   packet_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt = compat_packet_setsockopt,
+#endif
         .sendmsg =      packet_sendmsg,
         .recvmsg =      packet_recvmsg,
         .mmap =         packet_mmap,
diff --git a/net/rds/rds.h b/net/rds/rds.h
index 80256b08eac0..387df5f32e49 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -74,6 +74,7 @@ enum {
         RDS_CONN_CONNECTING,
         RDS_CONN_DISCONNECTING,
         RDS_CONN_UP,
+        RDS_CONN_RESETTING,
         RDS_CONN_ERROR,
 };
 
@@ -813,6 +814,7 @@ void rds_connect_worker(struct work_struct *);
 void rds_shutdown_worker(struct work_struct *);
 void rds_send_worker(struct work_struct *);
 void rds_recv_worker(struct work_struct *);
+void rds_connect_path_complete(struct rds_connection *conn, int curr);
 void rds_connect_complete(struct rds_connection *conn);
 
 /* transport.c */
diff --git a/net/rds/recv.c b/net/rds/recv.c
index c0be1ecd11c9..8413f6c99e13 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -561,5 +561,7 @@ void rds_inc_info_copy(struct rds_incoming *inc,
                 minfo.fport = inc->i_hdr.h_dport;
         }
 
+        minfo.flags = 0;
+
         rds_info_copy(iter, &minfo, sizeof(minfo));
 }
diff --git a/net/rds/send.c b/net/rds/send.c
index c9cdb358ea88..b1962f8e30f7 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -99,6 +99,7 @@ void rds_send_reset(struct rds_connection *conn)
         list_splice_init(&conn->c_retrans, &conn->c_send_queue);
         spin_unlock_irqrestore(&conn->c_lock, flags);
 }
+EXPORT_SYMBOL_GPL(rds_send_reset);
 
 static int acquire_in_xmit(struct rds_connection *conn)
 {
diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 86187dad1440..74ee126a6fe6 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -126,9 +126,81 @@ void rds_tcp_restore_callbacks(struct socket *sock,
 }
 
 /*
- * This is the only path that sets tc->t_sock.  Send and receive trust that
- * it is set.  The RDS_CONN_UP bit protects those paths from being
- * called while it isn't set.
+ * rds_tcp_reset_callbacks() switches the to the new sock and
+ * returns the existing tc->t_sock.
+ *
+ * The only functions that set tc->t_sock are rds_tcp_set_callbacks
+ * and rds_tcp_reset_callbacks.  Send and receive trust that
+ * it is set.  The absence of RDS_CONN_UP bit protects those paths
+ * from being called while it isn't set.
+ */
+void rds_tcp_reset_callbacks(struct socket *sock,
+                             struct rds_connection *conn)
+{
+        struct rds_tcp_connection *tc = conn->c_transport_data;
+        struct socket *osock = tc->t_sock;
+
+        if (!osock)
+                goto newsock;
+
+        /* Need to resolve a duelling SYN between peers.
+         * We have an outstanding SYN to this peer, which may
+         * potentially have transitioned to the RDS_CONN_UP state,
+         * so we must quiesce any send threads before resetting
+         * c_transport_data. We quiesce these threads by setting
+         * c_state to something other than RDS_CONN_UP, and then
+         * waiting for any existing threads in rds_send_xmit to
+         * complete release_in_xmit(). (Subsequent threads entering
+         * rds_send_xmit() will bail on !rds_conn_up().
+         *
+         * However an incoming syn-ack at this point would end up
+         * marking the conn as RDS_CONN_UP, and would again permit
+         * rds_send_xmi() threads through, so ideally we would
+         * synchronize on RDS_CONN_UP after lock_sock(), but cannot
+         * do that: waiting on !RDS_IN_XMIT after lock_sock() may
+         * end up deadlocking with tcp_sendmsg(), and the RDS_IN_XMIT
+         * would not get set. As a result, we set c_state to
+         * RDS_CONN_RESETTTING, to ensure that rds_tcp_state_change
+         * cannot mark rds_conn_path_up() in the window before lock_sock()
+         */
+        atomic_set(&conn->c_state, RDS_CONN_RESETTING);
+        wait_event(conn->c_waitq, !test_bit(RDS_IN_XMIT, &conn->c_flags));
+        lock_sock(osock->sk);
+        /* reset receive side state for rds_tcp_data_recv() for osock  */
+        if (tc->t_tinc) {
+                rds_inc_put(&tc->t_tinc->ti_inc);
+                tc->t_tinc = NULL;
+        }
+        tc->t_tinc_hdr_rem = sizeof(struct rds_header);
+        tc->t_tinc_data_rem = 0;
+        tc->t_sock = NULL;
+
+        write_lock_bh(&osock->sk->sk_callback_lock);
+
+        osock->sk->sk_user_data = NULL;
+        osock->sk->sk_data_ready = tc->t_orig_data_ready;
+        osock->sk->sk_write_space = tc->t_orig_write_space;
+        osock->sk->sk_state_change = tc->t_orig_state_change;
+        write_unlock_bh(&osock->sk->sk_callback_lock);
+        release_sock(osock->sk);
+        sock_release(osock);
+newsock:
+        rds_send_reset(conn);
+        lock_sock(sock->sk);
+        write_lock_bh(&sock->sk->sk_callback_lock);
+        tc->t_sock = sock;
+        sock->sk->sk_user_data = conn;
+        sock->sk->sk_data_ready = rds_tcp_data_ready;
+        sock->sk->sk_write_space = rds_tcp_write_space;
+        sock->sk->sk_state_change = rds_tcp_state_change;
+
+        write_unlock_bh(&sock->sk->sk_callback_lock);
+        release_sock(sock->sk);
+}
+
+/* Add tc to rds_tcp_tc_list and set tc->t_sock. See comments
+ * above rds_tcp_reset_callbacks for notes about synchronization
+ * with data path
  */
 void rds_tcp_set_callbacks(struct socket *sock, struct rds_connection *conn)
 {
diff --git a/net/rds/tcp.h b/net/rds/tcp.h
index 41c228300525..ec0602b0dc24 100644
--- a/net/rds/tcp.h
+++ b/net/rds/tcp.h
@@ -50,6 +50,7 @@ struct rds_tcp_statistics {
 void rds_tcp_tune(struct socket *sock);
 void rds_tcp_nonagle(struct socket *sock);
 void rds_tcp_set_callbacks(struct socket *sock, struct rds_connection *conn);
+void rds_tcp_reset_callbacks(struct socket *sock, struct rds_connection *conn);
 void rds_tcp_restore_callbacks(struct socket *sock,
                                struct rds_tcp_connection *tc);
 u32 rds_tcp_snd_nxt(struct rds_tcp_connection *tc);
diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index fb82e0a0bf89..fba13d0305fb 100644
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -60,7 +60,7 @@ void rds_tcp_state_change(struct sock *sk)
                 case TCP_SYN_RECV:
                         break;
                 case TCP_ESTABLISHED:
-                        rds_connect_complete(conn);
+                        rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
                         break;
                 case TCP_CLOSE_WAIT:
                 case TCP_CLOSE:
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 4bf4befe5066..686b1d03a558 100644
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -78,7 +78,6 @@ int rds_tcp_accept_one(struct socket *sock)
         struct inet_sock *inet;
         struct rds_tcp_connection *rs_tcp = NULL;
         int conn_state;
-        struct sock *nsk;
 
         if (!sock) /* module unload or netns delete in progress */
                 return -ENETUNREACH;
@@ -136,26 +135,21 @@ int rds_tcp_accept_one(struct socket *sock)
                     !conn->c_outgoing) {
                         goto rst_nsk;
                 } else {
-                        atomic_set(&conn->c_state, RDS_CONN_CONNECTING);
-                        wait_event(conn->c_waitq,
-                                   !test_bit(RDS_IN_XMIT, &conn->c_flags));
-                        rds_tcp_restore_callbacks(rs_tcp->t_sock, rs_tcp);
+                        rds_tcp_reset_callbacks(new_sock, conn);
                         conn->c_outgoing = 0;
+                        /* rds_connect_path_complete() marks RDS_CONN_UP */
+                        rds_connect_path_complete(conn, RDS_CONN_DISCONNECTING);
                 }
+        } else {
+                rds_tcp_set_callbacks(new_sock, conn);
+                rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
         }
-        rds_tcp_set_callbacks(new_sock, conn);
-        rds_connect_complete(conn); /* marks RDS_CONN_UP */
         new_sock = NULL;
         ret = 0;
         goto out;
 rst_nsk:
         /* reset the newly returned accept sock and bail */
-        nsk = new_sock->sk;
-        rds_tcp_stats_inc(s_tcp_listen_closed_stale);
-        nsk->sk_user_data = NULL;
-        nsk->sk_prot->disconnect(nsk, 0);
-        tcp_done(nsk);
-        new_sock = NULL;
+        kernel_sock_shutdown(new_sock, SHUT_RDWR);
         ret = 0;
 out:
         if (rs_tcp)
diff --git a/net/rds/threads.c b/net/rds/threads.c
index 454aa6d23327..4a323045719b 100644
--- a/net/rds/threads.c
+++ b/net/rds/threads.c
@@ -71,9 +71,9 @@
 struct workqueue_struct *rds_wq;
 EXPORT_SYMBOL_GPL(rds_wq);
 
-void rds_connect_complete(struct rds_connection *conn)
+void rds_connect_path_complete(struct rds_connection *conn, int curr)
 {
-        if (!rds_conn_transition(conn, RDS_CONN_CONNECTING, RDS_CONN_UP)) {
+        if (!rds_conn_transition(conn, curr, RDS_CONN_UP)) {
                 printk(KERN_WARNING "%s: Cannot transition to state UP, "
                                 "current state is %d\n",
                                 __func__,
@@ -90,6 +90,12 @@ void rds_connect_complete(struct rds_connection *conn)
         queue_delayed_work(rds_wq, &conn->c_send_w, 0);
         queue_delayed_work(rds_wq, &conn->c_recv_w, 0);
 }
+EXPORT_SYMBOL_GPL(rds_connect_path_complete);
+
+void rds_connect_complete(struct rds_connection *conn)
+{
+        rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
+}
 EXPORT_SYMBOL_GPL(rds_connect_complete);
 
 /*
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 6b726a046a7d..bab56ed649ba 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -1162,9 +1162,7 @@ static int rxkad_init(void)
         /* pin the cipher we need so that the crypto layer doesn't invoke
          * keventd to go get it */
         rxkad_ci = crypto_alloc_skcipher("pcbc(fcrypt)", 0, CRYPTO_ALG_ASYNC);
-        if (IS_ERR(rxkad_ci))
-                return PTR_ERR(rxkad_ci);
-        return 0;
+        return PTR_ERR_OR_ZERO(rxkad_ci);
 }
 
 /*
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 330f14e302e8..c557789765dc 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -38,7 +38,7 @@ struct tcf_police {
         bool                    peak_present;
 };
 #define to_police(pc)   \
-        container_of(pc, struct tcf_police, common)
+        container_of(pc->priv, struct tcf_police, common)
 
 #define POL_TAB_MASK     15
 
@@ -119,14 +119,12 @@ static int tcf_act_police_locate(struct net *net, struct nlattr *nla,
                                  struct nlattr *est, struct tc_action *a,
                                  int ovr, int bind)
 {
-        unsigned int h;
         int ret = 0, err;
         struct nlattr *tb[TCA_POLICE_MAX + 1];
         struct tc_police *parm;
         struct tcf_police *police;
         struct qdisc_rate_table *R_tab = NULL, *P_tab = NULL;
         struct tc_action_net *tn = net_generic(net, police_net_id);
-        struct tcf_hashinfo *hinfo = tn->hinfo;
         int size;
 
         if (nla == NULL)
@@ -145,7 +143,7 @@ static int tcf_act_police_locate(struct net *net, struct nlattr *nla,
 
         if (parm->index) {
                 if (tcf_hash_search(tn, a, parm->index)) {
-                        police = to_police(a->priv);
+                        police = to_police(a);
                         if (bind) {
                                 police->tcf_bindcnt += 1;
                                 police->tcf_refcnt += 1;
@@ -156,16 +154,15 @@ static int tcf_act_police_locate(struct net *net, struct nlattr *nla,
                         /* not replacing */
                         return -EEXIST;
                 }
+        } else {
+                ret = tcf_hash_create(tn, parm->index, NULL, a,
+                                      sizeof(*police), bind, false);
+                if (ret)
+                        return ret;
+                ret = ACT_P_CREATED;
         }
 
-        police = kzalloc(sizeof(*police), GFP_KERNEL);
-        if (police == NULL)
-                return -ENOMEM;
-        ret = ACT_P_CREATED;
-        police->tcf_refcnt = 1;
-        spin_lock_init(&police->tcf_lock);
-        if (bind)
-                police->tcf_bindcnt = 1;
+        police = to_police(a);
 override:
         if (parm->rate.rate) {
                 err = -ENOMEM;
@@ -237,14 +234,8 @@ override:
                 return ret;
 
         police->tcfp_t_c = ktime_get_ns();
-        police->tcf_index = parm->index ? parm->index :
-                tcf_hash_new_index(tn);
-        h = tcf_hash(police->tcf_index, POL_TAB_MASK);
-        spin_lock_bh(&hinfo->lock);
-        hlist_add_head(&police->tcf_head, &hinfo->htab[h]);
-        spin_unlock_bh(&hinfo->lock);
+        tcf_hash_insert(tn, a);
 
-        a->priv = police;
         return ret;
 
 failure_unlock:
@@ -253,7 +244,7 @@ failure:
         qdisc_put_rtab(P_tab);
         qdisc_put_rtab(R_tab);
         if (ret == ACT_P_CREATED)
-                kfree(police);
+                tcf_hash_cleanup(a, est);
         return err;
 }
 
@@ -268,6 +259,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a,
         spin_lock(&police->tcf_lock);
 
         bstats_update(&police->tcf_bstats, skb);
+        tcf_lastuse_update(&police->tcf_tm);
 
         if (police->tcfp_ewma_rate &&
             police->tcf_rate_est.bps >= police->tcfp_ewma_rate) {
@@ -327,6 +319,7 @@ tcf_act_police_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
                 .refcnt = police->tcf_refcnt - ref,
                 .bindcnt = police->tcf_bindcnt - bind,
         };
+        struct tcf_t t;
 
         if (police->rate_present)
                 psched_ratecfg_getrate(&opt.rate, &police->rate);
@@ -340,6 +333,13 @@ tcf_act_police_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
         if (police->tcfp_ewma_rate &&
             nla_put_u32(skb, TCA_POLICE_AVRATE, police->tcfp_ewma_rate))
                 goto nla_put_failure;
+
+        t.install = jiffies_to_clock_t(jiffies - police->tcf_tm.install);
+        t.lastuse = jiffies_to_clock_t(jiffies - police->tcf_tm.lastuse);
+        t.expires = jiffies_to_clock_t(police->tcf_tm.expires);
+        if (nla_put_64bit(skb, TCA_POLICE_TM, sizeof(t), &t, TCA_POLICE_PAD))
+                goto nla_put_failure;
+
         return skb->len;
 
 nla_put_failure:
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 730aacafc22d..b3b7978f4182 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -171,7 +171,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie)
         struct tc_cls_flower_offload offload = {0};
         struct tc_to_netdev tc;
 
-        if (!tc_should_offload(dev, 0))
+        if (!tc_should_offload(dev, tp, 0))
                 return;
 
         offload.command = TC_CLSFLOWER_DESTROY;
@@ -194,7 +194,7 @@ static void fl_hw_replace_filter(struct tcf_proto *tp,
         struct tc_cls_flower_offload offload = {0};
         struct tc_to_netdev tc;
 
-        if (!tc_should_offload(dev, flags))
+        if (!tc_should_offload(dev, tp, flags))
                 return;
 
         offload.command = TC_CLSFLOWER_REPLACE;
@@ -216,7 +216,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
         struct tc_cls_flower_offload offload = {0};
         struct tc_to_netdev tc;
 
-        if (!tc_should_offload(dev, 0))
+        if (!tc_should_offload(dev, tp, 0))
                 return;
 
         offload.command = TC_CLSFLOWER_STATS;
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 079b43b3c5d2..ffe593efe930 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -440,7 +440,7 @@ static void u32_remove_hw_knode(struct tcf_proto *tp, u32 handle)
         offload.type = TC_SETUP_CLSU32;
         offload.cls_u32 = &u32_offload;
 
-        if (tc_should_offload(dev, 0)) {
+        if (tc_should_offload(dev, tp, 0)) {
                 offload.cls_u32->command = TC_CLSU32_DELETE_KNODE;
                 offload.cls_u32->knode.handle = handle;
                 dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
@@ -457,20 +457,21 @@ static int u32_replace_hw_hnode(struct tcf_proto *tp,
         struct tc_to_netdev offload;
         int err;
 
+        if (!tc_should_offload(dev, tp, flags))
+                return tc_skip_sw(flags) ? -EINVAL : 0;
+
         offload.type = TC_SETUP_CLSU32;
         offload.cls_u32 = &u32_offload;
 
-        if (tc_should_offload(dev, flags)) {
-                offload.cls_u32->command = TC_CLSU32_NEW_HNODE;
-                offload.cls_u32->hnode.divisor = h->divisor;
-                offload.cls_u32->hnode.handle = h->handle;
-                offload.cls_u32->hnode.prio = h->prio;
+        offload.cls_u32->command = TC_CLSU32_NEW_HNODE;
+        offload.cls_u32->hnode.divisor = h->divisor;
+        offload.cls_u32->hnode.handle = h->handle;
+        offload.cls_u32->hnode.prio = h->prio;
 
-                err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
-                                                    tp->protocol, &offload);
-                if (tc_skip_sw(flags))
-                        return err;
-        }
+        err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
+                                            tp->protocol, &offload);
+        if (tc_skip_sw(flags))
+                return err;
 
         return 0;
 }
@@ -484,7 +485,7 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h)
         offload.type = TC_SETUP_CLSU32;
         offload.cls_u32 = &u32_offload;
 
-        if (tc_should_offload(dev, 0)) {
+        if (tc_should_offload(dev, tp, 0)) {
                 offload.cls_u32->command = TC_CLSU32_DELETE_HNODE;
                 offload.cls_u32->hnode.divisor = h->divisor;
                 offload.cls_u32->hnode.handle = h->handle;
@@ -507,27 +508,28 @@ static int u32_replace_hw_knode(struct tcf_proto *tp,
         offload.type = TC_SETUP_CLSU32;
         offload.cls_u32 = &u32_offload;
 
-        if (tc_should_offload(dev, flags)) {
-                offload.cls_u32->command = TC_CLSU32_REPLACE_KNODE;
-                offload.cls_u32->knode.handle = n->handle;
-                offload.cls_u32->knode.fshift = n->fshift;
+        if (!tc_should_offload(dev, tp, flags))
+                return tc_skip_sw(flags) ? -EINVAL : 0;
+
+        offload.cls_u32->command = TC_CLSU32_REPLACE_KNODE;
+        offload.cls_u32->knode.handle = n->handle;
+        offload.cls_u32->knode.fshift = n->fshift;
 #ifdef CONFIG_CLS_U32_MARK
-                offload.cls_u32->knode.val = n->val;
-                offload.cls_u32->knode.mask = n->mask;
+        offload.cls_u32->knode.val = n->val;
+        offload.cls_u32->knode.mask = n->mask;
 #else
-                offload.cls_u32->knode.val = 0;
-                offload.cls_u32->knode.mask = 0;
+        offload.cls_u32->knode.val = 0;
+        offload.cls_u32->knode.mask = 0;
 #endif
-                offload.cls_u32->knode.sel = &n->sel;
-                offload.cls_u32->knode.exts = &n->exts;
-                if (n->ht_down)
-                        offload.cls_u32->knode.link_handle = n->ht_down->handle;
-
-                err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
-                                                    tp->protocol, &offload);
-                if (tc_skip_sw(flags))
-                        return err;
-        }
+        offload.cls_u32->knode.sel = &n->sel;
+        offload.cls_u32->knode.exts = &n->exts;
+        if (n->ht_down)
+                offload.cls_u32->knode.link_handle = n->ht_down->handle;
+
+        err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
+                                            tp->protocol, &offload);
+        if (tc_skip_sw(flags))
+                return err;
 
         return 0;
 }
@@ -863,7 +865,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
         if (tb[TCA_U32_FLAGS]) {
                 flags = nla_get_u32(tb[TCA_U32_FLAGS]);
                 if (!tc_flags_valid(flags))
-                        return err;
+                        return -EINVAL;
         }
 
         n = (struct tc_u_knode *)*arg;
@@ -921,11 +923,17 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                 ht->divisor = divisor;
                 ht->handle = handle;
                 ht->prio = tp->prio;
+
+                err = u32_replace_hw_hnode(tp, ht, flags);
+                if (err) {
+                        kfree(ht);
+                        return err;
+                }
+
                 RCU_INIT_POINTER(ht->next, tp_c->hlist);
                 rcu_assign_pointer(tp_c->hlist, ht);
                 *arg = (unsigned long)ht;
 
-                u32_replace_hw_hnode(tp, ht, flags);
                 return 0;
         }
 
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 64f71a2155f3..ddf047df5361 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -607,6 +607,10 @@ void qdisc_watchdog_schedule_ns(struct qdisc_watchdog *wd, u64 expires, bool thr
         if (throttle)
                 qdisc_throttled(wd->qdisc);
 
+        if (wd->last_expires == expires)
+                return;
+
+        wd->last_expires = expires;
         hrtimer_start(&wd->timer,
                       ns_to_ktime(expires),
                       HRTIMER_MODE_ABS_PINNED);
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index a63e879e8975..bf8af2c43c2c 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -375,6 +375,7 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 cl->deficit = cl->quantum;
         }
 
+        qdisc_qstats_backlog_inc(sch, skb);
         sch->q.qlen++;
         return err;
 }
@@ -407,6 +408,7 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
 
                         bstats_update(&cl->bstats, skb);
                         qdisc_bstats_update(sch, skb);
+                        qdisc_qstats_backlog_dec(sch, skb);
                         sch->q.qlen--;
                         return skb;
                 }
@@ -428,6 +430,7 @@ static unsigned int drr_drop(struct Qdisc *sch)
                 if (cl->qdisc->ops->drop) {
                         len = cl->qdisc->ops->drop(cl->qdisc);
                         if (len > 0) {
+                                sch->qstats.backlog -= len;
                                 sch->q.qlen--;
                                 if (cl->qdisc->q.qlen == 0)
                                         list_del(&cl->alist);
@@ -463,6 +466,7 @@ static void drr_reset_qdisc(struct Qdisc *sch)
                         qdisc_reset(cl->qdisc);
                 }
         }
+        sch->qstats.backlog = 0;
         sch->q.qlen = 0;
 }
 
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index 6883a8971562..da250b2e06ae 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -199,6 +199,7 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         unsigned int idx, prev_backlog, prev_qlen;
         struct fq_codel_flow *flow;
         int uninitialized_var(ret);
+        unsigned int pkt_len;
         bool memory_limited;
 
         idx = fq_codel_classify(skb, sch, &ret);
@@ -230,6 +231,8 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         prev_backlog = sch->qstats.backlog;
         prev_qlen = sch->q.qlen;
 
+        /* save this packet length as it might be dropped by fq_codel_drop() */
+        pkt_len = qdisc_pkt_len(skb);
         /* fq_codel_drop() is quite expensive, as it performs a linear search
          * in q->backlogs[] to find a fat flow.
          * So instead of dropping a single packet, drop half of its backlog
@@ -237,14 +240,23 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
          */
         ret = fq_codel_drop(sch, q->drop_batch_size);
 
-        q->drop_overlimit += prev_qlen - sch->q.qlen;
+        prev_qlen -= sch->q.qlen;
+        prev_backlog -= sch->qstats.backlog;
+        q->drop_overlimit += prev_qlen;
         if (memory_limited)
-                q->drop_overmemory += prev_qlen - sch->q.qlen;
-        /* As we dropped packet(s), better let upper stack know this */
-        qdisc_tree_reduce_backlog(sch, prev_qlen - sch->q.qlen,
-                                  prev_backlog - sch->qstats.backlog);
+                q->drop_overmemory += prev_qlen;
 
-        return ret == idx ? NET_XMIT_CN : NET_XMIT_SUCCESS;
+        /* As we dropped packet(s), better let upper stack know this.
+         * If we dropped a packet for this flow, return NET_XMIT_CN,
+         * but in this case, our parents wont increase their backlogs.
+         */
+        if (ret == idx) {
+                qdisc_tree_reduce_backlog(sch, prev_qlen - 1,
+                                          prev_backlog - pkt_len);
+                return NET_XMIT_CN;
+        }
+        qdisc_tree_reduce_backlog(sch, prev_qlen, prev_backlog);
+        return NET_XMIT_SUCCESS;
 }
 
 /* This is the specific function called from codel_dequeue()
@@ -649,7 +661,7 @@ static int fq_codel_dump_class_stats(struct Qdisc *sch, unsigned long cl,
                 qs.backlog = q->backlogs[idx];
                 qs.drops = flow->dropped;
         }
-        if (gnet_stats_copy_queue(d, NULL, &qs, 0) < 0)
+        if (gnet_stats_copy_queue(d, NULL, &qs, qs.qlen) < 0)
                 return -1;
         if (idx < q->flows_cnt)
                 return gnet_stats_copy_app(d, &xstats, sizeof(xstats));
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 269dd71b3828..f9e0e9c03d0a 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -49,6 +49,7 @@ static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q)
 {
         q->gso_skb = skb;
         q->qstats.requeues++;
+        qdisc_qstats_backlog_inc(q, skb);
         q->q.qlen++;    /* it's still part of the queue */
         __netif_schedule(q);
 
@@ -92,6 +93,7 @@ static struct sk_buff *dequeue_skb(struct Qdisc *q, bool *validate,
                 txq = skb_get_tx_queue(txq->dev, skb);
                 if (!netif_xmit_frozen_or_stopped(txq)) {
                         q->gso_skb = NULL;
+                        qdisc_qstats_backlog_dec(q, skb);
                         q->q.qlen--;
                 } else
                         skb = NULL;
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index d783d7cc3348..1ac9f9f03fe3 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1529,6 +1529,7 @@ hfsc_reset_qdisc(struct Qdisc *sch)
         q->eligible = RB_ROOT;
         INIT_LIST_HEAD(&q->droplist);
         qdisc_watchdog_cancel(&q->watchdog);
+        sch->qstats.backlog = 0;
         sch->q.qlen = 0;
 }
 
@@ -1559,14 +1560,6 @@ hfsc_dump_qdisc(struct Qdisc *sch, struct sk_buff *skb)
         struct hfsc_sched *q = qdisc_priv(sch);
         unsigned char *b = skb_tail_pointer(skb);
         struct tc_hfsc_qopt qopt;
-        struct hfsc_class *cl;
-        unsigned int i;
-
-        sch->qstats.backlog = 0;
-        for (i = 0; i < q->clhash.hashsize; i++) {
-                hlist_for_each_entry(cl, &q->clhash.hash[i], cl_common.hnode)
-                        sch->qstats.backlog += cl->qdisc->qstats.backlog;
-        }
 
         qopt.defcls = q->defcls;
         if (nla_put(skb, TCA_OPTIONS, sizeof(qopt), &qopt))
@@ -1604,6 +1597,7 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         if (cl->qdisc->q.qlen == 1)
                 set_active(cl, qdisc_pkt_len(skb));
 
+        qdisc_qstats_backlog_inc(sch, skb);
         sch->q.qlen++;
 
         return NET_XMIT_SUCCESS;
@@ -1672,6 +1666,7 @@ hfsc_dequeue(struct Qdisc *sch)
 
         qdisc_unthrottled(sch);
         qdisc_bstats_update(sch, skb);
+        qdisc_qstats_backlog_dec(sch, skb);
         sch->q.qlen--;
 
         return skb;
@@ -1695,6 +1690,7 @@ hfsc_drop(struct Qdisc *sch)
                         }
                         cl->qstats.drops++;
                         qdisc_qstats_drop(sch);
+                        sch->qstats.backlog -= len;
                         sch->q.qlen--;
                         return len;
                 }
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index f6bf5818ed4d..d4b4218af6b1 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -928,17 +928,10 @@ ok:
                 }
         }
         qdisc_qstats_overlimit(sch);
-        if (likely(next_event > q->now)) {
-                if (!test_bit(__QDISC_STATE_DEACTIVATED,
-                              &qdisc_root_sleeping(q->watchdog.qdisc)->state)) {
-                        ktime_t time = ns_to_ktime(next_event);
-                        qdisc_throttled(q->watchdog.qdisc);
-                        hrtimer_start(&q->watchdog.timer, time,
-                                      HRTIMER_MODE_ABS_PINNED);
-                }
-        } else {
+        if (likely(next_event > q->now))
+                qdisc_watchdog_schedule_ns(&q->watchdog, next_event, true);
+        else
                 schedule_work(&q->work);
-        }
 fin:
         return skb;
 }
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 10adbc617905..8fe6999b642a 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -27,6 +27,11 @@ static unsigned long ingress_get(struct Qdisc *sch, u32 classid)
         return TC_H_MIN(classid) + 1;
 }
 
+static bool ingress_cl_offload(u32 classid)
+{
+        return true;
+}
+
 static unsigned long ingress_bind_filter(struct Qdisc *sch,
                                          unsigned long parent, u32 classid)
 {
@@ -86,6 +91,7 @@ static const struct Qdisc_class_ops ingress_class_ops = {
         .put            =       ingress_put,
         .walk           =       ingress_walk,
         .tcf_chain      =       ingress_find_tcf,
+        .tcf_cl_offload =       ingress_cl_offload,
         .bind_tcf       =       ingress_bind_filter,
         .unbind_tcf     =       ingress_put,
 };
@@ -110,6 +116,11 @@ static unsigned long clsact_get(struct Qdisc *sch, u32 classid)
         }
 }
 
+static bool clsact_cl_offload(u32 classid)
+{
+        return TC_H_MIN(classid) == TC_H_MIN(TC_H_MIN_INGRESS);
+}
+
 static unsigned long clsact_bind_filter(struct Qdisc *sch,
                                         unsigned long parent, u32 classid)
 {
@@ -158,6 +169,7 @@ static const struct Qdisc_class_ops clsact_class_ops = {
         .put            =       ingress_put,
         .walk           =       ingress_walk,
         .tcf_chain      =       clsact_find_tcf,
+        .tcf_cl_offload =       clsact_cl_offload,
         .bind_tcf       =       clsact_bind_filter,
         .unbind_tcf     =       ingress_put,
 };
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index fee1b15506b2..4b0a82191bc4 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -85,6 +85,7 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
         ret = qdisc_enqueue(skb, qdisc);
         if (ret == NET_XMIT_SUCCESS) {
+                qdisc_qstats_backlog_inc(sch, skb);
                 sch->q.qlen++;
                 return NET_XMIT_SUCCESS;
         }
@@ -117,6 +118,7 @@ static struct sk_buff *prio_dequeue(struct Qdisc *sch)
                 struct sk_buff *skb = qdisc_dequeue_peeked(qdisc);
                 if (skb) {
                         qdisc_bstats_update(sch, skb);
+                        qdisc_qstats_backlog_dec(sch, skb);
                         sch->q.qlen--;
                         return skb;
                 }
@@ -135,6 +137,7 @@ static unsigned int prio_drop(struct Qdisc *sch)
         for (prio = q->bands-1; prio >= 0; prio--) {
                 qdisc = q->queues[prio];
                 if (qdisc->ops->drop && (len = qdisc->ops->drop(qdisc)) != 0) {
+                        sch->qstats.backlog -= len;
                         sch->q.qlen--;
                         return len;
                 }
@@ -151,6 +154,7 @@ prio_reset(struct Qdisc *sch)
 
         for (prio = 0; prio < q->bands; prio++)
                 qdisc_reset(q->queues[prio]);
+        sch->qstats.backlog = 0;
         sch->q.qlen = 0;
 }
 
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 8d2d8d953432..f18857febdad 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -1235,8 +1235,10 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                          cl->agg->lmax, qdisc_pkt_len(skb), cl->common.classid);
                 err = qfq_change_agg(sch, cl, cl->agg->class_weight,
                                      qdisc_pkt_len(skb));
-                if (err)
-                        return err;
+                if (err) {
+                        cl->qstats.drops++;
+                        return qdisc_drop(skb, sch);
+                }
         }
 
         err = qdisc_enqueue(skb, cl->qdisc);
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index 8c0508c0e287..91578bdd378c 100644
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -97,6 +97,7 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
         ret = qdisc_enqueue(skb, child);
         if (likely(ret == NET_XMIT_SUCCESS)) {
+                qdisc_qstats_backlog_inc(sch, skb);
                 sch->q.qlen++;
         } else if (net_xmit_drop_count(ret)) {
                 q->stats.pdrop++;
@@ -118,6 +119,7 @@ static struct sk_buff *red_dequeue(struct Qdisc *sch)
         skb = child->dequeue(child);
         if (skb) {
                 qdisc_bstats_update(sch, skb);
+                qdisc_qstats_backlog_dec(sch, skb);
                 sch->q.qlen--;
         } else {
                 if (!red_is_idling(&q->vars))
@@ -143,6 +145,7 @@ static unsigned int red_drop(struct Qdisc *sch)
         if (child->ops->drop && (len = child->ops->drop(child)) > 0) {
                 q->stats.other++;
                 qdisc_qstats_drop(sch);
+                sch->qstats.backlog -= len;
                 sch->q.qlen--;
                 return len;
         }
@@ -158,6 +161,7 @@ static void red_reset(struct Qdisc *sch)
         struct red_sched_data *q = qdisc_priv(sch);
 
         qdisc_reset(q->qdisc);
+        sch->qstats.backlog = 0;
         sch->q.qlen = 0;
         red_restart(&q->vars);
 }
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 83b90b584fae..3161e491990b 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -207,6 +207,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 return ret;
         }
 
+        qdisc_qstats_backlog_inc(sch, skb);
         sch->q.qlen++;
         return NET_XMIT_SUCCESS;
 }
@@ -217,6 +218,7 @@ static unsigned int tbf_drop(struct Qdisc *sch)
         unsigned int len = 0;
 
         if (q->qdisc->ops->drop && (len = q->qdisc->ops->drop(q->qdisc)) != 0) {
+                sch->qstats.backlog -= len;
                 sch->q.qlen--;
                 qdisc_qstats_drop(sch);
         }
@@ -263,6 +265,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc *sch)
                         q->t_c = now;
                         q->tokens = toks;
                         q->ptokens = ptoks;
+                        qdisc_qstats_backlog_dec(sch, skb);
                         sch->q.qlen--;
                         qdisc_unthrottled(sch);
                         qdisc_bstats_update(sch, skb);
@@ -294,6 +297,7 @@ static void tbf_reset(struct Qdisc *sch)
         struct tbf_sched_data *q = qdisc_priv(sch);
 
         qdisc_reset(q->qdisc);
+        sch->qstats.backlog = 0;
         sch->q.qlen = 0;
         q->t_c = ktime_get_ns();
         q->tokens = q->buffer;
diff --git a/net/sctp/sctp_diag.c b/net/sctp/sctp_diag.c
index 8e3e769dc9ea..1ce724b87618 100644
--- a/net/sctp/sctp_diag.c
+++ b/net/sctp/sctp_diag.c
@@ -356,6 +356,9 @@ static int sctp_ep_dump(struct sctp_endpoint *ep, void *p)
         if (cb->args[4] < cb->args[1])
                 goto next;
 
+        if ((r->idiag_states & ~TCPF_LISTEN) && !list_empty(&ep->asocs))
+                goto next;
+
         if (r->sdiag_family != AF_UNSPEC &&
             sk->sk_family != r->sdiag_family)
                 goto next;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 777d0324594a..67154b848aa9 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4220,6 +4220,7 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc,
                 info->sctpi_s_disable_fragments = sp->disable_fragments;
                 info->sctpi_s_v4mapped = sp->v4mapped;
                 info->sctpi_s_frag_interleave = sp->frag_interleave;
+                info->sctpi_s_type = sp->type;
 
                 return 0;
         }
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 06b4df9faaa1..2808d550d273 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -446,16 +446,27 @@ out_no_rpciod:
         return ERR_PTR(err);
 }
 
-struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
+static struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
                                         struct rpc_xprt *xprt)
 {
         struct rpc_clnt *clnt = NULL;
         struct rpc_xprt_switch *xps;
 
-        xps = xprt_switch_alloc(xprt, GFP_KERNEL);
-        if (xps == NULL)
-                return ERR_PTR(-ENOMEM);
-
+        if (args->bc_xprt && args->bc_xprt->xpt_bc_xps) {
+                WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+                xps = args->bc_xprt->xpt_bc_xps;
+                xprt_switch_get(xps);
+        } else {
+                xps = xprt_switch_alloc(xprt, GFP_KERNEL);
+                if (xps == NULL) {
+                        xprt_put(xprt);
+                        return ERR_PTR(-ENOMEM);
+                }
+                if (xprt->bc_xprt) {
+                        xprt_switch_get(xps);
+                        xprt->bc_xprt->xpt_bc_xps = xps;
+                }
+        }
         clnt = rpc_new_client(args, xps, xprt, NULL);
         if (IS_ERR(clnt))
                 return clnt;
@@ -483,7 +494,6 @@ struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
 
         return clnt;
 }
-EXPORT_SYMBOL_GPL(rpc_create_xprt);
 
 /**
  * rpc_create - create an RPC client and transport with one call
@@ -509,6 +519,15 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
         };
         char servername[48];
 
+        if (args->bc_xprt) {
+                WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+                xprt = args->bc_xprt->xpt_bc_xprt;
+                if (xprt) {
+                        xprt_get(xprt);
+                        return rpc_create_xprt(args, xprt);
+                }
+        }
+
         if (args->flags & RPC_CLNT_CREATE_INFINITE_SLOTS)
                 xprtargs.flags |= XPRT_CREATE_INFINITE_SLOTS;
         if (args->flags & RPC_CLNT_CREATE_NO_IDLE_TIMEOUT)
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index f5572e31d518..4f01f63102ee 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -136,6 +136,8 @@ static void svc_xprt_free(struct kref *kref)
         /* See comment on corresponding get in xs_setup_bc_tcp(): */
         if (xprt->xpt_bc_xprt)
                 xprt_put(xprt->xpt_bc_xprt);
+        if (xprt->xpt_bc_xps)
+                xprt_switch_put(xprt->xpt_bc_xps);
         xprt->xpt_ops->xpo_free(xprt);
         module_put(owner);
 }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 2d3e0c42361e..7e2b2fa189c3 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -3057,6 +3057,7 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args)
                 return xprt;
 
         args->bc_xprt->xpt_bc_xprt = NULL;
+        args->bc_xprt->xpt_bc_xps = NULL;
         xprt_put(xprt);
         ret = ERR_PTR(-EINVAL);
 out_err:
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 4dfc5c14f8c3..3ad9fab1985f 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -346,9 +346,15 @@ static int tipc_nl_compat_bearer_dump(struct tipc_nl_compat_msg *msg,
                                       struct nlattr **attrs)
 {
         struct nlattr *bearer[TIPC_NLA_BEARER_MAX + 1];
+        int err;
+
+        if (!attrs[TIPC_NLA_BEARER])
+                return -EINVAL;
 
-        nla_parse_nested(bearer, TIPC_NLA_BEARER_MAX, attrs[TIPC_NLA_BEARER],
-                         NULL);
+        err = nla_parse_nested(bearer, TIPC_NLA_BEARER_MAX,
+                               attrs[TIPC_NLA_BEARER], NULL);
+        if (err)
+                return err;
 
         return tipc_add_tlv(msg->rep, TIPC_TLV_BEARER_NAME,
                             nla_data(bearer[TIPC_NLA_BEARER_NAME]),
@@ -460,14 +466,31 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg,
         struct nlattr *link[TIPC_NLA_LINK_MAX + 1];
         struct nlattr *prop[TIPC_NLA_PROP_MAX + 1];
         struct nlattr *stats[TIPC_NLA_STATS_MAX + 1];
+        int err;
 
-        nla_parse_nested(link, TIPC_NLA_LINK_MAX, attrs[TIPC_NLA_LINK], NULL);
+        if (!attrs[TIPC_NLA_LINK])
+                return -EINVAL;
 
-        nla_parse_nested(prop, TIPC_NLA_PROP_MAX, link[TIPC_NLA_LINK_PROP],
-                         NULL);
+        err = nla_parse_nested(link, TIPC_NLA_LINK_MAX, attrs[TIPC_NLA_LINK],
+                               NULL);
+        if (err)
+                return err;
+
+        if (!link[TIPC_NLA_LINK_PROP])
+                return -EINVAL;
 
-        nla_parse_nested(stats, TIPC_NLA_STATS_MAX, link[TIPC_NLA_LINK_STATS],
-                         NULL);
+        err = nla_parse_nested(prop, TIPC_NLA_PROP_MAX,
+                               link[TIPC_NLA_LINK_PROP], NULL);
+        if (err)
+                return err;
+
+        if (!link[TIPC_NLA_LINK_STATS])
+                return -EINVAL;
+
+        err = nla_parse_nested(stats, TIPC_NLA_STATS_MAX,
+                               link[TIPC_NLA_LINK_STATS], NULL);
+        if (err)
+                return err;
 
         name = (char *)TLV_DATA(msg->req);
         if (strcmp(name, nla_data(link[TIPC_NLA_LINK_NAME])) != 0)
@@ -569,12 +592,20 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg,
 {
         struct nlattr *link[TIPC_NLA_LINK_MAX + 1];
         struct tipc_link_info link_info;
+        int err;
 
-        nla_parse_nested(link, TIPC_NLA_LINK_MAX, attrs[TIPC_NLA_LINK], NULL);
+        if (!attrs[TIPC_NLA_LINK])
+                return -EINVAL;
+
+        err = nla_parse_nested(link, TIPC_NLA_LINK_MAX, attrs[TIPC_NLA_LINK],
+                               NULL);
+        if (err)
+                return err;
 
         link_info.dest = nla_get_flag(link[TIPC_NLA_LINK_DEST]);
         link_info.up = htonl(nla_get_flag(link[TIPC_NLA_LINK_UP]));
-        strcpy(link_info.str, nla_data(link[TIPC_NLA_LINK_NAME]));
+        nla_strlcpy(link_info.str, nla_data(link[TIPC_NLA_LINK_NAME]),
+                    TIPC_MAX_LINK_NAME);
 
         return tipc_add_tlv(msg->rep, TIPC_TLV_LINK_INFO,
                             &link_info, sizeof(link_info));
@@ -758,12 +789,23 @@ static int tipc_nl_compat_name_table_dump(struct tipc_nl_compat_msg *msg,
         u32 node, depth, type, lowbound, upbound;
         static const char * const scope_str[] = {"", " zone", " cluster",
                                                  " node"};
+        int err;
 
-        nla_parse_nested(nt, TIPC_NLA_NAME_TABLE_MAX,
-                         attrs[TIPC_NLA_NAME_TABLE], NULL);
+        if (!attrs[TIPC_NLA_NAME_TABLE])
+                return -EINVAL;
 
-        nla_parse_nested(publ, TIPC_NLA_PUBL_MAX, nt[TIPC_NLA_NAME_TABLE_PUBL],
-                         NULL);
+        err = nla_parse_nested(nt, TIPC_NLA_NAME_TABLE_MAX,
+                               attrs[TIPC_NLA_NAME_TABLE], NULL);
+        if (err)
+                return err;
+
+        if (!nt[TIPC_NLA_NAME_TABLE_PUBL])
+                return -EINVAL;
+
+        err = nla_parse_nested(publ, TIPC_NLA_PUBL_MAX,
+                               nt[TIPC_NLA_NAME_TABLE_PUBL], NULL);
+        if (err)
+                return err;
 
         ntq = (struct tipc_name_table_query *)TLV_DATA(msg->req);
 
@@ -815,8 +857,15 @@ static int __tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg,
 {
         u32 type, lower, upper;
         struct nlattr *publ[TIPC_NLA_PUBL_MAX + 1];
+        int err;
 
-        nla_parse_nested(publ, TIPC_NLA_PUBL_MAX, attrs[TIPC_NLA_PUBL], NULL);
+        if (!attrs[TIPC_NLA_PUBL])
+                return -EINVAL;
+
+        err = nla_parse_nested(publ, TIPC_NLA_PUBL_MAX, attrs[TIPC_NLA_PUBL],
+                               NULL);
+        if (err)
+                return err;
 
         type = nla_get_u32(publ[TIPC_NLA_PUBL_TYPE]);
         lower = nla_get_u32(publ[TIPC_NLA_PUBL_LOWER]);
@@ -876,7 +925,13 @@ static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg,
         u32 sock_ref;
         struct nlattr *sock[TIPC_NLA_SOCK_MAX + 1];
 
-        nla_parse_nested(sock, TIPC_NLA_SOCK_MAX, attrs[TIPC_NLA_SOCK], NULL);
+        if (!attrs[TIPC_NLA_SOCK])
+                return -EINVAL;
+
+        err = nla_parse_nested(sock, TIPC_NLA_SOCK_MAX, attrs[TIPC_NLA_SOCK],
+                               NULL);
+        if (err)
+                return err;
 
         sock_ref = nla_get_u32(sock[TIPC_NLA_SOCK_REF]);
         tipc_tlv_sprintf(msg->rep, "%u:", sock_ref);
@@ -917,9 +972,15 @@ static int tipc_nl_compat_media_dump(struct tipc_nl_compat_msg *msg,
                                      struct nlattr **attrs)
 {
         struct nlattr *media[TIPC_NLA_MEDIA_MAX + 1];
+        int err;
+
+        if (!attrs[TIPC_NLA_MEDIA])
+                return -EINVAL;
 
-        nla_parse_nested(media, TIPC_NLA_MEDIA_MAX, attrs[TIPC_NLA_MEDIA],
-                         NULL);
+        err = nla_parse_nested(media, TIPC_NLA_MEDIA_MAX, attrs[TIPC_NLA_MEDIA],
+                               NULL);
+        if (err)
+                return err;
 
         return tipc_add_tlv(msg->rep, TIPC_TLV_MEDIA_NAME,
                             nla_data(media[TIPC_NLA_MEDIA_NAME]),
@@ -931,8 +992,15 @@ static int tipc_nl_compat_node_dump(struct tipc_nl_compat_msg *msg,
 {
         struct tipc_node_info node_info;
         struct nlattr *node[TIPC_NLA_NODE_MAX + 1];
+        int err;
 
-        nla_parse_nested(node, TIPC_NLA_NODE_MAX, attrs[TIPC_NLA_NODE], NULL);
+        if (!attrs[TIPC_NLA_NODE])
+                return -EINVAL;
+
+        err = nla_parse_nested(node, TIPC_NLA_NODE_MAX, attrs[TIPC_NLA_NODE],
+                               NULL);
+        if (err)
+                return err;
 
         node_info.addr = htonl(nla_get_u32(node[TIPC_NLA_NODE_ADDR]));
         node_info.up = htonl(nla_get_flag(node[TIPC_NLA_NODE_UP]));
@@ -971,8 +1039,16 @@ static int tipc_nl_compat_net_dump(struct tipc_nl_compat_msg *msg,
 {
         __be32 id;
         struct nlattr *net[TIPC_NLA_NET_MAX + 1];
+        int err;
+
+        if (!attrs[TIPC_NLA_NET])
+                return -EINVAL;
+
+        err = nla_parse_nested(net, TIPC_NLA_NET_MAX, attrs[TIPC_NLA_NET],
+                               NULL);
+        if (err)
+                return err;
 
-        nla_parse_nested(net, TIPC_NLA_NET_MAX, attrs[TIPC_NLA_NET], NULL);
         id = htonl(nla_get_u32(net[TIPC_NLA_NET_ID]));
 
         return tipc_add_tlv(msg->rep, TIPC_TLV_UNSIGNED, &id, sizeof(id));
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 80aa6a3e6817..735362c26c8e 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -315,7 +315,7 @@ static struct sock *unix_find_socket_byinode(struct inode *i)
                     &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) {
                 struct dentry *dentry = unix_sk(s)->path.dentry;
 
-                if (dentry && d_backing_inode(dentry) == i) {
+                if (dentry && d_real_inode(dentry) == i) {
                         sock_hold(s);
                         goto found;
                 }
@@ -911,7 +911,7 @@ static struct sock *unix_find_other(struct net *net,
                 err = kern_path(sunname->sun_path, LOOKUP_FOLLOW, &path);
                 if (err)
                         goto fail;
-                inode = d_backing_inode(path.dentry);
+                inode = d_real_inode(path.dentry);
                 err = inode_permission(inode, MAY_WRITE);
                 if (err)
                         goto put_fail;
@@ -1048,7 +1048,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                         goto out_up;
                 }
                 addr->hash = UNIX_HASH_SIZE;
-                hash = d_backing_inode(dentry)->i_ino & (UNIX_HASH_SIZE - 1);
+                hash = d_real_inode(dentry)->i_ino & (UNIX_HASH_SIZE - 1);
                 spin_lock(&unix_table_lock);
                 u->path = u_path;
                 list = &unix_socket_table[hash];
diff --git a/net/wireless/core.c b/net/wireless/core.c
index d25c82bc1bbe..ecca3896b9f7 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -363,8 +363,6 @@ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv,
         WARN_ON(ops->remain_on_channel && !ops->cancel_remain_on_channel);
         WARN_ON(ops->tdls_channel_switch && !ops->tdls_cancel_channel_switch);
         WARN_ON(ops->add_tx_ts && !ops->del_tx_ts);
-        WARN_ON(ops->set_tx_power && !ops->get_tx_power);
-        WARN_ON(ops->set_antenna && !ops->get_antenna);
 
         alloc_size = sizeof(*rdev) + sizeof_priv;
 
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index 6250b1cfcde5..dbb2738e356a 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -958,8 +958,29 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
                         return private(dev, iwr, cmd, info, handler);
         }
         /* Old driver API : call driver ioctl handler */
-        if (dev->netdev_ops->ndo_do_ioctl)
-                return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
+        if (dev->netdev_ops->ndo_do_ioctl) {
+#ifdef CONFIG_COMPAT
+                if (info->flags & IW_REQUEST_FLAG_COMPAT) {
+                        int ret = 0;
+                        struct iwreq iwr_lcl;
+                        struct compat_iw_point *iwp_compat = (void *) &iwr->u.data;
+
+                        memcpy(&iwr_lcl, iwr, sizeof(struct iwreq));
+                        iwr_lcl.u.data.pointer = compat_ptr(iwp_compat->pointer);
+                        iwr_lcl.u.data.length = iwp_compat->length;
+                        iwr_lcl.u.data.flags = iwp_compat->flags;
+
+                        ret = dev->netdev_ops->ndo_do_ioctl(dev, (void *) &iwr_lcl, cmd);
+
+                        iwp_compat->pointer = ptr_to_compat(iwr_lcl.u.data.pointer);
+                        iwp_compat->length = iwr_lcl.u.data.length;
+                        iwp_compat->flags = iwr_lcl.u.data.flags;
+
+                        return ret;
+                } else
+#endif
+                        return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
+        }
         return -EOPNOTSUPP;
 }
 
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 6750595bd7b8..4904ced676d4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2454,6 +2454,7 @@ sub process {
 
 # Check for git id commit length and improperly formed commit descriptions
                 if ($in_commit_log && !$commit_log_possible_stack_dump &&
+                    $line !~ /^\s*(?:Link|Patchwork|http|BugLink):/i &&
                     ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
                      ($line =~ /\b[0-9a-f]{12,40}\b/i &&
                       $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 2fc8fad5195e..27757c21551a 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -59,6 +59,12 @@ Output format selection (mutually exclusive):
   -text                 Output plain text format.
 
 Output selection (mutually exclusive):
+  -export               Only output documentation for symbols that have been
+                        exported using EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL()
+                        in the same FILE.
+  -internal             Only output documentation for symbols that have NOT been
+                        exported using EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL()
+                        in the same FILE.
   -function NAME        Only output documentation for the given function(s)
                         or DOC: section title(s). All other functions and DOC:
                         sections are ignored. May be specified multiple times.
@@ -68,6 +74,8 @@ Output selection (mutually exclusive):
 
 Output selection modifiers:
   -no-doc-sections      Do not output DOC: sections.
+  -enable-lineno        Enable output of #define LINENO lines. Only works with
+                        reStructuredText format.
 
 Other parameters:
   -v                    Verbose output, more warnings and other information.
@@ -206,6 +214,10 @@ my $type_struct_xml = '\\&amp;((struct\s*)*[_\w]+)';
 my $type_env = '(\$\w+)';
 my $type_enum_full = '\&(enum)\s*([_\w]+)';
 my $type_struct_full = '\&(struct)\s*([_\w]+)';
+my $type_typedef_full = '\&(typedef)\s*([_\w]+)';
+my $type_union_full = '\&(union)\s*([_\w]+)';
+my $type_member = '\&([_\w]+)((\.|->)[_\w]+)';
+my $type_member_func = $type_member . '\(\)';
 
 # Output conversion substitutions.
 #  One for each output format
@@ -274,10 +286,16 @@ my $blankline_text = "";
 # rst-mode
 my @highlights_rst = (
                        [$type_constant, "``\$1``"],
-                       [$type_func, "\\:c\\:func\\:`\$1`"],
+                       # Note: need to escape () to avoid func matching later
+                       [$type_member_func, "\\:c\\:type\\:`\$1\$2\\\\(\\\\) <\$1>`"],
+                       [$type_member, "\\:c\\:type\\:`\$1\$2 <\$1>`"],
+                       [$type_func, "\\:c\\:func\\:`\$1()`"],
                        [$type_struct_full, "\\:c\\:type\\:`\$1 \$2 <\$2>`"],
                        [$type_enum_full, "\\:c\\:type\\:`\$1 \$2 <\$2>`"],
-                       [$type_struct, "\\:c\\:type\\:`struct \$1 <\$1>`"],
+                       [$type_typedef_full, "\\:c\\:type\\:`\$1 \$2 <\$2>`"],
+                       [$type_union_full, "\\:c\\:type\\:`\$1 \$2 <\$2>`"],
+                       # in rst this can refer to any type
+                       [$type_struct, "\\:c\\:type\\:`\$1`"],
                        [$type_param, "**\$1**"]
                       );
 my $blankline_rst = "\n";
@@ -303,10 +321,19 @@ my $verbose = 0;
 my $output_mode = "man";
 my $output_preformatted = 0;
 my $no_doc_sections = 0;
+my $enable_lineno = 0;
 my @highlights = @highlights_man;
 my $blankline = $blankline_man;
 my $modulename = "Kernel API";
-my $function_only = 0;
+
+use constant {
+    OUTPUT_ALL          => 0, # output all symbols and doc sections
+    OUTPUT_INCLUDE      => 1, # output only specified symbols
+    OUTPUT_EXCLUDE      => 2, # output everything except specified symbols
+    OUTPUT_EXPORTED     => 3, # output exported symbols
+    OUTPUT_INTERNAL     => 4, # output non-exported symbols
+};
+my $output_selection = OUTPUT_ALL;
 my $show_not_found = 0;
 
 my @build_time;
@@ -327,6 +354,7 @@ my $man_date = ('January', 'February', 'March', 'April', 'May', 'June',
 # CAVEAT EMPTOR!  Some of the others I localised may not want to be, which
 # could cause "use of undefined value" or other bugs.
 my ($function, %function_table, %parametertypes, $declaration_purpose);
+my $declaration_start_line;
 my ($type, $declaration_name, $return_type);
 my ($newsection, $newcontents, $prototype, $brcount, %source_map);
 
@@ -344,52 +372,62 @@ my $section_counter = 0;
 
 my $lineprefix="";
 
-# states
-# 0 - normal code
-# 1 - looking for function name
-# 2 - scanning field start.
-# 3 - scanning prototype.
-# 4 - documentation block
-# 5 - gathering documentation outside main block
+# Parser states
+use constant {
+    STATE_NORMAL        => 0, # normal code
+    STATE_NAME          => 1, # looking for function name
+    STATE_FIELD         => 2, # scanning field start
+    STATE_PROTO         => 3, # scanning prototype
+    STATE_DOCBLOCK      => 4, # documentation block
+    STATE_INLINE        => 5, # gathering documentation outside main block
+};
 my $state;
 my $in_doc_sect;
 
-# Split Doc State
-# 0 - Invalid (Before start or after finish)
-# 1 - Is started (the /** was found inside a struct)
-# 2 - The @parameter header was found, start accepting multi paragraph text.
-# 3 - Finished (the */ was found)
-# 4 - Error - Comment without header was found. Spit a warning as it's not
-#     proper kernel-doc and ignore the rest.
-my $split_doc_state;
+# Inline documentation state
+use constant {
+    STATE_INLINE_NA     => 0, # not applicable ($state != STATE_INLINE)
+    STATE_INLINE_NAME   => 1, # looking for member name (@foo:)
+    STATE_INLINE_TEXT   => 2, # looking for member documentation
+    STATE_INLINE_END    => 3, # done
+    STATE_INLINE_ERROR  => 4, # error - Comment without header was found.
+                              # Spit a warning as it's not
+                              # proper kernel-doc and ignore the rest.
+};
+my $inline_doc_state;
 
 #declaration types: can be
 # 'function', 'struct', 'union', 'enum', 'typedef'
 my $decl_type;
 
-my $doc_special = "\@\%\$\&";
-
 my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start.
 my $doc_end = '\*/';
 my $doc_com = '\s*\*\s*';
 my $doc_com_body = '\s*\* ?';
 my $doc_decl = $doc_com . '(\w+)';
-my $doc_sect = $doc_com . '([' . $doc_special . ']?[\w\s]+):(.*)';
+# @params and a strictly limited set of supported section names
+my $doc_sect = $doc_com . 
+    '\s*(\@\w+|description|context|returns?|notes?|examples?)\s*:(.*)';
 my $doc_content = $doc_com_body . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
-my $doc_split_start = '^\s*/\*\*\s*$';
-my $doc_split_sect = '\s*\*\s*(@[\w\s]+):(.*)';
-my $doc_split_end = '^\s*\*/\s*$';
+my $doc_inline_start = '^\s*/\*\*\s*$';
+my $doc_inline_sect = '\s*\*\s*(@[\w\s]+):(.*)';
+my $doc_inline_end = '^\s*\*/\s*$';
+my $export_symbol = '^\s*EXPORT_SYMBOL(_GPL)?\s*\(\s*(\w+)\s*\)\s*;';
 
-my %constants;
 my %parameterdescs;
+my %parameterdesc_start_lines;
 my @parameterlist;
 my %sections;
 my @sectionlist;
+my %section_start_lines;
 my $sectcheck;
 my $struct_actual;
 
 my $contents = "";
+my $new_start_line = 0;
+
+# the canonical section names. see also $doc_sect above.
 my $section_default = "Description";    # default section
 my $section_intro = "Introduction";
 my $section = $section_default;
@@ -437,19 +475,27 @@ while ($ARGV[0] =~ m/^-(.*)/) {
     } elsif ($cmd eq "-module") { # not needed for XML, inherits from calling document
         $modulename = shift @ARGV;
     } elsif ($cmd eq "-function") { # to only output specific functions
-        $function_only = 1;
+        $output_selection = OUTPUT_INCLUDE;
         $function = shift @ARGV;
         $function_table{$function} = 1;
-    } elsif ($cmd eq "-nofunction") { # to only output specific functions
-        $function_only = 2;
+    } elsif ($cmd eq "-nofunction") { # output all except specific functions
+        $output_selection = OUTPUT_EXCLUDE;
         $function = shift @ARGV;
         $function_table{$function} = 1;
+    } elsif ($cmd eq "-export") { # only exported symbols
+        $output_selection = OUTPUT_EXPORTED;
+        %function_table = ()
+    } elsif ($cmd eq "-internal") { # only non-exported symbols
+        $output_selection = OUTPUT_INTERNAL;
+        %function_table = ()
     } elsif ($cmd eq "-v") {
         $verbose = 1;
     } elsif (($cmd eq "-h") || ($cmd eq "--help")) {
         usage();
     } elsif ($cmd eq '-no-doc-sections') {
             $no_doc_sections = 1;
+    } elsif ($cmd eq '-enable-lineno') {
+            $enable_lineno = 1;
     } elsif ($cmd eq '-show-not-found') {
         $show_not_found = 1;
     }
@@ -467,6 +513,13 @@ sub get_kernel_version() {
     return $version;
 }
 
+#
+sub print_lineno {
+    my $lineno = shift;
+    if ($enable_lineno && defined($lineno)) {
+        print "#define LINENO " . $lineno . "\n";
+    }
+}
 ##
 # dumps section contents to arrays/hashes intended for that purpose.
 #
@@ -475,28 +528,32 @@ sub dump_section {
     my $name = shift;
     my $contents = join "\n", @_;
 
-    if ($name =~ m/$type_constant/) {
-        $name = $1;
-#       print STDERR "constant section '$1' = '$contents'\n";
-        $constants{$name} = $contents;
-    } elsif ($name =~ m/$type_param/) {
+    if ($name =~ m/$type_param/) {
 #       print STDERR "parameter def '$1' = '$contents'\n";
         $name = $1;
         $parameterdescs{$name} = $contents;
         $sectcheck = $sectcheck . $name . " ";
+        $parameterdesc_start_lines{$name} = $new_start_line;
+        $new_start_line = 0;
     } elsif ($name eq "@\.\.\.") {
 #       print STDERR "parameter def '...' = '$contents'\n";
         $name = "...";
         $parameterdescs{$name} = $contents;
         $sectcheck = $sectcheck . $name . " ";
+        $parameterdesc_start_lines{$name} = $new_start_line;
+        $new_start_line = 0;
     } else {
 #       print STDERR "other section '$name' = '$contents'\n";
         if (defined($sections{$name}) && ($sections{$name} ne "")) {
-                print STDERR "${file}:$.: error: duplicate section name '$name'\n";
-                ++$errors;
+            print STDERR "${file}:$.: warning: duplicate section name '$name'\n";
+            ++$warnings;
+            $sections{$name} .= $contents;
+        } else {
+            $sections{$name} = $contents;
+            push @sectionlist, $name;
+            $section_start_lines{$name} = $new_start_line;
+            $new_start_line = 0;
         }
-        $sections{$name} = $contents;
-        push @sectionlist, $name;
     }
 }
 
@@ -512,15 +569,17 @@ sub dump_doc_section {
         return;
     }
 
-    if (($function_only == 0) ||
-        ( $function_only == 1 && defined($function_table{$name})) ||
-        ( $function_only == 2 && !defined($function_table{$name})))
+    if (($output_selection == OUTPUT_ALL) ||
+        ($output_selection == OUTPUT_INCLUDE &&
+         defined($function_table{$name})) ||
+        ($output_selection == OUTPUT_EXCLUDE &&
+         !defined($function_table{$name})))
     {
         dump_section($file, $name, $contents);
         output_blockhead({'sectionlist' => \@sectionlist,
                           'sections' => \%sections,
                           'module' => $modulename,
-                          'content-only' => ($function_only != 0), });
+                          'content-only' => ($output_selection != OUTPUT_ALL), });
     }
 }
 
@@ -1736,7 +1795,10 @@ sub output_blockhead_rst(%) {
     my ($parameter, $section);
 
     foreach $section (@{$args{'sectionlist'}}) {
-        print "**$section**\n\n";
+        if ($output_selection != OUTPUT_INCLUDE) {
+            print "**$section**\n\n";
+        }
+        print_lineno($section_start_lines{$section});
         output_highlight_rst($args{'sections'}{$section});
         print "\n";
     }
@@ -1753,19 +1815,14 @@ sub output_highlight_rst {
     die $@ if $@;
 
     foreach $line (split "\n", $contents) {
-        if ($line eq "") {
-            print $lineprefix, $blankline;
-        } else {
-            $line =~ s/\\\\\\/\&/g;
-            print $lineprefix, $line;
-        }
-        print "\n";
+        print $lineprefix . $line . "\n";
     }
 }
 
 sub output_function_rst(%) {
     my %args = %{$_[0]};
     my ($parameter, $section);
+    my $oldprefix = $lineprefix;
     my $start;
 
     print ".. c:function:: ";
@@ -1790,29 +1847,37 @@ sub output_function_rst(%) {
             print $type . " " . $parameter;
         }
     }
-    print ")\n\n    " . $args{'purpose'} . "\n\n";
+    print ")\n\n";
+    print_lineno($declaration_start_line);
+    $lineprefix = "   ";
+    output_highlight_rst($args{'purpose'});
+    print "\n";
 
-    print ":Parameters:\n\n";
+    print "**Parameters**\n\n";
+    $lineprefix = "  ";
     foreach $parameter (@{$args{'parameterlist'}}) {
         my $parameter_name = $parameter;
         #$parameter_name =~ s/\[.*//;
         $type = $args{'parametertypes'}{$parameter};
 
         if ($type ne "") {
-            print "      ``$type $parameter``\n";
+            print "``$type $parameter``\n";
         } else {
-            print "      ``$parameter``\n";
+            print "``$parameter``\n";
         }
-        if ($args{'parameterdescs'}{$parameter_name} ne $undescribed) {
-            my $oldprefix = $lineprefix;
-            $lineprefix = "        ";
+
+        print_lineno($parameterdesc_start_lines{$parameter_name});
+
+        if (defined($args{'parameterdescs'}{$parameter_name}) &&
+            $args{'parameterdescs'}{$parameter_name} ne $undescribed) {
             output_highlight_rst($args{'parameterdescs'}{$parameter_name});
-            $lineprefix = $oldprefix;
         } else {
-            print "\n        _undescribed_\n";
+            print "  *undescribed*\n";
         }
         print "\n";
     }
+
+    $lineprefix = $oldprefix;
     output_section_rst(@_);
 }
 
@@ -1820,10 +1885,11 @@ sub output_section_rst(%) {
     my %args = %{$_[0]};
     my $section;
     my $oldprefix = $lineprefix;
-    $lineprefix = "        ";
+    $lineprefix = "";
 
     foreach $section (@{$args{'sectionlist'}}) {
-        print ":$section:\n\n";
+        print "**$section**\n\n";
+        print_lineno($section_start_lines{$section});
         output_highlight_rst($args{'sections'}{$section});
         print "\n";
     }
@@ -1834,24 +1900,28 @@ sub output_section_rst(%) {
 sub output_enum_rst(%) {
     my %args = %{$_[0]};
     my ($parameter);
+    my $oldprefix = $lineprefix;
     my $count;
     my $name = "enum " . $args{'enum'};
 
     print "\n\n.. c:type:: " . $name . "\n\n";
-    print "    " . $args{'purpose'} . "\n\n";
+    print_lineno($declaration_start_line);
+    $lineprefix = "   ";
+    output_highlight_rst($args{'purpose'});
+    print "\n";
 
-    print "..\n\n:Constants:\n\n";
-    my $oldprefix = $lineprefix;
-    $lineprefix = "    ";
+    print "**Constants**\n\n";
+    $lineprefix = "  ";
     foreach $parameter (@{$args{'parameterlist'}}) {
-        print "  `$parameter`\n";
+        print "``$parameter``\n";
         if ($args{'parameterdescs'}{$parameter} ne $undescribed) {
             output_highlight_rst($args{'parameterdescs'}{$parameter});
         } else {
-            print "    undescribed\n";
+            print "  *undescribed*\n";
         }
         print "\n";
     }
+
     $lineprefix = $oldprefix;
     output_section_rst(@_);
 }
@@ -1859,30 +1929,37 @@ sub output_enum_rst(%) {
 sub output_typedef_rst(%) {
     my %args = %{$_[0]};
     my ($parameter);
-    my $count;
+    my $oldprefix = $lineprefix;
     my $name = "typedef " . $args{'typedef'};
 
-    ### FIXME: should the name below contain "typedef" or not?
     print "\n\n.. c:type:: " . $name . "\n\n";
-    print "    " . $args{'purpose'} . "\n\n";
+    print_lineno($declaration_start_line);
+    $lineprefix = "   ";
+    output_highlight_rst($args{'purpose'});
+    print "\n";
 
+    $lineprefix = $oldprefix;
     output_section_rst(@_);
 }
 
 sub output_struct_rst(%) {
     my %args = %{$_[0]};
     my ($parameter);
+    my $oldprefix = $lineprefix;
     my $name = $args{'type'} . " " . $args{'struct'};
 
     print "\n\n.. c:type:: " . $name . "\n\n";
-    print "    " . $args{'purpose'} . "\n\n";
+    print_lineno($declaration_start_line);
+    $lineprefix = "   ";
+    output_highlight_rst($args{'purpose'});
+    print "\n";
 
-    print ":Definition:\n\n";
-    print " ::\n\n";
+    print "**Definition**\n\n";
+    print "::\n\n";
     print "  " . $args{'type'} . " " . $args{'struct'} . " {\n";
     foreach $parameter (@{$args{'parameterlist'}}) {
         if ($parameter =~ /^#/) {
-            print "    " . "$parameter\n";
+            print "  " . "$parameter\n";
             next;
         }
 
@@ -1903,7 +1980,8 @@ sub output_struct_rst(%) {
     }
     print "  };\n\n";
 
-    print ":Members:\n\n";
+    print "**Members**\n\n";
+    $lineprefix = "  ";
     foreach $parameter (@{$args{'parameterlist'}}) {
         ($parameter =~ /^#/) && next;
 
@@ -1912,14 +1990,14 @@ sub output_struct_rst(%) {
 
         ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
         $type = $args{'parametertypes'}{$parameter};
-        print "      `$type $parameter`" . "\n";
-        my $oldprefix = $lineprefix;
-        $lineprefix = "        ";
+        print_lineno($parameterdesc_start_lines{$parameter_name});
+        print "``$type $parameter``\n";
         output_highlight_rst($args{'parameterdescs'}{$parameter_name});
-        $lineprefix = $oldprefix;
         print "\n";
     }
     print "\n";
+
+    $lineprefix = $oldprefix;
     output_section_rst(@_);
 }
 
@@ -1969,9 +2047,13 @@ sub output_declaration {
     my $name = shift;
     my $functype = shift;
     my $func = "output_${functype}_$output_mode";
-    if (($function_only==0) ||
-        ( $function_only == 1 && defined($function_table{$name})) ||
-        ( $function_only == 2 && !($functype eq "function" && defined($function_table{$name}))))
+    if (($output_selection == OUTPUT_ALL) ||
+        (($output_selection == OUTPUT_INCLUDE ||
+          $output_selection == OUTPUT_EXPORTED) &&
+         defined($function_table{$name})) ||
+        (($output_selection == OUTPUT_EXCLUDE ||
+          $output_selection == OUTPUT_INTERNAL) &&
+         !($functype eq "function" && defined($function_table{$name}))))
     {
         &$func(@_);
         $section_counter++;
@@ -2471,7 +2553,6 @@ sub dump_function($$) {
 
 sub reset_state {
     $function = "";
-    %constants = ();
     %parameterdescs = ();
     %parametertypes = ();
     @parameterlist = ();
@@ -2481,8 +2562,8 @@ sub reset_state {
     $struct_actual = "";
     $prototype = "";
 
-    $state = 0;
-    $split_doc_state = 0;
+    $state = STATE_NORMAL;
+    $inline_doc_state = STATE_INLINE_NA;
 }
 
 sub tracepoint_munge($) {
@@ -2545,7 +2626,7 @@ sub syscall_munge() {
         }
 }
 
-sub process_state3_function($$) {
+sub process_proto_function($$) {
     my $x = shift;
     my $file = shift;
 
@@ -2575,7 +2656,7 @@ sub process_state3_function($$) {
     }
 }
 
-sub process_state3_type($$) {
+sub process_proto_type($$) {
     my $x = shift;
     my $file = shift;
 
@@ -2657,6 +2738,7 @@ sub process_file($) {
     my $in_purpose = 0;
     my $initial_section_counter = $section_counter;
     my ($orig_file) = @_;
+    my $leading_space;
 
     if (defined($ENV{'SRCTREE'})) {
         $file = "$ENV{'SRCTREE'}" . "/" . $orig_file;
@@ -2674,6 +2756,17 @@ sub process_file($) {
         return;
     }
 
+    # two passes for -export and -internal
+    if ($output_selection == OUTPUT_EXPORTED ||
+        $output_selection == OUTPUT_INTERNAL) {
+        while (<IN>) {
+            if (/$export_symbol/o) {
+                $function_table{$2} = 1;
+            }
+        }
+        seek(IN, 0, 0);
+    }
+
     $. = 1;
 
     $section_counter = 0;
@@ -2681,15 +2774,18 @@ sub process_file($) {
         while (s/\\\s*$//) {
             $_ .= <IN>;
         }
-        if ($state == 0) {
+        if ($state == STATE_NORMAL) {
             if (/$doc_start/o) {
-                $state = 1;             # next line is always the function name
+                $state = STATE_NAME;    # next line is always the function name
                 $in_doc_sect = 0;
+                $declaration_start_line = $. + 1;
             }
-        } elsif ($state == 1) { # this line is the function name (always)
+        } elsif ($state == STATE_NAME) {# this line is the function name (always)
             if (/$doc_block/o) {
-                $state = 4;
+                $state = STATE_DOCBLOCK;
                 $contents = "";
+                $new_start_line = $. + 1;
+
                 if ( $1 eq "" ) {
                         $section = $section_intro;
                 } else {
@@ -2702,7 +2798,12 @@ sub process_file($) {
                     $identifier = $1;
                 }
 
-                $state = 2;
+                $state = STATE_FIELD;
+                # if there's no @param blocks need to set up default section
+                # here
+                $contents = "";
+                $section = $section_default;
+                $new_start_line = $. + 1;
                 if (/-(.*)/) {
                     # strip leading/trailing/multiple spaces
                     $descr= $1;
@@ -2740,13 +2841,25 @@ sub process_file($) {
                 print STDERR "${file}:$.: warning: Cannot understand $_ on line $.",
                 " - I thought it was a doc line\n";
                 ++$warnings;
-                $state = 0;
+                $state = STATE_NORMAL;
             }
-        } elsif ($state == 2) { # look for head: lines, and include content
-            if (/$doc_sect/o) {
+        } elsif ($state == STATE_FIELD) {       # look for head: lines, and include content
+            if (/$doc_sect/i) { # case insensitive for supported section names
                 $newsection = $1;
                 $newcontents = $2;
 
+                # map the supported section names to the canonical names
+                if ($newsection =~ m/^description$/i) {
+                    $newsection = $section_default;
+                } elsif ($newsection =~ m/^context$/i) {
+                    $newsection = $section_context;
+                } elsif ($newsection =~ m/^returns?$/i) {
+                    $newsection = $section_return;
+                } elsif ($newsection =~ m/^\@return$/) {
+                    # special: @return is a section, not a param description
+                    $newsection = $section_return;
+                }
+
                 if (($contents ne "") && ($contents ne "\n")) {
                     if (!$in_doc_sect && $verbose) {
                         print STDERR "${file}:$.: warning: contents before sections\n";
@@ -2759,14 +2872,16 @@ sub process_file($) {
                 $in_doc_sect = 1;
                 $in_purpose = 0;
                 $contents = $newcontents;
+                $new_start_line = $.;
+                while ((substr($contents, 0, 1) eq " ") ||
+                       substr($contents, 0, 1) eq "\t") {
+                    $contents = substr($contents, 1);
+                }
                 if ($contents ne "") {
-                    while ((substr($contents, 0, 1) eq " ") ||
-                        substr($contents, 0, 1) eq "\t") {
-                            $contents = substr($contents, 1);
-                    }
                     $contents .= "\n";
                 }
                 $section = $newsection;
+                $leading_space = undef;
             } elsif (/$doc_end/) {
                 if (($contents ne "") && ($contents ne "\n")) {
                     dump_section($file, $section, xml_escape($contents));
@@ -2780,7 +2895,7 @@ sub process_file($) {
                 }
 
                 $prototype = "";
-                $state = 3;
+                $state = STATE_PROTO;
                 $brcount = 0;
 #               print STDERR "end of doc comment, looking for prototype\n";
             } elsif (/$doc_content/) {
@@ -2791,6 +2906,7 @@ sub process_file($) {
                         dump_section($file, $section, xml_escape($contents));
                         $section = $section_default;
                         $contents = "";
+                        $new_start_line = $.;
                     } else {
                         $contents .= "\n";
                     }
@@ -2801,87 +2917,86 @@ sub process_file($) {
                     $declaration_purpose .= " " . xml_escape($1);
                     $declaration_purpose =~ s/\s+/ /g;
                 } else {
-                    $contents .= $1 . "\n";
+                    my $cont = $1;
+                    if ($section =~ m/^@/ || $section eq $section_context) {
+                        if (!defined $leading_space) {
+                            if ($cont =~ m/^(\s+)/) {
+                                $leading_space = $1;
+                            } else {
+                                $leading_space = "";
+                            }
+                        }
+
+                        $cont =~ s/^$leading_space//;
+                    }
+                    $contents .= $cont . "\n";
                 }
             } else {
                 # i dont know - bad line?  ignore.
                 print STDERR "${file}:$.: warning: bad line: $_";
                 ++$warnings;
             }
-        } elsif ($state == 5) { # scanning for split parameters
+        } elsif ($state == STATE_INLINE) { # scanning for inline parameters
             # First line (state 1) needs to be a @parameter
-            if ($split_doc_state == 1 && /$doc_split_sect/o) {
+            if ($inline_doc_state == STATE_INLINE_NAME && /$doc_inline_sect/o) {
                 $section = $1;
                 $contents = $2;
+                $new_start_line = $.;
                 if ($contents ne "") {
                     while ((substr($contents, 0, 1) eq " ") ||
                            substr($contents, 0, 1) eq "\t") {
                         $contents = substr($contents, 1);
                     }
-                $contents .= "\n";
+                    $contents .= "\n";
                 }
-                $split_doc_state = 2;
+                $inline_doc_state = STATE_INLINE_TEXT;
             # Documentation block end */
-            } elsif (/$doc_split_end/) {
+            } elsif (/$doc_inline_end/) {
                 if (($contents ne "") && ($contents ne "\n")) {
                     dump_section($file, $section, xml_escape($contents));
                     $section = $section_default;
                     $contents = "";
                 }
-                $state = 3;
-                $split_doc_state = 0;
+                $state = STATE_PROTO;
+                $inline_doc_state = STATE_INLINE_NA;
             # Regular text
             } elsif (/$doc_content/) {
-                if ($split_doc_state == 2) {
+                if ($inline_doc_state == STATE_INLINE_TEXT) {
                     $contents .= $1 . "\n";
-                } elsif ($split_doc_state == 1) {
-                    $split_doc_state = 4;
+                    # nuke leading blank lines
+                    if ($contents =~ /^\s*$/) {
+                        $contents = "";
+                    }
+                } elsif ($inline_doc_state == STATE_INLINE_NAME) {
+                    $inline_doc_state = STATE_INLINE_ERROR;
                     print STDERR "Warning(${file}:$.): ";
                     print STDERR "Incorrect use of kernel-doc format: $_";
                     ++$warnings;
                 }
             }
-        } elsif ($state == 3) { # scanning for function '{' (end of prototype)
-            if (/$doc_split_start/) {
-                $state = 5;
-                $split_doc_state = 1;
+        } elsif ($state == STATE_PROTO) {       # scanning for function '{' (end of prototype)
+            if (/$doc_inline_start/) {
+                $state = STATE_INLINE;
+                $inline_doc_state = STATE_INLINE_NAME;
             } elsif ($decl_type eq 'function') {
-                process_state3_function($_, $file);
+                process_proto_function($_, $file);
             } else {
-                process_state3_type($_, $file);
+                process_proto_type($_, $file);
             }
-        } elsif ($state == 4) {
-                # Documentation block
-                if (/$doc_block/) {
-                        dump_doc_section($file, $section, xml_escape($contents));
-                        $contents = "";
-                        $function = "";
-                        %constants = ();
-                        %parameterdescs = ();
-                        %parametertypes = ();
-                        @parameterlist = ();
-                        %sections = ();
-                        @sectionlist = ();
-                        $prototype = "";
-                        if ( $1 eq "" ) {
-                                $section = $section_intro;
-                        } else {
-                                $section = $1;
-                        }
-                }
-                elsif (/$doc_end/)
+        } elsif ($state == STATE_DOCBLOCK) {
+                if (/$doc_end/)
                 {
                         dump_doc_section($file, $section, xml_escape($contents));
+                        $section = $section_default;
                         $contents = "";
                         $function = "";
-                        %constants = ();
                         %parameterdescs = ();
                         %parametertypes = ();
                         @parameterlist = ();
                         %sections = ();
                         @sectionlist = ();
                         $prototype = "";
-                        $state = 0;
+                        $state = STATE_NORMAL;
                 }
                 elsif (/$doc_content/)
                 {
@@ -2898,7 +3013,7 @@ sub process_file($) {
     }
     if ($initial_section_counter == $section_counter) {
         print STDERR "${file}:1: warning: no structured comments found\n";
-        if (($function_only == 1) && ($show_not_found == 1)) {
+        if (($output_selection == OUTPUT_INCLUDE) && ($show_not_found == 1)) {
             print STDERR "    Was looking for '$_'.\n" for keys %function_table;
         }
         if ($output_mode eq "xml") {
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index a9155077feef..fec75786f75b 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -384,7 +384,7 @@ static void do_of_entry_multi(void *symval, struct module *mod)
         len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*",
                       (*type)[0] ? *type : "*");
 
-        if (compatible[0])
+        if ((*compatible)[0])
                 sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "",
                         *compatible);
 
diff --git a/security/keys/compat.c b/security/keys/compat.c
index c8783b3b628c..36c80bf5b89c 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -134,7 +134,7 @@ COMPAT_SYSCALL_DEFINE5(keyctl, u32, option,
 
         case KEYCTL_DH_COMPUTE:
                 return keyctl_dh_compute(compat_ptr(arg2), compat_ptr(arg3),
-                                         arg4);
+                                         arg4, compat_ptr(arg5));
 
         default:
                 return -EOPNOTSUPP;
diff --git a/security/keys/dh.c b/security/keys/dh.c
index 880505a4b9f1..531ed2ec132f 100644
--- a/security/keys/dh.c
+++ b/security/keys/dh.c
@@ -78,7 +78,8 @@ error:
 }
 
 long keyctl_dh_compute(struct keyctl_dh_params __user *params,
-                       char __user *buffer, size_t buflen)
+                       char __user *buffer, size_t buflen,
+                       void __user *reserved)
 {
         long ret;
         MPI base, private, prime, result;
@@ -97,6 +98,11 @@ long keyctl_dh_compute(struct keyctl_dh_params __user *params,
                 goto out;
         }
 
+        if (reserved) {
+                ret = -EINVAL;
+                goto out;
+        }
+
         keylen = mpi_from_key(pcopy.prime, buflen, &prime);
         if (keylen < 0 || !prime) {
                 /* buflen == 0 may be used to query the required buffer size,
diff --git a/security/keys/internal.h b/security/keys/internal.h
index 8ec7a528365d..a705a7d92ad7 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -260,10 +260,11 @@ static inline long keyctl_get_persistent(uid_t uid, key_serial_t destring)
 
 #ifdef CONFIG_KEY_DH_OPERATIONS
 extern long keyctl_dh_compute(struct keyctl_dh_params __user *, char __user *,
-                              size_t);
+                              size_t, void __user *);
 #else
 static inline long keyctl_dh_compute(struct keyctl_dh_params __user *params,
-                                     char __user *buffer, size_t buflen)
+                                     char __user *buffer, size_t buflen,
+                                     void __user *reserved)
 {
         return -EOPNOTSUPP;
 }
diff --git a/security/keys/key.c b/security/keys/key.c
index bd5a272f28a6..346fbf201c22 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key,
 
         mutex_unlock(&key_construction_mutex);
 
-        if (keyring)
+        if (keyring && link_ret == 0)
                 __key_link_end(keyring, &key->index_key, edit);
 
         /* wake up anyone waiting for a key to be constructed */
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 3b135a0af344..d580ad06b792 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1688,8 +1688,8 @@ SYSCALL_DEFINE5(keyctl, int, option, unsigned long, arg2, unsigned long, arg3,
 
         case KEYCTL_DH_COMPUTE:
                 return keyctl_dh_compute((struct keyctl_dh_params __user *) arg2,
-                                         (char __user *) arg3,
-                                         (size_t) arg4);
+                                         (char __user *) arg3, (size_t) arg4,
+                                         (void __user *) arg5);
 
         default:
                 return -EOPNOTSUPP;
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index c0f8f613f1f1..172dacd925f5 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -420,6 +420,7 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream)
 
 static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)
 {
+        hrtimer_cancel(&dpcm->timer);
         tasklet_kill(&dpcm->tasklet);
 }
 
diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c
index 87041ddd29cb..47a358fab132 100644
--- a/sound/hda/hdac_regmap.c
+++ b/sound/hda/hdac_regmap.c
@@ -444,7 +444,7 @@ int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg,
         err = reg_raw_write(codec, reg, val);
         if (err == -EAGAIN) {
                 err = snd_hdac_power_up_pm(codec);
-                if (!err)
+                if (err >= 0)
                         err = reg_raw_write(codec, reg, val);
                 snd_hdac_power_down_pm(codec);
         }
@@ -470,7 +470,7 @@ static int __snd_hdac_regmap_read_raw(struct hdac_device *codec,
         err = reg_raw_read(codec, reg, val, uncached);
         if (err == -EAGAIN) {
                 err = snd_hdac_power_up_pm(codec);
-                if (!err)
+                if (err >= 0)
                         err = reg_raw_read(codec, reg, val, uncached);
                 snd_hdac_power_down_pm(codec);
         }
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9a0d1445ca5c..94089fc71884 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -365,8 +365,11 @@ enum {
 
 #define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170)
 #define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
+#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)
+#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
-#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci))
+#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \
+                        IS_KBL(pci) || IS_KBL_LP(pci)
 
 static char *driver_short_names[] = {
         [AZX_DRIVER_ICH] = "HDA Intel",
@@ -2181,6 +2184,12 @@ static const struct pci_device_id azx_ids[] = {
         /* Sunrise Point-LP */
         { PCI_DEVICE(0x8086, 0x9d70),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        /* Kabylake */
+        { PCI_DEVICE(0x8086, 0xa171),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        /* Kabylake-LP */
+        { PCI_DEVICE(0x8086, 0x9d71),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
         /* Broxton-P(Apollolake) */
         { PCI_DEVICE(0x8086, 0x5a98),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index 17fd81736d3d..0621920f7617 100644
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -115,20 +115,20 @@ static int substream_free_pages(struct azx *chip,
 /*
  * Register access ops. Tegra HDA register access is DWORD only.
  */
-static void hda_tegra_writel(u32 value, u32 *addr)
+static void hda_tegra_writel(u32 value, u32 __iomem *addr)
 {
         writel(value, addr);
 }
 
-static u32 hda_tegra_readl(u32 *addr)
+static u32 hda_tegra_readl(u32 __iomem *addr)
 {
         return readl(addr);
 }
 
-static void hda_tegra_writew(u16 value, u16 *addr)
+static void hda_tegra_writew(u16 value, u16 __iomem  *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
@@ -137,20 +137,20 @@ static void hda_tegra_writew(u16 value, u16 *addr)
         writel(v, dword_addr);
 }
 
-static u16 hda_tegra_readw(u16 *addr)
+static u16 hda_tegra_readw(u16 __iomem *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
         return (v >> shift) & 0xffff;
 }
 
-static void hda_tegra_writeb(u8 value, u8 *addr)
+static void hda_tegra_writeb(u8 value, u8 __iomem *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
@@ -159,10 +159,10 @@ static void hda_tegra_writeb(u8 value, u8 *addr)
         writel(v, dword_addr);
 }
 
-static u8 hda_tegra_readb(u8 *addr)
+static u8 hda_tegra_readb(u8 __iomem *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index d53c25e7a1c1..900bfbc3368c 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -346,6 +346,9 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
         case 0x10ec0234:
         case 0x10ec0274:
         case 0x10ec0294:
+        case 0x10ec0700:
+        case 0x10ec0701:
+        case 0x10ec0703:
                 alc_update_coef_idx(codec, 0x10, 1<<15, 0);
                 break;
         case 0x10ec0662:
@@ -2655,6 +2658,7 @@ enum {
         ALC269_TYPE_ALC256,
         ALC269_TYPE_ALC225,
         ALC269_TYPE_ALC294,
+        ALC269_TYPE_ALC700,
 };
 
 /*
@@ -2686,6 +2690,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         case ALC269_TYPE_ALC256:
         case ALC269_TYPE_ALC225:
         case ALC269_TYPE_ALC294:
+        case ALC269_TYPE_ALC700:
                 ssids = alc269_ssids;
                 break;
         default:
@@ -3618,13 +3623,20 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,
 static void alc_headset_mode_unplugged(struct hda_codec *codec)
 {
         static struct coef_fw coef0255[] = {
-                WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
                 WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */
                 UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), /* Direct Drive HP Amp control(Set to verb control)*/
                 WRITE_COEF(0x06, 0x6104), /* Set MIC2 Vref gate with HP */
                 WRITE_COEFEX(0x57, 0x03, 0x8aa6), /* Direct Drive HP Amp control */
                 {}
         };
+        static struct coef_fw coef0255_1[] = {
+                WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
+                {}
+        };
+        static struct coef_fw coef0256[] = {
+                WRITE_COEF(0x1b, 0x0c4b), /* LDO and MISC control */
+                {}
+        };
         static struct coef_fw coef0233[] = {
                 WRITE_COEF(0x1b, 0x0c0b),
                 WRITE_COEF(0x45, 0xc429),
@@ -3677,7 +3689,11 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
 
         switch (codec->core.vendor_id) {
         case 0x10ec0255:
+                alc_process_coef_fw(codec, coef0255_1);
+                alc_process_coef_fw(codec, coef0255);
+                break;
         case 0x10ec0256:
+                alc_process_coef_fw(codec, coef0256);
                 alc_process_coef_fw(codec, coef0255);
                 break;
         case 0x10ec0233:
@@ -3896,6 +3912,12 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
                 WRITE_COEFEX(0x57, 0x03, 0x8ea6),
                 {}
         };
+        static struct coef_fw coef0256[] = {
+                WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */
+                WRITE_COEF(0x1b, 0x0c6b),
+                WRITE_COEFEX(0x57, 0x03, 0x8ea6),
+                {}
+        };
         static struct coef_fw coef0233[] = {
                 WRITE_COEF(0x45, 0xd429),
                 WRITE_COEF(0x1b, 0x0c2b),
@@ -3936,9 +3958,11 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
 
         switch (codec->core.vendor_id) {
         case 0x10ec0255:
-        case 0x10ec0256:
                 alc_process_coef_fw(codec, coef0255);
                 break;
+        case 0x10ec0256:
+                alc_process_coef_fw(codec, coef0256);
+                break;
         case 0x10ec0233:
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
@@ -3978,6 +4002,12 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
                 WRITE_COEFEX(0x57, 0x03, 0x8ea6),
                 {}
         };
+        static struct coef_fw coef0256[] = {
+                WRITE_COEF(0x45, 0xe489), /* Set to OMTP Type */
+                WRITE_COEF(0x1b, 0x0c6b),
+                WRITE_COEFEX(0x57, 0x03, 0x8ea6),
+                {}
+        };
         static struct coef_fw coef0233[] = {
                 WRITE_COEF(0x45, 0xe429),
                 WRITE_COEF(0x1b, 0x0c2b),
@@ -4018,9 +4048,11 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
 
         switch (codec->core.vendor_id) {
         case 0x10ec0255:
-        case 0x10ec0256:
                 alc_process_coef_fw(codec, coef0255);
                 break;
+        case 0x10ec0256:
+                alc_process_coef_fw(codec, coef0256);
+                break;
         case 0x10ec0233:
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
@@ -4266,7 +4298,7 @@ static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,
 static void alc255_set_default_jack_type(struct hda_codec *codec)
 {
         /* Set to iphone type */
-        static struct coef_fw fw[] = {
+        static struct coef_fw alc255fw[] = {
                 WRITE_COEF(0x1b, 0x880b),
                 WRITE_COEF(0x45, 0xd089),
                 WRITE_COEF(0x1b, 0x080b),
@@ -4274,7 +4306,22 @@ static void alc255_set_default_jack_type(struct hda_codec *codec)
                 WRITE_COEF(0x1b, 0x0c0b),
                 {}
         };
-        alc_process_coef_fw(codec, fw);
+        static struct coef_fw alc256fw[] = {
+                WRITE_COEF(0x1b, 0x884b),
+                WRITE_COEF(0x45, 0xd089),
+                WRITE_COEF(0x1b, 0x084b),
+                WRITE_COEF(0x46, 0x0004),
+                WRITE_COEF(0x1b, 0x0c4b),
+                {}
+        };
+        switch (codec->core.vendor_id) {
+        case 0x10ec0255:
+                alc_process_coef_fw(codec, alc255fw);
+                break;
+        case 0x10ec0256:
+                alc_process_coef_fw(codec, alc256fw);
+                break;
+        }
         msleep(30);
 }
 
@@ -5587,6 +5634,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),
+        SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
@@ -5602,6 +5650,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
+        SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),
+        SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
         SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
@@ -5775,11 +5825,19 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                 {0x12, 0x90a60180},
                 {0x14, 0x90170130},
                 {0x21, 0x02211040}),
+        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell Inspiron 5565", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+                {0x12, 0x90a60180},
+                {0x14, 0x90170120},
+                {0x21, 0x02211030}),
         SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                 {0x12, 0x90a60160},
                 {0x14, 0x90170120},
                 {0x21, 0x02211030}),
         SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+                {0x12, 0x90a60170},
+                {0x14, 0x90170120},
+                {0x21, 0x02211030}),
+        SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                 ALC256_STANDARD_PINS),
         SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
                 {0x12, 0x90a60130},
@@ -6053,6 +6111,14 @@ static int patch_alc269(struct hda_codec *codec)
         case 0x10ec0294:
                 spec->codec_variant = ALC269_TYPE_ALC294;
                 break;
+        case 0x10ec0700:
+        case 0x10ec0701:
+        case 0x10ec0703:
+                spec->codec_variant = ALC269_TYPE_ALC700;
+                spec->gen.mixer_nid = 0; /* ALC700 does not have any loopback mixer path */
+                alc_update_coef_idx(codec, 0x4a, 0, 1 << 15); /* Combo jack auto trigger control */
+                break;
+
         }
 
         if (snd_hda_codec_read(codec, 0x51, 0, AC_VERB_PARAMETERS, 0) == 0x10ec5505) {
@@ -7008,6 +7074,9 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
         HDA_CODEC_ENTRY(0x10ec0670, "ALC670", patch_alc662),
         HDA_CODEC_ENTRY(0x10ec0671, "ALC671", patch_alc662),
         HDA_CODEC_ENTRY(0x10ec0680, "ALC680", patch_alc680),
+        HDA_CODEC_ENTRY(0x10ec0700, "ALC700", patch_alc269),
+        HDA_CODEC_ENTRY(0x10ec0701, "ALC701", patch_alc269),
+        HDA_CODEC_ENTRY(0x10ec0703, "ALC703", patch_alc269),
         HDA_CODEC_ENTRY(0x10ec0867, "ALC891", patch_alc882),
         HDA_CODEC_ENTRY(0x10ec0880, "ALC880", patch_alc880),
         HDA_CODEC_ENTRY(0x10ec0882, "ALC882", patch_alc882),
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 64425d352962..888133f9e65d 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -28,7 +28,6 @@
 #include <sound/asoundef.h>
 #include <sound/omap-pcm.h>
 #include <sound/omap-hdmi-audio.h>
-#include <video/omapdss.h>
 
 #define DRV_NAME "omap-hdmi-audio"
 
diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
index bbf69d248ec5..9f53020c3269 100644
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -204,6 +204,44 @@ static unsigned long long adjust_signedness(unsigned long long value_int, int si
         return (value_int & value_mask) | ~value_mask;
 }
 
+static int string_set_value(struct bt_ctf_field *field, const char *string)
+{
+        char *buffer = NULL;
+        size_t len = strlen(string), i, p;
+        int err;
+
+        for (i = p = 0; i < len; i++, p++) {
+                if (isprint(string[i])) {
+                        if (!buffer)
+                                continue;
+                        buffer[p] = string[i];
+                } else {
+                        char numstr[5];
+
+                        snprintf(numstr, sizeof(numstr), "\\x%02x",
+                                 (unsigned int)(string[i]) & 0xff);
+
+                        if (!buffer) {
+                                buffer = zalloc(i + (len - i) * 4 + 2);
+                                if (!buffer) {
+                                        pr_err("failed to set unprintable string '%s'\n", string);
+                                        return bt_ctf_field_string_set_value(field, "UNPRINTABLE-STRING");
+                                }
+                                if (i > 0)
+                                        strncpy(buffer, string, i);
+                        }
+                        strncat(buffer + p, numstr, 4);
+                        p += 3;
+                }
+        }
+
+        if (!buffer)
+                return bt_ctf_field_string_set_value(field, string);
+        err = bt_ctf_field_string_set_value(field, buffer);
+        free(buffer);
+        return err;
+}
+
 static int add_tracepoint_field_value(struct ctf_writer *cw,
                                       struct bt_ctf_event_class *event_class,
                                       struct bt_ctf_event *event,
@@ -270,8 +308,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
                 }
 
                 if (flags & FIELD_IS_STRING)
-                        ret = bt_ctf_field_string_set_value(field,
-                                        data + offset + i * len);
+                        ret = string_set_value(field, data + offset + i * len);
                 else {
                         unsigned long long value_int;
 
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index f6fcc6832949..9b141f12329e 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -673,6 +673,8 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
         int err;
         union perf_event *event;
 
+        if (symbol_conf.kptr_restrict)
+                return -1;
         if (map == NULL)
                 return -1;
 
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 20f9cb32b703..54c4ff2b1cee 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1933,17 +1933,17 @@ int setup_intlist(struct intlist **list, const char *list_str,
 static bool symbol__read_kptr_restrict(void)
 {
         bool value = false;
+        FILE *fp = fopen("/proc/sys/kernel/kptr_restrict", "r");
 
-        if (geteuid() != 0) {
-                FILE *fp = fopen("/proc/sys/kernel/kptr_restrict", "r");
-                if (fp != NULL) {
-                        char line[8];
+        if (fp != NULL) {
+                char line[8];
 
-                        if (fgets(line, sizeof(line), fp) != NULL)
-                                value = atoi(line) != 0;
+                if (fgets(line, sizeof(line), fp) != NULL)
+                        value = (geteuid() != 0) ?
+                                        (atoi(line) != 0) :
+                                        (atoi(line) == 2);
 
-                        fclose(fp);
-                }
+                fclose(fp);
         }
 
         return value;
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
index c2b61c4fda11..0bf5085281f3 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
@@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then
     exit_unsupported
 fi
 
-reset_tracer
-do_reset
-
-FEATURE=`grep hist events/sched/sched_process_fork/trigger`
-if [ -z "$FEATURE" ]; then
+if [ ! -f events/sched/sched_process_fork/hist ]; then
     echo "hist trigger is not supported"
     exit_unsupported
 fi
 
+reset_tracer
+do_reset
+
 echo "Test histogram with execname modifier"
 
 echo 'hist:keys=common_pid.execname' > events/sched/sched_process_fork/trigger
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
index b2902d42a537..a00184cd9c95 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
@@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then
     exit_unsupported
 fi
 
-reset_tracer
-do_reset
-
-FEATURE=`grep hist events/sched/sched_process_fork/trigger`
-if [ -z "$FEATURE" ]; then
+if [ ! -f events/sched/sched_process_fork/hist ]; then
     echo "hist trigger is not supported"
     exit_unsupported
 fi
 
+reset_tracer
+do_reset
+
 echo "Test histogram basic tigger"
 
 echo 'hist:keys=parent_pid:vals=child_pid' > events/sched/sched_process_fork/trigger
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
index 03c4a46561fc..3478b00ead57 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
@@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then
     exit_unsupported
 fi
 
-reset_tracer
-do_reset
-
-FEATURE=`grep hist events/sched/sched_process_fork/trigger`
-if [ -z "$FEATURE" ]; then
+if [ ! -f events/sched/sched_process_fork/hist ]; then
     echo "hist trigger is not supported"
     exit_unsupported
 fi
 
+reset_tracer
+do_reset
+
 reset_trigger
 
 echo "Test histogram multiple tiggers"
diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c
index 96ba386b1b7b..4a8217448f20 100644
--- a/tools/testing/selftests/net/reuseport_bpf.c
+++ b/tools/testing/selftests/net/reuseport_bpf.c
@@ -111,9 +111,9 @@ static void attach_ebpf(int fd, uint16_t mod)
         memset(&attr, 0, sizeof(attr));
         attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
         attr.insn_cnt = ARRAY_SIZE(prog);
-        attr.insns = (uint64_t)prog;
-        attr.license = (uint64_t)bpf_license;
-        attr.log_buf = (uint64_t)bpf_log_buf;
+        attr.insns = (unsigned long) &prog;
+        attr.license = (unsigned long) &bpf_license;
+        attr.log_buf = (unsigned long) &bpf_log_buf;
         attr.log_size = sizeof(bpf_log_buf);
         attr.log_level = 1;
         attr.kern_version = 0;
@@ -351,8 +351,8 @@ static void test_filter_no_reuseport(const struct test_params p)
         memset(&eprog, 0, sizeof(eprog));
         eprog.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
         eprog.insn_cnt = ARRAY_SIZE(ecode);
-        eprog.insns = (uint64_t)ecode;
-        eprog.license = (uint64_t)bpf_license;
+        eprog.insns = (unsigned long) &ecode;
+        eprog.license = (unsigned long) &bpf_license;
         eprog.kern_version = 0;
 
         memset(&cprog, 0, sizeof(cprog));
diff --git a/tools/testing/selftests/vm/compaction_test.c b/tools/testing/selftests/vm/compaction_test.c
index 932ff577ffc0..00c4f65d12da 100644
--- a/tools/testing/selftests/vm/compaction_test.c
+++ b/tools/testing/selftests/vm/compaction_test.c
@@ -136,7 +136,7 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size)
         printf("No of huge pages allocated = %d\n",
                (atoi(nr_hugepages)));
 
-        if (write(fd, initial_nr_hugepages, sizeof(initial_nr_hugepages))
+        if (write(fd, initial_nr_hugepages, strlen(initial_nr_hugepages))
             != strlen(initial_nr_hugepages)) {
                 perror("Failed to write to /proc/sys/vm/nr_hugepages\n");
                 goto close_fd;
diff --git a/tools/virtio/ringtest/Makefile b/tools/virtio/ringtest/Makefile
index 6ba745529833..6173adae9f08 100644
--- a/tools/virtio/ringtest/Makefile
+++ b/tools/virtio/ringtest/Makefile
@@ -1,6 +1,6 @@
 all:
 
-all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder
+all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder noring
 
 CFLAGS += -Wall
 CFLAGS += -pthread -O2 -ggdb
@@ -15,11 +15,13 @@ ring: ring.o main.o
 virtio_ring_0_9: virtio_ring_0_9.o main.o
 virtio_ring_poll: virtio_ring_poll.o main.o
 virtio_ring_inorder: virtio_ring_inorder.o main.o
+noring: noring.o main.o
 clean:
         -rm main.o
         -rm ring.o ring
         -rm virtio_ring_0_9.o virtio_ring_0_9
         -rm virtio_ring_poll.o virtio_ring_poll
         -rm virtio_ring_inorder.o virtio_ring_inorder
+        -rm noring.o noring
 
 .PHONY: all clean
diff --git a/tools/virtio/ringtest/README b/tools/virtio/ringtest/README
index 34e94c46104f..d83707a336c9 100644
--- a/tools/virtio/ringtest/README
+++ b/tools/virtio/ringtest/README
@@ -1,2 +1,6 @@
 Partial implementation of various ring layouts, useful to tune virtio design.
 Uses shared memory heavily.
+
+Typical use:
+
+# sh run-on-all.sh perf stat -r 10 --log-fd 1 -- ./ring
diff --git a/tools/virtio/ringtest/noring.c b/tools/virtio/ringtest/noring.c
new file mode 100644
index 000000000000..eda2f4824130
--- /dev/null
+++ b/tools/virtio/ringtest/noring.c
@@ -0,0 +1,69 @@
+#define _GNU_SOURCE
+#include "main.h"
+#include <assert.h>
+
+/* stub implementation: useful for measuring overhead */
+void alloc_ring(void)
+{
+}
+
+/* guest side */
+int add_inbuf(unsigned len, void *buf, void *datap)
+{
+        return 0;
+}
+
+/*
+ * skb_array API provides no way for producer to find out whether a given
+ * buffer was consumed.  Our tests merely require that a successful get_buf
+ * implies that add_inbuf succeed in the past, and that add_inbuf will succeed,
+ * fake it accordingly.
+ */
+void *get_buf(unsigned *lenp, void **bufp)
+{
+        return "Buffer";
+}
+
+void poll_used(void)
+{
+}
+
+void disable_call()
+{
+        assert(0);
+}
+
+bool enable_call()
+{
+        assert(0);
+}
+
+void kick_available(void)
+{
+        assert(0);
+}
+
+/* host side */
+void disable_kick()
+{
+        assert(0);
+}
+
+bool enable_kick()
+{
+        assert(0);
+}
+
+void poll_avail(void)
+{
+}
+
+bool use_buf(unsigned *lenp, void **bufp)
+{
+        return true;
+}
+
+void call_used(void)
+{
+        assert(0);
+}
diff --git a/tools/virtio/ringtest/run-on-all.sh b/tools/virtio/ringtest/run-on-all.sh
index 52b0f71ffa8d..2e69ca812b4c 100755
--- a/tools/virtio/ringtest/run-on-all.sh
+++ b/tools/virtio/ringtest/run-on-all.sh
@@ -3,10 +3,10 @@
 #use last CPU for host. Why not the first?
 #many devices tend to use cpu0 by default so
 #it tends to be busier
-HOST_AFFINITY=$(cd /dev/cpu; ls|grep -v '[a-z]'|sort -n|tail -1)
+HOST_AFFINITY=$(lscpu -p=cpu | tail -1)
 
 #run command on all cpus
-for cpu in $(cd /dev/cpu; ls|grep -v '[a-z]'|sort -n);
+for cpu in $(seq 0 $HOST_AFFINITY)
 do
         #Don't run guest and host on same CPU
         #It actually works ok if using signalling
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index 1889163f2f05..7cf6e1769903 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -492,7 +492,7 @@ static void slab_stats(struct slabinfo *s)
                         s->deactivate_to_head + s->deactivate_to_tail + s->deactivate_bypass;
 
         if (total) {
-                printf("\nSlab Deactivation             Ocurrences  %%\n");
+                printf("\nSlab Deactivation             Occurrences %%\n");
                 printf("-------------------------------------------------\n");
                 printf("Slab full                     %7lu  %3lu%%\n",
                         s->deactivate_full, (s->deactivate_full * 100) / total);
diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c
index a3f12b3b277b..3a3a699b7489 100644
--- a/virt/kvm/arm/hyp/vgic-v2-sr.c
+++ b/virt/kvm/arm/hyp/vgic-v2-sr.c
@@ -100,12 +100,11 @@ static void __hyp_text save_lrs(struct kvm_vcpu *vcpu, void __iomem *base)
                 if (!(vcpu->arch.vgic_cpu.live_lrs & (1UL << i)))
                         continue;
 
-                if (cpu_if->vgic_elrsr & (1UL << i)) {
+                if (cpu_if->vgic_elrsr & (1UL << i))
                         cpu_if->vgic_lr[i] &= ~GICH_LR_STATE;
-                        continue;
-                }
+                else
+                        cpu_if->vgic_lr[i] = readl_relaxed(base + GICH_LR0 + (i * 4));
 
-                cpu_if->vgic_lr[i] = readl_relaxed(base + GICH_LR0 + (i * 4));
                 writel_relaxed(0, base + GICH_LR0 + (i * 4));
         }
 }
diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
index 059595ec3da0..9f6fab74dce7 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.c
+++ b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -191,10 +191,8 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
          * other thread sync back the IRQ.
          */
         while (irq->vcpu && /* IRQ may have state in an LR somewhere */
-               irq->vcpu->cpu != -1) { /* VCPU thread is running */
-                BUG_ON(irq->intid < VGIC_NR_PRIVATE_IRQS);
+               irq->vcpu->cpu != -1) /* VCPU thread is running */
                 cond_resched_lock(&irq->irq_lock);
-        }
 
         irq->active = new_active_state;
         if (new_active_state)
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c
index 8ad42c217770..e31405ee5515 100644
--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
@@ -112,11 +112,15 @@ void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu)
                         }
                 }
 
-                /* Clear soft pending state when level IRQs have been acked */
-                if (irq->config == VGIC_CONFIG_LEVEL &&
-                    !(val & GICH_LR_PENDING_BIT)) {
-                        irq->soft_pending = false;
-                        irq->pending = irq->line_level;
+                /*
+                 * Clear soft pending state when level irqs have been acked.
+                 * Always regenerate the pending state.
+                 */
+                if (irq->config == VGIC_CONFIG_LEVEL) {
+                        if (!(val & GICH_LR_PENDING_BIT))
+                                irq->soft_pending = false;
+
+                        irq->pending = irq->line_level || irq->soft_pending;
                 }
 
                 spin_unlock(&irq->irq_lock);
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
index 336a46115937..346b4ad12b49 100644
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -101,11 +101,15 @@ void vgic_v3_fold_lr_state(struct kvm_vcpu *vcpu)
                         }
                 }
 
-                /* Clear soft pending state when level irqs have been acked */
-                if (irq->config == VGIC_CONFIG_LEVEL &&
-                    !(val & ICH_LR_PENDING_BIT)) {
-                        irq->soft_pending = false;
-                        irq->pending = irq->line_level;
+                /*
+                 * Clear soft pending state when level irqs have been acked.
+                 * Always regenerate the pending state.
+                 */
+                if (irq->config == VGIC_CONFIG_LEVEL) {
+                        if (!(val & ICH_LR_PENDING_BIT))
+                                irq->soft_pending = false;
+
+                        irq->pending = irq->line_level || irq->soft_pending;
                 }
 
                 spin_unlock(&irq->irq_lock);
diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
index fe84e1a95dd5..8db197bb6c7a 100644
--- a/virt/kvm/irqchip.c
+++ b/virt/kvm/irqchip.c
@@ -40,7 +40,7 @@ int kvm_irq_map_gsi(struct kvm *kvm,
 
         irq_rt = srcu_dereference_check(kvm->irq_routing, &kvm->irq_srcu,
                                         lockdep_is_held(&kvm->irq_lock));
-        if (gsi < irq_rt->nr_rt_entries) {
+        if (irq_rt && gsi < irq_rt->nr_rt_entries) {
                 hlist_for_each_entry(e, &irq_rt->map[gsi], link) {
                         entries[n] = *e;
                         ++n;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 37af23052470..48bd520fc702 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2935,25 +2935,27 @@ static long kvm_vm_ioctl(struct file *filp,
         case KVM_SET_GSI_ROUTING: {
                 struct kvm_irq_routing routing;
                 struct kvm_irq_routing __user *urouting;
-                struct kvm_irq_routing_entry *entries;
+                struct kvm_irq_routing_entry *entries = NULL;
 
                 r = -EFAULT;
                 if (copy_from_user(&routing, argp, sizeof(routing)))
                         goto out;
                 r = -EINVAL;
-                if (routing.nr >= KVM_MAX_IRQ_ROUTES)
+                if (routing.nr > KVM_MAX_IRQ_ROUTES)
                         goto out;
                 if (routing.flags)
                         goto out;
-                r = -ENOMEM;
-                entries = vmalloc(routing.nr * sizeof(*entries));
-                if (!entries)
-                        goto out;
-                r = -EFAULT;
-                urouting = argp;
-                if (copy_from_user(entries, urouting->entries,
-                                   routing.nr * sizeof(*entries)))
-                        goto out_free_irq_routing;
+                if (routing.nr) {
+                        r = -ENOMEM;
+                        entries = vmalloc(routing.nr * sizeof(*entries));
+                        if (!entries)
+                                goto out;
+                        r = -EFAULT;
+                        urouting = argp;
+                        if (copy_from_user(entries, urouting->entries,
+                                           routing.nr * sizeof(*entries)))
+                                goto out_free_irq_routing;
+                }
                 r = kvm_set_irq_routing(kvm, entries, routing.nr,
                                         routing.flags);
 out_free_irq_routing: