[Intel-gfx] [PATCH] drm/i915: make rc6 in sysfs functions conditional

[Daniel Vetter]

On Sun, Jul 01, 2012 at 09:50:34AM -0700, Ben Widawsky wrote:
> On Sun,  1 Jul 2012 11:39:40 +0800
> Hunt Xu <mhuntxu at gmail.com> 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 at ffwll.ch
Mobile: +41 (0)79 365 57 48