mirror of
https://github.com/torvalds/linux.git
synced 2026-05-01 04:52:32 -04:00
drm/nouveau: create real execution engine for software object class
Just a cleanup more or less, and to remove the need for special handling of software objects. This removes a heap of documentation on dma/graph object formats. The info is very out of date with our current understanding, and is far better documented in rnndb in envytools git. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
153
drivers/gpu/drm/nouveau/nv04_software.c
Normal file
153
drivers/gpu/drm/nouveau/nv04_software.c
Normal file
@@ -0,0 +1,153 @@
|
||||
/*
|
||||
* 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 "drmP.h"
|
||||
#include "nouveau_drv.h"
|
||||
#include "nouveau_ramht.h"
|
||||
#include "nouveau_software.h"
|
||||
#include "nouveau_hw.h"
|
||||
|
||||
struct nv04_software_priv {
|
||||
struct nouveau_software_priv base;
|
||||
};
|
||||
|
||||
struct nv04_software_chan {
|
||||
struct nouveau_software_chan base;
|
||||
};
|
||||
|
||||
static int
|
||||
mthd_fence(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data)
|
||||
{
|
||||
atomic_set(&chan->fence.last_sequence_irq, data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
mthd_flip(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data)
|
||||
{
|
||||
|
||||
struct nouveau_page_flip_state state;
|
||||
|
||||
if (!nouveau_finish_page_flip(chan, &state)) {
|
||||
nv_set_crtc_base(chan->dev, state.crtc, state.offset +
|
||||
state.y * state.pitch +
|
||||
state.x * state.bpp / 8);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
nv04_software_context_new(struct nouveau_channel *chan, int engine)
|
||||
{
|
||||
struct nv04_software_chan *pch;
|
||||
|
||||
pch = kzalloc(sizeof(*pch), GFP_KERNEL);
|
||||
if (!pch)
|
||||
return -ENOMEM;
|
||||
|
||||
nouveau_software_context_new(&pch->base);
|
||||
atomic_set(&chan->fence.last_sequence_irq, 0);
|
||||
chan->engctx[engine] = pch;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
nv04_software_context_del(struct nouveau_channel *chan, int engine)
|
||||
{
|
||||
struct nv04_software_chan *pch = chan->engctx[engine];
|
||||
chan->engctx[engine] = NULL;
|
||||
kfree(pch);
|
||||
}
|
||||
|
||||
static int
|
||||
nv04_software_object_new(struct nouveau_channel *chan, int engine,
|
||||
u32 handle, u16 class)
|
||||
{
|
||||
struct drm_device *dev = chan->dev;
|
||||
struct nouveau_gpuobj *obj = NULL;
|
||||
int ret;
|
||||
|
||||
ret = nouveau_gpuobj_new(dev, chan, 16, 16, 0, &obj);
|
||||
if (ret)
|
||||
return ret;
|
||||
obj->engine = 0;
|
||||
obj->class = class;
|
||||
|
||||
ret = nouveau_ramht_insert(chan, handle, obj);
|
||||
nouveau_gpuobj_ref(NULL, &obj);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
nv04_software_init(struct drm_device *dev, int engine)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
nv04_software_fini(struct drm_device *dev, int engine, bool suspend)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
nv04_software_destroy(struct drm_device *dev, int engine)
|
||||
{
|
||||
struct nv04_software_priv *psw = nv_engine(dev, engine);
|
||||
|
||||
NVOBJ_ENGINE_DEL(dev, SW);
|
||||
kfree(psw);
|
||||
}
|
||||
|
||||
int
|
||||
nv04_software_create(struct drm_device *dev)
|
||||
{
|
||||
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
||||
struct nv04_software_priv *psw;
|
||||
|
||||
psw = kzalloc(sizeof(*psw), GFP_KERNEL);
|
||||
if (!psw)
|
||||
return -ENOMEM;
|
||||
|
||||
psw->base.base.destroy = nv04_software_destroy;
|
||||
psw->base.base.init = nv04_software_init;
|
||||
psw->base.base.fini = nv04_software_fini;
|
||||
psw->base.base.context_new = nv04_software_context_new;
|
||||
psw->base.base.context_del = nv04_software_context_del;
|
||||
psw->base.base.object_new = nv04_software_object_new;
|
||||
nouveau_software_create(&psw->base);
|
||||
|
||||
NVOBJ_ENGINE_ADD(dev, SW, &psw->base.base);
|
||||
if (dev_priv->card_type <= NV_04) {
|
||||
NVOBJ_CLASS(dev, 0x006e, SW);
|
||||
NVOBJ_MTHD (dev, 0x006e, 0x0150, mthd_fence);
|
||||
NVOBJ_MTHD (dev, 0x006e, 0x0500, mthd_flip);
|
||||
} else {
|
||||
NVOBJ_CLASS(dev, 0x016e, SW);
|
||||
NVOBJ_MTHD (dev, 0x016e, 0x0500, mthd_flip);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user