From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Peres Subject: Re: linux-next: Tree for October 11 (nouveau) Date: Tue, 12 Oct 2010 03:40:03 +0200 Message-ID: <4CB3BC73.1020706@free.fr> References: <20101011162959.86e40961.sfr@canb.auug.org.au> <20101011092915.66afd35b.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070200030803040901060103" Return-path: Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [212.27.42.4]) by gabe.freedesktop.org (Postfix) with ESMTP id C2DDA9E80F for ; Mon, 11 Oct 2010 18:40:40 -0700 (PDT) Received: from [192.168.0.1] (unknown [82.246.199.246]) by smtp4-g21.free.fr (Postfix) with ESMTP id 4443D4C8059 for ; Tue, 12 Oct 2010 03:40:35 +0200 (CEST) In-Reply-To: <20101011092915.66afd35b.randy.dunlap@oracle.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org This is a multi-part message in MIME format. --------------070200030803040901060103 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Le 11/10/2010 18:29, Randy Dunlap a =E9crit : > When CONFIG_HWMON is not enabled: > > drivers/built-in.o: In function `nouveau_pm_fini': > (.text+0x1c680f): undefined reference to `hwmon_device_unregister' > drivers/built-in.o: In function `nouveau_hwmon_init': > nouveau_pm.c:(.text+0x1c6f93): undefined reference to `hwmon_device_reg= ister' > nouveau_pm.c:(.text+0x1c7094): undefined reference to `hwmon_device_unr= egister Hi, I cannot test the attached patch as my kernel forces me to compile hwmon=20 (static or module). What kernel version are you using? As nouveau, radeon doesn't check for CONFIG_HWMON, you may want to ask=20 them to do so. Cheers, Martin --------------070200030803040901060103 Content-Type: text/x-patch; name="0001-Try-to-fix-issues-when-compiling-nouveau-without-CON.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Try-to-fix-issues-when-compiling-nouveau-without-CON.pa"; filename*1="tch" >>From 77aee56418ffbb4f0d4683d9e6d9d8d46ad12621 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Tue, 12 Oct 2010 03:30:27 +0200 Subject: [PATCH] Try to fix issues when compiling nouveau without CONFIG_HWMON Signed-off: Martin Peres --- drivers/gpu/drm/nouveau/nouveau_pm.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 1c99c55..74a7d3a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -27,8 +27,10 @@ #include "nouveau_drv.h" #include "nouveau_pm.h" +#ifdef CONFIG_HWMON #include #include +#endif static int nouveau_pm_clock_set(struct drm_device *dev, struct nouveau_pm_level *perflvl, @@ -406,7 +408,8 @@ nouveau_hwmon_init(struct drm_device *dev) if (!pm->temp_get) return -ENODEV; - + +#ifdef CONFIG_HWMON hwmon_dev = hwmon_device_register(&dev->pdev->dev); if (IS_ERR(hwmon_dev)) { ret = PTR_ERR(hwmon_dev); @@ -425,6 +428,9 @@ nouveau_hwmon_init(struct drm_device *dev) } pm->hwmon = hwmon_dev; +#else + pm->hwmon = NULL; +#endif return 0; } @@ -435,10 +441,12 @@ nouveau_hwmon_fini(struct drm_device *dev) struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_pm_engine *pm = &dev_priv->engine.pm; +#ifdef CONFIG_HWMON if (pm->hwmon) { sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup); hwmon_device_unregister(pm->hwmon); } +#endif } int -- 1.7.3.1 --------------070200030803040901060103 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --------------070200030803040901060103--