Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tomi Valkeinen and committed by
Dave Airlie
b201e743 1a695a90

+2 -2
-2
drivers/gpu/drm/drm_crtc.c
··· 2821 2821 goto out; 2822 2822 } 2823 2823 2824 - drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); 2825 - 2826 2824 /* 2827 2825 * Check whether the primary plane supports the fb pixel format. 2828 2826 * Drivers not implementing the universal planes API use a
+2
drivers/gpu/drm/drm_modes.c
··· 1518 1518 if (out->status != MODE_OK) 1519 1519 goto out; 1520 1520 1521 + drm_mode_set_crtcinfo(out, CRTC_INTERLACE_HALVE_V); 1522 + 1521 1523 ret = 0; 1522 1524 1523 1525 out: