android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/sun4i: Remove open-coded drm_connector_register_all()

Browse Source 
drm_dev_register() will now register all known connectors, so we no
longer have to do so manually.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466501283-19976-4-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2016-06-21 10:28:03 +01:00
committed by Daniel Vetter
parent 398e97994f
commit 366e292df6
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/gpu/drm/sun4i/sun4i_drv.c
View File

@ -24,34 +24,6 @@
#include "sun4i_layer.h" #include "sun4i_layer.h"
#include "sun4i_tcon.h" #include "sun4i_tcon.h"
static int sun4i_drv_connector_plug_all(struct drm_device *drm)
{
struct drm_connector *connector, *failed;
int ret;
mutex_lock(&drm->mode_config.mutex);
list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
ret = drm_connector_register(connector);
if (ret) {
failed = connector;
goto err;
}
}
mutex_unlock(&drm->mode_config.mutex);
return 0;
err:
list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
if (failed == connector)
break;
drm_connector_unregister(connector);
}
mutex_unlock(&drm->mode_config.mutex);
return ret;
}
static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe) static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe)
{ {
struct sun4i_drv *drv = drm->dev_private; struct sun4i_drv *drv = drm->dev_private;
@ -183,14 +155,8 @@ static int sun4i_drv_bind(struct device *dev)
if (ret) if (ret)
goto free_drm; goto free_drm;
ret = sun4i_drv_connector_plug_all(drm);
if (ret)
goto unregister_drm;
return 0; return 0;
unregister_drm:
drm_dev_unregister(drm);
free_drm: free_drm:
drm_dev_unref(drm); drm_dev_unref(drm);
return ret; return ret;