From: Souptick Joarder <jrdr.linux@gmail.com>
To: z.liuxinliang@hisilicon.com, zourongrong@gmail.com,
kong.kongxinwei@hisilicon.com, puck.chen@hisilicon.com,
airlied@linux.ie, noralf@tronnes.org, jrdr.linux@gmail.com,
seanpaul@chromium.org
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
ajitn.linux@gmail.com, sabyasachi.linux@gmail.com,
brajeswar.linux@gmail.com, daniel@ffwll.ch
Subject: [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
Date: Thu, 19 Jul 2018 21:34:26 +0530 [thread overview]
Message-ID: <20180719160426.GA21958@jordon-HP-15-Notebook-PC> (raw)
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
next reply other threads:[~2018-07-19 16:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-19 16:04 Souptick Joarder [this message]
2018-07-26 8:07 ` [PATCH] gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume() Souptick Joarder
2018-08-02 9:57 ` Souptick Joarder
2018-08-03 7:03 ` xinliang
2018-08-06 6:06 ` Souptick Joarder
-- strict thread matches above, loose matches on Subject: below --
2018-08-06 14:49 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
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=20180719160426.GA21958@jordon-HP-15-Notebook-PC \
--to=jrdr.linux@gmail.com \
--cc=airlied@linux.ie \
--cc=ajitn.linux@gmail.com \
--cc=brajeswar.linux@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kong.kongxinwei@hisilicon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=noralf@tronnes.org \
--cc=puck.chen@hisilicon.com \
--cc=sabyasachi.linux@gmail.com \
--cc=seanpaul@chromium.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox