Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp738548pxa; Wed, 5 Aug 2020 11:31:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqFkNVns8iTSnWccYt8Ti5oH2E1BHgsE+9EQNF1peVTqLzinzcDxC6Zq4wr7ztdmjiwYj1 X-Received: by 2002:a17:907:2712:: with SMTP id w18mr527243ejk.473.1596652290942; Wed, 05 Aug 2020 11:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596652290; cv=none; d=google.com; s=arc-20160816; b=hX/M6SQ+ZZ3BL7WVvF4UrAlwbuPfSuOmacRRK3kT0/Q1nNnZlnY1hjGoWA+5VebArb FB4ejbyQ3ORzuRezgdJZKpZpHMqTAKsBRtkjfByRVUvbWci7fAumRmP+Zy/Y0PpdZ3fo coqmXMJeHazMx5sI7exOi+uKsLyI9mtqKE54QOxM6eNVf1opmO7+IK9y4biHET0jNzmX KGIPRobEpUwN17tKzTMBnIzSz2BXLS9dRbS5xdm65A6bfnbecH1+mVnxXiX2mWIwDzrd SzhiRRhpoMqQCPaULFxjLawXSfCthXYTDjSvHyyzXryl5bi/uAQJwEyu8ulR1kDgUU9a DvAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SgVLkQgbaRD9yzOFBDpXNqjeujh8891+2ZYkeKQIDLw=; b=AblObLa0tj1RFiDld8rSGrYwdYAUZTjjDLT0wsnWtbrQt4fmHT8i32zNeBVlwy8wKm hCION8nerLgV8N1Nh/RlQmWqYaLLnYq04A73Z4dUR1vDF79xoJQvdOyQ+GwDhlmuyRio QbZxqFJDiWsnQq063WZiI9l0B+VLkysqnKf2hUlncMkLsRO50yRKGSg9hEoHFNx882eE +417t9/RvSRgtdcF4hXOXgZ3WO1G72+ZwdfY2o452cetyL44/n5aMu/yApsDrDkEZMgU tCS4UUFAiz3AWcnAAPvAjxO0hThnbZMXSn/gHaEBZGYnuWKOYGOrJGQrAVTcofAkGKTH Y6wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=XePgyGKz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x22si1806272ejw.73.2020.08.05.11.30.20; Wed, 05 Aug 2020 11:31:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=XePgyGKz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729233AbgHESY7 (ORCPT + 99 others); Wed, 5 Aug 2020 14:24:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729168AbgHESKM (ORCPT ); Wed, 5 Aug 2020 14:10:12 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCBD1C0617A1; Wed, 5 Aug 2020 11:09:30 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id p8so8829927pgn.13; Wed, 05 Aug 2020 11:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SgVLkQgbaRD9yzOFBDpXNqjeujh8891+2ZYkeKQIDLw=; b=XePgyGKzBRdhr1GC2yklBTIzq8V2QdMNAJ851qYYfKh3kx4IBojl3TghejhwfBK/M1 bElu8fW3rTNT3y0jwYuwleod23ut0qqG6TTfOBRCb/M1PtQLLSOxhAGjcZO2TK65Lmg2 aCrBfkXj/cv3/tVsL9+b4miVVJu5Sog9tPWY0/3G63T9Azx7fYSHF62iKI2OVCbhk+lk eGcI8nuaJIw2tBlFwlHh69w10T2SFdCwKsqiDwFhvAam8AqEr4WZUucDuA2kemHWPBKO gWcboQJR8dR6qcpTHvZl8YmqZOrCuOg5zGiTXy0euwCdb2pUeAAeDLMUFzlCp7lOjPrx c3mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SgVLkQgbaRD9yzOFBDpXNqjeujh8891+2ZYkeKQIDLw=; b=dmckILXQyFMnM7Dxu6soAYilCMU7TBOG0OsQHHqH5E+v36ZeylRUyNlmBhsDpVTnNj 6d+g0FUbQyb6GdfNEMO1WVB5I6LtnIcmyd23+QdFd3IyCaBOMDDZiJCQlG14tvwdfe7x q1LE28JXfMrDqtA5CD2CjdpOMCo18nw30/ExeQQOPU6CW5UzuFJlUJv/uPiz1BKUGfdd sjHueiEDPGtjJpFBEs+8ItBY7bwBRO0PnAHs7/hBzJr9lF3EWX0w8UHJbNq6EFEBwR5C N0SYkBuMf+QyTWL7L5S26UCpqcEEoyQA/6oN9/lhyFMB7WsMMbqO600/Ov3Fm6ehVSvs gRfQ== X-Gm-Message-State: AOAM532HHndnjSfEfAUk0R76NGc9c9Cw4U0ei7ypw7AA9juDb7T3STmX 2IbEhcLaPEd6Ds5u5+XJl9s= X-Received: by 2002:a62:7c87:: with SMTP id x129mr4753260pfc.165.1596650970339; Wed, 05 Aug 2020 11:09:30 -0700 (PDT) Received: from varodek.iballbatonwifi.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id t63sm4977510pfb.210.2020.08.05.11.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 11:09:29 -0700 (PDT) From: Vaibhav Gupta To: Bjorn Helgaas , Bjorn Helgaas , Bjorn Helgaas , Vaibhav Gupta , Bartlomiej Zolnierkiewicz , Paul Mackerras , Russell King , Andres Salomon , Antonino Daplas , Florian Tobias Schandinat Cc: Vaibhav Gupta , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-geode@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Shuah Khan Subject: [PATCH v1 02/12] fbdev: lxfb: use generic power management Date: Wed, 5 Aug 2020 23:37:12 +0530 Message-Id: <20200805180722.244008-3-vaibhavgupta40@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200805180722.244008-1-vaibhavgupta40@gmail.com> References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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