From 861017e6d50f5724c179717f995322c498ee15db Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 2 Jan 2007 15:56:10 +1100 Subject: nouveau: Hookup nv40_graph_init. Now I can get 3D + working grctx switching on my NV40 without the binary driver initialising the card first. However, this change also breaks 3D on my C51 even *with* the binary driver's help. So, it's likely that the weird voodoo is card-specific. --- shared-core/nouveau_state.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'shared-core/nouveau_state.c') diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 914d1453..c66ecd4e 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -72,17 +72,8 @@ int nouveau_firstopen(struct drm_device *dev) if (ret) return ret; /* FIXME: doesn't belong here, and have no idea what it's for.. */ - if (dev_priv->card_type >= NV_40) { - uint32_t pg0220_inst; - - dev_priv->fb_obj = nouveau_dma_object_create(dev, - 0, nouveau_mem_fb_amount(dev), - NV_DMA_ACCESS_RW, NV_DMA_TARGET_VIDMEM); - - pg0220_inst = nouveau_chip_instance_get(dev, - dev_priv->fb_obj->instance); - NV_WRITE(NV_PGRAPH_NV40_UNK220, pg0220_inst); - } + if (dev_priv->card_type >= NV_40) + nv40_graph_init(dev); return 0; } -- cgit v1.2.3