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

Commit 296deb71 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/rv7xx/eg: implement get_current_sclk/mclk 



Will be used for exposing current clocks via INFO ioctl.

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

drivers/gpu/drm/radeon/radeon_asic.c

+4 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,8 @@ static struct radeon_asic rv770_asic = { 
		.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,

		.force_performance_level = &rv770_dpm_force_performance_level,

		.vblank_too_short = &rv770_dpm_vblank_too_short,

		.get_current_sclk = &rv770_dpm_get_current_sclk,

		.get_current_mclk = &rv770_dpm_get_current_mclk,

	},

	.pflip = {

		.page_flip = &rv770_page_flip,
@@ -1395,6 +1397,8 @@ static struct radeon_asic evergreen_asic = { 
		.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,

		.force_performance_level = &rv770_dpm_force_performance_level,

		.vblank_too_short = &cypress_dpm_vblank_too_short,

		.get_current_sclk = &rv770_dpm_get_current_sclk,

		.get_current_mclk = &rv770_dpm_get_current_mclk,

	},

	.pflip = {

		.page_flip = &evergreen_page_flip,

drivers/gpu/drm/radeon/radeon_asic.h

+2 −0
Original line number Diff line number Diff line
@@ -492,6 +492,8 @@ void rv770_dpm_debugfs_print_current_performance_level(struct radeon_device *rde 
int rv770_dpm_force_performance_level(struct radeon_device *rdev,

				      enum radeon_dpm_forced_level level);

bool rv770_dpm_vblank_too_short(struct radeon_device *rdev);

u32 rv770_dpm_get_current_sclk(struct radeon_device *rdev);

u32 rv770_dpm_get_current_mclk(struct radeon_device *rdev);



/*

 * evergreen

drivers/gpu/drm/radeon/rv770_dpm.c

+44 −0
Original line number Diff line number Diff line
@@ -2492,6 +2492,50 @@ void rv770_dpm_debugfs_print_current_performance_level(struct radeon_device *rde 
	}

}



u32 rv770_dpm_get_current_sclk(struct radeon_device *rdev)

{

	struct radeon_ps *rps = rdev->pm.dpm.current_ps;

	struct rv7xx_ps *ps = rv770_get_ps(rps);

	struct rv7xx_pl *pl;

	u32 current_index =

		(RREG32(TARGET_AND_CURRENT_PROFILE_INDEX) & CURRENT_PROFILE_INDEX_MASK) >>

		CURRENT_PROFILE_INDEX_SHIFT;



	if (current_index > 2) {

		return 0;

	} else {

		if (current_index == 0)

			pl = &ps->low;

		else if (current_index == 1)

			pl = &ps->medium;

		else /* current_index == 2 */

			pl = &ps->high;

		return  pl->sclk;

	}

}



u32 rv770_dpm_get_current_mclk(struct radeon_device *rdev)

{

	struct radeon_ps *rps = rdev->pm.dpm.current_ps;

	struct rv7xx_ps *ps = rv770_get_ps(rps);

	struct rv7xx_pl *pl;

	u32 current_index =

		(RREG32(TARGET_AND_CURRENT_PROFILE_INDEX) & CURRENT_PROFILE_INDEX_MASK) >>

		CURRENT_PROFILE_INDEX_SHIFT;



	if (current_index > 2) {

		return 0;

	} else {

		if (current_index == 0)

			pl = &ps->low;

		else if (current_index == 1)

			pl = &ps->medium;

		else /* current_index == 2 */

			pl = &ps->high;

		return  pl->mclk;

	}

}



void rv770_dpm_fini(struct radeon_device *rdev)

{

	int i;