From: Wei Yongjun <[email protected]>
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 <[email protected]>
---
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;
}
}
I think Thierry has acked this patch. So why?
Mark
On 04/24/2013 10:48 AM, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 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 <[email protected]>
> ---
> 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;
> }
> }
>
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 <[email protected]>
>>
>> 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 <[email protected]>
>> ---
>> 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;
>> }
>> }
>>
>
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 <[email protected]>
>>>
>>> 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 <[email protected]>
>>> ---
>>> 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;
>>> }
>>> }
>>>
>>
>
>
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
On Wed, Apr 24, 2013 at 10:48:23AM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 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 <[email protected]>
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