From f2f106b0c4c33a28b44135fdabd4d953e908e138 Mon Sep 17 00:00:00 2001 From: Maciej Cencora Date: Tue, 15 Dec 2009 23:13:08 +0100 Subject: [PATCH] --- yaml --- r: 177065 b: refs/heads/master c: 6e7267721fd67d626433ea10c59fc232c6928259 h: refs/heads/master i: 177063: 556fa01f2e529ceb2c93fe536e642fad21ebdcea v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r300.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 613c36953cdb..60232d16728c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3922105319120a48b97ebb42cb43acb5a7e4e73 +refs/heads/master: 6e7267721fd67d626433ea10c59fc232c6928259 diff --git a/trunk/drivers/gpu/drm/radeon/r300.c b/trunk/drivers/gpu/drm/radeon/r300.c index e47af526fc04..dbb149060b1d 100644 --- a/trunk/drivers/gpu/drm/radeon/r300.c +++ b/trunk/drivers/gpu/drm/radeon/r300.c @@ -686,7 +686,15 @@ static int r300_packet0_check(struct radeon_cs_parser *p, r100_cs_dump_packet(p, pkt); return r; } - ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); + + if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) + tile_flags |= R300_TXO_MACRO_TILE; + if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) + tile_flags |= R300_TXO_MICRO_TILE; + + tmp = idx_value + ((u32)reloc->lobj.gpu_offset); + tmp |= tile_flags; + ib[idx] = tmp; track->textures[i].robj = reloc->robj; break; /* Tracked registers */