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

Commit 285484e2 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon: add support for evergreen/ni tiling informations v11 



evergreen and northern island gpu needs more informations for 2D tiling
than previous r6xx/r7xx. Add field to tiling ioctl to allow userspace
to provide those.

The v8 cs checking change to track color view on r6xx/r7xx doesn't
affect old userspace as old userspace always emited 0 for this register.

v2 fix r6xx/r7xx 2D tiling computation
v3 fix r6xx/r7xx height align for untiled surface & add support for
   tile split on evergreen and newer
v4 improve tiling debugging output
v5 fix tile split code for evergreen and newer
v6 set proper tile split for crtc register
v7 fix tile split limit value
v8 add COLOR_VIEW checking to r6xx/r7xx checker, add evergreen cs
   checking, update safe reg for r600, evergreen and cayman.
   Evergreen checking need some work around for stencil alignment
   issues
v9 fix tile split value range, fix compressed texture handling and
   mipmap calculation, allow evergreen check to be silencious in
   front of current broken userspace (depth/stencil alignment issue)
v10 fix eg 3d texture and compressed texture, fix r600 depth array,
    fix r600 color view computation, add support for evergreen stencil
    split
v11 more verbose debugging in some case

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent dd220a00

drivers/gpu/drm/radeon/atombios_crtc.c

+7 −13
Original line number Diff line number Diff line
@@ -1031,6 +1031,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, 
	struct radeon_bo *rbo;

	uint64_t fb_location;

	uint32_t fb_format, fb_pitch_pixels, tiling_flags;

	unsigned bankw, bankh, mtaspect, tile_split;

	u32 fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_NONE);

	u32 tmp, viewport_w, viewport_h;

	int r;
@@ -1121,20 +1122,13 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, 
			break;

		}



		switch ((tmp & 0xf000) >> 12) {

		case 0: /* 1KB rows */

		default:

			fb_format |= EVERGREEN_GRPH_TILE_SPLIT(EVERGREEN_ADDR_SURF_TILE_SPLIT_1KB);

			break;

		case 1: /* 2KB rows */

			fb_format |= EVERGREEN_GRPH_TILE_SPLIT(EVERGREEN_ADDR_SURF_TILE_SPLIT_2KB);

			break;

		case 2: /* 4KB rows */

			fb_format |= EVERGREEN_GRPH_TILE_SPLIT(EVERGREEN_ADDR_SURF_TILE_SPLIT_4KB);

			break;

		}



		fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_2D_TILED_THIN1);



		evergreen_tiling_fields(tiling_flags, &bankw, &bankh, &mtaspect, &tile_split);

		fb_format |= EVERGREEN_GRPH_TILE_SPLIT(tile_split);

		fb_format |= EVERGREEN_GRPH_BANK_WIDTH(bankw);

		fb_format |= EVERGREEN_GRPH_BANK_HEIGHT(bankh);

		fb_format |= EVERGREEN_GRPH_MACRO_TILE_ASPECT(mtaspect);

	} else if (tiling_flags & RADEON_TILING_MICRO)

		fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1);

drivers/gpu/drm/radeon/evergreen.c

+31 −0
Original line number Diff line number Diff line
@@ -43,6 +43,37 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev); 
extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev,

				     int ring, u32 cp_int_cntl);



void evergreen_tiling_fields(unsigned tiling_flags, unsigned *bankw,

			     unsigned *bankh, unsigned *mtaspect,

			     unsigned *tile_split)

{

	*bankw = (tiling_flags >> RADEON_TILING_EG_BANKW_SHIFT) & RADEON_TILING_EG_BANKW_MASK;

	*bankh = (tiling_flags >> RADEON_TILING_EG_BANKH_SHIFT) & RADEON_TILING_EG_BANKH_MASK;

	*mtaspect = (tiling_flags >> RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT) & RADEON_TILING_EG_MACRO_TILE_ASPECT_MASK;

	*tile_split = (tiling_flags >> RADEON_TILING_EG_TILE_SPLIT_SHIFT) & RADEON_TILING_EG_TILE_SPLIT_MASK;

	switch (*bankw) {

	default:

	case 1: *bankw = EVERGREEN_ADDR_SURF_BANK_WIDTH_1; break;

	case 2: *bankw = EVERGREEN_ADDR_SURF_BANK_WIDTH_2; break;

	case 4: *bankw = EVERGREEN_ADDR_SURF_BANK_WIDTH_4; break;

	case 8: *bankw = EVERGREEN_ADDR_SURF_BANK_WIDTH_8; break;

	}

	switch (*bankh) {

	default:

	case 1: *bankh = EVERGREEN_ADDR_SURF_BANK_HEIGHT_1; break;

	case 2: *bankh = EVERGREEN_ADDR_SURF_BANK_HEIGHT_2; break;

	case 4: *bankh = EVERGREEN_ADDR_SURF_BANK_HEIGHT_4; break;

	case 8: *bankh = EVERGREEN_ADDR_SURF_BANK_HEIGHT_8; break;

	}

	switch (*mtaspect) {

	default:

	case 1: *mtaspect = EVERGREEN_ADDR_SURF_MACRO_TILE_ASPECT_1; break;

	case 2: *mtaspect = EVERGREEN_ADDR_SURF_MACRO_TILE_ASPECT_2; break;

	case 4: *mtaspect = EVERGREEN_ADDR_SURF_MACRO_TILE_ASPECT_4; break;

	case 8: *mtaspect = EVERGREEN_ADDR_SURF_MACRO_TILE_ASPECT_8; break;

	}

}



void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev)

{

	u16 ctl, v;