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

Commit f7eb9730 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix backend map setup on 1 RB sumo boards 

Need to adjust the backend map depending on which
RB is enabled.

Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=892233



Reported-by: default avatarMikko Tiihonen <mikko.tiihonen@iki.fi>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 9200ee49

drivers/gpu/drm/radeon/evergreen.c

+14 −3
Original line number Original line Diff line number Diff line
@@ -2044,9 +2044,20 @@ static void evergreen_gpu_init(struct radeon_device *rdev) 
	WREG32(HDP_ADDR_CONFIG, gb_addr_config);

	WREG32(HDP_ADDR_CONFIG, gb_addr_config);

	WREG32(DMA_TILING_CONFIG, gb_addr_config);

	WREG32(DMA_TILING_CONFIG, gb_addr_config);





	if ((rdev->config.evergreen.max_backends == 1) &&

	    (rdev->flags & RADEON_IS_IGP)) {

		if ((disabled_rb_mask & 3) == 1) {

			/* RB0 disabled, RB1 enabled */

			tmp = 0x11111111;

		} else {

			/* RB1 disabled, RB0 enabled */

			tmp = 0x00000000;

		}

	} else {

		tmp = gb_addr_config & NUM_PIPES_MASK;

		tmp = gb_addr_config & NUM_PIPES_MASK;

		tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.evergreen.max_backends,

		tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.evergreen.max_backends,

						EVERGREEN_MAX_BACKENDS, disabled_rb_mask);

						EVERGREEN_MAX_BACKENDS, disabled_rb_mask);

	}

	WREG32(GB_BACKEND_MAP, tmp);

	WREG32(GB_BACKEND_MAP, tmp);





	WREG32(CGTS_SYS_TCC_DISABLE, 0);

	WREG32(CGTS_SYS_TCC_DISABLE, 0);