* [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
@ 2018-08-06 14:49 Souptick Joarder
2018-09-11 8:34 ` Souptick Joarder
0 siblings, 1 reply; 10+ messages in thread
From: Souptick Joarder @ 2018-08-06 14:49 UTC (permalink / raw)
To: z.liuxinliang, zourongrong, kong.kongxinwei, puck.chen, airlied,
ajitn.linux
Cc: dri-devel, linux-kernel, brajeswar.linux, sabyasachi.linux, daniel
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>
---
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
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
0 siblings, 1 reply; 10+ messages in thread
From: Souptick Joarder @ 2018-09-11 8:34 UTC (permalink / raw)
To: xinliang, Zou Rongrong, kong.kongxinwei, puck.chen, airlied, Ajit Linux
Cc: dri-devel, linux-kernel, Brajeswar Ghosh, Sabyasachi Gupta,
Daniel Vetter
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 ??
> ---
> 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
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-09-11 8:34 ` Souptick Joarder
@ 2018-09-17 5:17 ` Souptick Joarder
2018-09-25 12:37 ` Xinliang Liu
0 siblings, 1 reply; 10+ messages in thread
From: Souptick Joarder @ 2018-09-17 5:17 UTC (permalink / raw)
To: xinliang, Zou Rongrong, kong.kongxinwei, puck.chen, airlied, Ajit Linux
Cc: dri-devel, linux-kernel, Brajeswar Ghosh, Sabyasachi Gupta,
Daniel Vetter
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 ?
>
> > ---
> > 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
> >
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-09-17 5:17 ` Souptick Joarder
@ 2018-09-25 12:37 ` Xinliang Liu
2018-09-25 12:43 ` Souptick Joarder
0 siblings, 1 reply; 10+ messages in thread
From: Xinliang Liu @ 2018-09-25 12:37 UTC (permalink / raw)
To: jrdr.linux
Cc: Liuxinliang (Matthew Liu),
Rongrong Zou, XinWei Kong, Feng Chen, David Airlie, ajitn.linux,
sabyasachi.linux, Linux Kernel Mailing List, dri-devel,
brajeswar.linux
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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-09-25 12:37 ` Xinliang Liu
@ 2018-09-25 12:43 ` Souptick Joarder
0 siblings, 0 replies; 10+ messages in thread
From: Souptick Joarder @ 2018-09-25 12:43 UTC (permalink / raw)
To: xinliang.liu
Cc: xinliang, Zou Rongrong, kong.kongxinwei, puck.chen, airlied,
Ajit Linux, Sabyasachi Gupta, linux-kernel, dri-devel,
Brajeswar Ghosh
On Tue, Sep 25, 2018 at 6:07 PM Xinliang Liu <xinliang.liu@linaro.org> wrote:
>
> 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.
> > >
> > > > ---
> > > > 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
@ 2018-07-19 16:04 Souptick Joarder
2018-07-26 8:07 ` Souptick Joarder
0 siblings, 1 reply; 10+ messages in thread
From: Souptick Joarder @ 2018-07-19 16:04 UTC (permalink / raw)
To: z.liuxinliang, zourongrong, kong.kongxinwei, puck.chen, airlied,
noralf, jrdr.linux, seanpaul
Cc: dri-devel, linux-kernel, ajitn.linux, sabyasachi.linux,
brajeswar.linux, daniel
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: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
---
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 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..2261676 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,22 @@ 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);
- }
+ int ret = 0;
- return 0;
+ ret = drm_mode_config_helper_suspend(drm_dev);
+
+ return ret;
}
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;
+ int ret = 0;
- drm_atomic_helper_resume(drm_dev, priv->suspend_state);
- drm_kms_helper_poll_enable(drm_dev);
+ ret = drm_mode_config_helper_resume(drm_dev);
- return 0;
+ return ret;
}
static const struct dev_pm_ops hibmc_pm_ops = {
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-07-19 16:04 Souptick Joarder
@ 2018-07-26 8:07 ` Souptick Joarder
2018-08-02 9:57 ` Souptick Joarder
0 siblings, 1 reply; 10+ messages in thread
From: Souptick Joarder @ 2018-07-26 8:07 UTC (permalink / raw)
To: z.liuxinliang, Zou Rongrong, kong.kongxinwei, puck.chen, airlied,
noralf, Souptick Joarder, Sean Paul
Cc: dri-devel, linux-kernel, Ajit Linux, Sabyasachi Gupta,
Brajeswar Ghosh, Daniel Vetter
On Thu, Jul 19, 2018 at 9:34 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: Souptick Joarder <jrdr.linux@gmail.com>
> Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
> ---
Any comment on this patch ?
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 24 ++++++++----------------
> 1 file changed, 8 insertions(+), 16 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..2261676 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,22 @@ 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);
> - }
> + int ret = 0;
>
> - return 0;
> + ret = drm_mode_config_helper_suspend(drm_dev);
> +
> + return ret;
> }
>
> 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;
> + int ret = 0;
>
> - drm_atomic_helper_resume(drm_dev, priv->suspend_state);
> - drm_kms_helper_poll_enable(drm_dev);
> + ret = drm_mode_config_helper_resume(drm_dev);
>
> - return 0;
> + return ret;
> }
>
> static const struct dev_pm_ops hibmc_pm_ops = {
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-07-26 8:07 ` Souptick Joarder
@ 2018-08-02 9:57 ` Souptick Joarder
2018-08-03 7:03 ` xinliang
0 siblings, 1 reply; 10+ messages in thread
From: Souptick Joarder @ 2018-08-02 9:57 UTC (permalink / raw)
To: z.liuxinliang, Zou Rongrong, kong.kongxinwei, puck.chen, airlied,
noralf, Souptick Joarder, Sean Paul
Cc: dri-devel, linux-kernel, Ajit Linux, Sabyasachi Gupta,
Brajeswar Ghosh, Daniel Vetter
On Thu, Jul 26, 2018 at 1:37 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
> On Thu, Jul 19, 2018 at 9:34 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: Souptick Joarder <jrdr.linux@gmail.com>
>> Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
>> ---
>
> Any comment on this patch ?
Any review comment for this patch ?
>
>> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 24 ++++++++----------------
>> 1 file changed, 8 insertions(+), 16 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..2261676 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,22 @@ 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);
>> - }
>> + int ret = 0;
>>
>> - return 0;
>> + ret = drm_mode_config_helper_suspend(drm_dev);
>> +
>> + return ret;
>> }
>>
>> 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;
>> + int ret = 0;
>>
>> - drm_atomic_helper_resume(drm_dev, priv->suspend_state);
>> - drm_kms_helper_poll_enable(drm_dev);
>> + ret = drm_mode_config_helper_resume(drm_dev);
>>
>> - return 0;
>> + return ret;
>> }
>>
>> static const struct dev_pm_ops hibmc_pm_ops = {
>> --
>> 1.9.1
>>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-08-02 9:57 ` Souptick Joarder
@ 2018-08-03 7:03 ` xinliang
2018-08-06 6:06 ` Souptick Joarder
0 siblings, 1 reply; 10+ messages in thread
From: xinliang @ 2018-08-03 7:03 UTC (permalink / raw)
To: Souptick Joarder, Zou Rongrong, kong.kongxinwei, puck.chen,
airlied, noralf, Sean Paul
Cc: dri-devel, linux-kernel, Ajit Linux, Sabyasachi Gupta,
Brajeswar Ghosh, Daniel Vetter
On 2018/8/2 17:57, Souptick Joarder wrote:
> On Thu, Jul 26, 2018 at 1:37 PM, Souptick Joarder<jrdr.linux@gmail.com> wrote:
>> >On Thu, Jul 19, 2018 at 9:34 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: Souptick Joarder<jrdr.linux@gmail.com>
>>> >>Signed-off-by: Ajit Negi<ajitn.linux@gmail.com>
>>> >>---
>> >
>> >Any comment on this patch ?
> Any review comment for this patch ?
Sorry for late reply. Looks good to me. Thanks.
Reviewed-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
2018-08-03 7:03 ` xinliang
@ 2018-08-06 6:06 ` Souptick Joarder
0 siblings, 0 replies; 10+ messages in thread
From: Souptick Joarder @ 2018-08-06 6:06 UTC (permalink / raw)
To: xinliang
Cc: Zou Rongrong, kong.kongxinwei, puck.chen, airlied, noralf,
Sean Paul, dri-devel, linux-kernel, Ajit Linux, Sabyasachi Gupta,
Brajeswar Ghosh, Daniel Vetter
On Fri, Aug 3, 2018 at 12:33 PM, xinliang <z.liuxinliang@hisilicon.com> wrote:
>
>
> On 2018/8/2 17:57, Souptick Joarder wrote:
>>
>> On Thu, Jul 26, 2018 at 1:37 PM, Souptick Joarder<jrdr.linux@gmail.com>
>> wrote:
>>>
>>> >On Thu, Jul 19, 2018 at 9:34 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: Souptick Joarder<jrdr.linux@gmail.com>
>>>> >>Signed-off-by: Ajit Negi<ajitn.linux@gmail.com>
>>>> >>---
>>>
>>> >
>>> >Any comment on this patch ?
>>
>> Any review comment for this patch ?
>
> Sorry for late reply. Looks good to me. Thanks.
> Reviewed-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
Xinliang,
I will do little more clean up by removing ret variable from
suspend / resume function and post v2.
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-09-25 12:44 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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-06 6:06 ` 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).