From e9a7d236eaaeb1cdfe20e583e2e1899b26d7469c Mon Sep 17 00:00:00 2001 From: Rodrigo Siqueira Date: Thu, 16 Jun 2022 16:48:22 -0400 Subject: [PATCH] drm/amd/display: Fix refresh rate issue on Club 3D Recently we introduced a patch for fixing an MST issue, but it caused a regression on Club 3D since we could not set a refresh rate higher than 60Hz. This commit fixes this issue by adding a proper check after validating the stream. Fixes: f04d275d94e164 ("drm/amd/display: add mst port output bw check") Reviewed-by: Hersen Wu Acked-by: Rodrigo Siqueira Signed-off-by: Rodrigo Siqueira Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 7b698dc91ada..595d065869a1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7214,12 +7214,10 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, break; } - if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) + dc_result = dc_validate_stream(adev->dm.dc, stream); + if (dc_result == DC_OK && stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) dc_result = dm_dp_mst_is_port_support_mode(aconnector, stream); - if (dc_result == DC_OK) - dc_result = dc_validate_stream(adev->dm.dc, stream); - if (dc_result != DC_OK) { DRM_DEBUG_KMS("Mode %dx%d (clk %d) failed DC validation with error %d (%s)\n", drm_mode->hdisplay,