Skip to content

Commit c082a52

Browse files
jannaualyssarosenzweig
authored andcommitted
drm: adp: Enable vblank interrupts in crtc's .atomic_enable
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>
1 parent 7a7d668 commit c082a52

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/adp/adp_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ static void adp_crtc_atomic_enable(struct drm_crtc *crtc,
288288
writel(BIT(0), adp->be + ADBE_BLEND_EN3);
289289
writel(BIT(0), adp->be + ADBE_BLEND_BYPASS);
290290
writel(BIT(0), adp->be + ADBE_BLEND_EN4);
291+
drm_crtc_vblank_on(crtc);
291292
}
292293

293294
static void adp_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -519,8 +520,7 @@ static int adp_drm_bind(struct device *dev)
519520
struct adp_drv_private *adp = to_adp(drm);
520521
int err;
521522

522-
adp_disable_vblank(adp);
523-
writel(ADP_CTRL_FIFO_ON | ADP_CTRL_VBLANK_ON, adp->fe + ADP_CTRL);
523+
writel(ADP_CTRL_FIFO_ON, adp->fe + ADP_CTRL);
524524

525525
adp->next_bridge = drmm_of_get_bridge(&adp->drm, dev->of_node, 0, 0);
526526
if (IS_ERR(adp->next_bridge)) {

0 commit comments

Comments
 (0)