mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 18:13:04 +00:00
f54d186700
I plan to usurp the short name of struct fence for a core kernel struct, and so I need to rename the specialised fence/timeline for DMA operations to make room. A consensus was reached in https://lists.freedesktop.org/archives/dri-devel/2016-July/113083.html that making clear this fence applies to DMA operations was a good thing. Since then the patch has grown a bit as usage increases, so hopefully it remains a good thing! (v2...: rebase, rerun spatch) v3: Compile on msm, spotted a manual fixup that I broke. v4: Try again for msm, sorry Daniel coccinelle script: @@ @@ - struct fence + struct dma_fence @@ @@ - struct fence_ops + struct dma_fence_ops @@ @@ - struct fence_cb + struct dma_fence_cb @@ @@ - struct fence_array + struct dma_fence_array @@ @@ - enum fence_flag_bits + enum dma_fence_flag_bits @@ @@ ( - fence_init + dma_fence_init | - fence_release + dma_fence_release | - fence_free + dma_fence_free | - fence_get + dma_fence_get | - fence_get_rcu + dma_fence_get_rcu | - fence_put + dma_fence_put | - fence_signal + dma_fence_signal | - fence_signal_locked + dma_fence_signal_locked | - fence_default_wait + dma_fence_default_wait | - fence_add_callback + dma_fence_add_callback | - fence_remove_callback + dma_fence_remove_callback | - fence_enable_sw_signaling + dma_fence_enable_sw_signaling | - fence_is_signaled_locked + dma_fence_is_signaled_locked | - fence_is_signaled + dma_fence_is_signaled | - fence_is_later + dma_fence_is_later | - fence_later + dma_fence_later | - fence_wait_timeout + dma_fence_wait_timeout | - fence_wait_any_timeout + dma_fence_wait_any_timeout | - fence_wait + dma_fence_wait | - fence_context_alloc + dma_fence_context_alloc | - fence_array_create + dma_fence_array_create | - to_fence_array + to_dma_fence_array | - fence_is_array + dma_fence_is_array | - trace_fence_emit + trace_dma_fence_emit | - FENCE_TRACE + DMA_FENCE_TRACE | - FENCE_WARN + DMA_FENCE_WARN | - FENCE_ERR + DMA_FENCE_ERR ) ( ... ) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161025120045.28839-1-chris@chris-wilson.co.uk
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/*
|
|
* Copyright 2012 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Ben Skeggs
|
|
*/
|
|
|
|
#include "nouveau_drv.h"
|
|
#include "nouveau_dma.h"
|
|
#include "nouveau_fence.h"
|
|
|
|
#include <nvif/if0004.h>
|
|
|
|
struct nv04_fence_chan {
|
|
struct nouveau_fence_chan base;
|
|
};
|
|
|
|
struct nv04_fence_priv {
|
|
struct nouveau_fence_priv base;
|
|
};
|
|
|
|
static int
|
|
nv04_fence_emit(struct nouveau_fence *fence)
|
|
{
|
|
struct nouveau_channel *chan = fence->channel;
|
|
int ret = RING_SPACE(chan, 2);
|
|
if (ret == 0) {
|
|
BEGIN_NV04(chan, NvSubSw, 0x0150, 1);
|
|
OUT_RING (chan, fence->base.seqno);
|
|
FIRE_RING (chan);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
nv04_fence_sync(struct nouveau_fence *fence,
|
|
struct nouveau_channel *prev, struct nouveau_channel *chan)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static u32
|
|
nv04_fence_read(struct nouveau_channel *chan)
|
|
{
|
|
struct nv04_nvsw_get_ref_v0 args = {};
|
|
WARN_ON(nvif_object_mthd(&chan->nvsw, NV04_NVSW_GET_REF,
|
|
&args, sizeof(args)));
|
|
return args.ref;
|
|
}
|
|
|
|
static void
|
|
nv04_fence_context_del(struct nouveau_channel *chan)
|
|
{
|
|
struct nv04_fence_chan *fctx = chan->fence;
|
|
nouveau_fence_context_del(&fctx->base);
|
|
chan->fence = NULL;
|
|
nouveau_fence_context_free(&fctx->base);
|
|
}
|
|
|
|
static int
|
|
nv04_fence_context_new(struct nouveau_channel *chan)
|
|
{
|
|
struct nv04_fence_chan *fctx = kzalloc(sizeof(*fctx), GFP_KERNEL);
|
|
if (fctx) {
|
|
nouveau_fence_context_new(chan, &fctx->base);
|
|
fctx->base.emit = nv04_fence_emit;
|
|
fctx->base.sync = nv04_fence_sync;
|
|
fctx->base.read = nv04_fence_read;
|
|
chan->fence = fctx;
|
|
return 0;
|
|
}
|
|
return -ENOMEM;
|
|
}
|
|
|
|
static void
|
|
nv04_fence_destroy(struct nouveau_drm *drm)
|
|
{
|
|
struct nv04_fence_priv *priv = drm->fence;
|
|
drm->fence = NULL;
|
|
kfree(priv);
|
|
}
|
|
|
|
int
|
|
nv04_fence_create(struct nouveau_drm *drm)
|
|
{
|
|
struct nv04_fence_priv *priv;
|
|
|
|
priv = drm->fence = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
priv->base.dtor = nv04_fence_destroy;
|
|
priv->base.context_new = nv04_fence_context_new;
|
|
priv->base.context_del = nv04_fence_context_del;
|
|
priv->base.contexts = 15;
|
|
priv->base.context_base = dma_fence_context_alloc(priv->base.contexts);
|
|
return 0;
|
|
}
|