Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 371599
b: refs/heads/master
c: f50c805
h: refs/heads/master
i:
  371597: fcb0bee
  371595: 621c3fb
  371591: 4d7b40f
  371583: af447ba
v: v3
  • Loading branch information
Ben Skeggs committed Apr 26, 2013
1 parent b7ba952 commit a6df0ed
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a3e6789a54362c24d929e2741bde8c8c4ac7a9c9
refs/heads/master: f50c805488ed7d937da51a29a37b0327bd116ee0
18 changes: 10 additions & 8 deletions trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
nv_parent(chan)->object_attach = nv50_fifo_object_attach;
nv_parent(chan)->object_detach = nv50_fifo_object_detach;

ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
&chan->ramht);
if (ret)
return ret;

Expand Down Expand Up @@ -263,7 +264,8 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
nv_parent(chan)->object_attach = nv50_fifo_object_attach;
nv_parent(chan)->object_detach = nv50_fifo_object_detach;

ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
&chan->ramht);
if (ret)
return ret;

Expand Down Expand Up @@ -373,17 +375,17 @@ nv50_fifo_context_ctor(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x0200, 0x1000,
NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0200,
0x1000, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x1200, 0,
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x1200, 0,
NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x4000, 0, 0,
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0, 0,
&base->pgd);
if (ret)
return ret;
Expand Down Expand Up @@ -437,12 +439,12 @@ nv50_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
&priv->playlist[0]);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
&priv->playlist[1]);
if (ret)
return ret;
Expand Down
22 changes: 12 additions & 10 deletions trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ nv84_fifo_chan_ctor_dma(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
&chan->ramht);
if (ret)
return ret;

Expand Down Expand Up @@ -242,7 +243,8 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
&chan->ramht);
if (ret)
return ret;

Expand Down Expand Up @@ -336,12 +338,12 @@ nv84_fifo_context_ctor(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x0200, 0,
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0200, 0,
NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x4000, 0,
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0,
0, &base->pgd);
if (ret)
return ret;
Expand All @@ -350,13 +352,13 @@ nv84_fifo_context_ctor(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x1000, 0x400,
NVOBJ_FLAG_ZERO_ALLOC, &base->cache);
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x1000,
0x400, NVOBJ_FLAG_ZERO_ALLOC, &base->cache);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, nv_object(base), 0x0100, 0x100,
NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0100,
0x100, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
if (ret)
return ret;

Expand Down Expand Up @@ -407,12 +409,12 @@ nv84_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
&priv->playlist[0]);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
&priv->playlist[1]);
if (ret)
return ret;
Expand Down
9 changes: 5 additions & 4 deletions trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,8 @@ nvc0_fifo_context_ctor(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 0x10000, 0x1000, 0, &base->pgd);
ret = nouveau_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
&base->pgd);
if (ret)
return ret;

Expand Down Expand Up @@ -623,17 +624,17 @@ nvc0_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
&priv->playlist[0]);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
&priv->playlist[1]);
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 128 * 0x1000, 0x1000, 0,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 0x1000, 0x1000, 0,
&priv->user.mem);
if (ret)
return ret;
Expand Down
7 changes: 4 additions & 3 deletions trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ nve0_fifo_playlist_update(struct nve0_fifo_priv *priv, u32 engine)

cur = engn->playlist[engn->cur_playlist];
if (unlikely(cur == NULL)) {
int ret = nouveau_gpuobj_new(nv_object(priv)->parent, NULL,
int ret = nouveau_gpuobj_new(nv_object(priv), NULL,
0x8000, 0x1000, 0, &cur);
if (ret) {
nv_error(priv, "playlist alloc failed\n");
Expand Down Expand Up @@ -333,7 +333,8 @@ nve0_fifo_context_ctor(struct nouveau_object *parent,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 0x10000, 0x1000, 0, &base->pgd);
ret = nouveau_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
&base->pgd);
if (ret)
return ret;

Expand Down Expand Up @@ -595,7 +596,7 @@ nve0_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if (ret)
return ret;

ret = nouveau_gpuobj_new(parent, NULL, 4096 * 0x200, 0x1000,
ret = nouveau_gpuobj_new(nv_object(priv), NULL, 4096 * 0x200, 0x1000,
NVOBJ_FLAG_ZERO_ALLOC, &priv->user.mem);
if (ret)
return ret;
Expand Down

0 comments on commit a6df0ed

Please sign in to comment.