diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-05-31 15:03:15 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-06-01 14:59:39 +1000 |
commit | b201e743f42d143f4bcdcb14587caf7cb1d99229 (patch) | |
tree | 0f4c35b21fb0154d8871f4f39a976a1529b50565 /drivers/gpu/drm/drm_modes.c | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
download | linux-b201e743f42d143f4bcdcb14587caf7cb1d99229.tar.gz linux-b201e743f42d143f4bcdcb14587caf7cb1d99229.tar.bz2 linux-b201e743f42d143f4bcdcb14587caf7cb1d99229.zip |
drm: add missing drm_mode_set_crtcinfo call
When setting mode via MODE_ID property,
drm_atomic_set_mode_prop_for_crtc() does not call
drm_mode_set_crtcinfo() which possibly causes:
"[drm:drm_calc_timestamping_constants [drm]] *ERROR* crtc 32: Can't
calculate constants, dotclock = 0!"
Whether the error is seen depends on the previous data in state->mode,
as state->mode is not cleared when setting new mode.
This patch adds drm_mode_set_crtcinfo() call to
drm_mode_convert_umode(), which is called in both legacy and atomic
paths. This should be fine as there's no reason to call
drm_mode_convert_umode() without also setting the crtc related fields.
drm_mode_set_crtcinfo() is removed from the legacy drm_mode_setcrtc() as
that is no longer needed.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: stable@vger.kernel.org
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, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 7def3d58da18..e5e6f504d8cc 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1518,6 +1518,8 @@ int drm_mode_convert_umode(struct drm_display_mode *out, if (out->status != MODE_OK) goto out; + drm_mode_set_crtcinfo(out, CRTC_INTERLACE_HALVE_V); + ret = 0; out: |