Skip to contentSkip to conversation

Revert "drm/imx: don't destroy mode objects manually on driver unbind"

PATCH In review Stefan Agner 3 participants 6 messages Oct 16, 2018 – Oct 17, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "drm/imx: don't destroy mode objects manually on driver unbind"

This reverts commit 8e3b16e2117409625b89807de3912ff773aea354.

Using the component framework requires all components to undo in ->unbind what ->bind does. Unfortunately that particular commit broke this rule. In particular, this is an issue if a single component during probe fails. In that case, component_bind_all() calls unbind on already succussfully bound components, and then frees memory allocated using devm. If one of those components registered e.g. an encoder with the framework then this leads to use after free situations.

Revert the commit to ensure that all components properly undo what ->bind does.

---
 drivers/gpu/drm/imx/imx-drm-core.c     | 4 ++--
 drivers/gpu/drm/imx/imx-ldb.c          | 6 ++++++
 drivers/gpu/drm/imx/imx-tve.c          | 3 +++
 drivers/gpu/drm/imx/parallel-display.c | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -2
index 5ea0c82f9957..caa6061a98ba 100644
@@ -305,11 +305,11 @@ static void imx_drm_unbind(struct device *dev)
 
 	drm_fb_cma_fbdev_fini(drm);
 
-	drm_mode_config_cleanup(drm);
-
 	component_unbind_all(drm->dev, drm);
 	dev_set_drvdata(dev, NULL);
 
+	drm_mode_config_cleanup(drm);
+
 	drm_dev_put(drm);
 }
 
drivers/gpu/drm/imx/imx-ldb.c +6 -0
index 3bd0f8a18e74..592aabc4a262 100644
@@ -723,6 +723,12 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,
 		if (channel->panel)
 			drm_panel_detach(channel->panel);
 
+		if (!channel->connector.funcs)
+			continue;
+
+		channel->connector.funcs->destroy(&channel->connector);
+		channel->encoder.funcs->destroy(&channel->encoder);
+
 		kfree(channel->edid);
 		i2c_put_adapter(channel->ddc);
 	}
drivers/gpu/drm/imx/imx-tve.c +3 -0
index cffd3310240e..8d6e89ce1edb 100644
@@ -673,6 +673,9 @@ static void imx_tve_unbind(struct device *dev, struct device *master,
 {
 	struct imx_tve *tve = dev_get_drvdata(dev);
 
+	tve->connector.funcs->destroy(&tve->connector);
+	tve->encoder.funcs->destroy(&tve->encoder);
+
 	if (!IS_ERR(tve->dac_reg))
 		regulator_disable(tve->dac_reg);
 }
drivers/gpu/drm/imx/parallel-display.c +3 -0
index aefd04e18f93..6f11bffcde37 100644
@@ -258,6 +258,9 @@ static void imx_pd_unbind(struct device *dev, struct device *master,
 	if (imxpd->panel)
 		drm_panel_detach(imxpd->panel);
 
+	imxpd->encoder.funcs->destroy(&imxpd->encoder);
+	imxpd->connector.funcs->destroy(&imxpd->connector);
+
 	kfree(imxpd->edid);
 }
 
Signature · 6 lines
2.19.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 11 lines · Stefan Agner

This reverts commit 8e3b16e2117409625b89807de3912ff773aea354.

Using the component framework requires all components to undo in ->unbind what ->bind does. Unfortunately that particular commit broke this rule. In particular, this is an issue if a single component during probe fails. In that case, component_bind_all() calls unbind on already succussfully bound components, and then frees memory allocated using devm. If one of those components registered e.g. an encoder with the framework then this leads to use after free situations.

Quoted 6 lines

Revert the commit to ensure that all components properly undo what ->bind does.

Adding Benjamin, who just made the same mistake I think (and I reviewed it ... oh well).
-Daniel

Quoted 77 lines
---
 drivers/gpu/drm/imx/imx-drm-core.c     | 4 ++--
 drivers/gpu/drm/imx/imx-ldb.c          | 6 ++++++
 drivers/gpu/drm/imx/imx-tve.c          | 3 +++
 drivers/gpu/drm/imx/parallel-display.c | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -2
index 5ea0c82f9957..caa6061a98ba 100644
@@ -305,11 +305,11 @@ static void imx_drm_unbind(struct device *dev)
 
 	drm_fb_cma_fbdev_fini(drm);
 
-	drm_mode_config_cleanup(drm);
-
 	component_unbind_all(drm->dev, drm);
 	dev_set_drvdata(dev, NULL);
 
+	drm_mode_config_cleanup(drm);
+
 	drm_dev_put(drm);
 }
 
