summaryrefslogtreecommitdiff
path: root/src/nvc0_accel.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-04-17 09:30:49 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-04-17 11:28:07 +1000
commitec019b3a50475b7ff1b5e0a5dbe14e5ef677bd9e (patch)
tree69b9d11c5b8c43025b077784f6d4a62626d58c38 /src/nvc0_accel.c
parentfb3a36b1e5af0f81bb266da894d3442eed8e4e55 (diff)
Keep a single buffer for random accel data, rather than 3 different ones
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'src/nvc0_accel.c')
-rw-r--r--src/nvc0_accel.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c
index ad34554..d0f6770 100644
--- a/src/nvc0_accel.c
+++ b/src/nvc0_accel.c
@@ -32,11 +32,6 @@ NVAccelInitM2MF_NVC0(ScrnInfoPtr pScrn)
struct nouveau_pushbuf *push = pNv->pushbuf;
int ret;
- ret = nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM, 128 * 1024, 0x20000,
- NULL, &pNv->tesla_scratch);
- if (ret)
- return FALSE;
-
ret = nouveau_object_new(pNv->channel, 0x00009039, 0x9039,
NULL, 0, &pNv->NvMemFormat);
if (ret)
@@ -45,8 +40,8 @@ NVAccelInitM2MF_NVC0(ScrnInfoPtr pScrn)
BEGIN_NVC0(push, NV01_SUBC(M2MF, OBJECT), 1);
PUSH_DATA (push, pNv->NvMemFormat->handle);
BEGIN_NVC0(push, NVC0_M2MF(QUERY_ADDRESS_HIGH), 3);
- PUSH_DATA (push, (pNv->tesla_scratch->offset + NTFY_OFFSET) >> 32);
- PUSH_DATA (push, (pNv->tesla_scratch->offset + NTFY_OFFSET));
+ PUSH_DATA (push, (pNv->scratch->offset + NTFY_OFFSET) >> 32);
+ PUSH_DATA (push, (pNv->scratch->offset + NTFY_OFFSET));
PUSH_DATA (push, 0);
return TRUE;
@@ -59,11 +54,6 @@ NVAccelInitP2MF_NVE0(ScrnInfoPtr pScrn)
struct nouveau_pushbuf *push = pNv->pushbuf;
int ret;
- ret = nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM, 128 * 1024, 0x20000,
- NULL, &pNv->tesla_scratch);
- if (ret)
- return FALSE;
-
ret = nouveau_object_new(pNv->channel, 0x0000a040, 0xa040,
NULL, 0, &pNv->NvMemFormat);
if (ret)
@@ -128,7 +118,7 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
{
NVPtr pNv = NVPTR(pScrn);
struct nouveau_pushbuf *push = pNv->pushbuf;
- struct nouveau_bo *bo = pNv->tesla_scratch;
+ struct nouveau_bo *bo = pNv->scratch;
uint32_t class;
int ret;
@@ -144,7 +134,7 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
if (nouveau_pushbuf_space(push, 512, 0, 0) ||
nouveau_pushbuf_refn (push, &(struct nouveau_pushbuf_refn) {
- pNv->tesla_scratch, NOUVEAU_BO_VRAM |
+ pNv->scratch, NOUVEAU_BO_VRAM |
NOUVEAU_BO_WR }, 1))
return FALSE;
@@ -153,8 +143,8 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
BEGIN_NVC0(push, NVC0_3D(COND_MODE), 1);
PUSH_DATA (push, NVC0_3D_COND_MODE_ALWAYS);
BEGIN_NVC0(push, SUBC_3D(NVC0_GRAPH_NOTIFY_ADDRESS_HIGH), 3);
- PUSH_DATA (push, (pNv->tesla_scratch->offset + NTFY_OFFSET) >> 32);
- PUSH_DATA (push, (pNv->tesla_scratch->offset + NTFY_OFFSET));
+ PUSH_DATA (push, (pNv->scratch->offset + NTFY_OFFSET) >> 32);
+ PUSH_DATA (push, (pNv->scratch->offset + NTFY_OFFSET));
PUSH_DATA (push, 0);
BEGIN_NVC0(push, NVC0_3D(CSAA_ENABLE), 1);
PUSH_DATA (push, 0);