| Message ID | 20180704092909.6599-5-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jul 04, 2018 at 11:29:08AM +0200, Daniel Vetter wrote: > dma_fence_default_wait is the default now, same for the trivial > enable_signaling implementation. > > Also remove the ->signaled callback, vgem can't peek ahead with a > fastpath, returning false is the default implementation. > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Kees Cook <keescook@chromium.org> > Cc: Cihangir Akturk <cakturk@gmail.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Anyone feel like reviewing patches 1-4 here? Thanks, Daniel > --- > drivers/gpu/drm/vgem/vgem_fence.c | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c > index b28876c222b4..75adedeaa384 100644 > --- a/drivers/gpu/drm/vgem/vgem_fence.c > +++ b/drivers/gpu/drm/vgem/vgem_fence.c > @@ -43,16 +43,6 @@ static const char *vgem_fence_get_timeline_name(struct dma_fence *fence) > return "unbound"; > } > > -static bool vgem_fence_signaled(struct dma_fence *fence) > -{ > - return false; > -} > - > -static bool vgem_fence_enable_signaling(struct dma_fence *fence) > -{ > - return true; > -} > - > static void vgem_fence_release(struct dma_fence *base) > { > struct vgem_fence *fence = container_of(base, typeof(*fence), base); > @@ -76,11 +66,7 @@ static void vgem_fence_timeline_value_str(struct dma_fence *fence, char *str, > static const struct dma_fence_ops vgem_fence_ops = { > .get_driver_name = vgem_fence_get_driver_name, > .get_timeline_name = vgem_fence_get_timeline_name, > - .enable_signaling = vgem_fence_enable_signaling, > - .signaled = vgem_fence_signaled, > - .wait = dma_fence_default_wait, > .release = vgem_fence_release, > - > .fence_value_str = vgem_fence_value_str, > .timeline_value_str = vgem_fence_timeline_value_str, > }; > -- > 2.18.0 >
Quoting Daniel Vetter (2018-08-09 09:33:49) > On Wed, Jul 04, 2018 at 11:29:08AM +0200, Daniel Vetter wrote: > > static void vgem_fence_release(struct dma_fence *base) > > { > > struct vgem_fence *fence = container_of(base, typeof(*fence), base); > > @@ -76,11 +66,7 @@ static void vgem_fence_timeline_value_str(struct dma_fence *fence, char *str, > > static const struct dma_fence_ops vgem_fence_ops = { > > .get_driver_name = vgem_fence_get_driver_name, > > .get_timeline_name = vgem_fence_get_timeline_name, > > - .enable_signaling = vgem_fence_enable_signaling, > > - .signaled = vgem_fence_signaled, > > - .wait = dma_fence_default_wait, > > .release = vgem_fence_release, > > - That space was to separate the interesting ops from the debug! -Chris > > .fence_value_str = vgem_fence_value_str, > > .timeline_value_str = vgem_fence_timeline_value_str, > > };
diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c index b28876c222b4..75adedeaa384 100644 --- a/drivers/gpu/drm/vgem/vgem_fence.c +++ b/drivers/gpu/drm/vgem/vgem_fence.c @@ -43,16 +43,6 @@ static const char *vgem_fence_get_timeline_name(struct dma_fence *fence) return "unbound"; } -static bool vgem_fence_signaled(struct dma_fence *fence) -{ - return false; -} - -static bool vgem_fence_enable_signaling(struct dma_fence *fence) -{ - return true; -} - static void vgem_fence_release(struct dma_fence *base) { struct vgem_fence *fence = container_of(base, typeof(*fence), base); @@ -76,11 +66,7 @@ static void vgem_fence_timeline_value_str(struct dma_fence *fence, char *str, static const struct dma_fence_ops vgem_fence_ops = { .get_driver_name = vgem_fence_get_driver_name, .get_timeline_name = vgem_fence_get_timeline_name, - .enable_signaling = vgem_fence_enable_signaling, - .signaled = vgem_fence_signaled, - .wait = dma_fence_default_wait, .release = vgem_fence_release, - .fence_value_str = vgem_fence_value_str, .timeline_value_str = vgem_fence_timeline_value_str, };
dma_fence_default_wait is the default now, same for the trivial enable_signaling implementation. Also remove the ->signaled callback, vgem can't peek ahead with a fastpath, returning false is the default implementation. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Kees Cook <keescook@chromium.org> Cc: Cihangir Akturk <cakturk@gmail.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/vgem/vgem_fence.c | 14 -------------- 1 file changed, 14 deletions(-)