Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 218171
b: refs/heads/master
c: 43efc9c
h: refs/heads/master
i:
  218169: 3cdb323
  218167: 9cf7115
v: v3
  • Loading branch information
Ben Skeggs committed Sep 24, 2010
1 parent 31d8858 commit 9398dfc
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 87 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: a8eaebc6c52bb0cd243b4cb421068f42d378be9c
refs/heads/master: 43efc9ce25c6956133c07394a6fa44ef2c9268a4
8 changes: 3 additions & 5 deletions trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,19 @@ enum nouveau_flags {

#define NVOBJ_FLAG_ZERO_ALLOC (1 << 1)
#define NVOBJ_FLAG_ZERO_FREE (1 << 2)
#define NVOBJ_FLAG_FAKE (1 << 3)
struct nouveau_gpuobj {
struct drm_device *dev;
struct list_head list;

struct drm_mm_node *im_pramin;
struct nouveau_bo *im_backing;
uint32_t im_backing_start;
uint32_t *im_backing_suspend;
int im_bound;

uint32_t flags;
int refcount;

u32 size;
u32 pinst;
u32 cinst;
u64 vinst;
Expand Down Expand Up @@ -753,9 +752,8 @@ extern int nouveau_gpuobj_new(struct drm_device *, struct nouveau_channel *,
struct nouveau_gpuobj **);
extern void nouveau_gpuobj_ref(struct nouveau_gpuobj *,
struct nouveau_gpuobj **);
extern int nouveau_gpuobj_new_fake(struct drm_device *,
uint32_t p_offset, uint32_t b_offset,
uint32_t size, uint32_t flags,
extern int nouveau_gpuobj_new_fake(struct drm_device *, u32 pinst, u64 vinst,
u32 size, u32 flags,
struct nouveau_gpuobj **);
extern int nouveau_gpuobj_dma_new(struct nouveau_channel *, int class,
uint64_t offset, uint64_t size, int access,
Expand Down
70 changes: 23 additions & 47 deletions trunk/drivers/gpu/drm/nouveau/nouveau_object.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
gpuobj->dev = dev;
gpuobj->flags = flags;
gpuobj->refcount = 1;
gpuobj->size = size;

list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);

Expand Down Expand Up @@ -133,25 +134,23 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,

/* calculate the various different addresses for the object */
if (chan) {
gpuobj->pinst = gpuobj->im_pramin->start +
chan->ramin->im_pramin->start;
gpuobj->pinst = gpuobj->im_pramin->start + chan->ramin->pinst;
if (dev_priv->card_type < NV_50) {
gpuobj->cinst = gpuobj->pinst;
} else {
gpuobj->cinst = gpuobj->im_pramin->start;
gpuobj->vinst = gpuobj->im_pramin->start +
chan->ramin->im_backing_start;
chan->ramin->vinst;
}
} else {
gpuobj->pinst = gpuobj->im_pramin->start;
gpuobj->cinst = 0xdeadbeef;
gpuobj->vinst = gpuobj->im_backing_start;
}

if (gpuobj->flags & NVOBJ_FLAG_ZERO_ALLOC) {
int i;

for (i = 0; i < gpuobj->im_pramin->size; i += 4)
for (i = 0; i < gpuobj->size; i += 4)
nv_wo32(gpuobj, i, 0);
engine->instmem.flush(dev);
}
Expand Down Expand Up @@ -237,23 +236,19 @@ nouveau_gpuobj_del(struct nouveau_gpuobj *gpuobj)
NV_DEBUG(dev, "gpuobj %p\n", gpuobj);

if (gpuobj->im_pramin && (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE)) {
for (i = 0; i < gpuobj->im_pramin->size; i += 4)
for (i = 0; i < gpuobj->size; i += 4)
nv_wo32(gpuobj, i, 0);
engine->instmem.flush(dev);
}

if (gpuobj->dtor)
gpuobj->dtor(dev, gpuobj);

if (gpuobj->im_backing && !(gpuobj->flags & NVOBJ_FLAG_FAKE))
if (gpuobj->im_backing)
engine->instmem.clear(dev, gpuobj);

if (gpuobj->im_pramin) {
if (gpuobj->flags & NVOBJ_FLAG_FAKE)
kfree(gpuobj->im_pramin);
else
drm_mm_put_block(gpuobj->im_pramin);
}
if (gpuobj->im_pramin)
drm_mm_put_block(gpuobj->im_pramin);

list_del(&gpuobj->list);

Expand All @@ -274,56 +269,37 @@ nouveau_gpuobj_ref(struct nouveau_gpuobj *ref, struct nouveau_gpuobj **ptr)
}

int
nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
uint32_t b_offset, uint32_t size,
uint32_t flags, struct nouveau_gpuobj **pgpuobj)
nouveau_gpuobj_new_fake(struct drm_device *dev, u32 pinst, u64 vinst,
u32 size, u32 flags, struct nouveau_gpuobj **pgpuobj)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_gpuobj *gpuobj = NULL;
int i;

NV_DEBUG(dev,
"p_offset=0x%08x b_offset=0x%08x size=0x%08x flags=0x%08x\n",
p_offset, b_offset, size, flags);
"pinst=0x%08x vinst=0x%010llx size=0x%08x flags=0x%08x\n",
pinst, vinst, size, flags);

