aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-12 07:41:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-12 07:41:14 +0200
commitb2a878de11251b06be144b5905e37dd0dc0b0104 (patch)
treef510ac1263ebd939493c3358408325804f7ba6e2 /drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c
parentstaging: rtl8712: r8712_xmit_classifier(): Change return values and type (diff)
parentLinux 5.3-rc4 (diff)
downloadlinux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.xz
linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.zip
Merge 5.3-rc4 into staging-next
We need the iio/staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c
index 26a66ccf6e72..1ae973962d53 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c
@@ -535,7 +535,7 @@ void dcn20_timing_generator_init(struct optc *optc1)
optc1->min_h_blank = 32;
optc1->min_v_blank = 3;
optc1->min_v_blank_interlace = 5;
- optc1->min_h_sync_width = 8;
+ optc1->min_h_sync_width = 4;// Minimum HSYNC = 8 pixels asked By HW in the first place for no actual reason. Oculus Rift S will not light up with 8 as it's hsyncWidth is 6. Changing it to 4 to fix that issue.
optc1->min_v_sync_width = 1;
optc1->comb_opp_id = 0xf;
}