public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error
@ 2013-04-24  2:48 Wei Yongjun
  2013-04-24  2:53 ` Mark Zhang
  2013-04-24  7:41 ` Thierry Reding
  0 siblings, 2 replies; 6+ messages in thread
From: Wei Yongjun @ 2013-04-24  2:48 UTC (permalink / raw)
  To: thierry.reding, tbergstrom, amerilainen, markz, swarren
  Cc: yongjun_wei, linux-kernel

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Add the missing unlock before return from function host1x_drm_init() and
host1x_drm_exit() in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
rebased on the latest linux-next.git tree.
---
 drivers/gpu/host1x/drm/drm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
index 2b561c9..0dbb9c0 100644
--- a/drivers/gpu/host1x/drm/drm.c
+++ b/drivers/gpu/host1x/drm/drm.c
@@ -148,6 +148,7 @@ int host1x_drm_init(struct host1x_drm *host1x, struct drm_device *drm)
 				dev_err(host1x->dev,
 					"DRM setup failed for %s: %d\n",
 					dev_name(client->dev), err);
+				mutex_unlock(&host1x->clients_lock);
 				return err;
 			}
 		}
@@ -175,6 +176,7 @@ int host1x_drm_exit(struct host1x_drm *host1x)
 				dev_err(host1x->dev,
 					"DRM cleanup failed for %s: %d\n",
 					dev_name(client->dev), err);
+				mutex_unlock(&host1x->clients_lock);
 				return err;
 			}
 		}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error
  2013-04-24  2:48 [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error Wei Yongjun
@ 2013-04-24  2:53 ` Mark Zhang
  2013-04-24  3:07   ` Wei Yongjun
  2013-04-24  7:41 ` Thierry Reding
  1 sibling, 1 reply; 6+ messages in thread
From: Mark Zhang @ 2013-04-24  2:53 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: thierry.reding@avionic-design.de, Terje Bergstrom,
	Arto Merilainen, Stephen Warren, yongjun_wei@trendmicro.com.cn,
	linux-kernel@vger.kernel.org

I think Thierry has acked this patch. So why?

Mark
On 04/24/2013 10:48 AM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Add the missing unlock before return from function host1x_drm_init() and
> host1x_drm_exit() in the error handling case.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> rebased on the latest linux-next.git tree.
> ---
>  drivers/gpu/host1x/drm/drm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
> index 2b561c9..0dbb9c0 100644
> --- a/drivers/gpu/host1x/drm/drm.c
> +++ b/drivers/gpu/host1x/drm/drm.c
> @@ -148,6 +148,7 @@ int host1x_drm_init(struct host1x_drm *host1x, struct drm_device *drm)
>  				dev_err(host1x->dev,
>  					"DRM setup failed for %s: %d\n",
>  					dev_name(client->dev), err);
> +				mutex_unlock(&host1x->clients_lock);
>  				return err;
>  			}
>  		}
> @@ -175,6 +176,7 @@ int host1x_drm_exit(struct host1x_drm *host1x)
>  				dev_err(host1x->dev,
>  					"DRM cleanup failed for %s: %d\n",
>  					dev_name(client->dev), err);
> +				mutex_unlock(&host1x->clients_lock);
>  				return err;
>  			}
>  		}
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error
  2013-04-24  2:53 ` Mark Zhang
@ 2013-04-24  3:07   ` Wei Yongjun
  2013-04-24  3:10     ` Mark Zhang
  2013-04-24  6:46     ` Thierry Reding
  0 siblings, 2 replies; 6+ messages in thread
From: Wei Yongjun @ 2013-04-24  3:07 UTC (permalink / raw)
  To: markz
  Cc: thierry.reding, tbergstrom, amerilainen, swarren, yongjun_wei,
	linux-kernel

On 04/24/2013 10:53 AM, Mark Zhang wrote:
> I think Thierry has acked this patch. So why?

Yes, Thierry has acked this patch five months ago, but this patch does not
applied util now. And the source file has been moved from
drivers/gpu/drm/tegra/host1x.c to drivers/gpu/host1x/drm/drm.c, so I am not
sure whether this patch was lost.

Regards,
Yongjun Wei 


>
> Mark
> On 04/24/2013 10:48 AM, Wei Yongjun wrote:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>>
>> Add the missing unlock before return from function host1x_drm_init() and
>> host1x_drm_exit() in the error handling case.
>>
>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> ---
>> rebased on the latest linux-next.git tree.
>> ---
>>  drivers/gpu/host1x/drm/drm.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
>> index 2b561c9..0dbb9c0 100644
>> --- a/drivers/gpu/host1x/drm/drm.c
>> +++ b/drivers/gpu/host1x/drm/drm.c
>> @@ -148,6 +148,7 @@ int host1x_drm_init(struct host1x_drm *host1x, struct drm_device *drm)
>>  				dev_err(host1x->dev,
>>  					"DRM setup failed for %s: %d\n",
>>  					dev_name(client->dev), err);
>> +				mutex_unlock(&host1x->clients_lock);
>>  				return err;
>>  			}
>>  		}
>> @@ -175,6 +176,7 @@ int host1x_drm_exit(struct host1x_drm *host1x)
>>  				dev_err(host1x->dev,
>>  					"DRM cleanup failed for %s: %d\n",
>>  					dev_name(client->dev), err);
>> +				mutex_unlock(&host1x->clients_lock);
>>  				return err;
>>  			}
>>  		}
>>
>



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error
  2013-04-24  3:07   ` Wei Yongjun
@ 2013-04-24  3:10     ` Mark Zhang
  2013-04-24  6:46     ` Thierry Reding
  1 sibling, 0 replies; 6+ messages in thread
From: Mark Zhang @ 2013-04-24  3:10 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: thierry.reding@avionic-design.de, Terje Bergstrom,
	Arto Merilainen, Stephen Warren, yongjun_wei@trendmicro.com.cn,
	linux-kernel@vger.kernel.org

Alright. Please send this to linux-tegra ML and ping Thierry.

Mark
On 04/24/2013 11:07 AM, Wei Yongjun wrote:
> On 04/24/2013 10:53 AM, Mark Zhang wrote:
>> I think Thierry has acked this patch. So why?
> 
> Yes, Thierry has acked this patch five months ago, but this patch does not
> applied util now. And the source file has been moved from
> drivers/gpu/drm/tegra/host1x.c to drivers/gpu/host1x/drm/drm.c, so I am not
> sure whether this patch was lost.
> 
> Regards,
> Yongjun Wei 
> 
> 
>>
>> Mark
>> On 04/24/2013 10:48 AM, Wei Yongjun wrote:
>>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>>>
>>> Add the missing unlock before return from function host1x_drm_init() and
>>> host1x_drm_exit() in the error handling case.
>>>
>>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>>> ---
>>> rebased on the latest linux-next.git tree.
>>> ---
>>>  drivers/gpu/host1x/drm/drm.c | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
>>> index 2b561c9..0dbb9c0 100644
>>> --- a/drivers/gpu/host1x/drm/drm.c
>>> +++ b/drivers/gpu/host1x/drm/drm.c
>>> @@ -148,6 +148,7 @@ int host1x_drm_init(struct host1x_drm *host1x, struct drm_device *drm)
>>>  				dev_err(host1x->dev,
>>>  					"DRM setup failed for %s: %d\n",
>>>  					dev_name(client->dev), err);
>>> +				mutex_unlock(&host1x->clients_lock);
>>>  				return err;
>>>  			}
>>>  		}
>>> @@ -175,6 +176,7 @@ int host1x_drm_exit(struct host1x_drm *host1x)
>>>  				dev_err(host1x->dev,
>>>  					"DRM cleanup failed for %s: %d\n",
>>>  					dev_name(client->dev), err);
>>> +				mutex_unlock(&host1x->clients_lock);
>>>  				return err;
>>>  			}
>>>  		}
>>>
>>
> 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error
  2013-04-24  3:07   ` Wei Yongjun
  2013-04-24  3:10     ` Mark Zhang
