summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/sti/sti_hda.c
diff options
context:
space:
mode:
authorBenjamin Gaignard2016-06-21 15:09:40 +0200
committerDaniel Vetter2016-06-21 21:32:52 +0200
commit84601dbdea36634a300c24f93b149a251fc64fed (patch)
tree97f72fc3b6df9dbb17705042fb8bf01020afb70d /drivers/gpu/drm/sti/sti_hda.c
parentdrm: sti: use late_register and early_unregister callbacks (diff)
downloadkernel-qcow2-linux-84601dbdea36634a300c24f93b149a251fc64fed.tar.gz
kernel-qcow2-linux-84601dbdea36634a300c24f93b149a251fc64fed.tar.xz
kernel-qcow2-linux-84601dbdea36634a300c24f93b149a251fc64fed.zip
drm: sti: rework init sequence
Use drm_dev_alloc() and drm_dev_register() instead of .load() To simplify init sequence only create fbdev when requested in output_poll_changed(). version 2: remove call to drm_connector_unregister_all() and drm_dev_set_unique() Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466514580-15194-4-git-send-email-benjamin.gaignard@linaro.org
Diffstat (limited to 'drivers/gpu/drm/sti/sti_hda.c')
-rw-r--r--drivers/gpu/drm/sti/sti_hda.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index e31d52d73dde..8505569f75de 100644
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -761,10 +761,6 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
drm_connector_helper_add(drm_connector,
&sti_hda_connector_helper_funcs);
- err = drm_connector_register(drm_connector);
- if (err)
- goto err_connector;
-
err = drm_mode_connector_attach_encoder(drm_connector, encoder);
if (err) {
DRM_ERROR("Failed to attach a connector to a encoder\n");
@@ -777,9 +773,7 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
return 0;
err_sysfs:
- drm_connector_unregister(drm_connector);
-err_connector:
- drm_connector_cleanup(drm_connector);
+ drm_bridge_remove(bridge);
return -EINVAL;
}