gpuobj = kzalloc(sizeof(*gpuobj), GFP_KERNEL);
if (!gpuobj)
return -ENOMEM;
NV_DEBUG(dev, "gpuobj %p\n", gpuobj);
gpuobj->dev = dev;
gpuobj->flags = flags | NVOBJ_FLAG_FAKE;
gpuobj->flags = flags;
gpuobj->refcount = 1;

list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);

if (p_offset != ~0) {
gpuobj->im_pramin = kzalloc(sizeof(struct drm_mm_node),
GFP_KERNEL);
if (!gpuobj->im_pramin) {
nouveau_gpuobj_ref(NULL, &gpuobj);
return -ENOMEM;
}
gpuobj->im_pramin->start = p_offset;
gpuobj->im_pramin->size = size;
}

if (b_offset != ~0) {
gpuobj->im_backing = (struct nouveau_bo *)-1;
gpuobj->im_backing_start = b_offset;
}

gpuobj->pinst = gpuobj->im_pramin->start;
gpuobj->size = size;
gpuobj->pinst = pinst;
gpuobj->cinst = 0xdeadbeef;
gpuobj->vinst = gpuobj->im_backing_start;
gpuobj->vinst = vinst;

if (gpuobj->flags & NVOBJ_FLAG_ZERO_ALLOC) {
for (i = 0; i < gpuobj->im_pramin->size; i += 4)
for (i = 0; i < gpuobj->size; i += 4)
nv_wo32(gpuobj, i, 0);
dev_priv->engine.instmem.flush(dev);
}

if (pgpuobj)
*pgpuobj = gpuobj;
list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);
*pgpuobj = gpuobj;
return 0;
}

Expand Down Expand Up @@ -830,16 +806,16 @@ nouveau_gpuobj_suspend(struct drm_device *dev)
}

list_for_each_entry(gpuobj, &dev_priv->gpuobj_list, list) {
if (!gpuobj->im_backing || (gpuobj->flags & NVOBJ_FLAG_FAKE))
if (!gpuobj->im_backing)
continue;

gpuobj->im_backing_suspend = vmalloc(gpuobj->im_pramin->size);
gpuobj->im_backing_suspend = vmalloc(gpuobj->size);
if (!gpuobj->im_backing_suspend) {
nouveau_gpuobj_resume(dev);
return -ENOMEM;
}

for (i = 0; i < gpuobj->im_pramin->size; i += 4)
for (i = 0; i < gpuobj->size; i += 4)
gpuobj->im_backing_suspend[i/4] = nv_ro32(gpuobj, i);
}

Expand Down Expand Up @@ -885,7 +861,7 @@ nouveau_gpuobj_resume(struct drm_device *dev)
if (!gpuobj->im_backing_suspend)
continue;

for (i = 0; i < gpuobj->im_pramin->size; i += 4)
for (i = 0; i < gpuobj->size; i += 4)
nv_wo32(gpuobj, i, gpuobj->im_backing_suspend[i/4]);
dev_priv->engine.instmem.flush(dev);
}
Expand Down
21 changes: 2 additions & 19 deletions trunk/drivers/gpu/drm/nouveau/nv04_instmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,43 +143,26 @@ nv04_instmem_takedown(struct drm_device *dev)
}

int
nv04_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
nv04_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj,
uint32_t *sz)
{
if (gpuobj->im_backing)
return -EINVAL;

return 0;
}

void
nv04_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;

if (gpuobj && gpuobj->im_backing) {
if (gpuobj->im_bound)
dev_priv->engine.instmem.unbind(dev, gpuobj);
gpuobj->im_backing = NULL;
}
}

int
nv04_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{
if (!gpuobj->im_pramin || gpuobj->im_bound)
return -EINVAL;

gpuobj->im_bound = 1;
return 0;
}

