Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

29 files changed, 339 insertions, 300 deletions

diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug
index 96b577f62752..459f8f88a34c 100644
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@ -26,7 +26,7 @@ config DRM_I915_DEBUG
         select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
         select DRM_DEBUG_MM if DRM=y
         select STACKDEPOT if DRM=y # for DRM_DEBUG_MM
-        select DRM_DEBUG_MM_SELFTEST
+        select DRM_DEBUG_SELFTEST
         select SW_SYNC # signaling validation framework (igt/syncobj*)
         select DRM_I915_SW_FENCE_DEBUG_OBJECTS
         select DRM_I915_SELFTEST
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index 0dd88fe2e39a..0651e63b25fb 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -2902,6 +2902,7 @@ static int init_cmd_table(struct intel_gvt *gvt)
                 if (info) {
                         gvt_err("%s %s duplicated\n", e->info->name,
                                         info->name);
+                        kfree(e);
                         return -EEXIST;
                 }
 
diff --git a/drivers/gpu/drm/i915/gvt/display.h b/drivers/gpu/drm/i915/gvt/display.h
index b46b86892d58..ea7c1c525b8c 100644
--- a/drivers/gpu/drm/i915/gvt/display.h
+++ b/drivers/gpu/drm/i915/gvt/display.h
@@ -67,7 +67,7 @@
 #define AUX_NATIVE_REPLY_NAK    (0x1 << 4)
 #define AUX_NATIVE_REPLY_DEFER  (0x2 << 4)
 
-#define AUX_BURST_SIZE          16
+#define AUX_BURST_SIZE          20
 
 /* DPCD addresses */
 #define DPCD_REV                        0x000
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 156ceeeb7446..39980dfbbebd 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1894,8 +1894,9 @@ static struct intel_vgpu_mm *intel_vgpu_create_ggtt_mm(struct intel_vgpu *vgpu)
         mm->type = INTEL_GVT_MM_GGTT;
 
         nr_entries = gvt_ggtt_gm_sz(vgpu->gvt) >> I915_GTT_PAGE_SHIFT;
-        mm->ggtt_mm.virtual_ggtt = vzalloc(nr_entries *
-                                        vgpu->gvt->device_info.gtt_entry_size);
+        mm->ggtt_mm.virtual_ggtt =
+                vzalloc(array_size(nr_entries,
+                                   vgpu->gvt->device_info.gtt_entry_size));
         if (!mm->ggtt_mm.virtual_ggtt) {
                 vgpu_free_mm(mm);
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index e2e252c67de8..6b50f850dc28 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -936,11 +936,14 @@ static int dp_aux_ch_ctl_mmio_write(struct intel_vgpu *vgpu,
                 }
 
                 /*
-                 * Write request format: (command + address) occupies
-                 * 3 bytes, followed by (len + 1) bytes of data.
+                 * Write request format: Headr (command + address + size) occupies
+                 * 4 bytes, followed by (len + 1) bytes of data. See details at
+                 * intel_dp_aux_transfer().
                  */
-                if (WARN_ON((len + 4) > AUX_BURST_SIZE))
+                if ((len + 1 + 4) > AUX_BURST_SIZE) {
+                        gvt_vgpu_err("dp_aux_header: len %d is too large\n", len);
                         return -EINVAL;
+                }
 
                 /* unpack data from vreg to buf */
                 for (t = 0; t < 4; t++) {
@@ -1004,8 +1007,10 @@ static int dp_aux_ch_ctl_mmio_write(struct intel_vgpu *vgpu,
                 /*
                  * Read reply format: ACK (1 byte) plus (len + 1) bytes of data.
                  */
-                if (WARN_ON((len + 2) > AUX_BURST_SIZE))
+                if ((len + 2) > AUX_BURST_SIZE) {
+                        gvt_vgpu_err("dp_aux_header: len %d is too large\n", len);
                         return -EINVAL;
+                }
 
                 /* read from virtual DPCD to vreg */
                 /* first 4 bytes: [ACK][addr][addr+1][addr+2] */
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 685cb3de6dab..718ab307a500 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -185,6 +185,12 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
         if (ret)
                 return ret;
 
+        if (!pfn_valid(pfn)) {
+                gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn);
+                vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1);
+                return -EINVAL;
+        }
+
         /* Setup DMA mapping. */
         *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
         ret = dma_mapping_error(dev, *dma_addr);
@@ -644,6 +650,17 @@ out:
         return ret;
 }
 
+static void intel_vgpu_release_msi_eventfd_ctx(struct intel_vgpu *vgpu)
+{
+        struct eventfd_ctx *trigger;
+
+        trigger = vgpu->vdev.msi_trigger;
+        if (trigger) {
+                eventfd_ctx_put(trigger);
+                vgpu->vdev.msi_trigger = NULL;
+        }
+}
+
 static void __intel_vgpu_release(struct intel_vgpu *vgpu)
 {
         struct kvmgt_guest_info *info;
@@ -668,6 +685,8 @@ static void __intel_vgpu_release(struct intel_vgpu *vgpu)
         info = (struct kvmgt_guest_info *)vgpu->handle;
         kvmgt_guest_exit(info);
 
+        intel_vgpu_release_msi_eventfd_ctx(vgpu);
+
         vgpu->vdev.kvm = NULL;
         vgpu->handle = 0;
 }
@@ -1048,7 +1067,8 @@ static int intel_vgpu_set_msi_trigger(struct intel_vgpu *vgpu,
                         return PTR_ERR(trigger);
                 }
                 vgpu->vdev.msi_trigger = trigger;
-        }
+        } else if ((flags & VFIO_IRQ_SET_DATA_NONE) && !count)
+                intel_vgpu_release_msi_eventfd_ctx(vgpu);
 
         return 0;
 }
@@ -1653,6 +1673,18 @@ static int kvmgt_inject_msi(unsigned long handle, u32 addr, u16 data)
         info = (struct kvmgt_guest_info *)handle;
         vgpu = info->vgpu;
 
+        /*
+         * When guest is poweroff, msi_trigger is set to NULL, but vgpu's
+         * config and mmio register isn't restored to default during guest
+         * poweroff. If this vgpu is still used in next vm, this vgpu's pipe
+         * may be enabled, then once this vgpu is active, it will get inject
+         * vblank interrupt request. But msi_trigger is null until msi is
+         * enabled by guest. so if msi_trigger is null, success is still
+         * returned and don't inject interrupt into guest.
+         */
+        if (vgpu->vdev.msi_trigger == NULL)
+                return 0;
+
         if (eventfd_signal(vgpu->vdev.msi_trigger, 1) == 1)
                 return 0;
 
