* [PATCH] drm/mediatek: Convert drm_atomic_helper_suspend/resume()
@ 2018-07-28 13:38 Souptick Joarder
2018-07-30 3:53 ` CK Hu
0 siblings, 1 reply; 3+ messages in thread
From: Souptick Joarder @ 2018-07-28 13:38 UTC (permalink / raw)
To: ck.hu, p.zabel, airlied, matthias.bgg, ajitn.linux
Cc: dri-devel, linux-arm-kernel, linux-mediatek, linux-kernel
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(-)
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
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/mediatek: Convert drm_atomic_helper_suspend/resume()
2018-07-28 13:38 [PATCH] drm/mediatek: Convert drm_atomic_helper_suspend/resume() Souptick Joarder
@ 2018-07-30 3:53 ` CK Hu
2018-07-30 4:51 ` Souptick Joarder
0 siblings, 1 reply; 3+ messages in thread
From: CK Hu @ 2018-07-30 3:53 UTC (permalink / raw)
To: Souptick Joarder
Cc: p.zabel, airlied, matthias.bgg, ajitn.linux, dri-devel,
linux-arm-kernel, linux-mediatek, linux-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/mediatek: Convert drm_atomic_helper_suspend/resume()
2018-07-30 3:53 ` CK Hu
@ 2018-07-30 4:51 ` Souptick Joarder
0 siblings, 0 replies; 3+ messages in thread
From: Souptick Joarder @ 2018-07-30 4:51 UTC (permalink / raw)
To: CK Hu
Cc: p.zabel, airlied, Matthias Brugger, Ajit Linux, dri-devel,
linux-arm-kernel, linux-mediatek, linux-kernel
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
>>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-30 4:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-28 13:38 [PATCH] drm/mediatek: Convert drm_atomic_helper_suspend/resume() Souptick Joarder
2018-07-30 3:53 ` CK Hu
2018-07-30 4:51 ` Souptick Joarder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).