Skip to contentSkip to conversation

drm/tegra: dc: Use devm_platform_ioremap_resource

PATCH In review Dmitry Osipenko 2 participants 5 messages Mar 8, 2020 – Mar 12, 2020

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

PATCH 1/3 drm/tegra: dc: Use devm_platform_ioremap_resource

The devm_platform_ioremap_resource() helper replaces few lines of a boilerplate code with a single line, making code to look cleaner a tad.

---
 drivers/gpu/drm/tegra/dc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/tegra/dc.c +1 -3
index 7c70fd31a4c2..257163dda301 100644
@@ -2503,7 +2503,6 @@ static int tegra_dc_couple(struct tegra_dc *dc)
 
 static int tegra_dc_probe(struct platform_device *pdev)
 {
-	struct resource *regs;
 	struct tegra_dc *dc;
 	int err;
 
@@ -2560,8 +2559,7 @@ static int tegra_dc_probe(struct platform_device *pdev)
 		tegra_powergate_power_off(dc->powergate);
 	}
 
-	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	dc->regs = devm_ioremap_resource(&pdev->dev, regs);
+	dc->regs = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(dc->regs))
 		return PTR_ERR(dc->regs);
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 drm/tegra: dc: Release PM and RGB output when client's registration fails

Runtime PM and RGB output need to be released when host1x client registration fails. The releasing is missed in the code, let's correct it.

---
 drivers/gpu/drm/tegra/dc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +7 -1
index 257163dda301..56d933e81797 100644
@@ -2586,10 +2586,16 @@ static int tegra_dc_probe(struct platform_device *pdev)
 	if (err < 0) {
 		dev_err(&pdev->dev, "failed to register host1x client: %d\n",
 			err);
-		return err;
+		goto disable_pm;
 	}
 
 	return 0;
+
+disable_pm:
+	pm_runtime_disable(&pdev->dev);
+	tegra_dc_rgb_remove(dc);
+
+	return err;
 }
 
 static int tegra_dc_remove(struct platform_device *pdev)
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 drm/tegra: dc: Silence RGB output deferred-probe error

In reply to Dmitry Osipenko

Driver fails to probe with -EPROBE_DEFER if display output isn't ready yet. This produces a bit noisy error message in KMSG during kernel's boot up on Tegra20 and Tegra30 because RGB output tends to be probed earlier than a corresponding voltage regulator driver.

---
 drivers/gpu/drm/tegra/dc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +5 -1
index 56d933e81797..d7f2c4654b6b 100644
@@ -2571,7 +2571,11 @@ static int tegra_dc_probe(struct platform_device *pdev)
 
 	err = tegra_dc_rgb_probe(dc);
 	if (err < 0 && err != -ENODEV) {
-		dev_err(&pdev->dev, "failed to probe RGB output: %d\n", err);
+		if (err == -EPROBE_DEFER)
+			dev_dbg(&pdev->dev, "RGB output probe deferred\n");
+		else
+			dev_err(&pdev->dev, "failed to probe RGB output: %d\n",
+				err);
 		return err;
 	}
 
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH v1 3/3] drm/tegra: dc: Silence RGB output deferred-probe error

Quoted 16 lines · Dmitry Osipenko

Driver fails to probe with -EPROBE_DEFER if display output isn't ready yet. This produces a bit noisy error message in KMSG during kernel's boot up on Tegra20 and Tegra30 because RGB output tends to be probed earlier than a corresponding voltage regulator driver.

---
 drivers/gpu/drm/tegra/dc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +0 -0
index 56d933e81797..d7f2c4654b6b 100644
@@ -2571,7 +2571,11 @@ static int tegra_dc_probe(struct platform_device *pdev)
 

drivers/gpu/drm/tegra/dc.c static int tegra_dc_probe(struct platform_device *pdev) · line 2580

Quoted 10 lines
drivers/gpu/drm/tegra/dc.c +5 -1
 	err = tegra_dc_rgb_probe(dc);
 	if (err < 0 && err != -ENODEV) {
-		dev_err(&pdev->dev, "failed to probe RGB output: %d\n", err);
+		if (err == -EPROBE_DEFER)
+			dev_dbg(&pdev->dev, "RGB output probe deferred\n");
+		else
+			dev_err(&pdev->dev, "failed to probe RGB output: %d\n",
+				err);
 		return err;
 	}

I'd prefer if we had just a single message and only differentiate on the kernel message level, something more along these lines:

	if (err < 0 && err != -ENODEV) {
		const char *level = KERN_ERR;

		if (err == -EPROBE_DEFER)
			level = KERN_DEBUG;

		dev_printk(level, dc->dev, "failed to probe RGB output: %d\n",
			   err);
		return err;
	}

Do you mind if I squash that into your patch?

Thierry

#4 lore raw

Re: [PATCH v1 3/3] drm/tegra: dc: Silence RGB output deferred-probe error

12.03.2020 12:33, Thierry Reding пишет:

Quoted 42 lines · Dmitry Osipenko
Quoted 16 lines

Driver fails to probe with -EPROBE_DEFER if display output isn't ready yet. This produces a bit noisy error message in KMSG during kernel's boot up on Tegra20 and Tegra30 because RGB output tends to be probed earlier than a corresponding voltage regulator driver.

---
 drivers/gpu/drm/tegra/dc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +0 -0
index 56d933e81797..d7f2c4654b6b 100644
@@ -2571,7 +2571,11 @@ static int tegra_dc_probe(struct platform_device *pdev)
 

drivers/gpu/drm/tegra/dc.c static int tegra_dc_probe(struct platform_device *pdev) · line 2580

Quoted 10 lines
drivers/gpu/drm/tegra/dc.c +5 -1
 	err = tegra_dc_rgb_probe(dc);
 	if (err < 0 && err != -ENODEV) {
-		dev_err(&pdev->dev, "failed to probe RGB output: %d\n", err);
+		if (err == -EPROBE_DEFER)
+			dev_dbg(&pdev->dev, "RGB output probe deferred\n");
+		else
+			dev_err(&pdev->dev, "failed to probe RGB output: %d\n",
+				err);
 		return err;
 	}

I'd prefer if we had just a single message and only differentiate on the kernel message level, something more along these lines:

	if (err < 0 && err != -ENODEV) {
		const char *level = KERN_ERR;

		if (err == -EPROBE_DEFER)
			level = KERN_DEBUG;

		dev_printk(level, dc->dev, "failed to probe RGB output: %d\n",
			   err);
		return err;
	}
Quoted 1 line

Do you mind if I squash that into your patch?

I don't mind, thanks :)