linux-kernel-mentees.lists.linuxfoundation.org archive mirror
 help / color / mirror / Atom feed
From: Vaibhav Gupta <vaibhavgupta40@gmail.com>
To: Bjorn Helgaas <helgaas@kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Bjorn Helgaas <bjorn@helgaas.com>,
	Vaibhav Gupta <vaibhav.varodek@gmail.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Paul Mackerras <paulus@samba.org>,
	Russell King <linux@armlinux.org.uk>,
	Andres Salomon <dilinger@queued.net>,
	Antonino Daplas <adaplas@gmail.com>
Cc: linux-fbdev@vger.kernel.org,
	Vaibhav Gupta <vaibhavgupta40@gmail.com>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-geode@lists.infradead.org,
	linux-kernel-mentees@lists.linuxfoundation.org,
	linux-arm-kernel@lists.infradead.org
Subject: [Linux-kernel-mentees] [PATCH v2 06/12] fbdev: nvidia: use generic power management
Date: Tue, 11 Aug 2020 00:27:17 +0530	[thread overview]
Message-ID: <20200810185723.15540-7-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20200810185723.15540-1-vaibhavgupta40@gmail.com>

Drivers should do only device-specific jobs. But in general, drivers using
legacy PCI PM framework for .suspend()/.resume() have to manage many PCI
PM-related tasks themselves which can be done by PCI Core itself. This
brings extra load on the driver and it directly calls PCI helper functions
to handle them.

Switch to the new generic framework by updating function signatures and
define a "struct dev_pm_ops" variable to bind PM callbacks. Also, remove
unnecessary calls to the PCI Helper functions along with the legacy
.suspend & .resume bindings.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
 drivers/video/fbdev/nvidia/nvidia.c | 64 ++++++++++++++++-------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
index c24de9107958..3a1a4330e0d3 100644
--- a/drivers/video/fbdev/nvidia/nvidia.c
+++ b/drivers/video/fbdev/nvidia/nvidia.c
@@ -1041,10 +1041,9 @@ static struct fb_ops nvidia_fb_ops = {
 	.fb_sync        = nvidiafb_sync,
 };
 
-#ifdef CONFIG_PM
-static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
+static int nvidiafb_suspend_late(struct device *dev, pm_message_t mesg)
 {
-	struct fb_info *info = pci_get_drvdata(dev);
+	struct fb_info *info = dev_get_drvdata(dev);
 	struct nvidia_par *par = info->par;
 
 	if (mesg.event == PM_EVENT_PRETHAW)
@@ -1056,46 +1055,54 @@ static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
 		fb_set_suspend(info, 1);
 		nvidiafb_blank(FB_BLANK_POWERDOWN, info);
 		nvidia_write_regs(par, &par->SavedReg);
-		pci_save_state(dev);
-		pci_disable_device(dev);
-		pci_set_power_state(dev, pci_choose_state(dev, mesg));
 	}
-	dev->dev.power.power_state = mesg;
+	dev->power.power_state = mesg;
 
 	console_unlock();
 	return 0;
 }
 
-static int nvidiafb_resume(struct pci_dev *dev)
+static int __maybe_unused nvidiafb_suspend(struct device *dev)
 {
-	struct fb_info *info = pci_get_drvdata(dev);
-	struct nvidia_par *par = info->par;
+	return nvidiafb_suspend_late(dev, PMSG_SUSPEND);
+}
 
-	console_lock();
-	pci_set_power_state(dev, PCI_D0);
+static int __maybe_unused nvidiafb_hibernate(struct device *dev)
+{
+	return nvidiafb_suspend_late(dev, PMSG_HIBERNATE);
+}
 
-	if (par->pm_state != PM_EVENT_FREEZE) {
-		pci_restore_state(dev);
+static int __maybe_unused nvidiafb_freeze(struct device *dev)
+{
+	return nvidiafb_suspend_late(dev, PMSG_FREEZE);
+}
 
-		if (pci_enable_device(dev))
-			goto fail;
+static int __maybe_unused nvidiafb_resume(struct device *dev)
+{
+	struct fb_info *info = dev_get_drvdata(dev);
+	struct nvidia_par *par = info->par;
 
-		pci_set_master(dev);
-	}
+	console_lock();
 
 	par->pm_state = PM_EVENT_ON;
 	nvidiafb_set_par(info);
 	fb_set_suspend (info, 0);
 	nvidiafb_blank(FB_BLANK_UNBLANK, info);
 
-fail:
 	console_unlock();
 	return 0;
 }
