drm/i915: Make intel_pin_and_fence_fb_obj take plane and framebuffer

It will help future code if this function knows something about of the context
of the display setup object is being pinned for.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

4 files changed, 25 insertions, 24 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d7951426f347..44060fb020a8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2194,11 +2194,13 @@ static int intel_align_height(struct drm_device *dev, int height, bool tiled)
 }
 
 int
-intel_pin_and_fence_fb_obj(struct drm_device *dev,
-                           struct drm_i915_gem_object *obj,
+intel_pin_and_fence_fb_obj(struct drm_plane *plane,
+                           struct drm_framebuffer *fb,
                            struct intel_engine_cs *pipelined)
 {
+        struct drm_device *dev = fb->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
         u32 alignment;
         int ret;
 
@@ -2897,7 +2899,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         enum pipe pipe = intel_crtc->pipe;
         struct drm_framebuffer *old_fb = crtc->primary->fb;
-        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
         struct drm_i915_gem_object *old_obj = intel_fb_obj(old_fb);
         int ret;
 
@@ -2920,9 +2921,9 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         }
 
         mutex_lock(&dev->struct_mutex);
-        ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
+        ret = intel_pin_and_fence_fb_obj(crtc->primary, fb, NULL);
         if (ret == 0)
-                i915_gem_track_fb(old_obj, obj,
+                i915_gem_track_fb(old_obj, intel_fb_obj(fb),
                                   INTEL_FRONTBUFFER_PRIMARY(pipe));
         mutex_unlock(&dev->struct_mutex);
         if (ret != 0) {
@@ -9689,7 +9690,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
                 ring = &dev_priv->ring[RCS];
         }
 
-        ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
+        ret = intel_pin_and_fence_fb_obj(crtc->primary, fb, ring);
         if (ret)
                 goto cleanup_pending;
 
@@ -10857,9 +10858,7 @@ static int __intel_set_mode(struct drm_crtc *crtc,
                 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
 
                 mutex_lock(&dev->struct_mutex);
-                ret = intel_pin_and_fence_fb_obj(dev,
-                                                 obj,
-                                                 NULL);
+                ret = intel_pin_and_fence_fb_obj(crtc->primary, fb, NULL);
                 if (ret != 0) {
                         DRM_ERROR("pin & fence failed\n");
                         mutex_unlock(&dev->struct_mutex);
@@ -11525,7 +11524,7 @@ intel_prepare_primary_plane(struct drm_plane *plane,
 
         if (old_obj != obj) {
                 mutex_lock(&dev->struct_mutex);
-                ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
+                ret = intel_pin_and_fence_fb_obj(plane, fb, NULL);
                 if (ret == 0)
                         i915_gem_track_fb(old_obj, obj,
                                           INTEL_FRONTBUFFER_PRIMARY(pipe));
@@ -13293,7 +13292,9 @@ void intel_modeset_gem_init(struct drm_device *dev)
                 if (obj == NULL)
                         continue;
 
-                if (intel_pin_and_fence_fb_obj(dev, obj, NULL)) {
+                if (intel_pin_and_fence_fb_obj(c->primary,
+                                               c->primary->fb,
+                                               NULL)) {
                         DRM_ERROR("failed to pin boot fb on pipe %d\n",
                                   to_intel_crtc(c)->pipe);
                         drm_framebuffer_unreference(c->primary->fb);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index dc53cfe949af..ae75b9950f01 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -896,8 +896,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
                                 struct drm_modeset_acquire_ctx *ctx);
 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_device *dev,
-                               struct drm_i915_gem_object *obj,
+int intel_pin_and_fence_fb_obj(struct drm_plane *plane,
+                               struct drm_framebuffer *fb,
                                struct intel_engine_cs *pipelined);
 void intel_unpin_fb_obj(struct drm_i915_gem_object *obj);
 struct drm_framebuffer *
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 9b584f3fbb99..f2183b554cbc 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -119,25 +119,25 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
                 goto out;
         }
 
-        /* Flush everything out, we'll be doing GTT only from now on */
-        ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
-        if (ret) {
-                DRM_ERROR("failed to pin obj: %d\n", ret);
-                goto out_unref;
-        }
-
         fb = __intel_framebuffer_create(dev, &mode_cmd, obj);
         if (IS_ERR(fb)) {
                 ret = PTR_ERR(fb);
-                goto out_unpin;
+                goto out_unref;
+        }
+
+        /* Flush everything out, we'll be doing GTT only from now on */
+        ret = intel_pin_and_fence_fb_obj(NULL, fb, NULL);
+        if (ret) {
+                DRM_ERROR("failed to pin obj: %d\n", ret);
+                goto out_fb;
         }
 
         ifbdev->fb = to_intel_framebuffer(fb);
 
         return 0;
 
-out_unpin:
-        i915_gem_object_ggtt_unpin(obj);
+out_fb:
+        drm_framebuffer_remove(fb);
 out_unref:
         drm_gem_object_unreference(&obj->base);
 out:
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index bf1eb158e624..8c70c54e048d 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1256,7 +1256,7 @@ intel_prepare_sprite_plane(struct drm_plane *plane,
                  * the sprite planes only require 128KiB alignment and 32 PTE
                  * padding.
                  */
-                ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
+                ret = intel_pin_and_fence_fb_obj(plane, fb, NULL);
                 if (ret == 0)
                         i915_gem_track_fb(old_obj, obj,
                                           INTEL_FRONTBUFFER_SPRITE(pipe));