diff mbox series

drm/mediatek: Convert drm_atomic_helper_suspend/resume()

Message ID 20180728133845.GA15261@jordon-HP-15-Notebook-PC (mailing list archive)
State New, archived
Headers show
Series drm/mediatek: Convert drm_atomic_helper_suspend/resume() | expand

Commit Message

Souptick Joarder July 28, 2018, 1:38 p.m. UTC 
convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

Comments

CK Hu (胡俊光) July 30, 2018, 3:53 a.m. UTC | #1 
Hi, Souptick:

On Sat, 2018-07-28 at 19:08 +0530, Souptick Joarder wrote:
> convert drm_atomic_helper_suspend/resume() to use
> drm_mode_config_helper_suspend/resume().
> 

Reviewed-by: CK Hu <ck.hu@mediatek.com>

> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 ++++++++-------------
>  1 file changed, 8 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index a2ca90f..1fcda2de 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -520,29 +520,24 @@ static int mtk_drm_sys_suspend(struct device *dev)
>  {
>  	struct mtk_drm_private *private = dev_get_drvdata(dev);
>  	struct drm_device *drm = private->drm;
> +	int ret;
>  
> -	drm_kms_helper_poll_disable(drm);
> -
> -	private->suspend_state = drm_atomic_helper_suspend(drm);
> -	if (IS_ERR(private->suspend_state)) {
> -		drm_kms_helper_poll_enable(drm);
> -		return PTR_ERR(private->suspend_state);
> -	}
> -
> +	ret = drm_mode_config_helper_suspend(drm);
>  	DRM_DEBUG_DRIVER("mtk_drm_sys_suspend\n");
> -	return 0;
> +
> +	return ret;
>  }
>  
>  static int mtk_drm_sys_resume(struct device *dev)
>  {
>  	struct mtk_drm_private *private = dev_get_drvdata(dev);
>  	struct drm_device *drm = private->drm;
> +	int ret;
>  
> -	drm_atomic_helper_resume(drm, private->suspend_state);
> -	drm_kms_helper_poll_enable(drm);
> -
> +	ret = drm_mode_config_helper_resume(drm);
>  	DRM_DEBUG_DRIVER("mtk_drm_sys_resume\n");
> -	return 0;
> +
> +	return ret;
>  }
>  #endif
>
Souptick Joarder July 30, 2018, 4:51 a.m. UTC | #2 
On Mon, Jul 30, 2018 at 9:23 AM, CK Hu <ck.hu@mediatek.com> wrote:
> Hi, Souptick:
>
> On Sat, 2018-07-28 at 19:08 +0530, Souptick Joarder wrote:
>> convert drm_atomic_helper_suspend/resume() to use
>> drm_mode_config_helper_suspend/resume().
>>
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>

Thank CK, can we get this patch in queue for 4.19 ?

>
>> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
>> Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
>> ---
>>  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 ++++++++-------------
>>  1 file changed, 8 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
>> index a2ca90f..1fcda2de 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
>> @@ -520,29 +520,24 @@ static int mtk_drm_sys_suspend(struct device *dev)
>>  {
>>       struct mtk_drm_private *private = dev_get_drvdata(dev);
>>       struct drm_device *drm = private->drm;
>> +     int ret;
>>
>> -     drm_kms_helper_poll_disable(drm);
>> -
>> -     private->suspend_state = drm_atomic_helper_suspend(drm);
>> -     if (IS_ERR(private->suspend_state)) {
>> -             drm_kms_helper_poll_enable(drm);
>> -             return PTR_ERR(private->suspend_state);
>> -     }
>> -
>> +     ret = drm_mode_config_helper_suspend(drm);
>>       DRM_DEBUG_DRIVER("mtk_drm_sys_suspend\n");
>> -     return 0;
>> +
>> +     return ret;
>>  }
>>
>>  static int mtk_drm_sys_resume(struct device *dev)
>>  {
>>       struct mtk_drm_private *private = dev_get_drvdata(dev);
>>       struct drm_device *drm = private->drm;
>> +     int ret;
>>
>> -     drm_atomic_helper_resume(drm, private->suspend_state);
>> -     drm_kms_helper_poll_enable(drm);
>> -
>> +     ret = drm_mode_config_helper_resume(drm);
>>       DRM_DEBUG_DRIVER("mtk_drm_sys_resume\n");
>> -     return 0;
>> +
>> +     return ret;
>>  }
>>  #endif
>>
>
>
CK Hu (胡俊光) July 30, 2018, 7:29 a.m. UTC | #3 
Hi, Souptick:


On Mon, 2018-07-30 at 10:21 +0530, Souptick Joarder wrote:
> On Mon, Jul 30, 2018 at 9:23 AM, CK Hu <ck.hu@mediatek.com> wrote:
> > Hi, Souptick:
> >
> > On Sat, 2018-07-28 at 19:08 +0530, Souptick Joarder wrote:
> >> convert drm_atomic_helper_suspend/resume() to use
> >> drm_mode_config_helper_suspend/resume().
> >>
> >
> > Reviewed-by: CK Hu <ck.hu@mediatek.com>
> 
> Thank CK, can we get this patch in queue for 4.19 ?
> 

Applied to mediatek-drm-fixes-4.19 [1].

[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-4.19

Regards,
CK

> >
> >> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> >> Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
> >> ---
> >>  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 ++++++++-------------
> >>  1 file changed, 8 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> >> index a2ca90f..1fcda2de 100644
> >> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> >> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> >> @@ -520,29 +520,24 @@ static int mtk_drm_sys_suspend(struct device *dev)
> >>  {
> >>       struct mtk_drm_private *private = dev_get_drvdata(dev);
> >>       struct drm_device *drm = private->drm;
> >> +     int ret;
> >>
> >> -     drm_kms_helper_poll_disable(drm);
> >> -
> >> -     private->suspend_state = drm_atomic_helper_suspend(drm);
> >> -     if (IS_ERR(private->suspend_state)) {
> >> -             drm_kms_helper_poll_enable(drm);
> >> -             return PTR_ERR(private->suspend_state);
> >> -     }
> >> -
> >> +     ret = drm_mode_config_helper_suspend(drm);
> >>       DRM_DEBUG_DRIVER("mtk_drm_sys_suspend\n");
> >> -     return 0;
> >> +
> >> +     return ret;
> >>  }
> >>
> >>  static int mtk_drm_sys_resume(struct device *dev)
> >>  {
> >>       struct mtk_drm_private *private = dev_get_drvdata(dev);
> >>       struct drm_device *drm = private->drm;
> >> +     int ret;
> >>
> >> -     drm_atomic_helper_resume(drm, private->suspend_state);
> >> -     drm_kms_helper_poll_enable(drm);
> >> -
> >> +     ret = drm_mode_config_helper_resume(drm);
> >>       DRM_DEBUG_DRIVER("mtk_drm_sys_resume\n");
> >> -     return 0;
> >> +
> >> +     return ret;
> >>  }
> >>  #endif
> >>
> >
> >
> 
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff mbox series

Patch

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index a2ca90f..1fcda2de 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -520,29 +520,24 @@  static int mtk_drm_sys_suspend(struct device *dev)
 {
 	struct mtk_drm_private *private = dev_get_drvdata(dev);
 	struct drm_device *drm = private->drm;
+	int ret;
 
-	drm_kms_helper_poll_disable(drm);
-
-	private->suspend_state = drm_atomic_helper_suspend(drm);
-	if (IS_ERR(private->suspend_state)) {
-		drm_kms_helper_poll_enable(drm);
-		return PTR_ERR(private->suspend_state);
-	}
-
+	ret = drm_mode_config_helper_suspend(drm);
 	DRM_DEBUG_DRIVER("mtk_drm_sys_suspend\n");
-	return 0;
+
+	return ret;
 }
 
 static int mtk_drm_sys_resume(struct device *dev)
 {
 	struct mtk_drm_private *private = dev_get_drvdata(dev);
 	struct drm_device *drm = private->drm;
+	int ret;
 
-	drm_atomic_helper_resume(drm, private->suspend_state);
-	drm_kms_helper_poll_enable(drm);
-
+	ret = drm_mode_config_helper_resume(drm);
 	DRM_DEBUG_DRIVER("mtk_drm_sys_resume\n");
-	return 0;
+
+	return ret;
 }
 #endif