diff mbox

drm/exynos: fix nested calls to lock mutex in drm resume

Message ID 1398865294-6754-1-git-send-email-rahul.sharma@samsung.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Rahul Sharma April 30, 2014, 1:41 p.m. UTC
From: Rahul Sharma <Rahul.Sharma@samsung.com>

While testing S2R on exynos board, system is hanging and
rebooting due to nested mutex_lock calls in exynos drm
resume callback. Changing the order of the calls is fixing
the issue.

Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
---
Based on exynos-drm-next branch in Inki Dae's tree.
 drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rahul Sharma May 22, 2014, 2:16 p.m. UTC | #1
Hi Inki,

This is another one which has not got reviewed. Please review.

Regards,
Rahul Sharma

On 30 April 2014 19:11, Rahul Sharma <rahul.sharma@samsung.com> wrote:
> From: Rahul Sharma <Rahul.Sharma@samsung.com>
>
> While testing S2R on exynos board, system is hanging and
> rebooting due to nested mutex_lock calls in exynos drm
> resume callback. Changing the order of the calls is fixing
> the issue.
>
> Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
> ---
> Based on exynos-drm-next branch in Inki Dae's tree.
>  drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index bb7dfee..2bb6233 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -184,8 +184,8 @@ static int exynos_drm_resume(struct drm_device *dev)
>                         connector->funcs->dpms(connector, connector->dpms);
>         }
>
> -       drm_helper_resume_force_mode(dev);
>         drm_modeset_unlock_all(dev);
> +       drm_helper_resume_force_mode(dev);
>
>         return 0;
>  }
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kyungmin Park May 22, 2014, 3:32 p.m. UTC | #2
add Mr. Dae

On Thu, May 22, 2014 at 11:16 PM, Rahul Sharma <rahul.sharma@samsung.com> wrote:
> Hi Inki,
>
> This is another one which has not got reviewed. Please review.
>
> Regards,
> Rahul Sharma
>
> On 30 April 2014 19:11, Rahul Sharma <rahul.sharma@samsung.com> wrote:
>> From: Rahul Sharma <Rahul.Sharma@samsung.com>
>>
>> While testing S2R on exynos board, system is hanging and
>> rebooting due to nested mutex_lock calls in exynos drm
>> resume callback. Changing the order of the calls is fixing
>> the issue.
>>
>> Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
>> ---
>> Based on exynos-drm-next branch in Inki Dae's tree.
>>  drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
>> index bb7dfee..2bb6233 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
>> @@ -184,8 +184,8 @@ static int exynos_drm_resume(struct drm_device *dev)
>>                         connector->funcs->dpms(connector, connector->dpms);
>>         }
>>
>> -       drm_helper_resume_force_mode(dev);
>>         drm_modeset_unlock_all(dev);
>> +       drm_helper_resume_force_mode(dev);
>>
>>         return 0;
>>  }
>> --
>> 1.7.9.5
>>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sachin Kamat May 22, 2014, 5:56 p.m. UTC | #3
Hi Rahul,

 On 22 May 2014 19:46, Rahul Sharma <rahul.sharma@samsung.com> wrote:
> Hi Inki,
>
> This is another one which has not got reviewed. Please review.

Inki has applied a similar patch from Takashi [1].

[1] https://lkml.org/lkml/2014/5/9/24
Rahul Sharma May 23, 2014, 2:14 a.m. UTC | #4
On 22 May 2014 23:26, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Hi Rahul,
>
>  On 22 May 2014 19:46, Rahul Sharma <rahul.sharma@samsung.com> wrote:
>> Hi Inki,
>>
>> This is another one which has not got reviewed. Please review.
>
> Inki has applied a similar patch from Takashi [1].

Thanks Sachin,

Good that solution is merged.

@ Inki, sorry for raising concern. It went unnoticed.

Regards,
Rahul Sharma.

>
> [1] https://lkml.org/lkml/2014/5/9/24
>
> --
> With warm regards,
> Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" 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/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index bb7dfee..2bb6233 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -184,8 +184,8 @@  static int exynos_drm_resume(struct drm_device *dev)
 			connector->funcs->dpms(connector, connector->dpms);
 	}
 
-	drm_helper_resume_force_mode(dev);
 	drm_modeset_unlock_all(dev);
+	drm_helper_resume_force_mode(dev);
 
 	return 0;
 }