Commit 353eec2a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: add get_allowed_info_register for CIK 



Registers that can be fetched from the info ioctl.

Tested-by: default avatarMarek Olšák <marek.olsak@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4af692f6

drivers/gpu/drm/radeon/cik.c

+33 −0
Original line number Diff line number Diff line
@@ -141,6 +141,39 @@ static void cik_fini_cg(struct radeon_device *rdev); 
static void cik_enable_gui_idle_interrupt(struct radeon_device *rdev,

					  bool enable);



/**

 * cik_get_allowed_info_register - fetch the register for the info ioctl

 *

 * @rdev: radeon_device pointer

 * @reg: register offset in bytes

 * @val: register value

 *

 * Returns 0 for success or -EINVAL for an invalid register

 *

 */

int cik_get_allowed_info_register(struct radeon_device *rdev,

				  u32 reg, u32 *val)

{

	switch (reg) {

	case GRBM_STATUS:

	case GRBM_STATUS2:

	case GRBM_STATUS_SE0:

	case GRBM_STATUS_SE1:

	case GRBM_STATUS_SE2:

	case GRBM_STATUS_SE3:

	case SRBM_STATUS:

	case SRBM_STATUS2:

	case (SDMA0_STATUS_REG + SDMA0_REGISTER_OFFSET):

	case (SDMA0_STATUS_REG + SDMA1_REGISTER_OFFSET):

	case UVD_STATUS:

	/* TODO VCE */

		*val = RREG32(reg);

		return 0;

	default:

		return -EINVAL;

	}

}



/* get temperature in millidegrees */

int ci_get_temp(struct radeon_device *rdev)

{

drivers/gpu/drm/radeon/cikd.h

+2 −0
Original line number Diff line number Diff line
@@ -2088,6 +2088,8 @@ 
#	define CLK_OD(x)				((x) << 6)

#	define CLK_OD_MASK				(0x1f << 6)



#define UVD_STATUS					0xf6bc



/* UVD clocks */



#define CG_DCLK_CNTL			0xC050009C

drivers/gpu/drm/radeon/radeon_asic.c

+2 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,7 @@ static struct radeon_asic ci_asic = { 
	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &cik_get_xclk,

	.get_gpu_clock_counter = &cik_get_gpu_clock_counter,

	.get_allowed_info_register = cik_get_allowed_info_register,

	.gart = {

		.tlb_flush = &cik_pcie_gart_tlb_flush,

		.get_page_entry = &rs600_gart_get_page_entry,
@@ -2187,6 +2188,7 @@ static struct radeon_asic kv_asic = { 
	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &cik_get_xclk,

	.get_gpu_clock_counter = &cik_get_gpu_clock_counter,

	.get_allowed_info_register = cik_get_allowed_info_register,

	.gart = {

		.tlb_flush = &cik_pcie_gart_tlb_flush,

		.get_page_entry = &rs600_gart_get_page_entry,

drivers/gpu/drm/radeon/radeon_asic.h

+2 −0
Original line number Diff line number Diff line
@@ -865,6 +865,8 @@ void cik_sdma_set_wptr(struct radeon_device *rdev, 
		       struct radeon_ring *ring);

int ci_get_temp(struct radeon_device *rdev);

int kv_get_temp(struct radeon_device *rdev);

int cik_get_allowed_info_register(struct radeon_device *rdev,

				  u32 reg, u32 *val);



int ci_dpm_init(struct radeon_device *rdev);

int ci_dpm_enable(struct radeon_device *rdev);