diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-17 08:55:04 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-01-17 09:14:17 +1000 |
| commit | e8ce1ef351ee51bec51211dca6fda88fdbfbefee (patch) | |
| tree | adaebd7f2468db182678aa50db4b2706c3c5ef50 | |
| parent | b414b1f948da18d96309bad84c54948d877efaa6 (diff) | |
| download | xorg-driver-xf86-video-nouveau-nvc0.tar.gz | |
fix hardcoding of nvc0 wfb pathnvc0
| -rw-r--r-- | src/nouveau_wfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nouveau_wfb.c b/src/nouveau_wfb.c index 47a0a93..e02fd1c 100644 --- a/src/nouveau_wfb.c +++ b/src/nouveau_wfb.c @@ -177,12 +177,12 @@ nouveau_wfb_setup_wrap(ReadMemoryProcPtr *pRead, WriteMemoryProcPtr *pWrite, wfb->pitch = ppix->devKind; /* 8192x8192x4 is 28 bits max, 64 - 28 == 36. */ wfb->multiply_factor = (((1ULL << 36) - 1) / wfb->pitch) + 1; - wfb->tile_height = bo->tile_mode + 2; + if (bo->device->chipset < 0xc0) + wfb->tile_height = bo->tile_mode + 2; + else + wfb->tile_height = (bo->tile_mode >> 4) + 3; wfb->horiz_tiles = wfb->pitch / 64; have_tiled = 1; - - if (1 /* NV_ARCH_C0, FIXME */) - wfb->tile_height = (bo->tile_mode >> 4) + 3; } out: |