Commit c3d98645 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher

drm/amd/amdgpu: Clean up SI DPM table assignments

Hoist common assignments out of cases.
Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9623e4bf
...@@ -2014,39 +2014,28 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev) ...@@ -2014,39 +2014,28 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev)
break; break;
} }
} else if (adev->asic_type == CHIP_PITCAIRN) { } else if (adev->asic_type == CHIP_PITCAIRN) {
si_pi->cac_weights = cac_weights_pitcairn;
si_pi->lcac_config = lcac_pitcairn;
si_pi->cac_override = cac_override_pitcairn;
si_pi->powertune_data = &powertune_data_pitcairn;
switch (adev->pdev->device) { switch (adev->pdev->device) {
case 0x6810: case 0x6810:
case 0x6818: case 0x6818:
si_pi->cac_weights = cac_weights_pitcairn;
si_pi->lcac_config = lcac_pitcairn;
si_pi->cac_override = cac_override_pitcairn;
si_pi->powertune_data = &powertune_data_pitcairn;
si_pi->dte_data = dte_data_curacao_xt; si_pi->dte_data = dte_data_curacao_xt;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
case 0x6819: case 0x6819:
case 0x6811: case 0x6811:
si_pi->cac_weights = cac_weights_pitcairn;
si_pi->lcac_config = lcac_pitcairn;
si_pi->cac_override = cac_override_pitcairn;
si_pi->powertune_data = &powertune_data_pitcairn;
si_pi->dte_data = dte_data_curacao_pro; si_pi->dte_data = dte_data_curacao_pro;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
case 0x6800: case 0x6800:
case 0x6806: case 0x6806:
si_pi->cac_weights = cac_weights_pitcairn;
si_pi->lcac_config = lcac_pitcairn;
si_pi->cac_override = cac_override_pitcairn;
si_pi->powertune_data = &powertune_data_pitcairn;
si_pi->dte_data = dte_data_neptune_xt; si_pi->dte_data = dte_data_neptune_xt;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
default: default:
si_pi->cac_weights = cac_weights_pitcairn;
si_pi->lcac_config = lcac_pitcairn;
si_pi->cac_override = cac_override_pitcairn;
si_pi->powertune_data = &powertune_data_pitcairn;
si_pi->dte_data = dte_data_pitcairn; si_pi->dte_data = dte_data_pitcairn;
break; break;
} }
...@@ -2102,16 +2091,17 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev) ...@@ -2102,16 +2091,17 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev)
break; break;
} }
} else if (adev->asic_type == CHIP_OLAND) { } else if (adev->asic_type == CHIP_OLAND) {
si_pi->lcac_config = lcac_mars_pro;
si_pi->cac_override = cac_override_oland;
si_pi->powertune_data = &powertune_data_mars_pro;
si_pi->dte_data = dte_data_mars_pro;
switch (adev->pdev->device) { switch (adev->pdev->device) {
case 0x6601: case 0x6601:
case 0x6621: case 0x6621:
case 0x6603: case 0x6603:
case 0x6605: case 0x6605:
si_pi->cac_weights = cac_weights_mars_pro; si_pi->cac_weights = cac_weights_mars_pro;
si_pi->lcac_config = lcac_mars_pro;
si_pi->cac_override = cac_override_oland;
si_pi->powertune_data = &powertune_data_mars_pro;
si_pi->dte_data = dte_data_mars_pro;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
case 0x6600: case 0x6600:
...@@ -2119,28 +2109,16 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev) ...@@ -2119,28 +2109,16 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev)
case 0x6620: case 0x6620:
case 0x6604: case 0x6604:
si_pi->cac_weights = cac_weights_mars_xt; si_pi->cac_weights = cac_weights_mars_xt;
si_pi->lcac_config = lcac_mars_pro;
si_pi->cac_override = cac_override_oland;
si_pi->powertune_data = &powertune_data_mars_pro;
si_pi->dte_data = dte_data_mars_pro;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
case 0x6611: case 0x6611:
case 0x6613: case 0x6613:
case 0x6608: case 0x6608:
si_pi->cac_weights = cac_weights_oland_pro; si_pi->cac_weights = cac_weights_oland_pro;
si_pi->lcac_config = lcac_mars_pro;
si_pi->cac_override = cac_override_oland;
si_pi->powertune_data = &powertune_data_mars_pro;
si_pi->dte_data = dte_data_mars_pro;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
case 0x6610: case 0x6610:
si_pi->cac_weights = cac_weights_oland_xt; si_pi->cac_weights = cac_weights_oland_xt;
si_pi->lcac_config = lcac_mars_pro;
si_pi->cac_override = cac_override_oland;
si_pi->powertune_data = &powertune_data_mars_pro;
si_pi->dte_data = dte_data_mars_pro;
update_dte_from_pl2 = true; update_dte_from_pl2 = true;
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment