diff options
| author | Rob Clark <robdclark@gmail.com> | 2016-06-16 16:37:38 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2016-09-15 17:43:51 -0400 |
| commit | f44d32c79fd591179820d6ce4645c4c2799e6d40 (patch) | |
| tree | d5e8e441dca58618ac700c384d3c3981fc8d8332 /drivers/gpu/drm/msm/msm_gpu.c | |
| parent | f0a42bb5423a1387e54a2d3451a10d4358b8cfb6 (diff) | |
| download | op-kernel-dev-f44d32c79fd591179820d6ce4645c4c2799e6d40.zip op-kernel-dev-f44d32c79fd591179820d6ce4645c4c2799e6d40.tar.gz | |
drm/msm: move fence allocation out of msm_gpu_submit()
Prep work for next patch.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 36ed53e..5bb0983 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -509,22 +509,15 @@ void msm_gpu_retire(struct msm_gpu *gpu) } /* add bo's to gpu's ring, and kick gpu: */ -int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, +void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, struct msm_file_private *ctx) { struct drm_device *dev = gpu->dev; struct msm_drm_private *priv = dev->dev_private; - int i, ret; + int i; WARN_ON(!mutex_is_locked(&dev->struct_mutex)); - submit->fence = msm_fence_alloc(gpu->fctx); - if (IS_ERR(submit->fence)) { - ret = PTR_ERR(submit->fence); - submit->fence = NULL; - return ret; - } - inactive_cancel(gpu); list_add_tail(&submit->node, &gpu->submit_list); @@ -557,8 +550,6 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, priv->lastctx = ctx; hangcheck_timer_reset(gpu); - - return 0; } /* |
