drm/i915: Defer rc6 shutdown to suspend_late

Browse source

Currently we shutdown rc6 during i915_gem_resume() but this is called
during the preparation phase (i915_drm_prepare) for all suspend paths,
but we only want to shutdown rc6 for S3+. Move the actual shutdown to
i915_gem_suspend_late().

We then need to differentiate between suspend targets, to distinguish S0
(s2idle) where the device is kept awake but needs to be in a low power
mode (the same as runtime suspend) from the device suspend levels where
we lose control of HW and so must disable any HW access to dangling
memory.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111909
Fixes: c113236718 ("drm/i915: Extract GT render sleep (rc6) management")
Testcase: igt/gem_exec_suspend/power-S0
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Acked-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101141009.15581-4-chris@chris-wilson.co.uk

...

This commit is contained in:

Chris Wilson 2019-11-01 14:10:09 +00:00

parent 9ab3fe2d7d

commit c601cb2135

5 changed files with 49 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/gpu/drm/i915/gem/i915_gem_pm.c

View file

44

drivers/gpu/drm/i915/gt/intel_gt_pm.c

View file

3

drivers/gpu/drm/i915/gt/intel_gt_pm.h

View file

5

drivers/gpu/drm/i915/gt/intel_rc6.c

View file

2

drivers/gpu/drm/i915/gt/selftest_gt_pm.c

View file