Skip to contentSkip to conversation

drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

PATCH In review Evan Quan 4 participants 8 messages Sep 24, 2020 – Sep 25, 2020

Subsystems (3)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +12 -31
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
 	if (smu->dc_controlled_by_gpio)
 		*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_ACDC_BIT);
 
+	if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+		*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+	/* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+	if (!(is_asic_secure(smu) &&
+	     (adev->asic_type == CHIP_NAVI10) &&
+	     (adev->rev_id == 0)) &&
+	    (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+		*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+				| FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+				| FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
 	/* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
 	if (is_asic_secure(smu) &&
 	    (adev->asic_type == CHIP_NAVI10) &&
@@ -2629,43 +2641,12 @@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)
 
 static int navi10_post_smu_init(struct smu_context *smu)
 {
-	struct smu_feature *feature = &smu->smu_feature;
 	struct amdgpu_device *adev = smu->adev;
-	uint64_t feature_mask = 0;
 	int ret = 0;
 
 	if (amdgpu_sriov_vf(adev))
 		return 0;
 
-	/* For Naiv1x, enable these features only after DAL initialization */
-	if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-		feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-	/* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-	if (!(is_asic_secure(smu) &&
-	     (adev->asic_type == CHIP_NAVI10) &&
-	     (adev->rev_id == 0)) &&
-	    (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-		feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-				| FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-				| FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-	if (!feature_mask)
-		return 0;
-
-	bitmap_or(feature->allowed,
-		  feature->allowed,
-		  (unsigned long *)(&feature_mask),
-		  SMU_FEATURE_MAX);
-
-	ret = smu_cmn_feature_update_enable_state(smu,
-						  feature_mask,
-						  true);
-	if (ret) {
-		dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-		return ret;
-	}
-
 	ret = navi10_run_umc_cdr_workaround(smu);
 	if (ret) {
 		dev_err(adev->dev, "Failed to apply umc cdr workaround!\n");
Signature · 6 lines
2.28.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 74 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +12 -32
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) &&
@@ -2629,43 +2641,12 @@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)
 
 static int navi10_post_smu_init(struct smu_context *smu)
 {
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr workaround!\n");
--

2.28.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author Acked-by Alex Deucher
#2 lore raw

[AMD Official Use Only - Internal Distribution Only]

That(postpone SOCCLK/UCLK enablement) will be revised and added back after confirmed with DAL team. For now, we just revert it to get around the screen flicker issue introduced.

BR
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, September 24, 2020 9:01 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Quoted 7 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 78 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +14 -0
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |=
 FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |=
+ FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               |
+ FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) && @@ -2629,43 +2641,12

@@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

static int navi10_post_smu_init(struct smu_context *smu) {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -31
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr

workaround!\n");
--
2.28.0

Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cev an.quan%40amd.com%7C3899143b7990458f882c08d86089df67%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637365492561293539&amp;sdata=J%2FM6YSLX6d% 2BMO%2B%2FWzdKAW7JlVZM%2FMFRDpTfi6UHkozk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

maintainer Acked-by Acked-by
#3 lore raw

[AMD Official Use Only - Internal Distribution Only]

Thanks.

________________________________
From: Quan, Evan <[email protected]>
Sent: Thursday, September 24, 2020 11:38 PM
To: Alex Deucher <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: RE: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

[AMD Official Use Only - Internal Distribution Only]

That(postpone SOCCLK/UCLK enablement) will be revised and added back after confirmed with DAL team. For now, we just revert it to get around the screen flicker issue introduced.

BR
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, September 24, 2020 9:01 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Quoted 7 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 78 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +14 -0
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |=
 FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |=
+ FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               |
+ FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) && @@ -2629,43 +2641,12

@@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

static int navi10_post_smu_init(struct smu_context *smu) {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -31
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr

workaround!\n");
--
2.28.0

Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cev an.quan%40amd.com%7C3899143b7990458f882c08d86089df67%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637365492561293539&amp;sdata=J%2FM6YSLX6d% 2BMO%2B%2FWzdKAW7JlVZM%2FMFRDpTfi6UHkozk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#4 lore raw
In reply to Quan, Evan

Sorry to bother you guys, but trying to learn about some of these things, and I'm tracking the issue this relates to pretty closely on GitLab.

What does DAL stand for in this context?

Thanks in advance for the help,
Matt

Quoted 105 lines · Evan

[AMD Official Use Only - Internal Distribution Only]

That(postpone SOCCLK/UCLK enablement) will be revised and added back after confirmed with DAL team. For now, we just revert it to get around the screen flicker issue introduced.

BR
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, September 24, 2020 9:01 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Quoted 7 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 78 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +14 -0
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |=
 FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |=
+ FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               |
+ FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) && @@ -2629,43 +2641,12

@@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

static int navi10_post_smu_init(struct smu_context *smu) {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -31
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr

workaround!\n");
--
2.28.0

Quoted 13 lines
Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cev an.quan%40amd.com%7C3899143b7990458f882c08d86089df67%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637365492561293539&amp;sdata=J%2FM6YSLX6d% 2BMO%2B%2FWzdKAW7JlVZM%2FMFRDpTfi6UHkozk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw
Quoted 5 lines · Matt Coffin

Sorry to bother you guys, but trying to learn about some of these things, and I'm tracking the issue this relates to pretty closely on GitLab.

What does DAL stand for in this context?

DAL is the name of the display team within AMD.

Alex

Quoted 124 lines

Thanks in advance for the help,
Matt

Quoted 118 lines · Evan

[AMD Official Use Only - Internal Distribution Only]

That(postpone SOCCLK/UCLK enablement) will be revised and added back after confirmed with DAL team. For now, we just revert it to get around the screen flicker issue introduced.

BR
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, September 24, 2020 9:01 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Quoted 7 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 78 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +14 -0
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |=
 FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |=
+ FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               |
+ FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) && @@ -2629,43 +2641,12

@@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

static int navi10_post_smu_init(struct smu_context *smu) {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -31
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr

workaround!\n");
--
2.28.0

Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cev an.quan%40amd.com%7C3899143b7990458f882c08d86089df67%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637365492561293539&amp;sdata=J%2FM6YSLX6d% 2BMO%2B%2FWzdKAW7JlVZM%2FMFRDpTfi6UHkozk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#6 lore raw

Thanks for the quick reply,

Would it make sense, since there seem to be issues with both before/after initialization, to (temporarily?) add a module parameter for users so that they can switch between these two behaviors easily based on what works for them?

If so, if you can toss me a hint at what name for the param would make sense, I can take a crack at a patch for it, for debugging by the people in the issue on GitLab.

Cheers, and thanks for the time,
Matt

GL issue for reference:
https://gitlab.freedesktop.org/drm/amd/-/issues/1260

Quoted 135 lines · Alex Deucher
Quoted 5 lines · Matt Coffin

Sorry to bother you guys, but trying to learn about some of these things, and I'm tracking the issue this relates to pretty closely on GitLab.

What does DAL stand for in this context?

DAL is the name of the display team within AMD.

Alex

Quoted 124 lines

Thanks in advance for the help,
Matt

Quoted 118 lines · Evan

[AMD Official Use Only - Internal Distribution Only]

That(postpone SOCCLK/UCLK enablement) will be revised and added back after confirmed with DAL team. For now, we just revert it to get around the screen flicker issue introduced.

BR
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, September 24, 2020 9:01 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Quoted 7 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 78 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +14 -0
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |=
 FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |=
+ FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               |
+ FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) && @@ -2629,43 +2641,12

@@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

static int navi10_post_smu_init(struct smu_context *smu) {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -31
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr

workaround!\n");
--
2.28.0

Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cev an.quan%40amd.com%7C3899143b7990458f882c08d86089df67%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637365492561293539&amp;sdata=J%2FM6YSLX6d% 2BMO%2B%2FWzdKAW7JlVZM%2FMFRDpTfi6UHkozk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#7 lore raw
Quoted 7 lines · Matt Coffin

Thanks for the quick reply,

Would it make sense, since there seem to be issues with both before/after initialization, to (temporarily?) add a module parameter for users so that they can switch between these two behaviors easily based on what works for them?

I'd rather work on a proper fix. module options tend to lead to more problems than they solve as people tend blindly apply them.

Alex

Quoted 5 lines

If so, if you can toss me a hint at what name for the param would make sense, I can take a crack at a patch for it, for debugging by the people in the issue on GitLab.

Quoted 143 lines

Cheers, and thanks for the time,
Matt

GL issue for reference:
https://gitlab.freedesktop.org/drm/amd/-/issues/1260

Quoted 135 lines · Alex Deucher
Quoted 5 lines · Matt Coffin

Sorry to bother you guys, but trying to learn about some of these things, and I'm tracking the issue this relates to pretty closely on GitLab.

What does DAL stand for in this context?

DAL is the name of the display team within AMD.

Alex

Quoted 124 lines

Thanks in advance for the help,
Matt

Quoted 118 lines · Evan

[AMD Official Use Only - Internal Distribution Only]

That(postpone SOCCLK/UCLK enablement) will be revised and added back after confirmed with DAL team. For now, we just revert it to get around the screen flicker issue introduced.

BR
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, September 24, 2020 9:01 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: fix screen flicker seen on Navi14 with 2*4K monitors

Quoted 7 lines · Evan Quan

Revert the guilty change introduced by the commit below:
drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2)

Change-Id I0cab619ffdf0f83b14ba5d2907e1b9c02a984e2f

Won't this effectively disable the potential fix for multiple monitors at boot time?

Quoted 78 lines
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +14 -0
index 1695b36dc23c..be44cb941e73 100644
@@ -316,6 +316,18 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
                *(uint64_t *)feature_mask |=
 FEATURE_MASK(FEATURE_ACDC_BIT);
 
+       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
+               *(uint64_t *)feature_mask |=
+ FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
+
+       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
+       if (!(is_asic_secure(smu) &&
+            (adev->asic_type == CHIP_NAVI10) &&
+            (adev->rev_id == 0)) &&
+           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
+               *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
+                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
+                               |
+ FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
+
        /* DS SOCCLK enablement should be skipped for navi10 A0 secure board */
        if (is_asic_secure(smu) &&
            (adev->asic_type == CHIP_NAVI10) && @@ -2629,43 +2641,12

@@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

static int navi10_post_smu_init(struct smu_context *smu) {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -31
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
-       uint64_t feature_mask = 0;
        int ret = 0;
 
        if (amdgpu_sriov_vf(adev))
                return 0;
 
-       /* For Naiv1x, enable these features only after DAL initialization */
-       if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
-
-       /* DPM UCLK enablement should be skipped for navi10 A0 secure board */
-       if (!(is_asic_secure(smu) &&
-            (adev->asic_type == CHIP_NAVI10) &&
-            (adev->rev_id == 0)) &&
-           (adev->pm.pp_feature & PP_MCLK_DPM_MASK))
-               feature_mask |= FEATURE_MASK(FEATURE_DPM_UCLK_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_VDDCI_SCALING_BIT)
-                               | FEATURE_MASK(FEATURE_MEM_MVDD_SCALING_BIT);
-
-       if (!feature_mask)
-               return 0;
-
-       bitmap_or(feature->allowed,
-                 feature->allowed,
-                 (unsigned long *)(&feature_mask),
-                 SMU_FEATURE_MAX);
-
-       ret = smu_cmn_feature_update_enable_state(smu,
-                                                 feature_mask,
-                                                 true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to post uclk/socclk dpm enablement!\n");
-               return ret;
-       }
-
        ret = navi10_run_umc_cdr_workaround(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr

workaround!\n");
--
2.28.0

Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cev an.quan%40amd.com%7C3899143b7990458f882c08d86089df67%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637365492561293539&amp;sdata=J%2FM6YSLX6d% 2BMO%2B%2FWzdKAW7JlVZM%2FMFRDpTfi6UHkozk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx