[PATCH] gpu/drm/exynos: Convert drm_atomic_helper_suspend/resume()

[Souptick Joarder]

On Tue, Jul 24, 2018 at 11:54 AM, Inki Dae <inki.dae at samsung.com> wrote:
> Hi,
>
> 2018년 07월 19일 05:49에 Souptick Joarder 이(가) 쓴 글:
>> convert drm_atomic_helper_suspend/resume() to use
>> drm_mode_config_helper_suspend/resume().
>>
>> exynos_drm_fbdev_suspend/resume can be removed
>> as drm_mode_config_helper_suspend/resume has
>> implement the same in generic way.
>>
>> Signed-off-by: Souptick Joarder <jrdr.linux at gmail.com>
>> Signed-off-by: Ajit Negi <ajitn.linux at gmail.com>
>> ---
>>  drivers/gpu/drm/exynos/exynos_drm_drv.c   | 32 ++++++++++---------------------
>>  drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 ----------------
>>  drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ----------
>>  3 files changed, 10 insertions(+), 49 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
>> index a81b4a5..1996ff7 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
>> @@ -151,39 +151,27 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
>>  static int exynos_drm_suspend(struct device *dev)
>>  {
>>       struct drm_device *drm_dev = dev_get_drvdata(dev);
>> -     struct exynos_drm_private *private;
>> +     int ret = 0;
>>
>> -     if (pm_runtime_suspended(dev) || !drm_dev)
>> -             return 0;
>
> You removes '!drm_dev' not related to this patch.

The same has been checked inside drm_mode_config_helper_suspend(),
so we should avoid double check.

>
>> +     if (pm_runtime_suspended(dev))
>> +             return ret;
>>
>> -     private = drm_dev->dev_private;
>> +     ret = drm_mode_config_helper_suspend(drm_dev);
>
> Just return drm_mode_config_helper_suspend(drm_dev);

 Ok

>
>>
>> -     drm_kms_helper_poll_disable(drm_dev);
>> -     exynos_drm_fbdev_suspend(drm_dev);
>> -     private->suspend_state = drm_atomic_helper_suspend(drm_dev);
>> -     if (IS_ERR(private->suspend_state)) {
>> -             exynos_drm_fbdev_resume(drm_dev);
>> -             drm_kms_helper_poll_enable(drm_dev);
>> -             return PTR_ERR(private->suspend_state);
>> -     }
>> -
>> -     return 0;
>> +     return ret;
>>  }
>>
>>  static int exynos_drm_resume(struct device *dev)
>>  {
>>       struct drm_device *drm_dev = dev_get_drvdata(dev);
>> -     struct exynos_drm_private *private;
>> +     int ret = 0;
>>
>> -     if (pm_runtime_suspended(dev) || !drm_dev)
>> -             return 0;
>> +     if (pm_runtime_suspended(dev))
>> +             return ret;
>
> Ditto. You removes '!drm_dev' not related to this patch.

Same reason mentioned above to remove '!drm_dev'

>
>>
>> -     private = drm_dev->dev_private;
>> -     drm_atomic_helper_resume(drm_dev, private->suspend_state);
>> -     exynos_drm_fbdev_resume(drm_dev);
>> -     drm_kms_helper_poll_enable(drm_dev);
>> +     ret = drm_mode_config_helper_resume(drm_dev);
>
> Ditto. return drm_mode_config_helper_resume(drm_dev);
>
> With this patch, you could remove 'int ret' declaration including one from exynos_drm_suspend.

Ok, I will add this in v2.

>
> Thanks,
> Inki Dae
>
>>
>> -     return 0;
>> +     return ret;
>>  }
>>  #endif
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> index 132dd52..918dd2c 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> @@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)
>>       private->fb_helper = NULL;
>>  }
>>
>> -void exynos_drm_fbdev_suspend(struct drm_device *dev)
>> -{
>> -     struct exynos_drm_private *private = dev->dev_private;
>> -
>> -     console_lock();
>> -     drm_fb_helper_set_suspend(private->fb_helper, 1);
>> -     console_unlock();
>> -}
>> -
>> -void exynos_drm_fbdev_resume(struct drm_device *dev)
>> -{
>> -     struct exynos_drm_private *private = dev->dev_private;
>> -
>> -     console_lock();
>> -     drm_fb_helper_set_suspend(private->fb_helper, 0);
>> -     console_unlock();
>> -}
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.h b/drivers/gpu/drm/exynos/exynos_drm_fbdev.h
>> index b338472..6840b6a 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.h
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.h
>> @@ -19,8 +19,6 @@
>>
>>  int exynos_drm_fbdev_init(struct drm_device *dev);
>>  void exynos_drm_fbdev_fini(struct drm_device *dev);
>> -void exynos_drm_fbdev_suspend(struct drm_device *drm);
>> -void exynos_drm_fbdev_resume(struct drm_device *drm);
>>
>>  #else
>>
>> @@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)
>>
>>  #define exynos_drm_output_poll_changed (NULL)
>>
>> -static inline void exynos_drm_fbdev_suspend(struct drm_device *drm)
>> -{
>> -}
>> -
>> -static inline void exynos_drm_fbdev_resume(struct drm_device *drm)
>> -{
>> -}
>> -
>>  #endif
>>
>>  #endif
>>