drm/radeon: add get_allowed_info_register for EG/BTC (ff609975) · Commits · 戴 / test

drivers/gpu/drm/radeon/evergreen.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -1006,6 +1006,34 @@ static void evergreen_init_golden_registers(struct radeon_device *rdev)
		}
		}

		/**
		* evergreen_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 evergreen_get_allowed_info_register(struct radeon_device *rdev,
		u32 reg, u32 *val)
		{
		switch (reg) {
		case GRBM_STATUS:
		case GRBM_STATUS_SE0:
		case GRBM_STATUS_SE1:
		case SRBM_STATUS:
		case SRBM_STATUS2:
		case DMA_STATUS_REG:
		case UVD_STATUS:
		*val = RREG32(reg);
		return 0;
		default:
		return -EINVAL;
		}
		}

		void evergreen_tiling_fields(unsigned tiling_flags, unsigned *bankw,
		unsigned bankh, unsigned mtaspect,
		unsigned *tile_split)

+1 −0

Original line number	Diff line number	Diff line
		@@ -1520,6 +1520,7 @@
		#define UVD_UDEC_DBW_ADDR_CONFIG 0xef54
		#define UVD_RBC_RB_RPTR 0xf690
		#define UVD_RBC_RB_WPTR 0xf694
		#define UVD_STATUS 0xf6bc

		/*
		* PM4

+3 −0

Original line number	Diff line number	Diff line
		@@ -1344,6 +1344,7 @@ static struct radeon_asic evergreen_asic = {
		.mc_wait_for_idle = &evergreen_mc_wait_for_idle,
		.get_xclk = &rv770_get_xclk,
		.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
		.get_allowed_info_register = evergreen_get_allowed_info_register,
		.gart = {
		.tlb_flush = &evergreen_pcie_gart_tlb_flush,
		.get_page_entry = &rs600_gart_get_page_entry,
		@@ -1437,6 +1438,7 @@ static struct radeon_asic sumo_asic = {
		.mc_wait_for_idle = &evergreen_mc_wait_for_idle,
		.get_xclk = &r600_get_xclk,
		.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
		.get_allowed_info_register = evergreen_get_allowed_info_register,
		.gart = {
		.tlb_flush = &evergreen_pcie_gart_tlb_flush,
		.get_page_entry = &rs600_gart_get_page_entry,
		@@ -1529,6 +1531,7 @@ static struct radeon_asic btc_asic = {
		.mc_wait_for_idle = &evergreen_mc_wait_for_idle,
		.get_xclk = &rv770_get_xclk,
		.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
		.get_allowed_info_register = evergreen_get_allowed_info_register,
		.gart = {
		.tlb_flush = &evergreen_pcie_gart_tlb_flush,
		.get_page_entry = &rs600_gart_get_page_entry,

+2 −0

Original line number	Diff line number	Diff line
		@@ -548,6 +548,8 @@ struct radeon_fence evergreen_copy_dma(struct radeon_device rdev,
		unsigned num_gpu_pages,
		struct reservation_object *resv);
		int evergreen_get_temp(struct radeon_device *rdev);
		int evergreen_get_allowed_info_register(struct radeon_device *rdev,
		u32 reg, u32 *val);
		int sumo_get_temp(struct radeon_device *rdev);
		int tn_get_temp(struct radeon_device *rdev);
		int cypress_dpm_init(struct radeon_device *rdev);