Skip to contentSkip to conversation

drm/amd/display: Fix bug use wrong pp interface

PATCH Superseded Rex Zhu 3 participants 3 messages Aug 16, 2018 2 messages not in the archive

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/1 drm/amd/display: Fix bug use wrong pp interface

Used wrong pp interface, the original interface is exposed by dpm on SI and paritial CI.

Pointed out by Francis David <[email protected]>

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +7 -2
index e5c5b0a..85b72d459 100644
@@ -480,12 +480,17 @@ void pp_rv_set_display_requirement(struct pp_smu *pp,
 {
 	const struct dc_context *ctx = pp->dm;
 	struct amdgpu_device *adev = ctx->driver_context;
+	void *pp_handle = adev->powerplay.pp_handle;
 	const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
 
-	if (!pp_funcs || !pp_funcs->display_configuration_changed)
+	if (!req || !pp_funcs || !pp_funcs->display_configuration_changed)
 		return;
 
-	amdgpu_dpm_display_configuration_changed(adev);
+	adev->pm.pm_display_cfg.min_dcef_deep_sleep_set_clk = req->min_deep_sleep_dcefclk_mhz/10;
+	adev->pm.pm_display_cfg.min_dcef_set_clk = req->hard_min_dcefclk_khz/10;
+	adev->pm.pm_display_cfg.num_display = req->display_count;
+	adev->pm.pm_display_cfg.min_core_set_clock = req->hard_min_fclk_khz/10;
+	pp_funcs->display_configuration_change(pp_handle, &adev->pm.pm_display_cfg);
 }
 
 void pp_rv_set_wm_ranges(struct pp_smu *pp,
Signature · 6 lines
1.9.1

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

A message that is not in the archive (sent off-list or not yet received): 1534390959-11954-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

#2 lore raw

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Wednesday, August 15, 2018 11:42:39 PM
To: [email protected]; Francis, David
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/display: Fix bug use wrong pp interface

Used wrong pp interface, the original interface is exposed by dpm on SI and paritial CI.

Pointed out by Francis David <[email protected]>

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +7 -2
index e5c5b0a..85b72d459 100644
@@ -480,12 +480,17 @@ void pp_rv_set_display_requirement(struct pp_smu *pp,
 {
         const struct dc_context *ctx = pp->dm;
         struct amdgpu_device *adev = ctx->driver_context;
+       void *pp_handle = adev->powerplay.pp_handle;
         const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
 
-       if (!pp_funcs || !pp_funcs->display_configuration_changed)
+       if (!req || !pp_funcs || !pp_funcs->display_configuration_changed)
                 return;
 
-       amdgpu_dpm_display_configuration_changed(adev);
+       adev->pm.pm_display_cfg.min_dcef_deep_sleep_set_clk = req->min_deep_sleep_dcefclk_mhz/10;
+       adev->pm.pm_display_cfg.min_dcef_set_clk = req->hard_min_dcefclk_khz/10;
+       adev->pm.pm_display_cfg.num_display = req->display_count;
+       adev->pm.pm_display_cfg.min_core_set_clock = req->hard_min_fclk_khz/10;
+       pp_funcs->display_configuration_change(pp_handle, &adev->pm.pm_display_cfg);
 }
 
 void pp_rv_set_wm_ranges(struct pp_smu *pp,

--
1.9.1

_______________________________________________
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

A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1809A7A1C222494983990651F73E0-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

Reviewed-by
#4 lore raw
Quoted 9 lines · Alexander

________________________________
From: amd-gfx <[email protected]> on behalf of Rex Zhu <[email protected]>
Sent: Wednesday, August 15, 2018 11:42:39 PM
To: [email protected]; Francis, David
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/display: Fix bug use wrong pp interface

Quoted 5 lines

Used wrong pp interface, the original interface is exposed by dpm on SI and paritial CI.

Pointed out by Francis David <[email protected]>

We can write the comment as below:

Others look good for me.

Quoted 37 lines
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +7 -3
index e5c5b0a..85b72d459 100644
@@ -480,12 +480,17 @@ void pp_rv_set_display_requirement(struct pp_smu *pp,
 {
         const struct dc_context *ctx = pp->dm;
         struct amdgpu_device *adev = ctx->driver_context;
+       void *pp_handle = adev->powerplay.pp_handle;
         const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
 
-       if (!pp_funcs || !pp_funcs->display_configuration_changed)
+       if (!req || !pp_funcs || !pp_funcs->display_configuration_changed)
                 return;
 
-       amdgpu_dpm_display_configuration_changed(adev);
+       adev->pm.pm_display_cfg.min_dcef_deep_sleep_set_clk = req->min_deep_sleep_dcefclk_mhz/10;
+       adev->pm.pm_display_cfg.min_dcef_set_clk = req->hard_min_dcefclk_khz/10;
+       adev->pm.pm_display_cfg.num_display = req->display_count;
+       adev->pm.pm_display_cfg.min_core_set_clock = req->hard_min_fclk_khz/10;
+       pp_funcs->display_configuration_change(pp_handle, &adev->pm.pm_display_cfg);
 }
 
 void pp_rv_set_wm_ranges(struct pp_smu *pp,
--

1.9.1

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

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