Merge tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_cs.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index aeee6840e82b6bc5d4e1b4b1cbbbc9df30fff936..5599c01b265d40c105b59b5ca0f3f14c2efdf40e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -64,7 +64,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
        return 0;
 }
 
-int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
+static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
 {
        struct amdgpu_fpriv *fpriv = p->filp->driver_priv;
        struct amdgpu_vm *vm = &fpriv->vm;
@@ -497,7 +497,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                                 &e->user_invalidated) && e->user_pages) {
 
                                /* We acquired a page array, but somebody
-                                * invalidated it. Free it an try again
+                                * invalidated it. Free it and try again
                                 */
                                release_pages(e->user_pages,
                                              e->robj->tbo.ttm->num_pages,
@@ -1069,10 +1069,8 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)
 {
        int i;
 
-       for (i = 0; i < p->num_post_dep_syncobjs; ++i) {
-               drm_syncobj_replace_fence(p->filp, p->post_dep_syncobjs[i],
-                                         p->fence);
-       }
+       for (i = 0; i < p->num_post_dep_syncobjs; ++i)
+               drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence);
 }
 
 static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,