drm/i915: make rc6 in sysfs functions conditional
Subsystems (2)
PATCH 1/1 drm/i915: make rc6 in sysfs functions conditional
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.
Signed-off-by Hunt Xu <[email protected]>
--- drivers/gpu/drm/i915/i915_sysfs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/i915/i915_sysfs.c +12 -0
@@ -31,6 +31,7 @@#include <linux/sysfs.h> #include "i915_drv.h" +#ifdef CONFIG_PM static u32 calc_residency (struct drm_device *dev,const u32 reg) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -109,3 +110,14 @@ void i915_teardown_sysfs(struct drm_device *dev) {sysfs_unmerge_group (&dev->primary->kdev.kobj, &rc6_attr_group); } +#else +void i915_setup_sysfs (struct drm_device *dev) +{ +return ; +} + +void i915_teardown_sysfs (struct drm_device *dev) +{ +return ; +} +#endif /* CONFIG_PM */
Signature · 1 line
1.7.11.1