diff --git a/arch/arm/mach-imx/imx8m/video_common.c b/arch/arm/mach-imx/imx8m/video_common.c
index a622933833..26597dbc36 100644
--- a/arch/arm/mach-imx/imx8m/video_common.c
+++ b/arch/arm/mach-imx/imx8m/video_common.c
@@ -652,6 +652,7 @@ void *video_hw_init(void)
 {
 	void *fb;
 	int encoding = 1;
+	int ret;
 
 	debug("%s()\n", __func__);
 
@@ -676,7 +677,11 @@ void *video_hw_init(void)
 
 	imx8m_create_color_bar((void *)((uint64_t) fb), &gmode);
 
-	imx8_hdmi_enable(encoding, &gmode); /* may change gmode */
+	ret = imx8_hdmi_enable(encoding, &gmode); /* may change gmode */
+	if (ret) {
+		printf("HDMI enable failed!\n");
+		return NULL;
+	}
 
 	/* start dccs */
 	imx8m_display_init((uint64_t) fb, encoding, &gmode);
diff --git a/drivers/video/imx/imx8_hdmi.c b/drivers/video/imx/imx8_hdmi.c
index ecb00f4ac9..3d73c139c2 100644
--- a/drivers/video/imx/imx8_hdmi.c
+++ b/drivers/video/imx/imx8_hdmi.c
@@ -166,9 +166,12 @@ static int imx8_hdmi_init(int vic,
 	cdn_api_init();
 	debug("CDN_API_Init completed\n");
 
-	ret = cdn_api_checkalive_blocking();
+	ret = cdn_api_checkalive();
 	debug("CDN_API_CheckAlive returned ret = %d\n", ret);
 
+	if (ret)
+		return -EPERM;
+
 	ret = cdn_api_general_test_echo_ext_blocking(echo_msg,
 						     echo_resp,
 						     sizeof(echo_msg),
@@ -244,7 +247,7 @@ static int imx8_hdmi_init(int vic,
 	return 0;
 }
 
-void imx8_hdmi_enable(int encoding,
+int imx8_hdmi_enable(int encoding,
 		      struct video_mode_settings *vms)
 {
 	int vic = 0;
@@ -261,7 +264,7 @@ void imx8_hdmi_enable(int encoding,
 		vic = 0; /* 480p60 */
 
 	imx8_hdmi_set_vic_mode(vic, vms);
-	imx8_hdmi_init(vic, encoding, g_color_depth, use_phy_pixel_clk);
+	return imx8_hdmi_init(vic, encoding, g_color_depth, use_phy_pixel_clk);
 }
 
 void imx8_hdmi_disable(void)
diff --git a/include/imx8_hdmi.h b/include/imx8_hdmi.h
index 741f86d2fd..eb1253cf51 100644
--- a/include/imx8_hdmi.h
+++ b/include/imx8_hdmi.h
@@ -7,7 +7,7 @@
 #ifndef __IMX8_HDMI_H__
 #define __IMX8_HDMI_H__
 
-void imx8_hdmi_enable(int encoding, struct video_mode_settings *vms);
+int imx8_hdmi_enable(int encoding, struct video_mode_settings *vms);
 void imx8_hdmi_disable(void);
 
 #endif /* __IMX8_HDMI_H__*/