3 files changed, 14 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 39380f414aff..4d8a397893d1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2291,6 +2291,7 @@ intel_fb_align_height(struct drm_device *dev, unsigned int height,
 int
 intel_pin_and_fence_fb_obj(struct drm_plane *plane,
                            struct drm_framebuffer *fb,
+                           const struct drm_plane_state *plane_state,
                            struct intel_engine_cs *pipelined)
 {
         struct drm_device *dev = fb->dev;
@@ -2378,8 +2379,11 @@ err_interruptible:
         return ret;
 }
 
-static void intel_unpin_fb_obj(struct drm_i915_gem_object *obj)
+static void intel_unpin_fb_obj(struct drm_framebuffer *fb,
+                               const struct drm_plane_state *plane_state)
 {
+        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+
         WARN_ON(!mutex_is_locked(&obj->base.dev->struct_mutex));
 
         i915_gem_object_unpin_fence(obj);
@@ -9318,7 +9322,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
         enum pipe pipe = to_intel_crtc(work->crtc)->pipe;
 
         mutex_lock(&dev->struct_mutex);
-        intel_unpin_fb_obj(intel_fb_obj(work->old_fb));
+        intel_unpin_fb_obj(work->old_fb, work->crtc->primary->state);
         drm_gem_object_unreference(&work->pending_flip_obj->base);
 
         intel_fbc_update(dev);
@@ -10026,7 +10030,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
                 ring = &dev_priv->ring[RCS];
         }
 
-        ret = intel_pin_and_fence_fb_obj(crtc->primary, fb, ring);
+        ret = intel_pin_and_fence_fb_obj(crtc->primary, fb,
+                                         crtc->primary->state, ring);
         if (ret)
                 goto cleanup_pending;
 
@@ -10066,7 +10071,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         return 0;
 
 cleanup_unpin:
-        intel_unpin_fb_obj(obj);
+        intel_unpin_fb_obj(fb, crtc->primary->state);
 cleanup_pending:
         atomic_dec(&intel_crtc->unpin_work_count);
         mutex_unlock(&dev->struct_mutex);
@@ -12022,7 +12027,7 @@ intel_prepare_plane_fb(struct drm_plane *plane,
                 if (ret)
                         DRM_DEBUG_KMS("failed to attach phys object\n");
         } else {
-                ret = intel_pin_and_fence_fb_obj(plane, fb, NULL);
+                ret = intel_pin_and_fence_fb_obj(plane, fb, new_state, NULL);
         }
 
         if (ret == 0)
@@ -12054,7 +12059,7 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
         if (plane->type != DRM_PLANE_TYPE_CURSOR ||
             !INTEL_INFO(dev)->cursor_needs_physical) {
                 mutex_lock(&dev->struct_mutex);
-                intel_unpin_fb_obj(obj);
+                intel_unpin_fb_obj(fb, old_state);
                 mutex_unlock(&dev->struct_mutex);
         }
 }
@@ -13940,6 +13945,7 @@ void intel_modeset_gem_init(struct drm_device *dev)
 
                 if (intel_pin_and_fence_fb_obj(c->primary,
                                                c->primary->fb,
+                                               c->primary->state,
                                                NULL)) {
                         DRM_ERROR("failed to pin boot fb on pipe %d\n",
                                   to_intel_crtc(c)->pipe);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index e974dd6fe25f..a0df556ad895 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -959,6 +959,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
                                     struct intel_load_detect_pipe *old);
 int intel_pin_and_fence_fb_obj(struct drm_plane *plane,
                                struct drm_framebuffer *fb,
+                               const struct drm_plane_state *plane_state,
                                struct intel_engine_cs *pipelined);
 struct drm_framebuffer *
 __intel_framebuffer_create(struct drm_device *dev,
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 757c0d216f80..4e7e7da2e03b 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -151,7 +151,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
         }
 
         /* Flush everything out, we'll be doing GTT only from now on */
-        ret = intel_pin_and_fence_fb_obj(NULL, fb, NULL);
+        ret = intel_pin_and_fence_fb_obj(NULL, fb, NULL, NULL);
         if (ret) {
                 DRM_ERROR("failed to pin obj: %d\n", ret);
                 goto out_fb;