From: Xinliang Liu <xinliang.liu@linaro.org> To: jrdr.linux@gmail.com Cc: "Liuxinliang (Matthew Liu)" <z.liuxinliang@hisilicon.com>, Rongrong Zou <zourongrong@gmail.com>, XinWei Kong <kong.kongxinwei@hisilicon.com>, Feng Chen <puck.chen@hisilicon.com>, David Airlie <airlied@linux.ie>, ajitn.linux@gmail.com, sabyasachi.linux@gmail.com, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, dri-devel <dri-devel@lists.freedesktop.org>, brajeswar.linux@gmail.com Subject: Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume() Date: Tue, 25 Sep 2018 20:37:42 +0800 [thread overview] Message-ID: <CAGd==041pgoA+5Xx6+tWm6zY=_B6FZ0+=TX3iG3zzuWQmQW0Dg@mail.gmail.com> (raw) In-Reply-To: <CAFqt6zYyBQhbvQiy4EWOpHHL-a77Fjm9LCLNA+drT62MhHuKeQ@mail.gmail.com> Hi Souptick, On Mon, 17 Sep 2018 at 15:40, Souptick Joarder <jrdr.linux@gmail.com> wrote: > > On Tue, Sep 11, 2018 at 2:04 PM Souptick Joarder <jrdr.linux@gmail.com> wrote: > > > > On Mon, Aug 6, 2018 at 8:16 PM Souptick Joarder <jrdr.linux@gmail.com> wrote: > > > > > > convert drm_atomic_helper_suspend/resume() to use > > > drm_mode_config_helper_suspend/resume(). > > > > > > Fixed one sparse warning by making hibmc_drm_interrupt > > > static. > > > > > > Signed-off-by: Ajit Negi <ajitn.linux@gmail.com> > > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> > > > Reviewed-by: Xinliang Liu <z.liuxinliang@hisilicon.com> > > > > Can we get this patch in queue for 4.20 ?? > > Daniel, can we get this patch in queue for 4.20, if no further comment ? Will send 4.20 drm-next pull for this patch. I am verifying it on our D05 board. Thanks, Xinliang > > > > > > --- > > > v2: remove ret variable from both suspend and resume. > > > remove suspend_state from hibmc_drm_private struct. > > > > > > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 20 +++----------------- > > > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 - > > > 2 files changed, 3 insertions(+), 18 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > > > index d4f6f1f..ee24480 100644 > > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > > > @@ -37,7 +37,7 @@ > > > .llseek = no_llseek, > > > }; > > > > > > -irqreturn_t hibmc_drm_interrupt(int irq, void *arg) > > > +static irqreturn_t hibmc_drm_interrupt(int irq, void *arg) > > > { > > > struct drm_device *dev = (struct drm_device *)arg; > > > struct hibmc_drm_private *priv = > > > @@ -74,30 +74,16 @@ static int __maybe_unused hibmc_pm_suspend(struct device *dev) > > > { > > > struct pci_dev *pdev = to_pci_dev(dev); > > > struct drm_device *drm_dev = pci_get_drvdata(pdev); > > > - struct hibmc_drm_private *priv = drm_dev->dev_private; > > > - > > > - drm_kms_helper_poll_disable(drm_dev); > > > - priv->suspend_state = drm_atomic_helper_suspend(drm_dev); > > > - if (IS_ERR(priv->suspend_state)) { > > > - DRM_ERROR("drm_atomic_helper_suspend failed: %ld\n", > > > - PTR_ERR(priv->suspend_state)); > > > - drm_kms_helper_poll_enable(drm_dev); > > > - return PTR_ERR(priv->suspend_state); > > > - } > > > > > > - return 0; > > > + return drm_mode_config_helper_suspend(drm_dev); > > > } > > > > > > static int __maybe_unused hibmc_pm_resume(struct device *dev) > > > { > > > struct pci_dev *pdev = to_pci_dev(dev); > > > struct drm_device *drm_dev = pci_get_drvdata(pdev); > > > - struct hibmc_drm_private *priv = drm_dev->dev_private; > > > > > > - drm_atomic_helper_resume(drm_dev, priv->suspend_state); > > > - drm_kms_helper_poll_enable(drm_dev); > > > - > > > - return 0; > > > + return drm_mode_config_helper_resume(drm_dev); > > > } > > > > > > static const struct dev_pm_ops hibmc_pm_ops = { > > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > > index e195521..45c25a4 100644 > > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > > @@ -47,7 +47,6 @@ struct hibmc_drm_private { > > > /* drm */ > > > struct drm_device *dev; > > > bool mode_config_initialized; > > > - struct drm_atomic_state *suspend_state; > > > > > > /* ttm */ > > > struct drm_global_reference mem_global_ref; > > > -- > > > 1.9.1 > > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Xinliang Liu <xinliang.liu@linaro.org> To: jrdr.linux@gmail.com Cc: ajitn.linux@gmail.com, sabyasachi.linux@gmail.com, David Airlie <airlied@linux.ie>, Feng Chen <puck.chen@hisilicon.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, dri-devel <dri-devel@lists.freedesktop.org>, "Liuxinliang (Matthew Liu)" <z.liuxinliang@hisilicon.com>, XinWei Kong <kong.kongxinwei@hisilicon.com>, brajeswar.linux@gmail.com, Rongrong Zou <zourongrong@gmail.com> Subject: Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume() Date: Tue, 25 Sep 2018 20:37:42 +0800 [thread overview] Message-ID: <CAGd==041pgoA+5Xx6+tWm6zY=_B6FZ0+=TX3iG3zzuWQmQW0Dg@mail.gmail.com> (raw) In-Reply-To: <CAFqt6zYyBQhbvQiy4EWOpHHL-a77Fjm9LCLNA+drT62MhHuKeQ@mail.gmail.com> Hi Souptick, On Mon, 17 Sep 2018 at 15:40, Souptick Joarder <jrdr.linux@gmail.com> wrote: > > On Tue, Sep 11, 2018 at 2:04 PM Souptick Joarder <jrdr.linux@gmail.com> wrote: > > > > On Mon, Aug 6, 2018 at 8:16 PM Souptick Joarder <jrdr.linux@gmail.com> wrote: > > > > > > convert drm_atomic_helper_suspend/resume() to use > > > drm_mode_config_helper_suspend/resume(). > > > > > > Fixed one sparse warning by making hibmc_drm_interrupt > > > static. > > > > > > Signed-off-by: Ajit Negi <ajitn.linux@gmail.com> > > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> > > > Reviewed-by: Xinliang Liu <z.liuxinliang@hisilicon.com> > > > > Can we get this patch in queue for 4.20 ?? > > Daniel, can we get this patch in queue for 4.20, if no further comment ? Will send 4.20 drm-next pull for this patch. I am verifying it on our D05 board. Thanks, Xinliang > > > > > > --- > > > v2: remove ret variable from both suspend and resume. > > > remove suspend_state from hibmc_drm_private struct. > > > > > > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 20 +++----------------- > > > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 - > > > 2 files changed, 3 insertions(+), 18 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > > > index d4f6f1f..ee24480 100644 > > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > > > @@ -37,7 +37,7 @@ > > > .llseek = no_llseek, > > > }; > > > > > > -irqreturn_t hibmc_drm_interrupt(int irq, void *arg) > > > +static irqreturn_t hibmc_drm_interrupt(int irq, void *arg) > > > { > > > struct drm_device *dev = (struct drm_device *)arg; > > > struct hibmc_drm_private *priv = > > > @@ -74,30 +74,16 @@ static int __maybe_unused hibmc_pm_suspend(struct device *dev) > > > { > > > struct pci_dev *pdev = to_pci_dev(dev); > > > struct drm_device *drm_dev = pci_get_drvdata(pdev); > > > - struct hibmc_drm_private *priv = drm_dev->dev_private; > > > - > > > - drm_kms_helper_poll_disable(drm_dev); > > > - priv->suspend_state = drm_atomic_helper_suspend(drm_dev); > > > - if (IS_ERR(priv->suspend_state)) { > > > - DRM_ERROR("drm_atomic_helper_suspend failed: %ld\n", > > > - PTR_ERR(priv->suspend_state)); > > > - drm_kms_helper_poll_enable(drm_dev); > > > - return PTR_ERR(priv->suspend_state); > > > - } > > > > > > - return 0; > > > + return drm_mode_config_helper_suspend(drm_dev); > > > } > > > > > > static int __maybe_unused hibmc_pm_resume(struct device *dev) > > > { > > > struct pci_dev *pdev = to_pci_dev(dev); > > > struct drm_device *drm_dev = pci_get_drvdata(pdev); > > > - struct hibmc_drm_private *priv = drm_dev->dev_private; > > > > > > - drm_atomic_helper_resume(drm_dev, priv->suspend_state); > > > - drm_kms_helper_poll_enable(drm_dev); > > > - > > > - return 0; > > > + return drm_mode_config_helper_resume(drm_dev); > > > } > > > > > > static const struct dev_pm_ops hibmc_pm_ops = { > > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > > index e195521..45c25a4 100644 > > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > > @@ -47,7 +47,6 @@ struct hibmc_drm_private { > > > /* drm */ > > > struct drm_device *dev; > > > bool mode_config_initialized; > > > - struct drm_atomic_state *suspend_state; > > > > > > /* ttm */ > > > struct drm_global_reference mem_global_ref; > > > -- > > > 1.9.1 > > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-09-25 12:37 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-06 14:49 [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume() Souptick Joarder 2018-09-11 8:34 ` Souptick Joarder 2018-09-17 5:17 ` Souptick Joarder 2018-09-25 12:37 ` Xinliang Liu [this message] 2018-09-25 12:37 ` Xinliang Liu 2018-09-25 12:43 ` Souptick Joarder -- strict thread matches above, loose matches on Subject: below -- 2018-07-19 16:04 Souptick Joarder 2018-07-26 8:07 ` Souptick Joarder 2018-08-02 9:57 ` Souptick Joarder 2018-08-03 7:03 ` xinliang 2018-08-03 7:03 ` xinliang 2018-08-06 6:06 ` Souptick Joarder
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAGd==041pgoA+5Xx6+tWm6zY=_B6FZ0+=TX3iG3zzuWQmQW0Dg@mail.gmail.com' \ --to=xinliang.liu@linaro.org \ --cc=airlied@linux.ie \ --cc=ajitn.linux@gmail.com \ --cc=brajeswar.linux@gmail.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jrdr.linux@gmail.com \ --cc=kong.kongxinwei@hisilicon.com \ --cc=linux-kernel@vger.kernel.org \ --cc=puck.chen@hisilicon.com \ --cc=sabyasachi.linux@gmail.com \ --cc=z.liuxinliang@hisilicon.com \ --cc=zourongrong@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.