Merge tag 'drm-misc-next-2022-09-09' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-block.git] / drivers / gpu / drm / vc4 / vc4_hdmi.c

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index fda450185c366e85efa06267d42a7693171ce5ab..25299fbc083b1f46e3c76b93b2838402bb225da1 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1425,7 +1425,7 @@ static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder,
        mutex_lock(&vc4_hdmi->mutex);
 
        if (!drm_dev_enter(drm, &idx))
-               return;
+               goto out;
 
        if (vc4_hdmi->variant->csc_setup)
                vc4_hdmi->variant->csc_setup(vc4_hdmi, conn_state, mode);
@@ -1436,6 +1436,7 @@ static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder,
 
        drm_dev_exit(idx);
 
+out:
        mutex_unlock(&vc4_hdmi->mutex);
 }
 
@@ -1455,7 +1456,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
        mutex_lock(&vc4_hdmi->mutex);
 
        if (!drm_dev_enter(drm, &idx))
-               return;
+               goto out;
 
        spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
 
@@ -1516,6 +1517,8 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
        vc4_hdmi_enable_scrambling(encoder);
 
        drm_dev_exit(idx);
+
+out:
        mutex_unlock(&vc4_hdmi->mutex);
 }