Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c3f929b authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Enable some sysfs stuff without CONFIG_PM 



The original patch was actually incorrect in stubbing out the sysfs for
l3 parity.
commit 5ab3633d
Author: Hunt Xu <mhuntxu@gmail.com>
Date:   Sun Jul 1 03:45:07 2012 +0000

    drm/i915: make rc6 in sysfs functions conditional

Unfortunately Hunt didn't respond to my review comments, and Daniel
sucked in the patch again ignoring. Worst of all, I'm too lazy to write
the patch for what I originally wanted, which was to keep rc6 sysfs even
without CONFIG_PM. This simpler patch does enough to enable us to add
more sysfs entries though.

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 8dee3eea

drivers/gpu/drm/i915/i915_sysfs.c

+3 −12
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static struct attribute_group rc6_attr_group = { 
	.name = power_group_name,

	.attrs =  rc6_attrs

};

#endif



static int l3_access_valid(struct drm_device *dev, loff_t offset)

{
@@ -206,13 +207,14 @@ void i915_setup_sysfs(struct drm_device *dev) 
{

	int ret;



#ifdef CONFIG_PM

	if (INTEL_INFO(dev)->gen >= 6) {

		ret = sysfs_merge_group(&dev->primary->kdev.kobj,

					&rc6_attr_group);

		if (ret)

			DRM_ERROR("RC6 residency sysfs setup failed\n");

	}



#endif

	if (HAS_L3_GPU_CACHE(dev)) {

		ret = device_create_bin_file(&dev->primary->kdev, &dpf_attrs);

		if (ret)
@@ -225,14 +227,3 @@ void i915_teardown_sysfs(struct drm_device *dev) 
	device_remove_bin_file(&dev->primary->kdev,  &dpf_attrs);

	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 */