From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: make rc6 in sysfs functions conditional Date: Mon, 6 Aug 2012 19:45:33 +0200 Message-ID: <20120806174533.GA20041@phenom.ffwll.local> References: <1341113980-6211-1-git-send-email-mhuntxu+intelgfx@gmail.com> <20120701095034.52e0940f@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id C83429E95C for ; Mon, 6 Aug 2012 10:46:59 -0700 (PDT) Received: by wibhm2 with SMTP id hm2so1650917wib.0 for ; Mon, 06 Aug 2012 10:46:58 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20120701095034.52e0940f@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Sun, Jul 01, 2012 at 09:50:34AM -0700, Ben Widawsky wrote: > On Sun, 1 Jul 2012 11:39:40 +0800 > Hunt Xu wrote: > > > Commit 0136db586c028f71e7cc21cc183064ff0d5919c8 merges rc6 information > > into the power group. However, when compiled with CONFIG_PM not set, > > modprobing i915 would taint since power_group_name is defined as NULL. > > > > This patch makes these rc6 in sysfs functions conditional upon the > > definition of the CONFIG_PM macro to avoid the above-mentioned problem. > > > > Thanks for the patch, the only problem is we want this information even > when CONFIG_PM is not set as we currently don't control our rc6 state > based on that. Unfortunately it also doesn't make too much sense to have > CONFIG_PM control the rc6 info. > > Do you have any other ideas to make this work? I've picked this one up for -fixes, cc stable, becaus it fixes an OOPS for compiled-in i915.ko and CONFIG_PM=n. Thanks for the patch. -Daniel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48