From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Quan, Evan" Subject: RE: [PATCH 3/4] drm/amd/powerplay: get bootup fclk value Date: Fri, 16 Aug 2019 07:59:57 +0000 Message-ID: References: <20190816060807.11922-1-evan.quan@amd.com>, <20190816060807.11922-3-evan.quan@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2028343620==" Return-path: In-Reply-To: Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: "Wang, Kevin(Yang)" , "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" --===============2028343620== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MN2PR12MB3344896B119B12D504E130C8E4AF0MN2PR12MB3344namp_" --_000_MN2PR12MB3344896B119B12D504E130C8E4AF0MN2PR12MB3344namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Since smu_get_atom_data_table() was already used in smu_v11_0_get_vbios_boo= tup_values(). We should get all our needed information at once. Also, what smu_get_atom_data_table() does is to get the data table from vbi= os. It's a time and resource cost job. I do not think it's a good idea to call it again just to get some informati= on we should already know. Regards, Evan From: Wang, Kevin(Yang) Sent: Friday, August 16, 2019 3:10 PM To: Quan, Evan ; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Subject: Re: [PATCH 3/4] drm/amd/powerplay: get bootup fclk value i think we can use a function to retrieve this information without storing = it separately. likes: ret =3D smu_get_atom_data_table(smu, index, &size, &frev, &crev, (uint8_t **)&header); because these information is a generic information from atom_common_table_h= eader. and other function don't care it except in smu_v11_0_get_clk_info_from_vbio= s. Best Regards, Kevin ________________________________ From: amd-gfx > on behalf of Evan Quan > Sent: Friday, August 16, 2019 2:08 PM To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > Cc: Quan, Evan > Subject: [PATCH 3/4] drm/amd/powerplay: get bootup fclk value This is available with firmwareinfo table v3.2 or later. Change-Id: I223edf3c616b9e3e2527c752214fef5ab53d1cea Signed-off-by: Evan Quan > --- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/d= rm/amd/powerplay/inc/amdgpu_smu.h index ca9b9ec39de8..2c16eb412954 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h @@ -222,6 +222,9 @@ struct smu_bios_boot_up_values uint16_t vdd_gfx; uint8_t cooling_id; uint32_t pp_table_id; + uint32_t format_revision; + uint32_t content_revision; + uint32_t fclk; }; enum smu_table_id diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/am= d/powerplay/smu_v11_0.c index 4a51de4ff162..df7b65360ac7 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c @@ -568,6 +568,9 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_contex= t *smu) smu->smu_table.boot_values.pp_table_id =3D v_3_3->pplib_pp= table_id; } + smu->smu_table.boot_values.format_revision =3D header->format_revis= ion; + smu->smu_table.boot_values.content_revision =3D header->content_rev= ision; + return 0; } @@ -647,6 +650,24 @@ static int smu_v11_0_get_clk_info_from_vbios(struct sm= u_context *smu) output =3D (struct atom_get_smu_clock_info_output_parameters_v3_1 = *)&input; smu->smu_table.boot_values.dclk =3D le32_to_cpu(output->atom_smu_o= utputclkfreq.smu_clock_freq_hz) / 10000; + if ((smu->smu_table.boot_values.format_revision =3D=3D 3) && + (smu->smu_table.boot_values.content_revision >=3D 2)) { + memset(&input, 0, sizeof(input)); + input.clk_id =3D SMU11_SYSPLL1_0_FCLK_ID; + input.syspll_id =3D SMU11_SYSPLL1_2_ID; + input.command =3D GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ; + index =3D get_index_into_master_table(atom_master_list_of_c= ommand_functions_v2_1, + getsmuclockinfo); + + ret =3D amdgpu_atom_execute_table(adev->mode_info.atom_cont= ext, index, + (uint32_t *)&input); + if (ret) + return -EINVAL; + + output =3D (struct atom_get_smu_clock_info_output_parameter= s_v3_1 *)&input; + smu->smu_table.boot_values.fclk =3D le32_to_cpu(output->ato= m_smu_outputclkfreq.smu_clock_freq_hz) / 10000; + } + return 0; } -- 2.22.0 _______________________________________________ amd-gfx mailing list amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx --_000_MN2PR12MB3344896B119B12D504E130C8E4AF0MN2PR12MB3344namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Since smu_get_atom_data_table() was already used in = smu_v11_0_get_vbios_bootup_values(). We should get all our needed informati= on at once.

Also, what smu_get_atom_data_table() does is to get = the data table from vbios. It’s a time and resource cost job.

I do not think it’s a good idea to call it aga= in just to get some information we should already know.

 

Regards,

Evan

From: Wang, Kevin(Yang) <Kevin1.Wang@amd.c= om>
Sent: Friday, August 16, 2019 3:10 PM
To: Quan, Evan <Evan.Quan-5C7GfCeVMHo@public.gmane.org>; amd-gfx-PD4FTy7X32lNgt0PjOBp9/rsn8yoX9R0@public.gmane.org= org
Subject: Re: [PATCH 3/4] drm/amd/powerplay: get bootup fclk value

 

i think= we can use a function to retrieve this information without storing it sepa= rately.

likes:&= nbsp; ret =3D smu_get_atom_data_table(smu, index, &size, &f= rev, &crev,                &nbs= p;                     &n= bsp;                     =                      = ;                     &nb= sp;               
                     = ;                 (uint8_t **)&= header);  

because= these information is a generic information from atom_common_table_header.<= o:p>

and oth= er function don't care it except in smu_v11_0_get_clk_info_from_vbios.=

&n= bsp;

Best Re= gards,
Kevin


From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf o= f Evan Quan <evan.quan-5C7GfCeVMHo@public.gmane.org&= gt;
Sent: Friday, August 16, 2019 2:08 PM
To: amd-gfx@lists.f= reedesktop.org <amd= -gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Cc: Quan, Evan <Evan.Quan@am= d.com>
Subject: [PATCH 3/4] drm/amd/powerplay: get bootup fclk value=

 

This is available with firmwareinfo table v3.2 or la= ter.

Change-Id: I223edf3c616b9e3e2527c752214fef5ab53d1cea
Signed-off-by: Evan Quan <evan.quan= @amd.com>
---
 .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h    |  = 3 +++
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c     | 2= 1 ++++++++++++++= 3;++++
 2 files changed, 24 insertions(+)

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/d= rm/amd/powerplay/inc/amdgpu_smu.h
index ca9b9ec39de8..2c16eb412954 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -222,6 +222,9 @@ struct smu_bios_boot_up_values
         uint16_t   =             &nb= sp;        vdd_gfx;
         uint8_t   &= nbsp;           &nbs= p;         cooling_id;
         uint32_t   =             &nb= sp;        pp_table_id;
+       uint32_t    &= nbsp;           &nbs= p;       format_revision;
+       uint32_t    &= nbsp;           &nbs= p;       content_revision;
+       uint32_t    &= nbsp;           &nbs= p;       fclk;
 };
 
 enum smu_table_id
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/am= d/powerplay/smu_v11_0.c
index 4a51de4ff162..df7b65360ac7 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -568,6 +568,9 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_co= ntext *smu)
            &nb= sp;    smu->smu_table.boot_values.pp_table_id =3D v_3_3-&= gt;pplib_pptable_id;
         }
 
+       smu->smu_table.boot_values.for= mat_revision =3D header->format_revision;
+       smu->smu_table.boot_values.con= tent_revision =3D header->content_revision;
+
         return 0;
 }
 
@@ -647,6 +650,24 @@ static int smu_v11_0_get_clk_info_from_vbios(struc= t smu_context *smu)
         output =3D (struct atom_ge= t_smu_clock_info_output_parameters_v3_1 *)&input;
         smu->smu_table.boot_val= ues.dclk =3D le32_to_cpu(output->atom_smu_outputclkfreq.smu_clock_freq_h= z) / 10000;
 
+       if ((smu->smu_table.boot_value= s.format_revision =3D=3D 3) &&
+           (smu->= smu_table.boot_values.content_revision >=3D 2)) {
+           &nbs= p;   memset(&input, 0, sizeof(input));
+           &nbs= p;   input.clk_id =3D SMU11_SYSPLL1_0_FCLK_ID;
+           &nbs= p;   input.syspll_id =3D SMU11_SYSPLL1_2_ID;
+           &nbs= p;   input.command =3D GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ; +           &nbs= p;   index =3D get_index_into_master_table(atom_master_list_of_co= mmand_functions_v2_1,
+           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp; getsmuclockinfo);
+
+           &nbs= p;   ret =3D amdgpu_atom_execute_table(adev->mode_info.atom_co= ntext, index,
+           &nbs= p;            &= nbsp;           &nbs= p;          (uint32_t *)&i= nput);
+           &nbs= p;   if (ret)
+           &nbs= p;           return -EINV= AL;
+
+           &nbs= p;   output =3D (struct atom_get_smu_clock_info_output_parameters= _v3_1 *)&input;
+           &nbs= p;   smu->smu_table.boot_values.fclk =3D le32_to_cpu(output-&g= t;atom_smu_outputclkfreq.smu_clock_freq_hz) / 10000;
+       }
+
         return 0;
 }
 
--
2.22.0

_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9/rsn8yoX9R0@public.gmane.org= org
https://= lists.freedesktop.org/mailman/listinfo/amd-gfx

--_000_MN2PR12MB3344896B119B12D504E130C8E4AF0MN2PR12MB3344namp_-- --===============2028343620== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 --===============2028343620==--