| Message ID | 1463490484-19540-11-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 17, 2016 at 03:07:53PM +0200, Maarten Lankhorst wrote: > Set plane_state->base.fence to the dma_buf exclusive fence, > and add a wait to the mmio function. This will make it easier > to unify plane updates later on. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + > drivers/gpu/drm/i915/intel_display.c | 54 +++++++++++++++++++++++-------- > 2 files changed, 42 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c > index 7de7721f65bc..2ab45f16fa65 100644 > --- a/drivers/gpu/drm/i915/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c > @@ -102,6 +102,7 @@ intel_plane_destroy_state(struct drm_plane *plane, > struct drm_plane_state *state) > { > WARN_ON(state && to_intel_plane_state(state)->wait_req); > + WARN_ON(state && state->fence); > drm_atomic_helper_plane_destroy_state(plane, state); > } > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index ece259de6ff2..b7888ad331bb 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -13358,6 +13358,15 @@ static int intel_atomic_prepare_commit(struct drm_device *dev, > struct intel_plane_state *intel_plane_state = > to_intel_plane_state(plane_state); > > + if (plane_state->fence) { > + long lret = fence_wait(plane_state->fence, true); > + > + if (lret < 0) { > + ret = lret; > + break; > + } > + } > + > if (!intel_plane_state->wait_req) > continue; > > @@ -13683,6 +13692,33 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { > .atomic_destroy_state = intel_crtc_destroy_state, > }; > > +static struct fence *intel_get_excl_fence(struct drm_i915_gem_object *obj) > +{ > + struct reservation_object *resv; > + > + > + if (!obj->base.dma_buf) > + return NULL; > + > + resv = obj->base.dma_buf->resv; > + > + /* For framebuffer backed by dmabuf, wait for fence */ > + while (1) { > + struct fence *fence_excl, *ret = NULL; > + > + rcu_read_lock(); > + > + fence_excl = rcu_dereference(resv->fence_excl); > + if (fence_excl) > + ret = fence_get_rcu(fence_excl); > + > + rcu_read_unlock(); > + > + if (ret == fence_excl) > + return ret; > + } > +} > + > /** > * intel_prepare_plane_fb - Prepare fb for usage on plane > * @plane: drm plane to prepare for > @@ -13735,19 +13771,6 @@ intel_prepare_plane_fb(struct drm_plane *plane, > } > } > > - /* For framebuffer backed by dmabuf, wait for fence */ > - if (obj && obj->base.dma_buf) { > - long lret; > - > - lret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv, > - false, true, > - MAX_SCHEDULE_TIMEOUT); > - if (lret == -ERESTARTSYS) > - return lret; > - > - WARN(lret < 0, "waiting returns %li\n", lret); > - } > - > if (!obj) { > ret = 0; > } else if (plane->type == DRM_PLANE_TYPE_CURSOR && > @@ -13767,6 +13790,8 @@ intel_prepare_plane_fb(struct drm_plane *plane, > > i915_gem_request_assign(&plane_state->wait_req, > obj->last_write_req); > + > + plane_state->base.fence = intel_get_excl_fence(obj); > } > > i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit); > @@ -13809,6 +13834,9 @@ intel_cleanup_plane_fb(struct drm_plane *plane, > i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit); > > i915_gem_request_assign(&old_intel_state->wait_req, NULL); > + > + fence_put(old_intel_state->base.fence); > + old_intel_state->base.fence = NULL; > } > > int > -- > 2.5.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 7de7721f65bc..2ab45f16fa65 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -102,6 +102,7 @@ intel_plane_destroy_state(struct drm_plane *plane, struct drm_plane_state *state) { WARN_ON(state && to_intel_plane_state(state)->wait_req); + WARN_ON(state && state->fence); drm_atomic_helper_plane_destroy_state(plane, state); } diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ece259de6ff2..b7888ad331bb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13358,6 +13358,15 @@ static int intel_atomic_prepare_commit(struct drm_device *dev, struct intel_plane_state *intel_plane_state = to_intel_plane_state(plane_state); + if (plane_state->fence) { + long lret = fence_wait(plane_state->fence, true); + + if (lret < 0) { + ret = lret; + break; + } + } + if (!intel_plane_state->wait_req) continue; @@ -13683,6 +13692,33 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { .atomic_destroy_state = intel_crtc_destroy_state, }; +static struct fence *intel_get_excl_fence(struct drm_i915_gem_object *obj) +{ + struct reservation_object *resv; + + + if (!obj->base.dma_buf) + return NULL; + + resv = obj->base.dma_buf->resv; + + /* For framebuffer backed by dmabuf, wait for fence */ + while (1) { + struct fence *fence_excl, *ret = NULL; + + rcu_read_lock(); + + fence_excl = rcu_dereference(resv->fence_excl); + if (fence_excl) + ret = fence_get_rcu(fence_excl); + + rcu_read_unlock(); + + if (ret == fence_excl) + return ret; + } +} + /** * intel_prepare_plane_fb - Prepare fb for usage on plane * @plane: drm plane to prepare for @@ -13735,19 +13771,6 @@ intel_prepare_plane_fb(struct drm_plane *plane, } } - /* For framebuffer backed by dmabuf, wait for fence */ - if (obj && obj->base.dma_buf) { - long lret; - - lret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv, - false, true, - MAX_SCHEDULE_TIMEOUT); - if (lret == -ERESTARTSYS) - return lret; - - WARN(lret < 0, "waiting returns %li\n", lret); - } - if (!obj) { ret = 0; } else if (plane->type == DRM_PLANE_TYPE_CURSOR && @@ -13767,6 +13790,8 @@ intel_prepare_plane_fb(struct drm_plane *plane, i915_gem_request_assign(&plane_state->wait_req, obj->last_write_req); + + plane_state->base.fence = intel_get_excl_fence(obj); } i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit); @@ -13809,6 +13834,9 @@ intel_cleanup_plane_fb(struct drm_plane *plane, i915_gem_track_fb(old_obj, obj, intel_plane->frontbuffer_bit); i915_gem_request_assign(&old_intel_state->wait_req, NULL); + + fence_put(old_intel_state->base.fence); + old_intel_state->base.fence = NULL; } int
Set plane_state->base.fence to the dma_buf exclusive fence, and add a wait to the mmio function. This will make it easier to unify plane updates later on. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/intel_display.c | 54 +++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 13 deletions(-)