2021-04-23 18:23:45

by Lyude Paul

Subject: [PATCH 2/2] drm/tegra: Fix DP AUX channel reference leaks

Noticed while fixing the regression I introduced in Tegra that Tegra seems
to actually never release the device or module references it's grabbing for
the DP AUX channel. So, let's fix that by dropping them when appropriate.

Signed-off-by: Lyude Paul <[email protected]>
---
drivers/gpu/drm/tegra/sor.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 4e0e3a63e586..474586e18d06 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -3772,12 +3772,13 @@ static int tegra_sor_probe(struct platform_device *pdev)

err = tegra_sor_parse_dt(sor);
if (err < 0)
- return err;
+ goto put_aux;

err = tegra_output_probe(&sor->output);
- if (err < 0)
- return dev_err_probe(&pdev->dev, err,
- "failed to probe output\n");
+ if (err < 0) {
+ err = dev_err_probe(&pdev->dev, err, "failed to probe output\n");
+ goto put_aux;
+ }

if (sor->ops && sor->ops->probe) {
err = sor->ops->probe(sor);
@@ -3966,6 +3967,11 @@ static int tegra_sor_probe(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
remove:
tegra_output_remove(&sor->output);
+put_aux:
+ if (sor->aux && sor->output.ddc) {
+ module_put(sor->aux->dev->driver->owner);
+ put_device(sor->aux->dev);
+ }
return err;
}

@@ -3985,6 +3991,11 @@ static int tegra_sor_remove(struct platform_device *pdev)

tegra_output_remove(&sor->output);

+ if (sor->aux && sor->output.ddc) {
+ module_put(sor->aux->dev->driver->owner);
+ put_device(sor->aux->dev);
+ }
+
return 0;
}

--
2.30.2