diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 9de390fe3794c..09289ae4a47b1 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -153,10 +153,20 @@ static bool vc4_crtc_get_scanout_position(struct drm_crtc *crtc, *hpos = 0; if (mode->flags & DRM_MODE_FLAG_INTERLACE) { + bool field; + *vpos /= 2; - /* Use hpos to correct for field offset in interlaced mode. */ - if (vc4_hvs_get_fifo_frame_count(hvs, channel) % 2) + if (vc4->gen >= VC4_GEN_6_C) + field = val & SCALER6_DISPX_STATUS_OFIELD; + else + field = val & SCALER_DISPSTATX_FIELD; + + /* + * Use hpos to correct for field offset in interlaced mode. + * The offset applies when the field bit is clear. + */ + if (!field) *hpos += mode->crtc_htotal / 2; } diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h index f79d4b2a5b7fd..10cf65e05fbba 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -421,6 +421,7 @@ # define SCALER_DISPSTATX_MODE_EOF 3 # define SCALER_DISPSTATX_FULL BIT(29) # define SCALER_DISPSTATX_EMPTY BIT(28) +# define SCALER_DISPSTATX_FIELD BIT(27) # define SCALER_DISPSTATX_LINE_MASK VC4_MASK(11, 0) # define SCALER_DISPSTATX_LINE_SHIFT 0