From patchwork Fri Apr 27 06:17:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10367491 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 8F78F602DC for ; Fri, 27 Apr 2018 06:18:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8109A28458 for ; Fri, 27 Apr 2018 06:18:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74B2D29301; Fri, 27 Apr 2018 06:18:13 +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=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,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 0D9CB28458 for ; Fri, 27 Apr 2018 06:18:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EACE6E7FD; Fri, 27 Apr 2018 06:17:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 11AE06E7F2 for ; Fri, 27 Apr 2018 06:17:48 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id l1so812572wmb.2 for ; Thu, 26 Apr 2018 23:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=50KESgrvJMbg5iNohip9HNOj3w05mZ94hdBgP6G+2rw=; b=X1ecm3/fyQhZLZ4gvI14Xo4g54c0DBoyUnJUalUsTkQIKUXvloOGoD6lR/O25QcCUl Ia6ckoFjVSHFIOsLB6qlWBknlKJztcZw5gaLkNq3fT5mv8W+hKmZrDUtWbr9obaZPyQy 4avwRiLgAdiraiLWadDy9hn3ctPtY7iogepSI= 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=50KESgrvJMbg5iNohip9HNOj3w05mZ94hdBgP6G+2rw=; b=JNXrX3uwczuGiCOLjFlZ4+TFpG5Dkmh9p3QZHCWW96+pAyps1FAZIwR7NAeeDopJVO HgsVoQIZjvVDDKyoWfC6SB6SwWxPvTCB+28uK8s82iv7YMn+IcK9LQNePLVPZIVgDhL2 aSYESqH1jvr8kMPEwhpyBqsjp8CY0Y5bw0/kVHjCXxpfykvDdnPzUlt0UJlr1OLyd5Tx IzTWKA1R5dpuvs5F1fxHwBv2F5m7m86IAMarTgYw6TXCnUmrVSaO+AwYRaXjKs1bi7Is Cmj/G6khekKq+jDs8/rIFTlUDpX9qUGTMewpSIHTLe3+ZuUbzIAu7Wn6iE3El7Wdnxtu wyCA== X-Gm-Message-State: ALQs6tDFMn8/Tg0CoFqnE2snhCba/Yf8lQOP1YTLsonP89pRBtABA9qk D4B17sa/SgGtZxUMCeSC3+GXeg== X-Google-Smtp-Source: AB8JxZp1hYnEA2Wlixl/S403gZah25khN8yQlOEo472JhZn5xYHnVa8fqXwnwuPs+ga62YRjXA1Eyw== X-Received: by 2002:a50:98e2:: with SMTP id j89-v6mr1756346edb.8.1524809866693; Thu, 26 Apr 2018 23:17:46 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id r15-v6sm468897edq.40.2018.04.26.23.17.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 23:17:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Fri, 27 Apr 2018 08:17:22 +0200 Message-Id: <20180427061724.28497-16-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427061724.28497-1-daniel.vetter@ffwll.ch> References: <20180427061724.28497-1-daniel.vetter@ffwll.ch> Subject: [Intel-gfx] [PATCH 15/17] drm/vgem: Remove unecessary dma_fence_ops X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Kees Cook , Cihangir Akturk MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP dma_fence_default_wait is the default now, same for the trivial enable_signaling implementation. Also remove the ->signaled callback, vgem can't peek ahead with a fastpath, returning false is the default implementation. Signed-off-by: Daniel Vetter Cc: Kees Cook Cc: Cihangir Akturk Cc: Sean Paul Cc: Daniel Vetter --- drivers/gpu/drm/vgem/vgem_fence.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c index b28876c222b4..75adedeaa384 100644 --- a/drivers/gpu/drm/vgem/vgem_fence.c +++ b/drivers/gpu/drm/vgem/vgem_fence.c @@ -43,16 +43,6 @@ static const char *vgem_fence_get_timeline_name(struct dma_fence *fence) return "unbound"; } -static bool vgem_fence_signaled(struct dma_fence *fence) -{ - return false; -} - -static bool vgem_fence_enable_signaling(struct dma_fence *fence) -{ - return true; -} - static void vgem_fence_release(struct dma_fence *base) { struct vgem_fence *fence = container_of(base, typeof(*fence), base); @@ -76,11 +66,7 @@ static void vgem_fence_timeline_value_str(struct dma_fence *fence, char *str, static const struct dma_fence_ops vgem_fence_ops = { .get_driver_name = vgem_fence_get_driver_name, .get_timeline_name = vgem_fence_get_timeline_name, - .enable_signaling = vgem_fence_enable_signaling, - .signaled = vgem_fence_signaled, - .wait = dma_fence_default_wait, .release = vgem_fence_release, - .fence_value_str = vgem_fence_value_str, .timeline_value_str = vgem_fence_timeline_value_str, };