From patchwork Fri May 4 14:09:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10380673 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 B46276038F for ; Fri, 4 May 2018 14:10:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91F162947C for ; Fri, 4 May 2018 14:10:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84A992947F; Fri, 4 May 2018 14:10:09 +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 E2A862947C for ; Fri, 4 May 2018 14:10:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A5006E8B6; Fri, 4 May 2018 14:10:05 +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 0C8E06E8A7 for ; Fri, 4 May 2018 14:10:02 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id x12-v6so7181842wmc.0 for ; Fri, 04 May 2018 07:10:02 -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=cHECnaN9K0AnBS4w2dPa5UAOhiqOXyhlRnvTNgG37U4=; b=V89JR/Nf2RW//PcjLoXTmRiFGpl1iZwKOzCOOatcxISu/xlbgv9B0HEPR4rR8V+k2n c66GbNrcc1wVCBw/fX5AZu/rIkUo3ax+t/+erChbinUJveeyj2XCU/PmPpoRxxxdaElf 92PMc6GRoe64wugYS1FpS3150R09uNd0b72Kg= 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=cHECnaN9K0AnBS4w2dPa5UAOhiqOXyhlRnvTNgG37U4=; b=t/+gTf9e+44KxP3fi7fxg0wFct+mqGPiwp2LRmjR69KgTviu7itWjElpaPhCkLCAdl IFo4Ya7U/UPyBbvK/XWzN/w4ksRfI4s+5mW5sirad2+04qvbWG4IS7ocJkInIyzaMGxL NspLDmYmZGmVVUETY2B5Y7B/ggxB19mwBYekphCh/kcdhnv0gfl6gc7YS86T7u1T6Zdt Va6jks8mkRAA58EGHtq1CWsTfl2+uvyx0nG7MRnDjDU/zATVFm9VHacChmZe+siY/mCS G5JNCdRrWR1UjSejGC9Ym8g/tYH/+1djSfA0XwBf6SVyL1kCWP3+8w5559ZnEFE3q/JE Umxg== X-Gm-Message-State: ALQs6tANo+Ycquqxwnr7NBUrzMnBpLW5Twg2oTvqjEs65+0VT0B9DevP L9LCfsG5XY31Z7y3Ja5zpueP0Q== X-Google-Smtp-Source: AB8JxZqb18G51Pum5Wn9R6U34B1o3uxHs0y1z3+P2mdytfrCDIzeoSvbOJ+xyS+ZQbaKADJVhv5iBA== X-Received: by 2002:a50:a490:: with SMTP id w16-v6mr36130530edb.67.1525443001572; Fri, 04 May 2018 07:10:01 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id l5-v6sm6493817eda.58.2018.05.04.07.10.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 07:10:00 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Fri, 4 May 2018 16:09:55 +0200 Message-Id: <20180504140955.27640-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180503142603.28513-9-daniel.vetter@ffwll.ch> References: <20180503142603.28513-9-daniel.vetter@ffwll.ch> Subject: [Intel-gfx] [PATCH] drm/i915: 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 , Rodrigo Vivi , Colin Ian King , Mika Kuoppala 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. v2: Also remove the relase hook, dma_fence_free is the default. Signed-off-by: Daniel Vetter Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: Chris Wilson Cc: Tvrtko Ursulin Cc: Colin Ian King Cc: Daniel Vetter Cc: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/i915/i915_gem_clflush.c | 7 ------- drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 8 -------- 2 files changed, 15 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_clflush.c b/drivers/gpu/drm/i915/i915_gem_clflush.c index f5c570d35b2a..8e74c23cbd91 100644 --- a/drivers/gpu/drm/i915/i915_gem_clflush.c +++ b/drivers/gpu/drm/i915/i915_gem_clflush.c @@ -45,11 +45,6 @@ static const char *i915_clflush_get_timeline_name(struct dma_fence *fence) return "clflush"; } -static bool i915_clflush_enable_signaling(struct dma_fence *fence) -{ - return true; -} - static void i915_clflush_release(struct dma_fence *fence) { struct clflush *clflush = container_of(fence, typeof(*clflush), dma); @@ -63,8 +58,6 @@ static void i915_clflush_release(struct dma_fence *fence) static const struct dma_fence_ops i915_clflush_ops = { .get_driver_name = i915_clflush_get_driver_name, .get_timeline_name = i915_clflush_get_timeline_name, - .enable_signaling = i915_clflush_enable_signaling, - .wait = dma_fence_default_wait, .release = i915_clflush_release, }; diff --git a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c index 570e325af93e..cdbc8f134e5e 100644 --- a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c @@ -611,17 +611,9 @@ static const char *mock_name(struct dma_fence *fence) return "mock"; } -static bool mock_enable_signaling(struct dma_fence *fence) -{ - return true; -} - static const struct dma_fence_ops mock_fence_ops = { .get_driver_name = mock_name, .get_timeline_name = mock_name, - .enable_signaling = mock_enable_signaling, - .wait = dma_fence_default_wait, - .release = dma_fence_free, }; static DEFINE_SPINLOCK(mock_fence_lock);