Skip to content

Commit

Permalink
drm/i915/selftests: Distinguish mock device from no wakeref
Browse files Browse the repository at this point in the history
On systems that have no runtime-pm, we mark the wakeref as being -1. We
therefore cannot use that value for the mock-gt indicator, so opt for
-ENODEV instead. The wakeref should never be an error value -- one
hopes!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190927211749.2181-2-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Sep 27, 2019
1 parent 260e6b7 commit 4e18ca7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gt/intel_gt_pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int intel_gt_runtime_resume(struct intel_gt *gt);

static inline bool is_mock_gt(const struct intel_gt *gt)
{
return I915_SELFTEST_ONLY(gt->awake == -1);
return I915_SELFTEST_ONLY(gt->awake == -ENODEV);
}

#endif /* INTEL_GT_PM_H */
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/selftests/mock_gem_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ struct drm_i915_private *mock_gem_device(void)
i915_gem_init__mm(i915);
intel_gt_init_early(&i915->gt, i915);
atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */
i915->gt.awake = -ENODEV;

i915->wq = alloc_ordered_workqueue("mock", 0);
if (!i915->wq)
Expand All @@ -192,8 +193,6 @@ struct drm_i915_private *mock_gem_device(void)
INIT_DELAYED_WORK(&i915->gem.retire_work, mock_retire_work_handler);
INIT_WORK(&i915->gem.idle_work, mock_idle_work_handler);

i915->gt.awake = -1;

intel_timelines_init(i915);

mutex_lock(&i915->drm.struct_mutex);
Expand Down

0 comments on commit 4e18ca7

Please sign in to comment.