Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_display.c

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index e3f8d00..ec23dae 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1091,6 +1091,7 @@ static bool intel_plane_uses_fence(const struct intel_plane_state *plane_state)
 
 struct i915_vma *
 intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
+                          bool phys_cursor,
                           const struct i915_ggtt_view *view,
                           bool uses_fence,
                           unsigned long *out_flags)
@@ -1099,14 +1100,19 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
        intel_wakeref_t wakeref;
+       struct i915_gem_ww_ctx ww;
        struct i915_vma *vma;
        unsigned int pinctl;
        u32 alignment;
+       int ret;
 
        if (drm_WARN_ON(dev, !i915_gem_object_is_framebuffer(obj)))
                return ERR_PTR(-EINVAL);
 
-       alignment = intel_surf_alignment(fb, 0);
+       if (phys_cursor)
+               alignment = intel_cursor_alignment(dev_priv);
+       else
+               alignment = intel_surf_alignment(fb, 0);
        if (drm_WARN_ON(dev, alignment && !is_power_of_2(alignment)))
                return ERR_PTR(-EINVAL);
 
@@ -1141,14 +1147,26 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
        if (HAS_GMCH(dev_priv))
                pinctl |= PIN_MAPPABLE;
 
-       vma = i915_gem_object_pin_to_display_plane(obj,
-                                                  alignment, view, pinctl);
-       if (IS_ERR(vma))
+       i915_gem_ww_ctx_init(&ww, true);
+retry:
+       ret = i915_gem_object_lock(obj, &ww);
+       if (!ret && phys_cursor)
+               ret = i915_gem_object_attach_phys(obj, alignment);
+       if (!ret)
+               ret = i915_gem_object_pin_pages(obj);
+       if (ret)
                goto err;
 
-       if (uses_fence && i915_vma_is_map_and_fenceable(vma)) {
-               int ret;
+       if (!ret) {
+               vma = i915_gem_object_pin_to_display_plane(obj, &ww, alignment,
+                                                          view, pinctl);
+               if (IS_ERR(vma)) {
+                       ret = PTR_ERR(vma);
+                       goto err_unpin;
+               }
+       }
 
+       if (uses_fence && i915_vma_is_map_and_fenceable(vma)) {
                /*
                 * Install a fence for tiled scan-out. Pre-i965 always needs a
                 * fence, whereas 965+ only requires a fence if using
@@ -1169,16 +1187,28 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
                ret = i915_vma_pin_fence(vma);
                if (ret != 0 && INTEL_GEN(dev_priv) < 4) {
                        i915_vma_unpin(vma);
-                       vma = ERR_PTR(ret);
-                       goto err;
+                       goto err_unpin;
                }
+               ret = 0;
 
-               if (ret == 0 && vma->fence)
+               if (vma->fence)
                        *out_flags |= PLANE_HAS_FENCE;
        }
 
        i915_vma_get(vma);
+
+err_unpin:
+       i915_gem_object_unpin_pages(obj);
 err:
+       if (ret == -EDEADLK) {
+               ret = i915_gem_ww_ctx_backoff(&ww);
+               if (!ret)
+                       goto retry;
+       }
+       i915_gem_ww_ctx_fini(&ww);
+       if (ret)
+               vma = ERR_PTR(ret);
+
        atomic_dec(&dev_priv->gpu_error.pending_fb_pin);
        intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
        return vma;
@@ -11333,19 +11363,11 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state)
        struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
        struct drm_framebuffer *fb = plane_state->hw.fb;
        struct i915_vma *vma;
+       bool phys_cursor =
+               plane->id == PLANE_CURSOR &&
+               INTEL_INFO(dev_priv)->display.cursor_needs_physical;
 
-       if (plane->id == PLANE_CURSOR &&
-           INTEL_INFO(dev_priv)->display.cursor_needs_physical) {
-               struct drm_i915_gem_object *obj = intel_fb_obj(fb);
-               const int align = intel_cursor_alignment(dev_priv);
-               int err;
-
-               err = i915_gem_object_attach_phys(obj, align);
-               if (err)
-                       return err;
-       }
-
-       vma = intel_pin_and_fence_fb_obj(fb,
+       vma = intel_pin_and_fence_fb_obj(fb, phys_cursor,
                                         &plane_state->view,
                                         intel_plane_uses_fence(plane_state),
                                         &plane_state->flags);
@@ -11382,9 +11404,7 @@ int
 intel_prepare_plane_fb(struct drm_plane *_plane,
                       struct drm_plane_state *_new_plane_state)
 {
-       struct i915_sched_attr attr = {
-               .priority = I915_USER_PRIORITY(I915_PRIORITY_DISPLAY),
-       };
+       struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY };
        struct intel_plane *plane = to_intel_plane(_plane);
        struct intel_plane_state *new_plane_state =
                to_intel_plane_state(_new_plane_state);
@@ -11437,13 +11457,8 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
        if (!obj)
                return 0;
 
-       ret = i915_gem_object_pin_pages(obj);
-       if (ret)
-               return ret;
 
        ret = intel_plane_pin_fb(new_plane_state);
-
-       i915_gem_object_unpin_pages(obj);
        if (ret)
                return ret;
 
@@ -11905,7 +11920,7 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
        struct drm_i915_private *i915 = to_i915(obj->base.dev);
 
-       if (obj->userptr.mm) {
+       if (i915_gem_object_is_userptr(obj)) {
                drm_dbg(&i915->drm,
                        "attempting to use a userptr for a framebuffer, denied\n");
                return -EINVAL;