diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-11-03 09:50:38 +0000 |
|---|---|---|
| committer |   Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-11-05 16:06:02 +0200 |
| commit | 3fd850dda83d0e5a4e49e7d093b0b72f75a9391f (patch) | |
| tree | cf0c895ff5db8bc59f8e9538ded714a093f7fba2 /drivers/gpu/drm/i915/gt/intel_gt_pm.c | |
| parent | drm/i915: Defer rc6 shutdown to suspend_late (diff) | |
| download | linux-dev-3fd850dda83d0e5a4e49e7d093b0b72f75a9391f.tar.xz linux-dev-3fd850dda83d0e5a4e49e7d093b0b72f75a9391f.zip | |
drm/i915/gt: Drop false assertion on user_forcewake
The counter is removed from the pm wakeref count, but it remains intact
so that we can restore it upon resume. Ergo inside suspend, it may have
a value.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191104090158.2959-1-chris@chris-wilson.co.uk
(cherry picked from commit 83c55ee82f3ac5a1c36dab9f7150554c4da773a8)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c index 6374744bb65e..060a27d9af34 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c @@ -251,7 +251,6 @@ static void wait_for_suspend(struct intel_gt *gt) intel_gt_set_wedged(gt); } - GEM_BUG_ON(atomic_read(>->user_wakeref)); intel_gt_pm_wait_for_idle(gt); } |