drivers/gpu/drm/openchrome/via_display.c | 14 ++++++++++----
drivers/gpu/drm/openchrome/via_fb.c | 1 -
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 546dc8db803f7abafb3902f084734fea34316a17
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Aug 12 23:44:19 2017 -0700
Calling drm_kms_helper_poll_init() from via_modeset_init
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_display.c
b/drivers/gpu/drm/openchrome/via_display.c
index 324d47d23e64..dc52b3195193 100644
--- a/drivers/gpu/drm/openchrome/via_display.c
+++ b/drivers/gpu/drm/openchrome/via_display.c
@@ -496,6 +496,7 @@ int
via_modeset_init(struct drm_device *dev)
{
struct via_device *dev_priv = dev->dev_private;
+ int ret = 0;
int i;
drm_mode_config_init(dev);
@@ -536,10 +537,15 @@ via_modeset_init(struct drm_device *dev)
break;
}
- /*
- * Set up the framebuffer device
- */
- return via_fbdev_init(dev, &dev_priv->helper);
+ /* Set up the framebuffer device */
+ ret = via_fbdev_init(dev, &dev_priv->helper);
+ if (!ret) {
+ goto exit;
+ }
+
+ drm_kms_helper_poll_init(dev);
+exit:
+ return ret;
}
void via_modeset_fini(struct drm_device *dev)
diff --git a/drivers/gpu/drm/openchrome/via_fb.c
b/drivers/gpu/drm/openchrome/via_fb.c
index 38d3d976bf21..b554a2e69c78 100644
--- a/drivers/gpu/drm/openchrome/via_fb.c
+++ b/drivers/gpu/drm/openchrome/via_fb.c
@@ -1220,7 +1220,6 @@ via_fbdev_init(struct drm_device *dev, struct
drm_fb_helper **ptr)
drm_fb_helper_single_add_all_connectors(&helper->base);
drm_helper_disable_unused_functions(dev);
drm_fb_helper_initial_config(&helper->base, 32);
- drm_kms_helper_poll_init(dev);
*ptr = (struct drm_fb_helper *) helper;
out_err:
if (ret)
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
