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

Commit 939461d5 authored by Marek Olšák's avatar Marek Olšák Committed by Dave Airlie
Browse files

drm/radeon/kms: add support for square microtiles on r3xx-r5xx 



Signed-off-by: default avatarMarek Olšák <maraeo@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 51e5fcd3

drivers/gpu/drm/radeon/r300.c

+7 −1
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			tile_flags |= R300_TXO_MACRO_TILE;

		if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)

			tile_flags |= R300_TXO_MICRO_TILE;

		else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO_SQUARE)

			tile_flags |= R300_TXO_MICRO_TILE_SQUARE;



		tmp = idx_value + ((u32)reloc->lobj.gpu_offset);

		tmp |= tile_flags;
@@ -755,6 +757,8 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			tile_flags |= R300_COLOR_TILE_ENABLE;

		if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)

			tile_flags |= R300_COLOR_MICROTILE_ENABLE;

		else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO_SQUARE)

			tile_flags |= R300_COLOR_MICROTILE_SQUARE_ENABLE;



		tmp = idx_value & ~(0x7 << 16);

		tmp |= tile_flags;
@@ -826,7 +830,9 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)

			tile_flags |= R300_DEPTHMACROTILE_ENABLE;

		if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)

			tile_flags |= R300_DEPTHMICROTILE_TILED;;

			tile_flags |= R300_DEPTHMICROTILE_TILED;

		else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO_SQUARE)

			tile_flags |= R300_DEPTHMICROTILE_TILED_SQUARE;



		tmp = idx_value & ~(0x7 << 16);

		tmp |= tile_flags;

drivers/gpu/drm/radeon/r300_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ 
#       define R300_TXO_ENDIAN_HALFDW_SWAP       (3 << 0)

#       define R300_TXO_MACRO_TILE               (1 << 2)

#       define R300_TXO_MICRO_TILE               (1 << 3)

#       define R300_TXO_MICRO_TILE_SQUARE        (2 << 3)

#       define R300_TXO_OFFSET_MASK              0xffffffe0

#       define R300_TXO_OFFSET_SHIFT             5

	/* END: Guess from R200 */
@@ -1360,6 +1361,7 @@ 
#       define R300_COLORPITCH_MASK              0x00001FF8 /* GUESS */

#       define R300_COLOR_TILE_ENABLE            (1 << 16) /* GUESS */

#       define R300_COLOR_MICROTILE_ENABLE       (1 << 17) /* GUESS */

#       define R300_COLOR_MICROTILE_SQUARE_ENABLE (2 << 17)

#       define R300_COLOR_ENDIAN_NO_SWAP         (0 << 18) /* GUESS */

#       define R300_COLOR_ENDIAN_WORD_SWAP       (1 << 18) /* GUESS */

#       define R300_COLOR_ENDIAN_DWORD_SWAP      (2 << 18) /* GUESS */

include/drm/radeon_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -808,6 +808,7 @@ struct drm_radeon_gem_create { 
#define RADEON_TILING_SWAP_32BIT  0x8

#define RADEON_TILING_SURFACE     0x10 /* this object requires a surface

					* when mapped - i.e. front buffer */

#define RADEON_TILING_MICRO_SQUARE 0x20



struct drm_radeon_gem_set_tiling {

	uint32_t	handle;