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

Commit 454d2e2a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: add a asic callback to get the xclk 



This is required to get the reference clock used
by the gfx engine for things like timestamps. Fixes
support for GL extensions the use timestamps on
certain boards.

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

drivers/gpu/drm/radeon/r600.c

+13 −0
Original line number Diff line number Diff line
@@ -109,6 +109,19 @@ void r600_fini(struct radeon_device *rdev); 
void r600_irq_disable(struct radeon_device *rdev);

static void r600_pcie_gen2_enable(struct radeon_device *rdev);



/**

 * r600_get_xclk - get the xclk

 *

 * @rdev: radeon_device pointer

 *

 * Returns the reference clock used by the gfx engine

 * (r6xx, IGPs, APUs).

 */

u32 r600_get_xclk(struct radeon_device *rdev)

{

	return rdev->clock.spll.reference_freq;

}



/* get temperature in millidegrees */

int rv6xx_get_temp(struct radeon_device *rdev)

{

drivers/gpu/drm/radeon/radeon.h

+3 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,8 @@ struct radeon_asic { 
	bool (*gui_idle)(struct radeon_device *rdev);

	/* wait for mc_idle */

	int (*mc_wait_for_idle)(struct radeon_device *rdev);

	/* get the reference clock */

	u32 (*get_xclk)(struct radeon_device *rdev);

	/* gart */

	struct {

		void (*tlb_flush)(struct radeon_device *rdev);
@@ -1860,6 +1862,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); 
#define radeon_post_page_flip(rdev, crtc) (rdev)->asic->pflip.post_page_flip((rdev), (crtc))

#define radeon_wait_for_vblank(rdev, crtc) (rdev)->asic->display.wait_for_vblank((rdev), (crtc))

#define radeon_mc_wait_for_idle(rdev) (rdev)->asic->mc_wait_for_idle((rdev))

#define radeon_get_xclk(rdev) (rdev)->asic->get_xclk((rdev))



/* Common functions */

/* AGP */

drivers/gpu/drm/radeon/radeon_asic.c

+9 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ static struct radeon_asic r600_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &r600_mc_wait_for_idle,

	.get_xclk = &r600_get_xclk,

	.gart = {

		.tlb_flush = &r600_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1018,6 +1019,7 @@ static struct radeon_asic rs780_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &r600_mc_wait_for_idle,

	.get_xclk = &r600_get_xclk,

	.gart = {

		.tlb_flush = &r600_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1102,6 +1104,7 @@ static struct radeon_asic rv770_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &r600_mc_wait_for_idle,

	.get_xclk = &rv770_get_xclk,

	.gart = {

		.tlb_flush = &r600_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1186,6 +1189,7 @@ static struct radeon_asic evergreen_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &rv770_get_xclk,

	.gart = {

		.tlb_flush = &evergreen_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1270,6 +1274,7 @@ static struct radeon_asic sumo_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &r600_get_xclk,

	.gart = {

		.tlb_flush = &evergreen_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1354,6 +1359,7 @@ static struct radeon_asic btc_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &rv770_get_xclk,

	.gart = {

		.tlb_flush = &evergreen_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1438,6 +1444,7 @@ static struct radeon_asic cayman_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &rv770_get_xclk,

	.gart = {

		.tlb_flush = &cayman_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1565,6 +1572,7 @@ static struct radeon_asic trinity_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &r600_get_xclk,

	.gart = {

		.tlb_flush = &cayman_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,
@@ -1692,6 +1700,7 @@ static struct radeon_asic si_asic = { 
	.ioctl_wait_idle = r600_ioctl_wait_idle,

	.gui_idle = &r600_gui_idle,

	.mc_wait_for_idle = &evergreen_mc_wait_for_idle,

	.get_xclk = &si_get_xclk,

	.gart = {

		.tlb_flush = &si_pcie_gart_tlb_flush,

		.set_page = &rs600_gart_set_page,

drivers/gpu/drm/radeon/radeon_asic.h

+3 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 
			struct radeon_sa_bo *vb);

int r600_mc_wait_for_idle(struct radeon_device *rdev);

uint64_t r600_get_gpu_clock(struct radeon_device *rdev);

u32 r600_get_xclk(struct radeon_device *rdev);



/*

 * rv770,rv730,rv710,rv740
@@ -407,6 +408,7 @@ int rv770_copy_dma(struct radeon_device *rdev, 
		  uint64_t src_offset, uint64_t dst_offset,

		  unsigned num_gpu_pages,

		   struct radeon_fence **fence);

u32 rv770_get_xclk(struct radeon_device *rdev);



/*

 * evergreen
@@ -521,5 +523,6 @@ int si_copy_dma(struct radeon_device *rdev, 
		unsigned num_gpu_pages,

		struct radeon_fence **fence);

void si_dma_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm);

u32 si_get_xclk(struct radeon_device *rdev);



#endif

drivers/gpu/drm/radeon/radeon_kms.c

+4 −1
Original line number Diff line number Diff line
@@ -282,6 +282,9 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		break;

	case RADEON_INFO_CLOCK_CRYSTAL_FREQ:

		/* return clock value in KHz */

		if (rdev->asic->get_xclk)

			value = radeon_get_xclk(rdev) * 10;

		else

			value = rdev->clock.spll.reference_freq * 10;

		break;

	case RADEON_INFO_NUM_BACKENDS: