mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 17:41:29 +00:00
ebb945a94b
This is a HUGE commit, but it's not nearly as bad as it looks - any problems can be isolated to a particular chipset and engine combination. It was simply too difficult to port each one at a time, the compat layers are *already* ridiculous. Most of the changes here are simply to the glue, the process for each of the engine modules was to start with a standard skeleton and copy+paste the old code into the appropriate places, fixing up variable names etc as needed. v2: Marcin Slusarz <marcin.slusarz@gmail.com> - fix find/replace bug in license header v3: Ben Skeggs <bskeggs@redhat.com> - bump indirect pushbuf size to 8KiB, 4KiB barely enough for userspace and left no space for kernel's requirements during GEM pushbuf submission. - fix duplicate assignments noticed by clang v4: Marcin Slusarz <marcin.slusarz@gmail.com> - add sparse annotations to nv04_fifo_pause/nv04_fifo_start - use ioread32_native/iowrite32_native for fifo control registers v5: Ben Skeggs <bskeggs@redhat.com> - rebase on v3.6-rc4, modified to keep copy engine fix intact - nv10/fence: unmap fence bo before destroying - fixed fermi regression when using nvidia gr fuc - fixed typo in supported dma_mask checking Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
112 lines
2.9 KiB
C
112 lines
2.9 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 <engine/fifo.h>
|
|
|
|
#include "nouveau_drm.h"
|
|
#include "nouveau_dma.h"
|
|
#include "nouveau_fence.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->sequence);
|
|
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 nouveau_fifo_chan *fifo = (void *)chan->object;
|
|
return atomic_read(&fifo->refcnt);
|
|
}
|
|
|
|
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;
|
|
kfree(fctx);
|
|
}
|
|
|
|
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(&fctx->base);
|
|
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.emit = nv04_fence_emit;
|
|
priv->base.sync = nv04_fence_sync;
|
|
priv->base.read = nv04_fence_read;
|
|
return 0;
|
|
}
|