-#else
-#define nvidiafb_suspend NULL
-#define nvidiafb_resume NULL
-#endif
+
+static const struct dev_pm_ops nvidiafb_pm_ops = {
+#ifdef CONFIG_PM_SLEEP
+	.suspend	= nvidiafb_suspend,
+	.resume		= nvidiafb_resume,
+	.freeze		= nvidiafb_freeze,
+	.thaw		= nvidiafb_resume,
+	.poweroff	= nvidiafb_hibernate,
+	.restore	= nvidiafb_resume,
+#endif /* CONFIG_PM_SLEEP */
+};
 
 static int nvidia_set_fbinfo(struct fb_info *info)
 {
@@ -1496,12 +1503,11 @@ static int nvidiafb_setup(char *options)
 #endif				/* !MODULE */
 
 static struct pci_driver nvidiafb_driver = {
-	.name = "nvidiafb",
-	.id_table = nvidiafb_pci_tbl,
-	.probe    = nvidiafb_probe,
-	.suspend  = nvidiafb_suspend,
-	.resume   = nvidiafb_resume,
-	.remove   = nvidiafb_remove,
+	.name      = "nvidiafb",
+	.id_table  = nvidiafb_pci_tbl,
+	.probe     = nvidiafb_probe,
+	.driver.pm = &nvidiafb_pm_ops,
+	.remove    = nvidiafb_remove,
 };
 
 /* ------------------------------------------------------------------------- *
-- 
2.27.0

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

  parent reply	other threads:[~2020-08-10 19:00 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-05 18:07 [Linux-kernel-mentees] [PATCH v1 00/12] video: fbdev: use generic power management Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 01/12] fbdev: gxfb: " Vaibhav Gupta
2020-08-05 20:19   ` Bjorn Helgaas
2020-08-06  5:59     ` Vaibhav Gupta
2020-08-08 11:17   ` Sam Ravnborg
2020-08-10  9:39     ` Vaibhav Gupta
2020-08-10  9:44       ` Vaibhav Gupta
2020-08-10 16:54       ` Sam Ravnborg
2020-08-10 17:58         ` Vaibhav Gupta
2020-08-10 18:57         ` [Linux-kernel-mentees] [PATCH v2 00/12] video: fbdev: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 01/12] fbdev: gxfb: " Vaibhav Gupta
2020-08-16 20:16             ` Sam Ravnborg
2020-08-17  7:45               ` Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 02/12] fbdev: lxfb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 03/12] fbdev: via-core: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 04/12] fbdev: aty: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 05/12] fbdev: aty128fb: " Vaibhav Gupta
2020-08-10 18:57           ` Vaibhav Gupta [this message]
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 07/12] fbdev: savagefb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 08/12] fbdev: cyber2000fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 09/12] fbdev: i740fb: " Vaibhav Gupta
2020-08-16 20:24             ` Sam Ravnborg
2020-08-17  7:46               ` Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 10/12] fbdev: vt8623fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 11/12] fbdev: s3fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 12/12] fbdev: arkfb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 02/12] fbdev: lxfb: " Vaibhav Gupta
2020-08-08 11:19   ` Sam Ravnborg
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 03/12] fbdev: via-core: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 04/12] fbdev: aty: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 05/12] fbdev: aty128fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 06/12] fbdev: nvidia: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 07/12] fbdev: savagefb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 08/12] fbdev: cyber2000fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 09/12] fbdev: i740fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 10/12] fbdev: vt8623fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 11/12] fbdev: s3fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 12/12] fbdev: arkfb: " Vaibhav Gupta

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=20200810185723.15540-7-vaibhavgupta40@gmail.com \
    --to=vaibhavgupta40@gmail.com \
    --cc=adaplas@gmail.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=bhelgaas@google.com \
    --cc=bjorn@helgaas.com \
    --cc=dilinger@queued.net \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=helgaas@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-geode@lists.infradead.org \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=paulus@samba.org \
    --cc=sam@ravnborg.org \
    --cc=vaibhav.varodek@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;
as well as URLs for NNTP newsgroup(s).