<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jul 5, 2017 at 1:12 PM, Chris Wilson <span dir="ltr"><<a href="mailto:chris@chris-wilson.co.uk" target="_blank">chris@chris-wilson.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">the drm_file parameter is unused, so remove it.<br>
<br>
Signed-off-by: Chris Wilson <<a href="mailto:chris@chris-wilson.co.uk">chris@chris-wilson.co.uk</a>><br>
Cc: Dave Airlie <<a href="mailto:airlied@redhat.com">airlied@redhat.com</a>><br>
---<br>
drivers/gpu/drm/amd/amdgpu/<wbr>amdgpu_cs.c | 6 ++----<br>
drivers/gpu/drm/drm_syncobj.c | 8 +++-----<br>
include/drm/drm_syncobj.h | 3 +--<br>
3 files changed, 6 insertions(+), 11 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/<wbr>amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/<wbr>amdgpu_cs.c<br>
index aeee6840e82b..8c73b91f0ddc 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/<wbr>amdgpu_cs.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/<wbr>amdgpu_cs.c<br>
@@ -1069,10 +1069,8 @@ static void amdgpu_cs_post_dependencies(<wbr>struct amdgpu_cs_parser *p)<br>
{<br>
int i;<br>
<br>
- for (i = 0; i < p->num_post_dep_syncobjs; ++i) {<br>
- drm_syncobj_replace_fence(p-><wbr>filp, p->post_dep_syncobjs[i],<br>
- p->fence);<br>
- }<br>
+ for (i = 0; i < p->num_post_dep_syncobjs; ++i)<br>
+ drm_syncobj_replace_fence(p-><wbr>post_dep_syncobjs[i], p->fence);<br>
}<br>
<br>
static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,<br>
diff --git a/drivers/gpu/drm/drm_syncobj.<wbr>c b/drivers/gpu/drm/drm_syncobj.<wbr>c<br>
index 89441bc78591..789ba0b37f7b 100644<br>
--- a/drivers/gpu/drm/drm_syncobj.<wbr>c<br>
+++ b/drivers/gpu/drm/drm_syncobj.<wbr>c<br>
@@ -77,17 +77,15 @@ EXPORT_SYMBOL(drm_syncobj_<wbr>find);<br>
<br>
/**<br>
* drm_syncobj_replace_fence - replace fence in a sync object.<br>
- * @file_private: drm file private pointer.<br>
* @syncobj: Sync object to replace fence in<br>
* @fence: fence to install in sync file.<br>
*<br>
* This replaces the fence on a sync object.<br>
*/<br>
-void drm_syncobj_replace_fence(<wbr>struct drm_file *file_private,<br>
- struct drm_syncobj *syncobj,<br>
+void drm_syncobj_replace_fence(<wbr>struct drm_syncobj *syncobj,<br>
struct dma_fence *fence)<br>
{<br>
- struct dma_fence *old_fence = NULL;<br>
+ struct dma_fence *old_fence;<br></blockquote><div><br></div><div>This change looks unrelated. Valid, but unrelated. :-)<br><br></div><div>Having worked through your i915 syncobj patch, this definitely makes some things a little bit nicer.<br><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
if (fence)<br>
dma_fence_get(fence);<br>
@@ -292,7 +290,7 @@ int drm_syncobj_import_sync_file_<wbr>fence(struct drm_file *file_private,<br>
return -ENOENT;<br>
}<br>
<br>
- drm_syncobj_replace_fence(<wbr>file_private, syncobj, fence);<br>
+ drm_syncobj_replace_fence(<wbr>syncobj, fence);<br>
dma_fence_put(fence);<br>
drm_syncobj_put(syncobj);<br>
return 0;<br>
diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h<br>
index 2c3610a4a074..89976da542b1 100644<br>
--- a/include/drm/drm_syncobj.h<br>
+++ b/include/drm/drm_syncobj.h<br>
@@ -79,8 +79,7 @@ drm_syncobj_put(struct drm_syncobj *obj)<br>
<br>
struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,<br>
u32 handle);<br>
-void drm_syncobj_replace_fence(<wbr>struct drm_file *file_private,<br>
- struct drm_syncobj *syncobj,<br>
+void drm_syncobj_replace_fence(<wbr>struct drm_syncobj *syncobj,<br>
struct dma_fence *fence);<br>
int drm_syncobj_fence_get(struct drm_file *file_private,<br>
u32 handle,<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.13.2<br>
<br>
______________________________<wbr>_________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.<wbr>org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/intel-gfx" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/intel-gfx</a><br>
</font></span></blockquote></div><br></div></div>