OSDN Git Service

drm: Remove unecessary dma_fence_ops
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 27 Apr 2018 06:17:14 +0000 (08:17 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 3 May 2018 09:49:31 +0000 (11:49 +0200)
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
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_syncobj.c
drivers/gpu/drm/scheduler/sched_fence.c

index a231dd5..e4d3285 100644 (file)
@@ -225,16 +225,9 @@ static const char *drm_crtc_fence_get_timeline_name(struct dma_fence *fence)
        return crtc->timeline_name;
 }
 
-static bool drm_crtc_fence_enable_signaling(struct dma_fence *fence)
-{
-       return true;
-}
-
 static const struct dma_fence_ops drm_crtc_fence_ops = {
        .get_driver_name = drm_crtc_fence_get_driver_name,
        .get_timeline_name = drm_crtc_fence_get_timeline_name,
-       .enable_signaling = drm_crtc_fence_enable_signaling,
-       .wait = dma_fence_default_wait,
 };
 
 struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc)
index d4f4ce4..adb3cb2 100644 (file)
@@ -207,7 +207,6 @@ static const struct dma_fence_ops drm_syncobj_null_fence_ops = {
        .get_driver_name = drm_syncobj_null_fence_get_name,
        .get_timeline_name = drm_syncobj_null_fence_get_name,
        .enable_signaling = drm_syncobj_null_fence_enable_signaling,
-       .wait = dma_fence_default_wait,
        .release = NULL,
 };
 
index 69aab08..4843289 100644 (file)
@@ -81,11 +81,6 @@ static const char *drm_sched_fence_get_timeline_name(struct dma_fence *f)
        return (const char *)fence->sched->name;
 }
 
-static bool drm_sched_fence_enable_signaling(struct dma_fence *f)
-{
-       return true;
-}
-
 /**
  * amd_sched_fence_free - free up the fence memory
  *
@@ -134,18 +129,12 @@ static void drm_sched_fence_release_finished(struct dma_fence *f)
 const struct dma_fence_ops drm_sched_fence_ops_scheduled = {
        .get_driver_name = drm_sched_fence_get_driver_name,
        .get_timeline_name = drm_sched_fence_get_timeline_name,
-       .enable_signaling = drm_sched_fence_enable_signaling,
-       .signaled = NULL,
-       .wait = dma_fence_default_wait,
        .release = drm_sched_fence_release_scheduled,
 };
 
 const struct dma_fence_ops drm_sched_fence_ops_finished = {
        .get_driver_name = drm_sched_fence_get_driver_name,
        .get_timeline_name = drm_sched_fence_get_timeline_name,
-       .enable_signaling = drm_sched_fence_enable_signaling,
-       .signaled = NULL,
-       .wait = dma_fence_default_wait,
        .release = drm_sched_fence_release_finished,
 };