Commit 5816d648 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: i915_gem_object_sync must handle NULL

When I extracted the synchronization code for implementing semaphorified
pageflips (74f5f6e0), I neglected the non pipelined case which also
calls this code. The modesetting code wants to make sure the object has
finished rendering to the frame before configuring the scanout (ie.
non-pipelined case).

As a result of a follow on discussion on IRC, I've decided to add a
comment about the function itself which received much inspiration from
Chris as well. So really, this patch was ghost-written by Chris :).

Reported-by: default avatarChris Wilson <>
Signed-off-by: default avatarBen Widawsky <>
Reviewed-by: default avatarChris Wilson <>
Tested-by: default avatarChris Wilson <>
Signed-off-by: default avatarDaniel Vetter <>
parent f82cfb6b
......@@ -1953,6 +1953,18 @@ i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj)
return 0;
* i915_gem_object_sync - sync an object to a ring.
* @obj: object which may be in use on another ring.
* @to: ring we wish to use the object on. May be NULL.
* This code is meant to abstract object synchronization with the GPU.
* Calling with NULL implies synchronizing the object with the CPU
* rather than a particular GPU ring.
* Returns 0 if successful, else propagates up the lower layer error.
i915_gem_object_sync(struct drm_i915_gem_object *obj,
struct intel_ring_buffer *to)
......@@ -1964,7 +1976,7 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj,
if (from == NULL || to == from)
return 0;
if (!i915_semaphore_is_enabled(obj->
if (to == NULL || !i915_semaphore_is_enabled(obj->
return i915_gem_object_wait_rendering(obj);
idx = intel_ring_sync_index(from, to);
Supports Markdown
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