diff options
Diffstat (limited to 'meta-steppeeagle/recipes-kernel/linux/linux-yocto/0033-yocto-amd-drm-radeon-dpm-fetch-vce-states-from-the-vbios.patch')
| -rw-r--r-- | meta-steppeeagle/recipes-kernel/linux/linux-yocto/0033-yocto-amd-drm-radeon-dpm-fetch-vce-states-from-the-vbios.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0033-yocto-amd-drm-radeon-dpm-fetch-vce-states-from-the-vbios.patch b/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0033-yocto-amd-drm-radeon-dpm-fetch-vce-states-from-the-vbios.patch deleted file mode 100644 index aa4de719..00000000 --- a/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0033-yocto-amd-drm-radeon-dpm-fetch-vce-states-from-the-vbios.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 55d04c82da7399c568896c2938a8729989e43c8d Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Wed, 4 Sep 2013 16:13:56 -0400 -Subject: [PATCH 33/44] drm/radeon/dpm: fetch vce states from the vbios - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/radeon/r600_dpm.c | 28 +++++++++++++++++++++++++++- - drivers/gpu/drm/radeon/radeon.h | 16 ++++++++++++++++ - 2 files changed, 43 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c -index d57cde7..0bad36b 100644 ---- a/drivers/gpu/drm/radeon/r600_dpm.c -+++ b/drivers/gpu/drm/radeon/r600_dpm.c -@@ -1047,7 +1047,15 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) - (mode_info->atom_context->bios + data_offset + - le16_to_cpu(ext_hdr->usVCETableOffset) + 1 + - 1 + array->ucNumEntries * sizeof(VCEClockInfo)); -+ ATOM_PPLIB_VCE_State_Table *states = -+ (ATOM_PPLIB_VCE_State_Table *) -+ (mode_info->atom_context->bios + data_offset + -+ le16_to_cpu(ext_hdr->usVCETableOffset) + 1 + -+ 1 + (array->ucNumEntries * sizeof (VCEClockInfo)) + -+ 1 + (limits->numEntries * sizeof(ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record))); - ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record *entry; -+ ATOM_PPLIB_VCE_State_Record *state_entry; -+ VCEClockInfo *vce_clk; - u32 size = limits->numEntries * - sizeof(struct radeon_vce_clock_voltage_dependency_entry); - rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries = -@@ -1059,8 +1067,9 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) - rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.count = - limits->numEntries; - entry = &limits->entries[0]; -+ state_entry = &states->entries[0]; - for (i = 0; i < limits->numEntries; i++) { -- VCEClockInfo *vce_clk = (VCEClockInfo *) -+ vce_clk = (VCEClockInfo *) - ((u8 *)&array->entries[0] + - (entry->ucVCEClockInfoIndex * sizeof(VCEClockInfo))); - rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries[i].evclk = -@@ -1072,6 +1081,23 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) - entry = (ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record *) - ((u8 *)entry + sizeof(ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record)); - } -+ for (i = 0; i < states->numEntries; i++) { -+ if (i >= RADEON_MAX_VCE_LEVELS) -+ break; -+ vce_clk = (VCEClockInfo *) -+ ((u8 *)&array->entries[0] + -+ (state_entry->ucVCEClockInfoIndex * sizeof(VCEClockInfo))); -+ rdev->pm.dpm.vce_states[i].evclk = -+ le16_to_cpu(vce_clk->usEVClkLow) | (vce_clk->ucEVClkHigh << 16); -+ rdev->pm.dpm.vce_states[i].ecclk = -+ le16_to_cpu(vce_clk->usECClkLow) | (vce_clk->ucECClkHigh << 16); -+ rdev->pm.dpm.vce_states[i].clk_idx = -+ state_entry->ucClockInfoIndex & 0x3f; -+ rdev->pm.dpm.vce_states[i].pstate = -+ (state_entry->ucClockInfoIndex & 0xc0) >> 6; -+ state_entry = (ATOM_PPLIB_VCE_State_Record *) -+ ((u8 *)state_entry + sizeof(ATOM_PPLIB_VCE_State_Record)); -+ } - } - if ((le16_to_cpu(ext_hdr->usSize) >= SIZE_OF_ATOM_PPLIB_EXTENDEDHEADER_V3) && - ext_hdr->usUVDTableOffset) { -diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h -index 7846289..fa57b11 100644 ---- a/drivers/gpu/drm/radeon/radeon.h -+++ b/drivers/gpu/drm/radeon/radeon.h -@@ -1253,6 +1253,8 @@ enum radeon_dpm_event_src { - RADEON_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL = 4 - }; - -+#define RADEON_MAX_VCE_LEVELS 6 -+ - enum radeon_vce_level { - RADEON_VCE_LEVEL_AC_ALL = 0, /* AC, All cases */ - RADEON_VCE_LEVEL_DC_EE = 1, /* DC, entropy encoding */ -@@ -1448,6 +1450,17 @@ enum radeon_dpm_forced_level { - RADEON_DPM_FORCED_LEVEL_HIGH = 2, - }; - -+struct radeon_vce_state { -+ /* vce clocks */ -+ u32 evclk; -+ u32 ecclk; -+ /* gpu clocks */ -+ u32 sclk; -+ u32 mclk; -+ u8 clk_idx; -+ u8 pstate; -+}; -+ - struct radeon_dpm { - struct radeon_ps *ps; - /* number of valid power states */ -@@ -1460,6 +1473,9 @@ struct radeon_dpm { - struct radeon_ps *boot_ps; - /* default uvd power state */ - struct radeon_ps *uvd_ps; -+ /* vce requirements */ -+ struct radeon_vce_state vce_states[RADEON_MAX_VCE_LEVELS]; -+ enum radeon_vce_level vce_level; - enum radeon_pm_state_type state; - enum radeon_pm_state_type user_state; - u32 platform_caps; --- -1.7.9.5 - |