nv40: fail completely if we don't have a ctxprog for the chipset

main
Ben Skeggs 2009-02-15 22:06:18 +10:00
parent a4ac60a102
commit 084e143d0c
1 changed files with 7 additions and 10 deletions

View File

@ -1982,21 +1982,18 @@ nv40_graph_init(struct drm_device *dev)
default:
DRM_ERROR("Context program for 0x%02x unavailable\n",
dev_priv->chipset);
ctx_prog = NULL;
break;
return -EINVAL;
}
/* Load the context program onto the card */
if (ctx_prog) {
DRM_DEBUG("Loading context program\n");
i = 0;
i = 0;
NV_WRITE(NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
while (ctx_prog[i] != ~0) {
NV_WRITE(NV40_PGRAPH_CTXCTL_UCODE_DATA, ctx_prog[i]);
i++;
}
}
/* No context present currently */
NV_WRITE(NV40_PGRAPH_CTXCTL_CUR, 0x00000000);