diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-10-07 16:00:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-11-10 08:58:47 +1000 |
| commit | 7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff (patch) | |
| tree | 1bbc4e238e4f69001c63b75476485db6deffffa7 /drivers/gpu/drm/nouveau/nv50_vram.c | |
| parent | dce411cdf60eb64638443f953b52c18192378305 (diff) | |
| download | blackbird-op-linux-7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff.tar.gz blackbird-op-linux-7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff.zip | |
drm/nv50/vram: fix incorrect detection of bank count on newer chipsets
NVA3+ has an extra bit here compared to NV50:NVA3 chipsets.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_vram.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_vram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_vram.c b/drivers/gpu/drm/nouveau/nv50_vram.c index 9da23838e63e..2e45e57fd869 100644 --- a/drivers/gpu/drm/nouveau/nv50_vram.c +++ b/drivers/gpu/drm/nouveau/nv50_vram.c @@ -160,7 +160,7 @@ nv50_vram_rblock(struct drm_device *dev) colbits = (r4 & 0x0000f000) >> 12; rowbitsa = ((r4 & 0x000f0000) >> 16) + 8; rowbitsb = ((r4 & 0x00f00000) >> 20) + 8; - banks = ((r4 & 0x01000000) ? 8 : 4); + banks = 1 << (((r4 & 0x03000000) >> 24) + 2); rowsize = parts * banks * (1 << colbits) * 8; predicted = rowsize << rowbitsa; |
