Commit 112abd29 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: simplify sysfs setup code

Positively checking for the required feature/gen is simpler than build
a cascade of negative "we need to bail" checks. And the later won't
scale if we add more stuff that doesn't fit in nicely.
Reviewed-by: default avatarBen Widawsky <>
Signed-Off-by: default avatarDaniel Vetter <>
parent 98fd81cd
......@@ -205,20 +205,18 @@ void i915_setup_sysfs(struct drm_device *dev)
int ret;
/* ILK and below don't yet have relevant sysfs files */
if (INTEL_INFO(dev)->gen < 6)
ret = sysfs_merge_group(&dev->primary->kdev.kobj, &rc6_attr_group);
if (INTEL_INFO(dev)->gen >= 6) {
ret = sysfs_merge_group(&dev->primary->kdev.kobj,
if (ret)
DRM_ERROR("RC6 residency sysfs setup failed\n");
if (!IS_IVYBRIDGE(dev))
if (IS_IVYBRIDGE(dev)) {
ret = device_create_bin_file(&dev->primary->kdev, &dpf_attrs);
if (ret)
DRM_ERROR("l3 parity sysfs setup failed\n");
void i915_teardown_sysfs(struct drm_device *dev)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment