diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-09-07 10:27:20 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 10:27:20 (GMT) |
| commit | 11670d3c93210793562748d83502ecbef4034765 (patch) | |
| tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 /drivers/gpu/drm/radeon/r100.c | |
| parent | 575dc34ee0de867ba83abf25998e0963bff451fa (diff) | |
| parent | 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0 (diff) | |
| download | linux-11670d3c93210793562748d83502ecbef4034765.tar.xz | |
Merge intel drm-intel-next branch
Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 639d5b2..44f34f8 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1140,6 +1140,16 @@ static int r100_packet0_check(struct radeon_cs_parser *p, tmp |= tile_flags; ib[idx] = tmp; break; + case RADEON_RB3D_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; default: /* FIXME: we don't want to allow anyothers packet */ break; |