mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-23 18:56:40 -04:00
drm/amd/pm: Use helper to get pptable in SMUv15
Use common helper function to get pptable from firmware binary in SMUv15. Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Assisted-by: Claude Sonnet (Cursor AI) Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
@@ -211,10 +211,6 @@ int smu_v15_0_deep_sleep_control(struct smu_context *smu,
|
||||
|
||||
int smu_v15_0_set_gfx_power_up_by_imu(struct smu_context *smu);
|
||||
|
||||
int smu_v15_0_get_pptable_from_firmware(struct smu_context *smu,
|
||||
void **table,
|
||||
uint32_t *size,
|
||||
uint32_t pptable_id);
|
||||
|
||||
int smu_v15_0_od_edit_dpm_table(struct smu_context *smu,
|
||||
enum PP_OD_DPM_TABLE_COMMAND type,
|
||||
|
||||
@@ -174,7 +174,7 @@ int smu_v15_0_init_pptable_microcode(struct smu_context *smu)
|
||||
if (!pptable_id)
|
||||
return 0;
|
||||
|
||||
ret = smu_v15_0_get_pptable_from_firmware(smu, &table, &size, pptable_id);
|
||||
ret = smu_cmn_get_pptable_from_firmware(smu, &table, &size, pptable_id);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -207,48 +207,6 @@ int smu_v15_0_check_fw_status(struct smu_context *smu)
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
static int smu_v15_0_set_pptable_v2_0(struct smu_context *smu, void **table, uint32_t *size)
|
||||
{
|
||||
struct amdgpu_device *adev = smu->adev;
|
||||
uint32_t ppt_offset_bytes;
|
||||
const struct smc_firmware_header_v2_0 *v2;
|
||||
|
||||
v2 = (const struct smc_firmware_header_v2_0 *) adev->pm.fw->data;
|
||||
|
||||
ppt_offset_bytes = le32_to_cpu(v2->ppt_offset_bytes);
|
||||
*size = le32_to_cpu(v2->ppt_size_bytes);
|
||||
*table = (uint8_t *)v2 + ppt_offset_bytes;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int smu_v15_0_set_pptable_v2_1(struct smu_context *smu, void **table,
|
||||
uint32_t *size, uint32_t pptable_id)
|
||||
{
|
||||
struct amdgpu_device *adev = smu->adev;
|
||||
const struct smc_firmware_header_v2_1 *v2_1;
|
||||
struct smc_soft_pptable_entry *entries;
|
||||
uint32_t pptable_count = 0;
|
||||
int i = 0;
|
||||
|
||||
v2_1 = (const struct smc_firmware_header_v2_1 *) adev->pm.fw->data;
|
||||
entries = (struct smc_soft_pptable_entry *)
|
||||
((uint8_t *)v2_1 + le32_to_cpu(v2_1->pptable_entry_offset));
|
||||
pptable_count = le32_to_cpu(v2_1->pptable_count);
|
||||
for (i = 0; i < pptable_count; i++) {
|
||||
if (le32_to_cpu(entries[i].id) == pptable_id) {
|
||||
*table = ((uint8_t *)v2_1 + le32_to_cpu(entries[i].ppt_offset_bytes));
|
||||
*size = le32_to_cpu(entries[i].ppt_size_bytes);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == pptable_count)
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int smu_v15_0_get_pptable_from_vbios(struct smu_context *smu, void **table, uint32_t *size)
|
||||
{
|
||||
struct amdgpu_device *adev = smu->adev;
|
||||
@@ -271,45 +229,6 @@ static int smu_v15_0_get_pptable_from_vbios(struct smu_context *smu, void **tabl
|
||||
return 0;
|
||||
}
|
||||
|
||||
int smu_v15_0_get_pptable_from_firmware(struct smu_context *smu,
|
||||
void **table,
|
||||
uint32_t *size,
|
||||
uint32_t pptable_id)
|
||||
{
|
||||
const struct smc_firmware_header_v1_0 *hdr;
|
||||
struct amdgpu_device *adev = smu->adev;
|
||||
uint16_t version_major, version_minor;
|
||||
int ret;
|
||||
|
||||
hdr = (const struct smc_firmware_header_v1_0 *) adev->pm.fw->data;
|
||||
if (!hdr)
|
||||
return -EINVAL;
|
||||
|
||||
dev_info(adev->dev, "use driver provided pptable %d\n", pptable_id);
|
||||
|
||||
version_major = le16_to_cpu(hdr->header.header_version_major);
|
||||
version_minor = le16_to_cpu(hdr->header.header_version_minor);
|
||||
if (version_major != 2) {
|
||||
dev_err(adev->dev, "Unsupported smu firmware version %d.%d\n",
|
||||
version_major, version_minor);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (version_minor) {
|
||||
case 0:
|
||||
ret = smu_v15_0_set_pptable_v2_0(smu, table, size);
|
||||
break;
|
||||
case 1:
|
||||
ret = smu_v15_0_set_pptable_v2_1(smu, table, size, pptable_id);
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int smu_v15_0_setup_pptable(struct smu_context *smu)
|
||||
{
|
||||
struct amdgpu_device *adev = smu->adev;
|
||||
@@ -329,7 +248,7 @@ int smu_v15_0_setup_pptable(struct smu_context *smu)
|
||||
if ((amdgpu_sriov_vf(adev) || !pptable_id) && (amdgpu_emu_mode != 1))
|
||||
ret = smu_v15_0_get_pptable_from_vbios(smu, &table, &size);
|
||||
else
|
||||
ret = smu_v15_0_get_pptable_from_firmware(smu, &table, &size, pptable_id);
|
||||
ret = smu_cmn_get_pptable_from_firmware(smu, &table, &size, pptable_id);
|
||||
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user