2013/1/16 Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>: > Op 16-01-13 07:28, Inki Dae schreef: >> 2013/1/15 Maarten Lankhorst <m.b.lankhorst@xxxxxxxxx>: >>> This type of fence can be used with hardware synchronization for simple >>> hardware that can block execution until the condition >>> (dma_buf[offset] - value) >= 0 has been met. >>> >>> A software fallback still has to be provided in case the fence is used >>> with a device that doesn't support this mechanism. It is useful to expose >>> this for graphics cards that have an op to support this. >>> >>> Some cards like i915 can export those, but don't have an option to wait, >>> so they need the software fallback. >>> >>> I extended the original patch by Rob Clark. >>> >>> v1: Original >>> v2: Renamed from bikeshed to seqno, moved into dma-fence.c since >>> not much was left of the file. Lots of documentation added. >>> v3: Use fence_ops instead of custom callbacks. Moved to own file >>> to avoid circular dependency between dma-buf.h and fence.h >>> v4: Add spinlock pointer to seqno_fence_init >>> >>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx> >>> --- >>> Documentation/DocBook/device-drivers.tmpl | 1 + >>> drivers/base/fence.c | 38 +++++++++++ >>> include/linux/seqno-fence.h | 105 ++++++++++++++++++++++++++++++ >>> 3 files changed, 144 insertions(+) >>> create mode 100644 include/linux/seqno-fence.h >>> >>> diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl >>> index 6f53fc0..ad14396 100644 >>> --- a/Documentation/DocBook/device-drivers.tmpl >>> +++ b/Documentation/DocBook/device-drivers.tmpl >>> @@ -128,6 +128,7 @@ X!Edrivers/base/interface.c >>> !Edrivers/base/dma-buf.c >>> !Edrivers/base/fence.c >>> !Iinclude/linux/fence.h >>> +!Iinclude/linux/seqno-fence.h >>> !Edrivers/base/dma-coherent.c >>> !Edrivers/base/dma-mapping.c >>> </sect1> >>> diff --git a/drivers/base/fence.c b/drivers/base/fence.c >>> index 28e5ffd..1d3f29c 100644 >>> --- a/drivers/base/fence.c >>> +++ b/drivers/base/fence.c >>> @@ -24,6 +24,7 @@ >>> #include <linux/slab.h> >>> #include <linux/export.h> >>> #include <linux/fence.h> >>> +#include <linux/seqno-fence.h> >>> >>> atomic_t fence_context_counter = ATOMIC_INIT(0); >>> EXPORT_SYMBOL(fence_context_counter); >>> @@ -284,3 +285,40 @@ out: >>> return ret; >>> } >>> EXPORT_SYMBOL(fence_default_wait); >>> + >>> +static bool seqno_enable_signaling(struct fence *fence) >>> +{ >>> + struct seqno_fence *seqno_fence = to_seqno_fence(fence); >>> + return seqno_fence->ops->enable_signaling(fence); >>> +} >>> + >>> +static bool seqno_signaled(struct fence *fence) >>> +{ >>> + struct seqno_fence *seqno_fence = to_seqno_fence(fence); >>> + return seqno_fence->ops->signaled && seqno_fence->ops->signaled(fence); >>> +} >>> + >>> +static void seqno_release(struct fence *fence) >>> +{ >>> + struct seqno_fence *f = to_seqno_fence(fence); >>> + >>> + dma_buf_put(f->sync_buf); >>> + if (f->ops->release) >>> + f->ops->release(fence); >>> + else >>> + kfree(f); >>> +} >>> + >>> +static long seqno_wait(struct fence *fence, bool intr, signed long timeout) >>> +{ >>> + struct seqno_fence *f = to_seqno_fence(fence); >>> + return f->ops->wait(fence, intr, timeout); >>> +} >>> + >>> +const struct fence_ops seqno_fence_ops = { >>> + .enable_signaling = seqno_enable_signaling, >>> + .signaled = seqno_signaled, >>> + .wait = seqno_wait, >>> + .release = seqno_release >>> +}; >>> +EXPORT_SYMBOL_GPL(seqno_fence_ops); >>> diff --git a/include/linux/seqno-fence.h b/include/linux/seqno-fence.h >>> new file mode 100644 >>> index 0000000..603adc0 >>> --- /dev/null >>> +++ b/include/linux/seqno-fence.h >>> @@ -0,0 +1,105 @@ >>> +/* >>> + * seqno-fence, using a dma-buf to synchronize fencing >>> + * >>> + * Copyright (C) 2012 Texas Instruments >>> + * Copyright (C) 2012 Canonical Ltd >>> + * Authors: >>> + * Rob Clark <rob.clark@xxxxxxxxxx> >>> + * Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx> >>> + * >>> + * This program is free software; you can redistribute it and/or modify it >>> + * under the terms of the GNU General Public License version 2 as published by >>> + * the Free Software Foundation. >>> + * >>> + * This program is distributed in the hope that it will be useful, but WITHOUT >>> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or >>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for >>> + * more details. >>> + * >>> + * You should have received a copy of the GNU General Public License along with >>> + * this program. If not, see <http://www.gnu.org/licenses/>. >>> + */ >>> + >>> +#ifndef __LINUX_SEQNO_FENCE_H >>> +#define __LINUX_SEQNO_FENCE_H >>> + >>> +#include <linux/fence.h> >>> +#include <linux/dma-buf.h> >>> + >>> +struct seqno_fence { >>> + struct fence base; >>> + >>> + const struct fence_ops *ops; >>> + struct dma_buf *sync_buf; >>> + uint32_t seqno_ofs; >>> +}; >> Hi maarten, >> >> I'm applying dma-fence v11 and seqno-fence v4 to exynos drm and have >> some proposals. >> >> The above seqno_fence structure has only one dmabuf. Shouldn't it have >> mutiple dmabufs? For example, in case of drm driver, when pageflip is >> requested, one framebuffer could have one more gem buffer for NV12M >> format. And this means that one more exported dmabufs should be >> sychronized with other devices. Below is simple structure for it, > The fence guards a single operation, as such I didn't feel like more than one > dma-buf was needed to guard it. > > Have you considered simply attaching multiple fences instead? Each with their own dma-buf. > There has been some muttering about allowing multiple exclusive fences to be attached, for arm soc's. > > But I'm also considering getting rid of the dma-buf member and add a function call to retrieve it, since > the sync dma-buf member should not be changing often, and it would zap 2 atomic ops on every fence, > but I want it replaced by something that's not 10x more complicated. > > Maybe "int get_sync_dma_buf(fence, old_dma_buf, &new_dma_buf)" that will set new_dma_buf = NULL > if the old_dma_buf is unchanged, and return true + return a new reference to the sync dma_buf if it's not identical to old_dma_buf. > old_dma_buf can also be NULL or a dma_buf that belongs to a different fence->context entirely. It might be capable of > returning an error, in which case the fence would count as being signaled. This could reduce the need for separately checking > fence_is_signaled first. > > I think this would allow caching the synchronization dma_buf in a similar way without each fence needing > to hold a reference to the dma_buf all the time, even for fences that are only used internally. > >> struct seqno_fence_dmabuf { >> struct list_head list; >> int id; >> struct dmabuf *sync_buf; >> uint32_t seqno_ops; >> uint32_t seqno; >> }; >> >> The member, id, could be used to identify which device sync_buf is >> going to be accessed by. In case of drm driver, one framebuffer could >> be accessed by one more devices, one is Display controller and another >> is HDMI controller. So id would have crtc number. > Why do you need this? the base fence already has a context member. > There was my missing point. Please ignore 'id'. If the fence relevant things are contained in each context(in case of drm page flip, a event), each driver could call fence_signal() with proper fence. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html