drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
Subsystems (3)
PATCH 1/2 drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
Support Navi1x gfxoff state retrieving.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 ++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +2 -0
@@ -287,5 +287,7 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,void smu_v11_0_interrupt_work (struct smu_context *smu); +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -2482,6 +2482,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_fan_parameters = navi10_get_fan_parameters, .post_init = navi10_post_smu_init, .interrupt_work = smu_v11_0_interrupt_work, + .get_gfx_off_status = smu_v11_0_get_gfxoff_status, };void navi10_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +24 -0
@@ -2127,3 +2127,27 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,return ret; } + +/** +* smu_v11_0_get_gfxoff_status - get gfxoff status +* +* @smu: amdgpu_device pointer +* +* This function will be used to get gfxoff status +* +* Returns 0=GFXOFF(default). +* Returns 1=Transition out of GFX State. +* Returns 2=Not in GFXOFF. +* Returns 3=Transition into GFXOFF. +*/ +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t gfxOff_Status =0 ; +uint32_t reg; + + reg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_EXT_SCRATCH0); + gfxOff_Status = reg &0x3 ; + +return gfxOff_Status; +}
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/pm: fulfill the API for Sienna Cichlid gfxoff state retrieving
Support Sienna Cichlid gfxoff state retrieving.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
@@ -3332,6 +3332,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .get_fan_parameters = sienna_cichlid_get_fan_parameters, .interrupt_work = smu_v11_0_interrupt_work, .gpo_control = sienna_cichlid_gpo_control, + .get_gfx_off_status = smu_v11_0_get_gfxoff_status, };void sienna_cichlid_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
A few nit-picks, please check.
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Friday, January 15, 2021 5:34 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
Support Navi1x gfxoff state retrieving.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 ++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +2 -0
@@ -287,5 +287,7 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,void smu_v11_0_interrupt_work (struct smu_context *smu); +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -2482,6 +2482,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_fan_parameters = navi10_get_fan_parameters, .post_init = navi10_post_smu_init, .interrupt_work = smu_v11_0_interrupt_work, + .get_gfx_off_status = smu_v11_0_get_gfxoff_status, }; void navi10_set_ppt_funcs(struct smu_context *smu) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 147efe12973c..50566c613971 100644
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +5 -0
@@ -2127,3 +2127,27 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,return ret; } + +/** +* smu_v11_0_get_gfxoff_status - get gfxoff status +* +* @smu: amdgpu_device pointer
[Guchun]should be smu pointer?
+ *
+ * This function will be used to get gfxoff status
+ *
+ * Returns 0=GFXOFF(default).
+ * Returns 1=Transition out of GFX State.
+ * Returns 2=Not in GFXOFF.
+ * Returns 3=Transition into GFXOFF.
+ */
+uint32_t smu_v11_0_get_gfxoff_status(struct smu_context *smu) {
+ struct amdgpu_device *adev = smu->adev;
+ uint32_t gfxOff_Status = 0;
[Guchun] Any cause to use capital O and S in this variable?
+ uint32_t reg;
+
+ reg = RREG32_SOC15(MP1, 0, mmMP1_SMN_EXT_SCRATCH0);
+ gfxOff_Status = reg & 0x3;
+
+ return gfxOff_Status;
[Guchun] return reg&0x3 is more simple?
+}
--
2.29.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cguchun.chen%40amd.com%7C6736a835d7b34d71079f08d8b938c8a7%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637463000831854828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=CUVBdQmZcOsqKxzoB4ut89g1UFmCW5PNDR6vvPIwk%2FQ%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thanks, I will correct them.
BR
Evan
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Friday, January 15, 2021 5:51 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
[AMD Public Use]
A few nit-picks, please check.
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Friday, January 15, 2021 5:34 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
Support Navi1x gfxoff state retrieving.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 ++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +2 -0
@@ -287,5 +287,7 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,void smu_v11_0_interrupt_work (struct smu_context *smu); +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -2482,6 +2482,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_fan_parameters = navi10_get_fan_parameters, .post_init = navi10_post_smu_init, .interrupt_work = smu_v11_0_interrupt_work, + .get_gfx_off_status = smu_v11_0_get_gfxoff_status, }; void navi10_set_ppt_funcs(struct smu_context *smu) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 147efe12973c..50566c613971 100644
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +5 -0
@@ -2127,3 +2127,27 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,return ret; } + +/** +* smu_v11_0_get_gfxoff_status - get gfxoff status +* +* @smu: amdgpu_device pointer
[Guchun]should be smu pointer?
+ *
+ * This function will be used to get gfxoff status
+ *
+ * Returns 0=GFXOFF(default).
+ * Returns 1=Transition out of GFX State.
+ * Returns 2=Not in GFXOFF.
+ * Returns 3=Transition into GFXOFF.
+ */
+uint32_t smu_v11_0_get_gfxoff_status(struct smu_context *smu) {
+ struct amdgpu_device *adev = smu->adev;
+ uint32_t gfxOff_Status = 0;
[Guchun] Any cause to use capital O and S in this variable?
+ uint32_t reg;
+
+ reg = RREG32_SOC15(MP1, 0, mmMP1_SMN_EXT_SCRATCH0);
+ gfxOff_Status = reg & 0x3;
+
+ return gfxOff_Status;
[Guchun] return reg&0x3 is more simple?
+}
--
2.29.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cguchun.chen%40amd.com%7C6736a835d7b34d71079f08d8b938c8a7%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637463000831854828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=CUVBdQmZcOsqKxzoB4ut89g1UFmCW5PNDR6vvPIwk%2FQ%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Can you help explain why we need introduce such a callback? Seems it has presupposed pmfw's internal Implementation.
Regards,
Jiansong
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Friday, January 15, 2021 5:34 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
Support Navi1x gfxoff state retrieving.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 ++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +2 -0
@@ -287,5 +287,7 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,void smu_v11_0_interrupt_work (struct smu_context *smu); +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -2482,6 +2482,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_fan_parameters = navi10_get_fan_parameters, .post_init = navi10_post_smu_init, .interrupt_work = smu_v11_0_interrupt_work, +.get_gfx_off_status = smu_v11_0_get_gfxoff_status, }; void navi10_set_ppt_funcs(struct smu_context *smu) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 147efe12973c..50566c613971 100644
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +23 -0
@@ -2127,3 +2127,27 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,return ret; } + +/** +* smu_v11_0_get_gfxoff_status - get gfxoff status +* +* @smu: amdgpu_device pointer +* +* This function will be used to get gfxoff status +* +* Returns 0=GFXOFF(default). +* Returns 1=Transition out of GFX State. +* Returns 2=Not in GFXOFF. +* Returns 3=Transition into GFXOFF. +*/ +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu) { +struct amdgpu_device *adev = smu->adev; +uint32_t gfxOff_Status =0 ; +uint32_t reg; + +reg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_EXT_SCRATCH0); +gfxOff_Status = reg &0x3 ; + +return gfxOff_Status; +}
--
2.29.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CJiansong.Chen%40amd.com%7C72d2ceab33474d94460908d8b938c75a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637463000820920597%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3WeEJ8EjgUYyA%2FAF7r30%2BOCEPNkfLwsPWuFhEIfRkU0%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
This will help gfxoff related issue debugging. Similar implementations were already added for APUs.
BR
Evan
-----Original Message-----
From: Chen, Jiansong (Simon) <[email protected]>
Sent: Friday, January 15, 2021 11:01 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
[AMD Public Use]
Can you help explain why we need introduce such a callback? Seems it has presupposed pmfw's internal Implementation.
Regards,
Jiansong
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Friday, January 15, 2021 5:34 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/pm: fulfill the API for navi1x gfxoff state retrieving
Support Navi1x gfxoff state retrieving.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 ++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +2 -0
@@ -287,5 +287,7 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,void smu_v11_0_interrupt_work (struct smu_context *smu); +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -2482,6 +2482,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_fan_parameters = navi10_get_fan_parameters, .post_init = navi10_post_smu_init, .interrupt_work = smu_v11_0_interrupt_work, +.get_gfx_off_status = smu_v11_0_get_gfxoff_status, }; void navi10_set_ppt_funcs(struct smu_context *smu) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 147efe12973c..50566c613971 100644
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +22 -0
@@ -2127,3 +2127,27 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,return ret; } + +/** +* smu_v11_0_get_gfxoff_status - get gfxoff status +* +* @smu: amdgpu_device pointer +* +* This function will be used to get gfxoff status +* +* Returns 0=GFXOFF(default). +* Returns 1=Transition out of GFX State. +* Returns 2=Not in GFXOFF. +* Returns 3=Transition into GFXOFF. +*/ +uint32_t smu_v11_0_get_gfxoff_status (struct smu_context *smu) {struct +amdgpu_device *adev = smu->adev;uint32_t gfxOff_Status =0 ;uint32_t +reg; + +reg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_EXT_SCRATCH0); gfxOff_Status = reg +&0x3 ; + +return gfxOff_Status; +}
--
2.29.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CJiansong.Chen%40amd.com%7C72d2ceab33474d94460908d8b938c75a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637463000820920597%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3WeEJ8EjgUYyA%2FAF7r30%2BOCEPNkfLwsPWuFhEIfRkU0%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx