diff mbox

[RESEND,1/2] drm/msm: remove unbalanced mutex unlock

Message ID 20180503120056.15146-1-daniel@zonque.org (mailing list archive)
State Superseded, archived
Delegated to: Andy Gross
Headers show

Commit Message

Daniel Mack May 3, 2018, noon UTC
This regression stems from 0e08270a1f01 ("drm/msm: Separate locking of
buffer resources from struct_mutex").

Signed-off-by: Daniel Mack <daniel@zonque.org>
Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
Cc: Rob Clark <rclark@redhat.com>
Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources from struct_mutex")
---
I'm resending these two patches as I got no reply last time.

 drivers/gpu/drm/msm/dsi/dsi_host.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Rob Clark May 3, 2018, 12:24 p.m. UTC | #1
On Thu, May 3, 2018 at 8:00 AM, Daniel Mack <daniel@zonque.org> wrote:
> This regression stems from 0e08270a1f01 ("drm/msm: Separate locking of
> buffer resources from struct_mutex").
>
> Signed-off-by: Daniel Mack <daniel@zonque.org>
> Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
> Cc: Rob Clark <rclark@redhat.com>
> Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources from struct_mutex")
> ---
> I'm resending these two patches as I got no reply last time.

I've applied these two to msm-next.  Sorry I missed them before...
for some reason they don't seem to show up in the dri-devel
patchworks[1]

BR,
-R

[1] https://patchwork.freedesktop.org/project/dri-devel/series/

>
>  drivers/gpu/drm/msm/dsi/dsi_host.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
> index 0f7324a686ca..27637d8a99ff 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
> @@ -994,7 +994,6 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
>
>                 ret = msm_gem_get_iova(msm_host->tx_gem_obj,
>                                 priv->kms->aspace, &iova);
> -               mutex_unlock(&dev->struct_mutex);
>                 if (ret) {
>                         pr_err("%s: failed to get iova, %d\n", __func__, ret);
>                         return ret;
> --
> 2.14.3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Daniel Mack May 3, 2018, 5:59 p.m. UTC | #2
On Thursday, May 03, 2018 02:24 PM, Rob Clark wrote:
> On Thu, May 3, 2018 at 8:00 AM, Daniel Mack <daniel@zonque.org> wrote:
>> This regression stems from 0e08270a1f01 ("drm/msm: Separate locking of
>> buffer resources from struct_mutex").
>>
>> Signed-off-by: Daniel Mack <daniel@zonque.org>
>> Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
>> Cc: Rob Clark <rclark@redhat.com>
>> Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources from struct_mutex")
>> ---
>> I'm resending these two patches as I got no reply last time.
> 
> I've applied these two to msm-next.  Sorry I missed them before...
> for some reason they don't seem to show up in the dri-devel
> patchworks[1]

No problem, and thanks for applying them :)


Daniel


> 
> BR,
> -R
> 
> [1] https://patchwork.freedesktop.org/project/dri-devel/series/
> 
>>
>>  drivers/gpu/drm/msm/dsi/dsi_host.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> index 0f7324a686ca..27637d8a99ff 100644
>> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
>> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> @@ -994,7 +994,6 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
>>
>>                 ret = msm_gem_get_iova(msm_host->tx_gem_obj,
>>                                 priv->kms->aspace, &iova);
>> -               mutex_unlock(&dev->struct_mutex);
>>                 if (ret) {
>>                         pr_err("%s: failed to get iova, %d\n", __func__, ret);
>>                         return ret;
>> --
>> 2.14.3
>>

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 0f7324a686ca..27637d8a99ff 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -994,7 +994,6 @@  static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
 
 		ret = msm_gem_get_iova(msm_host->tx_gem_obj,
 				priv->kms->aspace, &iova);
-		mutex_unlock(&dev->struct_mutex);
 		if (ret) {
 			pr_err("%s: failed to get iova, %d\n", __func__, ret);
 			return ret;