Commit 6ef92fbe authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-next 

A few more patches for 3.11:
- add debugfs interface to check current DPM state
- Fix a bug that caused problems with DPM on BTC+ asics.

* 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dpm: add debugfs support for SI
  drm/radeon/dpm: add debugfs support for cayman
  drm/radeon/dpm: add debugfs support for TN
  drm/radeon/dpm: add debugfs support for ON/LN
  drm/radeon/dpm: add debugfs support for 7xx/evergreen/btc
  drm/radeon/dpm: add debugfs support for rv6xx
  drm/radeon/dpm: add infrastructure to support debugfs info
  drm/radeon/dpm: re-enable state transitions for Cayman
  drm/radeon/dpm: re-enable state transitions for BTC
  drm/radeon: fix typo in radeon_atom_init_mc_reg_table()
  drm/radeon/atom: fix endian bug in radeon_atom_init_mc_reg_table()
  drm/radeon: remove sumo dpm/uvd bringup leftovers
parents f7d452f4 7982128c

drivers/gpu/drm/radeon/btc_dpm.c

+0 −3
Original line number Diff line number Diff line
@@ -2326,14 +2326,11 @@ int btc_dpm_set_power_state(struct radeon_device *rdev) 
		return ret;

	}



#if 0

	/* XXX */

	ret = rv770_unrestrict_performance_levels_after_switch(rdev);

	if (ret) {

		DRM_ERROR("rv770_unrestrict_performance_levels_after_switch failed\n");

		return ret;

	}

#endif



	return 0;

}

drivers/gpu/drm/radeon/ni_dpm.c

+20 −5
Original line number Diff line number Diff line
@@ -1036,7 +1036,6 @@ static int ni_restrict_performance_levels_before_switch(struct radeon_device *rd 
		0 : -EINVAL;

}



#if 0

static int ni_unrestrict_performance_levels_after_switch(struct radeon_device *rdev)

{

	if (ni_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)
@@ -1045,7 +1044,6 @@ static int ni_unrestrict_performance_levels_after_switch(struct radeon_device *r 
	return (ni_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, 0) == PPSMC_Result_OK) ?

		0 : -EINVAL;

}

#endif



static void ni_stop_smc(struct radeon_device *rdev)

{
@@ -3832,14 +3830,11 @@ int ni_dpm_set_power_state(struct radeon_device *rdev) 
		return ret;

	}



#if 0

	/* XXX */

	ret = ni_unrestrict_performance_levels_after_switch(rdev);

	if (ret) {

		DRM_ERROR("ni_unrestrict_performance_levels_after_switch failed\n");

		return ret;

	}

#endif



	return 0;

}
@@ -4292,6 +4287,26 @@ void ni_dpm_print_power_state(struct radeon_device *rdev, 
	r600_dpm_print_ps_status(rdev, rps);

}



void ni_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,

						    struct seq_file *m)

{

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

	struct ni_ps *ps = ni_get_ps(rps);

	struct rv7xx_pl *pl;

	u32 current_index =

		(RREG32(TARGET_AND_CURRENT_PROFILE_INDEX) & CURRENT_STATE_INDEX_MASK) >>

		CURRENT_STATE_INDEX_SHIFT;



	if (current_index >= ps->performance_level_count) {

		seq_printf(m, "invalid dpm profile %d\n", current_index);

	} else {

		pl = &ps->performance_levels[current_index];

		seq_printf(m, "uvd    vclk: %d dclk: %d\n", rps->vclk, rps->dclk);

		seq_printf(m, "power level %d    sclk: %u mclk: %u vddc: %u vddci: %u\n",

			   current_index, pl->sclk, pl->mclk, pl->vddc, pl->vddci);

	}

}



u32 ni_dpm_get_sclk(struct radeon_device *rdev, bool low)

{

	struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);

drivers/gpu/drm/radeon/nid.h

+4 −0
Original line number Diff line number Diff line
@@ -618,6 +618,10 @@ 
#       define MRDCKD0_BYPASS                           (1 << 30)

#       define MRDCKD1_BYPASS                           (1 << 31)



#define TARGET_AND_CURRENT_PROFILE_INDEX                  0x66c

#       define CURRENT_STATE_INDEX_MASK                   (0xf << 4)

#       define CURRENT_STATE_INDEX_SHIFT                  4



#define CG_AT                                           0x6d4

