diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-08-15 20:54:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-08-16 08:33:17 +1000 |
| commit | 3f8befec95d5c1bbc6e247e1a5dafa82519530f9 (patch) | |
| tree | 289112b8c8b0dcea9d12d2c0d53b922b367c3778 /drivers/gpu/drm | |
| parent | ebb177d2afb8532a8a316489aed545ed0c170802 (diff) | |
| download | linux-3.10-3f8befec95d5c1bbc6e247e1a5dafa82519530f9.tar.gz linux-3.10-3f8befec95d5c1bbc6e247e1a5dafa82519530f9.tar.bz2 linux-3.10-3f8befec95d5c1bbc6e247e1a5dafa82519530f9.zip | |
drm/radeon/kms: add rv530 R300_SU_REG_DEST + reloc for ZPASS_ADDR
These are needed for Occulsion Query support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 9c8d41534a5..8594486e162 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -1403,6 +1403,21 @@ static int r300_packet0_check(struct radeon_cs_parser *p, tmp = (ib_chunk->kdata[idx] >> 22) & 0xF; track->textures[i].txdepth = tmp; break; + case R300_ZB_ZPASS_ADDR: + r = r100_cs_packet_next_reloc(p, &reloc); + if (r) { + DRM_ERROR("No reloc for ib[%d]=0x%04X\n", + idx, reg); + r100_cs_dump_packet(p, pkt); + return r; + } + ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset); + break; + case 0x4be8: + /* valid register only on RV530 */ + if (p->rdev->family == CHIP_RV530) + break; + /* fallthrough do not move */ default: printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", reg, idx); |