Commit 544a32db authored by Rob Clark's avatar Rob Clark

drm/msm: preserve IOVAs in submit's bo table

We need this if we want to dump the submit after cleanup (ie. from hang
or fault).  But in the backoff/unpin case we want to clear them.  So add
a flag so we can skip clearing the IOVAs in at cleanup.
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 998b9a58
...@@ -161,7 +161,8 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, ...@@ -161,7 +161,8 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
return ret; return ret;
} }
static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i) static void submit_unlock_unpin_bo(struct msm_gem_submit *submit,
int i, bool backoff)
{ {
struct msm_gem_object *msm_obj = submit->bos[i].obj; struct msm_gem_object *msm_obj = submit->bos[i].obj;
...@@ -171,7 +172,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i) ...@@ -171,7 +172,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)
if (submit->bos[i].flags & BO_LOCKED) if (submit->bos[i].flags & BO_LOCKED)
ww_mutex_unlock(&msm_obj->resv->lock); ww_mutex_unlock(&msm_obj->resv->lock);
if (!(submit->bos[i].flags & BO_VALID)) if (backoff && !(submit->bos[i].flags & BO_VALID))
submit->bos[i].iova = 0; submit->bos[i].iova = 0;
submit->bos[i].flags &= ~(BO_LOCKED | BO_PINNED); submit->bos[i].flags &= ~(BO_LOCKED | BO_PINNED);
...@@ -206,10 +207,10 @@ static int submit_lock_objects(struct msm_gem_submit *submit) ...@@ -206,10 +207,10 @@ static int submit_lock_objects(struct msm_gem_submit *submit)
fail: fail:
for (; i >= 0; i--) for (; i >= 0; i--)
submit_unlock_unpin_bo(submit, i); submit_unlock_unpin_bo(submit, i, true);
if (slow_locked > 0) if (slow_locked > 0)
submit_unlock_unpin_bo(submit, slow_locked); submit_unlock_unpin_bo(submit, slow_locked, true);
if (ret == -EDEADLK) { if (ret == -EDEADLK) {
struct msm_gem_object *msm_obj = submit->bos[contended].obj; struct msm_gem_object *msm_obj = submit->bos[contended].obj;
...@@ -393,7 +394,7 @@ static void submit_cleanup(struct msm_gem_submit *submit) ...@@ -393,7 +394,7 @@ static void submit_cleanup(struct msm_gem_submit *submit)
for (i = 0; i < submit->nr_bos; i++) { for (i = 0; i < submit->nr_bos; i++) {
struct msm_gem_object *msm_obj = submit->bos[i].obj; struct msm_gem_object *msm_obj = submit->bos[i].obj;
submit_unlock_unpin_bo(submit, i); submit_unlock_unpin_bo(submit, i, false);
list_del_init(&msm_obj->submit_entry); list_del_init(&msm_obj->submit_entry);
drm_gem_object_unreference(&msm_obj->base); drm_gem_object_unreference(&msm_obj->base);
} }
......
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