From patchwork Tue Aug 8 22:46:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 9889185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D8FC7601EB for ; Tue, 8 Aug 2017 22:47:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBB9A28951 for ; Tue, 8 Aug 2017 22:47:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0DD328A1C; Tue, 8 Aug 2017 22:47:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9413328A1D for ; Tue, 8 Aug 2017 22:47:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E9956E257; Tue, 8 Aug 2017 22:46:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C36646E255 for ; Tue, 8 Aug 2017 22:46:33 +0000 (UTC) Received: by mail-pf0-x242.google.com with SMTP id j68so4362389pfc.2 for ; Tue, 08 Aug 2017 15:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zn3uKxnoGtLiwTSN9HarTBo9r1QocGH3eadbe99lvt8=; b=gHrNvQGLFQi8gEsKFB1VYZBX+TCeFXkYFAnykpKKVjL059O68uWhnh27FPwGNo73ay 3XDFJAml6HZJsyQE1VOsXlswR/V35l/G9lQGKYCE6uNBWENyag/ZDkCjns9xS/mDgAxY RNd3j8QhVvzzR82fHEoZcAoh5GV67O2582D0Qu9Sje8fTzSBaxUOENH6fLNDrkGDlY8A 0vo8hzq0omq8izDAlMeSM/jOlwXrqpVYCCKxn2fhz4ytxU3Y/oIKQO9tGwFFISVcXU+6 kQnz2d9Uv6DPb7/jzXhw7IigNKl+X5CDq7tj5QUrEpsHHNeoi6HERZLCjq2t6MhS/0Ob JmIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Zn3uKxnoGtLiwTSN9HarTBo9r1QocGH3eadbe99lvt8=; b=YijUzqCDaqIogySKuoE/WTtGiQmDMWwQpKTzpGFBqV+4k8I4zXAyCKl2uv72CmG6G3 G+0kqa+cqyhxd0JS6jLvpUVLHuWUd80b3ZrnA1XhFX6Zgx7/Rea7ng2DqKlnvUe2V/tS C+s5w49gRU0D0Au6xzh2Td3sIqrAAqO8fA6fMG9Fl2q2HWwJuUJiohkAsHgHy8+TSZsC N9rqGPCkNWpUp8g2QSGTJkD/XfWVLvYIJlD9SdxwZJq8fyss4WZl0XmEnT7P9na+wHCY cx0ix4C59knCgVGen94SYmBlmLrsjcN7s0psUDWs6ned8rlIqS0Kz2cc+PWXYt8mouiY 7EVg== X-Gm-Message-State: AHYfb5hw2cPHtgxYPtx4IbaLMGTouh+aFtoxGMztX5LAxbD90X1TTaIK nFertM1grr/QSKA3gc+y3A== X-Received: by 10.99.175.22 with SMTP id w22mr5729110pge.134.1502232392888; Tue, 08 Aug 2017 15:46:32 -0700 (PDT) Received: from omlet.jf.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id l24sm56129pfi.99.2017.08.08.15.46.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Aug 2017 15:46:31 -0700 (PDT) From: Jason Ekstrand X-Google-Original-From: Jason Ekstrand To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/9] drm/syncobj: Remove file_private from replace_fence Date: Tue, 8 Aug 2017 15:46:03 -0700 Message-Id: <1502232369-19753-4-git-send-email-jason.ekstrand@intel.com> X-Mailer: git-send-email 2.5.0.400.gff86faf In-Reply-To: <1502232369-19753-1-git-send-email-jason.ekstrand@intel.com> References: <1502232369-19753-1-git-send-email-jason.ekstrand@intel.com> Cc: Jason Ekstrand , Jason Ekstrand X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP It's completely unused. Signed-off-by: Jason Ekstrand --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-- drivers/gpu/drm/drm_syncobj.c | 5 ++--- include/drm/drm_syncobj.h | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 0aa33ae..3314702 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1070,8 +1070,7 @@ 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); + drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence); } } diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index dafca83..7fdf7e8 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -99,8 +99,7 @@ EXPORT_SYMBOL(drm_syncobj_fence_get); * * This replaces the fence on a sync object. */ -void drm_syncobj_replace_fence(struct drm_file *file_private, - struct drm_syncobj *syncobj, +void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *fence) { struct dma_fence *old_fence = NULL; @@ -313,7 +312,7 @@ int drm_syncobj_import_sync_file_fence(struct drm_file *file_private, return -ENOENT; } - drm_syncobj_replace_fence(file_private, syncobj, fence); + drm_syncobj_replace_fence(syncobj, fence); dma_fence_put(fence); drm_syncobj_put(syncobj); return 0; diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 422d631..1c81658 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -85,8 +85,7 @@ drm_syncobj_put(struct drm_syncobj *obj) struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, u32 handle); struct dma_fence *drm_syncobj_fence_get(struct drm_syncobj *syncobj); -void drm_syncobj_replace_fence(struct drm_file *file_private, - struct drm_syncobj *syncobj, +void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *fence); int drm_syncobj_find_fence(struct drm_file *file_private, u32 handle,