Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 081d0571 authored by Souptick Joarder's avatar Souptick Joarder Committed by Xinliang Liu
Browse files

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: default avatarAjit Negi <ajitn.linux@gmail.com>
Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: default avatarXinliang Liu <z.liuxinliang@hisilicon.com>
Signed-off-by: default avatarXinliang Liu <z.liuxinliang@hisilicon.com>
parent a66dae3a

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+3 −17
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const struct file_operations hibmc_fops = { 
	.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 = {

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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;