drivers/gpu/drm/imx/imx-ldb.c +6 -0
index 3bd0f8a18e74..592aabc4a262 100644
@@ -723,6 +723,12 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,
 		if (channel->panel)
 			drm_panel_detach(channel->panel);
 
+		if (!channel->connector.funcs)
+			continue;
+
+		channel->connector.funcs->destroy(&channel->connector);
+		channel->encoder.funcs->destroy(&channel->encoder);
+
 		kfree(channel->edid);
 		i2c_put_adapter(channel->ddc);
 	}
drivers/gpu/drm/imx/imx-tve.c +3 -0
index cffd3310240e..8d6e89ce1edb 100644
@@ -673,6 +673,9 @@ static void imx_tve_unbind(struct device *dev, struct device *master,
 {
 	struct imx_tve *tve = dev_get_drvdata(dev);
 
+	tve->connector.funcs->destroy(&tve->connector);
+	tve->encoder.funcs->destroy(&tve->encoder);
+
 	if (!IS_ERR(tve->dac_reg))
 		regulator_disable(tve->dac_reg);
 }
drivers/gpu/drm/imx/parallel-display.c +3 -0
index aefd04e18f93..6f11bffcde37 100644
@@ -258,6 +258,9 @@ static void imx_pd_unbind(struct device *dev, struct device *master,
 	if (imxpd->panel)
 		drm_panel_detach(imxpd->panel);
 
+	imxpd->encoder.funcs->destroy(&imxpd->encoder);
+	imxpd->connector.funcs->destroy(&imxpd->connector);
+
 	kfree(imxpd->edid);
 }
 
Signature · 6 lines
2.19.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
In reply to Stefan Agner

Am Dienstag, den 16.10.2018, 18:09 +0200 schrieb Stefan Agner:

Quoted 11 lines

This reverts commit 8e3b16e2117409625b89807de3912ff773aea354.

Using the component framework requires all components to undo in ->unbind what ->bind does. Unfortunately that particular commit broke this rule. In particular, this is an issue if a single component during probe fails. In that case, component_bind_all() calls unbind on already succussfully bound components, and then frees memory allocated using devm. If one of those components registered e.g. an encoder with the framework then this leads to use after free situations.

Quoted 2 lines

Revert the commit to ensure that all components properly undo what ->bind does.

I agree with this patch in general, but I think I remember why I changed this in the first place: dw_hdmi_imx_unbind does not destroy the encoder that has been registered in dw_hdmi_imx_bind.

8e3b16e21174 was an (apparently wrong) attempt to fix such issues once and for all. By reverting this commit we go back to leaking the HDMI encoder, so I think this patch should include a fix to destroy the encoder on unbind.

Regards,
Lucas

Quoted 67 lines
Quoted 2 lines

---
 drivers/gpu/drm/imx/imx-drm-core.c     | 4 ++-- drivers/gpu/drm/imx/imx-ldb.c          | 6 ++++++ drivers/gpu/drm/imx/imx-tve.c          | 3 +++ drivers/gpu/drm/imx/parallel-display.c | 3 +++

 4 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +0 -0
index 5ea0c82f9957..caa6061a98ba 100644
@@ -305,11 +305,11 @@ static void imx_drm_unbind(struct device *dev)

Quoted 1 line

  drm_fb_cma_fbdev_fini(drm);

drivers/gpu/drm/imx/imx-drm-core.c static void imx_drm_unbind(struct device *dev) · line 308

Quoted 1 line
drivers/gpu/drm/imx/imx-drm-core.c +0 -1
-	drm_mode_config_cleanup(drm);

-

Quoted 2 lines

  component_unbind_all(drm->dev, drm);
  dev_set_drvdata(dev, NULL);

drivers/gpu/drm/imx/imx-drm-core.c static void imx_drm_unbind(struct device *dev) · line 311

Quoted 1 line
drivers/gpu/drm/imx/imx-drm-core.c +1 -0
+	drm_mode_config_cleanup(drm);

+

Quoted 1 line

  drm_dev_put(drm);

 }

drivers/gpu/drm/imx/imx-ldb.c +0 -0
index 3bd0f8a18e74..592aabc4a262 100644
@@ -723,6 +723,12 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,
 >  		if (channel->panel)
 >  			drm_panel_detach(channel->panel);

drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_unbind(struct device *dev, struct device *master, · line 727

Quoted 2 lines
drivers/gpu/drm/imx/imx-ldb.c +2 -0
+		if (!channel->connector.funcs)
+			continue;

+

drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_unbind(struct device *dev, struct device *master, · line 730

Quoted 2 lines
drivers/gpu/drm/imx/imx-ldb.c +2 -0
+		channel->connector.funcs->destroy(&channel->connector);
+		channel->encoder.funcs->destroy(&channel->encoder);

+

Quoted 3 lines

  kfree(channel->edid);
  i2c_put_adapter(channel->ddc);
  }

drivers/gpu/drm/imx/imx-tve.c +0 -0
index cffd3310240e..8d6e89ce1edb 100644
@@ -673,6 +673,9 @@ static void imx_tve_unbind(struct device *dev, struct device *master,
  {
 >  	struct imx_tve *tve = dev_get_drvdata(dev);

drivers/gpu/drm/imx/imx-tve.c static void imx_tve_unbind(struct device *dev, struct device *master, · line 677

Quoted 2 lines
drivers/gpu/drm/imx/imx-tve.c +2 -0
+	tve->connector.funcs->destroy(&tve->connector);
+	tve->encoder.funcs->destroy(&tve->encoder);

+

Quoted 2 lines

  if (!IS_ERR(tve->dac_reg))
  regulator_disable(tve->dac_reg);

 }

drivers/gpu/drm/imx/parallel-display.c +0 -0
index aefd04e18f93..6f11bffcde37 100644
@@ -258,6 +258,9 @@ static void imx_pd_unbind(struct device *dev, struct device *master,
 >  	if (imxpd->panel)
 >  		drm_panel_detach(imxpd->panel);

Quoted 6 lines

drivers/gpu/drm/imx/parallel-display.c static void imx_pd_unbind(struct device *dev, struct device *master, · line 262

Quoted 2 lines
drivers/gpu/drm/imx/parallel-display.c +2 -0
+	imxpd->encoder.funcs->destroy(&imxpd->encoder);
+	imxpd->connector.funcs->destroy(&imxpd->connector);

+

Quoted 1 line

  kfree(imxpd->edid);

 }

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 12 lines · Lucas Stach

Am Dienstag, den 16.10.2018, 18:09 +0200 schrieb Stefan Agner:

Quoted 11 lines

This reverts commit 8e3b16e2117409625b89807de3912ff773aea354.

Using the component framework requires all components to undo in ->unbind what ->bind does. Unfortunately that particular commit broke this rule. In particular, this is an issue if a single component during probe fails. In that case, component_bind_all() calls unbind on already succussfully bound components, and then frees memory allocated using devm. If one of those components registered e.g. an encoder with the framework then this leads to use after free situations.

Quoted 6 lines
Quoted 2 lines

Revert the commit to ensure that all components properly undo what ->bind does.

I agree with this patch in general, but I think I remember why I changed this in the first place: dw_hdmi_imx_unbind does not destroy the encoder that has been registered in dw_hdmi_imx_bind.

Good point, yeah that is missing.

Quoted 5 lines

8e3b16e21174 was an (apparently wrong) attempt to fix such issues once and for all. By reverting this commit we go back to leaking the HDMI encoder, so I think this patch should include a fix to destroy the encoder on unbind.

Makes sense, will add that to the same commit and send a v2.

--
Stefan

Quoted 77 lines

Regards,
Lucas

Quoted 73 lines
Quoted 2 lines

---
 drivers/gpu/drm/imx/imx-drm-core.c     | 4 ++-- drivers/gpu/drm/imx/imx-ldb.c          | 6 ++++++ drivers/gpu/drm/imx/imx-tve.c          | 3 +++ drivers/gpu/drm/imx/parallel-display.c | 3 +++

 4 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +0 -0
index 5ea0c82f9957..caa6061a98ba 100644
@@ -305,11 +305,11 @@ static void imx_drm_unbind(struct device *dev)

Quoted 1 line

  drm_fb_cma_fbdev_fini(drm);

drivers/gpu/drm/imx/imx-drm-core.c static void imx_drm_unbind(struct device *dev) · line 308

Quoted 1 line
drivers/gpu/drm/imx/imx-drm-core.c +0 -1
-	drm_mode_config_cleanup(drm);

-

Quoted 2 lines

  component_unbind_all(drm->dev, drm);
  dev_set_drvdata(dev, NULL);

drivers/gpu/drm/imx/imx-drm-core.c static void imx_drm_unbind(struct device *dev) · line 311

Quoted 1 line
drivers/gpu/drm/imx/imx-drm-core.c +1 -0
+	drm_mode_config_cleanup(drm);

+

Quoted 1 line

  drm_dev_put(drm);

 }

drivers/gpu/drm/imx/imx-ldb.c +0 -0
index 3bd0f8a18e74..592aabc4a262 100644
@@ -723,6 +723,12 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,
 >  		if (channel->panel)
 >  			drm_panel_detach(channel->panel);

drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_unbind(struct device *dev, struct device *master, · line 727

Quoted 2 lines
drivers/gpu/drm/imx/imx-ldb.c +2 -0
+		if (!channel->connector.funcs)
+			continue;

+

drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_unbind(struct device *dev, struct device *master, · line 730

Quoted 2 lines
drivers/gpu/drm/imx/imx-ldb.c +2 -0
+		channel->connector.funcs->destroy(&channel->connector);
+		channel->encoder.funcs->destroy(&channel->encoder);

+

Quoted 3 lines

  kfree(channel->edid);
  i2c_put_adapter(channel->ddc);
  }

drivers/gpu/drm/imx/imx-tve.c +0 -0
index cffd3310240e..8d6e89ce1edb 100644
@@ -673,6 +673,9 @@ static void imx_tve_unbind(struct device *dev, struct device *master,
  {
 >  	struct imx_tve *tve = dev_get_drvdata(dev);

drivers/gpu/drm/imx/imx-tve.c static void imx_tve_unbind(struct device *dev, struct device *master, · line 677

Quoted 2 lines
drivers/gpu/drm/imx/imx-tve.c +2 -0
+	tve->connector.funcs->destroy(&tve->connector);
+	tve->encoder.funcs->destroy(&tve->encoder);

+

Quoted 2 lines

  if (!IS_ERR(tve->dac_reg))
  regulator_disable(tve->dac_reg);

 }

drivers/gpu/drm/imx/parallel-display.c +0 -0
index aefd04e18f93..6f11bffcde37 100644
@@ -258,6 +258,9 @@ static void imx_pd_unbind(struct device *dev, struct device *master,
 >  	if (imxpd->panel)
 >  		drm_panel_detach(imxpd->panel);

drivers/gpu/drm/imx/parallel-display.c static void imx_pd_unbind(struct device *dev, struct device *master, · line 262

Quoted 2 lines
drivers/gpu/drm/imx/parallel-display.c +2 -0
+	imxpd->encoder.funcs->destroy(&imxpd->encoder);
+	imxpd->connector.funcs->destroy(&imxpd->connector);

+

Quoted 1 line

  kfree(imxpd->edid);

 }

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw
In reply to Stefan Agner
Quoted 11 lines · Stefan Agner

This reverts commit 8e3b16e2117409625b89807de3912ff773aea354.

Using the component framework requires all components to undo in ->unbind what ->bind does. Unfortunately that particular commit broke this rule. In particular, this is an issue if a single component during probe fails. In that case, component_bind_all() calls unbind on already succussfully bound components, and then frees memory allocated using devm. If one of those components registered e.g. an encoder with the framework then this leads to use after free situations.

Quoted 2 lines

Revert the commit to ensure that all components properly undo what ->bind does.

After Lucas comment mentioning HDMI unbind is not proper I looked through all the unbind again. The other unbind functions need some fixing too. I did not bother checking whether those were always broken or just because things changed (the commit this is reverting was in 2016).... Here is what I found:

Quoted 36 lines

Link:
https://www.mail-archive.com/[email protected]/msg233327.html

---
 drivers/gpu/drm/imx/imx-drm-core.c     | 4 ++--
 drivers/gpu/drm/imx/imx-ldb.c          | 6 ++++++
 drivers/gpu/drm/imx/imx-tve.c          | 3 +++
 drivers/gpu/drm/imx/parallel-display.c | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -2
index 5ea0c82f9957..caa6061a98ba 100644
@@ -305,11 +305,11 @@ static void imx_drm_unbind(struct device *dev)
 
 	drm_fb_cma_fbdev_fini(drm);
 
-	drm_mode_config_cleanup(drm);
-
 	component_unbind_all(drm->dev, drm);
 	dev_set_drvdata(dev, NULL);
 
+	drm_mode_config_cleanup(drm);
+
 	drm_dev_put(drm);
 }
 
drivers/gpu/drm/imx/imx-ldb.c +0 -0
index 3bd0f8a18e74..592aabc4a262 100644

drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_unbind(struct device *dev, · line 731

Quoted 9 lines
drivers/gpu/drm/imx/imx-ldb.c +5 -0
@@ -723,6 +723,12 @@ static void imx_ldb_unbind(struct device *dev,
 struct device *master,
 		if (channel->panel)
 			drm_panel_detach(channel->panel);
 
+		if (!channel->connector.funcs)
+			continue;
+
+		channel->connector.funcs->destroy(&channel->connector);
+		channel->encoder.funcs->destroy(&channel->encoder);

There can be an encoder and bridge, or an encoder and connector. All of them should be properly cleaned up.

So I guess this should look like this:

  		if (channel->panel)
  			drm_panel_detach(channel->panel);

  		if (channel->bridge)
  			drm_bridge_detach(channel->bridge);
		if (channel->connector.funcs)
			channel->connector.funcs->destroy(&channel->connector);

		if (channel->encoder.funcs)
			channel->encoder.funcs->destroy(&channel->encoder);

		kfree(channel->edid);
		i2c_put_adapter(channel->ddc);

The last two functions following are only strictly necessary when connector is initialized. But its safe to call them with null, so I would just call them always.

Quoted 9 lines
drivers/gpu/drm/imx/imx-ldb.c +1 -0
+
 		kfree(channel->edid);
 		i2c_put_adapter(channel->ddc);
drivers/gpu/drm/imx/imx-ldb.c +0 -0
 	}
drivers/gpu/drm/imx/imx-tve.c +0 -0
index cffd3310240e..8d6e89ce1edb 100644

drivers/gpu/drm/imx/imx-tve.c static void imx_tve_unbind(struct device *dev, · line 679

Quoted 7 lines
drivers/gpu/drm/imx/imx-tve.c +3 -0
@@ -673,6 +673,9 @@ static void imx_tve_unbind(struct device *dev,
 struct device *master,
 {
 	struct imx_tve *tve = dev_get_drvdata(dev);
 
+	tve->connector.funcs->destroy(&tve->connector);
+	tve->encoder.funcs->destroy(&tve->encoder);
+

Cleanup of tve->ddc missing.

drivers/gpu/drm/imx/parallel-display.c static void imx_pd_unbind(struct device *dev, · line 261

Quoted 13 lines
drivers/gpu/drm/imx/imx-tve.c +0 -0
 	if (!IS_ERR(tve->dac_reg))
 		regulator_disable(tve->dac_reg);

}

drivers/gpu/drm/imx/parallel-display.c +0 -0
index aefd04e18f93..6f11bffcde37 100644
@@ -258,6 +258,9 @@ static void imx_pd_unbind(struct device *dev,
 struct device *master,
 	if (imxpd->panel)
 		drm_panel_detach(imxpd->panel);
 

And in this case a bridge detach is missing.

Will send a v2 with that addressed.

--
Stefan

Quoted 5 lines
drivers/gpu/drm/imx/parallel-display.c +3 -0
+	imxpd->encoder.funcs->destroy(&imxpd->encoder);
+	imxpd->connector.funcs->destroy(&imxpd->connector);
+
 	kfree(imxpd->edid);
 }
#5 lore raw
Quoted 70 lines · Stefan Agner
Quoted 11 lines · Stefan Agner

This reverts commit 8e3b16e2117409625b89807de3912ff773aea354.

Using the component framework requires all components to undo in ->unbind what ->bind does. Unfortunately that particular commit broke this rule. In particular, this is an issue if a single component during probe fails. In that case, component_bind_all() calls unbind on already succussfully bound components, and then frees memory allocated using devm. If one of those components registered e.g. an encoder with the framework then this leads to use after free situations.

Quoted 2 lines

Revert the commit to ensure that all components properly undo what ->bind does.

After Lucas comment mentioning HDMI unbind is not proper I looked through all the unbind again. The other unbind functions need some fixing too. I did not bother checking whether those were always broken or just because things changed (the commit this is reverting was in 2016).... Here is what I found:

Quoted 36 lines

Link:
https://www.mail-archive.com/[email protected]/msg233327.html

---
 drivers/gpu/drm/imx/imx-drm-core.c     | 4 ++--
 drivers/gpu/drm/imx/imx-ldb.c          | 6 ++++++
 drivers/gpu/drm/imx/imx-tve.c          | 3 +++
 drivers/gpu/drm/imx/parallel-display.c | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -2
index 5ea0c82f9957..caa6061a98ba 100644
@@ -305,11 +305,11 @@ static void imx_drm_unbind(struct device *dev)
 
 	drm_fb_cma_fbdev_fini(drm);
 
-	drm_mode_config_cleanup(drm);
-
 	component_unbind_all(drm->dev, drm);
 	dev_set_drvdata(dev, NULL);
 
+	drm_mode_config_cleanup(drm);
+
 	drm_dev_put(drm);
 }
 
drivers/gpu/drm/imx/imx-ldb.c +0 -0
index 3bd0f8a18e74..592aabc4a262 100644

drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_unbind(struct device *dev, · line 731

Quoted 9 lines
drivers/gpu/drm/imx/imx-ldb.c +5 -0
@@ -723,6 +723,12 @@ static void imx_ldb_unbind(struct device *dev,
 struct device *master,
 		if (channel->panel)
 			drm_panel_detach(channel->panel);
 
+		if (!channel->connector.funcs)
+			continue;
+
+		channel->connector.funcs->destroy(&channel->connector);
+		channel->encoder.funcs->destroy(&channel->encoder);

There can be an encoder and bridge, or an encoder and connector. All of them should be properly cleaned up.

Quoted 7 lines

So I guess this should look like this:

  		if (channel->panel)
  			drm_panel_detach(channel->panel);

  		if (channel->bridge)
  			drm_bridge_detach(channel->bridge);

Actually, when a bridge is attached to an encoder, which is the case when unbind is getting called, then encoder cleanup takes care of drm_bridge_detach.

Quoted 34 lines
		if (channel->connector.funcs)
			channel->connector.funcs->destroy(&channel->connector);

		if (channel->encoder.funcs)
			channel->encoder.funcs->destroy(&channel->encoder);

		kfree(channel->edid);
		i2c_put_adapter(channel->ddc);

The last two functions following are only strictly necessary when connector is initialized. But its safe to call them with null, so I would just call them always.

Quoted 9 lines
drivers/gpu/drm/imx/imx-ldb.c +1 -0
+
 		kfree(channel->edid);
 		i2c_put_adapter(channel->ddc);
drivers/gpu/drm/imx/imx-ldb.c +0 -0
 	}
drivers/gpu/drm/imx/imx-tve.c +0 -0
index cffd3310240e..8d6e89ce1edb 100644

drivers/gpu/drm/imx/imx-tve.c static void imx_tve_unbind(struct device *dev, · line 679

Quoted 7 lines
drivers/gpu/drm/imx/imx-tve.c +3 -0
@@ -673,6 +673,9 @@ static void imx_tve_unbind(struct device *dev,
 struct device *master,
 {
 	struct imx_tve *tve = dev_get_drvdata(dev);
 
+	tve->connector.funcs->destroy(&tve->connector);
+	tve->encoder.funcs->destroy(&tve->encoder);
+

Cleanup of tve->ddc missing.

Quoted 15 lines

drivers/gpu/drm/imx/parallel-display.c static void imx_pd_unbind(struct device *dev, · line 261

Quoted 13 lines
drivers/gpu/drm/imx/imx-tve.c +0 -0
 	if (!IS_ERR(tve->dac_reg))
 		regulator_disable(tve->dac_reg);

}

drivers/gpu/drm/imx/parallel-display.c +0 -0
index aefd04e18f93..6f11bffcde37 100644
@@ -258,6 +258,9 @@ static void imx_pd_unbind(struct device *dev,
 struct device *master,
 	if (imxpd->panel)
 		drm_panel_detach(imxpd->panel);
 

And in this case a bridge detach is missing.

Same here.

Quoted 2 lines

Will send a v2 with that addressed.

Still valid.

--
Stefan

Quoted 9 lines

--
Stefan

Quoted 5 lines
drivers/gpu/drm/imx/parallel-display.c +3 -0
+	imxpd->encoder.funcs->destroy(&imxpd->encoder);
+	imxpd->connector.funcs->destroy(&imxpd->connector);
+
 	kfree(imxpd->edid);
 }