Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit f2746f83 authored Feb 02, 2012 by Alex Deucher Committed by Dave Airlie Feb 03, 2012

drm/radeon/kms: add r1xx/r2xx CS support for tiled textures



Not likely this will be implemented anytime soon, but for
completeness...

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent c9068eb2

drivers/gpu/drm/radeon/r100.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -1558,6 +1558,16 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
		r100_cs_dump_packet(p, pkt);
		return r;
		}
		if (!(p->cs_flags & RADEON_CS_KEEP_TILING_FLAGS)) {
		if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
		tile_flags \|= RADEON_TXO_MACRO_TILE;
		if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
		tile_flags \|= RADEON_TXO_MICRO_TILE_X2;

		tmp = idx_value & ~(0x7 << 2);
		tmp \|= tile_flags;
		ib[idx] = tmp + ((u32)reloc->lobj.gpu_offset);
		} else
		ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset);
		track->textures[i].robj = reloc->robj;
		track->tex_dirty = true;

drivers/gpu/drm/radeon/r200.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -215,6 +215,16 @@ int r200_packet0_check(struct radeon_cs_parser *p,
		r100_cs_dump_packet(p, pkt);
		return r;
		}
		if (!(p->cs_flags & RADEON_CS_KEEP_TILING_FLAGS)) {
		if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
		tile_flags \|= R200_TXO_MACRO_TILE;
		if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
		tile_flags \|= R200_TXO_MICRO_TILE;

		tmp = idx_value & ~(0x7 << 2);
		tmp \|= tile_flags;
		ib[idx] = tmp + ((u32)reloc->lobj.gpu_offset);
		} else
		ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset);
		track->textures[i].robj = reloc->robj;
		track->tex_dirty = true;