int
nv04_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{
if (gpuobj->im_bound == 0)
return -EINVAL;

gpuobj->im_bound = 0;
return 0;
}

Expand Down
19 changes: 8 additions & 11 deletions trunk/drivers/gpu/drm/nouveau/nv50_instmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ nv50_instmem_init(struct drm_device *dev)
/*XXX: double-check this is ok */
dev_priv->vm_vram_pt[i] = chan->vm_vram_pt[i];

for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size;
v += 4)
for (v = 0; v < dev_priv->vm_vram_pt[i]->size; v += 4)
BAR0_WI32(dev_priv->vm_vram_pt[i], v, 0);

BAR0_WI32(chan->vm_pd, 0x10 + (i*8),
Expand Down Expand Up @@ -322,11 +321,11 @@ nv50_instmem_suspend(struct drm_device *dev)
struct nouveau_gpuobj *ramin = chan->ramin;
int i;

ramin->im_backing_suspend = vmalloc(ramin->im_pramin->size);
ramin->im_backing_suspend = vmalloc(ramin->size);
if (!ramin->im_backing_suspend)
return -ENOMEM;

for (i = 0; i < ramin->im_pramin->size; i += 4)
for (i = 0; i < ramin->size; i += 4)
ramin->im_backing_suspend[i/4] = nv_ri32(dev, i);
return 0;
}
Expand All @@ -340,8 +339,8 @@ nv50_instmem_resume(struct drm_device *dev)
struct nouveau_gpuobj *ramin = chan->ramin;
int i;

nv_wr32(dev, NV50_PUNK_BAR0_PRAMIN, (ramin->im_backing_start >> 16));
for (i = 0; i < ramin->im_pramin->size; i += 4)
nv_wr32(dev, NV50_PUNK_BAR0_PRAMIN, (ramin->vinst >> 16));
for (i = 0; i < ramin->size; i += 4)
BAR0_WI32(ramin, i, ramin->im_backing_suspend[i/4]);
vfree(ramin->im_backing_suspend);
ramin->im_backing_suspend = NULL;
Expand Down Expand Up @@ -387,9 +386,7 @@ nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj,
return ret;
}

gpuobj->im_backing_start = gpuobj->im_backing->bo.mem.mm_node->start;
gpuobj->im_backing_start <<= PAGE_SHIFT;

gpuobj->vinst = gpuobj->im_backing->bo.mem.mm_node->start << PAGE_SHIFT;
return 0;
}

Expand Down Expand Up @@ -424,11 +421,11 @@ nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)

pte = (gpuobj->im_pramin->start >> 12) << 1;
pte_end = ((gpuobj->im_pramin->size >> 12) << 1) + pte;
vram = gpuobj->im_backing_start;
vram = gpuobj->vinst;

NV_DEBUG(dev, "pramin=0x%lx, pte=%d, pte_end=%d\n",
gpuobj->im_pramin->start, pte, pte_end);
NV_DEBUG(dev, "first vram page: 0x%08x\n", gpuobj->im_backing_start);
NV_DEBUG(dev, "first vram page: 0x%010llx\n", gpuobj->vinst);

vram |= 1;
if (dev_priv->vram_sys_base) {
Expand Down
7 changes: 3 additions & 4 deletions trunk/drivers/gpu/drm/nouveau/nvc0_instmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ nvc0_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj,
return ret;
}

gpuobj->im_backing_start = gpuobj->im_backing->bo.mem.mm_node->start;
gpuobj->im_backing_start <<= PAGE_SHIFT;
gpuobj->vinst = gpuobj->im_backing->bo.mem.mm_node->start << PAGE_SHIFT;
return 0;
}

Expand Down Expand Up @@ -84,11 +83,11 @@ nvc0_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)

pte = gpuobj->im_pramin->start >> 12;
pte_end = (gpuobj->im_pramin->size >> 12) + pte;
vram = gpuobj->im_backing_start;
vram = gpuobj->vinst;

NV_DEBUG(dev, "pramin=0x%lx, pte=%d, pte_end=%d\n",
gpuobj->im_pramin->start, pte, pte_end);
NV_DEBUG(dev, "first vram page: 0x%08x\n", gpuobj->im_backing_start);
NV_DEBUG(dev, "first vram page: 0x%010llx\n", gpuobj->vinst);

while (pte < pte_end) {
nv_wr32(dev, 0x702000 + (pte * 8), (vram >> 8) | 1);
Expand Down

0 comments on commit 9398dfc

Please sign in to comment.