summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrex zhu <rex.zhu@amd.com>2018-07-02 16:20:56 +0800
committerAlex Deucher <alexander.deucher@amd.com>2018-07-05 16:39:56 -0500
commitd4d5eace210d3676202153c19e473aeb51a81909 (patch)
tree6e556a597e87dd57835e2c45f8717d4769860532
parent3180fb676d7fd38a7c1effa2e5d9265779473c23 (diff)
drm/amd/display: Notify powerplay the display controller id
powerplay can recalculate the number of active display Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
index 2e801bab5a78..81845116cdcc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
@@ -41,6 +41,7 @@ bool dm_pp_apply_display_requirements(
const struct dm_pp_display_configuration *pp_display_cfg)
{
struct amdgpu_device *adev = ctx->driver_context;
+ int i;
if (adev->pm.dpm_enabled) {
@@ -95,6 +96,12 @@ bool dm_pp_apply_display_requirements(
adev->pm.pm_display_cfg.crossfire_display_index = -1;
adev->pm.pm_display_cfg.min_bus_bandwidth = 0;
+ for (i = 0; i < pp_display_cfg->display_count; i++) {
+ const struct dm_pp_single_disp_config *dc_cfg =
+ &pp_display_cfg->disp_configs[i];
+ adev->pm.pm_display_cfg.displays[i].controller_id = dc_cfg->pipe_idx + 1;
+ }
+
/* TODO: complete implementation of
* pp_display_configuration_change().
* Follow example of: