Merge branch 'next' into for-linus

Prepare first round of input updates for 3.18.

1 files changed, 16 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index daa118978eec..dc2f4f26c961 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -415,6 +415,10 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
         }
 
         intel_overlay_release_old_vid_tail(overlay);
+
+
+        i915_gem_track_fb(overlay->old_vid_bo, NULL,
+                          INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe));
         return 0;
 }
 
@@ -686,6 +690,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         bool scale_changed = false;
         struct drm_device *dev = overlay->dev;
         u32 swidth, swidthsw, sheight, ostride;
+        enum pipe pipe = overlay->crtc->pipe;
 
         BUG_ON(!mutex_is_locked(&dev->struct_mutex));
         BUG_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
@@ -713,7 +718,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                 oconfig = OCONF_CC_OUT_8BIT;
                 if (IS_GEN4(overlay->dev))
                         oconfig |= OCONF_CSC_MODE_BT709;
-                oconfig |= overlay->crtc->pipe == 0 ?
+                oconfig |= pipe == 0 ?
                         OCONF_PIPE_A : OCONF_PIPE_B;
                 iowrite32(oconfig, &regs->OCONFIG);
                 intel_overlay_unmap_regs(overlay, regs);
@@ -776,9 +781,15 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         if (ret)
                 goto out_unpin;
 
+        i915_gem_track_fb(overlay->vid_bo, new_bo,
+                          INTEL_FRONTBUFFER_OVERLAY(pipe));
+
         overlay->old_vid_bo = overlay->vid_bo;
         overlay->vid_bo = new_bo;
 
+        intel_frontbuffer_flip(dev,
+                               INTEL_FRONTBUFFER_OVERLAY(pipe));
+
         return 0;
 
 out_unpin:
@@ -1028,7 +1039,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
         struct drm_intel_overlay_put_image *put_image_rec = data;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_overlay *overlay;
-        struct drm_mode_object *drmmode_obj;
+        struct drm_crtc *drmmode_crtc;
         struct intel_crtc *crtc;
         struct drm_i915_gem_object *new_bo;
         struct put_image_params *params;
@@ -1057,13 +1068,12 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
         if (!params)
                 return -ENOMEM;
 
-        drmmode_obj = drm_mode_object_find(dev, put_image_rec->crtc_id,
-                                           DRM_MODE_OBJECT_CRTC);
-        if (!drmmode_obj) {
+        drmmode_crtc = drm_crtc_find(dev, put_image_rec->crtc_id);
+        if (!drmmode_crtc) {
                 ret = -ENOENT;
                 goto out_free;
         }
-        crtc = to_intel_crtc(obj_to_crtc(drmmode_obj));
+        crtc = to_intel_crtc(drmmode_crtc);
 
         new_bo = to_intel_bo(drm_gem_object_lookup(dev, file_priv,
                                                    put_image_rec->bo_handle));