<html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> <p><br> </p> <div class="moz-cite-prefix">On 2020-03-25 3:28 p.m., Deucher, Alexander wrote:<br> </div> <blockquote type="cite" cite="mid:MN2PR12MB44886BCD9A29C93D8DC1A6FEF7CE0@MN2PR12MB4488.namprd12.prod.outlook.com"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> <p style="font-family:Arial;font-size:10pt;color:#317100;margin:15pt;" align="Left"> [AMD Public Use]<br> </p> <br> <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> While you are at it, can you clean up the local defines of these registers in</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> drivers/gpu/drm/amd/powerplay/smu_v12_0.c</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> and verify that the appropriate offset is used for both Renoir and raven?</div> </div> </blockquote> <p><br> </p> <p>I can absolutely do that tomorrow. I'd like to get my (v2) patch out though since it's gating an update to umr which an internal team is waiting on.</p> <p><br> </p> <p>As for the PWR register through um how shall I say "sheer luck" it actually pans out fine. The Renoir code paths use the vega10 IP offsets and the PWR block's offset. Segment 0 of the PWR block from vega10 matches segment 1 of the SMUIO (v12) block. So on the face of it the CGCG code for renoir is "wrong" but because it's using the wrong IP table (which happens to have the right offsets) it works out alright.</p> <p><br> </p> <p>int soc15_set_ip_blocks(struct amdgpu_device *adev)<br> {<br> /* Set IP register base before any HW register access */<br> switch (adev->asic_type) {<br> case CHIP_VEGA10:<br> case CHIP_VEGA12:<br> case CHIP_RAVEN:<br> case CHIP_RENOIR:<br> vega10_reg_base_init(adev);<br> break;<br> <br> </p> <p>Strictly speaking this is wrong since renoir has its own IP offset table but because it reuses a lot of the KGD implementations from earlier hardware (and the registers happen to be at the same locations) this works out fine.</p> <p><br> </p> <p>Tom<br> </p> <p><br> </p> <p><br> </p> <blockquote type="cite" cite="mid:MN2PR12MB44886BCD9A29C93D8DC1A6FEF7CE0@MN2PR12MB4488.namprd12.prod.outlook.com"> <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <br> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Alex<br> </div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)"> <br> </div> <hr tabindex="-1" style="display:inline-block; width:98%"> <div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> amd-gfx <a class="moz-txt-link-rfc2396E" href="mailto:amd-gfx-bounces@lists.freedesktop.org"><amd-gfx-bounces@lists.freedesktop.org></a> on behalf of Tom St Denis <a class="moz-txt-link-rfc2396E" href="mailto:tom.stdenis@amd.com"><tom.stdenis@amd.com></a><br> <b>Sent:</b> Wednesday, March 25, 2020 3:22 PM<br> <b>To:</b> <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <a class="moz-txt-link-rfc2396E" href="mailto:amd-gfx@lists.freedesktop.org"><amd-gfx@lists.freedesktop.org></a><br> <b>Cc:</b> StDenis, Tom <a class="moz-txt-link-rfc2396E" href="mailto:Tom.StDenis@amd.com"><Tom.StDenis@amd.com></a><br> <b>Subject:</b> [PATCH] drm/amd/amdgpu: Fix SMUIO/PWR Confusion (v2)</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt"> <div class="PlainText">The PWR block was merged into the SMUIO block by revision 12 so we add<br> that to the smuio_12_0_0 headers.<br> <br> (v2): Drop nonsensical smuio_10_0_0 header<br> <br> Signed-off-by: Tom St Denis <a class="moz-txt-link-rfc2396E" href="mailto:tom.stdenis@amd.com"><tom.stdenis@amd.com></a><br> ---<br> .../gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h | 3 +++<br> .../drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h | 5 +++++<br> 2 files changed, 8 insertions(+)<br> <br> diff --git a/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h<br> index 327b4d09f66d..9bf73284ad73 100644<br> --- a/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h<br> +++ b/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h<br> @@ -24,4 +24,7 @@<br> #define mmSMUIO_GFX_MISC_CNTL 0x00c8<br> #define mmSMUIO_GFX_MISC_CNTL_BASE_IDX 0<br> <br> +#define mmPWR_MISC_CNTL_STATUS 0x0183<br> +#define mmPWR_MISC_CNTL_STATUS_BASE_IDX 1<br> +<br> #endif<br> diff --git a/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h<br> index d815452cfd15..26556fa3d054 100644<br> --- a/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h<br> +++ b/drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h<br> @@ -24,5 +24,10 @@<br> //SMUIO_GFX_MISC_CNTL<br> #define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS_MASK 0x00000006L<br> #define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS__SHIFT 0x1<br> +//PWR_MISC_CNTL_STATUS<br> +#define PWR_MISC_CNTL_STATUS__PWR_GFX_RLC_CGPG_EN__SHIFT 0x0<br> +#define PWR_MISC_CNTL_STATUS__PWR_GFXOFF_STATUS__SHIFT 0x1<br> +#define PWR_MISC_CNTL_STATUS__PWR_GFX_RLC_CGPG_EN_MASK 0x00000001L<br> +#define PWR_MISC_CNTL_STATUS__PWR_GFXOFF_STATUS_MASK 0x00000006L<br> <br> #endif<br> -- <br> 2.25.1<br> <br> _______________________________________________<br> amd-gfx mailing list<br> <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><br> <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C20b8d1812aac4516419c08d7d0f1de31%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637207609564642593&sdata=%2BT3BSejxB%2F3MsW8lfqAZ%2BiFfMXVG394Atnxi3K%2Bhjs8%3D&reserved=0" moz-do-not-send="true">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C20b8d1812aac4516419c08d7d0f1de31%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637207609564642593&sdata=%2BT3BSejxB%2F3MsW8lfqAZ%2BiFfMXVG394Atnxi3K%2Bhjs8%3D&reserved=0</a><br> </div> </span></font></div> </div> </blockquote> </body> </html>