drm: adp: Enable vblank interrupts in crtc's .atomic_enable
authorJanne Grunau <j@jannau.net>
Mon, 28 Apr 2025 11:37:15 +0000 (13:37 +0200)
committerAlyssa Rosenzweig <alyssa@rosenzweig.io>
Mon, 28 Apr 2025 18:17:52 +0000 (14:17 -0400)
Calling drm_crtc_vblank_on() drm_crtc_helper_funcs' atomic_enable is
expected to enable vblank interrupts. It may have been avoided here to
due to drm_crtc_vblank_get()'s error behavior after
drm_crtc_vblank_reset(). With that fixed in the preceding change the
driver can call drm_crtc_vblank_on() from adp_crtc_atomic_enable().

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Signed-off-by: Janne Grunau <j@jannau.net>
Link: https://lore.kernel.org/r/20250428-drm_adp_fixes-v2-3-912e081e55d8@jannau.net
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
drivers/gpu/drm/adp/adp_drv.c

index bdf27ee742ea01759b5d571a21b527687ffcada7..50d26c73301c02e4a2f22b776ad8d8e9407565c9 100644 (file)
@@ -288,6 +288,7 @@ static void adp_crtc_atomic_enable(struct drm_crtc *crtc,
        writel(BIT(0), adp->be + ADBE_BLEND_EN3);
        writel(BIT(0), adp->be + ADBE_BLEND_BYPASS);
        writel(BIT(0), adp->be + ADBE_BLEND_EN4);
+       drm_crtc_vblank_on(crtc);
 }
 
 static void adp_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -519,8 +520,7 @@ static int adp_drm_bind(struct device *dev)
        struct adp_drv_private *adp = to_adp(drm);
        int err;
 
-       adp_disable_vblank(adp);
-       writel(ADP_CTRL_FIFO_ON | ADP_CTRL_VBLANK_ON, adp->fe + ADP_CTRL);
+       writel(ADP_CTRL_FIFO_ON, adp->fe + ADP_CTRL);
 
        adp->next_bridge = drmm_of_get_bridge(&adp->drm, dev->of_node, 0, 0);
        if (IS_ERR(adp->next_bridge)) {