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>,
	Paul Mackerras <paulus@samba.org>,
	Russell King <linux@armlinux.org.uk>,
	Andres Salomon <dilinger@queued.net>,
	Antonino Daplas <adaplas@gmail.com>,
	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
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 v1 02/12] fbdev: lxfb: use generic power management
Date: Wed,  5 Aug 2020 23:37:12 +0530	[thread overview]
Message-ID: <20200805180722.244008-3-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20200805180722.244008-1-vaibhavgupta40@gmail.com>

Drivers using legacy power management .suspen()/.resume() callbacks
have to manage PCI states and device's PM states themselves. They also
need to take care of standard configuration registers.

Switch to generic power management framework using a single
"struct dev_pm_ops" variable to take the unnecessary load from the driver.
This also avoids the need for the driver to directly call most of the PCI
helper functions and device power state control functions, as through
the generic framework PCI Core takes care of the necessary operations,
and drivers are required to do only device-specific jobs.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
 drivers/video/fbdev/geode/lxfb.h      |  5 ----
 drivers/video/fbdev/geode/lxfb_core.c | 37 +++++++++++++++------------
 drivers/video/fbdev/geode/lxfb_ops.c  |  4 ---
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/drivers/video/fbdev/geode/lxfb.h b/drivers/video/fbdev/geode/lxfb.h
index ef24bf6d49dc..d37b32dbcd68 100644
--- a/drivers/video/fbdev/geode/lxfb.h
+++ b/drivers/video/fbdev/geode/lxfb.h
@@ -29,7 +29,6 @@ struct lxfb_par {
 	void __iomem *gp_regs;
 	void __iomem *dc_regs;
 	void __iomem *vp_regs;
-#ifdef CONFIG_PM
 	int powered_down;
 
 	/* register state, for power mgmt functionality */
@@ -50,7 +49,6 @@ struct lxfb_par {
 	uint32_t hcoeff[DC_HFILT_COUNT * 2];
 	uint32_t vcoeff[DC_VFILT_COUNT];
 	uint32_t vp_coeff[VP_COEFF_SIZE / 4];
-#endif
 };
 
 static inline unsigned int lx_get_pitch(unsigned int xres, int bpp)
@@ -64,11 +62,8 @@ int lx_blank_display(struct fb_info *, int);
 void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
 			unsigned int, unsigned int);
 
-#ifdef CONFIG_PM
 int lx_powerdown(struct fb_info *info);
 int lx_powerup(struct fb_info *info);
-#endif
-
 
 /* Graphics Processor registers (table 6-29 from the data book) */
 enum gp_registers {
diff --git a/drivers/video/fbdev/geode/lxfb_core.c b/drivers/video/fbdev/geode/lxfb_core.c
index adc2d9c2395e..66c81262d18f 100644
--- a/drivers/video/fbdev/geode/lxfb_core.c
+++ b/drivers/video/fbdev/geode/lxfb_core.c
@@ -443,17 +443,14 @@ static struct fb_info *lxfb_init_fbinfo(struct device *dev)
 	return info;
 }
 
-#ifdef CONFIG_PM
-static int lxfb_suspend(struct pci_dev *pdev, pm_message_t state)
+static int __maybe_unused lxfb_suspend(struct device *dev)
 {
-	struct fb_info *info = pci_get_drvdata(pdev);
+	struct fb_info *info = dev_get_drvdata(dev);
 
-	if (state.event == PM_EVENT_SUSPEND) {
-		console_lock();
-		lx_powerdown(info);
-		fb_set_suspend(info, 1);
-		console_unlock();
-	}
+	console_lock();
+	lx_powerdown(info);
+	fb_set_suspend(info, 1);
+	console_unlock();
 
 	/* there's no point in setting PCI states; we emulate PCI, so
 	 * we don't end up getting power savings anyways */
@@ -461,9 +458,9 @@ static int lxfb_suspend(struct pci_dev *pdev, pm_message_t state)
 	return 0;
 }
 
-static int lxfb_resume(struct pci_dev *pdev)
+static int __maybe_unused lxfb_resume(struct device *dev)
 {
-	struct fb_info *info = pci_get_drvdata(pdev);
+	struct fb_info *info = dev_get_drvdata(dev);
 	int ret;
 
 	console_lock();
@@ -477,10 +474,6 @@ static int lxfb_resume(struct pci_dev *pdev)
 	console_unlock();
 	return 0;
 }
-#else
-#define lxfb_suspend NULL
-#define lxfb_resume NULL
-#endif
 
 static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
@@ -600,13 +593,23 @@ static struct pci_device_id lxfb_id_table[] = {
 
 MODULE_DEVICE_TABLE(pci, lxfb_id_table);
 
+static const struct dev_pm_ops lxfb_pm_ops = {
+#ifdef CONFIG_PM_SLEEP
+	.suspend	= lxfb_suspend,
+	.resume		= lxfb_resume,
+	.freeze		= NULL,
+	.thaw		= lxfb_resume,
+	.poweroff	= NULL,
+	.restore	= lxfb_resume,
+#endif
+};
+
 static struct pci_driver lxfb_driver = {
 	.name		= "lxfb",
 	.id_table	= lxfb_id_table,
 	.probe		= lxfb_probe,
 	.remove		= lxfb_remove,
-	.suspend	= lxfb_suspend,
-	.resume		= lxfb_resume,
+	.driver.pm	= &lxfb_pm_ops,
 };
 
 #ifndef MODULE
diff --git a/drivers/video/fbdev/geode/lxfb_ops.c b/drivers/video/fbdev/geode/lxfb_ops.c
index 5be8bc62844c..b3a041fce570 100644
--- a/drivers/video/fbdev/geode/lxfb_ops.c
+++ b/drivers/video/fbdev/geode/lxfb_ops.c
@@ -580,8 +580,6 @@ int lx_blank_display(struct fb_info *info, int blank_mode)
 	return 0;
 }
 
-#ifdef CONFIG_PM
-
 static void lx_save_regs(struct lxfb_par *par)
 {
 	uint32_t filt;
@@ -837,5 +835,3 @@ int lx_powerup(struct fb_info *info)
 	par->powered_down = 0;
 	return 0;
 }
-
-#endif
-- 
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-05 18:09 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           ` [Linux-kernel-mentees] [PATCH v2 06/12] fbdev: nvidia: " Vaibhav Gupta
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 ` Vaibhav Gupta [this message]
2020-08-08 11:19   ` [Linux-kernel-mentees] [PATCH v1 02/12] fbdev: lxfb: " 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=20200805180722.244008-3-vaibhavgupta40@gmail.com \
    --to=vaibhavgupta40@gmail.com \
    --cc=FlorianSchandinat@gmx.de \
    --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=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).