diff options
| author | Rob Clark <robdclark@gmail.com> | 2017-09-12 14:23:05 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2017-10-28 10:54:25 -0400 |
| commit | ad5149c4f65f7cb984ab85b366c6e7b573eaf48f (patch) | |
| tree | 2632a93346d6c9ba39df4393d13600a84a653d58 /drivers/gpu/drm/msm/msm_gem.c | |
| parent | 62884cd386b876638720ef88374b31a84ca7ee5f (diff) | |
| download | op-kernel-dev-ad5149c4f65f7cb984ab85b366c6e7b573eaf48f.zip op-kernel-dev-ad5149c4f65f7cb984ab85b366c6e7b573eaf48f.tar.gz | |
drm/msm: fix _NO_IMPLICIT fencing case
We need to call reservation_object_reserve_shared() in both cases, but
this wasn't happening in the _NO_IMPLICIT submit case.
Fixes: f0a42bb ("drm/msm: submit support for in-fences")
Reported-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index f15821a0..a0ab604 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -610,17 +610,6 @@ int msm_gem_sync_object(struct drm_gem_object *obj, struct dma_fence *fence; int i, ret; - if (!exclusive) { - /* NOTE: _reserve_shared() must happen before _add_shared_fence(), - * which makes this a slightly strange place to call it. OTOH this - * is a convenient can-fail point to hook it in. (And similar to - * how etnaviv and nouveau handle this.) - */ - ret = reservation_object_reserve_shared(msm_obj->resv); - if (ret) - return ret; - } - fobj = reservation_object_get_list(msm_obj->resv); if (!fobj || (fobj->shared_count == 0)) { fence = reservation_object_get_excl(msm_obj->resv); |
