]> git.baikalelectronics.ru Git - kernel.git/commit
drm/vc4: hvs: Fix frame count register readout
authorMaxime Ripard <maxime@cerno.tech>
Thu, 31 Mar 2022 14:37:39 +0000 (16:37 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Wed, 6 Apr 2022 13:18:01 +0000 (15:18 +0200)
commit1785abd64ab7f292963de77452ddf5c970c280c0
tree8f611b67c67de9724cc2448acb89249869f58f6e
parentd6b9c8fac34592a5520ddc9e23b8b7a414c81690
drm/vc4: hvs: Fix frame count register readout

In order to get the field currently being output, the driver has been
using the display FIFO frame count in the HVS, reading a 6-bit field at
the offset 12 in the DISPSTATx register.

While that field is indeed at that location for the FIFO 1 and 2, the
one for the FIFO0 is actually in the DISPSTAT1 register, at the offset
18.

Fixes: 4ec28cb9da73 ("drm/vc4: Enable precise vblank timestamping for interlaced modes.")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20220331143744.777652-3-maxime@cerno.tech
drivers/gpu/drm/vc4/vc4_crtc.c
drivers/gpu/drm/vc4/vc4_drv.h
drivers/gpu/drm/vc4/vc4_hvs.c
drivers/gpu/drm/vc4/vc4_regs.h