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

Commit 7c1c7c18 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dce6: add missing display reg for tiling setup 

A new tiling config register for the display blocks was
added on DCE6.

May fix:
https://bugs.freedesktop.org/show_bug.cgi?id=62889
https://bugs.freedesktop.org/show_bug.cgi?id=57919



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 9ed8b1f9

drivers/gpu/drm/radeon/ni.c

+2 −0
Original line number Diff line number Diff line
@@ -621,6 +621,8 @@ static void cayman_gpu_init(struct radeon_device *rdev) 


	WREG32(GB_ADDR_CONFIG, gb_addr_config);

	WREG32(DMIF_ADDR_CONFIG, gb_addr_config);

	if (ASIC_IS_DCE6(rdev))

		WREG32(DMIF_ADDR_CALC, gb_addr_config);

	WREG32(HDP_ADDR_CONFIG, gb_addr_config);

	WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config);

	WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config);

drivers/gpu/drm/radeon/nid.h

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ 
#define ARUBA_GB_ADDR_CONFIG_GOLDEN        0x12010001



#define DMIF_ADDR_CONFIG  				0xBD4



/* DCE6 only */

#define DMIF_ADDR_CALC  				0xC00



#define	SRBM_GFX_CNTL				        0x0E44

#define		RINGID(x)					(((x) & 0x3) << 0)

#define		VMID(x)						(((x) & 0x7) << 0)

drivers/gpu/drm/radeon/si.c

+1 −0
Original line number Diff line number Diff line
@@ -1765,6 +1765,7 @@ static void si_gpu_init(struct radeon_device *rdev) 


	WREG32(GB_ADDR_CONFIG, gb_addr_config);

	WREG32(DMIF_ADDR_CONFIG, gb_addr_config);

	WREG32(DMIF_ADDR_CALC, gb_addr_config);

	WREG32(HDP_ADDR_CONFIG, gb_addr_config);

	WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config);

	WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config);

drivers/gpu/drm/radeon/sid.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 


#define DMIF_ADDR_CONFIG  				0xBD4



#define DMIF_ADDR_CALC  				0xC00



#define	SRBM_STATUS				        0xE50

#define		GRBM_RQ_PENDING 			(1 << 5)

#define		VMC_BUSY 				(1 << 8)