diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
| commit | f0fe478c1587780690edc465d957a762e02acc8a (patch) | |
| tree | de129251264e7c4fa5c8c7119583dc18af9a3fab /shared-core/nv20_graph.c | |
| parent | e1bc147ac9aa8ac2ac271b0a21f4138b17875ce5 (diff) | |
| parent | 62cdc6dbb3545d21bc3a68987d0781f277ae6ee4 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
shared-core/i915_dma.c
tests/ttmtest/src/ttmtest.c
Diffstat (limited to 'shared-core/nv20_graph.c')
| -rw-r--r-- | shared-core/nv20_graph.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/shared-core/nv20_graph.c b/shared-core/nv20_graph.c index a21fde71..dace7edb 100644 --- a/shared-core/nv20_graph.c +++ b/shared-core/nv20_graph.c @@ -29,7 +29,7 @@ #define NV2A_GRCTX_SIZE (3500*4) #define NV30_31_GRCTX_SIZE (24392) -#define NV34_GRCTX_SIZE (18140) +#define NV34_GRCTX_SIZE (22000) #define NV35_36_GRCTX_SIZE (22396) static void nv20_graph_context_init(struct drm_device *dev, @@ -432,6 +432,19 @@ static void nv30_31_graph_context_init(struct drm_device *dev, INSTANCE_WR(ctx, 0x385c/4, 0x3f800000); INSTANCE_WR(ctx, 0x3864/4, 0xbf800000); INSTANCE_WR(ctx, 0x386c/4, 0xbf800000); + + /* nv30gl stuff */ + for (i=0; i<8; i++) { + INSTANCE_WR(ctx, (0x4dfc/4)+i, 0x001c527d); + } + INSTANCE_WR(ctx, 0x4e3c/4, 0x001c527c); +/* these ones make dma fifo hang + INSTANCE_WR(ctx, 0x567c/4, 0x000a0000); + INSTANCE_WR(ctx, 0x0878/4, 0x01000000); + INSTANCE_WR(ctx, 0x02f4/4, 0x0001ffff); + + INSTANCE_WR(ctx, 0x0028/4, INSTANCE_RD(ctx, 0x0028/4) | 1); +*/ } static void nv34_graph_context_init(struct drm_device *dev, |