This patch adds error-handling for the i915_active_acquire()
inside the intel_timeline_pin().

Signed-off-by: liuhaoran <liuhaora...@163.com>
---
 drivers/gpu/drm/i915/gt/intel_timeline.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c 
b/drivers/gpu/drm/i915/gt/intel_timeline.c
index b9640212d659..a2edf9233500 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -211,7 +211,11 @@ int intel_timeline_pin(struct intel_timeline *tl, struct 
i915_gem_ww_ctx *ww)
        GT_TRACE(tl->gt, "timeline:%llx using HWSP offset:%x\n",
                 tl->fence_context, tl->hwsp_offset);
 
-       i915_active_acquire(&tl->active);
+       err = i915_active_acquire(&tl->active);
+
+       if (err)
+               return err;
+
        if (atomic_fetch_inc(&tl->pin_count)) {
                i915_active_release(&tl->active);
                __i915_vma_unpin(tl->hwsp_ggtt);
-- 
2.17.1

Reply via email to