diff options
author | Maciej Cencora <m.cencora@gmail.com> | 2009-12-15 17:13:08 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-16 01:09:19 -0500 |
commit | 6e7267721fd67d626433ea10c59fc232c6928259 (patch) | |
tree | 3a139cfb0c8618f9f746076665a98eb169d5b3c5 /drivers/gpu | |
parent | a3922105319120a48b97ebb42cb43acb5a7e4e73 (diff) |
drm/radeon/kms: allow for texture tiling
This adds the relocations for texture tiling for KMS.
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index e47af526fc04..dbb149060b1d 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -686,7 +686,15 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
686 | r100_cs_dump_packet(p, pkt); | 686 | r100_cs_dump_packet(p, pkt); |
687 | return r; | 687 | return r; |
688 | } | 688 | } |
689 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); | 689 | |
690 | if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) | ||
691 | tile_flags |= R300_TXO_MACRO_TILE; | ||
692 | if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) | ||
693 | tile_flags |= R300_TXO_MICRO_TILE; | ||
694 | |||
695 | tmp = idx_value + ((u32)reloc->lobj.gpu_offset); | ||
696 | tmp |= tile_flags; | ||
697 | ib[idx] = tmp; | ||
690 | track->textures[i].robj = reloc->robj; | 698 | track->textures[i].robj = reloc->robj; |
691 | break; | 699 | break; |
692 | /* Tracked registers */ | 700 | /* Tracked registers */ |