This patchset adds some check of the returned error code in probe.
Fabien Dessenne (2):
drm/stm: ltdc: manage the get_irq probe defer case
drm/stm: ltdc: return appropriate error code during probe
drivers/gpu/drm/stm/ltdc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
2.7.4
Manage the -EPROBE_DEFER error case for the ltdc IRQ.
Signed-off-by: Fabien Dessenne <[email protected]>
---
drivers/gpu/drm/stm/ltdc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index 566b0d8..521ba83 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -1174,6 +1174,9 @@ int ltdc_load(struct drm_device *ddev)
for (i = 0; i < MAX_IRQ; i++) {
irq = platform_get_irq(pdev, i);
+ if (irq == -EPROBE_DEFER)
+ goto err;
+
if (irq < 0)
continue;
--
2.7.4
During probe, return the "clk_get" error value instead of -ENODEV.
Signed-off-by: Fabien Dessenne <[email protected]>
---
drivers/gpu/drm/stm/ltdc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index 521ba83..97912e2 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -1145,8 +1145,9 @@ int ltdc_load(struct drm_device *ddev)
ldev->pixel_clk = devm_clk_get(dev, "lcd");
if (IS_ERR(ldev->pixel_clk)) {
- DRM_ERROR("Unable to get lcd clock\n");
- return -ENODEV;
+ if (PTR_ERR(ldev->pixel_clk) != -EPROBE_DEFER)
+ DRM_ERROR("Unable to get lcd clock\n");
+ return PTR_ERR(ldev->pixel_clk);
}
if (clk_prepare_enable(ldev->pixel_clk)) {
--
2.7.4
Hi Fabien,
and thank you for your patch,
Acked-by: Philippe Cornu <[email protected]>
Philippe :-)
On 4/24/19 4:03 PM, Fabien Dessenne wrote:
> During probe, return the "clk_get" error value instead of -ENODEV.
>
> Signed-off-by: Fabien Dessenne <[email protected]>
> ---
> drivers/gpu/drm/stm/ltdc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> index 521ba83..97912e2 100644
> --- a/drivers/gpu/drm/stm/ltdc.c
> +++ b/drivers/gpu/drm/stm/ltdc.c
> @@ -1145,8 +1145,9 @@ int ltdc_load(struct drm_device *ddev)
>
> ldev->pixel_clk = devm_clk_get(dev, "lcd");
> if (IS_ERR(ldev->pixel_clk)) {
> - DRM_ERROR("Unable to get lcd clock\n");
> - return -ENODEV;
> + if (PTR_ERR(ldev->pixel_clk) != -EPROBE_DEFER)
> + DRM_ERROR("Unable to get lcd clock\n");
> + return PTR_ERR(ldev->pixel_clk);
> }
>
> if (clk_prepare_enable(ldev->pixel_clk)) {
>
Hi Fabien,
and thank you for your patch,
Acked-by: Philippe Cornu <[email protected]>
Philippe :-)
On 4/24/19 4:03 PM, Fabien Dessenne wrote:
> Manage the -EPROBE_DEFER error case for the ltdc IRQ.
>
> Signed-off-by: Fabien Dessenne <[email protected]>
> ---
> drivers/gpu/drm/stm/ltdc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> index 566b0d8..521ba83 100644
> --- a/drivers/gpu/drm/stm/ltdc.c
> +++ b/drivers/gpu/drm/stm/ltdc.c
> @@ -1174,6 +1174,9 @@ int ltdc_load(struct drm_device *ddev)
>
> for (i = 0; i < MAX_IRQ; i++) {
> irq = platform_get_irq(pdev, i);
> + if (irq == -EPROBE_DEFER)
> + goto err;
> +
> if (irq < 0)
> continue;
>
>
Le ven. 26 avr. 2019 à 14:30, Philippe CORNU <[email protected]> a écrit :
>
> Hi Fabien,
> and thank you for your patch,
>
> Acked-by: Philippe Cornu <[email protected]>
>
> Philippe :-)
>
> On 4/24/19 4:03 PM, Fabien Dessenne wrote:
> > Manage the -EPROBE_DEFER error case for the ltdc IRQ.
> >
> > Signed-off-by: Fabien Dessenne <[email protected]>
Applied on drm-misc-next.
Thanks,
Benjamin
> > ---
> > drivers/gpu/drm/stm/ltdc.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> > index 566b0d8..521ba83 100644
> > --- a/drivers/gpu/drm/stm/ltdc.c
> > +++ b/drivers/gpu/drm/stm/ltdc.c
> > @@ -1174,6 +1174,9 @@ int ltdc_load(struct drm_device *ddev)
> >
> > for (i = 0; i < MAX_IRQ; i++) {
> > irq = platform_get_irq(pdev, i);
> > + if (irq == -EPROBE_DEFER)
> > + goto err;
> > +
> > if (irq < 0)
> > continue;
> >
> >
Le ven. 26 avr. 2019 à 14:30, Philippe CORNU <[email protected]> a écrit :
>
> Hi Fabien,
> and thank you for your patch,
>
> Acked-by: Philippe Cornu <[email protected]>
>
> Philippe :-)
>
> On 4/24/19 4:03 PM, Fabien Dessenne wrote:
> > During probe, return the "clk_get" error value instead of -ENODEV.
> >
> > Signed-off-by: Fabien Dessenne <[email protected]>
Applied on drm-misc-next.
Thanks,
Benjamin
> > ---
> > drivers/gpu/drm/stm/ltdc.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> > index 521ba83..97912e2 100644
> > --- a/drivers/gpu/drm/stm/ltdc.c
> > +++ b/drivers/gpu/drm/stm/ltdc.c
> > @@ -1145,8 +1145,9 @@ int ltdc_load(struct drm_device *ddev)
> >
> > ldev->pixel_clk = devm_clk_get(dev, "lcd");
> > if (IS_ERR(ldev->pixel_clk)) {
> > - DRM_ERROR("Unable to get lcd clock\n");
> > - return -ENODEV;
> > + if (PTR_ERR(ldev->pixel_clk) != -EPROBE_DEFER)
> > + DRM_ERROR("Unable to get lcd clock\n");
> > + return PTR_ERR(ldev->pixel_clk);
> > }
> >
> > if (clk_prepare_enable(ldev->pixel_clk)) {
> >