aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2018-04-27 02:17:14 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-05-03 05:49:31 -0400
commit95aee35fe10dc6c86498c5dd5f06bd5fb5af723a (patch)
treebf1ddc01baa10c371ef07797e5869976ce687ec5
parent49a53d493e603c594e39dfbc7171917effcaf01e (diff)
drm: Remove unecessary dma_fence_ops
dma_fence_default_wait is the default now, same for the trivial enable_signaling implementation. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Gustavo Padovan <gustavo@padovan.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: David Airlie <airlied@linux.ie> Link: https://patchwork.freedesktop.org/patch/msgid/20180427061724.28497-8-daniel.vetter@ffwll.ch
-rw-r--r--drivers/gpu/drm/drm_crtc.c7
-rw-r--r--drivers/gpu/drm/drm_syncobj.c1
-rw-r--r--drivers/gpu/drm/scheduler/sched_fence.c11
3 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index a231dd5dce16..e4d3285f4191 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -225,16 +225,9 @@ static const char *drm_crtc_fence_get_timeline_name(struct dma_fence *fence)
225 return crtc->timeline_name; 225 return crtc->timeline_name;
226} 226}
227 227
228static bool drm_crtc_fence_enable_signaling(struct dma_fence *fence)
229{
230 return true;
231}
232
233static const struct dma_fence_ops drm_crtc_fence_ops = { 228static const struct dma_fence_ops drm_crtc_fence_ops = {
234 .get_driver_name = drm_crtc_fence_get_driver_name, 229 .get_driver_name = drm_crtc_fence_get_driver_name,
235 .get_timeline_name = drm_crtc_fence_get_timeline_name, 230 .get_timeline_name = drm_crtc_fence_get_timeline_name,
236 .enable_signaling = drm_crtc_fence_enable_signaling,
237 .wait = dma_fence_default_wait,
238}; 231};
239 232
240struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc) 233struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index d4f4ce484529..adb3cb27d31e 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -207,7 +207,6 @@ static const struct dma_fence_ops drm_syncobj_null_fence_ops = {
207 .get_driver_name = drm_syncobj_null_fence_get_name, 207 .get_driver_name = drm_syncobj_null_fence_get_name,
208 .get_timeline_name = drm_syncobj_null_fence_get_name, 208 .get_timeline_name = drm_syncobj_null_fence_get_name,
209 .enable_signaling = drm_syncobj_null_fence_enable_signaling, 209 .enable_signaling = drm_syncobj_null_fence_enable_signaling,
210 .wait = dma_fence_default_wait,
211 .release = NULL, 210 .release = NULL,
212}; 211};
213 212
diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c
index 69aab086b913..4843289cc8f0 100644
--- a/drivers/gpu/drm/scheduler/sched_fence.c
+++ b/drivers/gpu/drm/scheduler/sched_fence.c
@@ -81,11 +81,6 @@ static const char *drm_sched_fence_get_timeline_name(struct dma_fence *f)
81 return (const char *)fence->sched->name; 81 return (const char *)fence->sched->name;
82} 82}
83 83
84static bool drm_sched_fence_enable_signaling(struct dma_fence *f)
85{
86 return true;
87}
88
89/** 84/**
90 * amd_sched_fence_free - free up the fence memory 85 * amd_sched_fence_free - free up the fence memory
91 * 86 *
@@ -134,18 +129,12 @@ static void drm_sched_fence_release_finished(struct dma_fence *f)
134const struct dma_fence_ops drm_sched_fence_ops_scheduled = { 129const struct dma_fence_ops drm_sched_fence_ops_scheduled = {
135 .get_driver_name = drm_sched_fence_get_driver_name, 130 .get_driver_name = drm_sched_fence_get_driver_name,
136 .get_timeline_name = drm_sched_fence_get_timeline_name, 131 .get_timeline_name = drm_sched_fence_get_timeline_name,
137 .enable_signaling = drm_sched_fence_enable_signaling,
138 .signaled = NULL,
139 .wait = dma_fence_default_wait,
140 .release = drm_sched_fence_release_scheduled, 132 .release = drm_sched_fence_release_scheduled,
141}; 133};
142 134
143const struct dma_fence_ops drm_sched_fence_ops_finished = { 135const struct dma_fence_ops drm_sched_fence_ops_finished = {
144 .get_driver_name = drm_sched_fence_get_driver_name, 136 .get_driver_name = drm_sched_fence_get_driver_name,
145 .get_timeline_name = drm_sched_fence_get_timeline_name, 137 .get_timeline_name = drm_sched_fence_get_timeline_name,
146 .enable_signaling = drm_sched_fence_enable_signaling,
147 .signaled = NULL,
148 .wait = dma_fence_default_wait,
149 .release = drm_sched_fence_release_finished, 138 .release = drm_sched_fence_release_finished,
150}; 139};
151 140