Commit a5aca5d9 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove unecessary dma_fence_ops 



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.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20180704092909.6599-2-daniel.vetter@ffwll.ch
parent 86e5d0b5

drivers/gpu/drm/i915/i915_gem_clflush.c

+0 −7
Original line number Diff line number Diff line
@@ -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,

};

drivers/gpu/drm/i915/selftests/i915_sw_fence.c

+0 −8
Original line number Diff line number Diff line
@@ -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);