* [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
@ 2024-05-20 9:40 Christophe JAILLET
2024-05-20 15:05 ` Sean Anderson
2024-05-22 15:53 ` Laurent Pinchart
0 siblings, 2 replies; 7+ messages in thread
From: Christophe JAILLET @ 2024-05-20 9:40 UTC (permalink / raw)
To: Laurent Pinchart, Tomi Valkeinen, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
Michal Simek, Sean Anderson
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, dri-devel,
linux-arm-kernel
If zynqmp_dpsub_drm_init() fails, we must undo the previous
drm_bridge_add() call.
Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only
---
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
index face8d6b2a6f..f5781939de9c 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
@@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
return 0;
err_disp:
+ drm_bridge_remove(dpsub->bridge);
zynqmp_disp_remove(dpsub);
err_dp:
zynqmp_dp_remove(dpsub);
--
2.45.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
2024-05-20 9:40 [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe() Christophe JAILLET
@ 2024-05-20 15:05 ` Sean Anderson
2024-06-13 15:05 ` Sean Anderson
2024-05-22 15:53 ` Laurent Pinchart
1 sibling, 1 reply; 7+ messages in thread
From: Sean Anderson @ 2024-05-20 15:05 UTC (permalink / raw)
To: Christophe JAILLET, Laurent Pinchart, Tomi Valkeinen,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Daniel Vetter, Michal Simek
Cc: linux-kernel, kernel-janitors, dri-devel, linux-arm-kernel
On 5/20/24 05:40, Christophe JAILLET wrote:
> If zynqmp_dpsub_drm_init() fails, we must undo the previous
> drm_bridge_add() call.
>
> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only
> ---
> drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> index face8d6b2a6f..f5781939de9c 100644
> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
> return 0;
>
> err_disp:
> + drm_bridge_remove(dpsub->bridge);
> zynqmp_disp_remove(dpsub);
> err_dp:
> zynqmp_dp_remove(dpsub);
Reviewed-by: Sean Anderson <sean.anderso@linux.dev>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
2024-05-20 15:05 ` Sean Anderson
@ 2024-06-13 15:05 ` Sean Anderson
2024-06-16 18:43 ` Laurent Pinchart
0 siblings, 1 reply; 7+ messages in thread
From: Sean Anderson @ 2024-06-13 15:05 UTC (permalink / raw)
To: Christophe JAILLET, Laurent Pinchart, Tomi Valkeinen,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Daniel Vetter, Michal Simek
Cc: linux-kernel, kernel-janitors, dri-devel, linux-arm-kernel
On 5/20/24 11:05, Sean Anderson wrote:
> On 5/20/24 05:40, Christophe JAILLET wrote:
>> If zynqmp_dpsub_drm_init() fails, we must undo the previous
>> drm_bridge_add() call.
>>
>> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>> ---
>> Compile tested only
>> ---
>> drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
>> index face8d6b2a6f..f5781939de9c 100644
>> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
>> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
>> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
>> return 0;
>>
>> err_disp:
>> + drm_bridge_remove(dpsub->bridge);
>> zynqmp_disp_remove(dpsub);
>> err_dp:
>> zynqmp_dp_remove(dpsub);
>
> Reviewed-by: Sean Anderson <sean.anderso@linux.dev>
Will this be applied soon? The patch it fixes has made its way into the stable tree already.
--Sean
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
2024-06-13 15:05 ` Sean Anderson
@ 2024-06-16 18:43 ` Laurent Pinchart
2024-06-17 7:43 ` Tomi Valkeinen
0 siblings, 1 reply; 7+ messages in thread
From: Laurent Pinchart @ 2024-06-16 18:43 UTC (permalink / raw)
To: Sean Anderson
Cc: Christophe JAILLET, Tomi Valkeinen, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
Michal Simek, linux-kernel, kernel-janitors, dri-devel,
linux-arm-kernel
On Thu, Jun 13, 2024 at 11:05:01AM -0400, Sean Anderson wrote:
> On 5/20/24 11:05, Sean Anderson wrote:
> > On 5/20/24 05:40, Christophe JAILLET wrote:
> >> If zynqmp_dpsub_drm_init() fails, we must undo the previous
> >> drm_bridge_add() call.
> >>
> >> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
> >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> >> ---
> >> Compile tested only
> >> ---
> >> drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
> >> 1 file changed, 1 insertion(+)
> >>
> >> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >> index face8d6b2a6f..f5781939de9c 100644
> >> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
> >> return 0;
> >>
> >> err_disp:
> >> + drm_bridge_remove(dpsub->bridge);
> >> zynqmp_disp_remove(dpsub);
> >> err_dp:
> >> zynqmp_dp_remove(dpsub);
> >
> > Reviewed-by: Sean Anderson <sean.anderso@linux.dev>
>
> Will this be applied soon? The patch it fixes has made its way into
> the stable tree already.
If someone can merge it in drm-misc that would be the fastest way.
Otherwise I'll send a pull request at some point, but I'm overworked at
the moment.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
2024-06-16 18:43 ` Laurent Pinchart
@ 2024-06-17 7:43 ` Tomi Valkeinen
2024-06-17 8:59 ` Laurent Pinchart
0 siblings, 1 reply; 7+ messages in thread
From: Tomi Valkeinen @ 2024-06-17 7:43 UTC (permalink / raw)
To: Laurent Pinchart, Sean Anderson, Christophe JAILLET
Cc: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Daniel Vetter, Michal Simek, linux-kernel, kernel-janitors,
dri-devel, linux-arm-kernel
Hi,
On 16/06/2024 21:43, Laurent Pinchart wrote:
> On Thu, Jun 13, 2024 at 11:05:01AM -0400, Sean Anderson wrote:
>> On 5/20/24 11:05, Sean Anderson wrote:
>>> On 5/20/24 05:40, Christophe JAILLET wrote:
>>>> If zynqmp_dpsub_drm_init() fails, we must undo the previous
>>>> drm_bridge_add() call.
>>>>
>>>> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
>>>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>>>> ---
>>>> Compile tested only
>>>> ---
>>>> drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
>>>> 1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
>>>> index face8d6b2a6f..f5781939de9c 100644
>>>> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
>>>> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
>>>> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
>>>> return 0;
>>>>
>>>> err_disp:
>>>> + drm_bridge_remove(dpsub->bridge);
>>>> zynqmp_disp_remove(dpsub);
>>>> err_dp:
>>>> zynqmp_dp_remove(dpsub);
>>>
>>> Reviewed-by: Sean Anderson <sean.anderso@linux.dev>
>>
>> Will this be applied soon? The patch it fixes has made its way into
>> the stable tree already.
>
> If someone can merge it in drm-misc that would be the fastest way.
> Otherwise I'll send a pull request at some point, but I'm overworked at
> the moment.
>
Thanks, I have pushed this to drm-misc-next.
Tomi
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
2024-06-17 7:43 ` Tomi Valkeinen
@ 2024-06-17 8:59 ` Laurent Pinchart
0 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2024-06-17 8:59 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Sean Anderson, Christophe JAILLET, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
Michal Simek, linux-kernel, kernel-janitors, dri-devel,
linux-arm-kernel
On Mon, Jun 17, 2024 at 10:43:44AM +0300, Tomi Valkeinen wrote:
> On 16/06/2024 21:43, Laurent Pinchart wrote:
> > On Thu, Jun 13, 2024 at 11:05:01AM -0400, Sean Anderson wrote:
> >> On 5/20/24 11:05, Sean Anderson wrote:
> >>> On 5/20/24 05:40, Christophe JAILLET wrote:
> >>>> If zynqmp_dpsub_drm_init() fails, we must undo the previous
> >>>> drm_bridge_add() call.
> >>>>
> >>>> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
> >>>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> >>>> ---
> >>>> Compile tested only
> >>>> ---
> >>>> drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
> >>>> 1 file changed, 1 insertion(+)
> >>>>
> >>>> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >>>> index face8d6b2a6f..f5781939de9c 100644
> >>>> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >>>> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >>>> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
> >>>> return 0;
> >>>>
> >>>> err_disp:
> >>>> + drm_bridge_remove(dpsub->bridge);
> >>>> zynqmp_disp_remove(dpsub);
> >>>> err_dp:
> >>>> zynqmp_dp_remove(dpsub);
> >>>
> >>> Reviewed-by: Sean Anderson <sean.anderso@linux.dev>
> >>
> >> Will this be applied soon? The patch it fixes has made its way into
> >> the stable tree already.
> >
> > If someone can merge it in drm-misc that would be the fastest way.
> > Otherwise I'll send a pull request at some point, but I'm overworked at
> > the moment.
>
> Thanks, I have pushed this to drm-misc-next.
Thank you Tomi, much appreciated.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
2024-05-20 9:40 [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe() Christophe JAILLET
2024-05-20 15:05 ` Sean Anderson
@ 2024-05-22 15:53 ` Laurent Pinchart
1 sibling, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2024-05-22 15:53 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Tomi Valkeinen, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Daniel Vetter, Michal Simek,
Sean Anderson, linux-kernel, kernel-janitors, dri-devel,
linux-arm-kernel, Anatoliy Klymenko
Hi Christophe,
Thank you for the patch.
On Mon, May 20, 2024 at 11:40:37AM +0200, Christophe JAILLET wrote:
> If zynqmp_dpsub_drm_init() fails, we must undo the previous
> drm_bridge_add() call.
>
> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Compile tested only
> ---
> drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> index face8d6b2a6f..f5781939de9c 100644
> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
> return 0;
>
> err_disp:
> + drm_bridge_remove(dpsub->bridge);
> zynqmp_disp_remove(dpsub);
> err_dp:
> zynqmp_dp_remove(dpsub);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-06-17 8:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-20 9:40 [PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe() Christophe JAILLET
2024-05-20 15:05 ` Sean Anderson
2024-06-13 15:05 ` Sean Anderson
2024-06-16 18:43 ` Laurent Pinchart
2024-06-17 7:43 ` Tomi Valkeinen
2024-06-17 8:59 ` Laurent Pinchart
2024-05-22 15:53 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox