AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Tom St Denis <tstdenis82-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Tom St Denis <tom.stdenis-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 3/7] drm/amd/amdgpu: Clean up SI DPM table assignments
Date: Tue,  6 Sep 2016 12:18:40 -0400	[thread overview]
Message-ID: <20160906161844.21370-4-tom.stdenis@amd.com> (raw)
In-Reply-To: <20160906161844.21370-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>

Hoist common assignments out of cases.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/si_dpm.c | 42 +++++++++----------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 2a72b2b5801d..8d623912891c 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -2014,39 +2014,28 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev)
 			break;
 		}
 	} 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) {
 		case 0x6810:
 		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;
 			update_dte_from_pl2 = true;
 			break;
 		case 0x6819:
 		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;
 			update_dte_from_pl2 = true;
 			break;
 		case 0x6800:
 		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;
 			update_dte_from_pl2 = true;
 			break;
 		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;
 			break;
 		}
@@ -2102,16 +2091,17 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev)
 			break;
 		}
 	} 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) {
 		case 0x6601:
 		case 0x6621:
 		case 0x6603:
 		case 0x6605:
 			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;
 			break;
 		case 0x6600:
@@ -2119,28 +2109,16 @@ static void si_initialize_powertune_defaults(struct amdgpu_device *adev)
 		case 0x6620:
 		case 0x6604:
 			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;
 			break;
 		case 0x6611:
 		case 0x6613:
 		case 0x6608:
 			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;
 			break;
 		case 0x6610:
 			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;
 			break;
 		default:
-- 
2.9.3

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2016-09-06 16:18 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-06 16:18 Various tidy'ups with SI DMA/DPM/SMC/IH code Tom St Denis
     [not found] ` <20160906161844.21370-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
2016-09-06 16:18   ` [PATCH 1/7] drm/amd/amdgpu: Tidy up SI DMA code Tom St Denis
2016-09-06 16:18   ` [PATCH 2/7] drm/amd/amdgpu: Allow calling si_dpm_fini at any point Tom St Denis
2016-09-06 16:18   ` Tom St Denis [this message]
2016-09-06 16:18   ` [PATCH 4/7] drm/amd/amdgpu: Correct whitespace in SI DPM code Tom St Denis
2016-09-06 16:18   ` [PATCH 5/7] drm/amd/amdgpu: Tidy up SI IH code Tom St Denis
2016-09-06 16:18   ` [PATCH 6/7] drm/amd/amdgpu: Tidy up SI SMC code Tom St Denis
2016-09-06 16:18   ` [PATCH 7/7] drm/amd/amdgpu: Comment out currently unused SI DPM struct Tom St Denis
     [not found]     ` <20160906161844.21370-8-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
2016-09-07 14:45       ` Deucher, Alexander
     [not found]         ` <MWHPR12MB16946A5F5069CA4CAE4ABA7BF7F80-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2016-09-07 14:49           ` StDenis, Tom
     [not found]             ` <CY4PR12MB1768FBB1CC469E0C27182B9FF7F80-rpdhrqHFk06yjjPBNVDk/QdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2016-09-08  1:51               ` Michel Dänzer
2016-09-07  2:19   ` Various tidy'ups with SI DMA/DPM/SMC/IH code Edward O'Callaghan
2016-09-07 12:38   ` Huang Rui
2016-09-07 14:46   ` Deucher, Alexander

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160906161844.21370-4-tom.stdenis@amd.com \
    --to=tstdenis82-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=tom.stdenis-5C7GfCeVMHo@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox