[PATCH 1/2] drm/amdgpu: update smu_v11_0_pptable.h

[Alex Deucher]

On Fri, Feb 7, 2020 at 2:36 AM Quan, Evan <Evan.Quan at amd.com> wrote:
>
> >     SMU_11_0_ODFEATURE_COUNT                = 14,
> This seems a little weird.
> Maybe it should be "SMU_11_0_ODFEATURE_COUNT = 1 << SMU_11_0_ODCAP_COUNT, "

I copied it verbatim.  The naming makes more sense as 14 (number of
features) as opposed to 1 << 14.  I agree it's not consistent though.
I'd prefer to stay consistent with the internal headers.

Alex

> With above confirmed, the patch series is reviewed-by: Evan Quan <evan.quan at amd.com>
>
> >-----Original Message-----
> >From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
> >Deucher
> >Sent: Friday, February 7, 2020 3:55 AM
> >To: amd-gfx at lists.freedesktop.org
> >Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> >Subject: [PATCH 1/2] drm/amdgpu: update smu_v11_0_pptable.h
> >
> >Update to the latest changes.
> >
> >Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> >---
> > .../drm/amd/powerplay/inc/smu_v11_0_pptable.h | 46 +++++++++++++-----
> >-
> > 1 file changed, 32 insertions(+), 14 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h
> >b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h
> >index b2f96a101124..7a63cf8e85ed 100644
> >--- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h
> >+++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h
> >@@ -39,21 +39,39 @@
> > #define SMU_11_0_PP_OVERDRIVE_VERSION                   0x0800
> > #define SMU_11_0_PP_POWERSAVINGCLOCK_VERSION            0x0100
> >
> >+enum SMU_11_0_ODFEATURE_CAP {
> >+    SMU_11_0_ODCAP_GFXCLK_LIMITS = 0,
> >+    SMU_11_0_ODCAP_GFXCLK_CURVE,
> >+    SMU_11_0_ODCAP_UCLK_MAX,
> >+    SMU_11_0_ODCAP_POWER_LIMIT,
> >+    SMU_11_0_ODCAP_FAN_ACOUSTIC_LIMIT,
> >+    SMU_11_0_ODCAP_FAN_SPEED_MIN,
> >+    SMU_11_0_ODCAP_TEMPERATURE_FAN,
> >+    SMU_11_0_ODCAP_TEMPERATURE_SYSTEM,
> >+    SMU_11_0_ODCAP_MEMORY_TIMING_TUNE,
> >+    SMU_11_0_ODCAP_FAN_ZERO_RPM_CONTROL,
> >+    SMU_11_0_ODCAP_AUTO_UV_ENGINE,
> >+    SMU_11_0_ODCAP_AUTO_OC_ENGINE,
> >+    SMU_11_0_ODCAP_AUTO_OC_MEMORY,
> >+    SMU_11_0_ODCAP_FAN_CURVE,
> >+    SMU_11_0_ODCAP_COUNT,
> >+};
> >+
> > enum SMU_11_0_ODFEATURE_ID {
> >-    SMU_11_0_ODFEATURE_GFXCLK_LIMITS        = 1 << 0,         //GFXCLK Limit
> >feature
> >-    SMU_11_0_ODFEATURE_GFXCLK_CURVE         = 1 << 1,         //GFXCLK Curve
> >feature
> >-    SMU_11_0_ODFEATURE_UCLK_MAX             = 1 << 2,         //UCLK Limit
> >feature
> >-    SMU_11_0_ODFEATURE_POWER_LIMIT          = 1 << 3,         //Power Limit
> >feature
> >-    SMU_11_0_ODFEATURE_FAN_ACOUSTIC_LIMIT   = 1 << 4,         //Fan
> >Acoustic RPM feature
> >-    SMU_11_0_ODFEATURE_FAN_SPEED_MIN        = 1 << 5,         //Minimum
> >Fan Speed feature
> >-    SMU_11_0_ODFEATURE_TEMPERATURE_FAN      = 1 << 6,         //Fan Target
> >Temperature Limit feature
> >-    SMU_11_0_ODFEATURE_TEMPERATURE_SYSTEM   = 1 << 7,
> >//Operating Temperature Limit feature
> >-    SMU_11_0_ODFEATURE_MEMORY_TIMING_TUNE   = 1 << 8,         //AC
> >Timing Tuning feature
> >-    SMU_11_0_ODFEATURE_FAN_ZERO_RPM_CONTROL = 1 << 9,         //Zero
> >RPM feature
> >-    SMU_11_0_ODFEATURE_AUTO_UV_ENGINE       = 1 << 10,        //Auto
> >Under Volt GFXCLK feature
> >-    SMU_11_0_ODFEATURE_AUTO_OC_ENGINE       = 1 << 11,        //Auto Over
> >Clock GFXCLK feature
> >-    SMU_11_0_ODFEATURE_AUTO_OC_MEMORY       = 1 << 12,        //Auto
> >Over Clock MCLK feature
> >-    SMU_11_0_ODFEATURE_FAN_CURVE            = 1 << 13,        //VICTOR TODO
> >+    SMU_11_0_ODFEATURE_GFXCLK_LIMITS        = 1 <<
> >SMU_11_0_ODCAP_GFXCLK_LIMITS,            //GFXCLK Limit feature
> >+    SMU_11_0_ODFEATURE_GFXCLK_CURVE         = 1 <<
> >SMU_11_0_ODCAP_GFXCLK_CURVE,             //GFXCLK Curve feature
> >+    SMU_11_0_ODFEATURE_UCLK_MAX             = 1 <<
> >SMU_11_0_ODCAP_UCLK_MAX,                 //UCLK Limit feature
> >+    SMU_11_0_ODFEATURE_POWER_LIMIT          = 1 <<
> >SMU_11_0_ODCAP_POWER_LIMIT,              //Power Limit feature
> >+    SMU_11_0_ODFEATURE_FAN_ACOUSTIC_LIMIT   = 1 <<
> >SMU_11_0_ODCAP_FAN_ACOUSTIC_LIMIT,       //Fan Acoustic RPM feature
> >+    SMU_11_0_ODFEATURE_FAN_SPEED_MIN        = 1 <<
> >SMU_11_0_ODCAP_FAN_SPEED_MIN,            //Minimum Fan Speed feature
> >+    SMU_11_0_ODFEATURE_TEMPERATURE_FAN      = 1 <<
> >SMU_11_0_ODCAP_TEMPERATURE_FAN,          //Fan Target Temperature
> >Limit feature
> >+    SMU_11_0_ODFEATURE_TEMPERATURE_SYSTEM   = 1 <<
> >SMU_11_0_ODCAP_TEMPERATURE_SYSTEM,       //Operating Temperature
> >Limit feature
> >+    SMU_11_0_ODFEATURE_MEMORY_TIMING_TUNE   = 1 <<
> >SMU_11_0_ODCAP_MEMORY_TIMING_TUNE,       //AC Timing Tuning feature
> >+    SMU_11_0_ODFEATURE_FAN_ZERO_RPM_CONTROL = 1 <<
> >SMU_11_0_ODCAP_FAN_ZERO_RPM_CONTROL,     //Zero RPM feature
> >+    SMU_11_0_ODFEATURE_AUTO_UV_ENGINE       = 1 <<
> >SMU_11_0_ODCAP_AUTO_UV_ENGINE,           //Auto Under Volt GFXCLK
> >feature
> >+    SMU_11_0_ODFEATURE_AUTO_OC_ENGINE       = 1 <<
> >SMU_11_0_ODCAP_AUTO_OC_ENGINE,           //Auto Over Clock GFXCLK
> >feature
> >+    SMU_11_0_ODFEATURE_AUTO_OC_MEMORY       = 1 <<
> >SMU_11_0_ODCAP_AUTO_OC_MEMORY,           //Auto Over Clock MCLK
> >feature
> >+    SMU_11_0_ODFEATURE_FAN_CURVE            = 1 <<
> >SMU_11_0_ODCAP_FAN_CURVE,                //Fan Curve feature
> >     SMU_11_0_ODFEATURE_COUNT                = 14,
> > };
> > #define SMU_11_0_MAX_ODFEATURE    32          //Maximum Number of OD
> >Features
> >--
> >2.24.1
> >
> >_______________________________________________
> >amd-gfx mailing list
> >amd-gfx at lists.freedesktop.org
> >https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.f
> >reedesktop.org%2Fmailman%2Flistinfo%2Famd-
> >gfx&data=02%7C01%7Cevan.quan%40amd.com%7C99774c3d5dfa4e98e6
> >e408d7ab3e83c6%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637
> >166157332486214&sdata=n8ey1rnXwX3JLecL%2BWnNSV6cNNGTagtn2lR
> >ORmI%2Bb%2Bk%3D&reserved=0