forked from Minki/linux
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
153 lines
4.1 KiB
C
153 lines
4.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 <bskeggs@redhat.com>
|
|
*/
|
|
|
|
#include <nvif/os.h>
|
|
#include <nvif/class.h>
|
|
#include <nvif/cl0002.h>
|
|
|
|
#include "nouveau_drv.h"
|
|
#include "nouveau_dma.h"
|
|
#include "nv10_fence.h"
|
|
|
|
int
|
|
nv17_fence_sync(struct nouveau_fence *fence,
|
|
struct nouveau_channel *prev, struct nouveau_channel *chan)
|
|
{
|
|
struct nouveau_cli *cli = (void *)prev->user.client;
|
|
struct nv10_fence_priv *priv = chan->drm->fence;
|
|
struct nv10_fence_chan *fctx = chan->fence;
|
|
u32 value;
|
|
int ret;
|
|
|
|
if (!mutex_trylock(&cli->mutex))
|
|
return -EBUSY;
|
|
|
|
spin_lock(&priv->lock);
|
|
value = priv->sequence;
|
|
priv->sequence += 2;
|
|
spin_unlock(&priv->lock);
|
|
|
|
ret = RING_SPACE(prev, 5);
|
|
if (!ret) {
|
|
BEGIN_NV04(prev, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 4);
|
|
OUT_RING (prev, fctx->sema.handle);
|
|
OUT_RING (prev, 0);
|
|
OUT_RING (prev, value + 0);
|
|
OUT_RING (prev, value + 1);
|
|
FIRE_RING (prev);
|
|
}
|
|
|
|
if (!ret && !(ret = RING_SPACE(chan, 5))) {
|
|
BEGIN_NV04(chan, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 4);
|
|
OUT_RING (chan, fctx->sema.handle);
|
|
OUT_RING (chan, 0);
|
|
OUT_RING (chan, value + 1);
|
|
OUT_RING (chan, value + 2);
|
|
FIRE_RING (chan);
|
|
}
|
|
|
|
mutex_unlock(&cli->mutex);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
nv17_fence_context_new(struct nouveau_channel *chan)
|
|
{
|
|
struct nv10_fence_priv *priv = chan->drm->fence;
|
|
struct nv10_fence_chan *fctx;
|
|
struct ttm_mem_reg *mem = &priv->bo->bo.mem;
|
|
u32 start = mem->start * PAGE_SIZE;
|
|
u32 limit = start + mem->size - 1;
|
|
int ret = 0;
|
|
|
|
fctx = chan->fence = kzalloc(sizeof(*fctx), GFP_KERNEL);
|
|
if (!fctx)
|
|
return -ENOMEM;
|
|
|
|
nouveau_fence_context_new(chan, &fctx->base);
|
|
fctx->base.emit = nv10_fence_emit;
|
|
fctx->base.read = nv10_fence_read;
|
|
fctx->base.sync = nv17_fence_sync;
|
|
|
|
ret = nvif_object_init(&chan->user, NvSema, NV_DMA_FROM_MEMORY,
|
|
&(struct nv_dma_v0) {
|
|
.target = NV_DMA_V0_TARGET_VRAM,
|
|
.access = NV_DMA_V0_ACCESS_RDWR,
|
|
.start = start,
|
|
.limit = limit,
|
|
}, sizeof(struct nv_dma_v0),
|
|
&fctx->sema);
|
|
if (ret)
|
|
nv10_fence_context_del(chan);
|
|
return ret;
|
|
}
|
|
|
|
void
|
|
nv17_fence_resume(struct nouveau_drm *drm)
|
|
{
|
|
struct nv10_fence_priv *priv = drm->fence;
|
|
|
|
nouveau_bo_wr32(priv->bo, 0, priv->sequence);
|
|
}
|
|
|
|
int
|
|
nv17_fence_create(struct nouveau_drm *drm)
|
|
{
|
|
struct nv10_fence_priv *priv;
|
|
int ret = 0;
|
|
|
|
priv = drm->fence = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
priv->base.dtor = nv10_fence_destroy;
|
|
priv->base.resume = nv17_fence_resume;
|
|
priv->base.context_new = nv17_fence_context_new;
|
|
priv->base.context_del = nv10_fence_context_del;
|
|
priv->base.contexts = 31;
|
|
priv->base.context_base = dma_fence_context_alloc(priv->base.contexts);
|
|
spin_lock_init(&priv->lock);
|
|
|
|
ret = nouveau_bo_new(drm->dev, 4096, 0x1000, TTM_PL_FLAG_VRAM,
|
|
0, 0x0000, NULL, NULL, &priv->bo);
|
|
if (!ret) {
|
|
ret = nouveau_bo_pin(priv->bo, TTM_PL_FLAG_VRAM, false);
|
|
if (!ret) {
|
|
ret = nouveau_bo_map(priv->bo);
|
|
if (ret)
|
|
nouveau_bo_unpin(priv->bo);
|
|
}
|
|
if (ret)
|
|
nouveau_bo_ref(NULL, &priv->bo);
|
|
}
|
|
|
|
if (ret) {
|
|
nv10_fence_destroy(drm);
|
|
return ret;
|
|
}
|
|
|
|
nouveau_bo_wr32(priv->bo, 0x000, 0x00000000);
|
|
return ret;
|
|
}
|