[PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Peter Chen]

This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.

The of_get_next_parent will drop refcount on the passed node, so the reverted
patch is wrong, thanks for Tomi Valkeinen points it.

Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
 drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
index e256d87..dfd4e96 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
@@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
 
 static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
 {
-	struct device_node *np, *np_parent;
+	struct device_node *np;
 
 	np = of_parse_phandle(node, "remote-endpoint", 0);
 	if (!np)
 		return NULL;
 
-	np_parent = of_get_next_parent(np);
-	of_node_put(np);
+	np = of_get_next_parent(np);
 
-	return np_parent;
+	return np;
 }
 
 struct device_node *
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Sean Paul]

On Thu, Aug 11, 2016 at 5:44 AM, Peter Chen <peter.chen@nxp.com> wrote:
> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
>
> The of_get_next_parent will drop refcount on the passed node, so the reverted
> patch is wrong, thanks for Tomi Valkeinen points it.
>

Indeed it is. Tomi, are you going to pick this up in your tree, or
would you like it to go through -misc?

Reviewed-by: Sean Paul <seanpaul@chromium.org>


> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Signed-off-by: Peter Chen <peter.chen@nxp.com>
> ---
>  drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
> index e256d87..dfd4e96 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
> @@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
>
>  static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
>  {
> -       struct device_node *np, *np_parent;
> +       struct device_node *np;
>
>         np = of_parse_phandle(node, "remote-endpoint", 0);
>         if (!np)
>                 return NULL;
>
> -       np_parent = of_get_next_parent(np);
> -       of_node_put(np);
> +       np = of_get_next_parent(np);
>
> -       return np_parent;
> +       return np;
>  }
>
>  struct device_node *
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Tomi Valkeinen]

[-- Attachment #1.1.1: Type: text/plain, Size: 1754 bytes --]

On 11/08/16 13:56, Sean Paul wrote:
> On Thu, Aug 11, 2016 at 5:44 AM, Peter Chen <peter.chen@nxp.com> wrote:
>> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
>>
>> The of_get_next_parent will drop refcount on the passed node, so the reverted
>> patch is wrong, thanks for Tomi Valkeinen points it.
>>
> 
> Indeed it is. Tomi, are you going to pick this up in your tree, or
> would you like it to go through -misc?
> 
> Reviewed-by: Sean Paul <seanpaul@chromium.org>

Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

I don't have any other fixes at the moment, so I'm fine with it going
via some other tree, or picked directly to drm-fixes.

 Tomi

>> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> Signed-off-by: Peter Chen <peter.chen@nxp.com>
>> ---
>>  drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> index e256d87..dfd4e96 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> @@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
>>
>>  static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
>>  {
>> -       struct device_node *np, *np_parent;
>> +       struct device_node *np;
>>
>>         np = of_parse_phandle(node, "remote-endpoint", 0);
>>         if (!np)
>>                 return NULL;
>>
>> -       np_parent = of_get_next_parent(np);
>> -       of_node_put(np);
>> +       np = of_get_next_parent(np);
>>
>> -       return np_parent;
>> +       return np;
>>  }
>>
>>  struct device_node *
>> --
>> 1.9.1
>>


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Sean Paul]

On Thu, Aug 11, 2016 at 7:00 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> On 11/08/16 13:56, Sean Paul wrote:
>> On Thu, Aug 11, 2016 at 5:44 AM, Peter Chen <peter.chen@nxp.com> wrote:
>>> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
>>>
>>> The of_get_next_parent will drop refcount on the passed node, so the reverted
>>> patch is wrong, thanks for Tomi Valkeinen points it.
>>>
>>
>> Indeed it is. Tomi, are you going to pick this up in your tree, or
>> would you like it to go through -misc?
>>
>> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>
> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>
> I don't have any other fixes at the moment, so I'm fine with it going
> via some other tree, or picked directly to drm-fixes.
>

Applied to drm-misc

Sean


>  Tomi
>
>>> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
>>> Signed-off-by: Peter Chen <peter.chen@nxp.com>
>>> ---
>>>  drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
>>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>>> index e256d87..dfd4e96 100644
>>> --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
>>> +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>>> @@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
>>>
>>>  static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
>>>  {
>>> -       struct device_node *np, *np_parent;
>>> +       struct device_node *np;
>>>
>>>         np = of_parse_phandle(node, "remote-endpoint", 0);
>>>         if (!np)
>>>                 return NULL;
>>>
>>> -       np_parent = of_get_next_parent(np);
>>> -       of_node_put(np);
>>> +       np = of_get_next_parent(np);
>>>
>>> -       return np_parent;
>>> +       return np;
>>>  }
>>>
>>>  struct device_node *
>>> --
>>> 1.9.1
>>>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Tomi Valkeinen]

[-- Attachment #1.1.1: Type: text/plain, Size: 939 bytes --]

Hi,

On 12/08/16 14:14, Sean Paul wrote:
> On Thu, Aug 11, 2016 at 7:00 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>> On 11/08/16 13:56, Sean Paul wrote:
>>> On Thu, Aug 11, 2016 at 5:44 AM, Peter Chen <peter.chen@nxp.com> wrote:
>>>> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
>>>>
>>>> The of_get_next_parent will drop refcount on the passed node, so the reverted
>>>> patch is wrong, thanks for Tomi Valkeinen points it.
>>>>
>>>
>>> Indeed it is. Tomi, are you going to pick this up in your tree, or
>>> would you like it to go through -misc?
>>>
>>> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>>
>> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>>
>> I don't have any other fixes at the moment, so I'm fine with it going
>> via some other tree, or picked directly to drm-fixes.
>>
> 
> Applied to drm-misc

Hmm, did this go to drm-next? It should be in drm-fixes.

 Tomi


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Tomi Valkeinen]

[-- Attachment #1.1.1: Type: text/plain, Size: 1498 bytes --]

Hi Dave,

Can you pick this for drm-fixes? The bug is causing scary looking stack
dumps when loading omapdrm.

Apparently this fix went into drm-next accidentally instead of
drm-fixes. I hope having the same patch in both trees won't be causing
any extra conflicts.

 Tomi

On 11/08/16 12:44, Peter Chen wrote:
> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
> 
> The of_get_next_parent will drop refcount on the passed node, so the reverted
> patch is wrong, thanks for Tomi Valkeinen points it.
> 
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Signed-off-by: Peter Chen <peter.chen@nxp.com>
> ---
>  drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
> index e256d87..dfd4e96 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
> @@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
>  
>  static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
>  {
> -	struct device_node *np, *np_parent;
> +	struct device_node *np;
>  
>  	np = of_parse_phandle(node, "remote-endpoint", 0);
>  	if (!np)
>  		return NULL;
>  
> -	np_parent = of_get_next_parent(np);
> -	of_node_put(np);
> +	np = of_get_next_parent(np);
>  
> -	return np_parent;
> +	return np;
>  }
>  
>  struct device_node *
> 


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

[Tomi Valkeinen]

[-- Attachment #1.1.1: Type: text/plain, Size: 1745 bytes --]

Hi Dave,

Ping on this. This one is already in drm-next, so one can just
cherry-pick it: 5a78ff7bf7e25191144b550961001bbf6c734da4

 Tomi

On 06/09/16 15:18, Tomi Valkeinen wrote:
> Hi Dave,
> 
> Can you pick this for drm-fixes? The bug is causing scary looking stack
> dumps when loading omapdrm.
> 
> Apparently this fix went into drm-next accidentally instead of
> drm-fixes. I hope having the same patch in both trees won't be causing
> any extra conflicts.
> 
>  Tomi
> 
> On 11/08/16 12:44, Peter Chen wrote:
>> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
>>
>> The of_get_next_parent will drop refcount on the passed node, so the reverted
>> patch is wrong, thanks for Tomi Valkeinen points it.
>>
>> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> Signed-off-by: Peter Chen <peter.chen@nxp.com>
>> ---
>>  drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> index e256d87..dfd4e96 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> @@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
>>  
>>  static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
>>  {
>> -	struct device_node *np, *np_parent;
>> +	struct device_node *np;
>>  
>>  	np = of_parse_phandle(node, "remote-endpoint", 0);
>>  	if (!np)
>>  		return NULL;
>>  
>> -	np_parent = of_get_next_parent(np);
>> -	of_node_put(np);
>> +	np = of_get_next_parent(np);
>>  
>> -	return np_parent;
>> +	return np;
>>  }
>>  
>>  struct device_node *
>>
> 


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel