Commit 3c28ff22 authored by Alex Goins's avatar Alex Goins Committed by Maarten Lankhorst

i915: wait for fence in prepare_plane_fb

In intel_prepare_plane_fb, if fb is backed by dma-buf, wait for exclusive
fence

v2: First commit
v3: Remove object_name_lock acquire
    Move wait from intel_atomic_commit() to intel_prepare_plane_fb()
v4: Wait only on exclusive fences, interruptible with no timeout
v5: Style tweaks to more closely match rest of file
v6: Properly handle interrupted waits
v7: No change
v8: No change

Link: https://patchwork.kernel.org/patch/7704181/Signed-off-by: default avatarAlex Goins <agoins@nvidia.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent fd8e058a
...@@ -13690,6 +13690,17 @@ intel_prepare_plane_fb(struct drm_plane *plane, ...@@ -13690,6 +13690,17 @@ intel_prepare_plane_fb(struct drm_plane *plane,
return ret; return ret;
} }
/* For framebuffer backed by dmabuf, wait for fence */
if (obj && obj->base.dma_buf) {
ret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
false, true,
MAX_SCHEDULE_TIMEOUT);
if (ret == -ERESTARTSYS)
return ret;
WARN_ON(ret < 0);
}
if (!obj) { if (!obj) {
ret = 0; ret = 0;
} else if (plane->type == DRM_PLANE_TYPE_CURSOR && } else if (plane->type == DRM_PLANE_TYPE_CURSOR &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment