From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vaibhav Gupta Date: Mon, 10 Aug 2020 09:51:48 +0000 Subject: Re: [PATCH v1 01/12] fbdev: gxfb: use generic power management Message-Id: <20200810093948.GB6615@gmail.com> List-Id: References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> <20200805180722.244008-2-vaibhavgupta40@gmail.com> <20200808111746.GA24172@ravnborg.org> In-Reply-To: <20200808111746.GA24172@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Sam Ravnborg Cc: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Vaibhav Gupta , Florian Tobias Schandinat , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Andres Salomon , Bjorn Helgaas , Paul Mackerras , Shuah Khan , linux-kernel-mentees@lists.linuxfoundation.org, linux-geode@lists.infradead.org On Sat, Aug 08, 2020 at 01:17:46PM +0200, Sam Ravnborg wrote: > Hi Vaibhav > > On Wed, Aug 05, 2020 at 11:37:11PM +0530, Vaibhav Gupta wrote: > > 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." > - I do not parse the above - I cannot see what load is removed. > But the code is simpler which is fine. The drawback is that we now > always link in the suspend_gx functions but hopefultl the linker drops > them later. > > > 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. > Again, I do not see what calles are removed. > A single check for the state is dropped - anything else? > Yeah, the commit messages are bit misleading, I have modified them. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/video/fbdev/geode/gxfb.h | 5 ---- > > drivers/video/fbdev/geode/gxfb_core.c | 36 ++++++++++++++------------ > > drivers/video/fbdev/geode/suspend_gx.c | 4 --- > > 3 files changed, 20 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/video/fbdev/geode/gxfb.h b/drivers/video/fbdev/geode/gxfb.h > > index d2e9c5c8e294..792c111c21e4 100644 > > --- a/drivers/video/fbdev/geode/gxfb.h > > +++ b/drivers/video/fbdev/geode/gxfb.h > > @@ -21,7 +21,6 @@ struct gxfb_par { > > void __iomem *dc_regs; > > void __iomem *vid_regs; > > void __iomem *gp_regs; > > -#ifdef CONFIG_PM > > int powered_down; > > > > /* register state, for power management functionality */ > > @@ -36,7 +35,6 @@ struct gxfb_par { > > uint64_t fp[FP_REG_COUNT]; > > > > uint32_t pal[DC_PAL_COUNT]; > > -#endif > > }; > > > > unsigned int gx_frame_buffer_size(void); > > @@ -49,11 +47,8 @@ void gx_set_dclk_frequency(struct fb_info *info); > > void gx_configure_display(struct fb_info *info); > > int gx_blank_display(struct fb_info *info, int blank_mode); > > > > -#ifdef CONFIG_PM > > int gx_powerdown(struct fb_info *info); > > int gx_powerup(struct fb_info *info); > > -#endif > > - > > > > /* Graphics Processor registers (table 6-23 from the data book) */ > > enum gp_registers { > > diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c > > index d38a148d4746..44089b331f91 100644 > > --- a/drivers/video/fbdev/geode/gxfb_core.c > > +++ b/drivers/video/fbdev/geode/gxfb_core.c > > @@ -322,17 +322,14 @@ static struct fb_info *gxfb_init_fbinfo(struct device *dev) > > return info; > > } > > > > -#ifdef CONFIG_PM > > -static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused gxfb_suspend(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > I do not see any dev_set_drvdata() so I guess we get a NULL pointer > here which is not intended. > Adding a dev_set_data() to gxfb_probe() would do the trick. > gxfb_probe() invokes pci_set_drvdata(pdev, info) which in turn calls dev_set_drvdata(&pdev->dev, data). Adding dev_get_drvdata() will be redundant. > > > > - if (state.event = PM_EVENT_SUSPEND) { > > - console_lock(); > > - gx_powerdown(info); > > - fb_set_suspend(info, 1); > > - console_unlock(); > > - } > > + console_lock(); > > + gx_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 */ > > @@ -340,9 +337,9 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > return 0; > > } > > > > -static int gxfb_resume(struct pci_dev *pdev) > > +static int __maybe_unused gxfb_resume(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > int ret; > > > > console_lock(); > > @@ -356,7 +353,6 @@ static int gxfb_resume(struct pci_dev *pdev) > > console_unlock(); > > return 0; > > } > > -#endif > > > > static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > @@ -467,15 +463,23 @@ static const struct pci_device_id gxfb_id_table[] = { > > > > MODULE_DEVICE_TABLE(pci, gxfb_id_table); > > > > +static const struct dev_pm_ops gxfb_pm_ops = { > > +#ifdef CONFIG_PM_SLEEP > > + .suspend = gxfb_suspend, > > + .resume = gxfb_resume, > > + .freeze = NULL, > > + .thaw = gxfb_resume, > > + .poweroff = NULL, > > + .restore = gxfb_resume, > > +#endif > > +}; > Can we use SET_SYSTEM_SLEEP_PM_OPS here? > .freeze will be assigned gxfb_suspend, but gxfb_suspend will anyway be > called as far as I read the code. > Likewise for poweroff. > Earlier, gxfb_suspend() performed each operation just for suspend event. And as it was legacy code, it was invoked by pci_legacy_suspend() for pci_pm_suspend(), pci_pm_freeze() and pci_pm_poweroff(). Thus, the code was wrapped inside "if" container: if (state.event = PM_EVENT_SUSPEND) { } After binding it with dev_pm_ops variable, pm->suspend() is invoked by just pci_pm_suspend() which is required. So I removed the "if" container and bind the callback with pm->suspend pointer only. Using SET_SYSTEM_PM_OPS will bring back the extra step of invoking gxfb_suspend() for freeze and poweroff, even though the function will do nothing in that case. Vaibhav Gupta > Sam > > > + > > static struct pci_driver gxfb_driver = { > > .name = "gxfb", > > .id_table = gxfb_id_table, > > .probe = gxfb_probe, > > .remove = gxfb_remove, > > -#ifdef CONFIG_PM > > - .suspend = gxfb_suspend, > > - .resume = gxfb_resume, > > -#endif > > + .driver.pm = &gxfb_pm_ops, > > }; > > > > #ifndef MODULE > > diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c > > index 1110a527c35c..8c49d4e98772 100644 > > --- a/drivers/video/fbdev/geode/suspend_gx.c > > +++ b/drivers/video/fbdev/geode/suspend_gx.c > > @@ -11,8 +11,6 @@ > > > > #include "gxfb.h" > > > > -#ifdef CONFIG_PM > > - > > static void gx_save_regs(struct gxfb_par *par) > > { > > int i; > > @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) > > par->powered_down = 0; > > return 0; > > } > > - > > -#endif > > -- > > 2.27.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F01CBC433E0 for ; Mon, 10 Aug 2020 09:41:35 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B72B02070B for ; Mon, 10 Aug 2020 09:41:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BhHI6QrI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B72B02070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 81CDA8701F; Mon, 10 Aug 2020 09:41:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wnLwnWaSFpdV; Mon, 10 Aug 2020 09:41:34 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id CB7E586FD8; Mon, 10 Aug 2020 09:41:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C4AE8C0864; Mon, 10 Aug 2020 09:41:34 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 75BFDC004D for ; Mon, 10 Aug 2020 09:41:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6511E863E0 for ; Mon, 10 Aug 2020 09:41:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aJ2-uT7BMrfV for ; Mon, 10 Aug 2020 09:41:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5590085E1A for ; Mon, 10 Aug 2020 09:41:32 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id d4so4687588pjx.5 for ; Mon, 10 Aug 2020 02:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=BhHI6QrI59CCp9aOeqg0rtMs2ISonD+r8bVrNsB10xf3Chv8koFMrz9OE8b6a5acs8 558t3l2AnmWvtVKfOJceNXRhuk53EWvBOUZT97b3bWvOPCPwbJKCiO01meo0M1gWnJqQ Cg9RhFCRr1SdRa3ZewFFTkx7Qq0s2NLpSBDxdyOr45J/Sgmf0764JOoJofb5Hy+wxhnP ivzrBRmxYCbcDZ4Qo0WI5YJuWvk+aycAdYyaIKXvUtF9Cawlix6ruh/5cnRZrRaIQTdB zgAFuCYU35QSQ/BD8/VzLKiHfOWznMZK31lEEKIW24+HyVTBtxyFaDxIwDY0SbSmSJDH dDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=iEAM8zWYILIOHowL/05NPrLFVBMBW4IxSNcuxH3ErskqyDw4Dsj6eSqYshUNcQ0THw d0rMtzm9a+vT7hU9Yh37xAsPgahdMSVHSW6AHxn2aliFr3eJ1KqI6p66m+NOCZcY+AQ9 i7sXgU33IWNHoJBVQ1isf6bNRjknEJe27t8huYK9Y3Xc0Y4L0WEJkj+kWSTPOQatlloY rBuQdGxRkz5lIOCW7I6A4KKGsoKMYBa9M5OHv9lZO6Z3mcjzq2cPR2HhIsSbHFMwuEft m1d55NNyn6t2OriS3eQ2SZ0G4+yXGSS3/o0vPYuEFpXfKjMHsuftberZtb3pZFYqSch/ UJaQ== X-Gm-Message-State: AOAM533g9JHSM4H3+AUIw956nFlhlUX7ZYEefiWruda3MHV1BCisjvz9 1AI5aS0BBLoEX5/1/KMnBqw= X-Google-Smtp-Source: ABdhPJxRp1VjaaWXXrOdi8Azm9qKK7cq1QmeZD/8Knibe1gjjmeI3cd+iMmFGz7lYAvYXmTHmMZ+9Q== X-Received: by 2002:a17:90b:e83:: with SMTP id fv3mr25419713pjb.193.1597052491734; Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Received: from gmail.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id o4sm13500555pjs.51.2020.08.10.02.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Date: Mon, 10 Aug 2020 15:09:48 +0530 From: Vaibhav Gupta To: Sam Ravnborg Message-ID: <20200810093948.GB6615@gmail.com> References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> <20200805180722.244008-2-vaibhavgupta40@gmail.com> <20200808111746.GA24172@ravnborg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200808111746.GA24172@ravnborg.org> Cc: linux-fbdev@vger.kernel.org, Antonino Daplas , Bartlomiej Zolnierkiewicz , Vaibhav Gupta , Florian Tobias Schandinat , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Andres Salomon , Bjorn Helgaas , Paul Mackerras , linux-kernel-mentees@lists.linuxfoundation.org, linux-geode@lists.infradead.org Subject: Re: [Linux-kernel-mentees] [PATCH v1 01/12] fbdev: gxfb: use generic power management X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" On Sat, Aug 08, 2020 at 01:17:46PM +0200, Sam Ravnborg wrote: > Hi Vaibhav > > On Wed, Aug 05, 2020 at 11:37:11PM +0530, Vaibhav Gupta wrote: > > 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." > - I do not parse the above - I cannot see what load is removed. > But the code is simpler which is fine. The drawback is that we now > always link in the suspend_gx functions but hopefultl the linker drops > them later. > > > 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. > Again, I do not see what calles are removed. > A single check for the state is dropped - anything else? > Yeah, the commit messages are bit misleading, I have modified them. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/video/fbdev/geode/gxfb.h | 5 ---- > > drivers/video/fbdev/geode/gxfb_core.c | 36 ++++++++++++++------------ > > drivers/video/fbdev/geode/suspend_gx.c | 4 --- > > 3 files changed, 20 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/video/fbdev/geode/gxfb.h b/drivers/video/fbdev/geode/gxfb.h > > index d2e9c5c8e294..792c111c21e4 100644 > > --- a/drivers/video/fbdev/geode/gxfb.h > > +++ b/drivers/video/fbdev/geode/gxfb.h > > @@ -21,7 +21,6 @@ struct gxfb_par { > > void __iomem *dc_regs; > > void __iomem *vid_regs; > > void __iomem *gp_regs; > > -#ifdef CONFIG_PM > > int powered_down; > > > > /* register state, for power management functionality */ > > @@ -36,7 +35,6 @@ struct gxfb_par { > > uint64_t fp[FP_REG_COUNT]; > > > > uint32_t pal[DC_PAL_COUNT]; > > -#endif > > }; > > > > unsigned int gx_frame_buffer_size(void); > > @@ -49,11 +47,8 @@ void gx_set_dclk_frequency(struct fb_info *info); > > void gx_configure_display(struct fb_info *info); > > int gx_blank_display(struct fb_info *info, int blank_mode); > > > > -#ifdef CONFIG_PM > > int gx_powerdown(struct fb_info *info); > > int gx_powerup(struct fb_info *info); > > -#endif > > - > > > > /* Graphics Processor registers (table 6-23 from the data book) */ > > enum gp_registers { > > diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c > > index d38a148d4746..44089b331f91 100644 > > --- a/drivers/video/fbdev/geode/gxfb_core.c > > +++ b/drivers/video/fbdev/geode/gxfb_core.c > > @@ -322,17 +322,14 @@ static struct fb_info *gxfb_init_fbinfo(struct device *dev) > > return info; > > } > > > > -#ifdef CONFIG_PM > > -static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused gxfb_suspend(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > I do not see any dev_set_drvdata() so I guess we get a NULL pointer > here which is not intended. > Adding a dev_set_data() to gxfb_probe() would do the trick. > gxfb_probe() invokes pci_set_drvdata(pdev, info) which in turn calls dev_set_drvdata(&pdev->dev, data). Adding dev_get_drvdata() will be redundant. > > > > - if (state.event == PM_EVENT_SUSPEND) { > > - console_lock(); > > - gx_powerdown(info); > > - fb_set_suspend(info, 1); > > - console_unlock(); > > - } > > + console_lock(); > > + gx_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 */ > > @@ -340,9 +337,9 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > return 0; > > } > > > > -static int gxfb_resume(struct pci_dev *pdev) > > +static int __maybe_unused gxfb_resume(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > int ret; > > > > console_lock(); > > @@ -356,7 +353,6 @@ static int gxfb_resume(struct pci_dev *pdev) > > console_unlock(); > > return 0; > > } > > -#endif > > > > static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > @@ -467,15 +463,23 @@ static const struct pci_device_id gxfb_id_table[] = { > > > > MODULE_DEVICE_TABLE(pci, gxfb_id_table); > > > > +static const struct dev_pm_ops gxfb_pm_ops = { > > +#ifdef CONFIG_PM_SLEEP > > + .suspend = gxfb_suspend, > > + .resume = gxfb_resume, > > + .freeze = NULL, > > + .thaw = gxfb_resume, > > + .poweroff = NULL, > > + .restore = gxfb_resume, > > +#endif > > +}; > Can we use SET_SYSTEM_SLEEP_PM_OPS here? > .freeze will be assigned gxfb_suspend, but gxfb_suspend will anyway be > called as far as I read the code. > Likewise for poweroff. > Earlier, gxfb_suspend() performed each operation just for suspend event. And as it was legacy code, it was invoked by pci_legacy_suspend() for pci_pm_suspend(), pci_pm_freeze() and pci_pm_poweroff(). Thus, the code was wrapped inside "if" container: if (state.event == PM_EVENT_SUSPEND) { } After binding it with dev_pm_ops variable, pm->suspend() is invoked by just pci_pm_suspend() which is required. So I removed the "if" container and bind the callback with pm->suspend pointer only. Using SET_SYSTEM_PM_OPS will bring back the extra step of invoking gxfb_suspend() for freeze and poweroff, even though the function will do nothing in that case. Vaibhav Gupta > Sam > > > + > > static struct pci_driver gxfb_driver = { > > .name = "gxfb", > > .id_table = gxfb_id_table, > > .probe = gxfb_probe, > > .remove = gxfb_remove, > > -#ifdef CONFIG_PM > > - .suspend = gxfb_suspend, > > - .resume = gxfb_resume, > > -#endif > > + .driver.pm = &gxfb_pm_ops, > > }; > > > > #ifndef MODULE > > diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c > > index 1110a527c35c..8c49d4e98772 100644 > > --- a/drivers/video/fbdev/geode/suspend_gx.c > > +++ b/drivers/video/fbdev/geode/suspend_gx.c > > @@ -11,8 +11,6 @@ > > > > #include "gxfb.h" > > > > -#ifdef CONFIG_PM > > - > > static void gx_save_regs(struct gxfb_par *par) > > { > > int i; > > @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) > > par->powered_down = 0; > > return 0; > > } > > - > > -#endif > > -- > > 2.27.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,FSL_HELO_FAKE, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 743DCC433E0 for ; Mon, 10 Aug 2020 09:42:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 36F6C206C3 for ; Mon, 10 Aug 2020 09:42:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="a6EFAgLf"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BhHI6QrI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36F6C206C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KFQZUWDZUokcN4Cdp2fdfNDRMHFTc0CynA80iMfE5Go=; b=a6EFAgLftaTfua0/hZ/W4kNiM DekqQ+0ypzELKf90PuNhgZWYbE15+px0CEuS/6AIdvXxKgtizlPRYgBNBTqqtyI0NKfDWai9A31x3 Uv2HvjMncYLBqCnZGMS+PdBI1MBikURnB0v8ByJoTQ37es769uBKTYASo4sln+0xmPKBKd139xafz MnfbJls60sffoqz+Uuhff+LickgOU2Z012SU3UAMFCEIScQrJj/iBlVfVAPuHFZmEFhnCP3/i/L25 VYvOfNn49kHq2FFRc90yCHsmvRLm6WFC62MWCRpxrBY1PxHGjJw+PBkLjomFk+22b5OkxgxgAxLXX B1zF2A+5Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k54JH-0002Tv-DX; Mon, 10 Aug 2020 09:41:39 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k54JD-0002SS-AY; Mon, 10 Aug 2020 09:41:36 +0000 Received: by mail-pl1-x641.google.com with SMTP id u10so4493106plr.7; Mon, 10 Aug 2020 02:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=BhHI6QrI59CCp9aOeqg0rtMs2ISonD+r8bVrNsB10xf3Chv8koFMrz9OE8b6a5acs8 558t3l2AnmWvtVKfOJceNXRhuk53EWvBOUZT97b3bWvOPCPwbJKCiO01meo0M1gWnJqQ Cg9RhFCRr1SdRa3ZewFFTkx7Qq0s2NLpSBDxdyOr45J/Sgmf0764JOoJofb5Hy+wxhnP ivzrBRmxYCbcDZ4Qo0WI5YJuWvk+aycAdYyaIKXvUtF9Cawlix6ruh/5cnRZrRaIQTdB zgAFuCYU35QSQ/BD8/VzLKiHfOWznMZK31lEEKIW24+HyVTBtxyFaDxIwDY0SbSmSJDH dDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=MoSUybG+/FFnzlLEWr0YI8yBm0XLxabeMlG5jBqM6MzuQRkGobOo9TmaWyIhs+HBjN bf6CeiJDvLnYZPxHypo14yzj47U6aftm3MEiVXJUpnLmmr7mpEusTQzyVNjJGcDXAAwS HBD47jlbJ35zoBxOv/WAlG5B+I/nqNPR83D7trWapxBwvbiDvCchYUU+9bhK1uAh9rpL RFB7FxsKeu5FVG6jln5hxXDMDi4fLs0lTaZq+XB0xG3CItJNRPgksc1A9F2jlISMTeSO oVV4g+yeiuX06RNMyaiMWeYLTuH/PUA0vcYeUviITszs80Y6chURL18BmTlkFxNht+Dx HnQQ== X-Gm-Message-State: AOAM532dOm6ZVbZ1kPjH0bwZnvEIiQRlrBhNbMh0gJ2uj3xlB9fwMZva 6/GCVh7vnmm0N+GLHxY2Suc= X-Google-Smtp-Source: ABdhPJxRp1VjaaWXXrOdi8Azm9qKK7cq1QmeZD/8Knibe1gjjmeI3cd+iMmFGz7lYAvYXmTHmMZ+9Q== X-Received: by 2002:a17:90b:e83:: with SMTP id fv3mr25419713pjb.193.1597052491734; Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Received: from gmail.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id o4sm13500555pjs.51.2020.08.10.02.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Date: Mon, 10 Aug 2020 15:09:48 +0530 From: Vaibhav Gupta To: Sam Ravnborg Subject: Re: [PATCH v1 01/12] fbdev: gxfb: use generic power management Message-ID: <20200810093948.GB6615@gmail.com> References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> <20200805180722.244008-2-vaibhavgupta40@gmail.com> <20200808111746.GA24172@ravnborg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200808111746.GA24172@ravnborg.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200810_054135_475755_B3854273 X-CRM114-Status: GOOD ( 36.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Antonino Daplas , Bartlomiej Zolnierkiewicz , Vaibhav Gupta , Florian Tobias Schandinat , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Andres Salomon , Bjorn Helgaas , Paul Mackerras , Shuah Khan , linux-kernel-mentees@lists.linuxfoundation.org, linux-geode@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Aug 08, 2020 at 01:17:46PM +0200, Sam Ravnborg wrote: > Hi Vaibhav > > On Wed, Aug 05, 2020 at 11:37:11PM +0530, Vaibhav Gupta wrote: > > 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." > - I do not parse the above - I cannot see what load is removed. > But the code is simpler which is fine. The drawback is that we now > always link in the suspend_gx functions but hopefultl the linker drops > them later. > > > 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. > Again, I do not see what calles are removed. > A single check for the state is dropped - anything else? > Yeah, the commit messages are bit misleading, I have modified them. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/video/fbdev/geode/gxfb.h | 5 ---- > > drivers/video/fbdev/geode/gxfb_core.c | 36 ++++++++++++++------------ > > drivers/video/fbdev/geode/suspend_gx.c | 4 --- > > 3 files changed, 20 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/video/fbdev/geode/gxfb.h b/drivers/video/fbdev/geode/gxfb.h > > index d2e9c5c8e294..792c111c21e4 100644 > > --- a/drivers/video/fbdev/geode/gxfb.h > > +++ b/drivers/video/fbdev/geode/gxfb.h > > @@ -21,7 +21,6 @@ struct gxfb_par { > > void __iomem *dc_regs; > > void __iomem *vid_regs; > > void __iomem *gp_regs; > > -#ifdef CONFIG_PM > > int powered_down; > > > > /* register state, for power management functionality */ > > @@ -36,7 +35,6 @@ struct gxfb_par { > > uint64_t fp[FP_REG_COUNT]; > > > > uint32_t pal[DC_PAL_COUNT]; > > -#endif > > }; > > > > unsigned int gx_frame_buffer_size(void); > > @@ -49,11 +47,8 @@ void gx_set_dclk_frequency(struct fb_info *info); > > void gx_configure_display(struct fb_info *info); > > int gx_blank_display(struct fb_info *info, int blank_mode); > > > > -#ifdef CONFIG_PM > > int gx_powerdown(struct fb_info *info); > > int gx_powerup(struct fb_info *info); > > -#endif > > - > > > > /* Graphics Processor registers (table 6-23 from the data book) */ > > enum gp_registers { > > diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c > > index d38a148d4746..44089b331f91 100644 > > --- a/drivers/video/fbdev/geode/gxfb_core.c > > +++ b/drivers/video/fbdev/geode/gxfb_core.c > > @@ -322,17 +322,14 @@ static struct fb_info *gxfb_init_fbinfo(struct device *dev) > > return info; > > } > > > > -#ifdef CONFIG_PM > > -static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused gxfb_suspend(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > I do not see any dev_set_drvdata() so I guess we get a NULL pointer > here which is not intended. > Adding a dev_set_data() to gxfb_probe() would do the trick. > gxfb_probe() invokes pci_set_drvdata(pdev, info) which in turn calls dev_set_drvdata(&pdev->dev, data). Adding dev_get_drvdata() will be redundant. > > > > - if (state.event == PM_EVENT_SUSPEND) { > > - console_lock(); > > - gx_powerdown(info); > > - fb_set_suspend(info, 1); > > - console_unlock(); > > - } > > + console_lock(); > > + gx_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 */ > > @@ -340,9 +337,9 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > return 0; > > } > > > > -static int gxfb_resume(struct pci_dev *pdev) > > +static int __maybe_unused gxfb_resume(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > int ret; > > > > console_lock(); > > @@ -356,7 +353,6 @@ static int gxfb_resume(struct pci_dev *pdev) > > console_unlock(); > > return 0; > > } > > -#endif > > > > static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > @@ -467,15 +463,23 @@ static const struct pci_device_id gxfb_id_table[] = { > > > > MODULE_DEVICE_TABLE(pci, gxfb_id_table); > > > > +static const struct dev_pm_ops gxfb_pm_ops = { > > +#ifdef CONFIG_PM_SLEEP > > + .suspend = gxfb_suspend, > > + .resume = gxfb_resume, > > + .freeze = NULL, > > + .thaw = gxfb_resume, > > + .poweroff = NULL, > > + .restore = gxfb_resume, > > +#endif > > +}; > Can we use SET_SYSTEM_SLEEP_PM_OPS here? > .freeze will be assigned gxfb_suspend, but gxfb_suspend will anyway be > called as far as I read the code. > Likewise for poweroff. > Earlier, gxfb_suspend() performed each operation just for suspend event. And as it was legacy code, it was invoked by pci_legacy_suspend() for pci_pm_suspend(), pci_pm_freeze() and pci_pm_poweroff(). Thus, the code was wrapped inside "if" container: if (state.event == PM_EVENT_SUSPEND) { } After binding it with dev_pm_ops variable, pm->suspend() is invoked by just pci_pm_suspend() which is required. So I removed the "if" container and bind the callback with pm->suspend pointer only. Using SET_SYSTEM_PM_OPS will bring back the extra step of invoking gxfb_suspend() for freeze and poweroff, even though the function will do nothing in that case. Vaibhav Gupta > Sam > > > + > > static struct pci_driver gxfb_driver = { > > .name = "gxfb", > > .id_table = gxfb_id_table, > > .probe = gxfb_probe, > > .remove = gxfb_remove, > > -#ifdef CONFIG_PM > > - .suspend = gxfb_suspend, > > - .resume = gxfb_resume, > > -#endif > > + .driver.pm = &gxfb_pm_ops, > > }; > > > > #ifndef MODULE > > diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c > > index 1110a527c35c..8c49d4e98772 100644 > > --- a/drivers/video/fbdev/geode/suspend_gx.c > > +++ b/drivers/video/fbdev/geode/suspend_gx.c > > @@ -11,8 +11,6 @@ > > > > #include "gxfb.h" > > > > -#ifdef CONFIG_PM > > - > > static void gx_save_regs(struct gxfb_par *par) > > { > > int i; > > @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) > > par->powered_down = 0; > > return 0; > > } > > - > > -#endif > > -- > > 2.27.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4AB8C433E3 for ; Tue, 11 Aug 2020 06:59:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BAB5620772 for ; Tue, 11 Aug 2020 06:59:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BhHI6QrI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BAB5620772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDA986E4C1; Tue, 11 Aug 2020 06:59:31 +0000 (UTC) Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by gabe.freedesktop.org (Postfix) with ESMTPS id 517EB89D00 for ; Mon, 10 Aug 2020 09:41:32 +0000 (UTC) Received: by mail-pl1-x643.google.com with SMTP id p1so4505452pls.4 for ; Mon, 10 Aug 2020 02:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=BhHI6QrI59CCp9aOeqg0rtMs2ISonD+r8bVrNsB10xf3Chv8koFMrz9OE8b6a5acs8 558t3l2AnmWvtVKfOJceNXRhuk53EWvBOUZT97b3bWvOPCPwbJKCiO01meo0M1gWnJqQ Cg9RhFCRr1SdRa3ZewFFTkx7Qq0s2NLpSBDxdyOr45J/Sgmf0764JOoJofb5Hy+wxhnP ivzrBRmxYCbcDZ4Qo0WI5YJuWvk+aycAdYyaIKXvUtF9Cawlix6ruh/5cnRZrRaIQTdB zgAFuCYU35QSQ/BD8/VzLKiHfOWznMZK31lEEKIW24+HyVTBtxyFaDxIwDY0SbSmSJDH dDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=YWcQctcIBjVtS8lsLCQrUDWb8B5j9e/zjb8coYnMe3ly8V/vG2oNQZ+Do2gzi0QaRx Hve366dufadcj0PiYxPlebAF0UpgXrM+e52UGrGrySRxNSGYOCdGzwUMXzFmZxRBA9ka JrVBIUZFB7isHqu+9Ox4peG7rVkyt9hcVF5Ug5IijV/QrRCXGwgxFdo1OyATayW0rLZV Gl4cfralVkfSAIkVAF1NDjBtv3I/snTl2QifVT/5M3H0tK7jjE3ccqCT/nqKBZmvaikn 55OFsAp/PsIugbP4PrMa7j5k58x2Mzw9/DPI/C+t8DiivvCCpd6l5h4vI9/IpyN+XeSY NDOg== X-Gm-Message-State: AOAM533GLJpHsP6UVRa2KGvYVM8IgAwe5SBgfnSjBvm5efwBosA1CQ/c f4mu/KbPBXNP+Iw8t9KXcG4JiZ+AErXOZQ== X-Google-Smtp-Source: ABdhPJxRp1VjaaWXXrOdi8Azm9qKK7cq1QmeZD/8Knibe1gjjmeI3cd+iMmFGz7lYAvYXmTHmMZ+9Q== X-Received: by 2002:a17:90b:e83:: with SMTP id fv3mr25419713pjb.193.1597052491734; Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Received: from gmail.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id o4sm13500555pjs.51.2020.08.10.02.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Date: Mon, 10 Aug 2020 15:09:48 +0530 From: Vaibhav Gupta To: Sam Ravnborg Subject: Re: [PATCH v1 01/12] fbdev: gxfb: use generic power management Message-ID: <20200810093948.GB6615@gmail.com> References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> <20200805180722.244008-2-vaibhavgupta40@gmail.com> <20200808111746.GA24172@ravnborg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200808111746.GA24172@ravnborg.org> X-Mailman-Approved-At: Tue, 11 Aug 2020 06:58:41 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Vaibhav Gupta , Florian Tobias Schandinat , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Andres Salomon , Bjorn Helgaas , Paul Mackerras , Shuah Khan , linux-kernel-mentees@lists.linuxfoundation.org, linux-geode@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sat, Aug 08, 2020 at 01:17:46PM +0200, Sam Ravnborg wrote: > Hi Vaibhav > > On Wed, Aug 05, 2020 at 11:37:11PM +0530, Vaibhav Gupta wrote: > > 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." > - I do not parse the above - I cannot see what load is removed. > But the code is simpler which is fine. The drawback is that we now > always link in the suspend_gx functions but hopefultl the linker drops > them later. > > > 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. > Again, I do not see what calles are removed. > A single check for the state is dropped - anything else? > Yeah, the commit messages are bit misleading, I have modified them. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/video/fbdev/geode/gxfb.h | 5 ---- > > drivers/video/fbdev/geode/gxfb_core.c | 36 ++++++++++++++------------ > > drivers/video/fbdev/geode/suspend_gx.c | 4 --- > > 3 files changed, 20 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/video/fbdev/geode/gxfb.h b/drivers/video/fbdev/geode/gxfb.h > > index d2e9c5c8e294..792c111c21e4 100644 > > --- a/drivers/video/fbdev/geode/gxfb.h > > +++ b/drivers/video/fbdev/geode/gxfb.h > > @@ -21,7 +21,6 @@ struct gxfb_par { > > void __iomem *dc_regs; > > void __iomem *vid_regs; > > void __iomem *gp_regs; > > -#ifdef CONFIG_PM > > int powered_down; > > > > /* register state, for power management functionality */ > > @@ -36,7 +35,6 @@ struct gxfb_par { > > uint64_t fp[FP_REG_COUNT]; > > > > uint32_t pal[DC_PAL_COUNT]; > > -#endif > > }; > > > > unsigned int gx_frame_buffer_size(void); > > @@ -49,11 +47,8 @@ void gx_set_dclk_frequency(struct fb_info *info); > > void gx_configure_display(struct fb_info *info); > > int gx_blank_display(struct fb_info *info, int blank_mode); > > > > -#ifdef CONFIG_PM > > int gx_powerdown(struct fb_info *info); > > int gx_powerup(struct fb_info *info); > > -#endif > > - > > > > /* Graphics Processor registers (table 6-23 from the data book) */ > > enum gp_registers { > > diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c > > index d38a148d4746..44089b331f91 100644 > > --- a/drivers/video/fbdev/geode/gxfb_core.c > > +++ b/drivers/video/fbdev/geode/gxfb_core.c > > @@ -322,17 +322,14 @@ static struct fb_info *gxfb_init_fbinfo(struct device *dev) > > return info; > > } > > > > -#ifdef CONFIG_PM > > -static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused gxfb_suspend(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > I do not see any dev_set_drvdata() so I guess we get a NULL pointer > here which is not intended. > Adding a dev_set_data() to gxfb_probe() would do the trick. > gxfb_probe() invokes pci_set_drvdata(pdev, info) which in turn calls dev_set_drvdata(&pdev->dev, data). Adding dev_get_drvdata() will be redundant. > > > > - if (state.event == PM_EVENT_SUSPEND) { > > - console_lock(); > > - gx_powerdown(info); > > - fb_set_suspend(info, 1); > > - console_unlock(); > > - } > > + console_lock(); > > + gx_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 */ > > @@ -340,9 +337,9 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > return 0; > > } > > > > -static int gxfb_resume(struct pci_dev *pdev) > > +static int __maybe_unused gxfb_resume(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > int ret; > > > > console_lock(); > > @@ -356,7 +353,6 @@ static int gxfb_resume(struct pci_dev *pdev) > > console_unlock(); > > return 0; > > } > > -#endif > > > > static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > @@ -467,15 +463,23 @@ static const struct pci_device_id gxfb_id_table[] = { > > > > MODULE_DEVICE_TABLE(pci, gxfb_id_table); > > > > +static const struct dev_pm_ops gxfb_pm_ops = { > > +#ifdef CONFIG_PM_SLEEP > > + .suspend = gxfb_suspend, > > + .resume = gxfb_resume, > > + .freeze = NULL, > > + .thaw = gxfb_resume, > > + .poweroff = NULL, > > + .restore = gxfb_resume, > > +#endif > > +}; > Can we use SET_SYSTEM_SLEEP_PM_OPS here? > .freeze will be assigned gxfb_suspend, but gxfb_suspend will anyway be > called as far as I read the code. > Likewise for poweroff. > Earlier, gxfb_suspend() performed each operation just for suspend event. And as it was legacy code, it was invoked by pci_legacy_suspend() for pci_pm_suspend(), pci_pm_freeze() and pci_pm_poweroff(). Thus, the code was wrapped inside "if" container: if (state.event == PM_EVENT_SUSPEND) { } After binding it with dev_pm_ops variable, pm->suspend() is invoked by just pci_pm_suspend() which is required. So I removed the "if" container and bind the callback with pm->suspend pointer only. Using SET_SYSTEM_PM_OPS will bring back the extra step of invoking gxfb_suspend() for freeze and poweroff, even though the function will do nothing in that case. Vaibhav Gupta > Sam > > > + > > static struct pci_driver gxfb_driver = { > > .name = "gxfb", > > .id_table = gxfb_id_table, > > .probe = gxfb_probe, > > .remove = gxfb_remove, > > -#ifdef CONFIG_PM > > - .suspend = gxfb_suspend, > > - .resume = gxfb_resume, > > -#endif > > + .driver.pm = &gxfb_pm_ops, > > }; > > > > #ifndef MODULE > > diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c > > index 1110a527c35c..8c49d4e98772 100644 > > --- a/drivers/video/fbdev/geode/suspend_gx.c > > +++ b/drivers/video/fbdev/geode/suspend_gx.c > > @@ -11,8 +11,6 @@ > > > > #include "gxfb.h" > > > > -#ifdef CONFIG_PM > > - > > static void gx_save_regs(struct gxfb_par *par) > > { > > int i; > > @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) > > par->powered_down = 0; > > return 0; > > } > > - > > -#endif > > -- > > 2.27.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 270E7C433DF for ; Mon, 10 Aug 2020 09:41:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7AC6206C3 for ; Mon, 10 Aug 2020 09:41:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BhHI6QrI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726821AbgHJJld (ORCPT ); Mon, 10 Aug 2020 05:41:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725809AbgHJJlc (ORCPT ); Mon, 10 Aug 2020 05:41:32 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79B09C061756; Mon, 10 Aug 2020 02:41:32 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id f5so541595plr.9; Mon, 10 Aug 2020 02:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=BhHI6QrI59CCp9aOeqg0rtMs2ISonD+r8bVrNsB10xf3Chv8koFMrz9OE8b6a5acs8 558t3l2AnmWvtVKfOJceNXRhuk53EWvBOUZT97b3bWvOPCPwbJKCiO01meo0M1gWnJqQ Cg9RhFCRr1SdRa3ZewFFTkx7Qq0s2NLpSBDxdyOr45J/Sgmf0764JOoJofb5Hy+wxhnP ivzrBRmxYCbcDZ4Qo0WI5YJuWvk+aycAdYyaIKXvUtF9Cawlix6ruh/5cnRZrRaIQTdB zgAFuCYU35QSQ/BD8/VzLKiHfOWznMZK31lEEKIW24+HyVTBtxyFaDxIwDY0SbSmSJDH dDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=z3ulW2VxpkqtQgW6r5h1dF3y8SsTkgQ0jTlNBIbDSYs=; b=KNbVxzjELDlYh7ivumi17/XkSoJ+/gP8l2A6AHJtw1w9vSGTFVHg+JeiO8PIsx/wd+ S8il2NUiYyIecSXxE6iJvGxYVkWYWOkk9AMoxHxQSEQNjxltO533zesFtaXq7CWQR8s3 dsqcfIVbbkl4wZzO/KeQqipT06GwvztynWJivHGCWhspPC2ErLpH3L/H/EPZEJx6xWvI WJPyhzLvp7a6pjN+NcakwBpvQQAjXi3NV29Irv1vrrR4OunAwRKBizndIdFsju+jJ9I3 uoZgcqgDI2ZF3Ma7fyLZhJcUQTDD042wRm1uR9uzY8a2HjBjlzfBLDKwju9kWPqQtyNO 20ig== X-Gm-Message-State: AOAM530YhPK6VmSgIc9LH684DQdambfGfAo2esSP+Nk6YEj+BSaKbC8D hVq9YgJD92e2BzvL9mrCNK0= X-Google-Smtp-Source: ABdhPJxRp1VjaaWXXrOdi8Azm9qKK7cq1QmeZD/8Knibe1gjjmeI3cd+iMmFGz7lYAvYXmTHmMZ+9Q== X-Received: by 2002:a17:90b:e83:: with SMTP id fv3mr25419713pjb.193.1597052491734; Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Received: from gmail.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id o4sm13500555pjs.51.2020.08.10.02.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 02:41:31 -0700 (PDT) Date: Mon, 10 Aug 2020 15:09:48 +0530 From: Vaibhav Gupta To: Sam Ravnborg Cc: Bjorn Helgaas , Bjorn Helgaas , Bjorn Helgaas , Vaibhav Gupta , Bartlomiej Zolnierkiewicz , Paul Mackerras , Russell King , Andres Salomon , Antonino Daplas , Florian Tobias Schandinat , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-geode@lists.infradead.org, Shuah Khan , linux-kernel-mentees@lists.linuxfoundation.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v1 01/12] fbdev: gxfb: use generic power management Message-ID: <20200810093948.GB6615@gmail.com> References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> <20200805180722.244008-2-vaibhavgupta40@gmail.com> <20200808111746.GA24172@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200808111746.GA24172@ravnborg.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Aug 08, 2020 at 01:17:46PM +0200, Sam Ravnborg wrote: > Hi Vaibhav > > On Wed, Aug 05, 2020 at 11:37:11PM +0530, Vaibhav Gupta wrote: > > 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." > - I do not parse the above - I cannot see what load is removed. > But the code is simpler which is fine. The drawback is that we now > always link in the suspend_gx functions but hopefultl the linker drops > them later. > > > 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. > Again, I do not see what calles are removed. > A single check for the state is dropped - anything else? > Yeah, the commit messages are bit misleading, I have modified them. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/video/fbdev/geode/gxfb.h | 5 ---- > > drivers/video/fbdev/geode/gxfb_core.c | 36 ++++++++++++++------------ > > drivers/video/fbdev/geode/suspend_gx.c | 4 --- > > 3 files changed, 20 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/video/fbdev/geode/gxfb.h b/drivers/video/fbdev/geode/gxfb.h > > index d2e9c5c8e294..792c111c21e4 100644 > > --- a/drivers/video/fbdev/geode/gxfb.h > > +++ b/drivers/video/fbdev/geode/gxfb.h > > @@ -21,7 +21,6 @@ struct gxfb_par { > > void __iomem *dc_regs; > > void __iomem *vid_regs; > > void __iomem *gp_regs; > > -#ifdef CONFIG_PM > > int powered_down; > > > > /* register state, for power management functionality */ > > @@ -36,7 +35,6 @@ struct gxfb_par { > > uint64_t fp[FP_REG_COUNT]; > > > > uint32_t pal[DC_PAL_COUNT]; > > -#endif > > }; > > > > unsigned int gx_frame_buffer_size(void); > > @@ -49,11 +47,8 @@ void gx_set_dclk_frequency(struct fb_info *info); > > void gx_configure_display(struct fb_info *info); > > int gx_blank_display(struct fb_info *info, int blank_mode); > > > > -#ifdef CONFIG_PM > > int gx_powerdown(struct fb_info *info); > > int gx_powerup(struct fb_info *info); > > -#endif > > - > > > > /* Graphics Processor registers (table 6-23 from the data book) */ > > enum gp_registers { > > diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c > > index d38a148d4746..44089b331f91 100644 > > --- a/drivers/video/fbdev/geode/gxfb_core.c > > +++ b/drivers/video/fbdev/geode/gxfb_core.c > > @@ -322,17 +322,14 @@ static struct fb_info *gxfb_init_fbinfo(struct device *dev) > > return info; > > } > > > > -#ifdef CONFIG_PM > > -static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused gxfb_suspend(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > I do not see any dev_set_drvdata() so I guess we get a NULL pointer > here which is not intended. > Adding a dev_set_data() to gxfb_probe() would do the trick. > gxfb_probe() invokes pci_set_drvdata(pdev, info) which in turn calls dev_set_drvdata(&pdev->dev, data). Adding dev_get_drvdata() will be redundant. > > > > - if (state.event == PM_EVENT_SUSPEND) { > > - console_lock(); > > - gx_powerdown(info); > > - fb_set_suspend(info, 1); > > - console_unlock(); > > - } > > + console_lock(); > > + gx_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 */ > > @@ -340,9 +337,9 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > return 0; > > } > > > > -static int gxfb_resume(struct pci_dev *pdev) > > +static int __maybe_unused gxfb_resume(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > int ret; > > > > console_lock(); > > @@ -356,7 +353,6 @@ static int gxfb_resume(struct pci_dev *pdev) > > console_unlock(); > > return 0; > > } > > -#endif > > > > static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > @@ -467,15 +463,23 @@ static const struct pci_device_id gxfb_id_table[] = { > > > > MODULE_DEVICE_TABLE(pci, gxfb_id_table); > > > > +static const struct dev_pm_ops gxfb_pm_ops = { > > +#ifdef CONFIG_PM_SLEEP > > + .suspend = gxfb_suspend, > > + .resume = gxfb_resume, > > + .freeze = NULL, > > + .thaw = gxfb_resume, > > + .poweroff = NULL, > > + .restore = gxfb_resume, > > +#endif > > +}; > Can we use SET_SYSTEM_SLEEP_PM_OPS here? > .freeze will be assigned gxfb_suspend, but gxfb_suspend will anyway be > called as far as I read the code. > Likewise for poweroff. > Earlier, gxfb_suspend() performed each operation just for suspend event. And as it was legacy code, it was invoked by pci_legacy_suspend() for pci_pm_suspend(), pci_pm_freeze() and pci_pm_poweroff(). Thus, the code was wrapped inside "if" container: if (state.event == PM_EVENT_SUSPEND) { } After binding it with dev_pm_ops variable, pm->suspend() is invoked by just pci_pm_suspend() which is required. So I removed the "if" container and bind the callback with pm->suspend pointer only. Using SET_SYSTEM_PM_OPS will bring back the extra step of invoking gxfb_suspend() for freeze and poweroff, even though the function will do nothing in that case. Vaibhav Gupta > Sam > > > + > > static struct pci_driver gxfb_driver = { > > .name = "gxfb", > > .id_table = gxfb_id_table, > > .probe = gxfb_probe, > > .remove = gxfb_remove, > > -#ifdef CONFIG_PM > > - .suspend = gxfb_suspend, > > - .resume = gxfb_resume, > > -#endif > > + .driver.pm = &gxfb_pm_ops, > > }; > > > > #ifndef MODULE > > diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c > > index 1110a527c35c..8c49d4e98772 100644 > > --- a/drivers/video/fbdev/geode/suspend_gx.c > > +++ b/drivers/video/fbdev/geode/suspend_gx.c > > @@ -11,8 +11,6 @@ > > > > #include "gxfb.h" > > > > -#ifdef CONFIG_PM > > - > > static void gx_save_regs(struct gxfb_par *par) > > { > > int i; > > @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) > > par->powered_down = 0; > > return 0; > > } > > - > > -#endif > > -- > > 2.27.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel