gpu/drm/hisilicon: Convert drm_atomic_helper_suspend/resume()
Subsystems (3)
PATCH 1/1 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.
---
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(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3 -17
@@ -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 = {
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -1
@@ -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;
Signature · 1 line
1.9.1
Quoted 10 lines · Souptick Joarder
convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().Fixed one sparse warning by making
hibmc_drm_interruptstatic.Signed-off-by Ajit Negi <[email protected]>Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Xinliang Liu <[email protected]>
Can we get this patch in queue for 4.20 ??
Quoted 69 lines
---
v2: remove ret variable from both suspend and resume.
removesuspend_statefromhibmc_drm_privatestruct.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(-)drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3
-17@@ -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 = {drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0
-2@@ -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
Quoted 6 lines · Souptick Joarder
Quoted 4 lines · Souptick Joarder
convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().
Quoted 8 lines
Quoted 6 lines
Fixed one sparse warning by making
hibmc_drm_interruptstatic.Signed-off-by Ajit Negi <[email protected]>Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Xinliang Liu <[email protected]>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 ?
Quoted 70 lines
Quoted 70 lines
---
v2: remove ret variable from both suspend and resume.
removesuspend_statefromhibmc_drm_privatestruct.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(-)drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3
-17@@ -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 = {drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0
-2@@ -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
Hi Souptick,
Quoted 11 lines · Souptick Joarder
Quoted 9 lines · Souptick Joarder
Quoted 7 lines · Souptick Joarder
convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().Fixed one sparse warning by making
hibmc_drm_interruptstatic.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Signed-off-by Ajit Negi <[email protected]>Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Xinliang Liu <[email protected]>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
Quoted 66 lines
Quoted 66 lines
Quoted 66 lines
---
v2: remove ret variable from both suspend and resume.
removesuspend_statefromhibmc_drm_privatestruct.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(-)drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3
-17@@ -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 = {drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0
-1@@ -47,7 +47,6 @@ struct hibmc_drm_private {/* drm */ struct drm_device *dev;bool mode_config_initialized; -struct drm_atomic_state *suspend_state;
Quoted 9 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0
-1/* ttm */ struct drm_global_reference mem_global_ref; --1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 19 lines · Xinliang Liu
Hi Souptick,
Quoted 15 lines · Souptick Joarder
Quoted 13 lines · Souptick Joarder
Quoted 10 lines · Souptick Joarder
convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().Fixed one sparse warning by making
hibmc_drm_interruptstatic.Signed-off-by Ajit Negi <[email protected]>Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Xinliang Liu <[email protected]>
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
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.
Quoted 74 lines
Quoted 74 lines
Quoted 65 lines
Quoted 65 lines
---
v2: remove ret variable from both suspend and resume.
removesuspend_statefromhibmc_drm_privatestruct.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(-)drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3
-17@@ -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 = {drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0
-1@@ -47,7 +47,6 @@ struct hibmc_drm_private {/* drm */ struct drm_device *dev;bool mode_config_initialized; -struct drm_atomic_state *suspend_state;Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0
-1/* ttm */ struct drm_global_reference mem_global_ref; --1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel