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

drm-misc-next for 5.1:

UAPI Changes:
 - New fourcc identifier for ARM Framebuffer Compression v1.3

Cross-subsystem Changes:

Core Changes:
 - Reorganisation of drm_device and drm_framebuffer headers
 - Cleanup of the drmP inclusion
 - Fix leaks in the fb-helpers
 - Allow for depth different from bpp in fb-helper fbdev emulation
 - Remove drm_mode_object from drm_display_mode

Driver Changes:
 - Add reflection properties to rockchip
 - a bunch of fixes for virtio
 - a bunch of fixes for dp_mst and drivers using it, and introduction of a
   new refcounting scheme
 - Convertion of bochs to atomic and generic fbdev emulation
 - Allow meson to remove the firmware framebuffers

[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: Dave Airlie <airlied@redhat.com>

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

160 files changed, 3490 insertions, 1507 deletions

diff --git a/Documentation/devicetree/bindings/display/panel/auo,g101evn010 b/Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt
index bc6a0c858e23..bc6a0c858e23 100644
--- a/Documentation/devicetree/bindings/display/panel/auo,g101evn010
+++ b/Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt
index b79e5769f0ae..4f58c5a2d195 100644
--- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt
+++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt
@@ -10,6 +10,7 @@ Required properties:
                 "rockchip,rk3126-vop";
                 "rockchip,px30-vop-lit";
                 "rockchip,px30-vop-big";
+                "rockchip,rk3066-vop";
                 "rockchip,rk3188-vop";
                 "rockchip,rk3288-vop";
                 "rockchip,rk3368-vop";
diff --git a/Documentation/gpu/dp-mst/topology-figure-1.dot b/Documentation/gpu/dp-mst/topology-figure-1.dot
new file mode 100644
index 000000000000..157e17c7e0b0
--- /dev/null
+++ b/Documentation/gpu/dp-mst/topology-figure-1.dot
@@ -0,0 +1,52 @@
+digraph T {
+    /* Make sure our payloads are always drawn below the driver node */
+    subgraph cluster_driver {
+        fillcolor = grey;
+        style = filled;
+        driver -> {payload1, payload2} [dir=none];
+    }
+
+    /* Driver malloc references */
+    edge [style=dashed];
+    driver -> port1;
+    driver -> port2;
+    driver -> port3:e;
+    driver -> port4;
+
+    payload1:s -> port1:e;
+    payload2:s -> port3:e;
+    edge [style=""];
+
+    subgraph cluster_topology {
+        label="Topology Manager";
+        labelloc=bottom;
+
+        /* Topology references */
+        mstb1 -> {port1, port2};
+        port1 -> mstb2;
+        port2 -> mstb3 -> {port3, port4};
+        port3 -> mstb4;
+
+        /* Malloc references */
+        edge [style=dashed;dir=back];
+        mstb1 -> {port1, port2};
+        port1 -> mstb2;
+        port2 -> mstb3 -> {port3, port4};
+        port3 -> mstb4;
+    }
+
+    driver [label="DRM driver";style=filled;shape=box;fillcolor=lightblue];
+
+    payload1 [label="Payload #1";style=filled;shape=box;fillcolor=lightblue];
+    payload2 [label="Payload #2";style=filled;shape=box;fillcolor=lightblue];
+
+    mstb1 [label="MSTB #1";style=filled;fillcolor=palegreen;shape=oval];
+    mstb2 [label="MSTB #2";style=filled;fillcolor=palegreen;shape=oval];
+    mstb3 [label="MSTB #3";style=filled;fillcolor=palegreen;shape=oval];
+    mstb4 [label="MSTB #4";style=filled;fillcolor=palegreen;shape=oval];
+
+    port1 [label="Port #1";shape=oval];
+    port2 [label="Port #2";shape=oval];
+    port3 [label="Port #3";shape=oval];
+    port4 [label="Port #4";shape=oval];
+}
diff --git a/Documentation/gpu/dp-mst/topology-figure-2.dot b/Documentation/gpu/dp-mst/topology-figure-2.dot
new file mode 100644
index 000000000000..4243dd1737cb
--- /dev/null
+++ b/Documentation/gpu/dp-mst/topology-figure-2.dot
@@ -0,0 +1,56 @@
+digraph T {
+    /* Make sure our payloads are always drawn below the driver node */
+    subgraph cluster_driver {
+        fillcolor = grey;
+        style = filled;
+        driver -> {payload1, payload2} [dir=none];
+    }
+
+    /* Driver malloc references */
+    edge [style=dashed];
+    driver -> port1;
+    driver -> port2;
+    driver -> port3:e;
+    driver -> port4 [color=red];
+
+    payload1:s -> port1:e;
+    payload2:s -> port3:e;
+    edge [style=""];
+
+    subgraph cluster_topology {
+        label="Topology Manager";
+        labelloc=bottom;
+
+        /* Topology references */
+        mstb1 -> {port1, port2};
+        port1 -> mstb2;
+        edge [color=red];
+        port2 -> mstb3 -> {port3, port4};
+        port3 -> mstb4;
+        edge [color=""];
+
+        /* Malloc references */
+        edge [style=dashed;dir=back];
+        mstb1 -> {port1, port2};
+        port1 -> mstb2;
+        port2 -> mstb3 -> port3;
+        edge [color=red];
+        mstb3 -> port4;
+        port3 -> mstb4;
+    }
+
+    mstb1 [label="MSTB #1";style=filled;fillcolor=palegreen];
+    mstb2 [label="MSTB #2";style=filled;fillcolor=palegreen];
+    mstb3 [label="MSTB #3";style=filled;fillcolor=palegreen];
+    mstb4 [label="MSTB #4";style=filled;fillcolor=grey];
+
+    port1 [label="Port #1"];
+    port2 [label="Port #2"];
+    port3 [label="Port #3"];
+    port4 [label="Port #4";style=filled;fillcolor=grey];
+
+    driver [label="DRM driver";style=filled;shape=box;fillcolor=lightblue];
+
+    payload1 [label="Payload #1";style=filled;shape=box;fillcolor=lightblue];
+    payload2 [label="Payload #2";style=filled;shape=box;fillcolor=lightblue];
+}
diff --git a/Documentation/gpu/dp-mst/topology-figure-3.dot b/Documentation/gpu/dp-mst/topology-figure-3.dot
new file mode 100644
index 000000000000..6cd78d06778b
--- /dev/null
+++ b/Documentation/gpu/dp-mst/topology-figure-3.dot
@@ -0,0 +1,59 @@
+digraph T {
+    /* Make sure our payloads are always drawn below the driver node */
+    subgraph cluster_driver {
+        fillcolor = grey;
+        style = filled;
+        edge [dir=none];
+        driver -> payload1;
+        driver -> payload2 [penwidth=3];
+        edge [dir=""];
+    }
+
+    /* Driver malloc references */
+    edge [style=dashed];
+    driver -> port1;
+    driver -> port2;
+    driver -> port3:e;
+    driver -> port4 [color=grey];
+    payload1:s -> port1:e;
+    payload2:s -> port3:e [penwidth=3];
+    edge [style=""];
+
+    subgraph cluster_topology {
+        label="Topology Manager";
+        labelloc=bottom;
+
+        /* Topology references */
+        mstb1 -> {port1, port2};
+        port1 -> mstb2;
+        edge [color=grey];
+        port2 -> mstb3 -> {port3, port4};
+        port3 -> mstb4;
+        edge [color=""];
+
+        /* Malloc references */
+        edge [style=dashed;dir=back];
+        mstb1 -> {port1, port2};
+        port1 -> mstb2;
+        port2 -> mstb3 [penwidth=3];
+        mstb3 -> port3 [penwidth=3];
+        edge [color=grey];
+        mstb3 -> port4;
+        port3 -> mstb4;
+    }
+
+    mstb1 [label="MSTB #1";style=filled;fillcolor=palegreen];
+    mstb2 [label="MSTB #2";style=filled;fillcolor=palegreen];
+    mstb3 [label="MSTB #3";style=filled;fillcolor=palegreen;penwidth=3];
+    mstb4 [label="MSTB #4";style=filled;fillcolor=grey];
+
+    port1 [label="Port #1"];
+    port2 [label="Port #2";penwidth=5];
+    port3 [label="Port #3";penwidth=3];
+    port4 [label="Port #4";style=filled;fillcolor=grey];
+
+    driver [label="DRM driver";style=filled;shape=box;fillcolor=lightblue];
+
+    payload1 [label="Payload #1";style=filled;shape=box;fillcolor=lightblue];
+    payload2 [label="Payload #2";style=filled;shape=box;fillcolor=lightblue;penwidth=3];
+}
diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
index 5ee9674fb9e9..2caf21effd28 100644
--- a/Documentation/gpu/drm-internals.rst
+++ b/Documentation/gpu/drm-internals.rst
@@ -143,6 +143,9 @@ Device Instance and Driver Handling
 .. kernel-doc:: drivers/gpu/drm/drm_drv.c
    :doc: driver instance overview
 
+.. kernel-doc:: include/drm/drm_device.h
+   :internal:
+
 .. kernel-doc:: include/drm/drm_drv.h
    :internal:
 
@@ -230,6 +233,15 @@ Printer
 .. kernel-doc:: drivers/gpu/drm/drm_print.c
    :export:
 
+Utilities
+---------
+
+.. kernel-doc:: include/drm/drm_util.h
+   :doc: drm utils
+
+.. kernel-doc:: include/drm/drm_util.h
+   :internal:
+
 
 Legacy Support Code
 ===================
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
index b422eb8edf16..fbd11b2fe5b5 100644
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -116,8 +116,6 @@ Framebuffer CMA Helper Functions Reference
 .. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c
    :export:
 
-.. _drm_bridges:
-
 Framebuffer GEM Helper Reference
 ================================
 
@@ -127,6 +125,8 @@ Framebuffer GEM Helper Reference
 .. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
    :export:
 
+.. _drm_bridges:
+
 Bridges
 =======
 
@@ -208,18 +208,40 @@ Display Port Dual Mode Adaptor Helper Functions Reference
 .. kernel-doc:: drivers/gpu/drm/drm_dp_dual_mode_helper.c
    :export:
 
-Display Port MST Helper Functions Reference
-===========================================
+Display Port MST Helpers
+========================
+
+Overview
+--------
 
 .. kernel-doc:: drivers/gpu/drm/drm_dp_mst_topology.c
    :doc: dp mst helper
 
+.. kernel-doc:: drivers/gpu/drm/drm_dp_mst_topology.c
+   :doc: Branch device and port refcounting
+
+Functions Reference
+-------------------
+
 .. kernel-doc:: include/drm/drm_dp_mst_helper.h
    :internal:
 
 .. kernel-doc:: drivers/gpu/drm/drm_dp_mst_topology.c
    :export:
 
+Topology Lifetime Internals
+---------------------------
+
+These functions aren't exported to drivers, but are documented here to help make
+the MST topology helpers easier to understand
+
+.. kernel-doc:: drivers/gpu/drm/drm_dp_mst_topology.c
+   :functions: drm_dp_mst_topology_try_get_mstb drm_dp_mst_topology_get_mstb
+               drm_dp_mst_topology_put_mstb
+               drm_dp_mst_topology_try_get_port drm_dp_mst_topology_get_port
+               drm_dp_mst_topology_put_port
+               drm_dp_mst_get_mstb_malloc drm_dp_mst_put_mstb_malloc
+
 MIPI DSI Helper Functions Reference
 ===================================
 
diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst
index 41da7b06195c..0a85dad876ae 100644
--- a/Documentation/gpu/todo.rst
+++ b/Documentation/gpu/todo.rst
@@ -209,6 +209,36 @@ Would be great to refactor this all into a set of small common helpers.
 
 Contact: Daniel Vetter
 
+Generic fbdev defio support
+---------------------------
+
+The defio support code in the fbdev core has some very specific requirements,
+which means drivers need to have a special framebuffer for fbdev. Which prevents
+us from using the generic fbdev emulation code everywhere. The main issue is
+that it uses some fields in struct page itself, which breaks shmem gem objects
+(and other things).
+
+Possible solution would be to write our own defio mmap code in the drm fbdev
+emulation. It would need to fully wrap the existing mmap ops, forwarding
+everything after it has done the write-protect/mkwrite trickery:
+
+- In the drm_fbdev_fb_mmap helper, if we need defio, change the
+  default page prots to write-protected with something like this::
+
+      vma->vm_page_prot = pgprot_wrprotect(vma->vm_page_prot);
+
+- Set the mkwrite and fsync callbacks with similar implementions to the core
+  fbdev defio stuff. These should all work on plain ptes, they don't actually
+  require a struct page.  uff. These should all work on plain ptes, they don't
+  actually require a struct page.
+
+- Track the dirty pages in a separate structure (bitfield with one bit per page
+  should work) to avoid clobbering struct page.
+
+Might be good to also have some igt testcases for this.
+
+Contact: Daniel Vetter, Noralf Tronnes
+
 Put a reservation_object into drm_gem_object
 --------------------------------------------
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b510ef800f6..6e1cef2f21d9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4910,6 +4910,13 @@ DRM DRIVER FOR TDFX VIDEO CARDS
 S:      Orphan / Obsolete
 F:      drivers/gpu/drm/tdfx/
 
+DRM DRIVER FOR TPO TPG110 PANELS
+M:      Linus Walleij <linus.walleij@linaro.org>
+T:      git git://anongit.freedesktop.org/drm/drm-misc
+S:      Maintained
+F:      drivers/gpu/drm/panel/panel-tpo-tpg110.c
+F:      Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt
+
 DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 M:      Dave Airlie <airlied@redhat.com>
 R:      Sean Paul <sean@poorly.run>
@@ -4918,6 +4925,16 @@ S:	Odd Fixes
 F:      drivers/gpu/drm/udl/
 T:      git git://anongit.freedesktop.org/drm/drm-misc
 
+DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
+M:      Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
+R:      Haneen Mohammed <hamohammed.sa@gmail.com>
+R:      Daniel Vetter <daniel@ffwll.ch>
+T:      git git://anongit.freedesktop.org/drm/drm-misc
+S:      Maintained
+L:      dri-devel@lists.freedesktop.org
+F:      drivers/gpu/drm/vkms/
+F:      Documentation/gpu/vkms.rst
+
 DRM DRIVER FOR VMWARE VIRTUAL GPU
 M:      "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 M:      Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 8a078f4ae73d..28bccceaa363 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2708,7 +2708,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
         amdgpu_irq_disable_all(adev);
         if (adev->mode_info.mode_config_initialized){
                 if (!amdgpu_device_has_dc_support(adev))
-                        drm_crtc_force_disable_all(adev->ddev);
+                        drm_helper_force_disable_all(adev->ddev);
                 else
                         drm_atomic_helper_shutdown(adev->ddev);
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index e9934de1b9cf..dd30f4e61a8c 100644
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 
+#include <drm/drm_util.h>
+
 #define ATOM_DEBUG
 
 #include "atom.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 4cfecdce29a3..1f0426d2fc2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -1682,7 +1682,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v10_0_audio_write_sad_regs(encoder);
         dce_v10_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 7c868916d90f..2280b971d758 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -1724,7 +1724,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v11_0_audio_write_sad_regs(encoder);
         dce_v11_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 17eaaba36017..db443ec53d3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1423,6 +1423,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder,
         struct amdgpu_device *adev = dev->dev_private;
         struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
         struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
+        struct drm_connector *connector = amdgpu_get_connector_for_encoder(encoder);
         struct hdmi_avi_infoframe frame;
         u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];
         uint8_t *payload = buffer + 3;
@@ -1430,7 +1431,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder,
         ssize_t err;
         u32 tmp;
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 8c0576978d36..13da915991dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -1616,7 +1616,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v8_0_audio_write_sad_regs(encoder);
         dce_v8_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 5e7ca1f3a8d1..24632727e127 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -191,6 +191,7 @@ dm_dp_mst_connector_destroy(struct drm_connector *connector)
         drm_encoder_cleanup(&amdgpu_encoder->base);
         kfree(amdgpu_encoder);
         drm_connector_cleanup(connector);
+        drm_dp_mst_put_port_malloc(amdgpu_dm_connector->port);
         kfree(amdgpu_dm_connector);
 }
 
@@ -363,7 +364,9 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         amdgpu_dm_connector_funcs_reset(connector);
 
         DRM_INFO("DM_MST: added connector: %p [id: %d] [master: %p]\n",
-                        aconnector, connector->base.id, aconnector->mst_port);
+                 aconnector, connector->base.id, aconnector->mst_port);
+
+        drm_dp_mst_get_port_malloc(port);
 
         DRM_DEBUG_KMS(":%d\n", connector->base.id);
 
@@ -379,12 +382,12 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
 
         DRM_INFO("DM_MST: Disabling connector: %p [id: %d] [master: %p]\n",
-                                aconnector, connector->base.id, aconnector->mst_port);
+                 aconnector, connector->base.id, aconnector->mst_port);
 
-        aconnector->port = NULL;
         if (aconnector->dc_sink) {
                 amdgpu_dm_update_freesync_caps(connector, NULL);
-                dc_link_remove_remote_sink(aconnector->dc_link, aconnector->dc_sink);
+                dc_link_remove_remote_sink(aconnector->dc_link,
+                                           aconnector->dc_sink);
                 dc_sink_release(aconnector->dc_sink);
                 aconnector->dc_sink = NULL;
         }
diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
index 62f51f70606d..155ab177ce0b 100644
--- a/drivers/gpu/drm/arc/arcpgu_crtc.c
+++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
@@ -16,8 +16,10 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_device.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_vblank.h>
 #include <drm/drm_plane_helper.h>
 #include <linux/clk.h>
 #include <linux/platform_data/simplefb.h>
diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
index 206a76abf771..39a79f5718c4 100644
--- a/drivers/gpu/drm/arc/arcpgu_drv.c
+++ b/drivers/gpu/drm/arc/arcpgu_drv.c
@@ -16,12 +16,18 @@
 
 #include <linux/clk.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_device.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_atomic_helper.h>
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
 
 #include "arcpgu.h"
 #include "arcpgu_regs.h"
diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
index 68629e614990..6530d88f7293 100644
--- a/drivers/gpu/drm/arc/arcpgu_sim.c
+++ b/drivers/gpu/drm/arc/arcpgu_sim.c
@@ -51,7 +51,6 @@ arcpgu_drm_connector_helper_funcs = {
 };
 
 static const struct drm_connector_funcs arcpgu_drm_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
         .reset = drm_atomic_helper_connector_reset,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .destroy = arcpgu_drm_connector_destroy,
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index da9360688b55..20dfb29561c2 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -270,13 +270,7 @@ static void armada_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
         tm = adj->crtc_vtotal - adj->crtc_vsync_end;
 
         DRM_DEBUG_KMS("[CRTC:%d:%s] mode " DRM_MODE_FMT "\n",
-                      crtc->base.id, crtc->name,
-                      adj->base.id, adj->name, adj->vrefresh, adj->clock,
-                      adj->crtc_hdisplay, adj->crtc_hsync_start,
-                      adj->crtc_hsync_end, adj->crtc_htotal,
-                      adj->crtc_vdisplay, adj->crtc_vsync_start,
-                      adj->crtc_vsync_end, adj->crtc_vtotal,
-                      adj->type, adj->flags);
+                      crtc->base.id, crtc->name, DRM_MODE_ARG(adj));
         DRM_DEBUG_KMS("lm %d rm %d tm %d bm %d\n", lm, rm, tm, bm);
 
         /* Now compute the divider for real */
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index c2e41369adcf..2c9f8dd9733a 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -39,7 +39,9 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_util.h>
 #include <drm/drm_crtc_helper.h>
+
 #include "ast_drv.h"
 
 static void ast_dirty_update(struct ast_fbdev *afbdev,
@@ -261,7 +263,7 @@ static void ast_fbdev_destroy(struct drm_device *dev,
 {
         struct ast_framebuffer *afb = &afbdev->afb;
 
-        drm_crtc_force_disable_all(dev);
+        drm_helper_force_disable_all(dev);
         drm_fb_helper_unregister_fbi(&afbdev->helper);
 
         if (afb->obj) {
diff --git a/drivers/gpu/drm/bochs/Makefile b/drivers/gpu/drm/bochs/Makefile
index 98ef60a19e8f..e9e0f8f5eb5b 100644
--- a/drivers/gpu/drm/bochs/Makefile
+++ b/drivers/gpu/drm/bochs/Makefile
@@ -1,3 +1,3 @@
-bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_fbdev.o bochs_hw.o
+bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_hw.o
 
 obj-$(CONFIG_DRM_BOCHS) += bochs-drm.o
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index fb38c8b857b5..03711394f1ed 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -80,12 +80,6 @@ struct bochs_device {
                 struct ttm_bo_device bdev;
                 bool initialized;
         } ttm;
-
-        /* fbdev */
-        struct {
-                struct drm_framebuffer *fb;
-                struct drm_fb_helper helper;
-        } fb;
 };
 
 struct bochs_bo {
@@ -121,8 +115,9 @@ int bochs_hw_init(struct drm_device *dev);
 void bochs_hw_fini(struct drm_device *dev);
 
 void bochs_hw_setmode(struct bochs_device *bochs,
-                      struct drm_display_mode *mode,
-                      const struct drm_format_info *format);
+                      struct drm_display_mode *mode);
+void bochs_hw_setformat(struct bochs_device *bochs,
+                        const struct drm_format_info *format);
 void bochs_hw_setbase(struct bochs_device *bochs,
                       int x, int y, u64 addr);
 int bochs_hw_load_edid(struct bochs_device *bochs);
@@ -141,15 +136,19 @@ int bochs_dumb_create(struct drm_file *file, struct drm_device *dev,
 int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
                            uint32_t handle, uint64_t *offset);
 
-int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr);
+int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag);
 int bochs_bo_unpin(struct bochs_bo *bo);
 
+int bochs_gem_prime_pin(struct drm_gem_object *obj);
+void bochs_gem_prime_unpin(struct drm_gem_object *obj);
+void *bochs_gem_prime_vmap(struct drm_gem_object *obj);
+void bochs_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
+int bochs_gem_prime_mmap(struct drm_gem_object *obj,
+                         struct vm_area_struct *vma);
+
 /* bochs_kms.c */
 int bochs_kms_init(struct bochs_device *bochs);
 void bochs_kms_fini(struct bochs_device *bochs);
 
 /* bochs_fbdev.c */
-int bochs_fbdev_init(struct bochs_device *bochs);
-void bochs_fbdev_fini(struct bochs_device *bochs);
-
 extern const struct drm_mode_config_funcs bochs_mode_funcs;
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index f3dd66ae990a..cea42ac64d7e 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -16,10 +16,6 @@ static int bochs_modeset = -1;
 module_param_named(modeset, bochs_modeset, int, 0444);
 MODULE_PARM_DESC(modeset, "enable/disable kernel modesetting");
 
-static bool enable_fbdev = true;
-module_param_named(fbdev, enable_fbdev, bool, 0444);
-MODULE_PARM_DESC(fbdev, "register fbdev device");
-
 /* ---------------------------------------------------------------------- */
 /* drm interface                                                          */
 
@@ -27,7 +23,6 @@ static void bochs_unload(struct drm_device *dev)
 {
         struct bochs_device *bochs = dev->dev_private;
 
-        bochs_fbdev_fini(bochs);
         bochs_kms_fini(bochs);
         bochs_mm_fini(bochs);
         bochs_hw_fini(dev);
@@ -58,9 +53,6 @@ static int bochs_load(struct drm_device *dev)
         if (ret)
                 goto err;
 
-        if (enable_fbdev)
-                bochs_fbdev_init(bochs);
-
         return 0;
 
 err:
@@ -81,7 +73,8 @@ static const struct file_operations bochs_fops = {
 };
 
 static struct drm_driver bochs_driver = {
-        .driver_features        = DRIVER_GEM | DRIVER_MODESET,
+        .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |
+                                  DRIVER_PRIME,
         .fops                   = &bochs_fops,
         .name                   = "bochs-drm",
         .desc                   = "bochs dispi vga interface (qemu stdvga)",
@@ -91,6 +84,14 @@ static struct drm_driver bochs_driver = {
         .gem_free_object_unlocked = bochs_gem_free_object,
         .dumb_create            = bochs_dumb_create,
         .dumb_map_offset        = bochs_dumb_mmap_offset,
+
+        .gem_prime_export = drm_gem_prime_export,
+        .gem_prime_import = drm_gem_prime_import,
+        .gem_prime_pin = bochs_gem_prime_pin,
+        .gem_prime_unpin = bochs_gem_prime_unpin,
+        .gem_prime_vmap = bochs_gem_prime_vmap,
+        .gem_prime_vunmap = bochs_gem_prime_vunmap,
+        .gem_prime_mmap = bochs_gem_prime_mmap,
 };
 
 /* ---------------------------------------------------------------------- */
@@ -101,27 +102,16 @@ static int bochs_pm_suspend(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
         struct drm_device *drm_dev = pci_get_drvdata(pdev);
-        struct bochs_device *bochs = drm_dev->dev_private;
-
-        drm_kms_helper_poll_disable(drm_dev);
-
-        drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 1);
 
-        return 0;
+        return drm_mode_config_helper_suspend(drm_dev);
 }
 
 static int bochs_pm_resume(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
         struct drm_device *drm_dev = pci_get_drvdata(pdev);
-        struct bochs_device *bochs = drm_dev->dev_private;
-
-        drm_helper_resume_force_mode(drm_dev);
 
-        drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 0);
-
-        drm_kms_helper_poll_enable(drm_dev);
-        return 0;
+        return drm_mode_config_helper_resume(drm_dev);
 }
 #endif
 
@@ -165,6 +155,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,
         if (ret)
                 goto err_unload;
 
+        drm_fbdev_generic_setup(dev, 32);
         return ret;
 
 err_unload:
diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c
deleted file mode 100644
index dd3c7df267da..000000000000
--- a/drivers/gpu/drm/bochs/bochs_fbdev.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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 "bochs.h"
-#include <drm/drm_gem_framebuffer_helper.h>
-
-/* ---------------------------------------------------------------------- */
-
-static int bochsfb_mmap(struct fb_info *info,
-                        struct vm_area_struct *vma)
-{
-        struct drm_fb_helper *fb_helper = info->par;
-        struct bochs_bo *bo = gem_to_bochs_bo(fb_helper->fb->obj[0]);
-
-        return ttm_fbdev_mmap(vma, &bo->bo);
-}
-
-static struct fb_ops bochsfb_ops = {
-        .owner = THIS_MODULE,
-        DRM_FB_HELPER_DEFAULT_OPS,
-        .fb_fillrect = drm_fb_helper_cfb_fillrect,
-        .fb_copyarea = drm_fb_helper_cfb_copyarea,
-        .fb_imageblit = drm_fb_helper_cfb_imageblit,
-        .fb_mmap = bochsfb_mmap,
-};
-
-static int bochsfb_create_object(struct bochs_device *bochs,
-                                 const struct drm_mode_fb_cmd2 *mode_cmd,
-                                 struct drm_gem_object **gobj_p)
-{
-        struct drm_device *dev = bochs->dev;
-        struct drm_gem_object *gobj;
-        u32 size;
-        int ret = 0;
-
-        size = mode_cmd->pitches[0] * mode_cmd->height;
-        ret = bochs_gem_create(dev, size, true, &gobj);
-        if (ret)
-                return ret;
-
-        *gobj_p = gobj;
-        return ret;
-}
-
-static int bochsfb_create(struct drm_fb_helper *helper,
-                          struct drm_fb_helper_surface_size *sizes)
-{
-        struct bochs_device *bochs =
-                container_of(helper, struct bochs_device, fb.helper);
-        struct fb_info *info;
-        struct drm_framebuffer *fb;
-        struct drm_mode_fb_cmd2 mode_cmd;
-        struct drm_gem_object *gobj = NULL;
-        struct bochs_bo *bo = NULL;
-        int size, ret;
-
-        if (sizes->surface_bpp != 32)
-                return -EINVAL;
-
-        mode_cmd.width = sizes->surface_width;
-        mode_cmd.height = sizes->surface_height;
-        mode_cmd.pitches[0] = sizes->surface_width * 4;
-        mode_cmd.pixel_format = DRM_FORMAT_HOST_XRGB8888;
-        size = mode_cmd.pitches[0] * mode_cmd.height;
-
-        /* alloc, pin & map bo */
-        ret = bochsfb_create_object(bochs, &mode_cmd, &gobj);
-        if (ret) {
-                DRM_ERROR("failed to create fbcon backing object %d\n", ret);
-                return ret;
-        }
-
-        bo = gem_to_bochs_bo(gobj);
-
-        ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-        if (ret)
-                return ret;
-
-        ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-        if (ret) {
-                DRM_ERROR("failed to pin fbcon\n");
-                ttm_bo_unreserve(&bo->bo);
-                return ret;
-        }
-
-        ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages,
-                          &bo->kmap);
-        if (ret) {
-                DRM_ERROR("failed to kmap fbcon\n");
-                ttm_bo_unreserve(&bo->bo);
-                return ret;
-        }
-
-        ttm_bo_unreserve(&bo->bo);
-
-        /* init fb device */
-        info = drm_fb_helper_alloc_fbi(helper);
-        if (IS_ERR(info)) {
-                DRM_ERROR("Failed to allocate fbi: %ld\n", PTR_ERR(info));
-                return PTR_ERR(info);
-        }
-
-        info->par = &bochs->fb.helper;
-
-        fb = drm_gem_fbdev_fb_create(bochs->dev, sizes, 0, gobj, NULL);
-        if (IS_ERR(fb)) {
-                DRM_ERROR("Failed to create framebuffer: %ld\n", PTR_ERR(fb));
-                return PTR_ERR(fb);
-        }
-
-        /* setup helper */
-        bochs->fb.helper.fb = fb;
-
-        strcpy(info->fix.id, "bochsdrmfb");
-
-        info->fbops = &bochsfb_ops;
-
-        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
-        drm_fb_helper_fill_var(info, &bochs->fb.helper, sizes->fb_width,
-                               sizes->fb_height);
-
-        info->screen_base = bo->kmap.virtual;
-        info->screen_size = size;
-
-        drm_vma_offset_remove(&bo->bo.bdev->vma_manager, &bo->bo.vma_node);
-        info->fix.smem_start = 0;
-        info->fix.smem_len = size;
-        return 0;
-}
-
-static const struct drm_fb_helper_funcs bochs_fb_helper_funcs = {
-        .fb_probe = bochsfb_create,
-};
-
-static struct drm_framebuffer *
-bochs_gem_fb_create(struct drm_device *dev, struct drm_file *file,
-                    const struct drm_mode_fb_cmd2 *mode_cmd)
-{
-        if (mode_cmd->pixel_format != DRM_FORMAT_XRGB8888 &&
-            mode_cmd->pixel_format != DRM_FORMAT_BGRX8888)
-                return ERR_PTR(-EINVAL);
-
-        return drm_gem_fb_create(dev, file, mode_cmd);
-}
-
-const struct drm_mode_config_funcs bochs_mode_funcs = {
-        .fb_create = bochs_gem_fb_create,
-};
-
-int bochs_fbdev_init(struct bochs_device *bochs)
-{
-        return drm_fb_helper_fbdev_setup(bochs->dev, &bochs->fb.helper,
-                                         &bochs_fb_helper_funcs, 32, 1);
-}
-
-void bochs_fbdev_fini(struct bochs_device *bochs)
-{
-        drm_fb_helper_fbdev_teardown(bochs->dev);
-}
diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index d0b4e1cee83e..3e04b2f0ec08 100644
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.c
@@ -204,8 +204,7 @@ void bochs_hw_fini(struct drm_device *dev)
 }
 
 void bochs_hw_setmode(struct bochs_device *bochs,
-                      struct drm_display_mode *mode,
-                      const struct drm_format_info *format)
+                      struct drm_display_mode *mode)
 {
         bochs->xres = mode->hdisplay;
         bochs->yres = mode->vdisplay;
@@ -213,12 +212,8 @@ void bochs_hw_setmode(struct bochs_device *bochs,
         bochs->stride = mode->hdisplay * (bochs->bpp / 8);
         bochs->yres_virtual = bochs->fb_size / bochs->stride;
 
-        DRM_DEBUG_DRIVER("%dx%d @ %d bpp, format %c%c%c%c, vy %d\n",
+        DRM_DEBUG_DRIVER("%dx%d @ %d bpp, vy %d\n",
                          bochs->xres, bochs->yres, bochs->bpp,
-                         (format->format >>  0) & 0xff,
-                         (format->format >>  8) & 0xff,
-                         (format->format >> 16) & 0xff,
-                         (format->format >> 24) & 0xff,
                          bochs->yres_virtual);
 
         bochs_vga_writeb(bochs, 0x3c0, 0x20); /* unblank */
@@ -236,6 +231,16 @@ void bochs_hw_setmode(struct bochs_device *bochs,
 
         bochs_dispi_write(bochs, VBE_DISPI_INDEX_ENABLE,
                           VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
+}
+
+void bochs_hw_setformat(struct bochs_device *bochs,
+                        const struct drm_format_info *format)
+{
+        DRM_DEBUG_DRIVER("format %c%c%c%c\n",
+                         (format->format >>  0) & 0xff,
+                         (format->format >>  8) & 0xff,
+                         (format->format >> 16) & 0xff,
+                         (format->format >> 24) & 0xff);
 
         switch (format->format) {
         case DRM_FORMAT_XRGB8888:
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index f87c284dd93d..e9d5dbc34676 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -6,7 +6,10 @@
  */
 
 #include "bochs.h"
+#include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_atomic_uapi.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 
 static int defx = 1024;
 static int defy = 768;
@@ -18,115 +21,51 @@ MODULE_PARM_DESC(defy, "default y resolution");
 
 /* ---------------------------------------------------------------------- */
 
-static void bochs_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-        case DRM_MODE_DPMS_OFF:
-        default:
-                return;
-        }
-}
-
-static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
-                                    struct drm_framebuffer *old_fb)
-{
-        struct bochs_device *bochs =
-                container_of(crtc, struct bochs_device, crtc);
-        struct bochs_bo *bo;
-        u64 gpu_addr = 0;
-        int ret;
-
-        if (old_fb) {
-                bo = gem_to_bochs_bo(old_fb->obj[0]);
-                ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-                if (ret) {
-                        DRM_ERROR("failed to reserve old_fb bo\n");
-                } else {
-                        bochs_bo_unpin(bo);
-                        ttm_bo_unreserve(&bo->bo);
-                }
-        }
-
-        if (WARN_ON(crtc->primary->fb == NULL))
-                return -EINVAL;
-
-        bo = gem_to_bochs_bo(crtc->primary->fb->obj[0]);
-        ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-        if (ret)
-                return ret;
-
-        ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);
-        if (ret) {
-                ttm_bo_unreserve(&bo->bo);
-                return ret;
-        }
-
-        ttm_bo_unreserve(&bo->bo);
-        bochs_hw_setbase(bochs, x, y, gpu_addr);
-        return 0;
-}
-
-static int bochs_crtc_mode_set(struct drm_crtc *crtc,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode,
-                               int x, int y, struct drm_framebuffer *old_fb)
+static void bochs_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
         struct bochs_device *bochs =
                 container_of(crtc, struct bochs_device, crtc);
 
-        if (WARN_ON(crtc->primary->fb == NULL))
-                return -EINVAL;
-
-        bochs_hw_setmode(bochs, mode, crtc->primary->fb->format);
-        bochs_crtc_mode_set_base(crtc, x, y, old_fb);
-        return 0;
+        bochs_hw_setmode(bochs, &crtc->mode);
 }
 
-static void bochs_crtc_prepare(struct drm_crtc *crtc)
+static void bochs_crtc_atomic_enable(struct drm_crtc *crtc,
+                                     struct drm_crtc_state *old_crtc_state)
 {
 }
 
-static void bochs_crtc_commit(struct drm_crtc *crtc)
+static void bochs_crtc_atomic_flush(struct drm_crtc *crtc,
+                                    struct drm_crtc_state *old_crtc_state)
 {
-}
+        struct drm_device *dev = crtc->dev;
+        struct drm_pending_vblank_event *event;
 
-static int bochs_crtc_page_flip(struct drm_crtc *crtc,
-                                struct drm_framebuffer *fb,
-                                struct drm_pending_vblank_event *event,
-                                uint32_t page_flip_flags,
-                                struct drm_modeset_acquire_ctx *ctx)
-{
-        struct bochs_device *bochs =
-                container_of(crtc, struct bochs_device, crtc);
-        struct drm_framebuffer *old_fb = crtc->primary->fb;
-        unsigned long irqflags;
+        if (crtc->state && crtc->state->event) {
+                unsigned long irqflags;
 
-        crtc->primary->fb = fb;
-        bochs_crtc_mode_set_base(crtc, 0, 0, old_fb);
-        if (event) {
-                spin_lock_irqsave(&bochs->dev->event_lock, irqflags);
+                spin_lock_irqsave(&dev->event_lock, irqflags);
+                event = crtc->state->event;
+                crtc->state->event = NULL;
                 drm_crtc_send_vblank_event(crtc, event);
-                spin_unlock_irqrestore(&bochs->dev->event_lock, irqflags);
+                spin_unlock_irqrestore(&dev->event_lock, irqflags);
         }
-        return 0;
 }
 
+
 /* These provide the minimum set of functions required to handle a CRTC */
 static const struct drm_crtc_funcs bochs_crtc_funcs = {
-        .set_config = drm_crtc_helper_set_config,
+        .set_config = drm_atomic_helper_set_config,
         .destroy = drm_crtc_cleanup,
-        .page_flip = bochs_crtc_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,
 };
 
 static const struct drm_crtc_helper_funcs bochs_helper_funcs = {
-        .dpms = bochs_crtc_dpms,
-        .mode_set = bochs_crtc_mode_set,
-        .mode_set_base = bochs_crtc_mode_set_base,
-        .prepare = bochs_crtc_prepare,
-        .commit = bochs_crtc_commit,
+        .mode_set_nofb = bochs_crtc_mode_set_nofb,
+        .atomic_enable = bochs_crtc_atomic_enable,
+        .atomic_flush = bochs_crtc_atomic_flush,
 };
 
 static const uint32_t bochs_formats[] = {
@@ -134,6 +73,59 @@ static const uint32_t bochs_formats[] = {
         DRM_FORMAT_BGRX8888,
 };
 
+static void bochs_plane_atomic_update(struct drm_plane *plane,
+                                      struct drm_plane_state *old_state)
+{
+        struct bochs_device *bochs = plane->dev->dev_private;
+        struct bochs_bo *bo;
+
+        if (!plane->state->fb)
+                return;
+        bo = gem_to_bochs_bo(plane->state->fb->obj[0]);
+        bochs_hw_setbase(bochs,
+                         plane->state->crtc_x,
+                         plane->state->crtc_y,
+                         bo->bo.offset);
+        bochs_hw_setformat(bochs, plane->state->fb->format);
+}
+
+static int bochs_plane_prepare_fb(struct drm_plane *plane,
+                                struct drm_plane_state *new_state)
+{
+        struct bochs_bo *bo;
+
+        if (!new_state->fb)
+                return 0;
+        bo = gem_to_bochs_bo(new_state->fb->obj[0]);
+        return bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
+}
+
+static void bochs_plane_cleanup_fb(struct drm_plane *plane,
+                                   struct drm_plane_state *old_state)
+{
+        struct bochs_bo *bo;
+
+        if (!old_state->fb)
+                return;
+        bo = gem_to_bochs_bo(old_state->fb->obj[0]);
+        bochs_bo_unpin(bo);
+}
+
+static const struct drm_plane_helper_funcs bochs_plane_helper_funcs = {
+        .atomic_update = bochs_plane_atomic_update,
+        .prepare_fb = bochs_plane_prepare_fb,
+        .cleanup_fb = bochs_plane_cleanup_fb,
+};
+
+static const struct drm_plane_funcs bochs_plane_funcs = {
+       .update_plane   = drm_atomic_helper_update_plane,
+       .disable_plane  = drm_atomic_helper_disable_plane,
+       .destroy        = drm_primary_helper_destroy,
+       .reset          = drm_atomic_helper_plane_reset,
+       .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+       .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+};
+
 static struct drm_plane *bochs_primary_plane(struct drm_device *dev)
 {
         struct drm_plane *primary;
@@ -146,16 +138,17 @@ static struct drm_plane *bochs_primary_plane(struct drm_device *dev)
         }
 
         ret = drm_universal_plane_init(dev, primary, 0,
-                                       &drm_primary_helper_funcs,
+                                       &bochs_plane_funcs,
                                        bochs_formats,
                                        ARRAY_SIZE(bochs_formats),
                                        NULL,
                                        DRM_PLANE_TYPE_PRIMARY, NULL);
         if (ret) {
                 kfree(primary);
-                primary = NULL;
+                return NULL;
         }
 
+        drm_plane_helper_add(primary, &bochs_plane_helper_funcs);
         return primary;
 }
 
@@ -170,31 +163,6 @@ static void bochs_crtc_init(struct drm_device *dev)
         drm_crtc_helper_add(crtc, &bochs_helper_funcs);
 }
 
-static void bochs_encoder_mode_set(struct drm_encoder *encoder,
-                                   struct drm_display_mode *mode,
-                                   struct drm_display_mode *adjusted_mode)
-{
-}
-
-static void bochs_encoder_dpms(struct drm_encoder *encoder, int state)
-{
-}
-
-static void bochs_encoder_prepare(struct drm_encoder *encoder)
-{
-}
-
-static void bochs_encoder_commit(struct drm_encoder *encoder)
-{
-}
-
-static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = {
-        .dpms = bochs_encoder_dpms,
-        .mode_set = bochs_encoder_mode_set,
-        .prepare = bochs_encoder_prepare,
-        .commit = bochs_encoder_commit,
-};
-
 static const struct drm_encoder_funcs bochs_encoder_encoder_funcs = {
         .destroy = drm_encoder_cleanup,
 };
@@ -207,7 +175,6 @@ static void bochs_encoder_init(struct drm_device *dev)
         encoder->possible_crtcs = 0x1;
         drm_encoder_init(dev, encoder, &bochs_encoder_encoder_funcs,
                          DRM_MODE_ENCODER_DAC, NULL);
-        drm_encoder_helper_add(encoder, &bochs_encoder_helper_funcs);
 }
 
 
@@ -266,6 +233,9 @@ static const struct drm_connector_funcs bochs_connector_connector_funcs = {
         .dpms = drm_helper_connector_dpms,
         .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 void bochs_connector_init(struct drm_device *dev)
@@ -287,6 +257,22 @@ static void bochs_connector_init(struct drm_device *dev)
         }
 }
 
+static struct drm_framebuffer *
+bochs_gem_fb_create(struct drm_device *dev, struct drm_file *file,
+                    const struct drm_mode_fb_cmd2 *mode_cmd)
+{
+        if (mode_cmd->pixel_format != DRM_FORMAT_XRGB8888 &&
+            mode_cmd->pixel_format != DRM_FORMAT_BGRX8888)
+                return ERR_PTR(-EINVAL);
+
+        return drm_gem_fb_create(dev, file, mode_cmd);
+}
+
+const struct drm_mode_config_funcs bochs_mode_funcs = {
+        .fb_create = bochs_gem_fb_create,
+        .atomic_check = drm_atomic_helper_check,
+        .atomic_commit = drm_atomic_helper_commit,
+};
 
 int bochs_kms_init(struct bochs_device *bochs)
 {
@@ -309,6 +295,8 @@ int bochs_kms_init(struct bochs_device *bochs)
         drm_connector_attach_encoder(&bochs->connector,
                                           &bochs->encoder);
 
+        drm_mode_config_reset(bochs->dev);
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index 0980411e41bf..641a33f134ee 100644
--- a/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/drivers/gpu/drm/bochs/bochs_mm.c
@@ -210,33 +210,28 @@ static void bochs_ttm_placement(struct bochs_bo *bo, int domain)
         bo->placement.num_busy_placement = c;
 }
 
-static inline u64 bochs_bo_gpu_offset(struct bochs_bo *bo)
-{
-        return bo->bo.offset;
-}
-
-int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)
+int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag)
 {
         struct ttm_operation_ctx ctx = { false, false };
         int i, ret;
 
         if (bo->pin_count) {
                 bo->pin_count++;
-                if (gpu_addr)
-                        *gpu_addr = bochs_bo_gpu_offset(bo);
                 return 0;
         }
 
         bochs_ttm_placement(bo, pl_flag);
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
+        ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
+        if (ret)
+                return ret;
         ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
+        ttm_bo_unreserve(&bo->bo);
         if (ret)
                 return ret;
 
         bo->pin_count = 1;
-        if (gpu_addr)
-                *gpu_addr = bochs_bo_gpu_offset(bo);
         return 0;
 }
 
@@ -256,7 +251,11 @@ int bochs_bo_unpin(struct bochs_bo *bo)
 
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
+        ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
+        if (ret)
+                return ret;
         ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
+        ttm_bo_unreserve(&bo->bo);
         if (ret)
                 return ret;
 
@@ -396,3 +395,52 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
         drm_gem_object_put_unlocked(obj);
         return 0;
 }
+
+/* ---------------------------------------------------------------------- */
+
+int bochs_gem_prime_pin(struct drm_gem_object *obj)
+{
+        struct bochs_bo *bo = gem_to_bochs_bo(obj);
+
+        return bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
+}
+
+void bochs_gem_prime_unpin(struct drm_gem_object *obj)
+{
+        struct bochs_bo *bo = gem_to_bochs_bo(obj);
+
+        bochs_bo_unpin(bo);
+}
+
+void *bochs_gem_prime_vmap(struct drm_gem_object *obj)
+{
+        struct bochs_bo *bo = gem_to_bochs_bo(obj);
+        bool is_iomem;
+        int ret;
+
+        ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
+        if (ret)
+                return NULL;
+        ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
+        if (ret) {
+                bochs_bo_unpin(bo);
+                return NULL;
+        }
+        return ttm_kmap_obj_virtual(&bo->kmap, &is_iomem);
+}
+
+void bochs_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
+{
+        struct bochs_bo *bo = gem_to_bochs_bo(obj);
+
+        ttm_bo_kunmap(&bo->kmap);
+        bochs_bo_unpin(bo);
+}
+
+int bochs_gem_prime_mmap(struct drm_gem_object *obj,
+                         struct vm_area_struct *vma)
+{
+        struct bochs_bo *bo = gem_to_bochs_bo(obj);
+
+        return ttm_fbdev_mmap(vma, &bo->bo);
+}
diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index 705620e9f505..4cf7bc17ae14 100644
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -1094,8 +1094,9 @@ static void anx78xx_bridge_mode_set(struct drm_bridge *bridge,
 
         mutex_lock(&anx78xx->lock);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode,
-                                                       false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                       &anx78xx->connector,
+                                                       adjusted_mode);
         if (err) {
                 DRM_ERROR("Failed to setup AVI infoframe: %d\n", err);
                 goto unlock;
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 7cbaba213ef6..37baa79e95c3 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -134,8 +134,8 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = {
 };
 
 /**
- * drm_panel_bridge_add - Creates a drm_bridge and drm_connector that
- * just calls the appropriate functions from drm_panel.
+ * drm_panel_bridge_add - Creates a &drm_bridge and &drm_connector that
+ * just calls the appropriate functions from &drm_panel.
  *
  * @panel: The drm_panel being wrapped.  Must be non-NULL.
  * @connector_type: The DRM_MODE_CONNECTOR_* for the connector to be
@@ -149,9 +149,12 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = {
  * passed to drm_bridge_attach().  The drm_panel_prepare() and related
  * functions can be dropped from the encoder driver (they're now
  * called by the KMS helpers before calling into the encoder), along
- * with connector creation.  When done with the bridge,
- * drm_bridge_detach() should be called as normal, then
+ * with connector creation.  When done with the bridge (after
+ * drm_mode_config_cleanup() if the bridge has already been attached), then
  * drm_panel_bridge_remove() to free it.
+ *
+ * See devm_drm_panel_bridge_add() for an automatically manged version of this
+ * function.
  */
 struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel,
                                         u32 connector_type)
@@ -210,6 +213,17 @@ static void devm_drm_panel_bridge_release(struct device *dev, void *res)
         drm_panel_bridge_remove(*bridge);
 }
 
+/**
+ * devm_drm_panel_bridge_add - Creates a managed &drm_bridge and &drm_connector
+ * that just calls the appropriate functions from &drm_panel.
+ * @dev: device to tie the bridge lifetime to
+ * @panel: The drm_panel being wrapped.  Must be non-NULL.
+ * @connector_type: The DRM_MODE_CONNECTOR_* for the connector to be
+ * created.
+ *
+ * This is the managed version of drm_panel_bridge_add() which automatically
+ * calls drm_panel_bridge_remove() when @dev is unbound.
+ */
 struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev,
                                              struct drm_panel *panel,
                                              u32 connector_type)
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index a0b3a568dd9c..a5d58f7035c1 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -258,7 +258,8 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge,
         if (ret)
                 return;
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                       &sii902x->connector, adj);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return;
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index a6e8f4591e63..0cc293a6ac24 100644
--- a/drivers/gpu/drm/bridge/sil-sii8620.c
+++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -1104,8 +1104,7 @@ static void sii8620_set_infoframes(struct sii8620 *ctx,
         int ret;
 
         ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,
-                                                       mode,
-                                                       true);
+                                                       NULL, mode);
         if (ctx->use_packed_pixel)
                 frm.avi.colorspace = HDMI_COLORSPACE_YUV422;
 
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
index 2228689d9a5e..5cbb71a866d5 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
@@ -5,6 +5,10 @@
  * Copyright (c) 2017 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  */
+
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
+
 #include <drm/bridge/dw_hdmi.h>
 
 #include <sound/hdmi-codec.h>
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 4fed3eda6ded..129f464cbeb1 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1344,7 +1344,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
         u8 val;
 
         /* Initialise info frame from DRM mode */
-        drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                 &hdmi->connector, mode);
 
         if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format))
                 frame.colorspace = HDMI_COLORSPACE_YUV444;
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
index 4dd499c7d1ba..39df62acac69 100644
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
@@ -10,6 +10,7 @@
  */
 #include <linux/module.h>
 #include <drm/drmP.h>
+#include <drm/drm_util.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 
@@ -256,6 +257,8 @@ static int cirrus_fbdev_destroy(struct drm_device *dev,
 {
         struct drm_framebuffer *gfb = gfbdev->gfb;
 
+        drm_helper_force_disable_all(dev);
+
         drm_fb_helper_unregister_fbi(&gfbdev->helper);
 
         vfree(gfbdev->sysram);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 1593dd6cdfb7..7dabbaf033a1 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -93,15 +93,6 @@ struct drm_crtc *drm_crtc_from_index(struct drm_device *dev, int idx)
 }
 EXPORT_SYMBOL(drm_crtc_from_index);
 
-/**
- * drm_crtc_force_disable - Forcibly turn off a CRTC
- * @crtc: CRTC to turn off
- *
- * Note: This should only be used by non-atomic legacy drivers.
- *
- * Returns:
- * Zero on success, error code on failure.
- */
 int drm_crtc_force_disable(struct drm_crtc *crtc)
 {
         struct drm_mode_set set = {
@@ -112,38 +103,6 @@ int drm_crtc_force_disable(struct drm_crtc *crtc)
 
         return drm_mode_set_config_internal(&set);
 }
-EXPORT_SYMBOL(drm_crtc_force_disable);
-
-/**
- * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs
- * @dev: DRM device whose CRTCs to turn off
- *
- * Drivers may want to call this on unload to ensure that all displays are
- * unlit and the GPU is in a consistent, low power state. Takes modeset locks.
- *
- * Note: This should only be used by non-atomic legacy drivers. For an atomic
- * version look at drm_atomic_helper_shutdown().
- *
- * Returns:
- * Zero on success, error code on failure.
- */
-int drm_crtc_force_disable_all(struct drm_device *dev)
-{
-        struct drm_crtc *crtc;
-        int ret = 0;
-
-        drm_modeset_lock_all(dev);
-        drm_for_each_crtc(crtc, dev)
-                if (crtc->enabled) {
-                        ret = drm_crtc_force_disable(crtc);
-                        if (ret)
-                                goto out;
-                }
-out:
-        drm_modeset_unlock_all(dev);
-        return ret;
-}
-EXPORT_SYMBOL(drm_crtc_force_disable_all);
 
 static unsigned int drm_num_crtcs(struct drm_device *dev)
 {
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index a3c81850e755..747661f63fbb 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -93,6 +93,8 @@ bool drm_helper_encoder_in_use(struct drm_encoder *encoder)
         struct drm_connector_list_iter conn_iter;
         struct drm_device *dev = encoder->dev;
 
+        WARN_ON(drm_drv_uses_atomic_modeset(dev));
+
         /*
          * We can expect this mutex to be locked if we are not panicking.
          * Locking is currently fubar in the panic handler.
@@ -131,6 +133,8 @@ bool drm_helper_crtc_in_use(struct drm_crtc *crtc)
         struct drm_encoder *encoder;
         struct drm_device *dev = crtc->dev;
 
+        WARN_ON(drm_drv_uses_atomic_modeset(dev));
+
         /*
          * We can expect this mutex to be locked if we are not panicking.
          * Locking is currently fubar in the panic handler.
@@ -212,8 +216,7 @@ 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");
+        WARN_ON(drm_drv_uses_atomic_modeset(dev));
 
         drm_modeset_lock_all(dev);
         __drm_helper_disable_unused_functions(dev);
@@ -281,6 +284,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
         struct drm_encoder *encoder;
         bool ret = true;
 
+        WARN_ON(drm_drv_uses_atomic_modeset(dev));
+
         drm_warn_on_modeset_not_all_locked(dev);
 
         saved_enabled = crtc->enabled;
@@ -386,9 +391,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                 if (!encoder_funcs)
                         continue;
 
-                DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n",
-                        encoder->base.id, encoder->name,
-                        mode->base.id, mode->name);
+                DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%s]\n",
+                        encoder->base.id, encoder->name, mode->name);
                 if (encoder_funcs->mode_set)
                         encoder_funcs->mode_set(encoder, mode, adjusted_mode);
 
@@ -540,6 +544,9 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set,
 
         crtc_funcs = set->crtc->helper_private;
 
+        dev = set->crtc->dev;
+        WARN_ON(drm_drv_uses_atomic_modeset(dev));
+
         if (!set->mode)
                 set->fb = NULL;
 
@@ -555,8 +562,6 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set,
                 return 0;
         }
 
-        dev = set->crtc->dev;
-
         drm_warn_on_modeset_not_all_locked(dev);
 
         /*
@@ -875,6 +880,8 @@ int drm_helper_connector_dpms(struct drm_connector *connector, int mode)
         struct drm_crtc *crtc = encoder ? encoder->crtc : NULL;
         int old_dpms, encoder_dpms = DRM_MODE_DPMS_OFF;
 
+        WARN_ON(drm_drv_uses_atomic_modeset(connector->dev));
+
         if (mode == connector->dpms)
                 return 0;
 
@@ -946,6 +953,8 @@ void drm_helper_resume_force_mode(struct drm_device *dev)
         int encoder_dpms;
         bool ret;
 
+        WARN_ON(drm_drv_uses_atomic_modeset(dev));
+
         drm_modeset_lock_all(dev);
         drm_for_each_crtc(crtc, dev) {
 
@@ -984,3 +993,38 @@ void drm_helper_resume_force_mode(struct drm_device *dev)
         drm_modeset_unlock_all(dev);
 }
 EXPORT_SYMBOL(drm_helper_resume_force_mode);
+
+/**
+ * drm_helper_force_disable_all - Forcibly turn off all enabled CRTCs
+ * @dev: DRM device whose CRTCs to turn off
+ *
+ * Drivers may want to call this on unload to ensure that all displays are
+ * unlit and the GPU is in a consistent, low power state. Takes modeset locks.
+ *
+ * Note: This should only be used by non-atomic legacy drivers. For an atomic
+ * version look at drm_atomic_helper_shutdown().
+ *
+ * Returns:
+ * Zero on success, error code on failure.
+ */
+int drm_helper_force_disable_all(struct drm_device *dev)
+{
+        struct drm_crtc *crtc;
+        int ret = 0;
+
+        drm_modeset_lock_all(dev);
+        drm_for_each_crtc(crtc, dev)
+                if (crtc->enabled) {
+                        struct drm_mode_set set = {
+                                .crtc = crtc,
+                        };
+
+                        ret = drm_mode_set_config_internal(&set);
+                        if (ret)
+                                goto out;
+                }
+out:
+        drm_modeset_unlock_all(dev);
+        return ret;
+}
+EXPORT_SYMBOL(drm_helper_force_disable_all);
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 86893448f486..216f2a9ee3d4 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -50,6 +50,7 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc,
                             const struct drm_framebuffer *fb);
 int drm_crtc_register_all(struct drm_device *dev);
 void drm_crtc_unregister_all(struct drm_device *dev);
+int drm_crtc_force_disable(struct drm_crtc *crtc);
 
 struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc);
 
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 2d6c491a0542..f51a116543f7 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -154,6 +154,7 @@ u8 drm_dp_link_rate_to_bw_code(int link_rate)
         default:
                 WARN(1, "unknown DP link rate %d, using %x\n", link_rate,
                      DP_LINK_BW_1_62);
+                /* fall through */
         case 162000:
                 return DP_LINK_BW_1_62;
         case 270000:
@@ -171,6 +172,7 @@ int drm_dp_bw_code_to_link_rate(u8 link_bw)
         switch (link_bw) {
         default:
                 WARN(1, "unknown DP link BW code %x, using 162000\n", link_bw);
+                /* fall through */
         case DP_LINK_BW_1_62:
                 return 162000;
         case DP_LINK_BW_2_7:
@@ -552,6 +554,7 @@ int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
                 case DP_DS_16BPC:
                         return 16;
                 }
+                /* fall through */
         default:
                 return 0;
         }
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 2ab16c9e6243..196ebba8af5f 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -46,7 +46,7 @@ static bool dump_dp_payload_table(struct drm_dp_mst_topology_mgr *mgr,
                                   char *buf);
 static int test_calc_pbn_mode(void);
 
-static void drm_dp_put_port(struct drm_dp_mst_port *port);
+static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port);
 
 static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,
                                      int id,
@@ -850,46 +850,212 @@ static struct drm_dp_mst_branch *drm_dp_add_mst_branch_device(u8 lct, u8 *rad)
         if (lct > 1)
                 memcpy(mstb->rad, rad, lct / 2);
         INIT_LIST_HEAD(&mstb->ports);
-        kref_init(&mstb->kref);
+        kref_init(&mstb->topology_kref);
+        kref_init(&mstb->malloc_kref);
         return mstb;
 }
 
-static void drm_dp_free_mst_port(struct kref *kref);
-
 static void drm_dp_free_mst_branch_device(struct kref *kref)
 {
-        struct drm_dp_mst_branch *mstb = container_of(kref, struct drm_dp_mst_branch, kref);
-        if (mstb->port_parent) {
-                if (list_empty(&mstb->port_parent->next))
-                        kref_put(&mstb->port_parent->kref, drm_dp_free_mst_port);
-        }
+        struct drm_dp_mst_branch *mstb =
+                container_of(kref, struct drm_dp_mst_branch, malloc_kref);
+
+        if (mstb->port_parent)
+                drm_dp_mst_put_port_malloc(mstb->port_parent);
+
         kfree(mstb);
 }
 
+/**
+ * DOC: Branch device and port refcounting
+ *
+ * Topology refcount overview
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * The refcounting schemes for &struct drm_dp_mst_branch and &struct
+ * drm_dp_mst_port are somewhat unusual. Both ports and branch devices have
+ * two different kinds of refcounts: topology refcounts, and malloc refcounts.
+ *
+ * Topology refcounts are not exposed to drivers, and are handled internally
+ * by the DP MST helpers. The helpers use them in order to prevent the
+ * in-memory topology state from being changed in the middle of critical
+ * operations like changing the internal state of payload allocations. This
+ * means each branch and port will be considered to be connected to the rest
+ * of the topology until it's topology refcount reaches zero. Additionally,
+ * for ports this means that their associated &struct drm_connector will stay
+ * registered with userspace until the port's refcount reaches 0.
+ *
+ * Malloc refcount overview
+ * ~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * Malloc references are used to keep a &struct drm_dp_mst_port or &struct
+ * drm_dp_mst_branch allocated even after all of its topology references have
+ * been dropped, so that the driver or MST helpers can safely access each
+ * branch's last known state before it was disconnected from the topology.
+ * When the malloc refcount of a port or branch reaches 0, the memory
+ * allocation containing the &struct drm_dp_mst_branch or &struct
+ * drm_dp_mst_port respectively will be freed.
+ *
+ * For &struct drm_dp_mst_branch, malloc refcounts are not currently exposed
+ * to drivers. As of writing this documentation, there are no drivers that
+ * have a usecase for accessing &struct drm_dp_mst_branch outside of the MST
+ * helpers. Exposing this API to drivers in a race-free manner would take more
+ * tweaking of the refcounting scheme, however patches are welcome provided
+ * there is a legitimate driver usecase for this.
+ *
+ * Refcount relationships in a topology
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * Let's take a look at why the relationship between topology and malloc
+ * refcounts is designed the way it is.
+ *
+ * .. kernel-figure:: dp-mst/topology-figure-1.dot
+ *
+ *    An example of topology and malloc refs in a DP MST topology with two
+ *    active payloads. Topology refcount increments are indicated by solid
+ *    lines, and malloc refcount increments are indicated by dashed lines.
+ *    Each starts from the branch which incremented the refcount, and ends at
+ *    the branch to which the refcount belongs to, i.e. the arrow points the
+ *    same way as the C pointers used to reference a structure.
+ *
+ * As you can see in the above figure, every branch increments the topology
+ * refcount of it's children, and increments the malloc refcount of it's
+ * parent. Additionally, every payload increments the malloc refcount of it's
+ * assigned port by 1.
+ *
+ * So, what would happen if MSTB #3 from the above figure was unplugged from
+ * the system, but the driver hadn't yet removed payload #2 from port #3? The
+ * topology would start to look like the figure below.
+ *
+ * .. kernel-figure:: dp-mst/topology-figure-2.dot
+ *
+ *    Ports and branch devices which have been released from memory are
+ *    colored grey, and references which have been removed are colored red.
+ *
+ * Whenever a port or branch device's topology refcount reaches zero, it will
+ * decrement the topology refcounts of all its children, the malloc refcount
+ * of its parent, and finally its own malloc refcount. For MSTB #4 and port
+ * #4, this means they both have been disconnected from the topology and freed
+ * from memory. But, because payload #2 is still holding a reference to port
+ * #3, port #3 is removed from the topology but it's &struct drm_dp_mst_port
+ * is still accessible from memory. This also means port #3 has not yet
+ * decremented the malloc refcount of MSTB #3, so it's &struct
+ * drm_dp_mst_branch will also stay allocated in memory until port #3's
+ * malloc refcount reaches 0.
+ *
+ * This relationship is necessary because in order to release payload #2, we
+ * need to be able to figure out the last relative of port #3 that's still
+ * connected to the topology. In this case, we would travel up the topology as
+ * shown below.
+ *
+ * .. kernel-figure:: dp-mst/topology-figure-3.dot
+ *
+ * And finally, remove payload #2 by communicating with port #2 through
+ * sideband transactions.
+ */
+
+/**
+ * drm_dp_mst_get_mstb_malloc() - Increment the malloc refcount of a branch
+ * device
+ * @mstb: The &struct drm_dp_mst_branch to increment the malloc refcount of
+ *
+ * Increments &drm_dp_mst_branch.malloc_kref. When
+ * &drm_dp_mst_branch.malloc_kref reaches 0, the memory allocation for @mstb
+ * will be released and @mstb may no longer be used.
+ *
+ * See also: drm_dp_mst_put_mstb_malloc()
+ */
+static void
+drm_dp_mst_get_mstb_malloc(struct drm_dp_mst_branch *mstb)
+{
+        kref_get(&mstb->malloc_kref);
+        DRM_DEBUG("mstb %p (%d)\n", mstb, kref_read(&mstb->malloc_kref));
+}
+
+/**
+ * drm_dp_mst_put_mstb_malloc() - Decrement the malloc refcount of a branch
+ * device
+ * @mstb: The &struct drm_dp_mst_branch to decrement the malloc refcount of
+ *
+ * Decrements &drm_dp_mst_branch.malloc_kref. When
+ * &drm_dp_mst_branch.malloc_kref reaches 0, the memory allocation for @mstb
+ * will be released and @mstb may no longer be used.
+ *
+ * See also: drm_dp_mst_get_mstb_malloc()
+ */
+static void
+drm_dp_mst_put_mstb_malloc(struct drm_dp_mst_branch *mstb)
+{
+        DRM_DEBUG("mstb %p (%d)\n", mstb, kref_read(&mstb->malloc_kref) - 1);
+        kref_put(&mstb->malloc_kref, drm_dp_free_mst_branch_device);
+}
+
+static void drm_dp_free_mst_port(struct kref *kref)
+{
+        struct drm_dp_mst_port *port =
+                container_of(kref, struct drm_dp_mst_port, malloc_kref);
+
+        drm_dp_mst_put_mstb_malloc(port->parent);
+        kfree(port);
+}
+
+/**
+ * drm_dp_mst_get_port_malloc() - Increment the malloc refcount of an MST port
+ * @port: The &struct drm_dp_mst_port to increment the malloc refcount of
+ *
+ * Increments &drm_dp_mst_port.malloc_kref. When &drm_dp_mst_port.malloc_kref
+ * reaches 0, the memory allocation for @port will be released and @port may
+ * no longer be used.
+ *
+ * Because @port could potentially be freed at any time by the DP MST helpers
+ * if &drm_dp_mst_port.malloc_kref reaches 0, including during a call to this
+ * function, drivers that which to make use of &struct drm_dp_mst_port should
+ * ensure that they grab at least one main malloc reference to their MST ports
+ * in &drm_dp_mst_topology_cbs.add_connector. This callback is called before
+ * there is any chance for &drm_dp_mst_port.malloc_kref to reach 0.
+ *
+ * See also: drm_dp_mst_put_port_malloc()
+ */
+void
+drm_dp_mst_get_port_malloc(struct drm_dp_mst_port *port)
+{
+        kref_get(&port->malloc_kref);
+        DRM_DEBUG("port %p (%d)\n", port, kref_read(&port->malloc_kref));
+}
+EXPORT_SYMBOL(drm_dp_mst_get_port_malloc);
+
+/**
+ * drm_dp_mst_put_port_malloc() - Decrement the malloc refcount of an MST port
+ * @port: The &struct drm_dp_mst_port to decrement the malloc refcount of
+ *
+ * Decrements &drm_dp_mst_port.malloc_kref. When &drm_dp_mst_port.malloc_kref
+ * reaches 0, the memory allocation for @port will be released and @port may
+ * no longer be used.
+ *
+ * See also: drm_dp_mst_get_port_malloc()
+ */
+void
+drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port)
+{
+        DRM_DEBUG("port %p (%d)\n", port, kref_read(&port->malloc_kref) - 1);
+        kref_put(&port->malloc_kref, drm_dp_free_mst_port);
+}
+EXPORT_SYMBOL(drm_dp_mst_put_port_malloc);
+
 static void drm_dp_destroy_mst_branch_device(struct kref *kref)
 {
-        struct drm_dp_mst_branch *mstb = container_of(kref, struct drm_dp_mst_branch, kref);
+        struct drm_dp_mst_branch *mstb =
+                container_of(kref, struct drm_dp_mst_branch, topology_kref);
+        struct drm_dp_mst_topology_mgr *mgr = mstb->mgr;
         struct drm_dp_mst_port *port, *tmp;
         bool wake_tx = false;
 
-        /*
-         * init kref again to be used by ports to remove mst branch when it is
-         * not needed anymore
-         */
-        kref_init(kref);
-
-        if (mstb->port_parent && list_empty(&mstb->port_parent->next))
-                kref_get(&mstb->port_parent->kref);
-
-        /*
-         * destroy all ports - don't need lock
-         * as there are no more references to the mst branch
-         * device at this point.
-         */
+        mutex_lock(&mgr->lock);
         list_for_each_entry_safe(port, tmp, &mstb->ports, next) {
                 list_del(&port->next);
-                drm_dp_put_port(port);
+                drm_dp_mst_topology_put_port(port);
         }
+        mutex_unlock(&mgr->lock);
 
         /* drop any tx slots msg */
         mutex_lock(&mstb->mgr->qlock);
@@ -908,14 +1074,83 @@ static void drm_dp_destroy_mst_branch_device(struct kref *kref)
         if (wake_tx)
                 wake_up_all(&mstb->mgr->tx_waitq);
 
-        kref_put(kref, drm_dp_free_mst_branch_device);
+        drm_dp_mst_put_mstb_malloc(mstb);
 }
 
-static void drm_dp_put_mst_branch_device(struct drm_dp_mst_branch *mstb)
+/**
+ * drm_dp_mst_topology_try_get_mstb() - Increment the topology refcount of a
+ * branch device unless its zero
+ * @mstb: &struct drm_dp_mst_branch to increment the topology refcount of
+ *
+ * Attempts to grab a topology reference to @mstb, if it hasn't yet been
+ * removed from the topology (e.g. &drm_dp_mst_branch.topology_kref has
+ * reached 0). Holding a topology reference implies that a malloc reference
+ * will be held to @mstb as long as the user holds the topology reference.
+ *
+ * Care should be taken to ensure that the user has at least one malloc
+ * reference to @mstb. If you already have a topology reference to @mstb, you
+ * should use drm_dp_mst_topology_get_mstb() instead.
+ *
+ * See also:
+ * drm_dp_mst_topology_get_mstb()
+ * drm_dp_mst_topology_put_mstb()
+ *
+ * Returns:
+ * * 1: A topology reference was grabbed successfully
+ * * 0: @port is no longer in the topology, no reference was grabbed
+ */
+static int __must_check
+drm_dp_mst_topology_try_get_mstb(struct drm_dp_mst_branch *mstb)
 {
-        kref_put(&mstb->kref, drm_dp_destroy_mst_branch_device);
+        int ret = kref_get_unless_zero(&mstb->topology_kref);
+
+        if (ret)
+                DRM_DEBUG("mstb %p (%d)\n", mstb,
+                          kref_read(&mstb->topology_kref));
+
+        return ret;
 }
 
+/**
+ * drm_dp_mst_topology_get_mstb() - Increment the topology refcount of a
+ * branch device
+ * @mstb: The &struct drm_dp_mst_branch to increment the topology refcount of
+ *
+ * Increments &drm_dp_mst_branch.topology_refcount without checking whether or
+ * not it's already reached 0. This is only valid to use in scenarios where
+ * you are already guaranteed to have at least one active topology reference
+ * to @mstb. Otherwise, drm_dp_mst_topology_try_get_mstb() must be used.
+ *
+ * See also:
+ * drm_dp_mst_topology_try_get_mstb()
+ * drm_dp_mst_topology_put_mstb()
+ */
+static void drm_dp_mst_topology_get_mstb(struct drm_dp_mst_branch *mstb)
+{
+        WARN_ON(kref_read(&mstb->topology_kref) == 0);
+        kref_get(&mstb->topology_kref);
+        DRM_DEBUG("mstb %p (%d)\n", mstb, kref_read(&mstb->topology_kref));
+}
+
+/**
+ * drm_dp_mst_topology_put_mstb() - release a topology reference to a branch
+ * device
+ * @mstb: The &struct drm_dp_mst_branch to release the topology reference from
+ *
+ * Releases a topology reference from @mstb by decrementing
+ * &drm_dp_mst_branch.topology_kref.
+ *
+ * See also:
+ * drm_dp_mst_topology_try_get_mstb()
+ * drm_dp_mst_topology_get_mstb()
+ */
+static void
+drm_dp_mst_topology_put_mstb(struct drm_dp_mst_branch *mstb)
+{
+        DRM_DEBUG("mstb %p (%d)\n",
+                  mstb, kref_read(&mstb->topology_kref) - 1);
+        kref_put(&mstb->topology_kref, drm_dp_destroy_mst_branch_device);
+}
 
 static void drm_dp_port_teardown_pdt(struct drm_dp_mst_port *port, int old_pdt)
 {
@@ -930,19 +1165,18 @@ static void drm_dp_port_teardown_pdt(struct drm_dp_mst_port *port, int old_pdt)
         case DP_PEER_DEVICE_MST_BRANCHING:
                 mstb = port->mstb;
                 port->mstb = NULL;
-                drm_dp_put_mst_branch_device(mstb);
+                drm_dp_mst_topology_put_mstb(mstb);
                 break;
         }
 }
 
 static void drm_dp_destroy_port(struct kref *kref)
 {
-        struct drm_dp_mst_port *port = container_of(kref, struct drm_dp_mst_port, kref);
+        struct drm_dp_mst_port *port =
+                container_of(kref, struct drm_dp_mst_port, topology_kref);
         struct drm_dp_mst_topology_mgr *mgr = port->mgr;
 
         if (!port->input) {
-                port->vcpi.num_slots = 0;
-
                 kfree(port->cached_edid);
 
                 /*
@@ -956,7 +1190,6 @@ static void drm_dp_destroy_port(struct kref *kref)
                          * from an EDID retrieval */
 
                         mutex_lock(&mgr->destroy_connector_lock);
-                        kref_get(&port->parent->kref);
                         list_add(&port->next, &mgr->destroy_connector_list);
                         mutex_unlock(&mgr->destroy_connector_lock);
                         schedule_work(&mgr->destroy_connector_work);
@@ -967,25 +1200,95 @@ static void drm_dp_destroy_port(struct kref *kref)
                 drm_dp_port_teardown_pdt(port, port->pdt);
                 port->pdt = DP_PEER_DEVICE_NONE;
         }
-        kfree(port);
+        drm_dp_mst_put_port_malloc(port);
 }
 
-static void drm_dp_put_port(struct drm_dp_mst_port *port)
+/**
+ * drm_dp_mst_topology_try_get_port() - Increment the topology refcount of a
+ * port unless its zero
+ * @port: &struct drm_dp_mst_port to increment the topology refcount of
+ *
+ * Attempts to grab a topology reference to @port, if it hasn't yet been
+ * removed from the topology (e.g. &drm_dp_mst_port.topology_kref has reached
+ * 0). Holding a topology reference implies that a malloc reference will be
+ * held to @port as long as the user holds the topology reference.
+ *
+ * Care should be taken to ensure that the user has at least one malloc
+ * reference to @port. If you already have a topology reference to @port, you
+ * should use drm_dp_mst_topology_get_port() instead.
+ *
+ * See also:
+ * drm_dp_mst_topology_get_port()
+ * drm_dp_mst_topology_put_port()
+ *
+ * Returns:
+ * * 1: A topology reference was grabbed successfully
+ * * 0: @port is no longer in the topology, no reference was grabbed
+ */
+static int __must_check
+drm_dp_mst_topology_try_get_port(struct drm_dp_mst_port *port)
 {
-        kref_put(&port->kref, drm_dp_destroy_port);
+        int ret = kref_get_unless_zero(&port->topology_kref);
+
+        if (ret)
+                DRM_DEBUG("port %p (%d)\n", port,
+                          kref_read(&port->topology_kref));
+
+        return ret;
 }
 
-static struct drm_dp_mst_branch *drm_dp_mst_get_validated_mstb_ref_locked(struct drm_dp_mst_branch *mstb, struct drm_dp_mst_branch *to_find)
+/**
+ * drm_dp_mst_topology_get_port() - Increment the topology refcount of a port
+ * @port: The &struct drm_dp_mst_port to increment the topology refcount of
+ *
+ * Increments &drm_dp_mst_port.topology_refcount without checking whether or
+ * not it's already reached 0. This is only valid to use in scenarios where
+ * you are already guaranteed to have at least one active topology reference
+ * to @port. Otherwise, drm_dp_mst_topology_try_get_port() must be used.
+ *
+ * See also:
+ * drm_dp_mst_topology_try_get_port()
+ * drm_dp_mst_topology_put_port()
+ */
+static void drm_dp_mst_topology_get_port(struct drm_dp_mst_port *port)
+{
+        WARN_ON(kref_read(&port->topology_kref) == 0);
+        kref_get(&port->topology_kref);
+        DRM_DEBUG("port %p (%d)\n", port, kref_read(&port->topology_kref));
+}
+
+/**
+ * drm_dp_mst_topology_put_port() - release a topology reference to a port
+ * @port: The &struct drm_dp_mst_port to release the topology reference from
+ *
+ * Releases a topology reference from @port by decrementing
+ * &drm_dp_mst_port.topology_kref.
+ *
+ * See also:
+ * drm_dp_mst_topology_try_get_port()
+ * drm_dp_mst_topology_get_port()
+ */
+static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port)
+{
+        DRM_DEBUG("port %p (%d)\n",
+                  port, kref_read(&port->topology_kref) - 1);
+        kref_put(&port->topology_kref, drm_dp_destroy_port);
+}
+
+static struct drm_dp_mst_branch *
+drm_dp_mst_topology_get_mstb_validated_locked(struct drm_dp_mst_branch *mstb,
+                                              struct drm_dp_mst_branch *to_find)
 {
         struct drm_dp_mst_port *port;
         struct drm_dp_mst_branch *rmstb;
-        if (to_find == mstb) {
-                kref_get(&mstb->kref);
+
+        if (to_find == mstb)
                 return mstb;
-        }
+
         list_for_each_entry(port, &mstb->ports, next) {
                 if (port->mstb) {
-                        rmstb = drm_dp_mst_get_validated_mstb_ref_locked(port->mstb, to_find);
+                        rmstb = drm_dp_mst_topology_get_mstb_validated_locked(
+                            port->mstb, to_find);
                         if (rmstb)
                                 return rmstb;
                 }
@@ -993,27 +1296,37 @@ static struct drm_dp_mst_branch *drm_dp_mst_get_validated_mstb_ref_locked(struct
         return NULL;
 }
 
-static struct drm_dp_mst_branch *drm_dp_get_validated_mstb_ref(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_branch *mstb)
+static struct drm_dp_mst_branch *
+drm_dp_mst_topology_get_mstb_validated(struct drm_dp_mst_topology_mgr *mgr,
+                                       struct drm_dp_mst_branch *mstb)
 {
         struct drm_dp_mst_branch *rmstb = NULL;
+
         mutex_lock(&mgr->lock);
-        if (mgr->mst_primary)
-                rmstb = drm_dp_mst_get_validated_mstb_ref_locked(mgr->mst_primary, mstb);
+        if (mgr->mst_primary) {
+                rmstb = drm_dp_mst_topology_get_mstb_validated_locked(
+                    mgr->mst_primary, mstb);
+
+                if (rmstb && !drm_dp_mst_topology_try_get_mstb(rmstb))
+                        rmstb = NULL;
+        }
         mutex_unlock(&mgr->lock);
         return rmstb;
 }
 
-static struct drm_dp_mst_port *drm_dp_mst_get_port_ref_locked(struct drm_dp_mst_branch *mstb, struct drm_dp_mst_port *to_find)
+static struct drm_dp_mst_port *
+drm_dp_mst_topology_get_port_validated_locked(struct drm_dp_mst_branch *mstb,
+                                              struct drm_dp_mst_port *to_find)
 {
         struct drm_dp_mst_port *port, *mport;
 
         list_for_each_entry(port, &mstb->ports, next) {
-                if (port == to_find) {
-                        kref_get(&port->kref);
+                if (port == to_find)
                         return port;
-                }
+
                 if (port->mstb) {
-                        mport = drm_dp_mst_get_port_ref_locked(port->mstb, to_find);
+                        mport = drm_dp_mst_topology_get_port_validated_locked(
+                            port->mstb, to_find);
                         if (mport)
                                 return mport;
                 }
@@ -1021,12 +1334,20 @@ static struct drm_dp_mst_port *drm_dp_mst_get_port_ref_locked(struct drm_dp_mst_
         return NULL;
 }
 
-static struct drm_dp_mst_port *drm_dp_get_validated_port_ref(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
+static struct drm_dp_mst_port *
+drm_dp_mst_topology_get_port_validated(struct drm_dp_mst_topology_mgr *mgr,
+                                       struct drm_dp_mst_port *port)
 {
         struct drm_dp_mst_port *rport = NULL;
+
         mutex_lock(&mgr->lock);
-        if (mgr->mst_primary)
-                rport = drm_dp_mst_get_port_ref_locked(mgr->mst_primary, port);
+        if (mgr->mst_primary) {
+                rport = drm_dp_mst_topology_get_port_validated_locked(
+                    mgr->mst_primary, port);
+
+                if (rport && !drm_dp_mst_topology_try_get_port(rport))
+                        rport = NULL;
+        }
         mutex_unlock(&mgr->lock);
         return rport;
 }
@@ -1034,11 +1355,12 @@ static struct drm_dp_mst_port *drm_dp_get_validated_port_ref(struct drm_dp_mst_t
 static struct drm_dp_mst_port *drm_dp_get_port(struct drm_dp_mst_branch *mstb, u8 port_num)
 {
         struct drm_dp_mst_port *port;
+        int ret;
 
         list_for_each_entry(port, &mstb->ports, next) {
                 if (port->port_num == port_num) {
-                        kref_get(&port->kref);
-                        return port;
+                        ret = drm_dp_mst_topology_try_get_port(port);
+                        return ret ? port : NULL;
                 }
         }
 
@@ -1087,6 +1409,11 @@ static bool drm_dp_port_setup_pdt(struct drm_dp_mst_port *port)
                 if (port->mstb) {
                         port->mstb->mgr = port->mgr;
                         port->mstb->port_parent = port;
+                        /*
+                         * Make sure this port's memory allocation stays
+                         * around until it's child MSTB releases it
+                         */
+                        drm_dp_mst_get_port_malloc(port);
 
                         send_link = true;
                 }
@@ -1147,17 +1474,26 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
         bool created = false;
         int old_pdt = 0;
         int old_ddps = 0;
+
         port = drm_dp_get_port(mstb, port_msg->port_number);
         if (!port) {
                 port = kzalloc(sizeof(*port), GFP_KERNEL);
                 if (!port)
                         return;
-                kref_init(&port->kref);
+                kref_init(&port->topology_kref);
+                kref_init(&port->malloc_kref);
                 port->parent = mstb;
                 port->port_num = port_msg->port_number;
                 port->mgr = mstb->mgr;
                 port->aux.name = "DPMST";
                 port->aux.dev = dev->dev;
+
+                /*
+                 * Make sure the memory allocation for our parent branch stays
+                 * around until our own memory allocation is released
+                 */
+                drm_dp_mst_get_mstb_malloc(mstb);
+
                 created = true;
         } else {
                 old_pdt = port->pdt;
@@ -1177,18 +1513,20 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
            for this list */
         if (created) {
                 mutex_lock(&mstb->mgr->lock);
-                kref_get(&port->kref);
+                drm_dp_mst_topology_get_port(port);
                 list_add(&port->next, &mstb->ports);
                 mutex_unlock(&mstb->mgr->lock);
         }
 
         if (old_ddps != port->ddps) {
                 if (port->ddps) {
-                        if (!port->input)
-                                drm_dp_send_enum_path_resources(mstb->mgr, mstb, port);
+                        if (!port->input) {
+                                drm_dp_send_enum_path_resources(mstb->mgr,
+                                                                mstb, port);
+                        }
                 } else {
                         port->available_pbn = 0;
-                        }
+                }
         }
 
         if (old_pdt != port->pdt && !port->input) {
@@ -1202,21 +1540,25 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
         if (created && !port->input) {
                 char proppath[255];
 
-                build_mst_prop_path(mstb, port->port_num, proppath, sizeof(proppath));
-                port->connector = (*mstb->mgr->cbs->add_connector)(mstb->mgr, port, proppath);
+                build_mst_prop_path(mstb, port->port_num, proppath,
+                                    sizeof(proppath));
+                port->connector = (*mstb->mgr->cbs->add_connector)(mstb->mgr,
+                                                                   port,
+                                                                   proppath);
                 if (!port->connector) {
                         /* remove it from the port list */
                         mutex_lock(&mstb->mgr->lock);
                         list_del(&port->next);
                         mutex_unlock(&mstb->mgr->lock);
                         /* drop port list reference */
-                        drm_dp_put_port(port);
+                        drm_dp_mst_topology_put_port(port);
                         goto out;
                 }
                 if ((port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV ||
                      port->pdt == DP_PEER_DEVICE_SST_SINK) &&
                     port->port_num >= DP_MST_LOGICAL_PORT_0) {
-                        port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);
+                        port->cached_edid = drm_get_edid(port->connector,
+                                                         &port->aux.ddc);
                         drm_connector_set_tile_property(port->connector);
                 }
                 (*mstb->mgr->cbs->register_connector)(port->connector);
@@ -1224,7 +1566,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
 
 out:
         /* put reference to this port */
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
 }
 
 static void drm_dp_update_port(struct drm_dp_mst_branch *mstb,
@@ -1259,7 +1601,7 @@ static void drm_dp_update_port(struct drm_dp_mst_branch *mstb,
                         dowork = true;
         }
 
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
         if (dowork)
                 queue_work(system_long_wq, &mstb->mgr->work);
 
@@ -1270,7 +1612,7 @@ static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_
 {
         struct drm_dp_mst_branch *mstb;
         struct drm_dp_mst_port *port;
-        int i;
+        int i, ret;
         /* find the port by iterating down */
 
         mutex_lock(&mgr->lock);
@@ -1295,7 +1637,9 @@ static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_
                         }
                 }
         }
-        kref_get(&mstb->kref);
+        ret = drm_dp_mst_topology_try_get_mstb(mstb);
+        if (!ret)
+                mstb = NULL;
 out:
         mutex_unlock(&mgr->lock);
         return mstb;
@@ -1325,19 +1669,22 @@ static struct drm_dp_mst_branch *get_mst_branch_device_by_guid_helper(
         return NULL;
 }
 
-static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device_by_guid(
-        struct drm_dp_mst_topology_mgr *mgr,
-        uint8_t *guid)
+static struct drm_dp_mst_branch *
+drm_dp_get_mst_branch_device_by_guid(struct drm_dp_mst_topology_mgr *mgr,
+                                     uint8_t *guid)
 {
         struct drm_dp_mst_branch *mstb;
+        int ret;
 
         /* find the port by iterating down */
         mutex_lock(&mgr->lock);
 
         mstb = get_mst_branch_device_by_guid_helper(mgr->mst_primary, guid);
-
-        if (mstb)
-                kref_get(&mstb->kref);
+        if (mstb) {
+                ret = drm_dp_mst_topology_try_get_mstb(mstb);
+                if (!ret)
+                        mstb = NULL;
+        }
 
         mutex_unlock(&mgr->lock);
         return mstb;
@@ -1362,10 +1709,11 @@ static void drm_dp_check_and_send_link_address(struct drm_dp_mst_topology_mgr *m
                         drm_dp_send_enum_path_resources(mgr, mstb, port);
 
                 if (port->mstb) {
-                        mstb_child = drm_dp_get_validated_mstb_ref(mgr, port->mstb);
+                        mstb_child = drm_dp_mst_topology_get_mstb_validated(
+                            mgr, port->mstb);
                         if (mstb_child) {
                                 drm_dp_check_and_send_link_address(mgr, mstb_child);
-                                drm_dp_put_mst_branch_device(mstb_child);
+                                drm_dp_mst_topology_put_mstb(mstb_child);
                         }
                 }
         }
@@ -1375,16 +1723,19 @@ static void drm_dp_mst_link_probe_work(struct work_struct *work)
 {
         struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, work);
         struct drm_dp_mst_branch *mstb;
+        int ret;
 
         mutex_lock(&mgr->lock);
         mstb = mgr->mst_primary;
         if (mstb) {
-                kref_get(&mstb->kref);
+                ret = drm_dp_mst_topology_try_get_mstb(mstb);
+                if (!ret)
+                        mstb = NULL;
         }
         mutex_unlock(&mgr->lock);
         if (mstb) {
                 drm_dp_check_and_send_link_address(mgr, mstb);
-                drm_dp_put_mst_branch_device(mstb);
+                drm_dp_mst_topology_put_mstb(mstb);
         }
 }
 
@@ -1695,22 +2046,40 @@ static struct drm_dp_mst_port *drm_dp_get_last_connected_port_to_mstb(struct drm
         return drm_dp_get_last_connected_port_to_mstb(mstb->port_parent->parent);
 }
 
-static struct drm_dp_mst_branch *drm_dp_get_last_connected_port_and_mstb(struct drm_dp_mst_topology_mgr *mgr,
-                                                                         struct drm_dp_mst_branch *mstb,
-                                                                         int *port_num)
+/*
+ * Searches upwards in the topology starting from mstb to try to find the
+ * closest available parent of mstb that's still connected to the rest of the
+ * topology. This can be used in order to perform operations like releasing
+ * payloads, where the branch device which owned the payload may no longer be
+ * around and thus would require that the payload on the last living relative
+ * be freed instead.
+ */
+static struct drm_dp_mst_branch *
+drm_dp_get_last_connected_port_and_mstb(struct drm_dp_mst_topology_mgr *mgr,
+                                        struct drm_dp_mst_branch *mstb,
+                                        int *port_num)
 {
         struct drm_dp_mst_branch *rmstb = NULL;
         struct drm_dp_mst_port *found_port;
+
         mutex_lock(&mgr->lock);
-        if (mgr->mst_primary) {
+        if (!mgr->mst_primary)
+                goto out;
+
+        do {
                 found_port = drm_dp_get_last_connected_port_to_mstb(mstb);
+                if (!found_port)
+                        break;
 
-                if (found_port) {
+                if (drm_dp_mst_topology_try_get_mstb(found_port->parent)) {
                         rmstb = found_port->parent;
-                        kref_get(&rmstb->kref);
                         *port_num = found_port->port_num;
+                } else {
+                        /* Search again, starting from this parent */
+                        mstb = found_port->parent;
                 }
-        }
+        } while (!rmstb);
+out:
         mutex_unlock(&mgr->lock);
         return rmstb;
 }
@@ -1726,19 +2095,15 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
         u8 sinks[DRM_DP_MAX_SDP_STREAMS];
         int i;
 
-        port = drm_dp_get_validated_port_ref(mgr, port);
-        if (!port)
-                return -EINVAL;
-
         port_num = port->port_num;
-        mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent);
+        mstb = drm_dp_mst_topology_get_mstb_validated(mgr, port->parent);
         if (!mstb) {
-                mstb = drm_dp_get_last_connected_port_and_mstb(mgr, port->parent, &port_num);
+                mstb = drm_dp_get_last_connected_port_and_mstb(mgr,
+                                                               port->parent,
+                                                               &port_num);
 
-                if (!mstb) {
-                        drm_dp_put_port(port);
+                if (!mstb)
                         return -EINVAL;
-                }
         }
 
         txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
@@ -1757,17 +2122,24 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
 
         drm_dp_queue_down_tx(mgr, txmsg);
 
+        /*
+         * FIXME: there is a small chance that between getting the last
+         * connected mstb and sending the payload message, the last connected
+         * mstb could also be removed from the topology. In the future, this
+         * needs to be fixed by restarting the
+         * drm_dp_get_last_connected_port_and_mstb() search in the event of a
+         * timeout if the topology is still connected to the system.
+         */
         ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
         if (ret > 0) {
-                if (txmsg->reply.reply_type == 1) {
+                if (txmsg->reply.reply_type == 1)
                         ret = -EINVAL;
-                } else
+                else
                         ret = 0;
         }
         kfree(txmsg);
 fail_put:
-        drm_dp_put_mst_branch_device(mstb);
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_mstb(mstb);
         return ret;
 }
 
@@ -1777,13 +2149,13 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr,
         struct drm_dp_sideband_msg_tx *txmsg;
         int len, ret;
 
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (!port)
                 return -EINVAL;
 
         txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
         if (!txmsg) {
-                drm_dp_put_port(port);
+                drm_dp_mst_topology_put_port(port);
                 return -ENOMEM;
         }
 
@@ -1799,7 +2171,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr,
                         ret = 0;
         }
         kfree(txmsg);
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
 
         return ret;
 }
@@ -1872,15 +2244,16 @@ static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
  */
 int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
 {
-        int i, j;
-        int cur_slots = 1;
         struct drm_dp_payload req_payload;
         struct drm_dp_mst_port *port;
+        int i, j;
+        int cur_slots = 1;
 
         mutex_lock(&mgr->payload_lock);
         for (i = 0; i < mgr->max_payloads; i++) {
                 struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i];
                 struct drm_dp_payload *payload = &mgr->payloads[i];
+                bool put_port = false;
 
                 /* solve the current payloads - compare to the hw ones
                    - update the hw view */
@@ -1888,11 +2261,20 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
                 if (vcpi) {
                         port = container_of(vcpi, struct drm_dp_mst_port,
                                             vcpi);
-                        port = drm_dp_get_validated_port_ref(mgr, port);
-                        if (!port) {
-                                mutex_unlock(&mgr->payload_lock);
-                                return -EINVAL;
+
+                        /* Validated ports don't matter if we're releasing
+                         * VCPI
+                         */
+                        if (vcpi->num_slots) {
+                                port = drm_dp_mst_topology_get_port_validated(
+                                    mgr, port);
+                                if (!port) {
+                                        mutex_unlock(&mgr->payload_lock);
+                                        return -EINVAL;
+                                }
+                                put_port = true;
                         }
+
                         req_payload.num_slots = vcpi->num_slots;
                         req_payload.vcpi = vcpi->vcpi;
                 } else {
@@ -1924,8 +2306,8 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
                 }
                 cur_slots += req_payload.num_slots;
 
-                if (port)
-                        drm_dp_put_port(port);
+                if (put_port)
+                        drm_dp_mst_topology_put_port(port);
         }
 
         for (i = 0; i < mgr->max_payloads; i++) {
@@ -2024,7 +2406,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,
         struct drm_dp_sideband_msg_tx *txmsg;
         struct drm_dp_mst_branch *mstb;
 
-        mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent);
+        mstb = drm_dp_mst_topology_get_mstb_validated(mgr, port->parent);
         if (!mstb)
                 return -EINVAL;
 
@@ -2048,7 +2430,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,
         }
         kfree(txmsg);
 fail_put:
-        drm_dp_put_mst_branch_device(mstb);
+        drm_dp_mst_topology_put_mstb(mstb);
         return ret;
 }
 
@@ -2158,7 +2540,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
 
                 /* give this the main reference */
                 mgr->mst_primary = mstb;
-                kref_get(&mgr->mst_primary->kref);
+                drm_dp_mst_topology_get_mstb(mgr->mst_primary);
 
                 ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,
                                                          DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);
@@ -2192,7 +2574,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
 out_unlock:
         mutex_unlock(&mgr->lock);
         if (mstb)
-                drm_dp_put_mst_branch_device(mstb);
+                drm_dp_mst_topology_put_mstb(mstb);
         return ret;
 
 }
@@ -2357,7 +2739,7 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
                                mgr->down_rep_recv.initial_hdr.lct,
                                       mgr->down_rep_recv.initial_hdr.rad[0],
                                       mgr->down_rep_recv.msg[0]);
-                        drm_dp_put_mst_branch_device(mstb);
+                        drm_dp_mst_topology_put_mstb(mstb);
                         memset(&mgr->down_rep_recv, 0, sizeof(struct drm_dp_sideband_msg_rx));
                         return 0;
                 }
@@ -2368,7 +2750,7 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
                 }
 
                 memset(&mgr->down_rep_recv, 0, sizeof(struct drm_dp_sideband_msg_rx));
-                drm_dp_put_mst_branch_device(mstb);
+                drm_dp_mst_topology_put_mstb(mstb);
 
                 mutex_lock(&mgr->qlock);
                 txmsg->state = DRM_DP_SIDEBAND_TX_RX;
@@ -2441,7 +2823,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
                 }
 
                 if (mstb)
-                        drm_dp_put_mst_branch_device(mstb);
+                        drm_dp_mst_topology_put_mstb(mstb);
 
                 memset(&mgr->up_req_recv, 0, sizeof(struct drm_dp_sideband_msg_rx));
         }
@@ -2501,7 +2883,7 @@ enum drm_connector_status drm_dp_mst_detect_port(struct drm_connector *connector
         enum drm_connector_status status = connector_status_disconnected;
 
         /* we need to search for the port in the mgr in case its gone */
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (!port)
                 return connector_status_disconnected;
 
@@ -2526,7 +2908,7 @@ enum drm_connector_status drm_dp_mst_detect_port(struct drm_connector *connector
                 break;
         }
 out:
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
         return status;
 }
 EXPORT_SYMBOL(drm_dp_mst_detect_port);
@@ -2543,11 +2925,11 @@ bool drm_dp_mst_port_has_audio(struct drm_dp_mst_topology_mgr *mgr,
 {
         bool ret = false;
 
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (!port)
                 return ret;
         ret = port->has_audio;
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
         return ret;
 }
 EXPORT_SYMBOL(drm_dp_mst_port_has_audio);
@@ -2567,7 +2949,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
         struct edid *edid = NULL;
 
         /* we need to search for the port in the mgr in case its gone */
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (!port)
                 return NULL;
 
@@ -2578,7 +2960,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
                 drm_connector_set_tile_property(connector);
         }
         port->has_audio = drm_detect_monitor_audio(edid);
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
         return edid;
 }
 EXPORT_SYMBOL(drm_dp_mst_get_edid);
@@ -2629,43 +3011,98 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
 }
 
 /**
- * drm_dp_atomic_find_vcpi_slots() - Find and add vcpi slots to the state
+ * drm_dp_atomic_find_vcpi_slots() - Find and add VCPI slots to the state
  * @state: global atomic state
  * @mgr: MST topology manager for the port
  * @port: port to find vcpi slots for
  * @pbn: bandwidth required for the mode in PBN
  *
- * RETURNS:
- * Total slots in the atomic state assigned for this port or error
+ * Allocates VCPI slots to @port, replacing any previous VCPI allocations it
+ * may have had. Any atomic drivers which support MST must call this function
+ * in their &drm_encoder_helper_funcs.atomic_check() callback to change the
+ * current VCPI allocation for the new state, but only when
+ * &drm_crtc_state.mode_changed or &drm_crtc_state.connectors_changed is set
+ * to ensure compatibility with userspace applications that still use the
+ * legacy modesetting UAPI.
+ *
+ * Allocations set by this function are not checked against the bandwidth
+ * restraints of @mgr until the driver calls drm_dp_mst_atomic_check().
+ *
+ * Additionally, it is OK to call this function multiple times on the same
+ * @port as needed. It is not OK however, to call this function and
+ * drm_dp_atomic_release_vcpi_slots() in the same atomic check phase.
+ *
+ * See also:
+ * drm_dp_atomic_release_vcpi_slots()
+ * drm_dp_mst_atomic_check()
+ *
+ * Returns:
+ * Total slots in the atomic state assigned for this port, or a negative error
+ * code if the port no longer exists
  */
 int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
                                   struct drm_dp_mst_topology_mgr *mgr,
                                   struct drm_dp_mst_port *port, int pbn)
 {
         struct drm_dp_mst_topology_state *topology_state;
-        int req_slots;
+        struct drm_dp_vcpi_allocation *pos, *vcpi = NULL;
+        int prev_slots, req_slots, ret;
 
         topology_state = drm_atomic_get_mst_topology_state(state, mgr);
         if (IS_ERR(topology_state))
                 return PTR_ERR(topology_state);
 
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (port == NULL)
                 return -EINVAL;
-        req_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
-        DRM_DEBUG_KMS("vcpi slots req=%d, avail=%d\n",
-                        req_slots, topology_state->avail_slots);
 
-        if (req_slots > topology_state->avail_slots) {
-                drm_dp_put_port(port);
-                return -ENOSPC;
+        /* Find the current allocation for this port, if any */
+        list_for_each_entry(pos, &topology_state->vcpis, next) {
+                if (pos->port == port) {
+                        vcpi = pos;
+                        prev_slots = vcpi->vcpi;
+
+                        /*
+                         * This should never happen, unless the driver tries
+                         * releasing and allocating the same VCPI allocation,
+                         * which is an error
+                         */
+                        if (WARN_ON(!prev_slots)) {
+                                DRM_ERROR("cannot allocate and release VCPI on [MST PORT:%p] in the same state\n",
+                                          port);
+                                return -EINVAL;
+                        }
+
+                        break;
+                }
         }
+        if (!vcpi)
+                prev_slots = 0;
+
+        req_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
 
-        topology_state->avail_slots -= req_slots;
-        DRM_DEBUG_KMS("vcpi slots avail=%d", topology_state->avail_slots);
+        DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n",
+                         port->connector->base.id, port->connector->name,
+                         port, prev_slots, req_slots);
+
+        /* Add the new allocation to the state */
+        if (!vcpi) {
+                vcpi = kzalloc(sizeof(*vcpi), GFP_KERNEL);
+                if (!vcpi) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
+
+                drm_dp_mst_get_port_malloc(port);
+                vcpi->port = port;
+                list_add(&vcpi->next, &topology_state->vcpis);
+        }
+        vcpi->vcpi = req_slots;
 
-        drm_dp_put_port(port);
-        return req_slots;
+        ret = req_slots;
+out:
+        drm_dp_mst_topology_put_port(port);
+        return ret;
 }
 EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
 
@@ -2673,31 +3110,57 @@ EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
  * drm_dp_atomic_release_vcpi_slots() - Release allocated vcpi slots
  * @state: global atomic state
  * @mgr: MST topology manager for the port
- * @slots: number of vcpi slots to release
+ * @port: The port to release the VCPI slots from
  *
- * RETURNS:
- * 0 if @slots were added back to &drm_dp_mst_topology_state->avail_slots or
- * negative error code
+ * Releases any VCPI slots that have been allocated to a port in the atomic
+ * state. Any atomic drivers which support MST must call this function in
+ * their &drm_connector_helper_funcs.atomic_check() callback when the
+ * connector will no longer have VCPI allocated (e.g. because it's CRTC was
+ * removed) when it had VCPI allocated in the previous atomic state.
+ *
+ * It is OK to call this even if @port has been removed from the system.
+ * Additionally, it is OK to call this function multiple times on the same
+ * @port as needed. It is not OK however, to call this function and
+ * drm_dp_atomic_find_vcpi_slots() on the same @port in a single atomic check
+ * phase.
+ *
+ * See also:
+ * drm_dp_atomic_find_vcpi_slots()
+ * drm_dp_mst_atomic_check()
+ *
+ * Returns:
+ * 0 if all slots for this port were added back to
+ * &drm_dp_mst_topology_state.avail_slots or negative error code
  */
 int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
                                      struct drm_dp_mst_topology_mgr *mgr,
-                                     int slots)
+                                     struct drm_dp_mst_port *port)
 {
         struct drm_dp_mst_topology_state *topology_state;
+        struct drm_dp_vcpi_allocation *pos;
+        bool found = false;
 
         topology_state = drm_atomic_get_mst_topology_state(state, mgr);
         if (IS_ERR(topology_state))
                 return PTR_ERR(topology_state);
 
-        /* We cannot rely on port->vcpi.num_slots to update
-         * topology_state->avail_slots as the port may not exist if the parent
-         * branch device was unplugged. This should be fixed by tracking
-         * per-port slot allocation in drm_dp_mst_topology_state instead of
-         * depending on the caller to tell us how many slots to release.
-         */
-        topology_state->avail_slots += slots;
-        DRM_DEBUG_KMS("vcpi slots released=%d, avail=%d\n",
-                        slots, topology_state->avail_slots);
+        list_for_each_entry(pos, &topology_state->vcpis, next) {
+                if (pos->port == port) {
+                        found = true;
+                        break;
+                }
+        }
+        if (WARN_ON(!found)) {
+                DRM_ERROR("no VCPI for [MST PORT:%p] found in mst state %p\n",
+                          port, &topology_state->base);
+                return -EINVAL;
+        }
+
+        DRM_DEBUG_ATOMIC("[MST PORT:%p] VCPI %d -> 0\n", port, pos->vcpi);
+        if (pos->vcpi) {
+                drm_dp_mst_put_port_malloc(port);
+                pos->vcpi = 0;
+        }
 
         return 0;
 }
@@ -2715,7 +3178,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
 {
         int ret;
 
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (!port)
                 return false;
 
@@ -2723,9 +3186,10 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
                 return false;
 
         if (port->vcpi.vcpi > 0) {
-                DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn);
+                DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n",
+                              port->vcpi.vcpi, port->vcpi.pbn, pbn);
                 if (pbn == port->vcpi.pbn) {
-                        drm_dp_put_port(port);
+                        drm_dp_mst_topology_put_port(port);
                         return true;
                 }
         }
@@ -2733,13 +3197,15 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
         ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots);
         if (ret) {
                 DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n",
-                                DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
+                              DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
                 goto out;
         }
         DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n",
-                        pbn, port->vcpi.num_slots);
+                      pbn, port->vcpi.num_slots);
 
-        drm_dp_put_port(port);
+        /* Keep port allocated until it's payload has been removed */
+        drm_dp_mst_get_port_malloc(port);
+        drm_dp_mst_topology_put_port(port);
         return true;
 out:
         return false;
@@ -2749,12 +3215,12 @@ EXPORT_SYMBOL(drm_dp_mst_allocate_vcpi);
 int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
 {
         int slots = 0;
-        port = drm_dp_get_validated_port_ref(mgr, port);
+        port = drm_dp_mst_topology_get_port_validated(mgr, port);
         if (!port)
                 return slots;
 
         slots = port->vcpi.num_slots;
-        drm_dp_put_port(port);
+        drm_dp_mst_topology_put_port(port);
         return slots;
 }
 EXPORT_SYMBOL(drm_dp_mst_get_vcpi_slots);
@@ -2768,11 +3234,12 @@ EXPORT_SYMBOL(drm_dp_mst_get_vcpi_slots);
  */
 void drm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
 {
-        port = drm_dp_get_validated_port_ref(mgr, port);
-        if (!port)
-                return;
+        /*
+         * A port with VCPI will remain allocated until it's VCPI is
+         * released, no verified ref needed
+         */
+
         port->vcpi.num_slots = 0;
-        drm_dp_put_port(port);
 }
 EXPORT_SYMBOL(drm_dp_mst_reset_vcpi_slots);
 
@@ -2781,18 +3248,20 @@ EXPORT_SYMBOL(drm_dp_mst_reset_vcpi_slots);
  * @mgr: manager for this port
  * @port: unverified port to deallocate vcpi for
  */
-void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
+void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
+                                struct drm_dp_mst_port *port)
 {
-        port = drm_dp_get_validated_port_ref(mgr, port);
-        if (!port)
-                return;
+        /*
+         * A port with VCPI will remain allocated until it's VCPI is
+         * released, no verified ref needed
+         */
 
         drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
         port->vcpi.num_slots = 0;
         port->vcpi.pbn = 0;
         port->vcpi.aligned_pbn = 0;
         port->vcpi.vcpi = 0;
-        drm_dp_put_port(port);
+        drm_dp_mst_put_port_malloc(port);
 }
 EXPORT_SYMBOL(drm_dp_mst_deallocate_vcpi);
 
@@ -3076,13 +3545,6 @@ static void drm_dp_tx_work(struct work_struct *work)
         mutex_unlock(&mgr->qlock);
 }
 
-static void drm_dp_free_mst_port(struct kref *kref)
-{
-        struct drm_dp_mst_port *port = container_of(kref, struct drm_dp_mst_port, kref);
-        kref_put(&port->parent->kref, drm_dp_free_mst_branch_device);
-        kfree(port);
-}
-
 static void drm_dp_destroy_connector_work(struct work_struct *work)
 {
         struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, destroy_connector_work);
@@ -3103,7 +3565,6 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
                 list_del(&port->next);
                 mutex_unlock(&mgr->destroy_connector_lock);
 
-                kref_init(&port->kref);
                 INIT_LIST_HEAD(&port->next);
 
                 mgr->cbs->destroy_connector(mgr, port->connector);
@@ -3111,13 +3572,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
                 drm_dp_port_teardown_pdt(port, port->pdt);
                 port->pdt = DP_PEER_DEVICE_NONE;
 
-                if (!port->input && port->vcpi.vcpi > 0) {
-                        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);
+                drm_dp_mst_put_port_malloc(port);
                 send_hotplug = true;
         }
         if (send_hotplug)
@@ -3127,15 +3582,41 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
 static struct drm_private_state *
 drm_dp_mst_duplicate_state(struct drm_private_obj *obj)
 {
-        struct drm_dp_mst_topology_state *state;
+        struct drm_dp_mst_topology_state *state, *old_state =
+                to_dp_mst_topology_state(obj->state);
+        struct drm_dp_vcpi_allocation *pos, *vcpi;
 
-        state = kmemdup(obj->state, sizeof(*state), GFP_KERNEL);
+        state = kmemdup(old_state, sizeof(*state), GFP_KERNEL);
         if (!state)
                 return NULL;
 
         __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base);
 
+        INIT_LIST_HEAD(&state->vcpis);
+
+        list_for_each_entry(pos, &old_state->vcpis, next) {
+                /* Prune leftover freed VCPI allocations */
+                if (!pos->vcpi)
+                        continue;
+
+                vcpi = kmemdup(pos, sizeof(*vcpi), GFP_KERNEL);
+                if (!vcpi)
+                        goto fail;
+
+                drm_dp_mst_get_port_malloc(vcpi->port);
+                list_add(&vcpi->next, &state->vcpis);
+        }
+
         return &state->base;
+
+fail:
+        list_for_each_entry_safe(pos, vcpi, &state->vcpis, next) {
+                drm_dp_mst_put_port_malloc(pos->port);
+                kfree(pos);
+        }
+        kfree(state);
+
+        return NULL;
 }
 
 static void drm_dp_mst_destroy_state(struct drm_private_obj *obj,
@@ -3143,14 +3624,99 @@ static void drm_dp_mst_destroy_state(struct drm_private_obj *obj,
 {
         struct drm_dp_mst_topology_state *mst_state =
                 to_dp_mst_topology_state(state);
+        struct drm_dp_vcpi_allocation *pos, *tmp;
+
+        list_for_each_entry_safe(pos, tmp, &mst_state->vcpis, next) {
+                /* We only keep references to ports with non-zero VCPIs */
+                if (pos->vcpi)
+                        drm_dp_mst_put_port_malloc(pos->port);
+                kfree(pos);
+        }
 
         kfree(mst_state);
 }
 
-static const struct drm_private_state_funcs mst_state_funcs = {
+static inline int
+drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,
+                                       struct drm_dp_mst_topology_state *mst_state)
+{
+        struct drm_dp_vcpi_allocation *vcpi;
+        int avail_slots = 63, payload_count = 0;
+
+        list_for_each_entry(vcpi, &mst_state->vcpis, next) {
+                /* Releasing VCPI is always OK-even if the port is gone */
+                if (!vcpi->vcpi) {
+                        DRM_DEBUG_ATOMIC("[MST PORT:%p] releases all VCPI slots\n",
+                                         vcpi->port);
+                        continue;
+                }
+
+                DRM_DEBUG_ATOMIC("[MST PORT:%p] requires %d vcpi slots\n",
+                                 vcpi->port, vcpi->vcpi);
+
+                avail_slots -= vcpi->vcpi;
+                if (avail_slots < 0) {
+                        DRM_DEBUG_ATOMIC("[MST PORT:%p] not enough VCPI slots in mst state %p (avail=%d)\n",
+                                         vcpi->port, mst_state,
+                                         avail_slots + vcpi->vcpi);
+                        return -ENOSPC;
+                }
+
+                if (++payload_count > mgr->max_payloads) {
+                        DRM_DEBUG_ATOMIC("[MST MGR:%p] state %p has too many payloads (max=%d)\n",
+                                         mgr, mst_state, mgr->max_payloads);
+                        return -EINVAL;
+                }
+        }
+        DRM_DEBUG_ATOMIC("[MST MGR:%p] mst state %p VCPI avail=%d used=%d\n",
+                         mgr, mst_state, avail_slots,
+                         63 - avail_slots);
+
+        return 0;
+}
+
+/**
+ * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an
+ * atomic update is valid
+ * @state: Pointer to the new &struct drm_dp_mst_topology_state
+ *
+ * Checks the given topology state for an atomic update to ensure that it's
+ * valid. This includes checking whether there's enough bandwidth to support
+ * the new VCPI allocations in the atomic update.
+ *
+ * Any atomic drivers supporting DP MST must make sure to call this after
+ * checking the rest of their state in their
+ * &drm_mode_config_funcs.atomic_check() callback.
+ *
+ * See also:
+ * drm_dp_atomic_find_vcpi_slots()
+ * drm_dp_atomic_release_vcpi_slots()
+ *
+ * Returns:
+ *
+ * 0 if the new state is valid, negative error code otherwise.
+ */
+int drm_dp_mst_atomic_check(struct drm_atomic_state *state)
+{
+        struct drm_dp_mst_topology_mgr *mgr;
+        struct drm_dp_mst_topology_state *mst_state;
+        int i, ret = 0;
+
+        for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) {
+                ret = drm_dp_mst_atomic_check_topology_state(mgr, mst_state);
+                if (ret)
+                        break;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL(drm_dp_mst_atomic_check);
+
+const struct drm_private_state_funcs drm_dp_mst_topology_state_funcs = {
         .atomic_duplicate_state = drm_dp_mst_duplicate_state,
         .atomic_destroy_state = drm_dp_mst_destroy_state,
 };
+EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
 
 /**
  * drm_atomic_get_mst_topology_state: get MST topology state
@@ -3228,13 +3794,11 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
                 return -ENOMEM;
 
         mst_state->mgr = mgr;
-
-        /* max. time slots - one slot for MTP header */
-        mst_state->avail_slots = 63;
+        INIT_LIST_HEAD(&mst_state->vcpis);
 
         drm_atomic_private_obj_init(dev, &mgr->base,
                                     &mst_state->base,
-                                    &mst_state_funcs);
+                                    &drm_dp_mst_topology_state_funcs);
 
         return 0;
 }
@@ -3292,7 +3856,7 @@ static int drm_dp_mst_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs
         struct drm_dp_sideband_msg_tx *txmsg = NULL;
         int ret;
 
-        mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent);
+        mstb = drm_dp_mst_topology_get_mstb_validated(mgr, port->parent);
         if (!mstb)
                 return -EREMOTEIO;
 
@@ -3342,7 +3906,7 @@ static int drm_dp_mst_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs
         }
 out:
         kfree(txmsg);
-        drm_dp_put_mst_branch_device(mstb);
+        drm_dp_mst_topology_put_mstb(mstb);
         return ret;
 }
 
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index a5fe91b8c3c9..381581b01d48 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -264,14 +264,13 @@ void drm_minor_release(struct drm_minor *minor)
  * DOC: driver instance overview
  *
  * A device instance for a drm driver is represented by &struct drm_device. This
- * is allocated with drm_dev_alloc(), usually from bus-specific ->probe()
+ * is initialized with drm_dev_init(), usually from bus-specific ->probe()
  * 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 &drm_driver.load callback. But due to
@@ -287,9 +286,6 @@ void drm_minor_release(struct drm_minor *minor)
  * Note that the lifetime rules for &drm_device instance has still a lot of
  * historical baggage. Hence use the reference counting provided by
  * drm_dev_get() and drm_dev_put() only carefully.
- *
- * It is recommended that drivers embed &struct drm_device into their own device
- * structure, which is supported through drm_dev_init().
  */
 
 /**
@@ -475,6 +471,9 @@ static void drm_fs_inode_free(struct inode *inode)
  * The initial ref-count of the object is 1. Use drm_dev_get() and
  * drm_dev_put() to take and drop further ref-counts.
  *
+ * It is recommended that drivers embed &struct drm_device into their own device
+ * structure.
+ *
  * Drivers that do not want to allocate their own device struct
  * embedding &struct drm_device can call drm_dev_alloc() instead. For drivers
  * that do embed &struct drm_device it must be placed first in the overall
@@ -765,7 +764,7 @@ static void remove_compat_control_link(struct drm_device *dev)
  * @flags: Flags passed to the driver's .load() function
  *
  * 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()
+ * and start normal device operation. @dev must be initialized via drm_dev_init()
  * previously.
  *
  * Never call this twice on any device!
@@ -877,9 +876,9 @@ EXPORT_SYMBOL(drm_dev_unregister);
  * @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.
+ * Sets the unique name of a DRM device using the specified string. This is
+ * already done by drm_dev_init(), drivers should only override the default
+ * unique name for backwards compatibility reasons.
  *
  * Return: 0 on success or a negative error code on failure.
  */
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index b506e3622b08..990b1909f9d7 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3641,6 +3641,20 @@ static bool cea_db_is_hdmi_forum_vsdb(const u8 *db)
         return oui == HDMI_FORUM_IEEE_OUI;
 }
 
+static bool cea_db_is_vcdb(const u8 *db)
+{
+        if (cea_db_tag(db) != USE_EXTENDED_TAG)
+                return false;
+
+        if (cea_db_payload_len(db) != 2)
+                return false;
+
+        if (cea_db_extended_tag(db) != EXT_VIDEO_CAPABILITY_BLOCK)
+                return false;
+
+        return true;
+}
+
 static bool cea_db_is_y420cmdb(const u8 *db)
 {
         if (cea_db_tag(db) != USE_EXTENDED_TAG)
@@ -4223,41 +4237,6 @@ end:
 }
 EXPORT_SYMBOL(drm_detect_monitor_audio);
 
-/**
- * drm_rgb_quant_range_selectable - is RGB quantization range selectable?
- * @edid: EDID block to scan
- *
- * Check whether the monitor reports the RGB quantization range selection
- * as supported. The AVI infoframe can then be used to inform the monitor
- * which quantization range (full or limited) is used.
- *
- * Return: True if the RGB quantization range is selectable, false otherwise.
- */
-bool drm_rgb_quant_range_selectable(struct edid *edid)
-{
-        u8 *edid_ext;
-        int i, start, end;
-
-        edid_ext = drm_find_cea_extension(edid);
-        if (!edid_ext)
-                return false;
-
-        if (cea_db_offsets(edid_ext, &start, &end))
-                return false;
-
-        for_each_cea_db(edid_ext, i, start, end) {
-                if (cea_db_tag(&edid_ext[i]) == USE_EXTENDED_TAG &&
-                    cea_db_payload_len(&edid_ext[i]) == 2 &&
-                    cea_db_extended_tag(&edid_ext[i]) ==
-                        EXT_VIDEO_CAPABILITY_BLOCK) {
-                        DRM_DEBUG_KMS("CEA VCDB 0x%02x\n", edid_ext[i + 2]);
-                        return edid_ext[i + 2] & EDID_CEA_VCDB_QS;
-                }
-        }
-
-        return false;
-}
-EXPORT_SYMBOL(drm_rgb_quant_range_selectable);
 
 /**
  * drm_default_rgb_quant_range - default RGB quantization range
@@ -4278,6 +4257,16 @@ drm_default_rgb_quant_range(const struct drm_display_mode *mode)
 }
 EXPORT_SYMBOL(drm_default_rgb_quant_range);
 
+static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)
+{
+        struct drm_display_info *info = &connector->display_info;
+
+        DRM_DEBUG_KMS("CEA VCDB 0x%02x\n", db[2]);
+
+        if (db[2] & EDID_CEA_VCDB_QS)
+                info->rgb_quant_range_selectable = true;
+}
+
 static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector,
                                                const u8 *db)
 {
@@ -4452,6 +4441,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
                         drm_parse_hdmi_forum_vsdb(connector, db);
                 if (cea_db_is_y420cmdb(db))
                         drm_parse_y420cmdb_bitmap(connector, db);
+                if (cea_db_is_vcdb(db))
+                        drm_parse_vcdb(connector, db);
         }
 }
 
@@ -4472,6 +4463,7 @@ drm_reset_display_info(struct drm_connector *connector)
         info->max_tmds_clock = 0;
         info->dvi_dual = false;
         info->has_hdmi_infoframe = false;
+        info->rgb_quant_range_selectable = false;
         memset(&info->hdmi, 0, sizeof(info->hdmi));
 
         info->non_desktop = 0;
@@ -4830,19 +4822,32 @@ void drm_set_preferred_mode(struct drm_connector *connector,
 }
 EXPORT_SYMBOL(drm_set_preferred_mode);
 
+static bool is_hdmi2_sink(struct drm_connector *connector)
+{
+        /*
+         * FIXME: sil-sii8620 doesn't have a connector around when
+         * we need one, so we have to be prepared for a NULL connector.
+         */
+        if (!connector)
+                return true;
+
+        return connector->display_info.hdmi.scdc.supported ||
+                connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB420;
+}
+
 /**
  * drm_hdmi_avi_infoframe_from_display_mode() - fill an HDMI AVI infoframe with
  *                                              data from a DRM display mode
  * @frame: HDMI AVI infoframe
+ * @connector: the connector
  * @mode: DRM display mode
- * @is_hdmi2_sink: Sink is HDMI 2.0 compliant
  *
  * Return: 0 on success or a negative error code on failure.
  */
 int
 drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
-                                         const struct drm_display_mode *mode,
-                                         bool is_hdmi2_sink)
+                                         struct drm_connector *connector,
+                                         const struct drm_display_mode *mode)
 {
         enum hdmi_picture_aspect picture_aspect;
         int err;
@@ -4864,7 +4869,7 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
          * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
          * have to make sure we dont break HDMI 1.4 sinks.
          */
-        if (!is_hdmi2_sink && frame->video_code > 64)
+        if (!is_hdmi2_sink(connector) && frame->video_code > 64)
                 frame->video_code = 0;
 
         /*
@@ -4923,22 +4928,18 @@ EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);
  * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
  *                                        quantization range information
  * @frame: HDMI AVI infoframe
+ * @connector: the connector
  * @mode: DRM display mode
  * @rgb_quant_range: RGB quantization range (Q)
- * @rgb_quant_range_selectable: Sink support selectable RGB quantization range (QS)
- * @is_hdmi2_sink: HDMI 2.0 sink, which has different default recommendations
- *
- * Note that @is_hdmi2_sink can be derived by looking at the
- * &drm_scdc.supported flag stored in &drm_hdmi_info.scdc,
- * &drm_display_info.hdmi, which can be found in &drm_connector.display_info.
  */
 void
 drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
+                                   struct drm_connector *connector,
                                    const struct drm_display_mode *mode,
-                                   enum hdmi_quantization_range rgb_quant_range,
-                                   bool rgb_quant_range_selectable,
-                                   bool is_hdmi2_sink)
+                                   enum hdmi_quantization_range rgb_quant_range)
 {
+        const struct drm_display_info *info = &connector->display_info;
+
         /*
          * CEA-861:
          * "A Source shall not send a non-zero Q value that does not correspond
@@ -4949,7 +4950,7 @@ drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
          * HDMI 2.0 recommends sending non-zero Q when it does match the
          * default RGB quantization range for the mode, even when QS=0.
          */
-        if (rgb_quant_range_selectable ||
+        if (info->rgb_quant_range_selectable ||
             rgb_quant_range == drm_default_rgb_quant_range(mode))
                 frame->quantization_range = rgb_quant_range;
         else
@@ -4968,7 +4969,7 @@ drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
          * we limit non-zero YQ to HDMI 2.0 sinks only as HDMI 2.0 is based
          * on on CEA-861-F.
          */
-        if (!is_hdmi2_sink ||
+        if (!is_hdmi2_sink(connector) ||
             rgb_quant_range == HDMI_QUANTIZATION_RANGE_LIMITED)
                 frame->ycc_quantization_range =
                         HDMI_YCC_QUANTIZATION_RANGE_LIMITED;
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index d3af098b0922..ca706fb1d975 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1797,6 +1797,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
         int i;
         struct drm_fb_helper_surface_size sizes;
         int gamma_size = 0;
+        int best_depth = 0;
 
         memset(&sizes, 0, sizeof(struct drm_fb_helper_surface_size));
         sizes.surface_depth = 24;
@@ -1804,7 +1805,10 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
         sizes.fb_width = (u32)-1;
         sizes.fb_height = (u32)-1;
 
-        /* if driver picks 8 or 16 by default use that for both depth/bpp */
+        /*
+         * If driver picks 8 or 16 by default use that for both depth/bpp
+         * to begin with
+         */
         if (preferred_bpp != sizes.surface_bpp)
                 sizes.surface_depth = sizes.surface_bpp = preferred_bpp;
 
@@ -1839,6 +1843,55 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
                 }
         }
 
+        /*
+         * If we run into a situation where, for example, the primary plane
+         * supports RGBA5551 (16 bpp, depth 15) but not RGB565 (16 bpp, depth
+         * 16) we need to scale down the depth of the sizes we request.
+         */
+        for (i = 0; i < fb_helper->crtc_count; i++) {
+                struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
+                struct drm_crtc *crtc = mode_set->crtc;
+                struct drm_plane *plane = crtc->primary;
+                int j;
+
+                DRM_DEBUG("test CRTC %d primary plane\n", i);
+
+                for (j = 0; j < plane->format_count; j++) {
+                        const struct drm_format_info *fmt;
+
+                        fmt = drm_format_info(plane->format_types[j]);
+
+                        /*
+                         * Do not consider YUV or other complicated formats
+                         * for framebuffers. This means only legacy formats
+                         * are supported (fmt->depth is a legacy field) but
+                         * the framebuffer emulation can only deal with such
+                         * formats, specifically RGB/BGA formats.
+                         */
+                        if (fmt->depth == 0)
+                                continue;
+
+                        /* We found a perfect fit, great */
+                        if (fmt->depth == sizes.surface_depth) {
+                                best_depth = fmt->depth;
+                                break;
+                        }
+
+                        /* Skip depths above what we're looking for */
+                        if (fmt->depth > sizes.surface_depth)
+                                continue;
+
+                        /* Best depth found so far */
+                        if (fmt->depth > best_depth)
+                                best_depth = fmt->depth;
+                }
+        }
+        if (sizes.surface_depth != best_depth) {
+                DRM_INFO("requested bpp %d, scaled depth down to %d",
+                         sizes.surface_bpp, best_depth);
+                sizes.surface_depth = best_depth;
+        }
+
         crtc_count = 0;
         for (i = 0; i < fb_helper->crtc_count; i++) {
                 struct drm_display_mode *desired_mode;
@@ -2866,7 +2919,7 @@ int drm_fb_helper_fbdev_setup(struct drm_device *dev,
         return 0;
 
 err_drm_fb_helper_fini:
-        drm_fb_helper_fini(fb_helper);
+        drm_fb_helper_fbdev_teardown(dev);
 
         return ret;
 }
@@ -2961,18 +3014,16 @@ static int drm_fbdev_fb_release(struct fb_info *info, int user)
         return 0;
 }
 
-/*
- * fb_ops.fb_destroy is called by the last put_fb_info() call at the end of
- * unregister_framebuffer() or fb_release().
- */
-static void drm_fbdev_fb_destroy(struct fb_info *info)
+static void drm_fbdev_cleanup(struct drm_fb_helper *fb_helper)
 {
-        struct drm_fb_helper *fb_helper = info->par;
         struct fb_info *fbi = fb_helper->fbdev;
         struct fb_ops *fbops = NULL;
         void *shadow = NULL;
 
-        if (fbi->fbdefio) {
+        if (!fb_helper->dev)
+                return;
+
+        if (fbi && fbi->fbdefio) {
                 fb_deferred_io_cleanup(fbi);
                 shadow = fbi->screen_buffer;
                 fbops = fbi->fbops;
@@ -2986,6 +3037,12 @@ static void drm_fbdev_fb_destroy(struct fb_info *info)
         }
 
         drm_client_framebuffer_delete(fb_helper->buffer);
+}
+
+static void drm_fbdev_release(struct drm_fb_helper *fb_helper)
+{
+        drm_fbdev_cleanup(fb_helper);
+
         /*
          * FIXME:
          * Remove conditional when all CMA drivers have been moved over to using
@@ -2997,6 +3054,15 @@ static void drm_fbdev_fb_destroy(struct fb_info *info)
         }
 }
 
+/*
+ * fb_ops.fb_destroy is called by the last put_fb_info() call at the end of
+ * unregister_framebuffer() or fb_release().
+ */
+static void drm_fbdev_fb_destroy(struct fb_info *info)
+{
+        drm_fbdev_release(info->par);
+}
+
 static int drm_fbdev_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
         struct drm_fb_helper *fb_helper = info->par;
@@ -3047,7 +3113,6 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
         struct drm_framebuffer *fb;
         struct fb_info *fbi;
         u32 format;
-        int ret;
 
         DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d)\n",
                       sizes->surface_width, sizes->surface_height,
@@ -3064,10 +3129,8 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
         fb = buffer->fb;
 
         fbi = drm_fb_helper_alloc_fbi(fb_helper);
-        if (IS_ERR(fbi)) {
-                ret = PTR_ERR(fbi);
-                goto err_free_buffer;
-        }
+        if (IS_ERR(fbi))
+                return PTR_ERR(fbi);
 
         fbi->par = fb_helper;
         fbi->fbops = &drm_fbdev_fb_ops;
@@ -3098,8 +3161,7 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
                 if (!fbops || !shadow) {
                         kfree(fbops);
                         vfree(shadow);
-                        ret = -ENOMEM;
-                        goto err_fb_info_destroy;
+                        return -ENOMEM;
                 }
 
                 *fbops = *fbi->fbops;
@@ -3111,13 +3173,6 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
         }
 
         return 0;
-
-err_fb_info_destroy:
-        drm_fb_helper_fini(fb_helper);
-err_free_buffer:
-        drm_client_framebuffer_delete(buffer);
-
-        return ret;
 }
 EXPORT_SYMBOL(drm_fb_helper_generic_probe);
 
@@ -3129,18 +3184,11 @@ static void drm_fbdev_client_unregister(struct drm_client_dev *client)
 {
         struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
 
-        if (fb_helper->fbdev) {
-                drm_fb_helper_unregister_fbi(fb_helper);
+        if (fb_helper->fbdev)
                 /* drm_fbdev_fb_destroy() takes care of cleanup */
-                return;
-        }
-
-        /* Did drm_fb_helper_fbdev_setup() run? */
-        if (fb_helper->dev)
-                drm_fb_helper_fini(fb_helper);
-
-        drm_client_release(client);
-        kfree(fb_helper);
+                drm_fb_helper_unregister_fbi(fb_helper);
+        else
+                drm_fbdev_release(fb_helper);
 }
 
 static int drm_fbdev_client_restore(struct drm_client_dev *client)
@@ -3158,7 +3206,7 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client)
         struct drm_device *dev = client->dev;
         int ret;
 
-        /* If drm_fb_helper_fbdev_setup() failed, we only try once */
+        /* Setup is not retried if it has failed */
         if (!fb_helper->dev && fb_helper->funcs)
                 return 0;
 
@@ -3170,15 +3218,34 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client)
                 return 0;
         }
 
-        ret = drm_fb_helper_fbdev_setup(dev, fb_helper, &drm_fb_helper_generic_funcs,
-                                        fb_helper->preferred_bpp, 0);
-        if (ret) {
-                fb_helper->dev = NULL;
-                fb_helper->fbdev = NULL;
-                return ret;
-        }
+        drm_fb_helper_prepare(dev, fb_helper, &drm_fb_helper_generic_funcs);
+
+        ret = drm_fb_helper_init(dev, fb_helper, dev->mode_config.num_connector);
+        if (ret)
+                goto err;
+
+        ret = drm_fb_helper_single_add_all_connectors(fb_helper);
+        if (ret)
+                goto err_cleanup;
+
+        if (!drm_drv_uses_atomic_modeset(dev))
+                drm_helper_disable_unused_functions(dev);
+
+        ret = drm_fb_helper_initial_config(fb_helper, fb_helper->preferred_bpp);
+        if (ret)
+                goto err_cleanup;
 
         return 0;
+
+err_cleanup:
+        drm_fbdev_cleanup(fb_helper);
+err:
+        fb_helper->dev = NULL;
+        fb_helper->fbdev = NULL;
+
+        DRM_DEV_ERROR(dev->dev, "fbdev: Failed to setup generic emulation (ret=%d)\n", ret);
+
+        return ret;
 }
 
 static const struct drm_client_funcs drm_fbdev_client_funcs = {
@@ -3237,6 +3304,10 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
 
         drm_client_add(&fb_helper->client);
 
+        if (!preferred_bpp)
+                preferred_bpp = dev->mode_config.preferred_depth;
+        if (!preferred_bpp)
+                preferred_bpp = 32;
         fb_helper->preferred_bpp = preferred_bpp;
 
         ret = drm_fbdev_client_hotplug(&fb_helper->client);
diff --git a/drivers/gpu/drm/drm_flip_work.c b/drivers/gpu/drm/drm_flip_work.c
index 12dea16f22a8..3da3bf5af405 100644
--- a/drivers/gpu/drm/drm_flip_work.c
+++ b/drivers/gpu/drm/drm_flip_work.c
@@ -22,6 +22,7 @@
  */
 
 #include <drm/drmP.h>
+#include <drm/drm_util.h>
 #include <drm/drm_flip_work.h>
 
 /**
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index fcaea8f50513..7abcb265a108 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -27,6 +27,7 @@
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_uapi.h>
 #include <drm/drm_print.h>
+#include <drm/drm_util.h>
 
 #include "drm_internal.h"
 #include "drm_crtc_internal.h"
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 8b55ece97967..2896ff60552f 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -37,6 +37,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/dma-buf.h>
 #include <linux/mem_encrypt.h>
+#include <linux/pagevec.h>
 #include <drm/drmP.h>
 #include <drm/drm_vma_manager.h>
 #include <drm/drm_gem.h>
@@ -526,6 +527,17 @@ int drm_gem_create_mmap_offset(struct drm_gem_object *obj)
 }
 EXPORT_SYMBOL(drm_gem_create_mmap_offset);
 
+/*
+ * Move pages to appropriate lru and release the pagevec, decrementing the
+ * ref count of those pages.
+ */
+static void drm_gem_check_release_pagevec(struct pagevec *pvec)
+{
+        check_move_unevictable_pages(pvec);
+        __pagevec_release(pvec);
+        cond_resched();
+}
+
 /**
  * drm_gem_get_pages - helper to allocate backing pages for a GEM object
  * from shmem
@@ -551,6 +563,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
 {
         struct address_space *mapping;
         struct page *p, **pages;
+        struct pagevec pvec;
         int i, npages;
 
         /* This is the shared memory object that backs the GEM resource */
@@ -568,6 +581,8 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
         if (pages == NULL)
                 return ERR_PTR(-ENOMEM);
 
+        mapping_set_unevictable(mapping);
+
         for (i = 0; i < npages; i++) {
                 p = shmem_read_mapping_page(mapping, i);
                 if (IS_ERR(p))
@@ -586,8 +601,14 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
         return pages;
 
 fail:
-        while (i--)
-                put_page(pages[i]);
+        mapping_clear_unevictable(mapping);
+        pagevec_init(&pvec);
+        while (i--) {
+                if (!pagevec_add(&pvec, pages[i]))
+                        drm_gem_check_release_pagevec(&pvec);
+        }
+        if (pagevec_count(&pvec))
+                drm_gem_check_release_pagevec(&pvec);
 
         kvfree(pages);
         return ERR_CAST(p);
@@ -605,6 +626,11 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
                 bool dirty, bool accessed)
 {
         int i, npages;
+        struct address_space *mapping;
+        struct pagevec pvec;
+
+        mapping = file_inode(obj->filp)->i_mapping;
+        mapping_clear_unevictable(mapping);
 
         /* We already BUG_ON() for non-page-aligned sizes in
          * drm_gem_object_init(), so we should never hit this unless
@@ -614,6 +640,7 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
 
         npages = obj->size >> PAGE_SHIFT;
 
+        pagevec_init(&pvec);
         for (i = 0; i < npages; i++) {
                 if (dirty)
                         set_page_dirty(pages[i]);
@@ -622,8 +649,11 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
                         mark_page_accessed(pages[i]);
 
                 /* Undo the reference we took when populating the table */
-                put_page(pages[i]);
+                if (!pagevec_add(&pvec, pages[i]))
+                        drm_gem_check_release_pagevec(&pvec);
         }
+        if (pagevec_count(&pvec))
+                drm_gem_check_release_pagevec(&pvec);
 
         kvfree(pages);
 }
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 24a750436559..adce9a26bac9 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -71,11 +71,6 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev)
         if (!nmode)
                 return NULL;
 
-        if (drm_mode_object_add(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) {
-                kfree(nmode);
-                return NULL;
-        }
-
         return nmode;
 }
 EXPORT_SYMBOL(drm_mode_create);
@@ -92,8 +87,6 @@ void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode)
         if (!mode)
                 return;
 
-        drm_mode_object_unregister(dev, &mode->base);
-
         kfree(mode);
 }
 EXPORT_SYMBOL(drm_mode_destroy);
@@ -911,11 +904,9 @@ EXPORT_SYMBOL(drm_mode_set_crtcinfo);
  */
 void drm_mode_copy(struct drm_display_mode *dst, const struct drm_display_mode *src)
 {
-        int id = dst->base.id;
         struct list_head head = dst->head;
 
         *dst = *src;
-        dst->base.id = id;
         dst->head = head;
 }
 EXPORT_SYMBOL(drm_mode_copy);
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 2763a5ec845b..f2f71d71494a 100644
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -217,9 +217,11 @@ int drm_of_encoder_active_endpoint(struct device_node *node,
 }
 EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint);
 
-/*
+/**
  * drm_of_find_panel_or_bridge - return connected panel or bridge device
  * @np: device tree node containing encoder output ports
+ * @port: port in the device tree node
+ * @endpoint: endpoint in the device tree node
  * @panel: pointer to hold returned drm_panel
  * @bridge: pointer to hold returned drm_bridge
  *
diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c
index c33f95e08e1b..dbd5b873e8f2 100644
--- a/drivers/gpu/drm/drm_panel.c
+++ b/drivers/gpu/drm/drm_panel.c
@@ -36,6 +36,9 @@ static LIST_HEAD(panel_list);
  * The DRM panel helpers allow drivers to register panel objects with a
  * central registry and provide functions to retrieve those panels in display
  * drivers.
+ *
+ * For easy integration into drivers using the &drm_bridge infrastructure please
+ * take look at drm_panel_bridge_add() and devm_drm_panel_bridge_add().
  */
 
 /**
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 5f650d8fc66b..4cfb56893b7f 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -220,6 +220,9 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
                         format_modifier_count++;
         }
 
+        if (format_modifier_count)
+                config->allow_fb_modifiers = true;
+
         plane->modifier_count = format_modifier_count;
         plane->modifiers = kmalloc_array(format_modifier_count,
                                          sizeof(format_modifiers[0]),
diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 98e091175921..cde71ee95a8f 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -105,13 +105,20 @@ static void store_vblank(struct drm_device *dev, unsigned int pipe,
         write_sequnlock(&vblank->seqlock);
 }
 
+static u32 drm_max_vblank_count(struct drm_device *dev, unsigned int pipe)
+{
+        struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
+        return vblank->max_vblank_count ?: dev->max_vblank_count;
+}
+
 /*
  * "No hw counter" fallback implementation of .get_vblank_counter() hook,
  * if there is no useable hardware frame counter available.
  */
 static u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe)
 {
-        WARN_ON_ONCE(dev->max_vblank_count != 0);
+        WARN_ON_ONCE(drm_max_vblank_count(dev, pipe) != 0);
         return 0;
 }
 
@@ -198,6 +205,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
         ktime_t t_vblank;
         int count = DRM_TIMESTAMP_MAXRETRIES;
         int framedur_ns = vblank->framedur_ns;
+        u32 max_vblank_count = drm_max_vblank_count(dev, pipe);
 
         /*
          * Interrupts were disabled prior to this call, so deal with counter
@@ -216,9 +224,9 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
                 rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, in_vblank_irq);
         } while (cur_vblank != __get_vblank_counter(dev, pipe) && --count > 0);
 
-        if (dev->max_vblank_count != 0) {
+        if (max_vblank_count) {
                 /* trust the hw counter when it's around */
-                diff = (cur_vblank - vblank->last) & dev->max_vblank_count;
+                diff = (cur_vblank - vblank->last) & max_vblank_count;
         } else if (rc && framedur_ns) {
                 u64 diff_ns = ktime_to_ns(ktime_sub(t_vblank, vblank->time));
 
@@ -1205,6 +1213,37 @@ void drm_crtc_vblank_reset(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_vblank_reset);
 
 /**
+ * drm_crtc_set_max_vblank_count - configure the hw max vblank counter value
+ * @crtc: CRTC in question
+ * @max_vblank_count: max hardware vblank counter value
+ *
+ * Update the maximum hardware vblank counter value for @crtc
+ * at runtime. Useful for hardware where the operation of the
+ * hardware vblank counter depends on the currently active
+ * display configuration.
+ *
+ * For example, if the hardware vblank counter does not work
+ * when a specific connector is active the maximum can be set
+ * to zero. And when that specific connector isn't active the
+ * maximum can again be set to the appropriate non-zero value.
+ *
+ * If used, must be called before drm_vblank_on().
+ */
+void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc,
+                                   u32 max_vblank_count)
+{
+        struct drm_device *dev = crtc->dev;
+        unsigned int pipe = drm_crtc_index(crtc);
+        struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
+        WARN_ON(dev->max_vblank_count);
+        WARN_ON(!READ_ONCE(vblank->inmodeset));
+
+        vblank->max_vblank_count = max_vblank_count;
+}
+EXPORT_SYMBOL(drm_crtc_set_max_vblank_count);
+
+/**
  * drm_crtc_vblank_on - enable vblank events on a CRTC
  * @crtc: CRTC in question
  *
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 2092a650df7d..b857df67aff0 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -819,7 +819,8 @@ static void hdmi_reg_infoframes(struct hdmi_context *hdata)
                 return;
         }
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi, m, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,
+                                                       &hdata->connector, m);
         if (!ret)
                 ret = hdmi_avi_infoframe_pack(&frm.avi, buf, sizeof(buf));
         if (ret > 0) {
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index e6a62d5a00a3..15e32e5d9101 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -22,6 +22,7 @@
 #include <drm/drmP.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
@@ -33,32 +34,15 @@ static struct kirin_dc_ops *dc_ops;
 
 static int kirin_drm_kms_cleanup(struct drm_device *dev)
 {
-        struct kirin_drm_private *priv = dev->dev_private;
-
-        if (priv->fbdev) {
-                drm_fbdev_cma_fini(priv->fbdev);
-                priv->fbdev = NULL;
-        }
-
         drm_kms_helper_poll_fini(dev);
         dc_ops->cleanup(to_platform_device(dev->dev));
         drm_mode_config_cleanup(dev);
-        devm_kfree(dev->dev, priv);
-        dev->dev_private = NULL;
 
         return 0;
 }
 
-static void kirin_fbdev_output_poll_changed(struct drm_device *dev)
-{
-        struct kirin_drm_private *priv = dev->dev_private;
-
-        drm_fbdev_cma_hotplug_event(priv->fbdev);
-}
-
 static const struct drm_mode_config_funcs kirin_drm_mode_config_funcs = {
         .fb_create = drm_gem_fb_create,
-        .output_poll_changed = kirin_fbdev_output_poll_changed,
         .atomic_check = drm_atomic_helper_check,
         .atomic_commit = drm_atomic_helper_commit,
 };
@@ -76,14 +60,8 @@ static void kirin_drm_mode_config_init(struct drm_device *dev)
 
 static int kirin_drm_kms_init(struct drm_device *dev)
 {
-        struct kirin_drm_private *priv;
         int ret;
 
-        priv = devm_kzalloc(dev->dev, sizeof(*priv), GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-
-        dev->dev_private = priv;
         dev_set_drvdata(dev->dev, dev);
 
         /* dev->mode_config initialization */
@@ -117,26 +95,14 @@ static int kirin_drm_kms_init(struct drm_device *dev)
         /* init kms poll for handling hpd */
         drm_kms_helper_poll_init(dev);
 
-        priv->fbdev = drm_fbdev_cma_init(dev, 32,
-                                         dev->mode_config.num_connector);
-
-        if (IS_ERR(priv->fbdev)) {
-                DRM_ERROR("failed to initialize fbdev.\n");
-                ret = PTR_ERR(priv->fbdev);
-                goto err_cleanup_poll;
-        }
         return 0;
 
-err_cleanup_poll:
-        drm_kms_helper_poll_fini(dev);
 err_unbind_all:
         component_unbind_all(dev->dev, dev);
 err_dc_cleanup:
         dc_ops->cleanup(to_platform_device(dev->dev));
 err_mode_config_cleanup:
         drm_mode_config_cleanup(dev);
-        devm_kfree(dev->dev, priv);
-        dev->dev_private = NULL;
 
         return ret;
 }
@@ -199,6 +165,8 @@ static int kirin_drm_bind(struct device *dev)
         if (ret)
                 goto err_kms_cleanup;
 
+        drm_fbdev_generic_setup(drm_dev, 32);
+
         return 0;
 
 err_kms_cleanup:
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
index 56cb62df065c..ad027d1cc826 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
@@ -19,10 +19,6 @@ struct kirin_dc_ops {
         void (*cleanup)(struct platform_device *pdev);
 };
 
-struct kirin_drm_private {
-        struct drm_fbdev_cma *fbdev;
-};
-
 extern const struct kirin_dc_ops ade_dc_ops;
 
 #endif /* __KIRIN_DRM_DRV_H__ */
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 544a8a2d3562..b91e48d2190d 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -359,10 +359,10 @@ static int ch7006_encoder_set_property(struct drm_encoder *encoder,
         if (modes_changed) {
                 drm_helper_probe_single_connector_modes(connector, 0, 0);
 
-                /* Disable the crtc to ensure a full modeset is
-                 * performed whenever it's turned on again. */
                 if (crtc)
-                        drm_crtc_force_disable(crtc);
+                        drm_crtc_helper_set_mode(crtc, &crtc->mode,
+                                                 crtc->x, crtc->y,
+                                                 crtc->primary->fb);
         }
 
         return 0;
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index a6ba461749b2..ecdb8070ed35 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -849,7 +849,8 @@ tda998x_write_avi(struct tda998x_priv *priv, const struct drm_display_mode *mode
 {
         union hdmi_infoframe frame;
 
-        drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);
+        drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+                                                 &priv->connector, mode);
         frame.avi.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;
 
         tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, &frame);
@@ -1122,7 +1123,6 @@ static void tda998x_connector_destroy(struct drm_connector *connector)
 }
 
 static const struct drm_connector_funcs tda998x_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
         .reset = drm_atomic_helper_connector_reset,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .detect = tda998x_connector_detect,
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 38dcee1ca062..9bad6a32adae 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2948,14 +2948,7 @@ static void intel_seq_print_mode(struct seq_file *m, int tabs,
         for (i = 0; i < tabs; i++)
                 seq_putc(m, '\t');
 
-        seq_printf(m, "id %d:\"%s\" freq %d clock %d hdisp %d hss %d hse %d htot %d vdisp %d vss %d vse %d vtot %d type 0x%x flags 0x%x\n",
-                   mode->base.id, mode->name,
-                   mode->vrefresh, mode->clock,
-                   mode->hdisplay, mode->hsync_start,
-                   mode->hsync_end, mode->htotal,
-                   mode->vdisplay, mode->vsync_start,
-                   mode->vsync_end, mode->vtotal,
-                   mode->type, mode->flags);
+        seq_printf(m, DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
 }
 
 static void intel_encoder_info(struct seq_file *m,
diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c
index 4dd793b78996..d9dcee4ec51f 100644
--- a/drivers/gpu/drm/i915/icl_dsi.c
+++ b/drivers/gpu/drm/i915/icl_dsi.c
@@ -1178,9 +1178,9 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder,
         pipe_config->output_types |= BIT(INTEL_OUTPUT_DSI);
 }
 
-static bool gen11_dsi_compute_config(struct intel_encoder *encoder,
-                                     struct intel_crtc_state *pipe_config,
-                                     struct drm_connector_state *conn_state)
+static int gen11_dsi_compute_config(struct intel_encoder *encoder,
+                                    struct intel_crtc_state *pipe_config,
+                                    struct drm_connector_state *conn_state)
 {
         struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
                                                    base);
@@ -1205,7 +1205,7 @@ static bool gen11_dsi_compute_config(struct intel_encoder *encoder,
         pipe_config->clock_set = true;
         pipe_config->port_clock = intel_dsi_bitrate(intel_dsi) / 5;
 
-        return true;
+        return 0;
 }
 
 static u64 gen11_dsi_get_power_domains(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c
index 18e370f607bc..37d2c644f4b8 100644
--- a/drivers/gpu/drm/i915/intel_connector.c
+++ b/drivers/gpu/drm/i915/intel_connector.c
@@ -95,6 +95,10 @@ void intel_connector_destroy(struct drm_connector *connector)
         intel_panel_fini(&intel_connector->panel);
 
         drm_connector_cleanup(connector);
+
+        if (intel_connector->port)
+                drm_dp_mst_put_port_malloc(intel_connector->port);
+
         kfree(connector);
 }
 
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 68f2fb89ece3..2e0fd9927db2 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -344,51 +344,52 @@ intel_crt_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static bool intel_crt_compute_config(struct intel_encoder *encoder,
-                                     struct intel_crtc_state *pipe_config,
-                                     struct drm_connector_state *conn_state)
+static int intel_crt_compute_config(struct intel_encoder *encoder,
+                                    struct intel_crtc_state *pipe_config,
+                                    struct drm_connector_state *conn_state)
 {
         struct drm_display_mode *adjusted_mode =
                 &pipe_config->base.adjusted_mode;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
-        return true;
+
+        return 0;
 }
 
-static bool pch_crt_compute_config(struct intel_encoder *encoder,
-                                   struct intel_crtc_state *pipe_config,
-                                   struct drm_connector_state *conn_state)
+static int pch_crt_compute_config(struct intel_encoder *encoder,
+                                  struct intel_crtc_state *pipe_config,
+                                  struct drm_connector_state *conn_state)
 {
         struct drm_display_mode *adjusted_mode =
                 &pipe_config->base.adjusted_mode;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->has_pch_encoder = true;
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
 
-        return true;
+        return 0;
 }
 
-static bool hsw_crt_compute_config(struct intel_encoder *encoder,
-                                   struct intel_crtc_state *pipe_config,
-                                   struct drm_connector_state *conn_state)
+static int hsw_crt_compute_config(struct intel_encoder *encoder,
+                                  struct intel_crtc_state *pipe_config,
+                                  struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct drm_display_mode *adjusted_mode =
                 &pipe_config->base.adjusted_mode;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         /* HSW/BDW FDI limited to 4k */
         if (adjusted_mode->crtc_hdisplay > 4096 ||
             adjusted_mode->crtc_hblank_start > 4096)
-                return false;
+                return -EINVAL;
 
         pipe_config->has_pch_encoder = true;
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
@@ -397,7 +398,7 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,
         if (HAS_PCH_LPT(dev_priv)) {
                 if (pipe_config->bw_constrained && pipe_config->pipe_bpp < 24) {
                         DRM_DEBUG_KMS("LPT only supports 24bpp\n");
-                        return false;
+                        return -EINVAL;
                 }
 
                 pipe_config->pipe_bpp = 24;
@@ -406,7 +407,7 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,
         /* FDI must always be 2.7 GHz */
         pipe_config->port_clock = 135000 * 2;
 
-        return true;
+        return 0;
 }
 
 static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index f3e1d6a0b7dd..fd06d1fd39d3 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3875,9 +3875,9 @@ intel_ddi_compute_output_type(struct intel_encoder *encoder,
         }
 }
 
-static bool intel_ddi_compute_config(struct intel_encoder *encoder,
-                                     struct intel_crtc_state *pipe_config,
-                                     struct drm_connector_state *conn_state)
+static int intel_ddi_compute_config(struct intel_encoder *encoder,
+                                    struct intel_crtc_state *pipe_config,
+                                    struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         enum port port = encoder->port;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3da9c0f9e948..52c63135bc65 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11517,10 +11517,13 @@ encoder_retry:
                         continue;
 
                 encoder = to_intel_encoder(connector_state->best_encoder);
-
-                if (!(encoder->compute_config(encoder, pipe_config, connector_state))) {
-                        DRM_DEBUG_KMS("Encoder config failure\n");
-                        return -EINVAL;
+                ret = encoder->compute_config(encoder, pipe_config,
+                                              connector_state);
+                if (ret < 0) {
+                        if (ret != -EDEADLK)
+                                DRM_DEBUG_KMS("Encoder config failure: %d\n",
+                                              ret);
+                        return ret;
                 }
         }
 
@@ -12695,6 +12698,10 @@ static int intel_atomic_check(struct drm_device *dev,
                                        "[modeset]" : "[fastset]");
         }
 
+        ret = drm_dp_mst_atomic_check(state);
+        if (ret)
+                return ret;
+
         if (any_ms) {
                 ret = intel_modeset_checks(state);
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index fdd2cbc56fa3..d18b72b5f0b8 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1808,7 +1808,7 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp,
 }
 
 /* Optimize link config in order: max bpp, min clock, min lanes */
-static bool
+static int
 intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,
                                   struct intel_crtc_state *pipe_config,
                                   const struct link_config_limits *limits)
@@ -1834,17 +1834,17 @@ intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,
                                         pipe_config->pipe_bpp = bpp;
                                         pipe_config->port_clock = link_clock;
 
-                                        return true;
+                                        return 0;
                                 }
                         }
                 }
         }
 
-        return false;
+        return -EINVAL;
 }
 
 /* Optimize link config in order: max bpp, min lanes, min clock */
-static bool
+static int
 intel_dp_compute_link_config_fast(struct intel_dp *intel_dp,
                                   struct intel_crtc_state *pipe_config,
                                   const struct link_config_limits *limits)
@@ -1870,13 +1870,13 @@ intel_dp_compute_link_config_fast(struct intel_dp *intel_dp,
                                         pipe_config->pipe_bpp = bpp;
                                         pipe_config->port_clock = link_clock;
 
-                                        return true;
+                                        return 0;
                                 }
                         }
                 }
         }
 
-        return false;
+        return -EINVAL;
 }
 
 static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)
@@ -1894,19 +1894,20 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)
         return 0;
 }
 
-static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
-                                        struct intel_crtc_state *pipe_config,
-                                        struct drm_connector_state *conn_state,
-                                        struct link_config_limits *limits)
+static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
+                                       struct intel_crtc_state *pipe_config,
+                                       struct drm_connector_state *conn_state,
+                                       struct link_config_limits *limits)
 {
         struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
         struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
         struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
         u8 dsc_max_bpc;
         int pipe_bpp;
+        int ret;
 
         if (!intel_dp_supports_dsc(intel_dp, pipe_config))
-                return false;
+                return -EINVAL;
 
         dsc_max_bpc = min_t(u8, DP_DSC_MAX_SUPPORTED_BPC,
                             conn_state->max_requested_bpc);
@@ -1914,7 +1915,7 @@ static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
         pipe_bpp = intel_dp_dsc_compute_bpp(intel_dp, dsc_max_bpc);
         if (pipe_bpp < DP_DSC_MIN_SUPPORTED_BPC * 3) {
                 DRM_DEBUG_KMS("No DSC support for less than 8bpc\n");
-                return false;
+                return -EINVAL;
         }
 
         /*
@@ -1948,7 +1949,7 @@ static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
                                                      adjusted_mode->crtc_hdisplay);
                 if (!dsc_max_output_bpp || !dsc_dp_slice_count) {
                         DRM_DEBUG_KMS("Compressed BPP/Slice Count not supported\n");
-                        return false;
+                        return -EINVAL;
                 }
                 pipe_config->dsc_params.compressed_bpp = min_t(u16,
                                                                dsc_max_output_bpp >> 4,
@@ -1965,16 +1966,19 @@ static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
                         pipe_config->dsc_params.dsc_split = true;
                 } else {
                         DRM_DEBUG_KMS("Cannot split stream to use 2 VDSC instances\n");
-                        return false;
+                        return -EINVAL;
                 }
         }
-        if (intel_dp_compute_dsc_params(intel_dp, pipe_config) < 0) {
+
+        ret = intel_dp_compute_dsc_params(intel_dp, pipe_config);
+        if (ret < 0) {
                 DRM_DEBUG_KMS("Cannot compute valid DSC parameters for Input Bpp = %d "
                               "Compressed BPP = %d\n",
                               pipe_config->pipe_bpp,
                               pipe_config->dsc_params.compressed_bpp);
-                return false;
+                return ret;
         }
+
         pipe_config->dsc_params.compression_enable = true;
         DRM_DEBUG_KMS("DP DSC computed with Input Bpp = %d "
                       "Compressed Bpp = %d Slice Count = %d\n",
@@ -1982,10 +1986,10 @@ static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
                       pipe_config->dsc_params.compressed_bpp,
                       pipe_config->dsc_params.slice_count);
 
-        return true;
+        return 0;
 }
 
-static bool
+static int
 intel_dp_compute_link_config(struct intel_encoder *encoder,
                              struct intel_crtc_state *pipe_config,
                              struct drm_connector_state *conn_state)
@@ -1994,7 +1998,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
         struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
         struct link_config_limits limits;
         int common_len;
-        bool ret;
+        int ret;
 
         common_len = intel_dp_common_len_rate_limit(intel_dp,
                                                     intel_dp->max_link_rate);
@@ -2051,10 +2055,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
                                                         &limits);
 
         /* enable compression if the mode doesn't fit available BW */
-        if (!ret) {
-                if (!intel_dp_dsc_compute_config(intel_dp, pipe_config,
-                                                 conn_state, &limits))
-                        return false;
+        if (ret) {
+                ret = intel_dp_dsc_compute_config(intel_dp, pipe_config,
+                                                  conn_state, &limits);
+                if (ret < 0)
+                        return ret;
         }
 
         if (pipe_config->dsc_params.compression_enable) {
@@ -2079,10 +2084,10 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
                               intel_dp_max_data_rate(pipe_config->port_clock,
                                                      pipe_config->lane_count));
         }
-        return true;
+        return 0;
 }
 
-bool
+int
 intel_dp_compute_config(struct intel_encoder *encoder,
                         struct intel_crtc_state *pipe_config,
                         struct drm_connector_state *conn_state)
@@ -2098,6 +2103,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
                 to_intel_digital_connector_state(conn_state);
         bool constant_n = drm_dp_has_quirk(&intel_dp->desc,
                                            DP_DPCD_QUIRK_CONSTANT_N);
+        int ret;
 
         if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv) && port != PORT_A)
                 pipe_config->has_pch_encoder = true;
@@ -2119,8 +2125,6 @@ intel_dp_compute_config(struct intel_encoder *encoder,
                                        adjusted_mode);
 
                 if (INTEL_GEN(dev_priv) >= 9) {
-                        int ret;
-
                         ret = skl_update_scaler_crtc(pipe_config);
                         if (ret)
                                 return ret;
@@ -2135,20 +2139,21 @@ intel_dp_compute_config(struct intel_encoder *encoder,
         }
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         if (HAS_GMCH_DISPLAY(dev_priv) &&
             adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
-                return false;
+                return -EINVAL;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)
-                return false;
+                return -EINVAL;
 
         pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) &&
                                   intel_dp_supports_fec(intel_dp, pipe_config);
 
-        if (!intel_dp_compute_link_config(encoder, pipe_config, conn_state))
-                return false;
+        ret = intel_dp_compute_link_config(encoder, pipe_config, conn_state);
+        if (ret < 0)
+                return ret;
 
         if (intel_conn_state->broadcast_rgb == INTEL_BROADCAST_RGB_AUTO) {
                 /*
@@ -2196,7 +2201,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 
         intel_psr_compute_config(intel_dp, pipe_config);
 
-        return true;
+        return 0;
 }
 
 void intel_dp_set_link_params(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 f05427b74e34..5899debe2184 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -30,9 +30,9 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_edid.h>
 
-static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
-                                        struct intel_crtc_state *pipe_config,
-                                        struct drm_connector_state *conn_state)
+static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
+                                       struct intel_crtc_state *pipe_config,
+                                       struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
@@ -41,15 +41,19 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
         struct drm_connector *connector = conn_state->connector;
         void *port = to_intel_connector(connector)->port;
         struct drm_atomic_state *state = pipe_config->base.state;
+        struct drm_crtc *crtc = pipe_config->base.crtc;
+        struct drm_crtc_state *old_crtc_state =
+                drm_atomic_get_old_crtc_state(state, crtc);
         int bpp;
-        int lane_count, slots = 0;
+        int lane_count, slots =
+                to_intel_crtc_state(old_crtc_state)->dp_m_n.tu;
         const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
         int mst_pbn;
         bool constant_n = drm_dp_has_quirk(&intel_dp->desc,
                                            DP_DPCD_QUIRK_CONSTANT_N);
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
         pipe_config->has_pch_encoder = false;
@@ -86,7 +90,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
                 if (slots < 0) {
                         DRM_DEBUG_KMS("failed finding vcpi slots:%d\n",
                                       slots);
-                        return false;
+                        return slots;
                 }
         }
 
@@ -104,38 +108,42 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
 
         intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
 
-        return true;
+        return 0;
 }
 
-static int intel_dp_mst_atomic_check(struct drm_connector *connector,
-                struct drm_connector_state *new_conn_state)
+static int
+intel_dp_mst_atomic_check(struct drm_connector *connector,
+                          struct drm_connector_state *new_conn_state)
 {
         struct drm_atomic_state *state = new_conn_state->state;
-        struct drm_connector_state *old_conn_state;
-        struct drm_crtc *old_crtc;
+        struct drm_connector_state *old_conn_state =
+                drm_atomic_get_old_connector_state(state, connector);
+        struct intel_connector *intel_connector =
+                to_intel_connector(connector);
+        struct drm_crtc *new_crtc = new_conn_state->crtc;
         struct drm_crtc_state *crtc_state;
-        int slots, ret = 0;
-
-        old_conn_state = drm_atomic_get_old_connector_state(state, connector);
-        old_crtc = old_conn_state->crtc;
-        if (!old_crtc)
-                return ret;
+        struct drm_dp_mst_topology_mgr *mgr;
+        int ret = 0;
 
-        crtc_state = drm_atomic_get_new_crtc_state(state, old_crtc);
-        slots = to_intel_crtc_state(crtc_state)->dp_m_n.tu;
-        if (drm_atomic_crtc_needs_modeset(crtc_state) && slots > 0) {
-                struct drm_dp_mst_topology_mgr *mgr;
-                struct drm_encoder *old_encoder;
+        if (!old_conn_state->crtc)
+                return 0;
 
-                old_encoder = old_conn_state->best_encoder;
-                mgr = &enc_to_mst(old_encoder)->primary->dp.mst_mgr;
+        /* We only want to free VCPI if this state disables the CRTC on this
+         * connector
+         */
+        if (new_crtc) {
+                crtc_state = drm_atomic_get_new_crtc_state(state, new_crtc);
 
-                ret = drm_dp_atomic_release_vcpi_slots(state, mgr, slots);
-                if (ret)
-                        DRM_DEBUG_KMS("failed releasing %d vcpi slots:%d\n", slots, ret);
-                else
-                        to_intel_crtc_state(crtc_state)->dp_m_n.tu = 0;
+                if (!crtc_state ||
+                    !drm_atomic_crtc_needs_modeset(crtc_state) ||
+                    crtc_state->enable)
+                        return 0;
         }
+
+        mgr = &enc_to_mst(old_conn_state->best_encoder)->primary->dp.mst_mgr;
+        ret = drm_dp_atomic_release_vcpi_slots(state, mgr,
+                                               intel_connector->port);
+
         return ret;
 }
 
@@ -457,6 +465,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
         intel_connector->get_hw_state = intel_dp_mst_get_hw_state;
         intel_connector->mst_port = intel_dp;
         intel_connector->port = port;
+        drm_dp_mst_get_port_malloc(port);
 
         connector = &intel_connector->base;
         ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index f94a04b4ad87..19d9abd2666e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -222,9 +222,9 @@ struct intel_encoder {
         enum intel_output_type (*compute_output_type)(struct intel_encoder *,
                                                       struct intel_crtc_state *,
                                                       struct drm_connector_state *);
-        bool (*compute_config)(struct intel_encoder *,
-                               struct intel_crtc_state *,
-                               struct drm_connector_state *);
+        int (*compute_config)(struct intel_encoder *,
+                              struct intel_crtc_state *,
+                              struct drm_connector_state *);
         void (*pre_pll_enable)(struct intel_encoder *,
                                const struct intel_crtc_state *,
                                const struct drm_connector_state *);
@@ -1074,7 +1074,6 @@ struct intel_hdmi {
         } dp_dual_mode;
         bool has_hdmi_sink;
         bool has_audio;
-        bool rgb_quant_range_selectable;
         struct intel_connector *attached_connector;
         struct cec_notifier *cec_notifier;
 };
@@ -1807,9 +1806,9 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp,
 void intel_dp_encoder_reset(struct drm_encoder *encoder);
 void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder);
 void intel_dp_encoder_destroy(struct drm_encoder *encoder);
-bool intel_dp_compute_config(struct intel_encoder *encoder,
-                             struct intel_crtc_state *pipe_config,
-                             struct drm_connector_state *conn_state);
+int intel_dp_compute_config(struct intel_encoder *encoder,
+                            struct intel_crtc_state *pipe_config,
+                            struct drm_connector_state *conn_state);
 bool intel_dp_is_edp(struct intel_dp *intel_dp);
 bool intel_dp_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
 enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port,
@@ -1967,9 +1966,9 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv, i915_reg_t hdmi_reg,
 void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                                struct intel_connector *intel_connector);
 struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder);
-bool intel_hdmi_compute_config(struct intel_encoder *encoder,
-                               struct intel_crtc_state *pipe_config,
-                               struct drm_connector_state *conn_state);
+int intel_hdmi_compute_config(struct intel_encoder *encoder,
+                              struct intel_crtc_state *pipe_config,
+                              struct drm_connector_state *conn_state);
 bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder,
                                        struct drm_connector *connector,
                                        bool high_tmds_clock_ratio,
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 0042a7f69387..17a16917e134 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -235,9 +235,9 @@ intel_dvo_mode_valid(struct drm_connector *connector,
         return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode);
 }
 
-static bool intel_dvo_compute_config(struct intel_encoder *encoder,
-                                     struct intel_crtc_state *pipe_config,
-                                     struct drm_connector_state *conn_state)
+static int intel_dvo_compute_config(struct intel_encoder *encoder,
+                                    struct intel_crtc_state *pipe_config,
+                                    struct drm_connector_state *conn_state)
 {
         struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
         const struct drm_display_mode *fixed_mode =
@@ -254,10 +254,11 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder,
                 intel_fixed_panel_mode(fixed_mode, adjusted_mode);
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
-        return true;
+
+        return 0;
 }
 
 static void intel_dvo_pre_enable(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 07e803a604bd..1da7bb148fca 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -479,18 +479,14 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
                                          const struct intel_crtc_state *crtc_state,
                                          const struct drm_connector_state *conn_state)
 {
-        struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
         const struct drm_display_mode *adjusted_mode =
                 &crtc_state->base.adjusted_mode;
-        struct drm_connector *connector = &intel_hdmi->attached_connector->base;
-        bool is_hdmi2_sink = connector->display_info.hdmi.scdc.supported ||
-           connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB420;
         union hdmi_infoframe frame;
         int ret;
 
         ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
-                                                       adjusted_mode,
-                                                       is_hdmi2_sink);
+                                                       conn_state->connector,
+                                                       adjusted_mode);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return;
@@ -503,12 +499,12 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
         else
                 frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
-        drm_hdmi_avi_infoframe_quant_range(&frame.avi, adjusted_mode,
+        drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+                                           conn_state->connector,
+                                           adjusted_mode,
                                            crtc_state->limited_color_range ?
                                            HDMI_QUANTIZATION_RANGE_LIMITED :
-                                           HDMI_QUANTIZATION_RANGE_FULL,
-                                           intel_hdmi->rgb_quant_range_selectable,
-                                           is_hdmi2_sink);
+                                           HDMI_QUANTIZATION_RANGE_FULL);
 
         drm_hdmi_avi_infoframe_content_type(&frame.avi,
                                             conn_state);
@@ -1707,9 +1703,9 @@ intel_hdmi_ycbcr420_config(struct drm_connector *connector,
         return true;
 }
 
-bool intel_hdmi_compute_config(struct intel_encoder *encoder,
-                               struct intel_crtc_state *pipe_config,
-                               struct drm_connector_state *conn_state)
+int intel_hdmi_compute_config(struct intel_encoder *encoder,
+                              struct intel_crtc_state *pipe_config,
+                              struct drm_connector_state *conn_state)
 {
         struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -1725,7 +1721,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
         bool force_dvi = intel_conn_state->force_audio == HDMI_AUDIO_OFF_DVI;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
         pipe_config->has_hdmi_sink = !force_dvi && intel_hdmi->has_hdmi_sink;
@@ -1756,7 +1752,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
                                                 &clock_12bpc, &clock_10bpc,
                                                 &clock_8bpc)) {
                         DRM_ERROR("Can't support YCBCR420 output\n");
-                        return false;
+                        return -EINVAL;
                 }
         }
 
@@ -1806,7 +1802,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
         if (hdmi_port_clock_valid(intel_hdmi, pipe_config->port_clock,
                                   false, force_dvi) != MODE_OK) {
                 DRM_DEBUG_KMS("unsupported HDMI clock, rejecting mode\n");
-                return false;
+                return -EINVAL;
         }
 
         /* Set user selected PAR to incoming mode's member */
@@ -1825,7 +1821,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
                 }
         }
 
-        return true;
+        return 0;
 }
 
 static void
@@ -1835,7 +1831,6 @@ intel_hdmi_unset_edid(struct drm_connector *connector)
 
         intel_hdmi->has_hdmi_sink = false;
         intel_hdmi->has_audio = false;
-        intel_hdmi->rgb_quant_range_selectable = false;
 
         intel_hdmi->dp_dual_mode.type = DRM_DP_DUAL_MODE_NONE;
         intel_hdmi->dp_dual_mode.max_tmds_clock = 0;
@@ -1919,9 +1914,6 @@ intel_hdmi_set_edid(struct drm_connector *connector)
 
         to_intel_connector(connector)->detect_edid = edid;
         if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
-                intel_hdmi->rgb_quant_range_selectable =
-                        drm_rgb_quant_range_selectable(edid);
-
                 intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
                 intel_hdmi->has_hdmi_sink = drm_detect_hdmi_monitor(edid);
 
diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
index 96a8d9524b0c..7d15be5932e0 100644
--- a/drivers/gpu/drm/i915/intel_lspcon.c
+++ b/drivers/gpu/drm/i915/intel_lspcon.c
@@ -462,10 +462,8 @@ void lspcon_set_infoframes(struct intel_encoder *encoder,
         uint8_t buf[VIDEO_DIP_DATA_SIZE];
         struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
         struct intel_lspcon *lspcon = &dig_port->lspcon;
-        struct intel_dp *intel_dp = &dig_port->dp;
-        struct drm_connector *connector = &intel_dp->attached_connector->base;
-        const struct drm_display_mode *mode = &crtc_state->base.adjusted_mode;
-        bool is_hdmi2_sink = connector->display_info.hdmi.scdc.supported;
+        const struct drm_display_mode *adjusted_mode =
+                &crtc_state->base.adjusted_mode;
 
         if (!lspcon->active) {
                 DRM_ERROR("Writing infoframes while LSPCON disabled ?\n");
@@ -473,7 +471,8 @@ void lspcon_set_infoframes(struct intel_encoder *encoder,
         }
 
         ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
-                                                       mode, is_hdmi2_sink);
+                                                       conn_state->connector,
+                                                       adjusted_mode);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return;
@@ -488,11 +487,12 @@ void lspcon_set_infoframes(struct intel_encoder *encoder,
                 frame.avi.colorspace = HDMI_COLORSPACE_RGB;
         }
 
-        drm_hdmi_avi_infoframe_quant_range(&frame.avi, mode,
+        drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+                                           conn_state->connector,
+                                           adjusted_mode,
                                            crtc_state->limited_color_range ?
                                            HDMI_QUANTIZATION_RANGE_LIMITED :
-                                           HDMI_QUANTIZATION_RANGE_FULL,
-                                           false, is_hdmi2_sink);
+                                           HDMI_QUANTIZATION_RANGE_FULL);
 
         ret = hdmi_infoframe_pack(&frame, buf, sizeof(buf));
         if (ret < 0) {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index e6c5d985ea0a..3377d813dbb3 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -379,9 +379,9 @@ intel_lvds_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
-                                      struct intel_crtc_state *pipe_config,
-                                      struct drm_connector_state *conn_state)
+static int intel_lvds_compute_config(struct intel_encoder *intel_encoder,
+                                     struct intel_crtc_state *pipe_config,
+                                     struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);
         struct intel_lvds_encoder *lvds_encoder =
@@ -395,7 +395,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
         /* Should never happen!! */
         if (INTEL_GEN(dev_priv) < 4 && intel_crtc->pipe == 0) {
                 DRM_ERROR("Can't support LVDS on pipe A\n");
-                return false;
+                return -EINVAL;
         }
 
         if (lvds_encoder->a3_power == LVDS_A3_POWER_UP)
@@ -421,7 +421,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
                                adjusted_mode);
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         if (HAS_PCH_SPLIT(dev_priv)) {
                 pipe_config->has_pch_encoder = true;
@@ -440,7 +440,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
          * user's requested refresh rate.
          */
 
-        return true;
+        return 0;
 }
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 5805ec1aba12..4a03b7f67dd5 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -103,7 +103,6 @@ struct intel_sdvo {
 
         bool has_hdmi_monitor;
         bool has_hdmi_audio;
-        bool rgb_quant_range_selectable;
 
         /* DDC bus used by this SDVO encoder */
         uint8_t ddc_bus;
@@ -981,29 +980,30 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
 }
 
 static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
-                                         const struct intel_crtc_state *pipe_config)
+                                         const struct intel_crtc_state *pipe_config,
+                                         const struct drm_connector_state *conn_state)
 {
+        const struct drm_display_mode *adjusted_mode =
+                &pipe_config->base.adjusted_mode;
         uint8_t sdvo_data[HDMI_INFOFRAME_SIZE(AVI)];
         union hdmi_infoframe frame;
         int ret;
         ssize_t len;
 
         ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
-                                                       &pipe_config->base.adjusted_mode,
-                                                       false);
+                                                       conn_state->connector,
+                                                       adjusted_mode);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return false;
         }
 
-        if (intel_sdvo->rgb_quant_range_selectable) {
-                if (pipe_config->limited_color_range)
-                        frame.avi.quantization_range =
-                                HDMI_QUANTIZATION_RANGE_LIMITED;
-                else
-                        frame.avi.quantization_range =
-                                HDMI_QUANTIZATION_RANGE_FULL;
-        }
+        drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+                                           conn_state->connector,
+                                           adjusted_mode,
+                                           pipe_config->limited_color_range ?
+                                           HDMI_QUANTIZATION_RANGE_LIMITED :
+                                           HDMI_QUANTIZATION_RANGE_FULL);
 
         len = hdmi_infoframe_pack(&frame, sdvo_data, sizeof(sdvo_data));
         if (len < 0)
@@ -1108,9 +1108,9 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
         pipe_config->clock_set = true;
 }
 
-static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
-                                      struct intel_crtc_state *pipe_config,
-                                      struct drm_connector_state *conn_state)
+static int intel_sdvo_compute_config(struct intel_encoder *encoder,
+                                     struct intel_crtc_state *pipe_config,
+                                     struct drm_connector_state *conn_state)
 {
         struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
         struct intel_sdvo_connector_state *intel_sdvo_state =
@@ -1135,7 +1135,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
          */
         if (IS_TV(intel_sdvo_connector)) {
                 if (!intel_sdvo_set_output_timings_from_mode(intel_sdvo, mode))
-                        return false;
+                        return -EINVAL;
 
                 (void) intel_sdvo_get_preferred_input_mode(intel_sdvo,
                                                            intel_sdvo_connector,
@@ -1145,7 +1145,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
         } else if (IS_LVDS(intel_sdvo_connector)) {
                 if (!intel_sdvo_set_output_timings_from_mode(intel_sdvo,
                                                              intel_sdvo_connector->base.panel.fixed_mode))
-                        return false;
+                        return -EINVAL;
 
                 (void) intel_sdvo_get_preferred_input_mode(intel_sdvo,
                                                            intel_sdvo_connector,
@@ -1154,7 +1154,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
         }
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         /*
          * Make the CRTC code factor in the SDVO pixel multiplier.  The
@@ -1194,7 +1194,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
         if (intel_sdvo_connector->is_hdmi)
                 adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio;
 
-        return true;
+        return 0;
 }
 
 #define UPDATE_PROPERTY(input, NAME) \
@@ -1316,7 +1316,8 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
                 intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_HDMI);
                 intel_sdvo_set_colorimetry(intel_sdvo,
                                            SDVO_COLORIMETRY_RGB256);
-                intel_sdvo_set_avi_infoframe(intel_sdvo, crtc_state);
+                intel_sdvo_set_avi_infoframe(intel_sdvo,
+                                             crtc_state, conn_state);
         } else
                 intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_DVI);
 
@@ -1802,8 +1803,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
                         if (intel_sdvo_connector->is_hdmi) {
                                 intel_sdvo->has_hdmi_monitor = drm_detect_hdmi_monitor(edid);
                                 intel_sdvo->has_hdmi_audio = drm_detect_monitor_audio(edid);
-                                intel_sdvo->rgb_quant_range_selectable =
-                                        drm_rgb_quant_range_selectable(edid);
                         }
                 } else
                         status = connector_status_disconnected;
@@ -1852,7 +1851,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
 
         intel_sdvo->has_hdmi_monitor = false;
         intel_sdvo->has_hdmi_audio = false;
-        intel_sdvo->rgb_quant_range_selectable = false;
 
         if ((intel_sdvo_connector->output_flag & response) == 0)
                 ret = connector_status_disconnected;
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 860f306a23ba..9bbe35a0f0f2 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -870,7 +870,7 @@ intel_tv_get_config(struct intel_encoder *encoder,
         pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock;
 }
 
-static bool
+static int
 intel_tv_compute_config(struct intel_encoder *encoder,
                         struct intel_crtc_state *pipe_config,
                         struct drm_connector_state *conn_state)
@@ -880,10 +880,10 @@ intel_tv_compute_config(struct intel_encoder *encoder,
                 &pipe_config->base.adjusted_mode;
 
         if (!tv_mode)
-                return false;
+                return -EINVAL;
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
         adjusted_mode->crtc_clock = tv_mode->clock;
@@ -898,7 +898,7 @@ intel_tv_compute_config(struct intel_encoder *encoder,
          * or whether userspace is doing something stupid.
          */
 
-        return true;
+        return 0;
 }
 
 static void
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c
index 361e962a7969..9fc8085f76dc 100644
--- a/drivers/gpu/drm/i915/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/vlv_dsi.c
@@ -257,9 +257,9 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)
         mutex_unlock(&dev_priv->sb_lock);
 }
 
-static bool intel_dsi_compute_config(struct intel_encoder *encoder,
-                                     struct intel_crtc_state *pipe_config,
-                                     struct drm_connector_state *conn_state)
+static int intel_dsi_compute_config(struct intel_encoder *encoder,
+                                    struct intel_crtc_state *pipe_config,
+                                    struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
@@ -285,7 +285,7 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
         }
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         /* DSI uses short packets for sync events, so clear mode flags for DSI */
         adjusted_mode->flags = 0;
@@ -303,16 +303,16 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
 
                 ret = bxt_dsi_pll_compute(encoder, pipe_config);
                 if (ret)
-                        return false;
+                        return -EINVAL;
         } else {
                 ret = vlv_dsi_pll_compute(encoder, pipe_config);
                 if (ret)
-                        return false;
+                        return -EINVAL;
         }
 
         pipe_config->clock_set = true;
 
-        return true;
+        return 0;
 }
 
 static bool glk_dsi_enable_io(struct intel_encoder *encoder)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 994f0d8646bf..12ad00d01063 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -981,7 +981,8 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi,
         u8 buffer[17];
         ssize_t err;
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                       &hdmi->conn, mode);
         if (err < 0) {
                 dev_err(hdmi->dev,
                         "Failed to get AVI infoframe from mode: %zd\n", err);
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 3ee4d4a4ecba..1e360828ac38 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -152,6 +152,23 @@ static void meson_vpu_init(struct meson_drm *priv)
         writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1));
 }
 
+static void meson_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;
+
+        drm_fb_helper_remove_conflicting_framebuffers(ap, "meson-drm-fb",
+                                                      false);
+        kfree(ap);
+}
+
 static int meson_drv_bind_master(struct device *dev, bool has_components)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -262,6 +279,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
         if (ret)
                 goto free_drm;
 
+        /* Remove early framebuffers (ie. simplefb) */
+        meson_remove_framebuffers();
+
         drm_mode_config_init(drm);
         drm->mode_config.max_width = 3840;
         drm->mode_config.max_height = 2160;
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index 807111ebfdd9..bc25001b8207 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -365,7 +365,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data,
         unsigned int wr_clk =
                 readl_relaxed(priv->io_base + _REG(VPU_HDMI_SETTING));
 
-        DRM_DEBUG_DRIVER("%d:\"%s\"\n", mode->base.id, mode->name);
+        DRM_DEBUG_DRIVER("\"%s\"\n", mode->name);
 
         /* Enable clocks */
         regmap_update_bits(priv->hhi, HHI_HDMI_CLK_CNTL, 0xffff, 0x100);
@@ -555,12 +555,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector,
         int vic = drm_match_cea_mode(mode);
         enum drm_mode_status status;
 
-        DRM_DEBUG_DRIVER("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x\n",
-                mode->base.id, mode->name, mode->vrefresh, mode->clock,
-                mode->hdisplay, mode->hsync_start,
-                mode->hsync_end, mode->htotal,
-                mode->vdisplay, mode->vsync_start,
-                mode->vsync_end, mode->vtotal, mode->type, mode->flags);
+        DRM_DEBUG_DRIVER("Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
 
         /* Check against non-VIC supported modes */
         if (!vic) {
@@ -650,8 +645,7 @@ static void meson_venc_hdmi_encoder_mode_set(struct drm_encoder *encoder,
         struct meson_drm *priv = dw_hdmi->priv;
         int vic = drm_match_cea_mode(mode);
 
-        DRM_DEBUG_DRIVER("%d:\"%s\" vic %d\n",
-                         mode->base.id, mode->name, vic);
+        DRM_DEBUG_DRIVER("\"%s\" vic %d\n", mode->name, vic);
 
         /* VENC + VENC-DVI Mode setup */
         meson_venc_hdmi_mode_set(priv, vic, mode);
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index 30726c9fe28c..6893934b26c0 100644
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -12,6 +12,7 @@
  */
 #include <linux/module.h>
 #include <drm/drmP.h>
+#include <drm/drm_util.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
index 8f2359dc87b4..cc32ea5f4289 100644
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
@@ -244,14 +244,8 @@ static void mdp4_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
         mode = &crtc->state->adjusted_mode;
 
-        DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mdp4_crtc->name, mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("%s: set mode: " DRM_MODE_FMT,
+                        mdp4_crtc->name, DRM_MODE_ARG(mode));
 
         mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_SIZE(dma),
                         MDP4_DMA_SRC_SIZE_WIDTH(mode->hdisplay) |
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c
index 6a1ebdace391..48ce218b8463 100644
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c
@@ -58,14 +58,7 @@ static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder,
 
         mode = adjusted_mode;
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
 
         ctrl_pol = 0;
         if (mode->flags & DRM_MODE_FLAG_NHSYNC)
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
index a8fd14d4846b..ff8f2da160c0 100644
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
@@ -104,14 +104,7 @@ static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder,
 
         mode = adjusted_mode;
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
 
         mdp4_dtv_encoder->pixclock = mode->clock * 1000;
 
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
index c9e34501a89e..fff77a4b12c2 100644
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
@@ -273,14 +273,7 @@ static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder,
 
         mode = adjusted_mode;
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
 
         mdp4_lcdc_encoder->pixclock = mode->clock * 1000;
 
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
index c1962f29ec7d..976585d8bfd6 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
@@ -134,14 +134,7 @@ void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder,
 {
         mode = adjusted_mode;
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
         pingpong_tearcheck_setup(encoder, mode);
         mdp5_crtc_set_pipeline(encoder->crtc);
 }
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
index c5fde1a4191a..2f95e6525589 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
@@ -384,14 +384,7 @@ static void mdp5_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
         mode = &crtc->state->adjusted_mode;
 
-        DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        crtc->name, mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("%s: set mode: " DRM_MODE_FMT, crtc->name, DRM_MODE_ARG(mode));
 
         mixer_width = mode->hdisplay;
         if (r_mixer)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c
index fcd44d1d1068..d2a56e55e53d 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c
@@ -118,14 +118,7 @@ static void mdp5_vid_encoder_mode_set(struct drm_encoder *encoder,
 
         mode = adjusted_mode;
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
 
         ctrl_pol = 0;
 
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
index 7cebcb2b3a37..6153514db04c 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
@@ -16,6 +16,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_util.h>
 
 #include "mdp5_kms.h"
 #include "mdp5_smp.h"
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index bdb063b2dc4a..979a8e929341 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -536,14 +536,7 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge,
         struct mipi_dsi_host *host = msm_dsi->host;
         bool is_dual_dsi = IS_DUAL_DSI();
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
 
         if (is_dual_dsi && !IS_MASTER_DSI_LINK(id))
                 return;
diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c b/drivers/gpu/drm/msm/edp/edp_bridge.c
index 86366ba03e60..11166bf232ff 100644
--- a/drivers/gpu/drm/msm/edp/edp_bridge.c
+++ b/drivers/gpu/drm/msm/edp/edp_bridge.c
@@ -60,14 +60,7 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge,
         struct edp_bridge *edp_bridge = to_edp_bridge(bridge);
         struct msm_edp *edp = edp_bridge->edp;
 
-        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-                        mode->base.id, mode->name,
-                        mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal,
-                        mode->type, mode->flags);
+        DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
 
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 if ((connector->encoder != NULL) &&
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
index b42feb80531b..03197b8959ba 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
@@ -101,7 +101,8 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi)
         u32 val;
         int len;
 
-        drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);
+        drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+                                                 hdmi->connector, mode);
 
         len = hdmi_infoframe_pack(&frame, buffer, sizeof(buffer));
         if (len < 0) {
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 88ba003979e6..13e778825098 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -263,23 +263,12 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags)
 
         drm_kms_helper_poll_init(drm);
 
-        mxsfb->fbdev = drm_fbdev_cma_init(drm, 32,
-                                          drm->mode_config.num_connector);
-        if (IS_ERR(mxsfb->fbdev)) {
-                ret = PTR_ERR(mxsfb->fbdev);
-                mxsfb->fbdev = NULL;
-                dev_err(drm->dev, "Failed to init FB CMA area\n");
-                goto err_cma;
-        }
-
         platform_set_drvdata(pdev, drm);
 
         drm_helper_hpd_irq_event(drm);
 
         return 0;
 
-err_cma:
-        drm_irq_uninstall(drm);
 err_irq:
         drm_panel_detach(mxsfb->panel);
 err_vblank:
@@ -290,11 +279,6 @@ err_vblank:
 
 static void mxsfb_unload(struct drm_device *drm)
 {
-        struct mxsfb_drm_private *mxsfb = drm->dev_private;
-
-        if (mxsfb->fbdev)
-                drm_fbdev_cma_fini(mxsfb->fbdev);
-
         drm_kms_helper_poll_fini(drm);
         drm_mode_config_cleanup(drm);
 
@@ -307,13 +291,6 @@ static void mxsfb_unload(struct drm_device *drm)
         pm_runtime_disable(drm->dev);
 }
 
-static void mxsfb_lastclose(struct drm_device *drm)
-{
-        struct mxsfb_drm_private *mxsfb = drm->dev_private;
-
-        drm_fbdev_cma_restore_mode(mxsfb->fbdev);
-}
-
 static void mxsfb_irq_preinstall(struct drm_device *drm)
 {
         struct mxsfb_drm_private *mxsfb = drm->dev_private;
@@ -347,7 +324,6 @@ static struct drm_driver mxsfb_driver = {
         .driver_features        = DRIVER_GEM | DRIVER_MODESET |
                                   DRIVER_PRIME | DRIVER_ATOMIC |
                                   DRIVER_HAVE_IRQ,
-        .lastclose              = mxsfb_lastclose,
         .irq_handler            = mxsfb_irq_handler,
         .irq_preinstall         = mxsfb_irq_preinstall,
         .irq_uninstall          = mxsfb_irq_preinstall,
@@ -412,6 +388,8 @@ static int mxsfb_probe(struct platform_device *pdev)
         if (ret)
                 goto err_unload;
 
+        drm_fbdev_generic_setup(drm, 32);
+
         return 0;
 
 err_unload:
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.h b/drivers/gpu/drm/mxsfb/mxsfb_drv.h
index 5d0883fc805b..bedd6801edca 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.h
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.h
@@ -37,7 +37,6 @@ struct mxsfb_drm_private {
         struct drm_simple_display_pipe  pipe;
         struct drm_connector            connector;
         struct drm_panel                *panel;
-        struct drm_fbdev_cma            *fbdev;
 };
 
 int mxsfb_setup_crtc(struct drm_device *dev);
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 6a4ca139cf5d..8fd8124d72ba 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -750,7 +750,9 @@ static int nv17_tv_set_property(struct drm_encoder *encoder,
                 /* Disable the crtc to ensure a full modeset is
                  * performed whenever it's turned on again. */
                 if (crtc)
-                        drm_crtc_force_disable(crtc);
+                        drm_crtc_helper_set_mode(crtc, &crtc->mode,
+                                                 crtc->x, crtc->y,
+                                                 crtc->primary->fb);
         }
 
         return 0;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 26af45785939..67107f0b1299 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -561,7 +561,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)
         u32 max_ac_packet;
         union hdmi_infoframe avi_frame;
         union hdmi_infoframe vendor_frame;
-        bool scdc_supported, high_tmds_clock_ratio = false, scrambling = false;
+        bool high_tmds_clock_ratio = false, scrambling = false;
         u8 config;
         int ret;
         int size;
@@ -571,10 +571,9 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)
                 return;
 
         hdmi = &nv_connector->base.display_info.hdmi;
-        scdc_supported = hdmi->scdc.supported;
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame.avi, mode,
-                                                       scdc_supported);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame.avi,
+                                                       &nv_connector->base, mode);
         if (!ret) {
                 /* We have an AVI InfoFrame, populate it to the display */
                 args.pwr.avi_infoframe_length
@@ -680,6 +679,8 @@ nv50_msto_payload(struct nv50_msto *msto)
         struct nv50_mstm *mstm = mstc->mstm;
         int vcpi = mstc->port->vcpi.vcpi, i;
 
+        WARN_ON(!mutex_is_locked(&mstm->mgr.payload_lock));
+
         NV_ATOMIC(drm, "%s: vcpi %d\n", msto->encoder.name, vcpi);
         for (i = 0; i < mstm->mgr.max_payloads; i++) {
                 struct drm_dp_payload *payload = &mstm->mgr.payloads[i];
@@ -704,14 +705,16 @@ nv50_msto_cleanup(struct nv50_msto *msto)
         struct nv50_mstc *mstc = msto->mstc;
         struct nv50_mstm *mstm = mstc->mstm;
 
+        if (!msto->disabled)
+                return;
+
         NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
-        if (mstc->port && mstc->port->vcpi.vcpi > 0 && !nv50_msto_payload(msto))
-                drm_dp_mst_deallocate_vcpi(&mstm->mgr, mstc->port);
-        if (msto->disabled) {
-                msto->mstc = NULL;
-                msto->head = NULL;
-                msto->disabled = false;
-        }
+
+        drm_dp_mst_deallocate_vcpi(&mstm->mgr, mstc->port);
+
+        msto->mstc = NULL;
+        msto->head = NULL;
+        msto->disabled = false;
 }
 
 static void
@@ -731,8 +734,10 @@ nv50_msto_prepare(struct nv50_msto *msto)
                                (0x0100 << msto->head->base.index),
         };
 
+        mutex_lock(&mstm->mgr.payload_lock);
+
         NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
-        if (mstc->port && mstc->port->vcpi.vcpi > 0) {
+        if (mstc->port->vcpi.vcpi > 0) {
                 struct drm_dp_payload *payload = nv50_msto_payload(msto);
                 if (payload) {
                         args.vcpi.start_slot = payload->start_slot;
@@ -746,7 +751,9 @@ nv50_msto_prepare(struct nv50_msto *msto)
                   msto->encoder.name, msto->head->base.base.name,
                   args.vcpi.start_slot, args.vcpi.num_slots,
                   args.vcpi.pbn, args.vcpi.aligned_pbn);
+
         nvif_mthd(&drm->display->disp.object, 0, &args, sizeof(args));
+        mutex_unlock(&mstm->mgr.payload_lock);
 }
 
 static int
@@ -754,16 +761,23 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,
                        struct drm_crtc_state *crtc_state,
                        struct drm_connector_state *conn_state)
 {
-        struct nv50_mstc *mstc = nv50_mstc(conn_state->connector);
+        struct drm_atomic_state *state = crtc_state->state;
+        struct drm_connector *connector = conn_state->connector;
+        struct nv50_mstc *mstc = nv50_mstc(connector);
         struct nv50_mstm *mstm = mstc->mstm;
-        int bpp = conn_state->connector->display_info.bpc * 3;
+        int bpp = connector->display_info.bpc * 3;
         int slots;
 
-        mstc->pbn = drm_dp_calc_pbn_mode(crtc_state->adjusted_mode.clock, bpp);
+        mstc->pbn = drm_dp_calc_pbn_mode(crtc_state->adjusted_mode.clock,
+                                         bpp);
 
-        slots = drm_dp_find_vcpi_slots(&mstm->mgr, mstc->pbn);
-        if (slots < 0)
-                return slots;
+        if (drm_atomic_crtc_needs_modeset(crtc_state) &&
+            !drm_connector_is_unregistered(connector)) {
+                slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr,
+                                                      mstc->port, mstc->pbn);
+                if (slots < 0)
+                        return slots;
+        }
 
         return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state,
                                            mstc->native);
@@ -829,8 +843,7 @@ nv50_msto_disable(struct drm_encoder *encoder)
         struct nv50_mstc *mstc = msto->mstc;
         struct nv50_mstm *mstm = mstc->mstm;
 
-        if (mstc->port)
-                drm_dp_mst_reset_vcpi_slots(&mstm->mgr, mstc->port);
+        drm_dp_mst_reset_vcpi_slots(&mstm->mgr, mstc->port);
 
         mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0);
         mstm->modified = true;
@@ -927,12 +940,43 @@ nv50_mstc_get_modes(struct drm_connector *connector)
         return ret;
 }
 
+static int
+nv50_mstc_atomic_check(struct drm_connector *connector,
+                       struct drm_connector_state *new_conn_state)
+{
+        struct drm_atomic_state *state = new_conn_state->state;
+        struct nv50_mstc *mstc = nv50_mstc(connector);
+        struct drm_dp_mst_topology_mgr *mgr = &mstc->mstm->mgr;
+        struct drm_connector_state *old_conn_state =
+                drm_atomic_get_old_connector_state(state, connector);
+        struct drm_crtc_state *crtc_state;
+        struct drm_crtc *new_crtc = new_conn_state->crtc;
+
+        if (!old_conn_state->crtc)
+                return 0;
+
+        /* We only want to free VCPI if this state disables the CRTC on this
+         * connector
+         */
+        if (new_crtc) {
+                crtc_state = drm_atomic_get_new_crtc_state(state, new_crtc);
+
+                if (!crtc_state ||
+                    !drm_atomic_crtc_needs_modeset(crtc_state) ||
+                    crtc_state->enable)
+                        return 0;
+        }
+
+        return drm_dp_atomic_release_vcpi_slots(state, mgr, mstc->port);
+}
+
 static const struct drm_connector_helper_funcs
 nv50_mstc_help = {
         .get_modes = nv50_mstc_get_modes,
         .mode_valid = nv50_mstc_mode_valid,
         .best_encoder = nv50_mstc_best_encoder,
         .atomic_best_encoder = nv50_mstc_atomic_best_encoder,
+        .atomic_check = nv50_mstc_atomic_check,
 };
 
 static enum drm_connector_status
@@ -942,7 +986,7 @@ nv50_mstc_detect(struct drm_connector *connector, bool force)
         enum drm_connector_status conn_status;
         int ret;
 
-        if (!mstc->port)
+        if (drm_connector_is_unregistered(connector))
                 return connector_status_disconnected;
 
         ret = pm_runtime_get_sync(connector->dev->dev);
@@ -961,7 +1005,10 @@ static void
 nv50_mstc_destroy(struct drm_connector *connector)
 {
         struct nv50_mstc *mstc = nv50_mstc(connector);
+
         drm_connector_cleanup(&mstc->connector);
+        drm_dp_mst_put_port_malloc(mstc->port);
+
         kfree(mstc);
 }
 
@@ -1009,6 +1056,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
         drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
         drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
         drm_connector_set_path_property(&mstc->connector, path);
+        drm_dp_mst_get_port_malloc(port);
         return 0;
 }
 
@@ -1073,10 +1121,6 @@ nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
 
         drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector);
 
-        drm_modeset_lock(&drm->dev->mode_config.connection_mutex, NULL);
-        mstc->port = NULL;
-        drm_modeset_unlock(&drm->dev->mode_config.connection_mutex);
-
         drm_connector_put(&mstc->connector);
 }
 
@@ -1099,11 +1143,8 @@ nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
         int ret;
 
         ret = nv50_mstc_new(mstm, port, path, &mstc);
-        if (ret) {
-                if (mstc)
-                        mstc->connector.funcs->destroy(&mstc->connector);
+        if (ret)
                 return NULL;
-        }
 
         return &mstc->connector;
 }
@@ -2117,6 +2158,10 @@ nv50_disp_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)
                         return ret;
         }
 
+        ret = drm_dp_mst_atomic_check(state);
+        if (ret)
+                return ret;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index f326ffd86766..5d273a655479 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -453,7 +453,7 @@ nouveau_display_fini(struct drm_device *dev, bool suspend, bool runtime)
                 if (drm_drv_uses_atomic_modeset(dev))
                         drm_atomic_helper_shutdown(dev);
                 else
-                        drm_crtc_force_disable_all(dev);
+                        drm_helper_force_disable_all(dev);
         }
 
         /* disable flip completion events */
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index b81302c4bf9e..874d8f3cbff6 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -305,14 +305,9 @@ static int omap_connector_mode_valid(struct drm_connector *connector,
         drm_mode_destroy(dev, new_mode);
 
 done:
-        DBG("connector: mode %s: "
-                        "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
+        DBG("connector: mode %s: " DRM_MODE_FMT,
                         (ret == MODE_OK) ? "valid" : "invalid",
-                        mode->base.id, mode->name, mode->vrefresh, mode->clock,
-                        mode->hdisplay, mode->hsync_start,
-                        mode->hsync_end, mode->htotal,
-                        mode->vdisplay, mode->vsync_start,
-                        mode->vsync_end, mode->vtotal, mode->type, mode->flags);
+                        DRM_MODE_ARG(mode));
 
         return ret;
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index caffc547ef97..40acf4ce7c9f 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -427,12 +427,8 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
         struct drm_display_mode *mode = &crtc->state->adjusted_mode;
 
-        DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
-            omap_crtc->name, mode->base.id, mode->name,
-            mode->vrefresh, mode->clock,
-            mode->hdisplay, mode->hsync_start, mode->hsync_end, mode->htotal,
-            mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal,
-            mode->type, mode->flags);
+        DBG("%s: set mode: " DRM_MODE_FMT,
+            omap_crtc->name, DRM_MODE_ARG(mode));
 
         drm_display_mode_to_videomode(mode, &omap_crtc->vm);
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 933ebc9f9faa..148b6b20274f 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -76,8 +76,8 @@ static void omap_encoder_hdmi_mode_set(struct drm_encoder *encoder,
                 struct hdmi_avi_infoframe avi;
                 int r;
 
-                r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode,
-                                                             false);
+                r = drm_hdmi_avi_infoframe_from_display_mode(&avi, connector,
+                                                             adjusted_mode);
                 if (r == 0)
                         dssdev->ops->hdmi.set_infoframe(dssdev, &avi);
         }
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index aee99194499f..851c59f07eb1 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -16,6 +16,7 @@
  */
 
 #include <drm/drm_crtc.h>
+#include <drm/drm_util.h>
 #include <drm/drm_fb_helper.h>
 
 #include "omap_drv.h"
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index 3f3537719beb..a71f44191273 100644
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -204,6 +204,15 @@ config DRM_PANEL_SITRONIX_ST7789V
           Say Y here if you want to enable support for the Sitronix
           ST7789V controller for 240x320 LCD panels
 
+config DRM_PANEL_TPO_TPG110
+        tristate "TPO TPG 800x400 panel"
+        depends on OF && SPI && GPIOLIB
+        depends on BACKLIGHT_CLASS_DEVICE
+        help
+          Say Y here if you want to enable support for TPO TPG110
+          400CH LTPS TFT LCD Single Chip Digital Driver for up to
+          800x400 LCD panels.
+
 config DRM_PANEL_TRULY_NT35597_WQXGA
         tristate "Truly WQXGA"
         depends on OF
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
index 4396658a7996..cd14ca39c6e0 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -21,4 +21,5 @@ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) += panel-seiko-43wvf1g.o
 obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o
 obj-$(CONFIG_DRM_PANEL_SHARP_LS043T1LE01) += panel-sharp-ls043t1le01.o
 obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o
+obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o
 obj-$(CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA) += panel-truly-nt35597.o
diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
new file mode 100644
index 000000000000..5a9f8f4d5d24
--- /dev/null
+++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
@@ -0,0 +1,496 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Panel driver for the TPO TPG110 400CH LTPS TFT LCD Single Chip
+ * Digital Driver.
+ *
+ * This chip drives a TFT LCD, so it does not know what kind of
+ * display is actually connected to it, so the width and height of that
+ * display needs to be supplied from the machine configuration.
+ *
+ * Author:
+ * Linus Walleij <linus.walleij@linaro.org>
+ */
+#include <drm/drm_modes.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+
+#include <linux/backlight.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+
+#define TPG110_TEST                     0x00
+#define TPG110_CHIPID                   0x01
+#define TPG110_CTRL1                    0x02
+#define TPG110_RES_MASK                 GENMASK(2, 0)
+#define TPG110_RES_800X480              0x07
+#define TPG110_RES_640X480              0x06
+#define TPG110_RES_480X272              0x05
+#define TPG110_RES_480X640              0x04
+#define TPG110_RES_480X272_D            0x01 /* Dual scan: outputs 800x480 */
+#define TPG110_RES_400X240_D            0x00 /* Dual scan: outputs 800x480 */
+#define TPG110_CTRL2                    0x03
+#define TPG110_CTRL2_PM                 BIT(0)
+#define TPG110_CTRL2_RES_PM_CTRL        BIT(7)
+
+/**
+ * struct tpg110_panel_mode - lookup struct for the supported modes
+ */
+struct tpg110_panel_mode {
+        /**
+         * @name: the name of this panel
+         */
+        const char *name;
+        /**
+         * @magic: the magic value from the detection register
+         */
+        u32 magic;
+        /**
+         * @mode: the DRM display mode for this panel
+         */
+        struct drm_display_mode mode;
+        /**
+         * @bus_flags: the DRM bus flags for this panel e.g. inverted clock
+         */
+        u32 bus_flags;
+};
+
+/**
+ * struct tpg110 - state container for the TPG110 panel
+ */
+struct tpg110 {
+        /**
+         * @dev: the container device
+         */
+        struct device *dev;
+        /**
+         * @spi: the corresponding SPI device
+         */
+        struct spi_device *spi;
+        /**
+         * @panel: the DRM panel instance for this device
+         */
+        struct drm_panel panel;
+        /**
+         * @backlight: backlight for this panel
+         */
+        struct backlight_device *backlight;
+        /**
+         * @panel_type: the panel mode as detected
+         */
+        const struct tpg110_panel_mode *panel_mode;
+        /**
+         * @width: the width of this panel in mm
+         */
+        u32 width;
+        /**
+         * @height: the height of this panel in mm
+         */
+        u32 height;
+        /**
+         * @grestb: reset GPIO line
+         */
+        struct gpio_desc *grestb;
+};
+
+/*
+ * TPG110 modes, these are the simple modes, the dualscan modes that
+ * take 400x240 or 480x272 in and display as 800x480 are not listed.
+ */
+static const struct tpg110_panel_mode tpg110_modes[] = {
+        {
+                .name = "800x480 RGB",
+                .magic = TPG110_RES_800X480,
+                .mode = {
+                        .clock = 33200,
+                        .hdisplay = 800,
+                        .hsync_start = 800 + 40,
+                        .hsync_end = 800 + 40 + 1,
+                        .htotal = 800 + 40 + 1 + 216,
+                        .vdisplay = 480,
+                        .vsync_start = 480 + 10,
+                        .vsync_end = 480 + 10 + 1,
+                        .vtotal = 480 + 10 + 1 + 35,
+                        .vrefresh = 60,
+                },
+                .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        },
+        {
+                .name = "640x480 RGB",
+                .magic = TPG110_RES_640X480,
+                .mode = {
+                        .clock = 25200,
+                        .hdisplay = 640,
+                        .hsync_start = 640 + 24,
+                        .hsync_end = 640 + 24 + 1,
+                        .htotal = 640 + 24 + 1 + 136,
+                        .vdisplay = 480,
+                        .vsync_start = 480 + 18,
+                        .vsync_end = 480 + 18 + 1,
+                        .vtotal = 480 + 18 + 1 + 27,
+                        .vrefresh = 60,
+                },
+                .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        },
+        {
+                .name = "480x272 RGB",
+                .magic = TPG110_RES_480X272,
+                .mode = {
+                        .clock = 9000,
+                        .hdisplay = 480,
+                        .hsync_start = 480 + 2,
+                        .hsync_end = 480 + 2 + 1,
+                        .htotal = 480 + 2 + 1 + 43,
+                        .vdisplay = 272,
+                        .vsync_start = 272 + 2,
+                        .vsync_end = 272 + 2 + 1,
+                        .vtotal = 272 + 2 + 1 + 12,
+                        .vrefresh = 60,
+                },
+                .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        },
+        {
+                .name = "480x640 RGB",
+                .magic = TPG110_RES_480X640,
+                .mode = {
+                        .clock = 20500,
+                        .hdisplay = 480,
+                        .hsync_start = 480 + 2,
+                        .hsync_end = 480 + 2 + 1,
+                        .htotal = 480 + 2 + 1 + 43,
+                        .vdisplay = 640,
+                        .vsync_start = 640 + 4,
+                        .vsync_end = 640 + 4 + 1,
+                        .vtotal = 640 + 4 + 1 + 8,
+                        .vrefresh = 60,
+                },
+                .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        },
+        {
+                .name = "400x240 RGB",
+                .magic = TPG110_RES_400X240_D,
+                .mode = {
+                        .clock = 8300,
+                        .hdisplay = 400,
+                        .hsync_start = 400 + 20,
+                        .hsync_end = 400 + 20 + 1,
+                        .htotal = 400 + 20 + 1 + 108,
+                        .vdisplay = 240,
+                        .vsync_start = 240 + 2,
+                        .vsync_end = 240 + 2 + 1,
+                        .vtotal = 240 + 2 + 1 + 20,
+                        .vrefresh = 60,
+                },
+                .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+        },
+};
+
+static inline struct tpg110 *
+to_tpg110(struct drm_panel *panel)
+{
+        return container_of(panel, struct tpg110, panel);
+}
+
+static u8 tpg110_readwrite_reg(struct tpg110 *tpg, bool write,
+                               u8 address, u8 outval)
+{
+        struct spi_message m;
+        struct spi_transfer t[2];
+        u8 buf[2];
+        int ret;
+
+        spi_message_init(&m);
+        memset(t, 0, sizeof(t));
+
+        if (write) {
+                /*
+                 * Clear address bit 0, 1 when writing, just to be sure
+                 * The actual bit indicating a write here is bit 1, bit
+                 * 0 is just surplus to pad it up to 8 bits.
+                 */
+                buf[0] = address << 2;
+                buf[0] &= ~0x03;
+                buf[1] = outval;
+
+                t[0].bits_per_word = 8;
+                t[0].tx_buf = &buf[0];
+                t[0].len = 1;
+
+                t[1].tx_buf = &buf[1];
+                t[1].len = 1;
+                t[1].bits_per_word = 8;
+        } else {
+                /* Set address bit 0 to 1 to read */
+                buf[0] = address << 1;
+                buf[0] |= 0x01;
+
+                /*
+                 * The last bit/clock is Hi-Z turnaround cycle, so we need
+                 * to send only 7 bits here. The 8th bit is the high impedance
+                 * turn-around cycle.
+                 */
+                t[0].bits_per_word = 7;
+                t[0].tx_buf = &buf[0];
+                t[0].len = 1;
+
+                t[1].rx_buf = &buf[1];
+                t[1].len = 1;
+                t[1].bits_per_word = 8;
+        }
+
+        spi_message_add_tail(&t[0], &m);
+        spi_message_add_tail(&t[1], &m);
+        ret = spi_sync(tpg->spi, &m);
+        if (ret) {
+                DRM_DEV_ERROR(tpg->dev, "SPI message error %d\n", ret);
+                return ret;
+        }
+        if (write)
+                return 0;
+        /* Read */
+        return buf[1];
+}
+
+static u8 tpg110_read_reg(struct tpg110 *tpg, u8 address)
+{
+        return tpg110_readwrite_reg(tpg, false, address, 0);
+}
+
+static void tpg110_write_reg(struct tpg110 *tpg, u8 address, u8 outval)
+{
+        tpg110_readwrite_reg(tpg, true, address, outval);
+}
+
+static int tpg110_startup(struct tpg110 *tpg)
+{
+        u8 val;
+        int i;
+
+        /* De-assert the reset signal */
+        gpiod_set_value_cansleep(tpg->grestb, 0);
+        usleep_range(1000, 2000);
+        DRM_DEV_DEBUG(tpg->dev, "de-asserted GRESTB\n");
+
+        /* Test display communication */
+        tpg110_write_reg(tpg, TPG110_TEST, 0x55);
+        val = tpg110_read_reg(tpg, TPG110_TEST);
+        if (val != 0x55) {
+                DRM_DEV_ERROR(tpg->dev, "failed communication test\n");
+                return -ENODEV;
+        }
+
+        val = tpg110_read_reg(tpg, TPG110_CHIPID);
+        DRM_DEV_INFO(tpg->dev, "TPG110 chip ID: %d version: %d\n",
+                 val >> 4, val & 0x0f);
+
+        /* Show display resolution */
+        val = tpg110_read_reg(tpg, TPG110_CTRL1);
+        val &= TPG110_RES_MASK;
+        switch (val) {
+        case TPG110_RES_400X240_D:
+                DRM_DEV_INFO(tpg->dev,
+                         "IN 400x240 RGB -> OUT 800x480 RGB (dual scan)\n");
+                break;
+        case TPG110_RES_480X272_D:
+                DRM_DEV_INFO(tpg->dev,
+                         "IN 480x272 RGB -> OUT 800x480 RGB (dual scan)\n");
+                break;
+        case TPG110_RES_480X640:
+                DRM_DEV_INFO(tpg->dev, "480x640 RGB\n");
+                break;
+        case TPG110_RES_480X272:
+                DRM_DEV_INFO(tpg->dev, "480x272 RGB\n");
+                break;
+        case TPG110_RES_640X480:
+                DRM_DEV_INFO(tpg->dev, "640x480 RGB\n");
+                break;
+        case TPG110_RES_800X480:
+                DRM_DEV_INFO(tpg->dev, "800x480 RGB\n");
+                break;
+        default:
+                DRM_DEV_ERROR(tpg->dev, "ILLEGAL RESOLUTION 0x%02x\n", val);
+                break;
+        }
+
+        /* From the producer side, this is the same resolution */
+        if (val == TPG110_RES_480X272_D)
+                val = TPG110_RES_480X272;
+
+        for (i = 0; i < ARRAY_SIZE(tpg110_modes); i++) {
+                const struct tpg110_panel_mode *pm;
+
+                pm = &tpg110_modes[i];
+                if (pm->magic == val) {
+                        tpg->panel_mode = pm;
+                        break;
+                }
+        }
+        if (i == ARRAY_SIZE(tpg110_modes)) {
+                DRM_DEV_ERROR(tpg->dev, "unsupported mode (%02x) detected\n",
+                        val);
+                return -ENODEV;
+        }
+
+        val = tpg110_read_reg(tpg, TPG110_CTRL2);
+        DRM_DEV_INFO(tpg->dev, "resolution and standby is controlled by %s\n",
+                 (val & TPG110_CTRL2_RES_PM_CTRL) ? "software" : "hardware");
+        /* Take control over resolution and standby */
+        val |= TPG110_CTRL2_RES_PM_CTRL;
+        tpg110_write_reg(tpg, TPG110_CTRL2, val);
+
+        return 0;
+}
+
+static int tpg110_disable(struct drm_panel *panel)
+{
+        struct tpg110 *tpg = to_tpg110(panel);
+        u8 val;
+
+        /* Put chip into standby */
+        val = tpg110_read_reg(tpg, TPG110_CTRL2_PM);
+        val &= ~TPG110_CTRL2_PM;
+        tpg110_write_reg(tpg, TPG110_CTRL2_PM, val);
+
+        backlight_disable(tpg->backlight);
+
+        return 0;
+}
+
+static int tpg110_enable(struct drm_panel *panel)
+{
+        struct tpg110 *tpg = to_tpg110(panel);
+        u8 val;
+
+        backlight_enable(tpg->backlight);
+
+        /* Take chip out of standby */
+        val = tpg110_read_reg(tpg, TPG110_CTRL2_PM);
+        val |= TPG110_CTRL2_PM;
+        tpg110_write_reg(tpg, TPG110_CTRL2_PM, val);
+
+        return 0;
+}
+
+/**
+ * tpg110_get_modes() - return the appropriate mode
+ * @panel: the panel to get the mode for
+ *
+ * This currently does not present a forest of modes, instead it
+ * presents the mode that is configured for the system under use,
+ * and which is detected by reading the registers of the display.
+ */
+static int tpg110_get_modes(struct drm_panel *panel)
+{
+        struct drm_connector *connector = panel->connector;
+        struct tpg110 *tpg = to_tpg110(panel);
+        struct drm_display_mode *mode;
+
+        strncpy(connector->display_info.name, tpg->panel_mode->name,
+                DRM_DISPLAY_INFO_LEN);
+        connector->display_info.width_mm = tpg->width;
+        connector->display_info.height_mm = tpg->height;
+        connector->display_info.bus_flags = tpg->panel_mode->bus_flags;
+
+        mode = drm_mode_duplicate(panel->drm, &tpg->panel_mode->mode);
+        drm_mode_set_name(mode);
+        mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
+
+        mode->width_mm = tpg->width;
+        mode->height_mm = tpg->height;
+
+        drm_mode_probed_add(connector, mode);
+
+        return 1;
+}
+
+static const struct drm_panel_funcs tpg110_drm_funcs = {
+        .disable = tpg110_disable,
+        .enable = tpg110_enable,
+        .get_modes = tpg110_get_modes,
+};
+
+static int tpg110_probe(struct spi_device *spi)
+{
+        struct device *dev = &spi->dev;
+        struct device_node *np = dev->of_node;
+        struct tpg110 *tpg;
+        int ret;
+
+        tpg = devm_kzalloc(dev, sizeof(*tpg), GFP_KERNEL);
+        if (!tpg)
+                return -ENOMEM;
+        tpg->dev = dev;
+
+        /* We get the physical display dimensions from the DT */
+        ret = of_property_read_u32(np, "width-mm", &tpg->width);
+        if (ret)
+                DRM_DEV_ERROR(dev, "no panel width specified\n");
+        ret = of_property_read_u32(np, "height-mm", &tpg->height);
+        if (ret)
+                DRM_DEV_ERROR(dev, "no panel height specified\n");
+
+        /* Look for some optional backlight */
+        tpg->backlight = devm_of_find_backlight(dev);
+        if (IS_ERR(tpg->backlight))
+                return PTR_ERR(tpg->backlight);
+
+        /* This asserts the GRESTB signal, putting the display into reset */
+        tpg->grestb = devm_gpiod_get(dev, "grestb", GPIOD_OUT_HIGH);
+        if (IS_ERR(tpg->grestb)) {
+                DRM_DEV_ERROR(dev, "no GRESTB GPIO\n");
+                return -ENODEV;
+        }
+
+        spi->bits_per_word = 8;
+        spi->mode |= SPI_3WIRE_HIZ;
+        ret = spi_setup(spi);
+        if (ret < 0) {
+                DRM_DEV_ERROR(dev, "spi setup failed.\n");
+                return ret;
+        }
+        tpg->spi = spi;
+
+        ret = tpg110_startup(tpg);
+        if (ret)
+                return ret;
+
+        drm_panel_init(&tpg->panel);
+        tpg->panel.dev = dev;
+        tpg->panel.funcs = &tpg110_drm_funcs;
+        spi_set_drvdata(spi, tpg);
+
+        return drm_panel_add(&tpg->panel);
+}
+
+static int tpg110_remove(struct spi_device *spi)
+{
+        struct tpg110 *tpg = spi_get_drvdata(spi);
+
+        drm_panel_remove(&tpg->panel);
+        return 0;
+}
+
+static const struct of_device_id tpg110_match[] = {
+        { .compatible = "tpo,tpg110", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, tpg110_match);
+
+static struct spi_driver tpg110_driver = {
+        .probe          = tpg110_probe,
+        .remove         = tpg110_remove,
+        .driver         = {
+                .name   = "tpo-tpg110-panel",
+                .of_match_table = tpg110_match,
+        },
+};
+module_spi_driver(tpg110_driver);
+
+MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+MODULE_DESCRIPTION("TPO TPG110 panel driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index dffc5093ff16..2e100f644236 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -25,6 +25,8 @@
 
 /* QXL cmd/ring handling */
 
+#include <drm/drm_util.h>
+
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 72a1784dae54..1f8fddcc34d6 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -48,8 +48,8 @@ static int qxl_alloc_client_monitors_config(struct qxl_device *qdev,
         }
         if (!qdev->client_monitors_config) {
                 qdev->client_monitors_config = kzalloc(
-                                sizeof(struct qxl_monitors_config) +
-                                sizeof(struct qxl_head) * count, GFP_KERNEL);
+                                struct_size(qdev->client_monitors_config,
+                                heads, count), GFP_KERNEL);
                 if (!qdev->client_monitors_config)
                         return -ENOMEM;
         }
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index e55cbeee7a53..ac98ad561870 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 
+#include <drm/drm_util.h>
+
 #define ATOM_DEBUG
 
 #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 770e31f5fd1b..96f71114237a 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -516,21 +516,17 @@ static int radeon_audio_set_avi_packet(struct drm_encoder *encoder,
         if (!connector)
                 return -EINVAL;
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %d\n", err);
                 return err;
         }
 
         if (radeon_encoder->output_csc != RADEON_OUTPUT_CSC_BYPASS) {
-                if (drm_rgb_quant_range_selectable(radeon_connector_edid(connector))) {
-                        if (radeon_encoder->output_csc == RADEON_OUTPUT_CSC_TVRGB)
-                                frame.quantization_range = HDMI_QUANTIZATION_RANGE_LIMITED;
-                        else
-                                frame.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;
-                } else {
-                        frame.quantization_range = HDMI_QUANTIZATION_RANGE_DEFAULT;
-                }
+                drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode,
+                                                   radeon_encoder->output_csc == RADEON_OUTPUT_CSC_TVRGB ?
+                                                   HDMI_QUANTIZATION_RANGE_LIMITED :
+                                                   HDMI_QUANTIZATION_RANGE_FULL);
         }
 
         err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer));
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 9d3ac8b981da..b190478ad087 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1646,7 +1646,7 @@ void radeon_modeset_fini(struct radeon_device *rdev)
         if (rdev->mode_info.mode_config_initialized) {
                 drm_kms_helper_poll_fini(rdev->ddev);
                 radeon_hpd_fini(rdev);
-                drm_crtc_force_disable_all(rdev->ddev);
+                drm_helper_force_disable_all(rdev->ddev);
                 radeon_fbdev_fini(rdev);
                 radeon_afmt_fini(rdev);
                 drm_mode_config_cleanup(rdev->ddev);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 222a1fa41d7c..7e3257e8fd56 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -24,6 +24,7 @@
  *          Alex Deucher
  */
 #include <drm/drmP.h>
+#include <drm/drm_util.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/radeon_drm.h>
 #include "radeon.h"
diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
index 603bb340e8cf..452461dc96f2 100644
--- a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
+++ b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
@@ -7,10 +7,12 @@
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  */
 
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
 #include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_modes.h>
 
 #define RCAR_HDMI_PHY_OPMODE_PLLCFG     0x06    /* Mode of operation and PLL dividers */
 #define RCAR_HDMI_PHY_PLLCURRGMPCTRL    0x10    /* PLL current and Gmp (conductance) */
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 1c02b3e61299..27c945e030a0 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -295,7 +295,9 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
         union hdmi_infoframe frame;
         int rc;
 
-        rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);
+        rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+                                                      &hdmi->connector,
+                                                      mode);
 
         if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV444)
                 frame.avi.colorspace = HDMI_COLORSPACE_YUV444;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index ea18cb2a76c0..08bec50d9c5d 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -128,42 +128,6 @@ err_gem_object_unreference:
 }
 
 static void
-rockchip_drm_psr_inhibit_get_state(struct drm_atomic_state *state)
-{
-        struct drm_crtc *crtc;
-        struct drm_crtc_state *crtc_state;
-        struct drm_encoder *encoder;
-        u32 encoder_mask = 0;
-        int i;
-
-        for_each_old_crtc_in_state(state, crtc, crtc_state, i) {
-                encoder_mask |= crtc_state->encoder_mask;
-                encoder_mask |= crtc->state->encoder_mask;
-        }
-
-        drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)
-                rockchip_drm_psr_inhibit_get(encoder);
-}
-
-static void
-rockchip_drm_psr_inhibit_put_state(struct drm_atomic_state *state)
-{
-        struct drm_crtc *crtc;
-        struct drm_crtc_state *crtc_state;
-        struct drm_encoder *encoder;
-        u32 encoder_mask = 0;
-        int i;
-
-        for_each_old_crtc_in_state(state, crtc, crtc_state, i) {
-                encoder_mask |= crtc_state->encoder_mask;
-                encoder_mask |= crtc->state->encoder_mask;
-        }
-
-        drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)
-                rockchip_drm_psr_inhibit_put(encoder);
-}
-
-static void
 rockchip_atomic_helper_commit_tail_rpm(struct drm_atomic_state *old_state)
 {
         struct drm_device *dev = old_state->dev;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
index 01ff3c858875..22a70ab6e214 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
@@ -13,6 +13,7 @@
  */
 
 #include <drm/drmP.h>
+#include <drm/drm_atomic.h>
 #include <drm/drm_crtc_helper.h>
 
 #include "rockchip_drm_drv.h"
@@ -109,6 +110,42 @@ int rockchip_drm_psr_inhibit_put(struct drm_encoder *encoder)
 }
 EXPORT_SYMBOL(rockchip_drm_psr_inhibit_put);
 
+void rockchip_drm_psr_inhibit_get_state(struct drm_atomic_state *state)
+{
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_encoder *encoder;
+        u32 encoder_mask = 0;
+        int i;
+
+        for_each_old_crtc_in_state(state, crtc, crtc_state, i) {
+                encoder_mask |= crtc_state->encoder_mask;
+                encoder_mask |= crtc->state->encoder_mask;
+        }
+
+        drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)
+                rockchip_drm_psr_inhibit_get(encoder);
+}
+EXPORT_SYMBOL(rockchip_drm_psr_inhibit_get_state);
+
+void rockchip_drm_psr_inhibit_put_state(struct drm_atomic_state *state)
+{
+        struct drm_crtc *crtc;
+        struct drm_crtc_state *crtc_state;
+        struct drm_encoder *encoder;
+        u32 encoder_mask = 0;
+        int i;
+
+        for_each_old_crtc_in_state(state, crtc, crtc_state, i) {
+                encoder_mask |= crtc_state->encoder_mask;
+                encoder_mask |= crtc->state->encoder_mask;
+        }
+
+        drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)
+                rockchip_drm_psr_inhibit_put(encoder);
+}
+EXPORT_SYMBOL(rockchip_drm_psr_inhibit_put_state);
+
 /**
  * rockchip_drm_psr_inhibit_get - acquire PSR inhibit on given encoder
  * @encoder: encoder to obtain the PSR encoder
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.h b/drivers/gpu/drm/rockchip/rockchip_drm_psr.h
index 860c62494496..25350ba3237b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.h
@@ -20,6 +20,9 @@ void rockchip_drm_psr_flush_all(struct drm_device *dev);
 int rockchip_drm_psr_inhibit_put(struct drm_encoder *encoder);
 int rockchip_drm_psr_inhibit_get(struct drm_encoder *encoder);
 
+void rockchip_drm_psr_inhibit_get_state(struct drm_atomic_state *state);
+void rockchip_drm_psr_inhibit_put_state(struct drm_atomic_state *state);
+
 int rockchip_drm_psr_register(struct drm_encoder *encoder,
                         int (*psr_set)(struct drm_encoder *, bool enable));
 void rockchip_drm_psr_unregister(struct drm_encoder *encoder);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index db8358e6d230..619b6db05d58 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -15,6 +15,7 @@
 #include <drm/drm.h>
 #include <drm/drmP.h>
 #include <drm/drm_atomic.h>
+#include <drm/drm_atomic_uapi.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_flip_work.h>
@@ -45,14 +46,26 @@
 #include "rockchip_drm_vop.h"
 #include "rockchip_rgb.h"
 
-#define VOP_WIN_SET(x, win, name, v) \
+#define VOP_WIN_SET(vop, win, name, v) \
                 vop_reg_set(vop, &win->phy->name, win->base, ~0, v, #name)
-#define VOP_SCL_SET(x, win, name, v) \
+#define VOP_SCL_SET(vop, win, name, v) \
                 vop_reg_set(vop, &win->phy->scl->name, win->base, ~0, v, #name)
-#define VOP_SCL_SET_EXT(x, win, name, v) \
+#define VOP_SCL_SET_EXT(vop, win, name, v) \
                 vop_reg_set(vop, &win->phy->scl->ext->name, \
                             win->base, ~0, v, #name)
 
+#define VOP_WIN_YUV2YUV_SET(vop, win_yuv2yuv, name, v) \
+        do { \
+                if (win_yuv2yuv && win_yuv2yuv->name.mask) \
+                        vop_reg_set(vop, &win_yuv2yuv->name, 0, ~0, v, #name); \
+        } while (0)
+
+#define VOP_WIN_YUV2YUV_COEFFICIENT_SET(vop, win_yuv2yuv, name, v) \
+        do { \
+                if (win_yuv2yuv && win_yuv2yuv->phy->name.mask) \
+                        vop_reg_set(vop, &win_yuv2yuv->phy->name, win_yuv2yuv->base, ~0, v, #name); \
+        } while (0)
+
 #define VOP_INTR_SET_MASK(vop, name, mask, v) \
                 vop_reg_set(vop, &vop->data->intr->name, 0, mask, v, #name)
 
@@ -73,8 +86,11 @@
 #define VOP_INTR_GET_TYPE(vop, name, type) \
                 vop_get_intr_type(vop, &vop->data->intr->name, type)
 
-#define VOP_WIN_GET(x, win, name) \
-                vop_read_reg(x, win->offset, win->phy->name)
+#define VOP_WIN_GET(vop, win, name) \
+                vop_read_reg(vop, win->offset, win->phy->name)
+
+#define VOP_WIN_HAS_REG(win, name) \
+        (!!(win->phy->name.mask))
 
 #define VOP_WIN_GET_YRGBADDR(vop, win) \
                 vop_readl(vop, win->base + win->phy->yrgb_mst.offset)
@@ -85,6 +101,18 @@
 #define to_vop(x) container_of(x, struct vop, crtc)
 #define to_vop_win(x) container_of(x, struct vop_win, base)
 
+/*
+ * The coefficients of the following matrix are all fixed points.
+ * The format is S2.10 for the 3x3 part of the matrix, and S9.12 for the offsets.
+ * They are all represented in two's complement.
+ */
+static const uint32_t bt601_yuv2rgb[] = {
+        0x4A8, 0x0,    0x662,
+        0x4A8, 0x1E6F, 0x1CBF,
+        0x4A8, 0x812,  0x0,
+        0x321168, 0x0877CF, 0x2EB127
+};
+
 enum vop_pending {
         VOP_PENDING_FB_UNREF,
 };
@@ -92,6 +120,7 @@ enum vop_pending {
 struct vop_win {
         struct drm_plane base;
         const struct vop_win_data *data;
+        const struct vop_win_yuv2yuv_data *yuv2yuv_data;
         struct vop *vop;
 };
 
@@ -686,6 +715,11 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
                 return -EINVAL;
         }
 
+        if (fb->format->is_yuv && state->rotation & DRM_MODE_REFLECT_Y) {
+                DRM_ERROR("Invalid Source: Yuv format does not support this rotation\n");
+                return -EINVAL;
+        }
+
         return 0;
 }
 
@@ -713,6 +747,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         struct drm_crtc *crtc = state->crtc;
         struct vop_win *vop_win = to_vop_win(plane);
         const struct vop_win_data *win = vop_win->data;
+        const struct vop_win_yuv2yuv_data *win_yuv2yuv = vop_win->yuv2yuv_data;
         struct vop *vop = to_vop(state->crtc);
         struct drm_framebuffer *fb = state->fb;
         unsigned int actual_w, actual_h;
@@ -728,6 +763,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         bool rb_swap;
         int win_index = VOP_WIN_TO_INDEX(vop_win);
         int format;
+        int is_yuv = fb->format->is_yuv;
+        int i;
 
         /*
          * can't update plane when vop is disabled.
@@ -761,6 +798,13 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         offset += (src->y1 >> 16) * fb->pitches[0];
         dma_addr = rk_obj->dma_addr + offset + fb->offsets[0];
 
+        /*
+         * For y-mirroring we need to move address
+         * to the beginning of the last line.
+         */
+        if (state->rotation & DRM_MODE_REFLECT_Y)
+                dma_addr += (actual_h - 1) * fb->pitches[0];
+
         format = vop_convert_format(fb->format->format);
 
         spin_lock(&vop->reg_lock);
@@ -768,7 +812,13 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         VOP_WIN_SET(vop, win, format, format);
         VOP_WIN_SET(vop, win, yrgb_vir, DIV_ROUND_UP(fb->pitches[0], 4));
         VOP_WIN_SET(vop, win, yrgb_mst, dma_addr);
-        if (fb->format->is_yuv) {
+        VOP_WIN_YUV2YUV_SET(vop, win_yuv2yuv, y2r_en, is_yuv);
+        VOP_WIN_SET(vop, win, y_mir_en,
+                    (state->rotation & DRM_MODE_REFLECT_Y) ? 1 : 0);
+        VOP_WIN_SET(vop, win, x_mir_en,
+                    (state->rotation & DRM_MODE_REFLECT_X) ? 1 : 0);
+
+        if (is_yuv) {
                 int hsub = drm_format_horz_chroma_subsampling(fb->format->format);
                 int vsub = drm_format_vert_chroma_subsampling(fb->format->format);
                 int bpp = fb->format->cpp[1];
@@ -782,6 +832,13 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
                 dma_addr = rk_uv_obj->dma_addr + offset + fb->offsets[1];
                 VOP_WIN_SET(vop, win, uv_vir, DIV_ROUND_UP(fb->pitches[1], 4));
                 VOP_WIN_SET(vop, win, uv_mst, dma_addr);
+
+                for (i = 0; i < NUM_YUV2YUV_COEFFICIENTS; i++) {
+                        VOP_WIN_YUV2YUV_COEFFICIENT_SET(vop,
+                                                        win_yuv2yuv,
+                                                        y2r_coefficients[i],
+                                                        bt601_yuv2rgb[i]);
+                }
         }
 
         if (win->phy->scl)
@@ -820,10 +877,83 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
         spin_unlock(&vop->reg_lock);
 }
 
+static int vop_plane_atomic_async_check(struct drm_plane *plane,
+                                        struct drm_plane_state *state)
+{
+        struct vop_win *vop_win = to_vop_win(plane);
+        const struct vop_win_data *win = vop_win->data;
+        int min_scale = win->phy->scl ? FRAC_16_16(1, 8) :
+                                        DRM_PLANE_HELPER_NO_SCALING;
+        int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
+                                        DRM_PLANE_HELPER_NO_SCALING;
+        struct drm_crtc_state *crtc_state;
+
+        if (plane != state->crtc->cursor)
+                return -EINVAL;
+
+        if (!plane->state)
+                return -EINVAL;
+
+        if (!plane->state->fb)
+                return -EINVAL;
+
+        if (state->state)
+                crtc_state = drm_atomic_get_existing_crtc_state(state->state,
+                                                                state->crtc);
+        else /* Special case for asynchronous cursor updates. */
+                crtc_state = plane->crtc->state;
+
+        return drm_atomic_helper_check_plane_state(plane->state, crtc_state,
+                                                   min_scale, max_scale,
+                                                   true, true);
+}
+
+static void vop_plane_atomic_async_update(struct drm_plane *plane,
+                                          struct drm_plane_state *new_state)
+{
+        struct vop *vop = to_vop(plane->state->crtc);
+        struct drm_plane_state *plane_state;
+
+        plane_state = plane->funcs->atomic_duplicate_state(plane);
+        plane_state->crtc_x = new_state->crtc_x;
+        plane_state->crtc_y = new_state->crtc_y;
+        plane_state->crtc_h = new_state->crtc_h;
+        plane_state->crtc_w = new_state->crtc_w;
+        plane_state->src_x = new_state->src_x;
+        plane_state->src_y = new_state->src_y;
+        plane_state->src_h = new_state->src_h;
+        plane_state->src_w = new_state->src_w;
+
+        if (plane_state->fb != new_state->fb)
+                drm_atomic_set_fb_for_plane(plane_state, new_state->fb);
+
+        swap(plane_state, plane->state);
+
+        if (plane->state->fb && plane->state->fb != new_state->fb) {
+                drm_framebuffer_get(plane->state->fb);
+                WARN_ON(drm_crtc_vblank_get(plane->state->crtc) != 0);
+                drm_flip_work_queue(&vop->fb_unref_work, plane->state->fb);
+                set_bit(VOP_PENDING_FB_UNREF, &vop->pending);
+        }
+
+        if (vop->is_enabled) {
+                rockchip_drm_psr_inhibit_get_state(new_state->state);
+                vop_plane_atomic_update(plane, plane->state);
+                spin_lock(&vop->reg_lock);
+                vop_cfg_done(vop);
+                spin_unlock(&vop->reg_lock);
+                rockchip_drm_psr_inhibit_put_state(new_state->state);
+        }
+
+        plane->funcs->atomic_destroy_state(plane, plane_state);
+}
+
 static const struct drm_plane_helper_funcs plane_helper_funcs = {
         .atomic_check = vop_plane_atomic_check,
         .atomic_update = vop_plane_atomic_update,
         .atomic_disable = vop_plane_atomic_disable,
+        .atomic_async_check = vop_plane_atomic_async_check,
+        .atomic_async_update = vop_plane_atomic_async_update,
         .prepare_fb = drm_gem_fb_prepare_fb,
 };
 
@@ -1274,6 +1404,18 @@ out:
         return ret;
 }
 
+static void vop_plane_add_properties(struct drm_plane *plane,
+                                     const struct vop_win_data *win_data)
+{
+        unsigned int flags = 0;
+
+        flags |= VOP_WIN_HAS_REG(win_data, x_mir_en) ? DRM_MODE_REFLECT_X : 0;
+        flags |= VOP_WIN_HAS_REG(win_data, y_mir_en) ? DRM_MODE_REFLECT_Y : 0;
+        if (flags)
+                drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,
+                                                   DRM_MODE_ROTATE_0 | flags);
+}
+
 static int vop_create_crtc(struct vop *vop)
 {
         const struct vop_data *vop_data = vop->data;
@@ -1311,6 +1453,7 @@ static int vop_create_crtc(struct vop *vop)
 
                 plane = &vop_win->base;
                 drm_plane_helper_add(plane, &plane_helper_funcs);
+                vop_plane_add_properties(plane, win_data);
                 if (plane->type == DRM_PLANE_TYPE_PRIMARY)
                         primary = plane;
                 else if (plane->type == DRM_PLANE_TYPE_CURSOR)
@@ -1348,6 +1491,7 @@ static int vop_create_crtc(struct vop *vop)
                         goto err_cleanup_crtc;
                 }
                 drm_plane_helper_add(&vop_win->base, &plane_helper_funcs);
+                vop_plane_add_properties(&vop_win->base, win_data);
         }
 
         port = of_get_child_by_name(dev->of_node, "port");
@@ -1531,6 +1675,7 @@ static void vop_win_init(struct vop *vop)
 
                 vop_win->data = win_data;
                 vop_win->vop = vop;
+                vop_win->yuv2yuv_data = &vop_data->win_yuv2yuv[i];
         }
 }
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
index 0fe40e1983d9..04ed401d2325 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
@@ -23,6 +23,8 @@
 #define VOP_MAJOR(version)              ((version) >> 8)
 #define VOP_MINOR(version)              ((version) & 0xff)
 
+#define NUM_YUV2YUV_COEFFICIENTS 12
+
 enum vop_data_format {
         VOP_FMT_ARGB8888 = 0,
         VOP_FMT_RGB888,
@@ -124,6 +126,10 @@ struct vop_scl_regs {
         struct vop_reg scale_cbcr_y;
 };
 
+struct vop_yuv2yuv_phy {
+        struct vop_reg y2r_coefficients[NUM_YUV2YUV_COEFFICIENTS];
+};
+
 struct vop_win_phy {
         const struct vop_scl_regs *scl;
         const uint32_t *data_formats;
@@ -140,12 +146,20 @@ struct vop_win_phy {
         struct vop_reg uv_mst;
         struct vop_reg yrgb_vir;
         struct vop_reg uv_vir;
+        struct vop_reg y_mir_en;
+        struct vop_reg x_mir_en;
 
         struct vop_reg dst_alpha_ctl;
         struct vop_reg src_alpha_ctl;
         struct vop_reg channel;
 };
 
+struct vop_win_yuv2yuv_data {
+        uint32_t base;
+        const struct vop_yuv2yuv_phy *phy;
+        struct vop_reg y2r_en;
+};
+
 struct vop_win_data {
         uint32_t base;
         const struct vop_win_phy *phy;
@@ -159,6 +173,7 @@ struct vop_data {
         const struct vop_misc *misc;
         const struct vop_modeset *modeset;
         const struct vop_output *output;
+        const struct vop_win_yuv2yuv_data *win_yuv2yuv;
         const struct vop_win_data *win;
         unsigned int win_size;
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 08fc40af52c8..bd76328c0fdb 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -299,6 +299,114 @@ static const struct vop_data px30_vop_lit = {
         .win_size = ARRAY_SIZE(px30_vop_lit_win_data),
 };
 
+static const struct vop_scl_regs rk3066_win_scl = {
+        .scale_yrgb_x = VOP_REG(RK3066_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0),
+        .scale_yrgb_y = VOP_REG(RK3066_WIN0_SCL_FACTOR_YRGB, 0xffff, 16),
+        .scale_cbcr_x = VOP_REG(RK3066_WIN0_SCL_FACTOR_CBR, 0xffff, 0x0),
+        .scale_cbcr_y = VOP_REG(RK3066_WIN0_SCL_FACTOR_CBR, 0xffff, 16),
+};
+
+static const struct vop_win_phy rk3066_win0_data = {
+        .scl = &rk3066_win_scl,
+        .data_formats = formats_win_full,
+        .nformats = ARRAY_SIZE(formats_win_full),
+        .enable = VOP_REG(RK3066_SYS_CTRL1, 0x1, 0),
+        .format = VOP_REG(RK3066_SYS_CTRL0, 0x7, 4),
+        .rb_swap = VOP_REG(RK3066_SYS_CTRL0, 0x1, 19),
+        .act_info = VOP_REG(RK3066_WIN0_ACT_INFO, 0x1fff1fff, 0),
+        .dsp_info = VOP_REG(RK3066_WIN0_DSP_INFO, 0x0fff0fff, 0),
+        .dsp_st = VOP_REG(RK3066_WIN0_DSP_ST, 0x1fff1fff, 0),
+        .yrgb_mst = VOP_REG(RK3066_WIN0_YRGB_MST0, 0xffffffff, 0),
+        .uv_mst = VOP_REG(RK3066_WIN0_CBR_MST0, 0xffffffff, 0),
+        .yrgb_vir = VOP_REG(RK3066_WIN0_VIR, 0xffff, 0),
+        .uv_vir = VOP_REG(RK3066_WIN0_VIR, 0x1fff, 16),
+};
+
+static const struct vop_win_phy rk3066_win1_data = {
+        .scl = &rk3066_win_scl,
+        .data_formats = formats_win_full,
+        .nformats = ARRAY_SIZE(formats_win_full),
+        .enable = VOP_REG(RK3066_SYS_CTRL1, 0x1, 1),
+        .format = VOP_REG(RK3066_SYS_CTRL0, 0x7, 7),
+        .rb_swap = VOP_REG(RK3066_SYS_CTRL0, 0x1, 23),
+        .act_info = VOP_REG(RK3066_WIN1_ACT_INFO, 0x1fff1fff, 0),
+        .dsp_info = VOP_REG(RK3066_WIN1_DSP_INFO, 0x0fff0fff, 0),
+        .dsp_st = VOP_REG(RK3066_WIN1_DSP_ST, 0x1fff1fff, 0),
+        .yrgb_mst = VOP_REG(RK3066_WIN1_YRGB_MST, 0xffffffff, 0),
+        .uv_mst = VOP_REG(RK3066_WIN1_CBR_MST, 0xffffffff, 0),
+        .yrgb_vir = VOP_REG(RK3066_WIN1_VIR, 0xffff, 0),
+        .uv_vir = VOP_REG(RK3066_WIN1_VIR, 0x1fff, 16),
+};
+
+static const struct vop_win_phy rk3066_win2_data = {
+        .data_formats = formats_win_lite,
+        .nformats = ARRAY_SIZE(formats_win_lite),
+        .enable = VOP_REG(RK3066_SYS_CTRL1, 0x1, 2),
+        .format = VOP_REG(RK3066_SYS_CTRL0, 0x7, 10),
+        .rb_swap = VOP_REG(RK3066_SYS_CTRL0, 0x1, 27),
+        .dsp_info = VOP_REG(RK3066_WIN2_DSP_INFO, 0x0fff0fff, 0),
+        .dsp_st = VOP_REG(RK3066_WIN2_DSP_ST, 0x1fff1fff, 0),
+        .yrgb_mst = VOP_REG(RK3066_WIN2_MST, 0xffffffff, 0),
+        .yrgb_vir = VOP_REG(RK3066_WIN2_VIR, 0xffff, 0),
+};
+
+static const struct vop_modeset rk3066_modeset = {
+        .htotal_pw = VOP_REG(RK3066_DSP_HTOTAL_HS_END, 0x1fff1fff, 0),
+        .hact_st_end = VOP_REG(RK3066_DSP_HACT_ST_END, 0x1fff1fff, 0),
+        .vtotal_pw = VOP_REG(RK3066_DSP_VTOTAL_VS_END, 0x1fff1fff, 0),
+        .vact_st_end = VOP_REG(RK3066_DSP_VACT_ST_END, 0x1fff1fff, 0),
+};
+
+static const struct vop_output rk3066_output = {
+        .pin_pol = VOP_REG(RK3066_DSP_CTRL0, 0x7, 4),
+};
+
+static const struct vop_common rk3066_common = {
+        .standby = VOP_REG(RK3066_SYS_CTRL0, 0x1, 1),
+        .out_mode = VOP_REG(RK3066_DSP_CTRL0, 0xf, 0),
+        .cfg_done = VOP_REG(RK3066_REG_CFG_DONE, 0x1, 0),
+        .dsp_blank = VOP_REG(RK3066_DSP_CTRL1, 0x1, 24),
+};
+
+static const struct vop_win_data rk3066_vop_win_data[] = {
+        { .base = 0x00, .phy = &rk3066_win0_data,
+          .type = DRM_PLANE_TYPE_PRIMARY },
+        { .base = 0x00, .phy = &rk3066_win1_data,
+          .type = DRM_PLANE_TYPE_OVERLAY },
+        { .base = 0x00, .phy = &rk3066_win2_data,
+          .type = DRM_PLANE_TYPE_CURSOR },
+};
+
+static const int rk3066_vop_intrs[] = {
+        /*
+         * hs_start interrupt fires at frame-start, so serves
+         * the same purpose as dsp_hold in the driver.
+         */
+        DSP_HOLD_VALID_INTR,
+        FS_INTR,
+        LINE_FLAG_INTR,
+        BUS_ERROR_INTR,
+};
+
+static const struct vop_intr rk3066_intr = {
+        .intrs = rk3066_vop_intrs,
+        .nintrs = ARRAY_SIZE(rk3066_vop_intrs),
+        .line_flag_num[0] = VOP_REG(RK3066_INT_STATUS, 0xfff, 12),
+        .status = VOP_REG(RK3066_INT_STATUS, 0xf, 0),
+        .enable = VOP_REG(RK3066_INT_STATUS, 0xf, 4),
+        .clear = VOP_REG(RK3066_INT_STATUS, 0xf, 8),
+};
+
+static const struct vop_data rk3066_vop = {
+        .version = VOP_VERSION(2, 1),
+        .intr = &rk3066_intr,
+        .common = &rk3066_common,
+        .modeset = &rk3066_modeset,
+        .output = &rk3066_output,
+        .win = rk3066_vop_win_data,
+        .win_size = ARRAY_SIZE(rk3066_vop_win_data),
+};
+
 static const struct vop_scl_regs rk3188_win_scl = {
         .scale_yrgb_x = VOP_REG(RK3188_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0),
         .scale_yrgb_y = VOP_REG(RK3188_WIN0_SCL_FACTOR_YRGB, 0xffff, 16),
@@ -550,6 +658,27 @@ static const struct vop_intr rk3368_vop_intr = {
         .clear = VOP_REG_MASK_SYNC(RK3368_INTR_CLEAR, 0x3fff, 0),
 };
 
+static const struct vop_win_phy rk3368_win01_data = {
+        .scl = &rk3288_win_full_scl,
+        .data_formats = formats_win_full,
+        .nformats = ARRAY_SIZE(formats_win_full),
+        .enable = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 0),
+        .format = VOP_REG(RK3368_WIN0_CTRL0, 0x7, 1),
+        .rb_swap = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 12),
+        .x_mir_en = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 21),
+        .y_mir_en = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 22),
+        .act_info = VOP_REG(RK3368_WIN0_ACT_INFO, 0x1fff1fff, 0),
+        .dsp_info = VOP_REG(RK3368_WIN0_DSP_INFO, 0x0fff0fff, 0),
+        .dsp_st = VOP_REG(RK3368_WIN0_DSP_ST, 0x1fff1fff, 0),
+        .yrgb_mst = VOP_REG(RK3368_WIN0_YRGB_MST, 0xffffffff, 0),
+        .uv_mst = VOP_REG(RK3368_WIN0_CBR_MST, 0xffffffff, 0),
+        .yrgb_vir = VOP_REG(RK3368_WIN0_VIR, 0x3fff, 0),
+        .uv_vir = VOP_REG(RK3368_WIN0_VIR, 0x3fff, 16),
+        .src_alpha_ctl = VOP_REG(RK3368_WIN0_SRC_ALPHA_CTRL, 0xff, 0),
+        .dst_alpha_ctl = VOP_REG(RK3368_WIN0_DST_ALPHA_CTRL, 0xff, 0),
+        .channel = VOP_REG(RK3368_WIN0_CTRL2, 0xff, 0),
+};
+
 static const struct vop_win_phy rk3368_win23_data = {
         .data_formats = formats_win_lite,
         .nformats = ARRAY_SIZE(formats_win_lite),
@@ -557,6 +686,7 @@ static const struct vop_win_phy rk3368_win23_data = {
         .enable = VOP_REG(RK3368_WIN2_CTRL0, 0x1, 4),
         .format = VOP_REG(RK3368_WIN2_CTRL0, 0x3, 5),
         .rb_swap = VOP_REG(RK3368_WIN2_CTRL0, 0x1, 20),
+        .y_mir_en = VOP_REG(RK3368_WIN2_CTRL1, 0x1, 15),
         .dsp_info = VOP_REG(RK3368_WIN2_DSP_INFO0, 0x0fff0fff, 0),
         .dsp_st = VOP_REG(RK3368_WIN2_DSP_ST0, 0x1fff1fff, 0),
         .yrgb_mst = VOP_REG(RK3368_WIN2_MST0, 0xffffffff, 0),
@@ -566,9 +696,9 @@ static const struct vop_win_phy rk3368_win23_data = {
 };
 
 static const struct vop_win_data rk3368_vop_win_data[] = {
-        { .base = 0x00, .phy = &rk3288_win01_data,
+        { .base = 0x00, .phy = &rk3368_win01_data,
           .type = DRM_PLANE_TYPE_PRIMARY },
-        { .base = 0x40, .phy = &rk3288_win01_data,
+        { .base = 0x40, .phy = &rk3368_win01_data,
           .type = DRM_PLANE_TYPE_OVERLAY },
         { .base = 0x00, .phy = &rk3368_win23_data,
           .type = DRM_PLANE_TYPE_OVERLAY },
@@ -637,6 +767,34 @@ static const struct vop_output rk3399_output = {
         .mipi_dual_channel_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 3),
 };
 
+static const struct vop_yuv2yuv_phy rk3399_yuv2yuv_win01_data = {
+        .y2r_coefficients = {
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 0, 0xffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 0, 0xffff, 16),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 4, 0xffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 4, 0xffff, 16),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 8, 0xffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 8, 0xffff, 16),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 12, 0xffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 12, 0xffff, 16),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 16, 0xffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 20, 0xffffffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 24, 0xffffffff, 0),
+                VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 28, 0xffffffff, 0),
+        },
+};
+
+static const struct vop_yuv2yuv_phy rk3399_yuv2yuv_win23_data = { };
+
+static const struct vop_win_yuv2yuv_data rk3399_vop_big_win_yuv2yuv_data[] = {
+        { .base = 0x00, .phy = &rk3399_yuv2yuv_win01_data,
+          .y2r_en = VOP_REG(RK3399_YUV2YUV_WIN, 0x1, 1) },
+        { .base = 0x60, .phy = &rk3399_yuv2yuv_win01_data,
+          .y2r_en = VOP_REG(RK3399_YUV2YUV_WIN, 0x1, 9) },
+        { .base = 0xC0, .phy = &rk3399_yuv2yuv_win23_data },
+        { .base = 0x120, .phy = &rk3399_yuv2yuv_win23_data },
+};
+
 static const struct vop_data rk3399_vop_big = {
         .version = VOP_VERSION(3, 5),
         .feature = VOP_FEATURE_OUTPUT_RGB10,
@@ -647,15 +805,22 @@ static const struct vop_data rk3399_vop_big = {
         .misc = &rk3368_misc,
         .win = rk3368_vop_win_data,
         .win_size = ARRAY_SIZE(rk3368_vop_win_data),
+        .win_yuv2yuv = rk3399_vop_big_win_yuv2yuv_data,
 };
 
 static const struct vop_win_data rk3399_vop_lit_win_data[] = {
-        { .base = 0x00, .phy = &rk3288_win01_data,
+        { .base = 0x00, .phy = &rk3368_win01_data,
           .type = DRM_PLANE_TYPE_PRIMARY },
         { .base = 0x00, .phy = &rk3368_win23_data,
           .type = DRM_PLANE_TYPE_CURSOR},
 };
 
+static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = {
+        { .base = 0x00, .phy = &rk3399_yuv2yuv_win01_data,
+          .y2r_en = VOP_REG(RK3399_YUV2YUV_WIN, 0x1, 1)},
+        { .base = 0x60, .phy = &rk3399_yuv2yuv_win23_data },
+};
+
 static const struct vop_data rk3399_vop_lit = {
         .version = VOP_VERSION(3, 6),
         .intr = &rk3366_vop_intr,
@@ -665,6 +830,7 @@ static const struct vop_data rk3399_vop_lit = {
         .misc = &rk3368_misc,
         .win = rk3399_vop_lit_win_data,
         .win_size = ARRAY_SIZE(rk3399_vop_lit_win_data),
+        .win_yuv2yuv = rk3399_vop_lit_win_yuv2yuv_data,
 };
 
 static const struct vop_win_data rk3228_vop_win_data[] = {
@@ -730,11 +896,11 @@ static const struct vop_intr rk3328_vop_intr = {
 };
 
 static const struct vop_win_data rk3328_vop_win_data[] = {
-        { .base = 0xd0, .phy = &rk3288_win01_data,
+        { .base = 0xd0, .phy = &rk3368_win01_data,
           .type = DRM_PLANE_TYPE_PRIMARY },
-        { .base = 0x1d0, .phy = &rk3288_win01_data,
+        { .base = 0x1d0, .phy = &rk3368_win01_data,
           .type = DRM_PLANE_TYPE_OVERLAY },
-        { .base = 0x2d0, .phy = &rk3288_win01_data,
+        { .base = 0x2d0, .phy = &rk3368_win01_data,
           .type = DRM_PLANE_TYPE_CURSOR },
 };
 
@@ -759,6 +925,8 @@ static const struct of_device_id vop_driver_dt_match[] = {
           .data = &px30_vop_big },
         { .compatible = "rockchip,px30-vop-lit",
           .data = &px30_vop_lit },
+        { .compatible = "rockchip,rk3066-vop",
+          .data = &rk3066_vop },
         { .compatible = "rockchip,rk3188-vop",
           .data = &rk3188_vop },
         { .compatible = "rockchip,rk3288-vop",
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
index 7348c68352ed..d837d4a7df4a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
@@ -983,4 +983,57 @@
 #define RK3188_REG_CFG_DONE             0x90
 /* rk3188 register definition end */
 
+/* rk3066 register definition */
+#define RK3066_SYS_CTRL0                0x00
+#define RK3066_SYS_CTRL1                0x04
+#define RK3066_DSP_CTRL0                0x08
+#define RK3066_DSP_CTRL1                0x0c
+#define RK3066_INT_STATUS               0x10
+#define RK3066_MCU_CTRL                 0x14
+#define RK3066_BLEND_CTRL               0x18
+#define RK3066_WIN0_COLOR_KEY_CTRL      0x1c
+#define RK3066_WIN1_COLOR_KEY_CTRL      0x20
+#define RK3066_WIN2_COLOR_KEY_CTRL      0x24
+#define RK3066_WIN0_YRGB_MST0           0x28
+#define RK3066_WIN0_CBR_MST0            0x2c
+#define RK3066_WIN0_YRGB_MST1           0x30
+#define RK3066_WIN0_CBR_MST1            0x34
+#define RK3066_WIN0_VIR                 0x38
+#define RK3066_WIN0_ACT_INFO            0x3c
+#define RK3066_WIN0_DSP_INFO            0x40
+#define RK3066_WIN0_DSP_ST              0x44
+#define RK3066_WIN0_SCL_FACTOR_YRGB     0x48
+#define RK3066_WIN0_SCL_FACTOR_CBR      0x4c
+#define RK3066_WIN0_SCL_OFFSET          0x50
+#define RK3066_WIN1_YRGB_MST            0x54
+#define RK3066_WIN1_CBR_MST             0x58
+#define RK3066_WIN1_VIR                 0x5c
+#define RK3066_WIN1_ACT_INFO            0x60
+#define RK3066_WIN1_DSP_INFO            0x64
+#define RK3066_WIN1_DSP_ST              0x68
+#define RK3066_WIN1_SCL_FACTOR_YRGB     0x6c
+#define RK3066_WIN1_SCL_FACTOR_CBR      0x70
+#define RK3066_WIN1_SCL_OFFSET          0x74
+#define RK3066_WIN2_MST                 0x78
+#define RK3066_WIN2_VIR                 0x7c
+#define RK3066_WIN2_DSP_INFO            0x80
+#define RK3066_WIN2_DSP_ST              0x84
+#define RK3066_HWC_MST                  0x88
+#define RK3066_HWC_DSP_ST               0x8c
+#define RK3066_HWC_COLOR_LUT0           0x90
+#define RK3066_HWC_COLOR_LUT1           0x94
+#define RK3066_HWC_COLOR_LUT2           0x98
+#define RK3066_DSP_HTOTAL_HS_END        0x9c
+#define RK3066_DSP_HACT_ST_END          0xa0
+#define RK3066_DSP_VTOTAL_VS_END        0xa4
+#define RK3066_DSP_VACT_ST_END          0xa8
+#define RK3066_DSP_VS_ST_END_F1         0xac
+#define RK3066_DSP_VACT_ST_END_F1       0xb0
+#define RK3066_REG_CFG_DONE             0xc0
+#define RK3066_MCU_BYPASS_WPORT         0x100
+#define RK3066_MCU_BYPASS_RPORT         0x200
+#define RK3066_WIN2_LUT_ADDR            0x400
+#define RK3066_DSP_LUT_ADDR             0x800
+/* rk3066 register definition end */
+
 #endif /* _ROCKCHIP_VOP_REG_H */
diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index ed76e52eb213..ec9f87483e39 100644
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -53,18 +53,10 @@ sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode)
         struct clk *compo_clk, *pix_clk;
         int rate = mode->clock * 1000;
 
-        DRM_DEBUG_KMS("CRTC:%d (%s) mode:%d (%s)\n",
-                      crtc->base.id, sti_mixer_to_str(mixer),
-                      mode->base.id, mode->name);
-
-        DRM_DEBUG_KMS("%d %d %d %d %d %d %d %d %d %d 0x%x 0x%x\n",
-                      mode->vrefresh, mode->clock,
-                      mode->hdisplay,
-                      mode->hsync_start, mode->hsync_end,
-                      mode->htotal,
-                      mode->vdisplay,
-                      mode->vsync_start, mode->vsync_end,
-                      mode->vtotal, mode->type, mode->flags);
+        DRM_DEBUG_KMS("CRTC:%d (%s) mode: (%s)\n",
+                      crtc->base.id, sti_mixer_to_str(mixer), mode->name);
+
+        DRM_DEBUG_KMS(DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
 
         if (mixer->id == STI_MIXER_MAIN) {
                 compo_clk = compo->clk_compo_main;
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index fbef4ad6c8ef..458fcb5a93f2 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -434,7 +434,8 @@ static int hdmi_avi_infoframe_config(struct sti_hdmi *hdmi)
 
         DRM_DEBUG_DRIVER("\n");
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe,
+                                                       hdmi->drm_connector, mode);
         if (ret < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %d\n", ret);
                 return ret;
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 061d2e0d9011..554a6f4561f3 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -52,7 +52,8 @@ static int sun4i_hdmi_setup_avi_infoframes(struct sun4i_hdmi *hdmi,
         u8 buffer[17];
         int i, ret;
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                       &hdmi->connector, mode);
         if (ret < 0) {
                 DRM_ERROR("Failed to get infoframes from mode\n");
                 return ret;
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 0082468f703c..a7566c67bfb0 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -741,7 +741,8 @@ static void tegra_hdmi_setup_avi_infoframe(struct tegra_hdmi *hdmi,
         u8 buffer[17];
         ssize_t err;
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                       &hdmi->output.connector, mode);
         if (err < 0) {
                 dev_err(hdmi->dev, "failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index ef8692b7075a..44feac2a0359 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -2116,7 +2116,8 @@ tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor,
         value &= ~INFOFRAME_CTRL_ENABLE;
         tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
+                                                       &sor->output.connector, mode);
         if (err < 0) {
                 dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err);
                 return err;
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
index 01a6f2d42440..aeb93eadb047 100644
--- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
@@ -10,11 +10,14 @@
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_print.h>
 #include <drm/tinydrm/tinydrm.h>
 #include <linux/device.h>
 #include <linux/dma-buf.h>
+#include <linux/module.h>
 
 /**
  * DOC: overview
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
index eacfc0ec8ff1..d4576d6e8ce4 100644
--- a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
@@ -9,8 +9,11 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modes.h>
+#include <drm/drm_print.h>
+#include <drm/drm_vblank.h>
 #include <drm/tinydrm/tinydrm.h>
 
 struct tinydrm_connector {
diff --git a/drivers/gpu/drm/tinydrm/hx8357d.c b/drivers/gpu/drm/tinydrm/hx8357d.c
index 81a2bbeb25d4..3ae11aa4b73b 100644
--- a/drivers/gpu/drm/tinydrm/hx8357d.c
+++ b/drivers/gpu/drm/tinydrm/hx8357d.c
@@ -16,6 +16,7 @@
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c
index 78f7c2d1b449..b0ad58b97227 100644
--- a/drivers/gpu/drm/tinydrm/ili9225.c
+++ b/drivers/gpu/drm/tinydrm/ili9225.c
@@ -20,7 +20,9 @@
 #include <linux/spi/spi.h>
 #include <video/mipi_display.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/tinydrm/mipi-dbi.h>
diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c
index 51395bdc6ca2..bcdf10906ade 100644
--- a/drivers/gpu/drm/tinydrm/ili9341.c
+++ b/drivers/gpu/drm/tinydrm/ili9341.c
@@ -15,6 +15,7 @@
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
index 3fa62e77c30b..97805ca37a04 100644
--- a/drivers/gpu/drm/tinydrm/mi0283qt.c
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -17,6 +17,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
index 3a05e56f9b0d..10294e1283dd 100644
--- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -10,14 +10,17 @@
  */
 
 #include <linux/debugfs.h>
+#include <linux/delay.h>
 #include <linux/dma-buf.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/tinydrm/mipi-dbi.h>
 #include <drm/tinydrm/tinydrm-helpers.h>
diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c
index 54d6fe0f37ce..b2a8f894946a 100644
--- a/drivers/gpu/drm/tinydrm/repaper.c
+++ b/drivers/gpu/drm/tinydrm/repaper.c
@@ -26,6 +26,7 @@
 #include <linux/spi/spi.h>
 #include <linux/thermal.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
index a6a8a1081b73..bf518167760a 100644
--- a/drivers/gpu/drm/tinydrm/st7586.c
+++ b/drivers/gpu/drm/tinydrm/st7586.c
@@ -17,6 +17,7 @@
 #include <linux/spi/spi.h>
 #include <video/mipi_display.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
diff --git a/drivers/gpu/drm/tinydrm/st7735r.c b/drivers/gpu/drm/tinydrm/st7735r.c
index b39779e0dcd8..9bc93d5a0401 100644
--- a/drivers/gpu/drm/tinydrm/st7735r.c
+++ b/drivers/gpu/drm/tinydrm/st7735r.c
@@ -14,6 +14,7 @@
 #include <linux/spi/spi.h>
 #include <video/mipi_display.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/tinydrm/mipi-dbi.h>
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index c24b078f0593..2c635f001c71 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -9,6 +9,7 @@
 #include <linux/mm_types.h>
 #include <linux/reservation.h>
 #include <drm/drmP.h>
+#include <drm/drm_util.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_atomic.h>
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 2f276222e30f..051b61b62541 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -109,7 +109,6 @@ struct vc4_hdmi_encoder {
         struct vc4_encoder base;
         bool hdmi_monitor;
         bool limited_rgb_range;
-        bool rgb_range_selectable;
 };
 
 static inline struct vc4_hdmi_encoder *
@@ -280,11 +279,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
 
         vc4_encoder->hdmi_monitor = drm_detect_hdmi_monitor(edid);
 
-        if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
-                vc4_encoder->rgb_range_selectable =
-                        drm_rgb_quant_range_selectable(edid);
-        }
-
         drm_connector_update_edid_property(connector, edid);
         ret = drm_add_edid_modes(connector, edid);
         kfree(edid);
@@ -424,18 +418,18 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder)
         union hdmi_infoframe frame;
         int ret;
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+                                                       hdmi->connector, mode);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return;
         }
 
-        drm_hdmi_avi_infoframe_quant_range(&frame.avi, mode,
+        drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+                                           hdmi->connector, mode,
                                            vc4_encoder->limited_rgb_range ?
                                            HDMI_QUANTIZATION_RANGE_LIMITED :
-                                           HDMI_QUANTIZATION_RANGE_FULL,
-                                           vc4_encoder->rgb_range_selectable,
-                                           false);
+                                           HDMI_QUANTIZATION_RANGE_FULL);
 
         frame.avi.right_bar = cstate->tv.margins.right;
         frame.avi.left_bar = cstate->tv.margins.left;
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 2901ed0c5223..d098337c10e9 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -675,20 +675,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
                 uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
                 u32 tile_w, tile, x_off, pix_per_tile;
 
-                /* Column-based NV12 or RGBA.
-                 */
-                if (fb->format->num_planes > 1) {
-                        if (hvs_format != HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE) {
-                                DRM_DEBUG_KMS("SAND format only valid for NV12/21");
-                                return -EINVAL;
-                        }
-                        hvs_format = HVS_PIXEL_FORMAT_H264;
-                } else {
-                        if (base_format_mod == DRM_FORMAT_MOD_BROADCOM_SAND256) {
-                                DRM_DEBUG_KMS("SAND256 format only valid for H.264");
-                                return -EINVAL;
-                        }
-                }
+                hvs_format = HVS_PIXEL_FORMAT_H264;
 
                 switch (base_format_mod) {
                 case DRM_FORMAT_MOD_BROADCOM_SAND64:
@@ -1151,8 +1138,6 @@ static bool vc4_format_mod_supported(struct drm_plane *plane,
                 switch (fourcc_mod_broadcom_mod(modifier)) {
                 case DRM_FORMAT_MOD_LINEAR:
                 case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:
-                case DRM_FORMAT_MOD_BROADCOM_SAND64:
-                case DRM_FORMAT_MOD_BROADCOM_SAND128:
                         return true;
                 default:
                         return false;
diff --git a/drivers/gpu/drm/virtio/Makefile b/drivers/gpu/drm/virtio/Makefile
index f29deec83d1f..4e90cc8fa651 100644
--- a/drivers/gpu/drm/virtio/Makefile
+++ b/drivers/gpu/drm/virtio/Makefile
@@ -3,7 +3,7 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_drm_bus.o virtgpu_gem.o \
+virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_gem.o \
         virtgpu_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \
         virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \
         virtgpu_ioctl.o virtgpu_prime.o
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index e1c223e18d86..87d7c49cf057 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -243,12 +243,8 @@ static enum drm_connector_status virtio_gpu_conn_detect(
 
 static void virtio_gpu_conn_destroy(struct drm_connector *connector)
 {
-        struct virtio_gpu_output *virtio_gpu_output =
-                drm_connector_to_virtio_gpu_output(connector);
-
         drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
-        kfree(virtio_gpu_output);
 }
 
 static const struct drm_connector_funcs virtio_gpu_connector_funcs = {
@@ -362,7 +358,7 @@ static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = {
         .atomic_commit = drm_atomic_helper_commit,
 };
 
-int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
+void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
 {
         int i;
 
@@ -381,7 +377,6 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
                 vgdev_output_init(vgdev, i);
 
         drm_mode_config_reset(vgdev->ddev);
-        return 0;
 }
 
 void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)
diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
deleted file mode 100644
index 0887e0b64b9c..000000000000
--- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2015 Red Hat, Inc.
- * 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 COPYRIGHT OWNER(S) 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.
- */
-
-#include <linux/pci.h>
-#include <drm/drm_fb_helper.h>
-
-#include "virtgpu_drv.h"
-
-int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
-{
-        struct drm_device *dev;
-        int ret;
-
-        dev = drm_dev_alloc(driver, &vdev->dev);
-        if (IS_ERR(dev))
-                return PTR_ERR(dev);
-        vdev->priv = dev;
-
-        if (strcmp(vdev->dev.parent->bus->name, "pci") == 0) {
-                struct pci_dev *pdev = to_pci_dev(vdev->dev.parent);
-                const char *pname = dev_name(&pdev->dev);
-                bool vga = (pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA;
-                char unique[20];
-
-                DRM_INFO("pci: %s detected at %s\n",
-                         vga ? "virtio-vga" : "virtio-gpu-pci",
-                         pname);
-                dev->pdev = pdev;
-                if (vga)
-                        drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
-                                                                          0,
-                                                                          "virtiodrmfb");
-
-                /*
-                 * Normally the drm_dev_set_unique() call is done by core DRM.
-                 * The following comment covers, why virtio cannot rely on it.
-                 *
-                 * Unlike the other virtual GPU drivers, virtio abstracts the
-                 * underlying bus type by using struct virtio_device.
-                 *
-                 * Hence the dev_is_pci() check, used in core DRM, will fail
-                 * and the unique returned will be the virtio_device "virtio0",
-                 * while a "pci:..." one is required.
-                 *
-                 * A few other ideas were considered:
-                 * - Extend the dev_is_pci() check [in drm_set_busid] to
-                 *   consider virtio.
-                 *   Seems like a bigger hack than what we have already.
-                 *
-                 * - Point drm_device::dev to the parent of the virtio_device
-                 *   Semantic changes:
-                 *   * Using the wrong device for i2c, framebuffer_alloc and
-                 *     prime import.
-                 *   Visual changes:
-                 *   * Helpers such as DRM_DEV_ERROR, dev_info, drm_printer,
-                 *     will print the wrong information.
-                 *
-                 * We could address the latter issues, by introducing
-                 * drm_device::bus_dev, ... which would be used solely for this.
-                 *
-                 * So for the moment keep things as-is, with a bulky comment
-                 * for the next person who feels like removing this
-                 * drm_dev_set_unique() quirk.
-                 */
-                snprintf(unique, sizeof(unique), "pci:%s", pname);
-                ret = drm_dev_set_unique(dev, unique);
-                if (ret)
-                        goto err_free;
-
-        }
-
-        ret = drm_dev_register(dev, 0);
-        if (ret)
-                goto err_free;
-
-        return 0;
-
-err_free:
-        drm_dev_put(dev);
-        return ret;
-}
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 7df50920c1e0..af92964b6889 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -40,8 +40,60 @@ static int virtio_gpu_modeset = -1;
 MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
 module_param_named(modeset, virtio_gpu_modeset, int, 0400);
 
+static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vdev)
+{
+        struct pci_dev *pdev = to_pci_dev(vdev->dev.parent);
+        const char *pname = dev_name(&pdev->dev);
+        bool vga = (pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA;
+        char unique[20];
+
+        DRM_INFO("pci: %s detected at %s\n",
+                 vga ? "virtio-vga" : "virtio-gpu-pci",
+                 pname);
+        dev->pdev = pdev;
+        if (vga)
+                drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
+                                                                  0,
+                                                                  "virtiodrmfb");
+
+        /*
+         * Normally the drm_dev_set_unique() call is done by core DRM.
+         * The following comment covers, why virtio cannot rely on it.
+         *
+         * Unlike the other virtual GPU drivers, virtio abstracts the
+         * underlying bus type by using struct virtio_device.
+         *
+         * Hence the dev_is_pci() check, used in core DRM, will fail
+         * and the unique returned will be the virtio_device "virtio0",
+         * while a "pci:..." one is required.
+         *
+         * A few other ideas were considered:
+         * - Extend the dev_is_pci() check [in drm_set_busid] to
+         *   consider virtio.
+         *   Seems like a bigger hack than what we have already.
+         *
+         * - Point drm_device::dev to the parent of the virtio_device
+         *   Semantic changes:
+         *   * Using the wrong device for i2c, framebuffer_alloc and
+         *     prime import.
+         *   Visual changes:
+         *   * Helpers such as DRM_DEV_ERROR, dev_info, drm_printer,
+         *     will print the wrong information.
+         *
+         * We could address the latter issues, by introducing
+         * drm_device::bus_dev, ... which would be used solely for this.
+         *
+         * So for the moment keep things as-is, with a bulky comment
+         * for the next person who feels like removing this
+         * drm_dev_set_unique() quirk.
+         */
+        snprintf(unique, sizeof(unique), "pci:%s", pname);
+        return drm_dev_set_unique(dev, unique);
+}
+
 static int virtio_gpu_probe(struct virtio_device *vdev)
 {
+        struct drm_device *dev;
         int ret;
 
         if (vgacon_text_force() && virtio_gpu_modeset == -1)
@@ -50,18 +102,39 @@ static int virtio_gpu_probe(struct virtio_device *vdev)
         if (virtio_gpu_modeset == 0)
                 return -EINVAL;
 
-        ret = drm_virtio_init(&driver, vdev);
+        dev = drm_dev_alloc(&driver, &vdev->dev);
+        if (IS_ERR(dev))
+                return PTR_ERR(dev);
+        vdev->priv = dev;
+
+        if (!strcmp(vdev->dev.parent->bus->name, "pci")) {
+                ret = virtio_gpu_pci_quirk(dev, vdev);
+                if (ret)
+                        goto err_free;
+        }
+
+        ret = virtio_gpu_init(dev);
         if (ret)
-                return ret;
+                goto err_free;
+
+        ret = drm_dev_register(dev, 0);
+        if (ret)
+                goto err_free;
 
         drm_fbdev_generic_setup(vdev->priv, 32);
         return 0;
+
+err_free:
+        drm_dev_put(dev);
+        return ret;
 }
 
 static void virtio_gpu_remove(struct virtio_device *vdev)
 {
         struct drm_device *dev = vdev->priv;
 
+        drm_dev_unregister(dev);
+        virtio_gpu_deinit(dev);
         drm_put_dev(dev);
 }
 
@@ -123,8 +196,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,
-        .load = virtio_gpu_driver_load,
-        .unload = virtio_gpu_driver_unload,
         .open = virtio_gpu_driver_open,
         .postclose = virtio_gpu_driver_postclose,
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 63704915f8ce..cf896d879382 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -50,9 +50,6 @@
 #define DRIVER_MINOR 1
 #define DRIVER_PATCHLEVEL 0
 
-/* virtgpu_drm_bus.c */
-int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev);
-
 struct virtio_gpu_object {
         struct drm_gem_object gem_base;
         uint32_t hw_res_handle;
@@ -209,8 +206,8 @@ struct virtio_gpu_fpriv {
 extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS];
 
 /* virtio_kms.c */
-int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags);
-void virtio_gpu_driver_unload(struct drm_device *dev);
+int virtio_gpu_init(struct drm_device *dev);
+void virtio_gpu_deinit(struct drm_device *dev);
 int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file);
 void virtio_gpu_driver_postclose(struct drm_device *dev, struct drm_file *file);
 
@@ -320,7 +317,7 @@ int virtio_gpu_framebuffer_init(struct drm_device *dev,
                                 struct virtio_gpu_framebuffer *vgfb,
                                 const struct drm_mode_fb_cmd2 *mode_cmd,
                                 struct drm_gem_object *obj);
-int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev);
+void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev);
 void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev);
 
 /* virtio_gpu_plane.c */
@@ -337,7 +334,6 @@ int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma);
 /* virtio_gpu_fence.c */
 struct virtio_gpu_fence *virtio_gpu_fence_alloc(
         struct virtio_gpu_device *vgdev);
-void virtio_gpu_fence_cleanup(struct virtio_gpu_fence *fence);
 int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev,
                           struct virtio_gpu_ctrl_hdr *cmd_hdr,
                           struct virtio_gpu_fence *fence);
diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c
index 4d6826b27814..21bd4c4a32d1 100644
--- a/drivers/gpu/drm/virtio/virtgpu_fence.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fence.c
@@ -81,14 +81,6 @@ struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev)
         return fence;
 }
 
-void virtio_gpu_fence_cleanup(struct virtio_gpu_fence *fence)
-{
-        if (!fence)
-                return;
-
-        dma_fence_put(&fence->f);
-}
-
 int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev,
                           struct virtio_gpu_ctrl_hdr *cmd_hdr,
                           struct virtio_gpu_fence *fence)
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 161b80fee492..14ce8188c052 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -351,7 +351,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
                 virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d);
                 ret = virtio_gpu_object_attach(vgdev, qobj, fence);
                 if (ret) {
-                        virtio_gpu_fence_cleanup(fence);
+                        dma_fence_put(&fence->f);
                         goto fail_backoff;
                 }
                 ttm_eu_fence_buffer_objects(&ticket, &validate_list, &fence->f);
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 1072064a0db2..84b6a6bf00c6 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -106,7 +106,7 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev,
         vgdev->num_capsets = num_capsets;
 }
 
-int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
+int virtio_gpu_init(struct drm_device *dev)
 {
         static vq_callback_t *callbacks[] = {
                 virtio_gpu_ctrl_ack, virtio_gpu_cursor_ack
@@ -193,9 +193,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
                      num_capsets, &num_capsets);
         DRM_INFO("number of cap sets: %d\n", num_capsets);
 
-        ret = virtio_gpu_modeset_init(vgdev);
-        if (ret)
-                goto err_modeset;
+        virtio_gpu_modeset_init(vgdev);
 
         virtio_device_ready(vgdev->vdev);
         vgdev->vqs_ready = true;
@@ -209,7 +207,6 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
                            5 * HZ);
         return 0;
 
-err_modeset:
 err_scanouts:
         virtio_gpu_ttm_fini(vgdev);
 err_ttm:
@@ -231,7 +228,7 @@ static void virtio_gpu_cleanup_cap_cache(struct virtio_gpu_device *vgdev)
         }
 }
 
-void virtio_gpu_driver_unload(struct drm_device *dev)
+void virtio_gpu_deinit(struct drm_device *dev)
 {
         struct virtio_gpu_device *vgdev = dev->dev_private;
 
@@ -239,6 +236,7 @@ void virtio_gpu_driver_unload(struct drm_device *dev)
         flush_work(&vgdev->ctrlq.dequeue_work);
         flush_work(&vgdev->cursorq.dequeue_work);
         flush_work(&vgdev->config_changed_work);
+        vgdev->vdev->config->reset(vgdev->vdev);
         vgdev->vdev->config->del_vqs(vgdev->vdev);
 
         virtio_gpu_modeset_fini(vgdev);
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index ead5c53d4e21..024c2aa0c929 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -130,11 +130,12 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
                                    plane->state->src_h >> 16,
                                    plane->state->src_x >> 16,
                                    plane->state->src_y >> 16);
-        virtio_gpu_cmd_resource_flush(vgdev, handle,
-                                      plane->state->src_x >> 16,
-                                      plane->state->src_y >> 16,
-                                      plane->state->src_w >> 16,
-                                      plane->state->src_h >> 16);
+        if (handle)
+                virtio_gpu_cmd_resource_flush(vgdev, handle,
+                                              plane->state->src_x >> 16,
+                                              plane->state->src_y >> 16,
+                                              plane->state->src_w >> 16,
+                                              plane->state->src_h >> 16);
 }
 
 static int virtio_gpu_cursor_prepare_fb(struct drm_plane *plane,
@@ -168,8 +169,10 @@ static void virtio_gpu_cursor_cleanup_fb(struct drm_plane *plane,
                 return;
 
         vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
-        if (vgfb->fence)
-                virtio_gpu_fence_cleanup(vgfb->fence);
+        if (vgfb->fence) {
+                dma_fence_put(&vgfb->fence->f);
+                vgfb->fence = NULL;
+        }
 }
 
 static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index e27c4aedb809..6bc2008b0d0d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -192,8 +192,16 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work)
 
         list_for_each_entry_safe(entry, tmp, &reclaim_list, list) {
                 resp = (struct virtio_gpu_ctrl_hdr *)entry->resp_buf;
-                if (resp->type != cpu_to_le32(VIRTIO_GPU_RESP_OK_NODATA))
-                        DRM_DEBUG("response 0x%x\n", le32_to_cpu(resp->type));
+                if (resp->type != cpu_to_le32(VIRTIO_GPU_RESP_OK_NODATA)) {
+                        if (resp->type >= cpu_to_le32(VIRTIO_GPU_RESP_ERR_UNSPEC)) {
+                                struct virtio_gpu_ctrl_hdr *cmd;
+                                cmd = (struct virtio_gpu_ctrl_hdr *)entry->buf;
+                                DRM_ERROR("response 0x%x (command 0x%x)\n",
+                                          le32_to_cpu(resp->type),
+                                          le32_to_cpu(cmd->type));
+                        } else
+                                DRM_DEBUG("response 0x%x\n", le32_to_cpu(resp->type));
+                }
                 if (resp->flags & cpu_to_le32(VIRTIO_GPU_FLAG_FENCE)) {
                         u64 f = le64_to_cpu(resp->fence_id);
 
diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index 78655269d843..9fc98bb4f3d9 100644
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -125,7 +125,9 @@ static int zx_hdmi_config_video_avi(struct zx_hdmi *hdmi,
         union hdmi_infoframe frame;
         int ret;
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+                                                       &hdmi->connector,
+                                                       mode);
         if (ret) {
                 DRM_DEV_ERROR(hdmi->dev, "failed to get avi infoframe: %d\n",
                               ret);
diff --git a/drivers/staging/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c
index 6b7aa23dfc0a..397496cf0bdf 100644
--- a/drivers/staging/vboxvideo/vbox_fb.c
+++ b/drivers/staging/vboxvideo/vbox_fb.c
@@ -95,11 +95,6 @@ int vboxfb_create(struct drm_fb_helper *helper,
 
         strcpy(info->fix.id, "vboxdrmfb");
 
-        /*
-         * The last flag forces a mode set on VT switches even if the kernel
-         * does not think it is needed.
-         */
-        info->flags = FBINFO_DEFAULT | FBINFO_MISC_ALWAYS_SETPAR;
         info->fbops = &vboxfb_ops;
 
         /*
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index 9c56412bb2cf..9f93895dde88 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -10,9 +10,11 @@
 #ifndef __DW_HDMI__
 #define __DW_HDMI__
 
-#include <drm/drmP.h>
-
+struct drm_connector;
+struct drm_display_mode;
+struct drm_encoder;
 struct dw_hdmi;
+struct platform_device;
 
 /**
  * DOC: Supported input formats and encodings
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index db94ef00940e..3f5c577c9dbd 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -94,23 +94,11 @@ struct dma_buf_attachment;
 struct pci_dev;
 struct pci_controller;
 
-#define DRM_SWITCH_POWER_ON 0
-#define DRM_SWITCH_POWER_OFF 1
-#define DRM_SWITCH_POWER_CHANGING 2
-#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
-
-/* returns true if currently okay to sleep */
-static inline bool drm_can_sleep(void)
-{
-        if (in_atomic() || in_dbg_master() || irqs_disabled())
-                return false;
-        return true;
-}
-
-#if defined(CONFIG_DRM_DEBUG_SELFTEST_MODULE)
-#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x) EXPORT_SYMBOL(x)
-#else
-#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x)
-#endif
+/*
+ * NOTE: drmP.h is obsolete - do NOT add anything to this file
+ *
+ * Do not include drmP.h in new files.
+ * Work is ongoing to remove drmP.h includes from existing files
+ */
 
 #endif
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index cac4a1b6b0e8..811b4a92568f 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -139,9 +139,9 @@ struct drm_crtc_commit {
         /**
          * @abort_completion:
          *
-         * A flag that's set after drm_atomic_helper_setup_commit takes a second
-         * reference for the completion of $drm_crtc_state.event. It's used by
-         * the free code to remove the second reference if commit fails.
+         * A flag that's set after drm_atomic_helper_setup_commit() takes a
+         * second reference for the completion of $drm_crtc_state.event. It's
+         * used by the free code to remove the second reference if commit fails.
          */
         bool abort_completion;
 };
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index f82701d49ea6..994161374a49 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -366,6 +366,12 @@ struct drm_display_info {
         bool has_hdmi_infoframe;
 
         /**
+         * @rgb_quant_range_selectable: Does the sink support selecting
+         * the RGB quantization range?
+         */
+        bool rgb_quant_range_selectable;
+
+        /**
          * @edid_hdmi_dc_modes: Mask of supported hdmi deep color modes. Even
          * more stuff redundant with @bus_formats.
          */
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 39c3900aab3c..85abd3fe9e83 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1149,9 +1149,6 @@ static inline uint32_t drm_crtc_mask(const struct drm_crtc *crtc)
         return 1 << drm_crtc_index(crtc);
 }
 
-int drm_crtc_force_disable(struct drm_crtc *crtc);
-int drm_crtc_force_disable_all(struct drm_device *dev);
-
 int drm_mode_set_config_internal(struct drm_mode_set *set);
 struct drm_crtc *drm_crtc_from_index(struct drm_device *dev, int idx);
 
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index d65f034843ce..0ee9a96b70da 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -56,6 +56,7 @@ bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
 int drm_helper_connector_dpms(struct drm_connector *connector, int mode);
 
 void drm_helper_resume_force_mode(struct drm_device *dev);
+int drm_helper_force_disable_all(struct drm_device *dev);
 
 /* drm_probe_helper.c */
 int drm_helper_probe_single_connector_modes(struct drm_connector
diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
index 42411b3ea0c8..d5e092dccf3e 100644
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
@@ -24,25 +24,79 @@ struct inode;
 struct pci_dev;
 struct pci_controller;
 
+
 /**
- * DRM device structure. This structure represent a complete card that
+ * enum drm_switch_power - power state of drm device
+ */
+
+enum switch_power_state {
+        /** @DRM_SWITCH_POWER_ON: Power state is ON */
+        DRM_SWITCH_POWER_ON = 0,
+
+        /** @DRM_SWITCH_POWER_OFF: Power state is OFF */
+        DRM_SWITCH_POWER_OFF = 1,
+
+        /** @DRM_SWITCH_POWER_CHANGING: Power state is changing */
+        DRM_SWITCH_POWER_CHANGING = 2,
+
+        /** @DRM_SWITCH_POWER_DYNAMIC_OFF: Suspended */
+        DRM_SWITCH_POWER_DYNAMIC_OFF = 3,
+};
+
+/**
+ * struct drm_device - DRM device structure
+ *
+ * This structure represent a complete card that
  * may contain multiple heads.
  */
 struct drm_device {
-        struct list_head legacy_dev_list;/**< list of devices per driver for stealth attach cleanup */
-        int if_version;                 /**< Highest interface version set */
-
-        /** \name Lifetime Management */
-        /*@{ */
-        struct kref ref;                /**< Object ref-count */
-        struct device *dev;             /**< Device structure of bus-device */
-        struct drm_driver *driver;      /**< DRM driver managing the device */
-        void *dev_private;              /**< DRM driver private data */
-        struct drm_minor *primary;              /**< Primary node */
-        struct drm_minor *render;               /**< Render node */
+        /**
+         * @legacy_dev_list:
+         *
+         * List of devices per driver for stealth attach cleanup
+         */
+        struct list_head legacy_dev_list;
+
+        /** @if_version: Highest interface version set */
+        int if_version;
+
+        /** @ref: Object ref-count */
+        struct kref ref;
+
+        /** @dev: Device structure of bus-device */
+        struct device *dev;
+
+        /** @driver: DRM driver managing the device */
+        struct drm_driver *driver;
+
+        /**
+         * @dev_private:
+         *
+         * DRM driver private data. Instead of using this pointer it is
+         * recommended that drivers use drm_dev_init() and embed struct
+         * &drm_device in their larger per-device structure.
+         */
+        void *dev_private;
+
+        /** @primary: Primary node */
+        struct drm_minor *primary;
+
+        /** @render: Render node */
+        struct drm_minor *render;
+
+        /**
+         * @registered:
+         *
+         * Internally used by drm_dev_register() and drm_connector_register().
+         */
         bool registered;
 
-        /* currently active master for this device. Protected by master_mutex */
+        /**
+         * @master:
+         *
+         * Currently active master for this device.
+         * Protected by &master_mutex
+         */
         struct drm_master *master;
 
         /**
@@ -63,76 +117,65 @@ struct drm_device {
          */
         bool unplugged;
 
-        struct inode *anon_inode;               /**< inode for private address-space */
-        char *unique;                           /**< unique name of the device */
-        /*@} */
+        /** @anon_inode: inode for private address-space */
+        struct inode *anon_inode;
+
+        /** @unique: Unique name of the device */
+        char *unique;
 
-        /** \name Locks */
-        /*@{ */
-        struct mutex struct_mutex;      /**< For others */
-        struct mutex master_mutex;      /**< For drm_minor::master and drm_file::is_master */
-        /*@} */
+        /**
+         * @struct_mutex:
+         *
+         * Lock for others (not &drm_minor.master and &drm_file.is_master)
+         */
+        struct mutex struct_mutex;
 
-        /** \name Usage Counters */
-        /*@{ */
-        int open_count;                 /**< Outstanding files open, protected by drm_global_mutex. */
-        spinlock_t buf_lock;            /**< For drm_device::buf_use and a few other things. */
-        int buf_use;                    /**< Buffers in use -- cannot alloc */
-        atomic_t buf_alloc;             /**< Buffer allocation in progress */
-        /*@} */
+        /**
+         * @master_mutex:
+         *
+         * Lock for &drm_minor.master and &drm_file.is_master
+         */
+        struct mutex master_mutex;
+
+        /**
+         * @open_count:
+         *
+         * Usage counter for outstanding files open,
+         * protected by drm_global_mutex
+         */
+        int open_count;
 
+        /** @filelist_mutex: Protects @filelist. */
         struct mutex filelist_mutex;
+        /**
+         * @filelist:
+         *
+         * List of userspace clients, linked through &drm_file.lhead.
+         */
         struct list_head filelist;
 
         /**
          * @filelist_internal:
          *
-         * List of open DRM files for in-kernel clients. Protected by @filelist_mutex.
+         * List of open DRM files for in-kernel clients.
+         * Protected by &filelist_mutex.
          */
         struct list_head filelist_internal;
 
         /**
          * @clientlist_mutex:
          *
-         * Protects @clientlist access.
+         * Protects &clientlist access.
          */
         struct mutex clientlist_mutex;
 
         /**
          * @clientlist:
          *
-         * List of in-kernel clients. Protected by @clientlist_mutex.
+         * List of in-kernel clients. Protected by &clientlist_mutex.
          */
         struct list_head clientlist;
 
-        /** \name Memory management */
-        /*@{ */
-        struct list_head maplist;       /**< Linked list of regions */
-        struct drm_open_hash map_hash;  /**< User token hash table for maps */
-
-        /** \name Context handle management */
-        /*@{ */
-        struct list_head ctxlist;       /**< Linked list of context handles */
-        struct mutex ctxlist_mutex;     /**< For ctxlist */
-
-        struct idr ctx_idr;
-
-        struct list_head vmalist;       /**< List of vmas (for debugging) */
-
-        /*@} */
-
-        /** \name DMA support */
-        /*@{ */
-        struct drm_device_dma *dma;             /**< Optional pointer for DMA support */
-        /*@} */
-
-        /** \name Context support */
-        /*@{ */
-
-        __volatile__ long context_flag; /**< Context swapping flag */
-        int last_context;               /**< Last current context */
-        /*@} */
-
         /**
          * @irq_enabled:
          *
@@ -141,6 +184,10 @@ struct drm_device {
          * to true manually.
          */
         bool irq_enabled;
+
+        /**
+         * @irq: Used by the drm_irq_install() and drm_irq_unistall() helpers.
+         */
         int irq;
 
         /**
@@ -168,7 +215,16 @@ struct drm_device {
          */
         struct drm_vblank_crtc *vblank;
 
-        spinlock_t vblank_time_lock;    /**< Protects vblank count and time updates during vblank enable/disable */
+        /**
+         * @vblank_time_lock:
+         *
+         *  Protects vblank count and time updates during vblank enable/disable
+         */
+        spinlock_t vblank_time_lock;
+        /**
+         * @vbl_lock: Top-level vblank references lock, wraps the low-level
+         * @vblank_time_lock.
+         */
         spinlock_t vbl_lock;
 
         /**
@@ -184,45 +240,61 @@ struct drm_device {
          * races and imprecision over longer time periods, hence exposing a
          * hardware vblank counter is always recommended.
          *
-         * If non-zeor, &drm_crtc_funcs.get_vblank_counter must be set.
+         * This is the statically configured device wide maximum. The driver
+         * can instead choose to use a runtime configurable per-crtc value
+         * &drm_vblank_crtc.max_vblank_count, in which case @max_vblank_count
+         * must be left at zero. See drm_crtc_set_max_vblank_count() on how
+         * to use the per-crtc value.
+         *
+         * If non-zero, &drm_crtc_funcs.get_vblank_counter must be set.
          */
-        u32 max_vblank_count;           /**< size of vblank counter register */
+        u32 max_vblank_count;
+
+        /** @vblank_event_list: List of vblank events */
+        struct list_head vblank_event_list;
 
         /**
-         * List of events
+         * @event_lock:
+         *
+         * Protects @vblank_event_list and event delivery in
+         * general. See drm_send_event() and drm_send_event_locked().
          */
-        struct list_head vblank_event_list;
         spinlock_t event_lock;
 
-        /*@} */
+        /** @agp: AGP data */
+        struct drm_agp_head *agp;
 
-        struct drm_agp_head *agp;       /**< AGP data */
+        /** @pdev: PCI device structure */
+        struct pci_dev *pdev;
 
-        struct pci_dev *pdev;           /**< PCI device structure */
 #ifdef __alpha__
+        /** @hose: PCI hose, only used on ALPHA platforms. */
         struct pci_controller *hose;
 #endif
+        /** @num_crtcs: Number of CRTCs on this device */
+        unsigned int num_crtcs;
 
-        struct drm_sg_mem *sg;  /**< Scatter gather memory */
-        unsigned int num_crtcs;                  /**< Number of CRTCs on this device */
+        /** @mode_config: Current mode config */
+        struct drm_mode_config mode_config;
 
-        struct {
-                int context;
-                struct drm_hw_lock *lock;
-        } sigdata;
-
-        struct drm_local_map *agp_buffer_map;
-        unsigned int agp_buffer_token;
-
-        struct drm_mode_config mode_config;     /**< Current mode config */
-
-        /** \name GEM information */
-        /*@{ */
+        /** @object_name_lock: GEM information */
         struct mutex object_name_lock;
+
+        /** @object_name_idr: GEM information */
         struct idr object_name_idr;
+
+        /** @vma_offset_manager: GEM information */
         struct drm_vma_offset_manager *vma_offset_manager;
-        /*@} */
-        int switch_power_state;
+
+        /**
+         * @switch_power_state:
+         *
+         * Power state of the client.
+         * Used by drivers supporting the switcheroo driver.
+         * The state is maintained in the
+         * &vga_switcheroo_client_ops.set_gpu_state callback
+         */
+        enum switch_power_state switch_power_state;
 
         /**
          * @fb_helper:
@@ -231,6 +303,56 @@ struct drm_device {
          * Set by drm_fb_helper_init() and cleared by drm_fb_helper_fini().
          */
         struct drm_fb_helper *fb_helper;
+
+        /* Everything below here is for legacy driver, never use! */
+        /* private: */
+
+        /* Context handle management - linked list of context handles */
+        struct list_head ctxlist;
+
+        /* Context handle management - mutex for &ctxlist */
+        struct mutex ctxlist_mutex;
+
+        /* Context handle management */
+        struct idr ctx_idr;
+
+        /* Memory management - linked list of regions */
+        struct list_head maplist;
+
+        /* Memory management - user token hash table for maps */
+        struct drm_open_hash map_hash;
+
+        /* Context handle management - list of vmas (for debugging) */
+        struct list_head vmalist;
+
+        /* Optional pointer for DMA support */
+        struct drm_device_dma *dma;
+
+        /* Context swapping flag */
+        __volatile__ long context_flag;
+
+        /* Last current context */
+        int last_context;
+
+        /* Lock for &buf_use and a few other things. */
+        spinlock_t buf_lock;
+
+        /* Usage counter for buffers in use -- cannot alloc */
+        int buf_use;
+
+        /* Buffer allocation in progress */
+        atomic_t buf_alloc;
+
+        struct {
+                int context;
+                struct drm_hw_lock *lock;
+        } sigdata;
+
+        struct drm_local_map *agp_buffer_map;
+        unsigned int agp_buffer_token;
+
+        /* Scatter gather memory */
+        struct drm_sg_mem *sg;
 };
 
 #endif
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 371cc2816477..451d020f0137 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -44,7 +44,6 @@ struct drm_dp_vcpi {
 
 /**
  * struct drm_dp_mst_port - MST port
- * @kref: reference count for this port.
  * @port_num: port number
  * @input: if this port is an input port.
  * @mcs: message capability status - DP 1.2 spec.
@@ -67,7 +66,18 @@ struct drm_dp_vcpi {
  * in the MST topology.
  */
 struct drm_dp_mst_port {
-        struct kref kref;
+        /**
+         * @topology_kref: refcount for this port's lifetime in the topology,
+         * only the DP MST helpers should need to touch this
+         */
+        struct kref topology_kref;
+
+        /**
+         * @malloc_kref: refcount for the memory allocation containing this
+         * structure. See drm_dp_mst_get_port_malloc() and
+         * drm_dp_mst_put_port_malloc().
+         */
+        struct kref malloc_kref;
 
         u8 port_num;
         bool input;
@@ -102,7 +112,6 @@ struct drm_dp_mst_port {
 
 /**
  * struct drm_dp_mst_branch - MST branch device.
- * @kref: reference count for this port.
  * @rad: Relative Address to talk to this branch device.
  * @lct: Link count total to talk to this branch device.
  * @num_ports: number of ports on the branch.
@@ -121,7 +130,19 @@ struct drm_dp_mst_port {
  * to downstream port of parent branches.
  */
 struct drm_dp_mst_branch {
-        struct kref kref;
+        /**
+         * @topology_kref: refcount for this branch device's lifetime in the
+         * topology, only the DP MST helpers should need to touch this
+         */
+        struct kref topology_kref;
+
+        /**
+         * @malloc_kref: refcount for the memory allocation containing this
+         * structure. See drm_dp_mst_get_mstb_malloc() and
+         * drm_dp_mst_put_mstb_malloc().
+         */
+        struct kref malloc_kref;
+
         u8 rad[8];
         u8 lct;
         int num_ports;
@@ -404,9 +425,15 @@ struct drm_dp_payload {
 
 #define to_dp_mst_topology_state(x) container_of(x, struct drm_dp_mst_topology_state, base)
 
+struct drm_dp_vcpi_allocation {
+        struct drm_dp_mst_port *port;
+        int vcpi;
+        struct list_head next;
+};
+
 struct drm_dp_mst_topology_state {
         struct drm_private_state base;
-        int avail_slots;
+        struct list_head vcpis;
         struct drm_dp_mst_topology_mgr *mgr;
 };
 
@@ -617,13 +644,115 @@ void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
 int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
 struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
                                                                     struct drm_dp_mst_topology_mgr *mgr);
-int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
-                                  struct drm_dp_mst_topology_mgr *mgr,
-                                  struct drm_dp_mst_port *port, int pbn);
-int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
-                                     struct drm_dp_mst_topology_mgr *mgr,
-                                     int slots);
+int __must_check
+drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
+                              struct drm_dp_mst_topology_mgr *mgr,
+                              struct drm_dp_mst_port *port, int pbn);
+int __must_check
+drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
+                                 struct drm_dp_mst_topology_mgr *mgr,
+                                 struct drm_dp_mst_port *port);
 int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr,
                                  struct drm_dp_mst_port *port, bool power_up);
+int __must_check drm_dp_mst_atomic_check(struct drm_atomic_state *state);
+
+void drm_dp_mst_get_port_malloc(struct drm_dp_mst_port *port);
+void drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port);
+
+extern const struct drm_private_state_funcs drm_dp_mst_topology_state_funcs;
+
+/**
+ * __drm_dp_mst_state_iter_get - private atomic state iterator function for
+ * macro-internal use
+ * @state: &struct drm_atomic_state pointer
+ * @mgr: pointer to the &struct drm_dp_mst_topology_mgr iteration cursor
+ * @old_state: optional pointer to the old &struct drm_dp_mst_topology_state
+ * iteration cursor
+ * @new_state: optional pointer to the new &struct drm_dp_mst_topology_state
+ * iteration cursor
+ * @i: int iteration cursor, for macro-internal use
+ *
+ * Used by for_each_oldnew_mst_mgr_in_state(),
+ * for_each_old_mst_mgr_in_state(), and for_each_new_mst_mgr_in_state(). Don't
+ * call this directly.
+ *
+ * Returns:
+ * True if the current &struct drm_private_obj is a &struct
+ * drm_dp_mst_topology_mgr, false otherwise.
+ */
+static inline bool
+__drm_dp_mst_state_iter_get(struct drm_atomic_state *state,
+                            struct drm_dp_mst_topology_mgr **mgr,
+                            struct drm_dp_mst_topology_state **old_state,
+                            struct drm_dp_mst_topology_state **new_state,
+                            int i)
+{
+        struct __drm_private_objs_state *objs_state = &state->private_objs[i];
+
+        if (objs_state->ptr->funcs != &drm_dp_mst_topology_state_funcs)
+                return false;
+
+        *mgr = to_dp_mst_topology_mgr(objs_state->ptr);
+        if (old_state)
+                *old_state = to_dp_mst_topology_state(objs_state->old_state);
+        if (new_state)
+                *new_state = to_dp_mst_topology_state(objs_state->new_state);
+
+        return true;
+}
+
+/**
+ * for_each_oldnew_mst_mgr_in_state - iterate over all DP MST topology
+ * managers in an atomic update
+ * @__state: &struct drm_atomic_state pointer
+ * @mgr: &struct drm_dp_mst_topology_mgr iteration cursor
+ * @old_state: &struct drm_dp_mst_topology_state iteration cursor for the old
+ * state
+ * @new_state: &struct drm_dp_mst_topology_state iteration cursor for the new
+ * state
+ * @__i: int iteration cursor, for macro-internal use
+ *
+ * This iterates over all DRM DP MST topology managers in an atomic update,
+ * tracking both old and new state. This is useful in places where the state
+ * delta needs to be considered, for example in atomic check functions.
+ */
+#define for_each_oldnew_mst_mgr_in_state(__state, mgr, old_state, new_state, __i) \
+        for ((__i) = 0; (__i) < (__state)->num_private_objs; (__i)++) \
+                for_each_if(__drm_dp_mst_state_iter_get((__state), &(mgr), &(old_state), &(new_state), (__i)))
+
+/**
+ * for_each_old_mst_mgr_in_state - iterate over all DP MST topology managers
+ * in an atomic update
+ * @__state: &struct drm_atomic_state pointer
+ * @mgr: &struct drm_dp_mst_topology_mgr iteration cursor
+ * @old_state: &struct drm_dp_mst_topology_state iteration cursor for the old
+ * state
+ * @__i: int iteration cursor, for macro-internal use
+ *
+ * This iterates over all DRM DP MST topology managers in an atomic update,
+ * tracking only the old state. This is useful in disable functions, where we
+ * need the old state the hardware is still in.
+ */
+#define for_each_old_mst_mgr_in_state(__state, mgr, old_state, __i) \
+        for ((__i) = 0; (__i) < (__state)->num_private_objs; (__i)++) \
+                for_each_if(__drm_dp_mst_state_iter_get((__state), &(mgr), &(old_state), NULL, (__i)))
+
+/**
+ * for_each_new_mst_mgr_in_state - iterate over all DP MST topology managers
+ * in an atomic update
+ * @__state: &struct drm_atomic_state pointer
+ * @mgr: &struct drm_dp_mst_topology_mgr iteration cursor
+ * @new_state: &struct drm_dp_mst_topology_state iteration cursor for the new
+ * state
+ * @__i: int iteration cursor, for macro-internal use
+ *
+ * This iterates over all DRM DP MST topology managers in an atomic update,
+ * tracking only the new state. This is useful in enable functions, where we
+ * need the new state the hardware should be in when the atomic commit
+ * operation has completed.
+ */
+#define for_each_new_mst_mgr_in_state(__state, mgr, new_state, __i) \
+        for ((__i) = 0; (__i) < (__state)->num_private_objs; (__i)++) \
+                for_each_if(__drm_dp_mst_state_iter_get((__state), &(mgr), NULL, &(new_state), (__i)))
 
 #endif
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index e3c404833115..8dc1a081fb36 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -352,18 +352,17 @@ drm_load_edid_firmware(struct drm_connector *connector)
 
 int
 drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
-                                         const struct drm_display_mode *mode,
-                                         bool is_hdmi2_sink);
+                                         struct drm_connector *connector,
+                                         const struct drm_display_mode *mode);
 int
 drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame,
                                             struct drm_connector *connector,
                                             const struct drm_display_mode *mode);
 void
 drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
+                                   struct drm_connector *connector,
                                    const struct drm_display_mode *mode,
-                                   enum hdmi_quantization_range rgb_quant_range,
-                                   bool rgb_quant_range_selectable,
-                                   bool is_hdmi2_sink);
+                                   enum hdmi_quantization_range rgb_quant_range);
 
 /**
  * drm_eld_mnl - Get ELD monitor name length in bytes.
@@ -471,7 +470,6 @@ 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);
 enum hdmi_quantization_range
 drm_default_rgb_quant_range(const struct drm_display_mode *mode);
 int drm_add_modes_noedid(struct drm_connector *connector,
diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h
index 1107b4b1c599..a09864f6d684 100644
--- a/include/drm/drm_encoder_slave.h
+++ b/include/drm/drm_encoder_slave.h
@@ -27,7 +27,6 @@
 #ifndef __DRM_ENCODER_SLAVE_H__
 #define __DRM_ENCODER_SLAVE_H__
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_encoder.h>
 
diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h
index c94acedfb08e..f0b34c977ec5 100644
--- a/include/drm/drm_framebuffer.h
+++ b/include/drm/drm_framebuffer.h
@@ -23,13 +23,17 @@
 #ifndef __DRM_FRAMEBUFFER_H__
 #define __DRM_FRAMEBUFFER_H__
 
-#include <linux/list.h>
 #include <linux/ctype.h>
+#include <linux/list.h>
+#include <linux/sched.h>
+
 #include <drm/drm_mode_object.h>
 
-struct drm_framebuffer;
-struct drm_file;
+struct drm_clip_rect;
 struct drm_device;
+struct drm_file;
+struct drm_framebuffer;
+struct drm_gem_object;
 
 /**
  * struct drm_framebuffer_funcs - framebuffer hooks
diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h
index 07c504940ba1..947ac95eb24a 100644
--- a/include/drm/drm_gem_cma_helper.h
+++ b/include/drm/drm_gem_cma_helper.h
@@ -2,9 +2,12 @@
 #ifndef __DRM_GEM_CMA_HELPER_H__
 #define __DRM_GEM_CMA_HELPER_H__
 
-#include <drm/drmP.h>
+#include <drm/drm_file.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_gem.h>
 
+struct drm_mode_create_dumb;
+
 /**
  * struct drm_gem_cma_object - GEM object backed by CMA memory allocations
  * @base: base GEM object
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index baded6514456..be4fed97e727 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -136,8 +136,7 @@ enum drm_mode_status {
         .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
         .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
         .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
-        .vscan = (vs), .flags = (f), \
-        .base.type = DRM_MODE_OBJECT_MODE
+        .vscan = (vs), .flags = (f)
 
 #define CRTC_INTERLACE_HALVE_V  (1 << 0) /* halve V values for interlacing */
 #define CRTC_STEREO_DOUBLE      (1 << 1) /* adjust timings for stereo modes */
@@ -214,20 +213,6 @@ struct drm_display_mode {
         struct list_head head;
 
         /**
-         * @base:
-         *
-         * A display mode is a normal modeset object, possibly including public
-         * userspace id.
-         *
-         * FIXME:
-         *
-         * This can probably be removed since the entire concept of userspace
-         * managing modes explicitly has never landed in upstream kernel mode
-         * setting support.
-         */
-        struct drm_mode_object base;
-
-        /**
          * @name:
          *
          * Human-readable name of the mode, filled out with drm_mode_set_name().
@@ -429,14 +414,14 @@ struct drm_display_mode {
 /**
  * DRM_MODE_FMT - printf string for &struct drm_display_mode
  */
-#define DRM_MODE_FMT    "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"
+#define DRM_MODE_FMT    "\"%s\": %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"
 
 /**
  * DRM_MODE_ARG - printf arguments for &struct drm_display_mode
  * @m: display mode
  */
 #define DRM_MODE_ARG(m) \
-        (m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \
+        (m)->name, (m)->vrefresh, (m)->clock, \
         (m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \
         (m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \
         (m)->type, (m)->flags
diff --git a/include/drm/drm_util.h b/include/drm/drm_util.h
index 88abdca89baa..8163d35f8327 100644
--- a/include/drm/drm_util.h
+++ b/include/drm/drm_util.h
@@ -26,7 +26,58 @@
 #ifndef _DRM_UTIL_H_
 #define _DRM_UTIL_H_
 
-/* helper for handling conditionals in various for_each macros */
+/**
+ * DOC: drm utils
+ *
+ * Macros and inline functions that does not naturally belong in other places
+ */
+
+#include <linux/interrupt.h>
+#include <linux/kgdb.h>
+#include <linux/preempt.h>
+#include <linux/smp.h>
+
+/*
+ * Use EXPORT_SYMBOL_FOR_TESTS_ONLY() for functions that shall
+ * only be visible for drmselftests.
+ */
+#if defined(CONFIG_DRM_DEBUG_SELFTEST_MODULE)
+#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x) EXPORT_SYMBOL(x)
+#else
+#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x)
+#endif
+
+/**
+ * for_each_if - helper for handling conditionals in various for_each macros
+ * @condition: The condition to check
+ *
+ * Typical use::
+ *
+ *      #define for_each_foo_bar(x, y) \'
+ *              list_for_each_entry(x, y->list, head) \'
+ *                      for_each_if(x->something == SOMETHING)
+ *
+ * The for_each_if() macro makes the use of for_each_foo_bar() less error
+ * prone.
+ */
 #define for_each_if(condition) if (!(condition)) {} else
 
+/**
+ * drm_can_sleep - returns true if currently okay to sleep
+ *
+ * This function shall not be used in new code.
+ * The check for running in atomic context may not work - see linux/preempt.h.
+ *
+ * FIXME: All users of drm_can_sleep should be removed (see todo.rst)
+ *
+ * Returns:
+ * True if kgdb is active or we are in an atomic context or irqs are disabled
+ */
+static inline bool drm_can_sleep(void)
+{
+        if (in_atomic() || in_dbg_master() || irqs_disabled())
+                return false;
+        return true;
+}
+
 #endif
diff --git a/include/drm/drm_vblank.h b/include/drm/drm_vblank.h
index 6ad9630d4f48..e528bb2f659d 100644
--- a/include/drm/drm_vblank.h
+++ b/include/drm/drm_vblank.h
@@ -129,6 +129,26 @@ struct drm_vblank_crtc {
          */
         u32 last;
         /**
+         * @max_vblank_count:
+         *
+         * Maximum value of the vblank registers for this crtc. This value +1
+         * will result in a wrap-around of the vblank register. It is used
+         * by the vblank core to handle wrap-arounds.
+         *
+         * If set to zero the vblank core will try to guess the elapsed vblanks
+         * between times when the vblank interrupt is disabled through
+         * high-precision timestamps. That approach is suffering from small
+         * races and imprecision over longer time periods, hence exposing a
+         * hardware vblank counter is always recommended.
+         *
+         * This is the runtime configurable per-crtc maximum set through
+         * drm_crtc_set_max_vblank_count(). If this is used the driver
+         * must leave the device wide &drm_device.max_vblank_count at zero.
+         *
+         * If non-zero, &drm_crtc_funcs.get_vblank_counter must be set.
+         */
+        u32 max_vblank_count;
+        /**
          * @inmodeset: Tracks whether the vblank is disabled due to a modeset.
          * For legacy driver bit 2 additionally tracks whether an additional
          * temporary vblank reference has been acquired to paper over the
@@ -206,4 +226,6 @@ bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 void drm_calc_timestamping_constants(struct drm_crtc *crtc,
                                      const struct drm_display_mode *mode);
 wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc);
+void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc,
+                                   u32 max_vblank_count);
 #endif
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 0b44260a5ee9..41106c835747 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -581,10 +581,18 @@ extern "C" {
  * Indicates the superblock size(s) used for the AFBC buffer. The buffer
  * size (in pixels) must be aligned to a multiple of the superblock size.
  * Four lowest significant bits(LSBs) are reserved for block size.
+ *
+ * Where one superblock size is specified, it applies to all planes of the
+ * buffer (e.g. 16x16, 32x8). When multiple superblock sizes are specified,
+ * the first applies to the Luma plane and the second applies to the Chroma
+ * plane(s). e.g. (32x8_64x4 means 32x8 Luma, with 64x4 Chroma).
+ * Multiple superblock sizes are only valid for multi-plane YCbCr formats.
  */
 #define AFBC_FORMAT_MOD_BLOCK_SIZE_MASK      0xf
 #define AFBC_FORMAT_MOD_BLOCK_SIZE_16x16     (1ULL)
 #define AFBC_FORMAT_MOD_BLOCK_SIZE_32x8      (2ULL)
+#define AFBC_FORMAT_MOD_BLOCK_SIZE_64x4      (3ULL)
+#define AFBC_FORMAT_MOD_BLOCK_SIZE_32x8_64x4 (4ULL)
 
 /*
  * AFBC lossless colorspace transform
@@ -644,6 +652,21 @@ extern "C" {
  */
 #define AFBC_FORMAT_MOD_SC      (1ULL <<  9)
 
+/*
+ * AFBC double-buffer
+ *
+ * Indicates that the buffer is allocated in a layout safe for front-buffer
+ * rendering.
+ */
+#define AFBC_FORMAT_MOD_DB      (1ULL << 10)
+
+/*
+ * AFBC buffer content hints
+ *
+ * Indicates that the buffer includes per-superblock content hints.
+ */
+#define AFBC_FORMAT_MOD_BCH     (1ULL << 11)
+
 #if defined(__cplusplus)
 }
 #endif