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

Commit 6759a0a7 authored by Marek Olšák's avatar Marek Olšák Committed by Alex Deucher
Browse files

drm/radeon/kms: implement timestamp userspace query (v2) 



Returns a snapshot of the GPU clock counter.  Needed
for certain OpenGL extensions.

v2: agd5f
- address Jerome's comments
- add function documentation

Signed-off-by: default avatarMarek Olšák <maraeo@gmail.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b51ad12a

drivers/gpu/drm/radeon/r600.c

+20 −0
Original line number Diff line number Diff line
@@ -3789,3 +3789,23 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev) 
		WREG32_PCIE_P(PCIE_LC_LINK_WIDTH_CNTL, link_width_cntl);

	}

}



/**

 * r600_get_gpu_clock - return GPU clock counter snapshot

 *

 * @rdev: radeon_device pointer

 *

 * Fetches a GPU clock counter snapshot (R6xx-cayman).

 * Returns the 64 bit clock counter snapshot.

 */

uint64_t r600_get_gpu_clock(struct radeon_device *rdev)

{

	uint64_t clock;



	mutex_lock(&rdev->gpu_clock_mutex);

	WREG32(RLC_CAPTURE_GPU_CLOCK_COUNT, 1);

	clock = (uint64_t)RREG32(RLC_GPU_CLOCK_COUNT_LSB) |

	        ((uint64_t)RREG32(RLC_GPU_CLOCK_COUNT_MSB) << 32ULL);

	mutex_unlock(&rdev->gpu_clock_mutex);

	return clock;

}

drivers/gpu/drm/radeon/r600d.h

+3 −0
Original line number Diff line number Diff line
@@ -602,6 +602,9 @@ 
#define RLC_HB_WPTR                                       0x3f1c

#define RLC_HB_WPTR_LSB_ADDR                              0x3f14

#define RLC_HB_WPTR_MSB_ADDR                              0x3f18

#define RLC_GPU_CLOCK_COUNT_LSB				  0x3f38

#define RLC_GPU_CLOCK_COUNT_MSB				  0x3f3c

#define RLC_CAPTURE_GPU_CLOCK_COUNT			  0x3f40

#define RLC_MC_CNTL                                       0x3f44

#define RLC_UCODE_CNTL                                    0x3f48

#define RLC_UCODE_ADDR                                    0x3f2c

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -1534,6 +1534,7 @@ struct radeon_device { 
	unsigned 		debugfs_count;

	/* virtual memory */

	struct radeon_vm_manager	vm_manager;

	struct mutex			gpu_clock_mutex;

};



int radeon_device_init(struct radeon_device *rdev,

drivers/gpu/drm/radeon/radeon_asic.h

+2 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev, 
			unsigned num_gpu_pages,

			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);



/*

 * rv770,rv730,rv710,rv740
@@ -468,5 +469,6 @@ int si_vm_bind(struct radeon_device *rdev, struct radeon_vm *vm, int id); 
void si_vm_unbind(struct radeon_device *rdev, struct radeon_vm *vm);

void si_vm_tlb_flush(struct radeon_device *rdev, struct radeon_vm *vm);

int si_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib);

uint64_t si_get_gpu_clock(struct radeon_device *rdev);



#endif

drivers/gpu/drm/radeon/radeon_device.c

+1 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ int radeon_device_init(struct radeon_device *rdev, 
	atomic_set(&rdev->ih.lock, 0);

	mutex_init(&rdev->gem.mutex);

	mutex_init(&rdev->pm.mutex);

	mutex_init(&rdev->gpu_clock_mutex);

	init_rwsem(&rdev->pm.mclk_lock);

	init_rwsem(&rdev->exclusive_lock);

	init_waitqueue_head(&rdev->irq.vblank_queue);