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

Pull drm updates from Dave Airlie:
 "The biggest thing in this is the AMD Navi GPU support, this again
  contains a bunch of header files that are large. These are the new AMD
  RX5700 GPUs that just recently became available.

  New drivers:
   - ST-Ericsson MCDE driver
   - Ingenic JZ47xx SoC

  UAPI change:
   - HDR source metadata property

  Core:
   - HDR inforframes and EDID parsing
   - drm hdmi infoframe unpacking
   - remove prime sg_table caching into dma-buf
   - New gem vram helpers to reduce driver code
   - Lots of drmP.h removal
   - reservation fencing fix
   - documentation updates
   - drm_fb_helper_connector removed
   - mode name command handler rewrite

  fbcon:
   - Remove the fbcon notifiers

  ttm:
   - forward progress fixes

  dma-buf:
   - make mmap call optional
   - debugfs refcount fixes
   - dma-fence free with pending signals fix
   - each dma-buf gets an inode

  Panels:
   - Lots of additional panel bindings

  amdgpu:
   - initial navi10 support
   - avoid hw reset
   - HDR metadata support
   - new thermal sensors for vega asics
   - RAS fixes
   - use HMM rather than MMU notifier
   - xgmi topology via kfd
   - SR-IOV fixes
   - driver reload fixes
   - DC use a core bpc attribute
   - Aux fixes for DC
   - Bandwidth calc updates for DC
   - Clock handling refactor
   - kfd VEGAM support

  vmwgfx:
   - Coherent memory support changes

  i915:
   - HDR Support
   - HDMI i2c link
   - Icelake multi-segmented gamma support
   - GuC firmware update
   - Mule Creek Canyon PCH support for EHL
   - EHL platform updtes
   - move i915.alpha_support to i915.force_probe
   - runtime PM refactoring
   - VBT parsing refactoring
   - DSI fixes
   - struct mutex dependency reduction
   - GEM code reorg

  mali-dp:
   - Komeda driver features

  msm:
   - dsi vs EPROBE_DEFER fixes
   - msm8998 snapdragon 835 support
   - a540 gpu support
   - mdp5 and dpu interconnect support

  exynos:
   - drmP.h removal

  tegra:
   - misc fixes

  tda998x:
   - audio support improvements
   - pixel repeated mode support
   - quantisation range handling corrections
   - HDMI vendor info fix

  armada:
   - interlace support fix
   - overlay/video plane register handling refactor
   - add gamma support

  rockchip:
   - RX3328 support

  panfrost:
   - expose perf counters via hidden ioctls

  vkms:
   - enumerate CRC sources list

  ast:
   - rework BO handling

  mgag200:
   - rework BO handling

  dw-hdmi:
   - suspend/resume support

  rcar-du:
   - R8A774A1 Soc Support
   - LVDS dual-link mode support
   - Additional formats
   - Misc fixes

  omapdrm:
   - DSI command mode display support

  stm
   - fb modifier support
   - runtime PM support

  sun4i:
   - use vmap ops

  vc4:
   - binner bo binding rework

  v3d:
   - compute shader support
   - resync/sync fixes
   - job management refactoring

  lima:
   - NULL pointer in irq handler fix
   - scheduler default timeout

  virtio:
   - fence seqno support
   - trace events

  bochs:
   - misc fixes

  tc458767:
   - IRQ/HDP handling

  sii902x:
   - HDMI audio support

  atmel-hlcdc:
   - misc fixes

  meson:
   - zpos support"

* tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm: (1815 commits)
  Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next"
  Revert "mm: adjust apply_to_pfn_range interface for dropped token."
  mm: adjust apply_to_pfn_range interface for dropped token.
  drm/amdgpu/navi10: add uclk activity sensor
  drm/amdgpu: properly guard the generic discovery code
  drm/amdgpu: add missing documentation on new module parameters
  drm/amdgpu: don't invalidate caches in RELEASE_MEM, only do the writeback
  drm/amd/display: avoid 64-bit division
  drm/amdgpu/psp11: simplify the ucode register logic
  drm/amdgpu: properly guard DC support in navi code
  drm/amd/powerplay: vega20: fix uninitialized variable use
  drm/amd/display: dcn20: include linux/delay.h
  amdgpu: make pmu support optional
  drm/amd/powerplay: Zero initialize current_rpm in vega20_get_fan_speed_percent
  drm/amd/powerplay: Zero initialize freq in smu_v11_0_get_current_clk_freq
  drm/amd/powerplay: Use memset to initialize metrics structs
  drm/amdgpu/mes10.1: Fix header guard
  drm/amd/powerplay: add temperature sensor support for navi10
  drm/amdgpu: fix scheduler timeout calc
  drm/amdgpu: Prepare for hmm_range_register API change (v2)
  ...

33 files changed, 933 insertions, 171 deletions

diff --git a/include/drm/amd_asic_type.h b/include/drm/amd_asic_type.h
index dd63d08cc54e..bcc2bcf32886 100644
--- a/include/drm/amd_asic_type.h
+++ b/include/drm/amd_asic_type.h
@@ -49,6 +49,7 @@ enum amd_asic_type {
         CHIP_VEGA12,
         CHIP_VEGA20,
         CHIP_RAVEN,
+        CHIP_NAVI10,
         CHIP_LAST,
 };
 
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index b4ca970a5b75..c402364aec0d 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -150,6 +150,8 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev,
                              struct drm_encoder *encoder,
                              const struct dw_hdmi_plat_data *plat_data);
 
+void dw_hdmi_resume(struct dw_hdmi *hdmi);
+
 void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);
 
 void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate);
diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h
index 0c33b9e9e0f0..94cc64a342e1 100644
--- a/include/drm/bridge/dw_mipi_dsi.h
+++ b/include/drm/bridge/dw_mipi_dsi.h
@@ -9,10 +9,20 @@
 #ifndef __DW_MIPI_DSI__
 #define __DW_MIPI_DSI__
 
+#include <linux/types.h>
+
+#include <drm/drm_modes.h>
+
+struct drm_display_mode;
+struct drm_encoder;
 struct dw_mipi_dsi;
+struct mipi_dsi_device;
+struct platform_device;
 
 struct dw_mipi_dsi_phy_ops {
         int (*init)(void *priv_data);
+        void (*power_on)(void *priv_data);
+        void (*power_off)(void *priv_data);
         int (*get_lane_mbps)(void *priv_data,
                              const struct drm_display_mode *mode,
                              unsigned long mode_flags, u32 lanes, u32 format,
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index e937ff2beb04..927e1205d7aa 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -459,6 +459,13 @@ struct drm_private_state *
 drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
                                      struct drm_private_obj *obj);
 
+struct drm_connector *
+drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
+                                         struct drm_encoder *encoder);
+struct drm_connector *
+drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
+                                         struct drm_encoder *encoder);
+
 /**
  * drm_atomic_get_existing_crtc_state - get crtc state, if it exists
  * @state: global atomic state object
@@ -950,4 +957,19 @@ drm_atomic_crtc_needs_modeset(const struct drm_crtc_state *state)
                state->connectors_changed;
 }
 
+/**
+ * drm_atomic_crtc_effectively_active - compute whether crtc is actually active
+ * @state: &drm_crtc_state for the CRTC
+ *
+ * When in self refresh mode, the crtc_state->active value will be false, since
+ * the crtc is off. However in some cases we're interested in whether the crtc
+ * is active, or effectively active (ie: it's connected to an active display).
+ * In these cases, use this function instead of just checking active.
+ */
+static inline bool
+drm_atomic_crtc_effectively_active(const struct drm_crtc_state *state)
+{
+        return state->active || state->self_refresh_active;
+}
+
 #endif /* DRM_ATOMIC_H_ */
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index 58214be3bf3d..bf4e07141d81 100644
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -117,12 +117,8 @@ int drm_atomic_helper_update_plane(struct drm_plane *plane,
                                    struct drm_modeset_acquire_ctx *ctx);
 int drm_atomic_helper_disable_plane(struct drm_plane *plane,
                                     struct drm_modeset_acquire_ctx *ctx);
-int __drm_atomic_helper_disable_plane(struct drm_plane *plane,
-                struct drm_plane_state *plane_state);
 int drm_atomic_helper_set_config(struct drm_mode_set *set,
                                  struct drm_modeset_acquire_ctx *ctx);
-int __drm_atomic_helper_set_config(struct drm_mode_set *set,
-                struct drm_atomic_state *state);
 
 int drm_atomic_helper_disable_all(struct drm_device *dev,
                                   struct drm_modeset_acquire_ctx *ctx);
diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h
index 66c92cbd8e16..e4577cc11689 100644
--- a/include/drm/drm_atomic_state_helper.h
+++ b/include/drm/drm_atomic_state_helper.h
@@ -37,6 +37,8 @@ struct drm_private_state;
 struct drm_modeset_acquire_ctx;
 struct drm_device;
 
+void __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc,
+                                    struct drm_crtc_state *state);
 void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc);
 void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc,
                                               struct drm_crtc_state *state);
@@ -60,6 +62,7 @@ void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
 void __drm_atomic_helper_connector_reset(struct drm_connector *connector,
                                          struct drm_connector_state *conn_state);
 void drm_atomic_helper_connector_reset(struct drm_connector *connector);
+void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector);
 void
 __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector,
                                            struct drm_connector_state *state);
diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h
index 871008118bab..6bf8b2b78991 100644
--- a/include/drm/drm_auth.h
+++ b/include/drm/drm_auth.h
@@ -1,3 +1,6 @@
+#ifndef _DRM_AUTH_H_
+#define _DRM_AUTH_H_
+
 /*
  * Internal Header for the Direct Rendering Manager
  *
@@ -25,8 +28,12 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _DRM_AUTH_H_
-#define _DRM_AUTH_H_
+#include <linux/idr.h>
+#include <linux/kref.h>
+#include <linux/wait.h>
+
+struct drm_file;
+struct drm_hw_lock;
 
 /*
  * Legacy DRI1 locking data structure. Only here instead of in drm_legacy.h for
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index d4428913a4e1..7616f6562fe4 100644
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -237,6 +237,103 @@ struct drm_bridge_funcs {
          * The enable callback is optional.
          */
         void (*enable)(struct drm_bridge *bridge);
+
+        /**
+         * @atomic_pre_enable:
+         *
+         * This callback should enable the bridge. It is called right before
+         * the preceding element in the display pipe is enabled. If the
+         * preceding element is a bridge this means it's called before that
+         * bridge's @atomic_pre_enable or @pre_enable function. If the preceding
+         * element is a &drm_encoder it's called right before the encoder's
+         * &drm_encoder_helper_funcs.atomic_enable hook.
+         *
+         * The display pipe (i.e. clocks and timing signals) feeding this bridge
+         * will not yet be running when this callback is called. The bridge must
+         * not enable the display link feeding the next bridge in the chain (if
+         * there is one) when this callback is called.
+         *
+         * Note that this function will only be invoked in the context of an
+         * atomic commit. It will not be invoked from &drm_bridge_pre_enable. It
+         * would be prudent to also provide an implementation of @pre_enable if
+         * you are expecting driver calls into &drm_bridge_pre_enable.
+         *
+         * The @atomic_pre_enable callback is optional.
+         */
+        void (*atomic_pre_enable)(struct drm_bridge *bridge,
+                                  struct drm_atomic_state *state);
+
+        /**
+         * @atomic_enable:
+         *
+         * This callback should enable the bridge. It is called right after
+         * the preceding element in the display pipe is enabled. If the
+         * preceding element is a bridge this means it's called after that
+         * bridge's @atomic_enable or @enable function. If the preceding element
+         * is a &drm_encoder it's called right after the encoder's
+         * &drm_encoder_helper_funcs.atomic_enable hook.
+         *
+         * The bridge can assume that the display pipe (i.e. clocks and timing
+         * signals) feeding it is running when this callback is called. This
+         * callback must enable the display link feeding the next bridge in the
+         * chain if there is one.
+         *
+         * Note that this function will only be invoked in the context of an
+         * atomic commit. It will not be invoked from &drm_bridge_enable. It
+         * would be prudent to also provide an implementation of @enable if
+         * you are expecting driver calls into &drm_bridge_enable.
+         *
+         * The enable callback is optional.
+         */
+        void (*atomic_enable)(struct drm_bridge *bridge,
+                              struct drm_atomic_state *state);
+        /**
+         * @atomic_disable:
+         *
+         * This callback should disable the bridge. It is called right before
+         * the preceding element in the display pipe is disabled. If the
+         * preceding element is a bridge this means it's called before that
+         * bridge's @atomic_disable or @disable vfunc. If the preceding element
+         * is a &drm_encoder it's called right before the
+         * &drm_encoder_helper_funcs.atomic_disable hook.
+         *
+         * The bridge can assume that the display pipe (i.e. clocks and timing
+         * signals) feeding it is still running when this callback is called.
+         *
+         * Note that this function will only be invoked in the context of an
+         * atomic commit. It will not be invoked from &drm_bridge_disable. It
+         * would be prudent to also provide an implementation of @disable if
+         * you are expecting driver calls into &drm_bridge_disable.
+         *
+         * The disable callback is optional.
+         */
+        void (*atomic_disable)(struct drm_bridge *bridge,
+                               struct drm_atomic_state *state);
+
+        /**
+         * @atomic_post_disable:
+         *
+         * This callback should disable the bridge. It is called right after the
+         * preceding element in the display pipe is disabled. If the preceding
+         * element is a bridge this means it's called after that bridge's
+         * @atomic_post_disable or @post_disable function. If the preceding
+         * element is a &drm_encoder it's called right after the encoder's
+         * &drm_encoder_helper_funcs.atomic_disable hook.
+         *
+         * The bridge must assume that the display pipe (i.e. clocks and timing
+         * signals) feeding it is no longer running when this callback is
+         * called.
+         *
+         * Note that this function will only be invoked in the context of an
+         * atomic commit. It will not be invoked from &drm_bridge_post_disable.
+         * It would be prudent to also provide an implementation of
+         * @post_disable if you are expecting driver calls into
+         * &drm_bridge_post_disable.
+         *
+         * The post_disable callback is optional.
+         */
+        void (*atomic_post_disable)(struct drm_bridge *bridge,
+                                    struct drm_atomic_state *state);
 };
 
 /**
@@ -265,6 +362,14 @@ struct drm_bridge_timings {
          * input signal after the clock edge.
          */
         u32 hold_time_ps;
+        /**
+         * @dual_link:
+         *
+         * True if the bus operates in dual-link mode. The exact meaning is
+         * dependent on the bus type. For LVDS buses, this indicates that even-
+         * and odd-numbered pixels are received on separate links.
+         */
+        bool dual_link;
 };
 
 /**
@@ -314,6 +419,15 @@ void drm_bridge_mode_set(struct drm_bridge *bridge,
 void drm_bridge_pre_enable(struct drm_bridge *bridge);
 void drm_bridge_enable(struct drm_bridge *bridge);
 
+void drm_atomic_bridge_disable(struct drm_bridge *bridge,
+                               struct drm_atomic_state *state);
+void drm_atomic_bridge_post_disable(struct drm_bridge *bridge,
+                                    struct drm_atomic_state *state);
+void drm_atomic_bridge_pre_enable(struct drm_bridge *bridge,
+                                  struct drm_atomic_state *state);
+void drm_atomic_bridge_enable(struct drm_bridge *bridge,
+                              struct drm_atomic_state *state);
+
 #ifdef CONFIG_DRM_PANEL_BRIDGE
 struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel,
                                         u32 connector_type);
diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
index 268b2cf0052a..72d51d1e9dd9 100644
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
@@ -3,8 +3,13 @@
 #ifndef _DRM_CLIENT_H_
 #define _DRM_CLIENT_H_
 
+#include <linux/lockdep.h>
+#include <linux/mutex.h>
 #include <linux/types.h>
 
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc.h>
+
 struct drm_client_dev;
 struct drm_device;
 struct drm_file;
@@ -85,6 +90,16 @@ struct drm_client_dev {
          * @file: DRM file
          */
         struct drm_file *file;
+
+        /**
+         * @modeset_mutex: Protects @modesets.
+         */
+        struct mutex modeset_mutex;
+
+        /**
+         * @modesets: CRTC configurations
+         */
+        struct drm_mode_set *modesets;
 };
 
 int drm_client_init(struct drm_device *dev, struct drm_client_dev *client,
@@ -135,6 +150,37 @@ struct drm_client_buffer *
 drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32 height, u32 format);
 void drm_client_framebuffer_delete(struct drm_client_buffer *buffer);
 
+int drm_client_modeset_create(struct drm_client_dev *client);
+void drm_client_modeset_free(struct drm_client_dev *client);
+int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, unsigned int height);
+bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation);
+int drm_client_modeset_commit_force(struct drm_client_dev *client);
+int drm_client_modeset_commit(struct drm_client_dev *client);
+int drm_client_modeset_dpms(struct drm_client_dev *client, int mode);
+
+/**
+ * drm_client_for_each_modeset() - Iterate over client modesets
+ * @modeset: &drm_mode_set loop cursor
+ * @client: DRM client
+ */
+#define drm_client_for_each_modeset(modeset, client) \
+        for (({ lockdep_assert_held(&(client)->modeset_mutex); }), \
+             modeset = (client)->modesets; modeset->crtc; modeset++)
+
+/**
+ * drm_client_for_each_connector_iter - connector_list iterator macro
+ * @connector: &struct drm_connector pointer used as cursor
+ * @iter: &struct drm_connector_list_iter
+ *
+ * This iterates the connectors that are useable for internal clients (excludes
+ * writeback connectors).
+ *
+ * For more info see drm_for_each_connector_iter().
+ */
+#define drm_client_for_each_connector_iter(connector, iter) \
+        drm_for_each_connector_iter(connector, iter) \
+                if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
+
 int drm_client_debugfs_init(struct drm_minor *minor);
 
 #endif
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 02a131202add..ca745d9feaf5 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -464,13 +464,37 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info,
                                      unsigned int num_formats);
 
 /**
+ * struct drm_connector_tv_margins - TV connector related margins
+ *
+ * Describes the margins in pixels to put around the image on TV
+ * connectors to deal with overscan.
+ */
+struct drm_connector_tv_margins {
+        /**
+         * @bottom: Bottom margin in pixels.
+         */
+        unsigned int bottom;
+
+        /**
+         * @left: Left margin in pixels.
+         */
+        unsigned int left;
+
+        /**
+         * @right: Right margin in pixels.
+         */
+        unsigned int right;
+
+        /**
+         * @top: Top margin in pixels.
+         */
+        unsigned int top;
+};
+
+/**
  * struct drm_tv_connector_state - TV connector related states
  * @subconnector: selected subconnector
- * @margins: margins (all margins are expressed in pixels)
- * @margins.left: left margin
- * @margins.right: right margin
- * @margins.top: top margin
- * @margins.bottom: bottom margin
+ * @margins: TV margins
  * @mode: TV mode
  * @brightness: brightness in percent
  * @contrast: contrast in percent
@@ -481,12 +505,7 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info,
  */
 struct drm_tv_connector_state {
         enum drm_mode_subconnector subconnector;
-        struct {
-                unsigned int left;
-                unsigned int right;
-                unsigned int top;
-                unsigned int bottom;
-        } margins;
+        struct drm_connector_tv_margins margins;
         unsigned int mode;
         unsigned int brightness;
         unsigned int contrast;
@@ -517,6 +536,15 @@ struct drm_connector_state {
          * Used by the atomic helpers to select the encoder, through the
          * &drm_connector_helper_funcs.atomic_best_encoder or
          * &drm_connector_helper_funcs.best_encoder callbacks.
+         *
+         * This is also used in the atomic helpers to map encoders to their
+         * current and previous connectors, see
+         * &drm_atomic_get_old_connector_for_encoder() and
+         * &drm_atomic_get_new_connector_for_encoder().
+         *
+         * NOTE: Atomic drivers must fill this out (either themselves or through
+         * helpers), for otherwise the GETCONNECTOR and GETENCODER IOCTLs will
+         * not return correct data to userspace.
          */
         struct drm_encoder *best_encoder;
 
@@ -540,6 +568,20 @@ struct drm_connector_state {
         struct drm_tv_connector_state tv;
 
         /**
+         * @self_refresh_aware:
+         *
+         * This tracks whether a connector is aware of the self refresh state.
+         * It should be set to true for those connector implementations which
+         * understand the self refresh state. This is needed since the crtc
+         * registers the self refresh helpers and it doesn't know if the
+         * connectors downstream have implemented self refresh entry/exit.
+         *
+         * Drivers should set this to true in atomic_check if they know how to
+         * handle self_refresh requests.
+         */
+        bool self_refresh_aware;
+
+        /**
          * @picture_aspect_ratio: Connector property to control the
          * HDMI infoframe aspect ratio setting.
          *
@@ -599,6 +641,12 @@ struct drm_connector_state {
          * and the connector bpc limitations obtained from edid.
          */
         u8 max_bpc;
+
+        /**
+         * @hdr_output_metadata:
+         * DRM blob property for HDR output metadata
+         */
+        struct drm_property_blob *hdr_output_metadata;
 };
 
 /**
@@ -894,19 +942,123 @@ struct drm_connector_funcs {
                                    const struct drm_connector_state *state);
 };
 
-/* mode specified on the command line */
+/**
+ * struct drm_cmdline_mode - DRM Mode passed through the kernel command-line
+ *
+ * Each connector can have an initial mode with additional options
+ * passed through the kernel command line. This structure allows to
+ * express those parameters and will be filled by the command-line
+ * parser.
+ */
 struct drm_cmdline_mode {
+        /**
+         * @name:
+         *
+         * Name of the mode.
+         */
+        char name[DRM_DISPLAY_MODE_LEN];
+
+        /**
+         * @specified:
+         *
+         * Has a mode been read from the command-line?
+         */
         bool specified;
+
+        /**
+         * @refresh_specified:
+         *
+         * Did the mode have a preferred refresh rate?
+         */
         bool refresh_specified;
+
+        /**
+         * @bpp_specified:
+         *
+         * Did the mode have a preferred BPP?
+         */
         bool bpp_specified;
-        int xres, yres;
+
+        /**
+         * @xres:
+         *
+         * Active resolution on the X axis, in pixels.
+         */
+        int xres;
+
+        /**
+         * @yres:
+         *
+         * Active resolution on the Y axis, in pixels.
+         */
+        int yres;
+
+        /**
+         * @bpp:
+         *
+         * Bits per pixels for the mode.
+         */
         int bpp;
+
+        /**
+         * @refresh:
+         *
+         * Refresh rate, in Hertz.
+         */
         int refresh;
+
+        /**
+         * @rb:
+         *
+         * Do we need to use reduced blanking?
+         */
         bool rb;
+
+        /**
+         * @interlace:
+         *
+         * The mode is interlaced.
+         */
         bool interlace;
+
+        /**
+         * @cvt:
+         *
+         * The timings will be calculated using the VESA Coordinated
+         * Video Timings instead of looking up the mode from a table.
+         */
         bool cvt;
+
+        /**
+         * @margins:
+         *
+         * Add margins to the mode calculation (1.8% of xres rounded
+         * down to 8 pixels and 1.8% of yres).
+         */
         bool margins;
+
+        /**
+         * @force:
+         *
+         * Ignore the hotplug state of the connector, and force its
+         * state to one of the DRM_FORCE_* values.
+         */
         enum drm_connector_force force;
+
+        /**
+         * @rotation_reflection:
+         *
+         * Initial rotation and reflection of the mode setup from the
+         * command line. See DRM_MODE_ROTATE_* and
+         * DRM_MODE_REFLECT_*. The only rotations supported are
+         * DRM_MODE_ROTATE_0 and DRM_MODE_ROTATE_180.
+         */
+        unsigned int rotation_reflection;
+
+        /**
+         * @tv_margins: TV margins to apply to the mode.
+         */
+        struct drm_connector_tv_margins tv_margins;
 };
 
 /**
@@ -1062,12 +1214,6 @@ struct drm_connector {
         struct drm_property *vrr_capable_property;
 
         /**
-         * @content_protection_property: DRM ENUM property for content
-         * protection. See drm_connector_attach_content_protection_property().
-         */
-        struct drm_property *content_protection_property;
-
-        /**
          * @colorspace_property: Connector property to set the suitable
          * colorspace supported by the sink.
          */
@@ -1239,6 +1385,9 @@ struct drm_connector {
          * &drm_mode_config.connector_free_work.
          */
         struct llist_node free_node;
+
+        /** @hdr_sink_metadata: HDR Metadata Information read from sink */
+        struct hdr_sink_metadata hdr_sink_metadata;
 };
 
 #define obj_to_connector(x) container_of(x, struct drm_connector, base)
@@ -1345,8 +1494,6 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector,
                                                u32 scaling_mode_mask);
 int drm_connector_attach_vrr_capable_property(
                 struct drm_connector *connector);
-int drm_connector_attach_content_protection_property(
-                struct drm_connector *connector);
 int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
 int drm_mode_create_colorspace_property(struct drm_connector *connector);
 int drm_mode_create_content_type_property(struct drm_device *dev);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 58ad983d7cd6..128d8b210621 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -39,6 +39,7 @@
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_modes.h>
 #include <drm/drm_connector.h>
+#include <drm/drm_device.h>
 #include <drm/drm_property.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_edid.h>
@@ -53,6 +54,7 @@ struct drm_mode_set;
 struct drm_file;
 struct drm_clip_rect;
 struct drm_printer;
+struct drm_self_refresh_data;
 struct device_node;
 struct dma_fence;
 struct edid;
@@ -300,6 +302,17 @@ struct drm_crtc_state {
         bool vrr_enabled;
 
         /**
+         * @self_refresh_active:
+         *
+         * Used by the self refresh helpers to denote when a self refresh
+         * transition is occurring. This will be set on enable/disable callbacks
+         * when self refresh is being enabled or disabled. In some cases, it may
+         * not be desirable to fully shut off the crtc during self refresh.
+         * CRTC's can inspect this flag and determine the best course of action.
+         */
+        bool self_refresh_active;
+
+        /**
          * @event:
          *
          * Optional pointer to a DRM event to signal upon completion of the
@@ -1087,6 +1100,13 @@ struct drm_crtc {
          * The name of the CRTC's fence timeline.
          */
         char timeline_name[32];
+
+        /**
+         * @self_refresh_data: Holds the state for the self refresh helpers
+         *
+         * Initialized via drm_self_refresh_helper_register().
+         */
+        struct drm_self_refresh_data *self_refresh_data;
 };
 
 /**
diff --git a/include/drm/drm_debugfs.h b/include/drm/drm_debugfs.h
index ac0f75df1ac9..7501e323d383 100644
--- a/include/drm/drm_debugfs.h
+++ b/include/drm/drm_debugfs.h
@@ -32,6 +32,8 @@
 #ifndef _DRM_DEBUGFS_H_
 #define _DRM_DEBUGFS_H_
 
+#include <linux/types.h>
+#include <linux/seq_file.h>
 /**
  * struct drm_info_list - debugfs info list entry
  *
diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
index 7f9ef709b2b6..1acfc3bbd3fb 100644
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
@@ -17,6 +17,7 @@ struct drm_vblank_crtc;
 struct drm_sg_mem;
 struct drm_local_map;
 struct drm_vma_offset_manager;
+struct drm_vram_mm;
 struct drm_fb_helper;
 
 struct inode;
@@ -286,6 +287,9 @@ struct drm_device {
         /** @vma_offset_manager: GEM information */
         struct drm_vma_offset_manager *vma_offset_manager;
 
+        /** @vram_mm: VRAM MM memory manager */
+        struct drm_vram_mm *vram_mm;
+
         /**
          * @switch_power_state:
          *
diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h
index c0d4df6a606f..9d3b745c3107 100644
--- a/include/drm/drm_displayid.h
+++ b/include/drm/drm_displayid.h
@@ -40,6 +40,7 @@
 #define DATA_BLOCK_DISPLAY_INTERFACE 0x0f
 #define DATA_BLOCK_STEREO_DISPLAY_INTERFACE 0x10
 #define DATA_BLOCK_TILED_DISPLAY 0x12
+#define DATA_BLOCK_CTA 0x81
 
 #define DATA_BLOCK_VENDOR_SPECIFIC 0x7f
 
@@ -90,4 +91,13 @@ struct displayid_detailed_timing_block {
         struct displayid_block base;
         struct displayid_detailed_timings_1 timings[0];
 };
+
+#define for_each_displayid_db(displayid, block, idx, length) \
+        for ((block) = (struct displayid_block *)&(displayid)[idx]; \
+             (idx) + sizeof(struct displayid_block) <= (length) && \
+             (idx) + sizeof(struct displayid_block) + (block)->num_bytes <= (length) && \
+             (block)->num_bytes > 0; \
+             (idx) += (block)->num_bytes + sizeof(struct displayid_block), \
+             (block) = (struct displayid_block *)&(displayid)[idx])
+
 #endif
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 97ce790a5b5a..397896b5b21a 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -249,6 +249,7 @@
 #define DP_DSC_PEAK_THROUGHPUT              0x06B
 # define DP_DSC_THROUGHPUT_MODE_0_MASK      (0xf << 0)
 # define DP_DSC_THROUGHPUT_MODE_0_SHIFT     0
+# define DP_DSC_THROUGHPUT_MODE_0_UPSUPPORTED 0
 # define DP_DSC_THROUGHPUT_MODE_0_340       (1 << 0)
 # define DP_DSC_THROUGHPUT_MODE_0_400       (2 << 0)
 # define DP_DSC_THROUGHPUT_MODE_0_450       (3 << 0)
@@ -263,8 +264,10 @@
 # define DP_DSC_THROUGHPUT_MODE_0_900       (12 << 0)
 # define DP_DSC_THROUGHPUT_MODE_0_950       (13 << 0)
 # define DP_DSC_THROUGHPUT_MODE_0_1000      (14 << 0)
+# define DP_DSC_THROUGHPUT_MODE_0_170       (15 << 4)
 # define DP_DSC_THROUGHPUT_MODE_1_MASK      (0xf << 4)
 # define DP_DSC_THROUGHPUT_MODE_1_SHIFT     4
+# define DP_DSC_THROUGHPUT_MODE_1_UPSUPPORTED 0
 # define DP_DSC_THROUGHPUT_MODE_1_340       (1 << 4)
 # define DP_DSC_THROUGHPUT_MODE_1_400       (2 << 4)
 # define DP_DSC_THROUGHPUT_MODE_1_450       (3 << 4)
@@ -279,6 +282,7 @@
 # define DP_DSC_THROUGHPUT_MODE_1_900       (12 << 4)
 # define DP_DSC_THROUGHPUT_MODE_1_950       (13 << 4)
 # define DP_DSC_THROUGHPUT_MODE_1_1000      (14 << 4)
+# define DP_DSC_THROUGHPUT_MODE_1_170       (15 << 4)
 
 #define DP_DSC_MAX_SLICE_WIDTH              0x06C
 #define DP_DSC_MIN_SLICE_WIDTH_VALUE        2560
@@ -352,6 +356,11 @@
 # define DP_FEC_CORR_BLK_ERROR_COUNT_CAP    (1 << 2)
 # define DP_FEC_BIT_ERROR_COUNT_CAP         (1 << 3)
 
+/* DP Extended DSC Capabilities */
+#define DP_DSC_BRANCH_OVERALL_THROUGHPUT_0  0x0a0   /* DP 1.4a SCR */
+#define DP_DSC_BRANCH_OVERALL_THROUGHPUT_1  0x0a1
+#define DP_DSC_BRANCH_MAX_LINE_WIDTH        0x0a2
+
 /* link configuration */
 #define DP_LINK_BW_SET                      0x100
 # define DP_LINK_RATE_TABLE                 0x00    /* eDP 1.4 */
@@ -1083,17 +1092,30 @@ struct dp_sdp_header {
 #define EDP_SDP_HEADER_VALID_PAYLOAD_BYTES      0x1F
 #define DP_SDP_PPS_HEADER_PAYLOAD_BYTES_MINUS_1 0x7F
 
-struct edp_vsc_psr {
+/**
+ * struct dp_sdp - DP secondary data packet
+ * @sdp_header: DP secondary data packet header
+ * @db: DP secondaray data packet data blocks
+ * VSC SDP Payload for PSR
+ * db[0]: Stereo Interface
+ * db[1]: 0 - PSR State; 1 - Update RFB; 2 - CRC Valid
+ * db[2]: CRC value bits 7:0 of the R or Cr component
+ * db[3]: CRC value bits 15:8 of the R or Cr component
+ * db[4]: CRC value bits 7:0 of the G or Y component
+ * db[5]: CRC value bits 15:8 of the G or Y component
+ * db[6]: CRC value bits 7:0 of the B or Cb component
+ * db[7]: CRC value bits 15:8 of the B or Cb component
+ * db[8] - db[31]: Reserved
+ * VSC SDP Payload for Pixel Encoding/Colorimetry Format
+ * db[0] - db[15]: Reserved
+ * db[16]: Pixel Encoding and Colorimetry Formats
+ * db[17]: Dynamic Range and Component Bit Depth
+ * db[18]: Content Type
+ * db[19] - db[31]: Reserved
+ */
+struct dp_sdp {
         struct dp_sdp_header sdp_header;
-        u8 DB0; /* Stereo Interface */
-        u8 DB1; /* 0 - PSR State; 1 - Update RFB; 2 - CRC Valid */
-        u8 DB2; /* CRC value bits 7:0 of the R or Cr component */
-        u8 DB3; /* CRC value bits 15:8 of the R or Cr component */
-        u8 DB4; /* CRC value bits 7:0 of the G or Y component */
-        u8 DB5; /* CRC value bits 15:8 of the G or Y component */
-        u8 DB6; /* CRC value bits 7:0 of the B or Cb component */
-        u8 DB7; /* CRC value bits 15:8 of the B or Cb component */
-        u8 DB8_31[24]; /* Reserved */
+        u8 db[32];
 } __packed;
 
 #define EDP_VSC_PSR_STATE_ACTIVE        (1<<0)
@@ -1401,6 +1423,13 @@ enum drm_dp_quirk {
          * driver still need to implement proper handling for such device.
          */
         DP_DPCD_QUIRK_NO_PSR,
+        /**
+         * @DP_DPCD_QUIRK_NO_SINK_COUNT:
+         *
+         * The device does not set SINK_COUNT to a non-zero value.
+         * The driver should ignore SINK_COUNT during detection.
+         */
+        DP_DPCD_QUIRK_NO_SINK_COUNT,
 };
 
 /**
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index c9ca0be54d9a..b9719418c3d2 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -25,6 +25,7 @@
 
 #include <linux/types.h>
 #include <linux/hdmi.h>
+#include <drm/drm_mode.h>
 
 struct drm_device;
 struct i2c_adapter;
@@ -176,21 +177,23 @@ struct detailed_timing {
 #define DRM_EDID_INPUT_BLANK_TO_BLACK  (1 << 4)
 #define DRM_EDID_INPUT_VIDEO_LEVEL     (3 << 5)
 #define DRM_EDID_INPUT_DIGITAL         (1 << 7)
-#define DRM_EDID_DIGITAL_DEPTH_MASK    (7 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_UNDEF   (0 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_6       (1 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_8       (2 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_10      (3 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_12      (4 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_14      (5 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_16      (6 << 4)
-#define DRM_EDID_DIGITAL_DEPTH_RSVD    (7 << 4)
-#define DRM_EDID_DIGITAL_TYPE_UNDEF    (0)
-#define DRM_EDID_DIGITAL_TYPE_DVI      (1)
-#define DRM_EDID_DIGITAL_TYPE_HDMI_A   (2)
-#define DRM_EDID_DIGITAL_TYPE_HDMI_B   (3)
-#define DRM_EDID_DIGITAL_TYPE_MDDI     (4)
-#define DRM_EDID_DIGITAL_TYPE_DP       (5)
+#define DRM_EDID_DIGITAL_DEPTH_MASK    (7 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_UNDEF   (0 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_6       (1 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_8       (2 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_10      (3 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_12      (4 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_14      (5 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_16      (6 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_DEPTH_RSVD    (7 << 4) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_MASK     (7 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_UNDEF    (0 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_DVI      (1 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_HDMI_A   (2 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_HDMI_B   (3 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_MDDI     (4 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_TYPE_DP       (5 << 0) /* 1.4 */
+#define DRM_EDID_DIGITAL_DFP_1_X       (1 << 0) /* 1.3 */
 
 #define DRM_EDID_FEATURE_DEFAULT_GTF      (1 << 0)
 #define DRM_EDID_FEATURE_PREFERRED_TIMING (1 << 1)
@@ -370,6 +373,10 @@ drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
                                    const struct drm_display_mode *mode,
                                    enum hdmi_quantization_range rgb_quant_range);
 
+int
+drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
+                                    const struct drm_connector_state *conn_state);
+
 /**
  * drm_eld_mnl - Get ELD monitor name length in bytes.
  * @eld: pointer to an eld memory structure with mnl set
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 40af2866c26a..c8a8ae2a678a 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -43,17 +43,6 @@ enum mode_set_atomic {
         ENTER_ATOMIC_MODE_SET,
 };
 
-struct drm_fb_offset {
-        int x, y;
-};
-
-struct drm_fb_helper_crtc {
-        struct drm_mode_set mode_set;
-        struct drm_display_mode *desired_mode;
-        int x, y;
-        int rotation;
-};
-
 /**
  * struct drm_fb_helper_surface_size - describes fbdev size and scanout surface size
  * @fb_width: fbdev width
@@ -104,18 +93,10 @@ struct drm_fb_helper_funcs {
                         struct drm_fb_helper_surface_size *sizes);
 };
 
-struct drm_fb_helper_connector {
-        struct drm_connector *connector;
-};
-
 /**
  * struct drm_fb_helper - main structure to emulate fbdev on top of KMS
  * @fb: Scanout framebuffer object
  * @dev: DRM device
- * @crtc_count: number of possible CRTCs
- * @crtc_info: per-CRTC helper state (mode, x/y offset, etc)
- * @connector_count: number of connected connectors
- * @connector_info_alloc_count: size of connector_info
  * @funcs: driver callbacks for fb helper
  * @fbdev: emulated fbdev device info struct
  * @pseudo_palette: fake palette of 16 colors
@@ -147,24 +128,6 @@ struct drm_fb_helper {
 
         struct drm_framebuffer *fb;
         struct drm_device *dev;
-        int crtc_count;
-        struct drm_fb_helper_crtc *crtc_info;
-        int connector_count;
-        int connector_info_alloc_count;
-        /**
-         * @sw_rotations:
-         * Bitmask of all rotations requested for panel-orientation which
-         * could not be handled in hardware. If only one bit is set
-         * fbdev->fbcon_rotate_hint gets set to the requested rotation.
-         */
-        int sw_rotations;
-        /**
-         * @connector_info:
-         *
-         * Array of per-connector information. Do not iterate directly, but use
-         * drm_fb_helper_for_each_connector.
-         */
-        struct drm_fb_helper_connector **connector_info;
         const struct drm_fb_helper_funcs *funcs;
         struct fb_info *fbdev;
         u32 pseudo_palette[17];
@@ -304,18 +267,8 @@ int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd,
 
 int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);
 int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
-int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
 int drm_fb_helper_debug_enter(struct fb_info *info);
 int drm_fb_helper_debug_leave(struct fb_info *info);
-struct drm_display_mode *
-drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
-                        int width, int height);
-struct drm_display_mode *
-drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);
-
-int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);
-int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
-                                       struct drm_connector *connector);
 
 int drm_fb_helper_fbdev_setup(struct drm_device *dev,
                               struct drm_fb_helper *fb_helper,
@@ -490,12 +443,6 @@ static inline int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper,
         return 0;
 }
 
-static inline int
-drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper)
-{
-        return 0;
-}
-
 static inline int drm_fb_helper_debug_enter(struct fb_info *info)
 {
         return 0;
@@ -506,34 +453,6 @@ static inline int drm_fb_helper_debug_leave(struct fb_info *info)
         return 0;
 }
 
-static inline struct drm_display_mode *
-drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
-                       int width, int height)
-{
-        return NULL;
-}
-
-static inline struct drm_display_mode *
-drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,
-                      int width, int height)
-{
-        return NULL;
-}
-
-static inline int
-drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper,
-                                struct drm_connector *connector)
-{
-        return 0;
-}
-
-static inline int
-drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
-                                   struct drm_connector *connector)
-{
-        return 0;
-}
-
 static inline int
 drm_fb_helper_fbdev_setup(struct drm_device *dev,
                           struct drm_fb_helper *fb_helper,
@@ -575,6 +494,27 @@ drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
 
 #endif
 
+/* TODO: There's a todo entry to remove these three */
+static inline int
+drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper)
+{
+        return 0;
+}
+
+static inline int
+drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper,
+                                struct drm_connector *connector)
+{
+        return 0;
+}
+
+static inline int
+drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
+                                   struct drm_connector *connector)
+{
+        return 0;
+}
+
 /**
  * drm_fb_helper_remove_conflicting_framebuffers - remove firmware-configured framebuffers
  * @a: memory range, users of which are to be removed
diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
index b3d9d88ab290..306d1efeb5e0 100644
--- a/include/drm/drm_fourcc.h
+++ b/include/drm/drm_fourcc.h
@@ -260,6 +260,50 @@ drm_format_info_is_yuv_sampling_444(const struct drm_format_info *info)
         return info->is_yuv && info->hsub == 1 && info->vsub == 1;
 }
 
+/**
+ * drm_format_info_plane_width - width of the plane given the first plane
+ * @info: pixel format info
+ * @width: width of the first plane
+ * @plane: plane index
+ *
+ * Returns:
+ * The width of @plane, given that the width of the first plane is @width.
+ */
+static inline
+int drm_format_info_plane_width(const struct drm_format_info *info, int width,
+                                int plane)
+{
+        if (!info || plane >= info->num_planes)
+                return 0;
+
+        if (plane == 0)
+                return width;
+
+        return width / info->hsub;
+}
+
+/**
+ * drm_format_info_plane_height - height of the plane given the first plane
+ * @info: pixel format info
+ * @height: height of the first plane
+ * @plane: plane index
+ *
+ * Returns:
+ * The height of @plane, given that the height of the first plane is @height.
+ */
+static inline
+int drm_format_info_plane_height(const struct drm_format_info *info, int height,
+                                 int plane)
+{
+        if (!info || plane >= info->num_planes)
+                return 0;
+
+        if (plane == 0)
+                return height;
+
+        return height / info->vsub;
+}
+
 const struct drm_format_info *__drm_format_info(u32 format);
 const struct drm_format_info *drm_format_info(u32 format);
 const struct drm_format_info *