@ 2013-04-24  6:46     ` Thierry Reding
  1 sibling, 0 replies; 6+ messages in thread
From: Thierry Reding @ 2013-04-24  6:46 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: markz, tbergstrom, amerilainen, swarren, yongjun_wei,
	linux-kernel

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

On Wed, Apr 24, 2013 at 11:07:30AM +0800, Wei Yongjun wrote:
> On 04/24/2013 10:53 AM, Mark Zhang wrote:
> > I think Thierry has acked this patch. So why?
> 
> Yes, Thierry has acked this patch five months ago, but this patch does not
> applied util now. And the source file has been moved from
> drivers/gpu/drm/tegra/host1x.c to drivers/gpu/host1x/drm/drm.c, so I am not
> sure whether this patch was lost.

This slipped under the radar apparently. I'll be preparing a fixes
branch soon and will make sure that this makes it in as well.

Thanks for reminding me.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error
  2013-04-24  2:48 [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error Wei Yongjun
  2013-04-24  2:53 ` Mark Zhang
@ 2013-04-24  7:41 ` Thierry Reding
  1 sibling, 0 replies; 6+ messages in thread
From: Thierry Reding @ 2013-04-24  7:41 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: tbergstrom, amerilainen, markz, swarren, yongjun_wei,
	linux-kernel

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

On Wed, Apr 24, 2013 at 10:48:23AM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Add the missing unlock before return from function host1x_drm_init() and
> host1x_drm_exit() in the error handling case.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

I've applied this to my fixes branch with a small modification to the
subject prefix. I'd like to stick with "drm/tegra: " for things that
touch the DRM parts exclusively.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-04-24  7:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-24  2:48 [PATCH -next RESEND] gpu: host1x: drm: fix missing unlock on error Wei Yongjun
2013-04-24  2:53 ` Mark Zhang
2013-04-24  3:07   ` Wei Yongjun
2013-04-24  3:10     ` Mark Zhang
2013-04-24  6:46     ` Thierry Reding
2013-04-24  7:41 ` Thierry Reding

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox