Commit b62d628b authored by Alex Deucher's avatar Alex Deucher Committed by Christian König
Browse files

drm/radeon/dpm: fill in some initial vce infrastructure 



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

drivers/gpu/drm/radeon/radeon.h

+12 −0
Original line number Diff line number Diff line
@@ -1259,6 +1259,15 @@ enum radeon_dpm_event_src { 
	RADEON_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL = 4

};



enum radeon_vce_level {

	RADEON_VCE_LEVEL_AC_ALL = 0,     /* AC, All cases */

	RADEON_VCE_LEVEL_DC_EE = 1,      /* DC, entropy encoding */

	RADEON_VCE_LEVEL_DC_LL_LOW = 2,  /* DC, low latency queue, res <= 720 */

	RADEON_VCE_LEVEL_DC_LL_HIGH = 3, /* DC, low latency queue, 1080 >= res > 720 */

	RADEON_VCE_LEVEL_DC_GP_LOW = 4,  /* DC, general purpose queue, res <= 720 */

	RADEON_VCE_LEVEL_DC_GP_HIGH = 5, /* DC, general purpose queue, 1080 >= res > 720 */

};



struct radeon_ps {

	u32 caps; /* vbios flags */

	u32 class; /* vbios flags */
@@ -1269,6 +1278,8 @@ struct radeon_ps { 
	/* VCE clocks */

	u32 evclk;

	u32 ecclk;

	bool vce_active;

	enum radeon_vce_level vce_level;

	/* asic priv */

	void *ps_priv;

};
@@ -1480,6 +1491,7 @@ struct radeon_dpm { 
	/* special states active */

	bool                    thermal_active;

	bool                    uvd_active;

	bool                    vce_active;

	/* thermal handling */

	struct radeon_dpm_thermal thermal;

	/* forced levels */

drivers/gpu/drm/radeon/radeon_pm.c

+8 −0
Original line number Diff line number Diff line
@@ -826,6 +826,9 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev) 


	/* no need to reprogram if nothing changed unless we are on BTC+ */

	if (rdev->pm.dpm.current_ps == rdev->pm.dpm.requested_ps) {

		/* vce just modifies an existing state so force a change */

		if (ps->vce_active != rdev->pm.dpm.vce_active)

			goto force;

		if ((rdev->family < CHIP_BARTS) || (rdev->flags & RADEON_IS_IGP)) {

			/* for pre-BTC and APUs if the num crtcs changed but state is the same,

			 * all we need to do is update the display configuration.
@@ -862,16 +865,21 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev) 
		}

	}



force:

	if (radeon_dpm == 1) {

		printk("switching from power state:\n");

		radeon_dpm_print_power_state(rdev, rdev->pm.dpm.current_ps);

		printk("switching to power state:\n");

		radeon_dpm_print_power_state(rdev, rdev->pm.dpm.requested_ps);

	}



	mutex_lock(&rdev->ddev->struct_mutex);

	down_write(&rdev->pm.mclk_lock);

	mutex_lock(&rdev->ring_lock);



	/* update whether vce is active */

	ps->vce_active = rdev->pm.dpm.vce_active;



	ret = radeon_dpm_pre_set_power_state(rdev);

	if (ret)

		goto done;