UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume() 

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>
Signed-off-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
This commit is contained in:
Souptick Joarder 2018-08-06 20:19:01 +05:30 committed by Xinliang Liu
parent a66dae3a2b
commit 081d057170
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
View File

@ -37,7 +37,7 @@ static const struct file_operations hibmc_fops = {
.llseek = no_llseek, .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 drm_device *dev = (struct drm_device *)arg;
struct hibmc_drm_private *priv = 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 pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev); 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); return drm_mode_config_helper_suspend(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;
} }
static int __maybe_unused hibmc_pm_resume(struct device *dev) static int __maybe_unused hibmc_pm_resume(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev); 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); return drm_mode_config_helper_resume(drm_dev);
drm_kms_helper_poll_enable(drm_dev);
return 0;
} }
static const struct dev_pm_ops hibmc_pm_ops = { static const struct dev_pm_ops hibmc_pm_ops = {

1
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
View File

@ -47,7 +47,6 @@ struct hibmc_drm_private {
/* drm */ /* drm */
struct drm_device *dev; struct drm_device *dev;
bool mode_config_initialized; bool mode_config_initialized;
struct drm_atomic_state *suspend_state;
/* ttm */ /* ttm */
struct drm_global_reference mem_global_ref; struct drm_global_reference mem_global_ref;