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

drm/radeon/kms: add accessors for RCU indirect space 



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 26e2235d

drivers/gpu/drm/radeon/evergreen.c

+2 −4
Original line number Diff line number Diff line
@@ -3120,10 +3120,8 @@ static void evergreen_gpu_init(struct radeon_device *rdev) 
		u32 efuse_straps_4;

		u32 efuse_straps_3;



		WREG32(RCU_IND_INDEX, 0x204);

		efuse_straps_4 = RREG32(RCU_IND_DATA);

		WREG32(RCU_IND_INDEX, 0x203);

		efuse_straps_3 = RREG32(RCU_IND_DATA);

		efuse_straps_4 = RREG32_RCU(0x204);

		efuse_straps_3 = RREG32_RCU(0x203);

		tmp = (((efuse_straps_4 & 0xf) << 4) |

		      ((efuse_straps_3 & 0xf0000000) >> 28));

	} else {

drivers/gpu/drm/radeon/r600_reg.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
#define R600_PCIE_PORT_INDEX                0x0038

#define R600_PCIE_PORT_DATA                 0x003c



#define R600_RCU_INDEX                      0x0100

#define R600_RCU_DATA                       0x0104



#define R600_MC_VM_FB_LOCATION			0x2180

#define		R600_MC_FB_BASE_MASK			0x0000FFFF

#define		R600_MC_FB_BASE_SHIFT			0

drivers/gpu/drm/radeon/radeon.h

+17 −0
Original line number Diff line number Diff line
@@ -1850,6 +1850,8 @@ void cik_mm_wdoorbell(struct radeon_device *rdev, u32 offset, u32 v); 
#define WREG32_PCIE_PORT(reg, v) rdev->pciep_wreg(rdev, (reg), (v))

#define RREG32_SMC(reg) tn_smc_rreg(rdev, (reg))

#define WREG32_SMC(reg, v) tn_smc_wreg(rdev, (reg), (v))

#define RREG32_RCU(reg) r600_rcu_rreg(rdev, (reg))

#define WREG32_RCU(reg, v) r600_rcu_wreg(rdev, (reg), (v))

#define WREG32_P(reg, val, mask)				\

	do {							\

		uint32_t tmp_ = RREG32(reg);			\
@@ -1906,6 +1908,21 @@ static inline void tn_smc_wreg(struct radeon_device *rdev, u32 reg, u32 v) 
	WREG32(TN_SMC_IND_DATA_0, (v));

}



static inline u32 r600_rcu_rreg(struct radeon_device *rdev, u32 reg)

{

	u32 r;



	WREG32(R600_RCU_INDEX, ((reg) & 0x1fff));

	r = RREG32(R600_RCU_DATA);

	return r;

}



static inline void r600_rcu_wreg(struct radeon_device *rdev, u32 reg, u32 v)

{

	WREG32(R600_RCU_INDEX, ((reg) & 0x1fff));

	WREG32(R600_RCU_DATA, (v));

}



void r100_pll_errata_after_index(struct radeon_device *rdev);