2018-04-17 11:36:40

by Philippe Cornu

Subject: [PATCH] drm/stm: ltdc: fix deferred endpoint management

When a driver related to one of the endpoints is deferred
due to probe dependencies (i2c, spi...) but the other one
is ready, ltdc probe continues and the deferred driver
will never be probed again.

The fix consists in waiting for all deferred endpoints before
continuing the ltdc probe.

Signed-off-by: Philippe Cornu <[email protected]>
---
drivers/gpu/drm/stm/ltdc.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index e3121d9e4230..014cef8cef37 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -987,14 +987,13 @@ int ltdc_load(struct drm_device *ddev)
&bridge[i]);

/*
- * If at least one endpoint is ready, continue probing,
- * else if at least one endpoint is -EPROBE_DEFER and
- * there is no previous ready endpoints, defer probing.
+ * If at least one endpoint is -EPROBE_DEFER, defer probing,
+ * else if at least one endpoint is ready, continue probing.
*/
- if (!ret)
+ if (ret == -EPROBE_DEFER)
+ return ret;
+ else if (!ret)
endpoint_not_ready = 0;
- else if (ret == -EPROBE_DEFER && endpoint_not_ready)
- endpoint_not_ready = -EPROBE_DEFER;
}

if (endpoint_not_ready)
--
2.15.1

2018-04-25 07:13:52

by Yannick FERTRE

Subject: Re: [PATCH] drm/stm: ltdc: fix deferred endpoint management

Hi Philippe,

Reviewed-by: Yannick Fertré <[email protected]>


On 04/17/2018 01:34 PM, Philippe Cornu wrote:
> When a driver related to one of the endpoints is deferred
> due to probe dependencies (i2c, spi...) but the other one
> is ready, ltdc probe continues and the deferred driver
> will never be probed again.
>
> The fix consists in waiting for all deferred endpoints before
> continuing the ltdc probe.
>
> Signed-off-by: Philippe Cornu <[email protected]>
> ---
> drivers/gpu/drm/stm/ltdc.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> index e3121d9e4230..014cef8cef37 100644
> --- a/drivers/gpu/drm/stm/ltdc.c
> +++ b/drivers/gpu/drm/stm/ltdc.c
> @@ -987,14 +987,13 @@ int ltdc_load(struct drm_device *ddev)
> &bridge[i]);
>
> /*
> - * If at least one endpoint is ready, continue probing,
> - * else if at least one endpoint is -EPROBE_DEFER and
> - * there is no previous ready endpoints, defer probing.
> + * If at least one endpoint is -EPROBE_DEFER, defer probing,
> + * else if at least one endpoint is ready, continue probing.
> */
> - if (!ret)
> + if (ret == -EPROBE_DEFER)
> + return ret;
> + else if (!ret)
> endpoint_not_ready = 0;
> - else if (ret == -EPROBE_DEFER && endpoint_not_ready)
> - endpoint_not_ready = -EPROBE_DEFER;
> }
>
> if (endpoint_not_ready)
>

2018-04-27 13:01:00

by Philippe Cornu

Subject: Re: [PATCH] drm/stm: ltdc: fix deferred endpoint management

On 04/25/2018 09:12 AM, Yannick FERTRE wrote:
> Hi Philippe,
>
> Reviewed-by: Yannick Fertré <[email protected]>

Applied on drm-misc-next.
Many thanks,
Philippe :-)


>
>
> On 04/17/2018 01:34 PM, Philippe Cornu wrote:
>> When a driver related to one of the endpoints is deferred
>> due to probe dependencies (i2c, spi...) but the other one
>> is ready, ltdc probe continues and the deferred driver
>> will never be probed again.
>>
>> The fix consists in waiting for all deferred endpoints before
>> continuing the ltdc probe.
>>
>> Signed-off-by: Philippe Cornu <[email protected]>
>> ---
>> drivers/gpu/drm/stm/ltdc.c | 11 +++++------
>> 1 file changed, 5 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
>> index e3121d9e4230..014cef8cef37 100644
>> --- a/drivers/gpu/drm/stm/ltdc.c
>> +++ b/drivers/gpu/drm/stm/ltdc.c
>> @@ -987,14 +987,13 @@ int ltdc_load(struct drm_device *ddev)
>> &bridge[i]);
>>
>> /*
>> - * If at least one endpoint is ready, continue probing,
>> - * else if at least one endpoint is -EPROBE_DEFER and
>> - * there is no previous ready endpoints, defer probing.
>> + * If at least one endpoint is -EPROBE_DEFER, defer probing,
>> + * else if at least one endpoint is ready, continue probing.
>> */
>> - if (!ret)
>> + if (ret == -EPROBE_DEFER)
>> + return ret;
>> + else if (!ret)
>> endpoint_not_ready = 0;
>> - else if (ret == -EPROBE_DEFER && endpoint_not_ready)
>> - endpoint_not_ready = -EPROBE_DEFER;
>> }
>>
>> if (endpoint_not_ready)