aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-15 07:11:54 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-15 07:11:54 -0400
commitfc1645ac826c82ebad4402aabbf65595b671ecca (patch)
tree513eb498caefcc16dbdf3dd6445f57c3aef855b7
parentc8e32cc1219fc15135b696b726421571f68bd97e (diff)
drm/imx: remove drm_mode_connector_detach_encoder harder
Since the last time I've looked more of this stuff sprouted up. Stomp it down again. Repeating the original justification for ripping this all out: There's absolutely no need to deteach connectors before cleaning them up at driver unload time. And since drm doesn't support hotplugging kms objects at all it's positively dangerous to attempt this at runtime. Luckily imx only detachs at driver cleanup time and hence we can savely remove this. Reported-by: kbuild test robot <fengguang.wu@intel.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/staging/imx-drm/imx-hdmi.c1
-rw-r--r--drivers/staging/imx-drm/imx-tve.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 62ce0e86f14b..f996e082faf4 100644
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -1883,7 +1883,6 @@ static int imx_hdmi_platform_remove(struct platform_device *pdev)
1883 struct drm_connector *connector = &hdmi->connector; 1883 struct drm_connector *connector = &hdmi->connector;
1884 struct drm_encoder *encoder = &hdmi->encoder; 1884 struct drm_encoder *encoder = &hdmi->encoder;
1885 1885
1886 drm_mode_connector_detach_encoder(connector, encoder);
1887 imx_drm_remove_connector(hdmi->imx_drm_connector); 1886 imx_drm_remove_connector(hdmi->imx_drm_connector);
1888 imx_drm_remove_encoder(hdmi->imx_drm_encoder); 1887 imx_drm_remove_encoder(hdmi->imx_drm_encoder);
1889 1888
diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 9abc7ca8b6cf..64729fa4a3d4 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -709,8 +709,6 @@ static int imx_tve_remove(struct platform_device *pdev)
709 struct drm_connector *connector = &tve->connector; 709 struct drm_connector *connector = &tve->connector;
710 struct drm_encoder *encoder = &tve->encoder; 710 struct drm_encoder *encoder = &tve->encoder;
711 711
712 drm_mode_connector_detach_encoder(connector, encoder);
713
714 imx_drm_remove_connector(tve->imx_drm_connector); 712 imx_drm_remove_connector(tve->imx_drm_connector);
715 imx_drm_remove_encoder(tve->imx_drm_encoder); 713 imx_drm_remove_encoder(tve->imx_drm_encoder);
716 714