#       define CG_R(x)					((x) << 0)

#       define CG_R_MASK				(0xffff << 0)

drivers/gpu/drm/radeon/radeon.h

+2 −0
Original line number Diff line number Diff line
@@ -1667,6 +1667,7 @@ struct radeon_asic { 
		u32 (*get_sclk)(struct radeon_device *rdev, bool low);

		u32 (*get_mclk)(struct radeon_device *rdev, bool low);

		void (*print_power_state)(struct radeon_device *rdev, struct radeon_ps *ps);

		void (*debugfs_print_current_performance_level)(struct radeon_device *rdev, struct seq_file *m);

	} dpm;

	/* pageflipping */

	struct {
@@ -2433,6 +2434,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); 
#define radeon_dpm_get_sclk(rdev, l) rdev->asic->dpm.get_sclk((rdev), (l))

#define radeon_dpm_get_mclk(rdev, l) rdev->asic->dpm.get_mclk((rdev), (l))

#define radeon_dpm_print_power_state(rdev, ps) rdev->asic->dpm.print_power_state((rdev), (ps))

#define radeon_dpm_debugfs_print_current_performance_level(rdev, m) rdev->asic->dpm.debugfs_print_current_performance_level((rdev), (m))



/* Common functions */

/* AGP */

drivers/gpu/drm/radeon/radeon_asic.c

+8 −0
Original line number Diff line number Diff line
@@ -1160,6 +1160,7 @@ static struct radeon_asic rv6xx_asic = { 
		.get_sclk = &rv6xx_dpm_get_sclk,

		.get_mclk = &rv6xx_dpm_get_mclk,

		.print_power_state = &rv6xx_dpm_print_power_state,

		.debugfs_print_current_performance_level = &rv6xx_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &rs600_pre_page_flip,
@@ -1391,6 +1392,7 @@ static struct radeon_asic rv770_asic = { 
		.get_sclk = &rv770_dpm_get_sclk,

		.get_mclk = &rv770_dpm_get_mclk,

		.print_power_state = &rv770_dpm_print_power_state,

		.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &rs600_pre_page_flip,
@@ -1513,6 +1515,7 @@ static struct radeon_asic evergreen_asic = { 
		.get_sclk = &rv770_dpm_get_sclk,

		.get_mclk = &rv770_dpm_get_mclk,

		.print_power_state = &rv770_dpm_print_power_state,

		.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &evergreen_pre_page_flip,
@@ -1635,6 +1638,7 @@ static struct radeon_asic sumo_asic = { 
		.get_sclk = &sumo_dpm_get_sclk,

		.get_mclk = &sumo_dpm_get_mclk,

		.print_power_state = &sumo_dpm_print_power_state,

		.debugfs_print_current_performance_level = &sumo_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &evergreen_pre_page_flip,
@@ -1757,6 +1761,7 @@ static struct radeon_asic btc_asic = { 
		.get_sclk = &btc_dpm_get_sclk,

		.get_mclk = &btc_dpm_get_mclk,

		.print_power_state = &rv770_dpm_print_power_state,

		.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &evergreen_pre_page_flip,
@@ -1931,6 +1936,7 @@ static struct radeon_asic cayman_asic = { 
		.get_sclk = &ni_dpm_get_sclk,

		.get_mclk = &ni_dpm_get_mclk,

		.print_power_state = &ni_dpm_print_power_state,

		.debugfs_print_current_performance_level = &ni_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &evergreen_pre_page_flip,
@@ -2103,6 +2109,7 @@ static struct radeon_asic trinity_asic = { 
		.get_sclk = &trinity_dpm_get_sclk,

		.get_mclk = &trinity_dpm_get_mclk,

		.print_power_state = &trinity_dpm_print_power_state,

		.debugfs_print_current_performance_level = &trinity_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &evergreen_pre_page_flip,
@@ -2275,6 +2282,7 @@ static struct radeon_asic si_asic = { 
		.get_sclk = &ni_dpm_get_sclk,

		.get_mclk = &ni_dpm_get_mclk,

		.print_power_state = &ni_dpm_print_power_state,

		.debugfs_print_current_performance_level = &si_dpm_debugfs_print_current_performance_level,

	},

	.pflip = {

		.pre_page_flip = &evergreen_pre_page_flip,

CRA Git | Maintained and supported by SUSTech CRA and CCSE