renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-05 12:13:57 +08:00
Code

drm/nvc0: gpuobj_new need only check validity and init the relevant engine

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-11-24 10:10:23 +10:00
parent 587107b690
commit 7460d70355
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/nouveau/nouveau_object.c
View File

@ -643,10 +643,13 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, u32 handle, int class)
found: found:
switch (oc->engine) { switch (oc->engine) {
case NVOBJ_ENGINE_SW: case NVOBJ_ENGINE_SW:
ret = nouveau_gpuobj_sw_new(chan, class, &gpuobj); if (dev_priv->card_type < NV_C0) {
if (ret) ret = nouveau_gpuobj_sw_new(chan, class, &gpuobj);
return ret; if (ret)
goto insert; return ret;
goto insert;
}
break;
case NVOBJ_ENGINE_GR: case NVOBJ_ENGINE_GR:
if (dev_priv->card_type >= NV_50 && !chan->ramin_grctx) { if (dev_priv->card_type >= NV_50 && !chan->ramin_grctx) {
struct nouveau_pgraph_engine *pgraph = struct nouveau_pgraph_engine *pgraph =
@ -669,6 +672,10 @@ found:
break; break;
} }
/* we're done if this is fermi */
if (dev_priv->card_type >= NV_C0)
return 0;
ret = nouveau_gpuobj_new(dev, chan, ret = nouveau_gpuobj_new(dev, chan,
nouveau_gpuobj_class_instmem_size(dev, class), nouveau_gpuobj_class_instmem_size(dev, class),
16, 16,