diff --git a/drivers/gpu/drm/i915/gvt/mmio.c b/drivers/gpu/drm/i915/gvt/mmio.c
index 2be1be2cf49a..994366035364 100644
--- a/drivers/gpu/drm/i915/gvt/mmio.c
+++ b/drivers/gpu/drm/i915/gvt/mmio.c
@@ -267,7 +267,7 @@ int intel_vgpu_init_mmio(struct intel_vgpu *vgpu)
 {
         const struct intel_gvt_device_info *info = &vgpu->gvt->device_info;
 
-        vgpu->mmio.vreg = vzalloc(info->mmio_size * 2);
+        vgpu->mmio.vreg = vzalloc(array_size(info->mmio_size, 2));
         if (!vgpu->mmio.vreg)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
index aa063b275e81..f6fa916517c3 100644
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -125,7 +125,7 @@ int intel_gvt_init_vgpu_types(struct intel_gvt *gvt)
         high_avail = gvt_hidden_sz(gvt) - HOST_HIGH_GM_SIZE;
         num_types = sizeof(vgpu_types) / sizeof(vgpu_types[0]);
 
-        gvt->types = kzalloc(num_types * sizeof(struct intel_vgpu_type),
+        gvt->types = kcalloc(num_types, sizeof(struct intel_vgpu_type),
                              GFP_KERNEL);
         if (!gvt->types)
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 23e9a86cbc2a..18a45e7a3d7c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2847,10 +2847,10 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
         DRM_IOCTL_DEF_DRV(I915_GEM_GET_APERTURE, i915_gem_get_aperture_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GET_PIPE_FROM_CRTC_ID, intel_get_pipe_from_crtc_id_ioctl, 0),
         DRM_IOCTL_DEF_DRV(I915_GEM_MADVISE, i915_gem_madvise_ioctl, DRM_RENDER_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
-        DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER|DRM_CONTROL_ALLOW),
+        DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image_ioctl, DRM_MASTER),
+        DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs_ioctl, DRM_MASTER),
+        DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey_ioctl, DRM_MASTER),
+        DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER),
         DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW),
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ef1aabb751c6..0f49f9988dfa 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2230,9 +2230,6 @@ static inline struct scatterlist *____sg_next(struct scatterlist *sg)
  **/
 static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-        BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
         return sg_is_last(sg) ? NULL : ____sg_next(sg);
 }
 
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 69a7aec49e84..82e2ca17a441 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -111,15 +111,6 @@ static void i915_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)
         i915_gem_object_unpin_map(obj);
 }
 
-static void *i915_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num)
-{
-        return NULL;
-}
-
-static void i915_gem_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr)
-{
-
-}
 static void *i915_gem_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num)
 {
         struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
@@ -225,9 +216,7 @@ static const struct dma_buf_ops i915_dmabuf_ops =  {
         .unmap_dma_buf = i915_gem_unmap_dma_buf,
         .release = drm_gem_dmabuf_release,
         .map = i915_gem_dmabuf_kmap,
-        .map_atomic = i915_gem_dmabuf_kmap_atomic,
         .unmap = i915_gem_dmabuf_kunmap,
-        .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
         .mmap = i915_gem_dmabuf_mmap,
         .vmap = i915_gem_dmabuf_vmap,
         .vunmap = i915_gem_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 81a2c340c091..1b476423bfab 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -4031,7 +4031,7 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,
 
         mode = DRM_MM_INSERT_BEST;
         if (flags & PIN_HIGH)
-                mode = DRM_MM_INSERT_HIGH;
+                mode = DRM_MM_INSERT_HIGHEST;
         if (flags & PIN_MAPPABLE)
                 mode = DRM_MM_INSERT_LOW;
 
@@ -4051,6 +4051,15 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,
         if (err != -ENOSPC)
                 return err;
 
+        if (mode & DRM_MM_INSERT_ONCE) {
+                err = drm_mm_insert_node_in_range(&vm->mm, node,
+                                                  size, alignment, color,
+                                                  start, end,
+                                                  DRM_MM_INSERT_BEST);
+                if (err != -ENOSPC)
+                        return err;
+        }
+
         if (flags & PIN_NOEVICT)
                 return -ENOSPC;
 
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index fee026ca449b..b04952bacf77 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -126,6 +126,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
         if (new_conn_state->force_audio != old_conn_state->force_audio ||
             new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
             new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio ||
+            new_conn_state->base.content_type != old_conn_state->base.content_type ||
             new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode)
                 crtc_state->mode_changed = true;
 
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 69a18d4ff59d..dcba645cabb8 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -120,12 +120,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
                 &crtc_state->base.adjusted_mode;
         int ret;
 
-        /*
-         * Both crtc and plane->crtc could be NULL if we're updating a
-         * property while the plane is disabled.  We don't actually have
-         * anything driver-specific we need to test in that case, so
-         * just return success.
-         */
         if (!intel_state->base.crtc && !old_plane_state->base.crtc)
                 return 0;
 
@@ -209,12 +203,6 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
         const struct drm_crtc_state *old_crtc_state;
         struct drm_crtc_state *new_crtc_state;
 
-        /*
-         * Both crtc and plane->crtc could be NULL if we're updating a
-         * property while the plane is disabled.  We don't actually have
-         * anything driver-specific we need to test in that case, so
-         * just return success.
-         */
         if (!crtc)
                 return 0;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8719c1a9d1ce..577b30dde45b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1022,7 +1022,7 @@ bool intel_crtc_active(struct intel_crtc *crtc)
          * We can ditch the adjusted_mode.crtc_clock check as soon
          * as Haswell has gained clock readout/fastboot support.
          *
-         * We can ditch the crtc->primary->fb check as soon as we can
+         * We can ditch the crtc->primary->state->fb check as soon as we can
          * properly reconstruct framebuffers.
          *
          * FIXME: The intel_crtc->active here should be switched to
@@ -2756,10 +2756,10 @@ intel_set_plane_visible(struct intel_crtc_state *crtc_state,
 
         /* FIXME pre-g4x don't work like this */
         if (visible) {
-                crtc_state->base.plane_mask |= BIT(drm_plane_index(&plane->base));
+                crtc_state->base.plane_mask |= drm_plane_mask(&plane->base);
                 crtc_state->active_planes |= BIT(plane->id);
         } else {
-                crtc_state->base.plane_mask &= ~BIT(drm_plane_index(&plane->base));
+                crtc_state->base.plane_mask &= ~drm_plane_mask(&plane->base);
                 crtc_state->active_planes &= ~BIT(plane->id);
         }
 
@@ -2882,9 +2882,8 @@ valid_fb:
         if (i915_gem_object_is_tiled(obj))
                 dev_priv->preserve_bios_swizzle = true;
 
-        drm_framebuffer_get(fb);
-        primary->fb = primary->state->fb = fb;
-        primary->crtc = primary->state->crtc = &intel_crtc->base;
+        plane_state->fb = fb;
+        plane_state->crtc = &intel_crtc->base;
 
         intel_set_plane_visible(to_intel_crtc_state(crtc_state),
                                 to_intel_plane_state(plane_state),
@@ -3658,7 +3657,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
         plane_color_ctl |= PLANE_COLOR_PLANE_GAMMA_DISABLE;
         plane_color_ctl |= glk_plane_color_ctl_alpha(fb->format->format);
 
-        if (intel_format_is_yuv(fb->format->format)) {
+        if (fb->format->is_yuv) {
                 if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
                         plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
                 else
@@ -11899,7 +11898,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,
                          struct drm_crtc_state *new_state)
 {
         struct intel_dpll_hw_state dpll_hw_state;
-        unsigned crtc_mask;
+        unsigned int crtc_mask;
         bool active;
 
         memset(&dpll_hw_state, 0, sizeof(dpll_hw_state));
@@ -11926,7 +11925,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,
                 return;
         }
 
-        crtc_mask = 1 << drm_crtc_index(crtc);
+        crtc_mask = drm_crtc_mask(crtc);
 
         if (new_state->active)
                 I915_STATE_WARN(!(pll->active_mask & crtc_mask),
@@ -11961,7 +11960,7 @@ verify_shared_dpll_state(struct drm_device *dev, struct drm_crtc *crtc,
 
         if (old_state->shared_dpll &&
             old_state->shared_dpll != new_state->shared_dpll) {
-                unsigned crtc_mask = 1 << drm_crtc_index(crtc);
+                unsigned int crtc_mask = drm_crtc_mask(crtc);
                 struct intel_shared_dpll *pll = old_state->shared_dpll;
 
                 I915_STATE_WARN(pll->active_mask & crtc_mask,
@@ -13305,8 +13304,17 @@ void intel_plane_destroy(struct drm_plane *plane)
         kfree(to_intel_plane(plane));
 }
 
-static bool i8xx_mod_supported(uint32_t format, uint64_t modifier)
+static bool i8xx_plane_format_mod_supported(struct drm_plane *_plane,
+                                            u32 format, u64 modifier)
 {
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_C8:
         case DRM_FORMAT_RGB565:
@@ -13319,8 +13327,17 @@ static bool i8xx_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool i965_mod_supported(uint32_t format, uint64_t modifier)
+static bool i965_plane_format_mod_supported(struct drm_plane *_plane,
+                                            u32 format, u64 modifier)
 {
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_C8:
         case DRM_FORMAT_RGB565:
@@ -13335,8 +13352,26 @@ static bool i965_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool skl_mod_supported(uint32_t format, uint64_t modifier)
+static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
+                                           u32 format, u64 modifier)
 {
+        struct intel_plane *plane = to_intel_plane(_plane);
+
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+        case I915_FORMAT_MOD_Y_TILED:
+        case I915_FORMAT_MOD_Yf_TILED:
+                break;
+        case I915_FORMAT_MOD_Y_TILED_CCS:
+        case I915_FORMAT_MOD_Yf_TILED_CCS:
+                if (!plane->has_ccs)
+                        return false;
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_XRGB8888:
         case DRM_FORMAT_XBGR8888:
@@ -13368,38 +13403,36 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane,
-                                                     uint32_t format,
-                                                     uint64_t modifier)
+static bool intel_cursor_format_mod_supported(struct drm_plane *_plane,
+                                              u32 format, u64 modifier)
 {
-        struct drm_i915_private *dev_priv = to_i915(plane->dev);
-
-        if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))
-                return false;
-
-        if ((modifier >> 56) != DRM_FORMAT_MOD_VENDOR_INTEL &&
-            modifier != DRM_FORMAT_MOD_LINEAR)
-                return false;
-
-        if (INTEL_GEN(dev_priv) >= 9)
-                return skl_mod_supported(format, modifier);
-        else if (INTEL_GEN(dev_priv) >= 4)
-                return i965_mod_supported(format, modifier);
-        else
-                return i8xx_mod_supported(format, modifier);
+        return modifier == DRM_FORMAT_MOD_LINEAR &&
+                format == DRM_FORMAT_ARGB8888;
 }
 
-static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,
-                                                    uint32_t format,
-                                                    uint64_t modifier)
-{
-        if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))
-                return false;
+static struct drm_plane_funcs skl_plane_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = intel_plane_destroy,
+        .atomic_get_property = intel_plane_atomic_get_property,
+        .atomic_set_property = intel_plane_atomic_set_property,
+        .atomic_duplicate_state = intel_plane_duplicate_state,
+        .atomic_destroy_state = intel_plane_destroy_state,
+        .format_mod_supported = skl_plane_format_mod_supported,
+};
 
-        return modifier == DRM_FORMAT_MOD_LINEAR && format == DRM_FORMAT_ARGB8888;
-}
+static struct drm_plane_funcs i965_plane_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = intel_plane_destroy,
+        .atomic_get_property = intel_plane_atomic_get_property,
+        .atomic_set_property = intel_plane_atomic_set_property,
+        .atomic_duplicate_state = intel_plane_duplicate_state,
+        .atomic_destroy_state = intel_plane_destroy_state,
+        .format_mod_supported = i965_plane_format_mod_supported,
+};
 
-static struct drm_plane_funcs intel_plane_funcs = {
+static struct drm_plane_funcs i8xx_plane_funcs = {
         .update_plane = drm_atomic_helper_update_plane,
         .disable_plane = drm_atomic_helper_disable_plane,
         .destroy = intel_plane_destroy,
@@ -13407,7 +13440,7 @@ static struct drm_plane_funcs intel_plane_funcs = {
         .atomic_set_property = intel_plane_atomic_set_property,
         .atomic_duplicate_state = intel_plane_duplicate_state,
         .atomic_destroy_state = intel_plane_destroy_state,
-        .format_mod_supported = intel_primary_plane_format_mod_supported,
+        .format_mod_supported = i8xx_plane_format_mod_supported,
 };
 
 static int
@@ -13532,7 +13565,7 @@ static const struct drm_plane_funcs intel_cursor_plane_funcs = {
         .atomic_set_property = intel_plane_atomic_set_property,
         .atomic_duplicate_state = intel_plane_duplicate_state,
         .atomic_destroy_state = intel_plane_destroy_state,
-        .format_mod_supported = intel_cursor_plane_format_mod_supported,
+        .format_mod_supported = intel_cursor_format_mod_supported,
 };
 
 static bool i9xx_plane_has_fbc(struct drm_i915_private *dev_priv,
@@ -13590,6 +13623,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
 {
         struct intel_plane *primary = NULL;
         struct intel_plane_state *state = NULL;
+        const struct drm_plane_funcs *plane_funcs;
         const uint32_t *intel_primary_formats;
         unsigned int supported_rotations;
         unsigned int num_formats;
@@ -13645,6 +13679,9 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
         primary->check_plane = intel_check_primary_plane;
 
         if (INTEL_GEN(dev_priv) >= 9) {
+                primary->has_ccs = skl_plane_has_ccs(dev_priv, pipe,
+                                                     PLANE_PRIMARY);
+
                 if (skl_plane_has_planar(dev_priv, pipe, PLANE_PRIMARY)) {
                         intel_primary_formats = skl_pri_planar_formats;
                         num_formats = ARRAY_SIZE(skl_pri_planar_formats);
@@ -13653,7 +13690,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
                         num_formats = ARRAY_SIZE(skl_primary_formats);
                 }
 
-                if (skl_plane_has_ccs(dev_priv, pipe, PLANE_PRIMARY))
+                if (primary->has_ccs)
                         modifiers = skl_format_modifiers_ccs;
                 else
                         modifiers = skl_format_modifiers_noccs;
@@ -13661,6 +13698,8 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
                 primary->update_plane = skl_update_plane;
                 primary->disable_plane = skl_disable_plane;
                 primary->get_hw_state = skl_plane_get_hw_state;
+
+                plane_funcs = &skl_plane_funcs;
         } else if (INTEL_GEN(dev_priv) >= 4) {
                 intel_primary_formats = i965_primary_formats;
                 num_formats = ARRAY_SIZE(i965_primary_formats);
@@ -13669,6 +13708,8 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
                 primary->update_plane = i9xx_update_plane;
                 primary->disable_plane = i9xx_disable_plane;
                 primary->get_hw_state = i9xx_plane_get_hw_state;
+
+                plane_funcs = &i965_plane_funcs;
         } else {
                 intel_primary_formats = i8xx_primary_formats;
                 num_formats = ARRAY_SIZE(i8xx_primary_formats);
@@ -13677,25 +13718,27 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
                 primary->update_plane = i9xx_update_plane;
                 primary->disable_plane = i9xx_disable_plane;
                 primary->get_hw_state = i9xx_plane_get_hw_state;
+
+                plane_funcs = &i8xx_plane_funcs;
         }
 
         if (INTEL_GEN(dev_priv) >= 9)
                 ret = drm_universal_plane_init(&dev_priv->drm, &primary->base,
-                                               0, &intel_plane_funcs,
+                                               0, plane_funcs,
                                                intel_primary_formats, num_formats,
                                                modifiers,
                                                DRM_PLANE_TYPE_PRIMARY,
                                                "plane 1%c", pipe_name(pipe));
         else if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
                 ret = drm_universal_plane_init(&dev_priv->drm, &primary->base,
-                                               0, &intel_plane_funcs,
+                                               0, plane_funcs,
                                                intel_primary_formats, num_formats,
                                                modifiers,
                                                DRM_PLANE_TYPE_PRIMARY,
                                                "primary %c", pipe_name(pipe));
         else
                 ret = drm_universal_plane_init(&dev_priv->drm, &primary->base,
-                                               0, &intel_plane_funcs,
+                                               0, plane_funcs,
                                                intel_primary_formats, num_formats,
                                                modifiers,
                                                DRM_PLANE_TYPE_PRIMARY,
@@ -15666,9 +15709,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                                  * rely on the connector_mask being accurate.
                                  */
                                 encoder->base.crtc->state->connector_mask |=
-                                        1 << drm_connector_index(&connector->base);
+                                        drm_connector_mask(&connector->base);
                                 encoder->base.crtc->state->encoder_mask |=
-                                        1 << drm_encoder_index(&encoder->base);
+                                        drm_encoder_mask(&encoder->base);
                         }
 
                 } else {
@@ -15968,8 +16011,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
                                     struct intel_encoder *encoder)
 {
         connector->encoder = encoder;
-        drm_mode_connector_attach_encoder(&connector->base,
-                                          &encoder->base);
+        drm_connector_attach_encoder(&connector->base, &encoder->base);
 }
 
 /*
diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h
index 7559dfc235a2..9292001cdd14 100644
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@ -265,7 +265,7 @@ struct intel_link_m_n {
                             &(dev)->mode_config.plane_list,             \
                             base.head)                                  \
                 for_each_if((plane_mask) &                              \
-                            BIT(drm_plane_index(&intel_plane->base)))
+                            drm_plane_mask(&intel_plane->base)))
 
 #define for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane)      \
         list_for_each_entry(intel_plane,                                \
@@ -282,7 +282,7 @@ struct intel_link_m_n {
         list_for_each_entry(intel_crtc,                                 \
                             &(dev)->mode_config.crtc_list,              \
                             base.head)                                  \
-                for_each_if((crtc_mask) & BIT(drm_crtc_index(&intel_crtc->base)))
+                for_each_if((crtc_mask) & drm_crtc_mask(&intel_crtc->base))
 
 #define for_each_intel_encoder(dev, intel_encoder)              \
         list_for_each_entry(intel_encoder,                      \
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index fee23cf93a2b..cd0f649b57a5 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4333,6 +4333,9 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
                         DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
         }
 
+        /* Handle CEC interrupts, if any */
+        drm_dp_cec_irq(&intel_dp->aux);
+
         /* defer to the hotplug work for link retraining if needed */
         if (intel_dp_needs_link_retrain(intel_dp))
                 return false;
@@ -4642,6 +4645,7 @@ intel_dp_set_edid(struct intel_dp *intel_dp)
         intel_connector->detect_edid = edid;
 
         intel_dp->has_audio = drm_detect_monitor_audio(edid);
+        drm_dp_cec_set_edid(&intel_dp->aux, edid);
 }
 
 static void
@@ -4649,6 +4653,7 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 {
         struct intel_connector *intel_connector = intel_dp->attached_connector;
 
+        drm_dp_cec_unset_edid(&intel_dp->aux);
         kfree(intel_connector->detect_edid);
         intel_connector->detect_edid = NULL;
 
@@ -4837,6 +4842,7 @@ static int
 intel_dp_connector_register(struct drm_connector *connector)
 {
         struct intel_dp *intel_dp = intel_attached_dp(connector);
+        struct drm_device *dev = connector->dev;
         int ret;
 
         ret = intel_connector_register(connector);
@@ -4849,13 +4855,20 @@ intel_dp_connector_register(struct drm_connector *connector)
                       intel_dp->aux.name, connector->kdev->kobj.name);
 
         intel_dp->aux.dev = connector->kdev;
-        return drm_dp_aux_register(&intel_dp->aux);
+        ret = drm_dp_aux_register(&intel_dp->aux);
+        if (!ret)
+                drm_dp_cec_register_connector(&intel_dp->aux,
+                                              connector->name, dev->dev);
+        return ret;
 }
 
 static void
 intel_dp_connector_unregister(struct drm_connector *connector)
 {
-        drm_dp_aux_unregister(&intel_attached_dp(connector)->aux);
+        struct intel_dp *intel_dp = intel_attached_dp(connector);
+
+        drm_dp_cec_unregister_connector(&intel_dp->aux);
+        drm_dp_aux_unregister(&intel_dp->aux);
         intel_connector_unregister(connector);
 }
 
@@ -6051,7 +6064,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
         edid = drm_get_edid(connector, &intel_dp->aux.ddc);
         if (edid) {
                 if (drm_add_edid_modes(connector, edid)) {
-                        drm_mode_connector_update_edid_property(connector,
+                        drm_connector_update_edid_property(connector,
                                                                 edid);
                 } else {
                         kfree(edid);
@@ -6140,8 +6153,8 @@ static void intel_dp_modeset_retry_work_fn(struct work_struct *work)
         /* Set connector link status to BAD and send a Uevent to notify
          * userspace to do a modeset.
          */
-        drm_mode_connector_set_link_status_property(connector,
-                                                    DRM_MODE_LINK_STATUS_BAD);
+        drm_connector_set_link_status_property(connector,
+                                               DRM_MODE_LINK_STATUS_BAD);
         mutex_unlock(&connector->dev->mode_config.mutex);
         /* Send Hotplug uevent so userspace can reprobe */
         drm_kms_helper_hotplug_event(connector->dev);
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index d88d0f5abdce..18c65f8e4fe8 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -402,20 +402,10 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *c
         return &intel_dp->mst_encoders[crtc->pipe]->base.base;
 }
 
-static struct drm_encoder *intel_mst_best_encoder(struct drm_connector *connector)
-{
-        struct intel_connector *intel_connector = to_intel_connector(connector);
-        struct intel_dp *intel_dp = intel_connector->mst_port;
-        if (!intel_dp)
-                return NULL;
-        return &intel_dp->mst_encoders[0]->base.base;
-}
-
 static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = {
         .get_modes = intel_dp_mst_get_modes,
         .mode_valid = intel_dp_mst_mode_valid,
         .atomic_best_encoder = intel_mst_atomic_best_encoder,
-        .best_encoder = intel_mst_best_encoder,
         .atomic_check = intel_dp_mst_atomic_check,
 };
 
@@ -475,8 +465,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
                 struct drm_encoder *enc =
                         &intel_dp->mst_encoders[pipe]->base.base;
 
-                ret = drm_mode_connector_attach_encoder(&intel_connector->base,
-                                                        enc);
+                ret = drm_connector_attach_encoder(&intel_connector->base, enc);
                 if (ret)
                         goto err;
         }
@@ -484,7 +473,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
         drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
         drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
 
-        ret = drm_mode_connector_set_path_property(connector, pathprop);
+        ret = drm_connector_set_path_property(connector, pathprop);
         if (ret)
                 goto err;
 
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index e046c4f668e0..7e5e6eb5dfe2 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -163,8 +163,8 @@ void intel_enable_shared_dpll(struct intel_crtc *crtc)
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_shared_dpll *pll = crtc->config->shared_dpll;
-        unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
-        unsigned old_mask;
+        unsigned int crtc_mask = drm_crtc_mask(&crtc->base);
+        unsigned int old_mask;
 
         if (WARN_ON(pll == NULL))
                 return;
@@ -207,7 +207,7 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc)
 {
         struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
         struct intel_shared_dpll *pll = crtc->config->shared_dpll;
-        unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
+        unsigned int crtc_mask = drm_crtc_mask(&crtc->base);
 
         /* PCH only available on ILK+ */
         if (INTEL_GEN(dev_priv) < 5)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index edcfd85e7b94..c275f91244a6 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -949,6 +949,7 @@ struct intel_plane {
         enum pipe pipe;
         bool can_scale;
         bool has_fbc;
+        bool has_ccs;
         int max_downscale;
         uint32_t frontbuffer_bit;
 
@@ -2086,7 +2087,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
 
 
 /* intel_sprite.c */
-bool intel_format_is_yuv(u32 format);
 int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
                              int usecs);
 struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv,
@@ -2102,7 +2102,6 @@ void skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc);
 bool skl_plane_get_hw_state(struct intel_plane *plane, enum pipe *pipe);
 bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
                        enum pipe pipe, enum plane_id plane_id);
-bool intel_format_is_yuv(uint32_t format);
 bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
                           enum pipe pipe, enum plane_id plane_id);
 
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 2db5da550a1c..0cc6a861bcf8 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -429,7 +429,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
         if (num_downstream == 0)
                 return -EINVAL;
 
-        ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL);
+        ksv_fifo = kcalloc(DRM_HDCP_KSV_LEN, num_downstream, GFP_KERNEL);
         if (!ksv_fifo)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 98ad4313d9f2..8363fbd18ee8 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -467,7 +467,8 @@ static void intel_write_infoframe(struct drm_encoder *encoder,
 }
 
 static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
-                                         const struct intel_crtc_state *crtc_state)
+                                         const struct intel_crtc_state *crtc_state,
+                                         const struct drm_connector_state *conn_state)
 {
         struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
         const struct drm_display_mode *adjusted_mode =
@@ -497,6 +498,9 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
                                            intel_hdmi->rgb_quant_range_selectable,
                                            is_hdmi2_sink);
 
+        drm_hdmi_avi_infoframe_content_type(&frame.avi,
+                                            conn_state);
+
         /* TODO: handle pixel repetition for YCBCR420 outputs */
         intel_write_infoframe(encoder, crtc_state, &frame);
 }
@@ -592,7 +596,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -733,7 +737,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -776,7 +780,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -829,7 +833,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -862,7 +866,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -2092,6 +2096,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
         intel_attach_force_audio_property(connector);
         intel_attach_broadcast_rgb_property(connector);
         intel_attach_aspect_ratio_property(connector);
+        drm_connector_attach_content_type_property(connector);
         connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index a35404119257..f9f3b0885ba5 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -999,7 +999,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
                                     intel_gmbus_get_adapter(dev_priv, pin));
         if (edid) {
                 if (drm_add_edid_modes(connector, edid)) {
-                        drm_mode_connector_update_edid_property(connector,
+                        drm_connector_update_edid_property(connector,
                                                                 edid);
                 } else {
                         kfree(edid);
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index b39846613e3c..ca44bf368e24 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -40,7 +40,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
 {
         int ret;
 
-        drm_mode_connector_update_edid_property(connector, edid);
+        drm_connector_update_edid_property(connector, edid);
         ret = drm_add_edid_modes(connector, edid);
 
         return ret;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 69bd7f697f6d..33faad3197fe 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1023,6 +1023,8 @@ int intel_ring_pin(struct intel_ring *ring,
                 flags |= PIN_OFFSET_BIAS | offset_bias;
         if (vma->obj->stolen)
                 flags |= PIN_MAPPABLE;
+        else
+                flags |= PIN_HIGH;
 
         if (!(vma->flags & I915_VMA_GLOBAL_BIND)) {
                 if (flags & PIN_MAPPABLE || map == I915_MAP_WC)
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 5417c54f67da..812fe7b06f87 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1911,7 +1911,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
         if (edid != NULL) {
                 if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
                                                       edid)) {
-                        drm_mode_connector_update_edid_property(connector, edid);
+                        drm_connector_update_edid_property(connector, edid);
                         drm_add_edid_modes(connector, edid);
                 }
 
@@ -2798,9 +2798,8 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
                 return false;
 
         for (i = 0; i < intel_sdvo_connector->format_supported_num; i++)
-                drm_property_add_enum(
-                                intel_sdvo_connector->tv_format, i,
-                                i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
+                drm_property_add_enum(intel_sdvo_connector->tv_format, i,
+                                      tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
 
         intel_sdvo_connector->base.base.state->tv.mode = intel_sdvo_connector->tv_format_supported[0];
         drm_object_attach_property(&intel_sdvo_connector->base.base.base,
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 3a4a26dd770f..f7026e887fa9 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -41,20 +41,6 @@
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 
-bool intel_format_is_yuv(u32 format)
-{
-        switch (format) {
-        case DRM_FORMAT_YUYV:
-        case DRM_FORMAT_UYVY:
-        case DRM_FORMAT_VYUY:
-        case DRM_FORMAT_YVYU:
-        case DRM_FORMAT_NV12:
-                return true;
-        default:
-                return false;
-        }
-}
-
 int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
                              int usecs)
 {
@@ -416,7 +402,7 @@ chv_update_csc(const struct intel_plane_state *plane_state)
         const s16 *csc = csc_matrix[plane_state->base.color_encoding];
 
         /* Seems RGB data bypasses the CSC always */
-        if (!intel_format_is_yuv(fb->format->format))
+        if (!fb->format->is_yuv)
                 return;
 
         I915_WRITE_FW(SPCSCYGOFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
@@ -451,7 +437,7 @@ vlv_update_clrc(const struct intel_plane_state *plane_state)
         enum plane_id plane_id = plane->id;
         int contrast, brightness, sh_scale, sh_sin, sh_cos;
 
-        if (intel_format_is_yuv(fb->format->format) &&
+        if (fb->format->is_yuv &&
             plane_state->base.color_range == DRM_COLOR_YCBCR_LIMITED_RANGE) {
                 /*
                  * Expand limited range to full range:
@@ -978,22 +964,12 @@ intel_check_sprite_plane(struct intel_plane *plane,
         struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
         struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
         struct drm_framebuffer *fb = state->base.fb;
-        int crtc_x, crtc_y;
-        unsigned int crtc_w, crtc_h;
-        uint32_t src_x, src_y, src_w, src_h;
-        struct drm_rect *src = &state->base.src;
-        struct drm_rect *dst = &state->base.dst;
-        struct drm_rect clip = {};
         int max_stride = INTEL_GEN(dev_priv) >= 9 ? 32768 : 16384;
-        int hscale, vscale;
         int max_scale, min_scale;
         bool can_scale;
         int ret;
         uint32_t pixel_format = 0;
 
-        *src = drm_plane_state_src(&state->base);
-        *dst = drm_plane_state_dest(&state->base);
-
         if (!fb) {
                 state->base.visible = false;
                 return 0;
@@ -1032,64 +1008,19 @@ intel_check_sprite_plane(struct intel_plane *plane,
                 min_scale = plane->can_scale ? 1 : (1 << 16);
         }
 
-        /*
-         * FIXME the following code does a bunch of fuzzy adjustments to the
-         * coordinates and sizes. We probably need some way to decide whether
-         * more strict checking should be done instead.
-         */
-        drm_rect_rotate(src, fb->width << 16, fb->height << 16,
-                        state->base.rotation);
-
-        hscale = drm_rect_calc_hscale_relaxed(src, dst, min_scale, max_scale);
-        BUG_ON(hscale < 0);
-
-        vscale = drm_rect_calc_vscale_relaxed(src, dst, min_scale, max_scale);
-        BUG_ON(vscale < 0);
-
-        if (crtc_state->base.enable)
-                drm_mode_get_hv_timing(&crtc_state->base.mode,
-                                       &clip.x2, &clip.y2);
-
-        state->base.visible = drm_rect_clip_scaled(src, dst, &clip, hscale, vscale);
-
-        crtc_x = dst->x1;
-        crtc_y = dst->y1;
-        crtc_w = drm_rect_width(dst);
-        crtc_h = drm_rect_height(dst);
+        ret = drm_atomic_helper_check_plane_state(&state->base,
+                                                  &crtc_state->base,
+                                                  min_scale, max_scale,
+                                                  true, true);
+        if (ret)
+                return ret;
 
         if (state->base.visible) {
-                /* check again in case clipping clamped the results */
-                hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);
-                if (hscale < 0) {
-                        DRM_DEBUG_KMS("Horizontal scaling factor out of limits\n");
-                        drm_rect_debug_print("src: ", src, true);
-                        drm_rect_debug_print("dst: ", dst, false);
-
-                        return hscale;
-                }
-
-                vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);
-                if (vscale < 0) {
-                        DRM_DEBUG_KMS("Vertical scaling factor out of limits\n");
-                        drm_rect_debug_print("src: ", src, true);
-                        drm_rect_debug_print("dst: ", dst, false);
-
-                        return vscale;
-                }
-
-                /* Make the source viewport size an exact multiple of the scaling factors. */
-                drm_rect_adjust_size(src,
-                                     drm_rect_width(dst) * hscale - drm_rect_width(src),
-                                     drm_rect_height(dst) * vscale - drm_rect_height(src));
-
-                drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16,
-                                    state->base.rotation);
-
-                /* sanity check to make sure the src viewport wasn't enlarged */
-                WARN_ON(src->x1 < (int) state->base.src_x ||
-                        src->y1 < (int) state->base.src_y ||
-                        src->x2 > (int) state->base.src_x + state->base.src_w ||
-                        src->y2 > (int) state->base.src_y + state->base.src_h);
+                struct drm_rect *src = &state->base.src;
+                struct drm_rect *dst = &state->base.dst;
+                unsigned int crtc_w = drm_rect_width(dst);
+                unsigned int crtc_h = drm_rect_height(dst);
+                uint32_t src_x, src_y, src_w, src_h;
 
                 /*
                  * Hardware doesn't handle subpixel coordinates.
@@ -1102,59 +1033,40 @@ intel_check_sprite_plane(struct intel_plane *plane,
                 src_y = src->y1 >> 16;
                 src_h = drm_rect_height(src) >> 16;
 
-                if (intel_format_is_yuv(fb->format->format) &&
-                    fb->format->format != DRM_FORMAT_NV12) {
-                        src_x &= ~1;
-                        src_w &= ~1;
-
-                        /*
-                         * Must keep src and dst the
-                         * same if we can't scale.
-                         */
-                        if (!can_scale)
-                                crtc_w &= ~1;
+                src->x1 = src_x << 16;
+                src->x2 = (src_x + src_w) << 16;
+                src->y1 = src_y << 16;
+                src->y2 = (src_y + src_h) << 16;
 
-                        if (crtc_w == 0)
-                                state->base.visible = false;
+                if (fb->format->is_yuv &&
+                    fb->format->format != DRM_FORMAT_NV12 &&
+                    (src_x % 2 || src_w % 2)) {
+                        DRM_DEBUG_KMS("src x/w (%u, %u) must be a multiple of 2 for YUV planes\n",
+                                      src_x, src_w);
+                        return -EINVAL;
                 }
-        }
-
-        /* Check size restrictions when scaling */
-        if (state->base.visible && (src_w != crtc_w || src_h != crtc_h)) {
-                unsigned int width_bytes;
-                int cpp = fb->format->cpp[0];
-
-                WARN_ON(!can_scale);
 
-                /* FIXME interlacing min height is 6 */
+                /* Check size restrictions when scaling */
+                if (src_w != crtc_w || src_h != crtc_h) {
+                        unsigned int width_bytes;
+                        int cpp = fb->format->cpp[0];
 
-                if (crtc_w < 3 || crtc_h < 3)
-                        state->base.visible = false;
+                        WARN_ON(!can_scale);
 
-                if (src_w < 3 || src_h < 3)
-                        state->base.visible = false;
+                        width_bytes = ((src_x * cpp) & 63) + src_w * cpp;
 
-                width_bytes = ((src_x * cpp) & 63) + src_w * cpp;
-
-                if (INTEL_GEN(dev_priv) < 9 && (src_w > 2048 || src_h > 2048 ||
-                    width_bytes > 4096 || fb->pitches[0] > 4096)) {
-                        DRM_DEBUG_KMS("Source dimensions exceed hardware limits\n");
-                        return -EINVAL;
+                        /* FIXME interlacing min height is 6 */
+                        if (INTEL_GEN(dev_priv) < 9 && (
+                             src_w < 3 || src_h < 3 ||
+                             src_w > 2048 || src_h > 2048 ||
+                             crtc_w < 3 || crtc_h < 3 ||
+                             width_bytes > 4096 || fb->pitches[0] > 4096)) {
+                                DRM_DEBUG_KMS("Source dimensions exceed hardware limits\n");
+                                return -EINVAL;
+                        }
                 }
         }
 
-        if (state->base.visible) {
-                src->x1 = src_x << 16;
-                src->x2 = (src_x + src_w) << 16;
-                src->y1 = src_y << 16;
-                src->y2 = (src_y + src_h) << 16;
-        }
-
-        dst->x1 = crtc_x;
-        dst->x2 = crtc_x + crtc_w;
-        dst->y1 = crtc_y;
-        dst->y2 = crtc_y + crtc_h;
-
         if (INTEL_GEN(dev_priv) >= 9) {
                 ret = skl_check_plane_surface(crtc_state, state);
                 if (ret)
@@ -1385,8 +1297,17 @@ static const uint64_t skl_plane_format_modifiers_ccs[] = {
         DRM_FORMAT_MOD_INVALID
 };
 
-static bool g4x_mod_supported(uint32_t format, uint64_t modifier)
+static bool g4x_sprite_format_mod_supported(struct drm_plane *_plane,
+                                            u32 format, u64 modifier)
 {
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_XRGB8888:
         case DRM_FORMAT_YUYV:
@@ -1402,8 +1323,17 @@ static bool g4x_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool snb_mod_supported(uint32_t format, uint64_t modifier)
+static bool snb_sprite_format_mod_supported(struct drm_plane *_plane,
+                                            u32 format, u64 modifier)
 {
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_XRGB8888:
         case DRM_FORMAT_XBGR8888:
@@ -1420,8 +1350,17 @@ static bool snb_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool vlv_mod_supported(uint32_t format, uint64_t modifier)
+static bool vlv_sprite_format_mod_supported(struct drm_plane *_plane,
+                                            u32 format, u64 modifier)
 {
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_RGB565:
         case DRM_FORMAT_ABGR8888:
@@ -1443,8 +1382,26 @@ static bool vlv_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool skl_mod_supported(uint32_t format, uint64_t modifier)
+static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
+                                           u32 format, u64 modifier)
 {
+        struct intel_plane *plane = to_intel_plane(_plane);
+
+        switch (modifier) {
+        case DRM_FORMAT_MOD_LINEAR:
+        case I915_FORMAT_MOD_X_TILED:
+        case I915_FORMAT_MOD_Y_TILED:
+        case I915_FORMAT_MOD_Yf_TILED:
+                break;
+        case I915_FORMAT_MOD_Y_TILED_CCS:
+        case I915_FORMAT_MOD_Yf_TILED_CCS:
+                if (!plane->has_ccs)
+                        return false;
+                break;
+        default:
+                return false;
+        }
+
         switch (format) {
         case DRM_FORMAT_XRGB8888:
         case DRM_FORMAT_XBGR8888:
@@ -1476,30 +1433,40 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)
         }
 }
 
-static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane,
-                                                    uint32_t format,
-                                                    uint64_t modifier)
-{
-        struct drm_i915_private *dev_priv = to_i915(plane->dev);
-
-        if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))
-                return false;
+static const struct drm_plane_funcs g4x_sprite_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = intel_plane_destroy,
+        .atomic_get_property = intel_plane_atomic_get_property,
+        .atomic_set_property = intel_plane_atomic_set_property,
+        .atomic_duplicate_state = intel_plane_duplicate_state,
+        .atomic_destroy_state = intel_plane_destroy_state,
+        .format_mod_supported = g4x_sprite_format_mod_supported,
+};
 
-        if ((modifier >> 56) != DRM_FORMAT_MOD_VENDOR_INTEL &&
-            modifier != DRM_FORMAT_MOD_LINEAR)
-                return false;
+static const struct drm_plane_funcs snb_sprite_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = intel_plane_destroy,
+        .atomic_get_property = intel_plane_atomic_get_property,
+        .atomic_set_property = intel_plane_atomic_set_property,
+        .atomic_duplicate_state = intel_plane_duplicate_state,
+        .atomic_destroy_state = intel_plane_destroy_state,
+        .format_mod_supported = snb_sprite_format_mod_supported,
+};
 
-        if (INTEL_GEN(dev_priv) >= 9)
-                return skl_mod_supported(format, modifier);
-        else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
-                return vlv_mod_supported(format, modifier);
-        else if (INTEL_GEN(dev_priv) >= 6)
-                return snb_mod_supported(format, modifier);
-        else
-                return g4x_mod_supported(format, modifier);
-}
+static const struct drm_plane_funcs vlv_sprite_funcs = {
+        .update_plane = drm_atomic_helper_update_plane,
+        .disable_plane = drm_atomic_helper_disable_plane,
+        .destroy = intel_plane_destroy,
+        .atomic_get_property = intel_plane_atomic_get_property,
+        .atomic_set_property = intel_plane_atomic_set_property,
+        .atomic_duplicate_state = intel_plane_duplicate_state,
+        .atomic_destroy_state = intel_plane_destroy_state,
+        .format_mod_supported = vlv_sprite_format_mod_supported,
+};
 
-static const struct drm_plane_funcs intel_sprite_plane_funcs = {
+static const struct drm_plane_funcs skl_plane_funcs = {
         .update_plane = drm_atomic_helper_update_plane,
         .disable_plane = drm_atomic_helper_disable_plane,
         .destroy = intel_plane_destroy,
@@ -1507,7 +1474,7 @@ static const struct drm_plane_funcs intel_sprite_plane_funcs = {
         .atomic_set_property = intel_plane_atomic_set_property,
         .atomic_duplicate_state = intel_plane_duplicate_state,
         .atomic_destroy_state = intel_plane_destroy_state,
-        .format_mod_supported = intel_sprite_plane_format_mod_supported,
+        .format_mod_supported = skl_plane_format_mod_supported,
 };
 
 bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
@@ -1533,6 +1500,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
 {
         struct intel_plane *intel_plane = NULL;
         struct intel_plane_state *state = NULL;
+        const struct drm_plane_funcs *plane_funcs;
         unsigned long possible_crtcs;
         const uint32_t *plane_formats;
         const uint64_t *modifiers;
@@ -1557,6 +1525,9 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                 intel_plane->can_scale = true;
                 state->scaler_id = -1;
 
+                intel_plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe,
+                                                         PLANE_SPRITE0 + plane);
+
                 intel_plane->update_plane = skl_update_plane;
                 intel_plane->disable_plane = skl_disable_plane;
                 intel_plane->get_hw_state = skl_plane_get_hw_state;
@@ -1570,10 +1541,12 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                         num_plane_formats = ARRAY_SIZE(skl_plane_formats);
                 }
 
-                if (skl_plane_has_ccs(dev_priv, pipe, PLANE_SPRITE0 + plane))
+                if (intel_plane->has_ccs)
                         modifiers = skl_plane_format_modifiers_ccs;
                 else
                         modifiers = skl_plane_format_modifiers_noccs;
+
+                plane_funcs = &skl_plane_funcs;
         } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                 intel_plane->can_scale = false;
                 intel_plane->max_downscale = 1;
@@ -1585,6 +1558,8 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                 plane_formats = vlv_plane_formats;
                 num_plane_formats = ARRAY_SIZE(vlv_plane_formats);
                 modifiers = i9xx_plane_format_modifiers;
+
+                plane_funcs = &vlv_sprite_funcs;
         } else if (INTEL_GEN(dev_priv) >= 7) {
                 if (IS_IVYBRIDGE(dev_priv)) {
                         intel_plane->can_scale = true;
@@ -1601,6 +1576,8 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                 plane_formats = snb_plane_formats;
                 num_plane_formats = ARRAY_SIZE(snb_plane_formats);
                 modifiers = i9xx_plane_format_modifiers;
+
+                plane_funcs = &snb_sprite_funcs;
         } else {
                 intel_plane->can_scale = true;
                 intel_plane->max_downscale = 16;
@@ -1613,9 +1590,13 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                 if (IS_GEN6(dev_priv)) {
                         plane_formats = snb_plane_formats;
                         num_plane_formats = ARRAY_SIZE(snb_plane_formats);
+
+                        plane_funcs = &snb_sprite_funcs;
                 } else {
                         plane_formats = g4x_plane_formats;
                         num_plane_formats = ARRAY_SIZE(g4x_plane_formats);
+
+                        plane_funcs = &g4x_sprite_funcs;
                 }
         }
 
@@ -1642,14 +1623,14 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
 
         if (INTEL_GEN(dev_priv) >= 9)
                 ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,
-                                               possible_crtcs, &intel_sprite_plane_funcs,
+                                               possible_crtcs, plane_funcs,
                                                plane_formats, num_plane_formats,
                                                modifiers,
                                                DRM_PLANE_TYPE_OVERLAY,
                                                "plane %d%c", plane + 2, pipe_name(pipe));
         else
                 ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,
-                                               possible_crtcs, &intel_sprite_plane_funcs,
+                                               possible_crtcs, plane_funcs,
                                                plane_formats, num_plane_formats,
                                                modifiers,
                                                DRM_PLANE_TYPE_OVERLAY,
diff --git a/drivers/gpu/drm/i915/selftests/intel_uncore.c b/drivers/gpu/drm/i915/selftests/intel_uncore.c
index f76f2597df5c..47bc5b2ddb56 100644
--- a/drivers/gpu/drm/i915/selftests/intel_uncore.c
+++ b/drivers/gpu/drm/i915/selftests/intel_uncore.c
@@ -137,7 +137,7 @@ static int intel_uncore_check_forcewake_domains(struct drm_i915_private *dev_pri
         if (!IS_ENABLED(CONFIG_DRM_I915_SELFTEST_BROKEN))
                 return 0;
 
-        valid = kzalloc(BITS_TO_LONGS(FW_RANGE) * sizeof(*valid),
+        valid = kcalloc(BITS_TO_LONGS(FW_RANGE), sizeof(*valid),
                         GFP_KERNEL);
         if (!valid)
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
index 302f7d103635..ca682caf1062 100644
--- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
+++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
@@ -94,18 +94,6 @@ static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)
         vm_unmap_ram(vaddr, mock->npages);
 }
 
-static void *mock_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num)
-{
-        struct mock_dmabuf *mock = to_mock(dma_buf);
-
-        return kmap_atomic(mock->pages[page_num]);
-}
-
-static void mock_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr)
-{
-        kunmap_atomic(addr);
-}
-
 static void *mock_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num)
 {
         struct mock_dmabuf *mock = to_mock(dma_buf);
@@ -130,9 +118,7 @@ static const struct dma_buf_ops mock_dmabuf_ops =  {
         .unmap_dma_buf = mock_unmap_dma_buf,
         .release = mock_dmabuf_release,
         .map = mock_dmabuf_kmap,
-        .map_atomic = mock_dmabuf_kmap_atomic,
         .unmap = mock_dmabuf_kunmap,
-        .unmap_atomic = mock_dmabuf_kunmap_atomic,
         .mmap = mock_dmabuf_mmap,
         .vmap = mock_dmabuf_vmap,
         .vunmap = mock_dmabuf_vunmap,