leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: Block 6Ghz timing if SBIOS set HDMI_6G_en to 0

Browse Source 
Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Charlene Liu 2017-08-22 20:15:28 -04:00 committed by Alex Deucher
parent 0f0bdca5ca
commit 577b5c2b51
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
View File

@ -1853,6 +1853,7 @@ static enum bp_result bios_parser_get_encoder_cap_info(
info->DP_HBR2_EN = record->usHBR2En; info->DP_HBR2_EN = record->usHBR2En;
info->DP_HBR3_EN = record->usHBR3En; info->DP_HBR3_EN = record->usHBR3En;
info->HDMI_6GB_EN = record->usHDMI6GEn;
return BP_RESULT_OK; return BP_RESULT_OK;
} }

4
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
View File

@ -887,6 +887,9 @@ static bool dce110_link_encoder_validate_hdmi_output(
crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR420) crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR420)
return false; return false;
if (!enc110->base.features.flags.bits.HDMI_6GB_EN &&
adjusted_pix_clk_khz >= 300000)
return false;
return true; return true;
} }
@ -1008,6 +1011,7 @@ bool dce110_link_encoder_construct(
bp_cap_info.DP_HBR2_EN; bp_cap_info.DP_HBR2_EN;
enc110->base.features.flags.bits.IS_HBR3_CAPABLE = enc110->base.features.flags.bits.IS_HBR3_CAPABLE =
bp_cap_info.DP_HBR3_EN; bp_cap_info.DP_HBR3_EN;
enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
} }
return true; return true;

1
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
View File

@ -37,6 +37,7 @@ struct encoder_feature_support {
uint32_t IS_TPS3_CAPABLE:1; uint32_t IS_TPS3_CAPABLE:1;
uint32_t IS_TPS4_CAPABLE:1; uint32_t IS_TPS4_CAPABLE:1;
uint32_t IS_YCBCR_CAPABLE:1; uint32_t IS_YCBCR_CAPABLE:1;
uint32_t HDMI_6GB_EN:1;
} bits; } bits;
uint32_t raw; uint32_t raw;
} flags; } flags;