From patchwork Thu May 3 14:25:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10378531 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 9E89D60159 for ; Thu, 3 May 2018 14:27:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D01F29194 for ; Thu, 3 May 2018 14:27:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8185A29196; Thu, 3 May 2018 14:27:42 +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 306AD29194 for ; Thu, 3 May 2018 14:27:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFF0C6E716; Thu, 3 May 2018 14:26:28 +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 AB9DD6E6F5 for ; Thu, 3 May 2018 14:26:20 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id n10so30665382wmc.1 for ; Thu, 03 May 2018 07:26:20 -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=ExHGW0oWt9W63JeleeNLGUU9SlgWWHY0hQ4JSv+yFr4=; b=KvfPhV4jhFWkCMHVOjXlxvJ7p/bbS+TRZYAfPcCGQV2CkNFfhlUbix1Jqb1JJEjdnw hqVsfBVFGuAG7XVa4nQ0OIh5cv+qdXNB9F2WTLwvwiL82xhqHIJ46qYAlWCzDNgjmIPa qIhIvCv3aJHP7P0iuAj/vrU3qbphqTQteu0pM= 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=ExHGW0oWt9W63JeleeNLGUU9SlgWWHY0hQ4JSv+yFr4=; b=eXsNBuQDv4vMOTCI7oRCffe/PCniBFwMKEfTUouPK3Gb4pd9a2+9t6bI/GxiV/mFeI t0dOO6fiMUl+bBTf6ot55tRAO4NzK34B3azP2vCueJ3fBddoDV47NrfiAEozw1ewn3w4 x1gg2qgpT5/SdmIalV5QE5sLRiZ9wfIFV9DVpgx+nvRD3ui+N0yCdVT2Bi9KwH5eatQl TaEW+qjt4S6RRGglG13Yim+77vnnQjQWzYTYrwNK4vJQhLABbIq/+r+7m/OLeRvl0QbH gAYRkkSIuEkYwsv8YG031yzSgfiIyA9FuJMHLS2sVrzcleFnYY37cuv58lhEM+nOfcdB 6ypw== X-Gm-Message-State: ALQs6tD0U8Zrz01nwCxQ5GZ5tH4hOYSyhzWifF8oCwsPVCI2qfxXjxB4 4DsswzAhRcJoP34AdgVdu4fahI4i X-Google-Smtp-Source: AB8JxZpodVXDt9QMggIeeb22Y8qx8b9ZpI51HmoWN/Ravh3xTGI2+uYmI9XsBFL9UGLAPwvZQTWIZg== X-Received: by 2002:a50:9aa6:: with SMTP id p35-v6mr31500131edb.50.1525357579368; Thu, 03 May 2018 07:26:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id u5-v6sm8095647edi.79.2018.05.03.07.26.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 07:26:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 3 May 2018 16:25:56 +0200 Message-Id: <20180503142603.28513-9-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180503142603.28513-1-daniel.vetter@ffwll.ch> References: <20180503142603.28513-1-daniel.vetter@ffwll.ch> Subject: [Intel-gfx] [PATCH 08/15] 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. 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 | 7 ------- 2 files changed, 14 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..0c02446f613d 100644 --- a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c @@ -611,16 +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, };