From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbcAISNi (ORCPT ); Sat, 9 Jan 2016 13:13:38 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:57516 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752998AbcAISNh (ORCPT ); Sat, 9 Jan 2016 13:13:37 -0500 From: Guenter Roeck To: David Airlie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Guenter Roeck , Eric Anholt Subject: [PATCH -next] drm/vc4: Do not call pm functions if CONFIG_PM_SLEEP is not configured Date: Sat, 9 Jan 2016 10:13:34 -0800 Message-Id: <1452363214-969-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If CONFIG_PM_SLEEP is not configured, the build fails with include/linux/pm.h:776:30: note: in expansion of macro 'NULL' #define pm_generic_poweroff NULL drivers/gpu/drm/vc4/vc4_v3d.c:157:10: note: in expansion of macro 'pm_generic_poweroff' return pm_generic_poweroff(&vc4->v3d->pdev->dev); pm_generic_poweroff and pm_generic_resume are defined as NULL if CONFIG_PM_SLEEP is not configured and can therefore not be called in that case. Create a wrapper for the calling function to solve the problem. Fixes: d5b1a78a772f1 ("drm/vc4: Add support for drawing 3D frames.") Cc: Eric Anholt Signed-off-by: Guenter Roeck --- drivers/gpu/drm/vc4/vc4_drv.h | 8 ++++++++ drivers/gpu/drm/vc4/vc4_v3d.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index 080865ec2bae..5948e2b1b7d9 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -434,7 +434,15 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, extern struct platform_driver vc4_v3d_driver; int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused); int vc4_v3d_debugfs_regs(struct seq_file *m, void *unused); + +#ifdef CONFIG_PM_SLEEP int vc4_v3d_set_power(struct vc4_dev *vc4, bool on); +#else +static inline int vc4_v3d_set_power(struct vc4_dev *vc4, bool on) +{ + return 0; +} +#endif /* vc4_validate.c */ int diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index 424d515ffcda..4789de303f2f 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -150,6 +150,8 @@ int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused) * This may be doable with just the clocks interface, though this * packet does some other register setup from the firmware, too. */ +#ifdef CONFIG_PM_SLEEP + int vc4_v3d_set_power(struct vc4_dev *vc4, bool on) { @@ -159,6 +161,8 @@ vc4_v3d_set_power(struct vc4_dev *vc4, bool on) return pm_generic_resume(&vc4->v3d->pdev->dev); } +#endif /* CONFIG_PM_SLEEP */ + static void vc4_v3d_init_hw(struct drm_device *dev) { struct vc4_dev *vc4 = to_vc4_dev(dev); -- 2.1.4