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

drm/amd/display: temporary clamp the vratio used to 1.0

Browse Source 
[Why]
in Is_Support function, driver report different caps between
same timing but different scaling cause OS inconsistent.

[How]
min_row_time is a local that’s only used for verifying immediate
flip support. Clamp the vratio used for its calculation to 1.0.

Signed-off-by: Lewis Huang <Lewis.Huang@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Lewis Huang 2020-04-22 10:01:23 +08:00 committed by Alex Deucher
parent f00889dc71
commit b130cc4eec
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c
View File

@ -3190,6 +3190,7 @@ static void CalculateFlipSchedule(
double TimeForFetchingRowInVBlankImmediateFlip; double TimeForFetchingRowInVBlankImmediateFlip;
double ImmediateFlipBW; double ImmediateFlipBW;
double HostVMInefficiencyFactor; double HostVMInefficiencyFactor;
double VRatioClamped;
if (GPUVMEnable == true && HostVMEnable == true) { if (GPUVMEnable == true && HostVMEnable == true) {
HostVMInefficiencyFactor = HostVMInefficiencyFactor =
@ -3222,31 +3223,32 @@ static void CalculateFlipSchedule(
*DestinationLinesToRequestRowInImmediateFlip = dml_ceil(4.0 * (TimeForFetchingRowInVBlankImmediateFlip / LineTime), 1) / 4.0; *DestinationLinesToRequestRowInImmediateFlip = dml_ceil(4.0 * (TimeForFetchingRowInVBlankImmediateFlip / LineTime), 1) / 4.0;
*final_flip_bw = dml_max(PDEAndMetaPTEBytesPerFrame * HostVMInefficiencyFactor / (*DestinationLinesToRequestVMInImmediateFlip * LineTime), (MetaRowBytes + DPTEBytesPerRow) * HostVMInefficiencyFactor / (*DestinationLinesToRequestRowInImmediateFlip * LineTime)); *final_flip_bw = dml_max(PDEAndMetaPTEBytesPerFrame * HostVMInefficiencyFactor / (*DestinationLinesToRequestVMInImmediateFlip * LineTime), (MetaRowBytes + DPTEBytesPerRow) * HostVMInefficiencyFactor / (*DestinationLinesToRequestRowInImmediateFlip * LineTime));
VRatioClamped = (VRatio < 1.0) ? 1.0 : VRatio;
if (SourcePixelFormat == dm_420_8 || SourcePixelFormat == dm_420_10) { if (SourcePixelFormat == dm_420_8 || SourcePixelFormat == dm_420_10) {
if (GPUVMEnable == true && DCCEnable != true) { if (GPUVMEnable == true && DCCEnable != true) {
min_row_time = dml_min( min_row_time = dml_min(
dpte_row_height * LineTime / VRatio, dpte_row_height * LineTime / VRatioClamped,
dpte_row_height_chroma * LineTime / (VRatio / 2)); dpte_row_height_chroma * LineTime / (VRatioClamped / 2));
} else if (GPUVMEnable != true && DCCEnable == true) { } else if (GPUVMEnable != true && DCCEnable == true) {
min_row_time = dml_min( min_row_time = dml_min(
meta_row_height * LineTime / VRatio, meta_row_height * LineTime / VRatioClamped,
meta_row_height_chroma * LineTime / (VRatio / 2)); meta_row_height_chroma * LineTime / (VRatioClamped / 2));
} else { } else {
min_row_time = dml_min4( min_row_time = dml_min4(
dpte_row_height * LineTime / VRatio, dpte_row_height * LineTime / VRatioClamped,
meta_row_height * LineTime / VRatio, meta_row_height * LineTime / VRatioClamped,
dpte_row_height_chroma * LineTime / (VRatio / 2), dpte_row_height_chroma * LineTime / (VRatioClamped / 2),
meta_row_height_chroma * LineTime / (VRatio / 2)); meta_row_height_chroma * LineTime / (VRatioClamped / 2));
} }
} else { } else {
if (GPUVMEnable == true && DCCEnable != true) { if (GPUVMEnable == true && DCCEnable != true) {
min_row_time = dpte_row_height * LineTime / VRatio; min_row_time = dpte_row_height * LineTime / VRatioClamped;
} else if (GPUVMEnable != true && DCCEnable == true) { } else if (GPUVMEnable != true && DCCEnable == true) {
min_row_time = meta_row_height * LineTime / VRatio; min_row_time = meta_row_height * LineTime / VRatioClamped;
} else { } else {
min_row_time = dml_min( min_row_time = dml_min(
dpte_row_height * LineTime / VRatio, dpte_row_height * LineTime / VRatioClamped,
meta_row_height * LineTime / VRatio); meta_row_height * LineTime / VRatioClamped);
} }
} }