[openchrome-devel] drm-openchrome: Branch 'drm-next-5.3' - drivers/gpu/drm

Kevin Brace kevinbrace at kemper.freedesktop.org
Tue Jun 4 02:10:41 UTC 2019


 drivers/gpu/drm/openchrome/openchrome_crtc.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit ee7c3fe79978eba84ca144cf34b3b24cb312367d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Jun 3 21:09:42 2019 -0500

    drm/openchrome: Add error handling code after calling drm_crtc_init()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 59681e110131..4cc50c25c0cc 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -2489,7 +2489,12 @@ int via_crtc_init(struct drm_device *dev, int index)
 
 	iga->index = index;
 	if (index) {
-		drm_crtc_init(dev, crtc, &via_iga2_funcs);
+		ret = drm_crtc_init(dev, crtc, &via_iga2_funcs);
+		if (ret) {
+			DRM_ERROR("Failed to initialize CRTC!\n");
+			goto exit;
+		}
+
 		drm_crtc_helper_add(crtc, &via_iga2_helper_funcs);
 
 		iga->timings.htotal.count = ARRAY_SIZE(iga2_hor_total);
@@ -2566,7 +2571,12 @@ int via_crtc_init(struct drm_device *dev, int index)
 		iga->offset.count = ARRAY_SIZE(iga2_offset) - 1;
 		iga->offset.regs = iga2_offset;
 	} else {
-		drm_crtc_init(dev, crtc, &via_iga1_funcs);
+		ret = drm_crtc_init(dev, crtc, &via_iga1_funcs);
+		if (ret) {
+			DRM_ERROR("Failed to initialize CRTC!\n");
+			goto exit;
+		}
+
 		drm_crtc_helper_add(crtc, &via_iga1_helper_funcs);
 
 		iga->timings.htotal.count = ARRAY_SIZE(iga1_hor_total);


More information about the openchrome-devel mailing list