diff mbox

drm/imx: remove drm_mode_connector_detach_encoder harder

Message ID 1394882149-5029-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter March 15, 2014, 11:15 a.m. UTC
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>
---
 drivers/staging/imx-drm/imx-hdmi.c | 1 -
 drivers/staging/imx-drm/imx-tve.c  | 2 --
 2 files changed, 3 deletions(-)

Comments

Russell King - ARM Linux March 15, 2014, 11:23 a.m. UTC | #1
On Sat, Mar 15, 2014 at 12:15:49PM +0100, Daniel Vetter wrote:
> 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.

Are you looking at what's in linux-next, because if not, you're creating
conflicts by making these changes.
Daniel Vetter March 15, 2014, 11:35 a.m. UTC | #2
On Sat, Mar 15, 2014 at 11:23:32AM +0000, Russell King - ARM Linux wrote:
> On Sat, Mar 15, 2014 at 12:15:49PM +0100, Daniel Vetter wrote:
> > 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.
> 
> Are you looking at what's in linux-next, because if not, you're creating
> conflicts by making these changes.

I'm lookint at what's in drm-next, since that's what my pull request is
for. Might result in conflicts somewhere else, but they shouldn't be a lot
of fuzz to resolve really.
-Daniel
Greg KH March 17, 2014, 9:48 p.m. UTC | #3
On Sat, Mar 15, 2014 at 12:15:49PM +0100, Daniel Vetter wrote:
> 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>
> ---
>  drivers/staging/imx-drm/imx-hdmi.c | 1 -
>  drivers/staging/imx-drm/imx-tve.c  | 2 --
>  2 files changed, 3 deletions(-)

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff mbox

Patch

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)
 	struct drm_connector *connector = &hdmi->connector;
 	struct drm_encoder *encoder = &hdmi->encoder;
 
-	drm_mode_connector_detach_encoder(connector, encoder);
 	imx_drm_remove_connector(hdmi->imx_drm_connector);
 	imx_drm_remove_encoder(hdmi->imx_drm_encoder);
 
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)
 	struct drm_connector *connector = &tve->connector;
 	struct drm_encoder *encoder = &tve->encoder;
 
-	drm_mode_connector_detach_encoder(connector, encoder);
-
 	imx_drm_remove_connector(tve->imx_drm_connector);
 	imx_drm_remove_encoder(tve->imx_drm_encoder);