diff options
author | Dave Airlie <airlied@redhat.com> | 2019-02-18 13:27:15 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-02-18 13:27:15 +1000 |
commit | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (patch) | |
tree | 3662e7052352b0f1b78e8832b1d3b91ca211b798 /drivers/gpu/drm/drm_modes.c | |
parent | 8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0 (diff) | |
parent | a3b22b9f11d9fbc48b0291ea92259a5a810e9438 (diff) | |
download | linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.gz linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.bz2 linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.zip |
Merge v5.0-rc7 into drm-next
Backmerging for nouveau and imx that needed some fixes for next pulls.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_modes.c')
-rw-r--r-- | drivers/gpu/drm/drm_modes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index a28e7a91c8be..869ac6f4671e 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -751,7 +751,7 @@ int drm_mode_hsync(const struct drm_display_mode *mode) if (mode->hsync) return mode->hsync; - if (mode->htotal < 0) + if (mode->htotal <= 0) return 0; calc_val = (mode->clock * 1000) / mode->htotal; /* hsync in Hz */ |