On 28-Sep-2018 9:00 PM, "Laurent Pinchart" <laurent.pinchart@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Souptick,
>
> On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
> > On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
> > > On Tue, Sep 18, 2018 at 10:05 PM Souptick Joarder wrote:
> > >> convert drm_atomic_helper_suspend/resume() to use
> > >> drm_mode_config_helper_suspend/resume().
> > >>
> > >> remove suspend_state field from the rcar_du_device
> > >> structure as it is no more required.
> > >>
> > >> With this conversion, also drm_fbdev_cma_set_suspend_unlocked()
> > >> will left with no consumer. So this function can be removed.
> > >>
> > >> Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx>
> > >
> > > Laurent, any comment on this patch ??
> >
> > Sorry for the delay, and thanks for pinging me.
> >
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> >
> > Should I apply this to my tree or do you plan to merge it through drm-misc
> > as it touches drm_fb_cma_helper.c ?
>
> I just realized that the same patch got supplied by Noralf Trønnes nearly a
> year ago, and was later superseded by https://patchwork.freedesktop.org/patch/
> 247861/. I think we should thus apply Noralf's patches instead (once he sends
> v4 out).
Sure, you can go ahead with his patch.
Shall I remove drm_fbdev_cma_set_suspend_unlocked in a separate patch once all the consumer remove this function ?
>
> > >> ---
> > >>
> > >> drivers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------
> > >> drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
> > >> drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 -
> > >> include/drm/drm_fb_cma_helper.h | 2 --
> > >> 4 files changed, 2 insertions(+), 40 deletions(-)
> > >>
> > >> diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c
> > >> b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644
> > >> --- a/drivers/gpu/drm/drm_fb_cma_helper.c
> > >> +++ b/drivers/gpu/drm/drm_fb_cma_helper.c
> > >> @@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
> > >> drm_fbdev_cma *fbdev_cma)
> > >> drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
> > >> }
> > >> EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
> > >>
> > >> -
> > >> -/**
> > >> - * drm_fbdev_cma_set_suspend_unlocked - wrapper around
> > >> - *
> > >> drm_fb_helper_set_suspend_unlocked
> > >> - * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
> > >> - * @state: desired state, zero to resume, non-zero to suspend
> > >> - *
> > >> - * Calls drm_fb_helper_set_suspend, which is a wrapper around
> > >> - * fb_set_suspend implemented by fbdev core.
> > >> - */
> > >> -void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma
> > >> *fbdev_cma,
> > >> - bool state)
> > >> -{
> > >> - if (fbdev_cma)
> > >> -
> > >> drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
> > >> - state);
> > >> -}
> > >> -EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
> > >> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > >> b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 02aee6c..288220f 100644
> > >> --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > >> +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > >> @@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device
> > >> *dev)
> > >>
> > >> static int rcar_du_pm_suspend(struct device *dev)
> > >> {
> > >> struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> > >> - struct drm_atomic_state *state;
> > >>
> > >> - drm_kms_helper_poll_disable(rcdu->ddev);
> > >> - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
> > >> -
> > >> - state = drm_atomic_helper_suspend(rcdu->ddev);
> > >> - if (IS_ERR(state)) {
> > >> - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
> > >> - drm_kms_helper_poll_enable(rcdu->ddev);
> > >> - return PTR_ERR(state);
> > >> - }
> > >> -
> > >> - rcdu->suspend_state = state;
> > >> -
> > >> - return 0;
> > >> + return drm_mode_config_helper_suspend(rcdu->ddev);
> > >> }
> > >>
> > >> static int rcar_du_pm_resume(struct device *dev)
> > >> {
> > >> struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> > >>
> > >> - drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
> > >> - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
> > >> - drm_kms_helper_poll_enable(rcdu->ddev);
> > >> -
> > >> - return 0;
> > >> + return drm_mode_config_helper_resume(rcdu->ddev);
> > >> }
> > >> #endif
> > >>
> > >> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
> > >> b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644
> > >> --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
> > >> +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
> > >> @@ -78,7 +78,6 @@ struct rcar_du_device {
> > >> struct drm_device *ddev;
> > >> struct drm_fbdev_cma *fbdev;
> > >>
> > >> - struct drm_atomic_state *suspend_state;
> > >>
> > >> struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
> > >> unsigned int num_crtcs;
> > >> diff --git a/include/drm/drm_fb_cma_helper.h
> > >> b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644
> > >> --- a/include/drm/drm_fb_cma_helper.h
> > >> +++ b/include/drm/drm_fb_cma_helper.h
> > >> @@ -26,8 +26,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct
> > >> drm_device *dev,
> > >>
> > >> void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
> > >> void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
> > >> -void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma
> > >> *fbdev_cma,
> > >> - bool state);
> > >>
> > >> struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct
> > >> drm_framebuffer *fb,
> > >> unsigned int plane);
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
