summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-30 10:04:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-30 10:04:58 +0200
commit8a7b5d0f75f757fa88b0d17c19523161b27b8e80 (patch)
tree54a3e7f1f995583ed924ff32cf5dacc800119800 /drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
parent7bab01ecc6c43da882333c6db39741cb43677004 (diff)
parentacb1872577b346bd15ab3a3f8dff780d6cca4b70 (diff)
downloadlinux-8a7b5d0f75f757fa88b0d17c19523161b27b8e80.tar.gz
linux-8a7b5d0f75f757fa88b0d17c19523161b27b8e80.tar.bz2
linux-8a7b5d0f75f757fa88b0d17c19523161b27b8e80.zip
Merge 4.18-rc7 into usb-next
We want the USB fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index df5cb2d1d164..34dac84066a0 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -1027,6 +1027,8 @@ static bool construct(
dc->caps.max_slave_planes = 1;
dc->caps.is_apu = true;
dc->caps.post_blend_color_processing = false;
+ /* Raven DP PHY HBR2 eye diagram pattern is not stable. Use TP4 */
+ dc->caps.force_dp_tps4_for_cp2520 = true;
if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)
dc->debug = debug_defaults_drv;