In preparation for upcoming patches, we need the ability to create and remove individual sysfs files. To facilitate this, extract from the intel_engines_add_sysfs() function the creation of individual files.
Signed-off-by: Andi Shyti <[email protected]> --- drivers/gpu/drm/i915/gt/sysfs_engines.c | 75 ++++++++++++++++--------- drivers/gpu/drm/i915/gt/sysfs_engines.h | 2 + 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/sysfs_engines.c b/drivers/gpu/drm/i915/gt/sysfs_engines.c index d0bb2aa561ed..3356fadce327 100644 --- a/drivers/gpu/drm/i915/gt/sysfs_engines.c +++ b/drivers/gpu/drm/i915/gt/sysfs_engines.c @@ -9,6 +9,7 @@ #include "i915_drv.h" #include "intel_engine.h" #include "intel_engine_heartbeat.h" +#include "intel_gt_print.h" #include "sysfs_engines.h" struct kobj_engine { @@ -483,7 +484,7 @@ static void add_defaults(struct kobj_engine *parent) parent->engine->kobj_defaults = &ke->base; } -void intel_engines_add_sysfs(struct drm_i915_private *i915) +int intel_engine_add_single_sysfs(struct intel_engine_cs *engine) { static const struct attribute * const files[] = { &name_attr.attr, @@ -499,46 +500,64 @@ void intel_engines_add_sysfs(struct drm_i915_private *i915) #endif NULL }; + struct kobject *dir = engine->i915->sysfs_engine; + struct kobject *kobj = engine->kobj; + int err; - struct device *kdev = i915->drm.primary->kdev; - struct intel_engine_cs *engine; - struct kobject *dir; - - dir = kobject_create_and_add("engine", &kdev->kobj); - if (!dir) - return; - - i915->sysfs_engine = dir; - - for_each_uabi_engine(engine, i915) { - struct kobject *kobj; - + if (!kobj) { kobj = kobj_engine(dir, engine); if (!kobj) goto err_engine; + } - if (sysfs_create_files(kobj, files)) + err = sysfs_create_files(kobj, files); + if (err) + goto err_object; + + if (intel_engine_has_timeslices(engine)) { + err = sysfs_create_file(kobj, ×lice_duration_attr.attr); + if (err) goto err_object; + } - if (intel_engine_has_timeslices(engine) && - sysfs_create_file(kobj, ×lice_duration_attr.attr)) - goto err_engine; + if (intel_engine_has_preempt_reset(engine)) { + err = sysfs_create_file(kobj, &preempt_timeout_attr.attr); + if (err) + goto err_object; + } - if (intel_engine_has_preempt_reset(engine) && - sysfs_create_file(kobj, &preempt_timeout_attr.attr)) - goto err_engine; + add_defaults(container_of(kobj, struct kobj_engine, base)); - add_defaults(container_of(kobj, struct kobj_engine, base)); + engine->kobj = kobj; - engine->kobj = kobj; + return 0; - if (0) { err_object: - kobject_put(kobj); + kobject_put(kobj); err_engine: - dev_err(kdev, "Failed to add sysfs engine '%s'\n", - engine->name); + gt_err(engine->gt, "Failed to add sysfs engine '%s'\n", + engine->name); + + return err; +} + +void intel_engines_add_sysfs(struct drm_i915_private *i915) +{ + struct device *kdev = i915->drm.primary->kdev; + struct intel_engine_cs *engine; + struct kobject *dir; + + dir = kobject_create_and_add("engine", &kdev->kobj); + if (!dir) + return; + + i915->sysfs_engine = dir; + + for_each_uabi_engine(engine, i915) { + int err; + + err = intel_engine_add_single_sysfs(engine); + if (err) break; - } } } diff --git a/drivers/gpu/drm/i915/gt/sysfs_engines.h b/drivers/gpu/drm/i915/gt/sysfs_engines.h index 9546fffe03a7..2e3ec2df14a9 100644 --- a/drivers/gpu/drm/i915/gt/sysfs_engines.h +++ b/drivers/gpu/drm/i915/gt/sysfs_engines.h @@ -7,7 +7,9 @@ #define INTEL_ENGINE_SYSFS_H struct drm_i915_private; +struct intel_engine_cs; void intel_engines_add_sysfs(struct drm_i915_private *i915); +int intel_engine_add_single_sysfs(struct intel_engine_cs *engine); #endif /* INTEL_ENGINE_SYSFS_H */ -- 2.45.2
