Skip to content

Commit

Permalink
drm/amd/display: implement shared PSR-SU sink validation helper
Browse files Browse the repository at this point in the history
[why]
creating a generic helper for AMD specific PSR-SU sink validation.
Moving the function to the power module to reference it across all
OS.

[how]
- drop PSRSU specific sink validation helper and move to power
  module by reading PSR version and other PSR caps
- call the new helper from linux DM (amdgpu_dm_psr)

Acked-by: Pavle Kotarac <Pavle.Kotarac@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: David Zhang <dingchen.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
David Zhang authored and Alex Deucher committed Apr 13, 2022
1 parent 72907bf commit 9dd9410
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "dc.h"
#include "dm_helpers.h"
#include "amdgpu_dm.h"
#include "modules/power/power_helpers.h"

#ifdef CONFIG_DRM_AMD_DC_DCN
static bool link_supports_psrsu(struct dc_link *link)
Expand All @@ -39,6 +40,9 @@ static bool link_supports_psrsu(struct dc_link *link)
if (dc->ctx->dce_version < DCN_VERSION_3_1)
return false;

if (!is_psr_su_specific_panel(link))
return false;

if (!link->dpcd_caps.alpm_caps.bits.AUX_WAKE_ALPM_CAP ||
!link->dpcd_caps.psr_info.psr_dpcd_caps.bits.Y_COORDINATE_REQUIRED)
return false;
Expand Down Expand Up @@ -79,7 +83,10 @@ void amdgpu_dm_set_psr_caps(struct dc_link *link)
link->psr_settings.psr_feature_enabled = true;
}

DRM_INFO("PSR support:%d\n", link->psr_settings.psr_feature_enabled);
DRM_INFO("PSR support %d, DC PSR ver %d, sink PSR ver %d\n",
link->psr_settings.psr_feature_enabled,
link->psr_settings.psr_version,
link->dpcd_caps.psr_info.psr_version);

}

Expand Down
38 changes: 38 additions & 0 deletions drivers/gpu/drm/amd/display/modules/power/power_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -784,3 +784,41 @@ bool dmcu_load_iram(struct dmcu *dmcu,
return result;
}

/*
* is_psr_su_specific_panel() - check if sink is AMD vendor-specific PSR-SU
* supported eDP device.
*
* @link: dc link pointer
*
* Return: true if AMDGPU vendor specific PSR-SU eDP panel
*/
bool is_psr_su_specific_panel(struct dc_link *link)
{
if (link->dpcd_caps.edp_rev >= DP_EDP_14) {
if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
return true;
/*
* Some panels will report PSR capabilities over additional DPCD bits.
* Such panels are approved despite reporting only PSR v3, as long as
* the additional bits are reported.
*/
if (link->dpcd_caps.psr_info.psr_version < DP_PSR2_WITH_Y_COORD_IS_SUPPORTED)
return false;

if (link->dpcd_caps.sink_dev_id == DP_BRANCH_DEVICE_ID_001CF8) {
/*
* FIXME:
* This is the temporary workaround to disable PSRSU when system turned on
* DSC function on the sepcific sink. Once the PSRSU + DSC is fixed, this
* condition should be removed.
*/
if (link->dpcd_caps.dsc_caps.dsc_basic_caps.fields.dsc_support.DSC_SUPPORT)
return false;

if (link->dpcd_caps.psr_info.force_psrsu_cap == 0x1)
return true;
}
}

return false;
}
1 change: 1 addition & 0 deletions drivers/gpu/drm/amd/display/modules/power/power_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ bool dmub_init_abm_config(struct resource_pool *res_pool,
struct dmcu_iram_parameters params,
unsigned int inst);

bool is_psr_su_specific_panel(struct dc_link *link);
#endif /* MODULES_POWER_POWER_HELPERS_H_ */

0 comments on commit 9dd9410

Please sign in to comment.