@@ -268,12 +312,6 @@ drm_get_format_info(struct drm_device *dev,
 uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth);
 uint32_t drm_driver_legacy_fb_format(struct drm_device *dev,
                                      uint32_t bpp, uint32_t depth);
-int drm_format_num_planes(uint32_t format);
-int drm_format_plane_cpp(uint32_t format, int plane);
-int drm_format_horz_chroma_subsampling(uint32_t format);
-int drm_format_vert_chroma_subsampling(uint32_t format);
-int drm_format_plane_width(int width, uint32_t format, int plane);
-int drm_format_plane_height(int height, uint32_t format, int plane);
 unsigned int drm_format_info_block_width(const struct drm_format_info *info,
                                          int plane);
 unsigned int drm_format_info_block_height(const struct drm_format_info *info,
diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h
index c23016748e3f..c0e0256e3e98 100644
--- a/include/drm/drm_framebuffer.h
+++ b/include/drm/drm_framebuffer.h
@@ -87,6 +87,9 @@ struct drm_framebuffer_funcs {
          * for more information as all the semantics and arguments have a one to
          * one mapping on this function.
          *
+         * Atomic drivers should use drm_atomic_helper_dirtyfb() to implement
+         * this hook.
+         *
          * RETURNS:
          *
          * 0 on success or a negative error code on failure.
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 5047c7ee25f5..a9121fe66ea2 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -401,9 +401,4 @@ int drm_gem_dumb_destroy(struct drm_file *file,
                          struct drm_device *dev,
                          uint32_t handle);
 
-int drm_gem_pin(struct drm_gem_object *obj);
-void drm_gem_unpin(struct drm_gem_object *obj);
-void *drm_gem_vmap(struct drm_gem_object *obj);
-void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr);
-
 #endif /* __DRM_GEM_H__ */
diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
new file mode 100644
index 000000000000..9581ea0a4f7e
--- /dev/null
+++ b/include/drm/drm_gem_vram_helper.h
@@ -0,0 +1,153 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef DRM_GEM_VRAM_HELPER_H
+#define DRM_GEM_VRAM_HELPER_H
+
+#include <drm/drm_gem.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_placement.h>
+#include <linux/kernel.h> /* for container_of() */
+
+struct drm_mode_create_dumb;
+struct drm_vram_mm_funcs;
+struct filp;
+struct vm_area_struct;
+
+#define DRM_GEM_VRAM_PL_FLAG_VRAM       TTM_PL_FLAG_VRAM
+#define DRM_GEM_VRAM_PL_FLAG_SYSTEM     TTM_PL_FLAG_SYSTEM
+
+/*
+ * Buffer-object helpers
+ */
+
+/**
+ * struct drm_gem_vram_object - GEM object backed by VRAM
+ * @gem:        GEM object
+ * @bo:         TTM buffer object
+ * @kmap:       Mapping information for @bo
+ * @placement:  TTM placement information. Supported placements are \
+        %TTM_PL_VRAM and %TTM_PL_SYSTEM
+ * @placements: TTM placement information.
+ * @pin_count:  Pin counter
+ *
+ * The type struct drm_gem_vram_object represents a GEM object that is
+ * backed by VRAM. It can be used for simple framebuffer devices with
+ * dedicated memory. The buffer object can be evicted to system memory if
+ * video memory becomes scarce.
+ */
+struct drm_gem_vram_object {
+        struct drm_gem_object gem;
+        struct ttm_buffer_object bo;
+        struct ttm_bo_kmap_obj kmap;
+
+        /* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */
+        struct ttm_placement placement;
+        struct ttm_place placements[2];
+
+        int pin_count;
+};
+
+/**
+ * Returns the container of type &struct drm_gem_vram_object
+ * for field bo.
+ * @bo:         the VRAM buffer object
+ * Returns:     The containing GEM VRAM object
+ */
+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo(
+        struct ttm_buffer_object *bo)
+{
+        return container_of(bo, struct drm_gem_vram_object, bo);
+}
+
+/**
+ * Returns the container of type &struct drm_gem_vram_object
+ * for field gem.
+ * @gem:        the GEM object
+ * Returns:     The containing GEM VRAM object
+ */
+static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
+        struct drm_gem_object *gem)
+{
+        return container_of(gem, struct drm_gem_vram_object, gem);
+}
+
+struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
+                                                struct ttm_bo_device *bdev,
+                                                size_t size,
+                                                unsigned long pg_align,
+                                                bool interruptible);
+void drm_gem_vram_put(struct drm_gem_vram_object *gbo);
+u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo);
+s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo);
+int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, unsigned long pl_flag);
+int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo);
+void *drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map,
+                        bool *is_iomem);
+void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo);
+
+int drm_gem_vram_fill_create_dumb(struct drm_file *file,
+                                  struct drm_device *dev,
+                                  struct ttm_bo_device *bdev,
+                                  unsigned long pg_align,
+                                  bool interruptible,
+                                  struct drm_mode_create_dumb *args);
+
+/*
+ * Helpers for struct ttm_bo_driver
+ */
+
+void drm_gem_vram_bo_driver_evict_flags(struct ttm_buffer_object *bo,
+                                        struct ttm_placement *pl);
+
+int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo,
+                                         struct file *filp);
+
+extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs;
+
+/*
+ * Helpers for struct drm_driver
+ */
+
+void drm_gem_vram_driver_gem_free_object_unlocked(struct drm_gem_object *gem);
+int drm_gem_vram_driver_dumb_create(struct drm_file *file,
+                                    struct drm_device *dev,
+                                    struct drm_mode_create_dumb *args);
+int drm_gem_vram_driver_dumb_mmap_offset(struct drm_file *file,
+                                         struct drm_device *dev,
+                                         uint32_t handle, uint64_t *offset);
+
+/**
+ * define DRM_GEM_VRAM_DRIVER - default callback functions for \
+        &struct drm_driver
+ *
+ * Drivers that use VRAM MM and GEM VRAM can use this macro to initialize
+ * &struct drm_driver with default functions.
+ */
+#define DRM_GEM_VRAM_DRIVER \
+        .gem_free_object_unlocked = \
+                drm_gem_vram_driver_gem_free_object_unlocked, \
+        .dumb_create              = drm_gem_vram_driver_dumb_create, \
+        .dumb_map_offset          = drm_gem_vram_driver_dumb_mmap_offset
+
+/*
+ * PRIME helpers for struct drm_driver
+ */
+
+int drm_gem_vram_driver_gem_prime_pin(struct drm_gem_object *obj);
+void drm_gem_vram_driver_gem_prime_unpin(struct drm_gem_object *obj);
+void *drm_gem_vram_driver_gem_prime_vmap(struct drm_gem_object *obj);
+void drm_gem_vram_driver_gem_prime_vunmap(struct drm_gem_object *obj,
+                                          void *vaddr);
+int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *obj,
+                                       struct vm_area_struct *vma);
+
+#define DRM_GEM_VRAM_DRIVER_PRIME \
+        .gem_prime_export = drm_gem_prime_export, \
+        .gem_prime_import = drm_gem_prime_import, \
+        .gem_prime_pin    = drm_gem_vram_driver_gem_prime_pin, \
+        .gem_prime_unpin  = drm_gem_vram_driver_gem_prime_unpin, \
+        .gem_prime_vmap   = drm_gem_vram_driver_gem_prime_vmap, \
+        .gem_prime_vunmap = drm_gem_vram_driver_gem_prime_vunmap, \
+        .gem_prime_mmap   = drm_gem_vram_driver_gem_prime_mmap
+
+#endif
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index f243408ecf26..13771a496e2b 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -252,17 +252,44 @@ struct hdcp2_rep_stream_ready {
  * host format and back
  */
 static inline
-u32 drm_hdcp2_seq_num_to_u32(u8 seq_num[HDCP_2_2_SEQ_NUM_LEN])
+u32 drm_hdcp_be24_to_cpu(const u8 seq_num[HDCP_2_2_SEQ_NUM_LEN])
 {
         return (u32)(seq_num[2] | seq_num[1] << 8 | seq_num[0] << 16);
 }
 
 static inline
-void drm_hdcp2_u32_to_seq_num(u8 seq_num[HDCP_2_2_SEQ_NUM_LEN], u32 val)
+void drm_hdcp_cpu_to_be24(u8 seq_num[HDCP_2_2_SEQ_NUM_LEN], u32 val)
 {
         seq_num[0] = val >> 16;
         seq_num[1] = val >> 8;
         seq_num[2] = val;
 }
 
+#define DRM_HDCP_SRM_GEN1_MAX_BYTES             (5 * 1024)
+#define DRM_HDCP_1_4_SRM_ID                     0x8
+#define DRM_HDCP_SRM_ID_MASK                    (0xF << 4)
+#define DRM_HDCP_1_4_VRL_LENGTH_SIZE            3
+#define DRM_HDCP_1_4_DCP_SIG_SIZE               40
+#define DRM_HDCP_2_SRM_ID                       0x9
+#define DRM_HDCP_2_INDICATOR                    0x1
+#define DRM_HDCP_2_INDICATOR_MASK               0xF
+#define DRM_HDCP_2_VRL_LENGTH_SIZE              3
+#define DRM_HDCP_2_DCP_SIG_SIZE                 384
+#define DRM_HDCP_2_NO_OF_DEV_PLUS_RESERVED_SZ   4
+#define DRM_HDCP_2_KSV_COUNT_2_LSBITS(byte)     (((byte) & 0xC) >> 6)
+
+struct hdcp_srm_header {
+        u8 srm_id;
+        u8 reserved;
+        __be16 srm_version;
+        u8 srm_gen_no;
+} __packed;
+
+struct drm_device;
+struct drm_connector;
+
+bool drm_hdcp_check_ksvs_revoked(struct drm_device *dev,
+                                 u8 *ksvs, u32 ksv_count);
+int drm_connector_attach_content_protection_property(
+                struct drm_connector *connector);
 #endif
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
index 2182a56ac421..58dc0c04bf99 100644
--- a/include/drm/drm_legacy.h
+++ b/include/drm/drm_legacy.h
@@ -1,11 +1,5 @@
 #ifndef __DRM_DRM_LEGACY_H__
 #define __DRM_DRM_LEGACY_H__
-
-#include <drm/drm_auth.h>
-#include <drm/drm_hashtab.h>
-
-struct drm_device;
-
 /*
  * Legacy driver interfaces for the Direct Rendering Manager
  *
@@ -39,6 +33,12 @@ struct drm_device;
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <drm/drm.h>
+#include <drm/drm_auth.h>
+#include <drm/drm_hashtab.h>
+
+struct drm_device;
+struct file;
 
 /*
  * Legacy Support for palateontologic DRM drivers
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 7f60e8eb269a..759d462d028b 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -836,6 +836,19 @@ struct drm_mode_config {
          */
         struct drm_property *writeback_out_fence_ptr_property;
 
+        /**
+         * @hdr_output_metadata_property: Connector property containing hdr
+         * metatada. This will be provided by userspace compositors based
+         * on HDR content
+         */
+        struct drm_property *hdr_output_metadata_property;
+
+        /**
+         * @content_protection_property: DRM ENUM property for content
+         * protection. See drm_connector_attach_content_protection_property().
+         */
+        struct drm_property *content_protection_property;
+
         /* dumb ioctl parameters */
         uint32_t preferred_depth, prefer_shadow;
 
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index f7bbd0b0ecd1..6b18c8adfe9d 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -680,6 +680,52 @@ struct drm_encoder_helper_funcs {
                                             struct drm_connector *connector);
 
         /**
+         * @atomic_disable:
+         *
+         * This callback should be used to disable the encoder. With the atomic
+         * drivers it is called before this encoder's CRTC has been shut off
+         * using their own &drm_crtc_helper_funcs.atomic_disable hook. If that
+         * sequence is too simple drivers can just add their own driver private
+         * encoder hooks and call them from CRTC's callback by looping over all
+         * encoders connected to it using for_each_encoder_on_crtc().
+         *
+         * This callback is a variant of @disable that provides the atomic state
+         * to the driver. If @atomic_disable is implemented, @disable is not
+         * called by the helpers.
+         *
+         * This hook is only used by atomic helpers. Atomic drivers don't need
+         * to implement it if there's no need to disable anything at the encoder
+         * level. To ensure that runtime PM handling (using either DPMS or the
+         * new "ACTIVE" property) works @atomic_disable must be the inverse of
+         * @atomic_enable.
+         */
+        void (*atomic_disable)(struct drm_encoder *encoder,
+                               struct drm_atomic_state *state);
+
+        /**
+         * @atomic_enable:
+         *
+         * This callback should be used to enable the encoder. It is called
+         * after this encoder's CRTC has been enabled using their own
+         * &drm_crtc_helper_funcs.atomic_enable hook. If that sequence is
+         * too simple drivers can just add their own driver private encoder
+         * hooks and call them from CRTC's callback by looping over all encoders
+         * connected to it using for_each_encoder_on_crtc().
+         *
+         * This callback is a variant of @enable that provides the atomic state
+         * to the driver. If @atomic_enable is implemented, @enable is not
+         * called by the helpers.
+         *
+         * This hook is only used by atomic helpers, it is the opposite of
+         * @atomic_disable. Atomic drivers don't need to implement it if there's
+         * no need to enable anything at the encoder level. To ensure that
+         * runtime PM handling works @atomic_enable must be the inverse of
+         * @atomic_disable.
+         */
+        void (*atomic_enable)(struct drm_encoder *encoder,
+                              struct drm_atomic_state *state);
+
+        /**
          * @disable:
          *
          * This callback should be used to disable the encoder. With the atomic
@@ -695,6 +741,9 @@ struct drm_encoder_helper_funcs {
          * handling (using either DPMS or the new "ACTIVE" property) works
          * @disable must be the inverse of @enable for atomic drivers.
          *
+         * For atomic drivers also consider @atomic_disable and save yourself
+         * from having to read the NOTE below!
+         *
          * NOTE:
          *
          * With legacy CRTC helpers there's a big semantic difference between
@@ -719,11 +768,11 @@ struct drm_encoder_helper_funcs {
          * hooks and call them from CRTC's callback by looping over all encoders
          * connected to it using for_each_encoder_on_crtc().
          *
-         * This hook is used only by atomic helpers, for symmetry with @disable.
-         * Atomic drivers don't need to implement it if there's no need to
-         * enable anything at the encoder level. To ensure that runtime PM handling
-         * (using either DPMS or the new "ACTIVE" property) works
-         * @enable must be the inverse of @disable for atomic drivers.
+         * This hook is only used by atomic helpers, it is the opposite of
+         * @disable. Atomic drivers don't need to implement it if there's no
+         * need to enable anything at the encoder level. To ensure that
+         * runtime PM handling (using either DPMS or the new "ACTIVE" property)
+         * works @enable must be the inverse of @disable for atomic drivers.
          */
         void (*enable)(struct drm_encoder *encoder);
 
@@ -979,7 +1028,7 @@ struct drm_connector_helper_funcs {
          * deadlock.
          */
         int (*atomic_check)(struct drm_connector *connector,
-                            struct drm_connector_state *state);
+                            struct drm_atomic_state *state);
 
         /**
          * @atomic_commit:
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 6078c700d9ba..cd5903ad33f7 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -69,7 +69,7 @@ struct drm_plane_state {
          *
          * Optional fence to wait for before scanning out @fb. The core atomic
          * code will set this when userspace is using explicit fencing. Do not
-         * write this directly for a driver's implicit fence, use
+         * write this field directly for a driver's implicit fence, use
          * drm_atomic_set_fence_for_plane() to ensure that an explicit fence is
          * preserved.
          *
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 3a4247319e63..a5d6f2f3e430 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
+#include <drm/drm.h>
+
 /**
  * DOC: print
  *
diff --git a/include/drm/drm_self_refresh_helper.h b/include/drm/drm_self_refresh_helper.h
new file mode 100644
index 000000000000..397a583ccca7
--- /dev/null
+++ b/include/drm/drm_self_refresh_helper.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (C) 2019 Google, Inc.
+ *
+ * Authors:
+ * Sean Paul <seanpaul@chromium.org>
+ */
+#ifndef DRM_SELF_REFRESH_HELPER_H_
+#define DRM_SELF_REFRESH_HELPER_H_
+
+struct drm_atomic_state;
+struct drm_crtc;
+
+void drm_self_refresh_helper_alter_state(struct drm_atomic_state *state);
+
+int drm_self_refresh_helper_init(struct drm_crtc *crtc,
+                                 unsigned int entry_delay_ms);
+
+void drm_self_refresh_helper_cleanup(struct drm_crtc *crtc);
+#endif
diff --git a/include/drm/drm_vram_mm_helper.h b/include/drm/drm_vram_mm_helper.h
new file mode 100644
index 000000000000..a8ffd8599b08
--- /dev/null
+++ b/include/drm/drm_vram_mm_helper.h
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef DRM_VRAM_MM_HELPER_H
+#define DRM_VRAM_MM_HELPER_H
+
+#include <drm/ttm/ttm_bo_driver.h>
+
+struct drm_device;
+
+/**
+ * struct drm_vram_mm_funcs - Callback functions for &struct drm_vram_mm
+ * @evict_flags:        Provides an implementation for struct \
+        &ttm_bo_driver.evict_flags
+ * @verify_access:      Provides an implementation for \
+        struct &ttm_bo_driver.verify_access
+ *
+ * These callback function integrate VRAM MM with TTM buffer objects. New
+ * functions can be added if necessary.
+ */
+struct drm_vram_mm_funcs {
+        void (*evict_flags)(struct ttm_buffer_object *bo,
+                            struct ttm_placement *placement);
+        int (*verify_access)(struct ttm_buffer_object *bo, struct file *filp);
+};
+
+/**
+ * struct drm_vram_mm - An instance of VRAM MM
+ * @vram_base:  Base address of the managed video memory
+ * @vram_size:  Size of the managed video memory in bytes
+ * @bdev:       The TTM BO device.
+ * @funcs:      TTM BO functions
+ *
+ * The fields &struct drm_vram_mm.vram_base and
+ * &struct drm_vram_mm.vrm_size are managed by VRAM MM, but are
+ * available for public read access. Use the field
+ * &struct drm_vram_mm.bdev to access the TTM BO device.
+ */
+struct drm_vram_mm {
+        uint64_t vram_base;
+        size_t vram_size;
+
+        struct ttm_bo_device bdev;
+
+        const struct drm_vram_mm_funcs *funcs;
+};
+
+/**
+ * drm_vram_mm_of_bdev() - \
+        Returns the container of type &struct ttm_bo_device for field bdev.
+ * @bdev:       the TTM BO device
+ *
+ * Returns:
+ * The containing instance of &struct drm_vram_mm
+ */
+static inline struct drm_vram_mm *drm_vram_mm_of_bdev(
+        struct ttm_bo_device *bdev)
+{
+        return container_of(bdev, struct drm_vram_mm, bdev);
+}
+
+int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
+                     uint64_t vram_base, size_t vram_size,
+                     const struct drm_vram_mm_funcs *funcs);
+void drm_vram_mm_cleanup(struct drm_vram_mm *vmm);
+
+int drm_vram_mm_mmap(struct file *filp, struct vm_area_struct *vma,
+                     struct drm_vram_mm *vmm);
+
+/*
+ * Helpers for integration with struct drm_device
+ */
+
+struct drm_vram_mm *drm_vram_helper_alloc_mm(
+        struct drm_device *dev, uint64_t vram_base, size_t vram_size,
+        const struct drm_vram_mm_funcs *funcs);
+void drm_vram_helper_release_mm(struct drm_device *dev);
+
+/*
+ * Helpers for &struct file_operations
+ */
+
+int drm_vram_mm_file_operations_mmap(
+        struct file *filp, struct vm_area_struct *vma);
+
+/**
+ * define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \
+        &struct file_operations
+ *
+ * Drivers that use VRAM MM can use this macro to initialize
+ * &struct file_operations with default functions.
+ */
+#define DRM_VRAM_MM_FILE_OPERATIONS \
+        .llseek         = no_llseek, \
+        .read           = drm_read, \
+        .poll           = drm_poll, \
+        .unlocked_ioctl = drm_ioctl, \
+        .compat_ioctl   = drm_compat_ioctl, \
+        .mmap           = drm_vram_mm_file_operations_mmap, \
+        .open           = drm_open, \
+        .release        = drm_release \
+
+#endif
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index 0daca4d8dad9..57b4121c750a 100644
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -167,9 +167,6 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f);
  * @sched: the scheduler instance on which this job is scheduled.
  * @s_fence: contains the fences for the scheduling of job.
  * @finish_cb: the callback for the finished fence.
- * @finish_work: schedules the function @drm_sched_job_finish once the job has
- *               finished to remove the job from the
- *               @drm_gpu_scheduler.ring_mirror_list.
  * @node: used to append this struct to the @drm_gpu_scheduler.ring_mirror_list.
  * @id: a unique id assigned to each job scheduled on the scheduler.
  * @karma: increment on every hang caused by this job. If this exceeds the hang
@@ -188,7 +185,6 @@ struct drm_sched_job {
         struct drm_gpu_scheduler        *sched;
         struct drm_sched_fence          *s_fence;
         struct dma_fence_cb             finish_cb;
-        struct work_struct              finish_work;
         struct list_head                node;
         uint64_t                        id;
         atomic_t                        karma;
@@ -263,6 +259,7 @@ struct drm_sched_backend_ops {
  *              guilty and it will be considered for scheduling further.
  * @num_jobs: the number of jobs in queue in the scheduler
  * @ready: marks if the underlying HW is ready to work
+ * @free_guilty: A hit to time out handler to free the guilty job.
  *
  * One scheduler is implemented for each hardware ring.
  */
@@ -283,6 +280,7 @@ struct drm_gpu_scheduler {
         int                             hang_limit;
         atomic_t                        num_jobs;
         bool                    ready;
+        bool                            free_guilty;
 };
 
 int drm_sched_init(struct drm_gpu_scheduler *sched,
@@ -296,7 +294,7 @@ int drm_sched_job_init(struct drm_sched_job *job,
                        void *owner);
 void drm_sched_job_cleanup(struct drm_sched_job *job);
 void drm_sched_wakeup(struct drm_gpu_scheduler *sched);
-void drm_sched_stop(struct drm_gpu_scheduler *sched);
+void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);
 void drm_sched_start(struct drm_gpu_scheduler *sched, bool full_recovery);
 void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched);
 void drm_sched_increase_karma(struct drm_sched_job *bad);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 6477da22af28..6d60ea68c171 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -559,7 +559,6 @@
 #define INTEL_ICL_PORT_F_IDS(info) \
         INTEL_VGA_DEVICE(0x8A50, info), \
         INTEL_VGA_DEVICE(0x8A5C, info), \
-        INTEL_VGA_DEVICE(0x8A5D, info), \
         INTEL_VGA_DEVICE(0x8A59, info), \
         INTEL_VGA_DEVICE(0x8A58, info), \
         INTEL_VGA_DEVICE(0x8A52, info), \
@@ -573,7 +572,8 @@
 
 #define INTEL_ICL_11_IDS(info) \
         INTEL_ICL_PORT_F_IDS(info), \
-        INTEL_VGA_DEVICE(0x8A51, info)
+        INTEL_VGA_DEVICE(0x8A51, info), \
+        INTEL_VGA_DEVICE(0x8A5D, info)
 
 /* EHL */
 #define INTEL_EHL_IDS(info) \
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 129dabbc002d..c9b8ba492f24 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -767,11 +767,12 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
  */
 static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
 {
-        if (!(bo->mem.placement & TTM_PL_FLAG_NO_EVICT)) {
-                spin_lock(&bo->bdev->glob->lru_lock);
+        spin_lock(&bo->bdev->glob->lru_lock);
+        if (list_empty(&bo->lru))
                 ttm_bo_add_to_lru(bo);
-                spin_unlock(&bo->bdev->glob->lru_lock);
-        }
+        else
+                ttm_bo_move_to_lru_tail(bo, NULL);
+        spin_unlock(&bo->bdev->glob->lru_lock);
         reservation_object_unlock(bo->resv);
 }
 
diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h
index 621615fa7728..7e46cc678e7e 100644
--- a/include/drm/ttm/ttm_execbuf_util.h
+++ b/include/drm/ttm/ttm_execbuf_util.h
@@ -70,6 +70,7 @@ extern void ttm_eu_backoff_reservation(struct ww_acquire_ctx *ticket,
  * @list:    thread private list of ttm_validate_buffer structs.
  * @intr:    should the wait be interruptible
  * @dups:    [out] optional list of duplicates.
+ * @del_lru: true if BOs should be removed from the LRU.
  *
  * Tries to reserve bos pointed to by the list entries for validation.
  * If the function returns 0, all buffers are marked as "unfenced",
@@ -98,7 +99,7 @@ extern void ttm_eu_backoff_reservation(struct ww_acquire_ctx *ticket,
 
 extern int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
                                   struct list_head *list, bool intr,
-                                  struct list_head *dups);
+                                  struct list_head *dups, bool del_lru);
 
 /**
  * function ttm_eu_fence_buffer_objects.