drm/nouveau/devinit/gf100: make devinit on resume safer

Browse source

In case of successful suspend, devinit will have to be run and this is
the behavior currently hardcoded. However, as FD bug 94725 suggests,
there might be cases where runtime suspend leaves the GPU powered, and
in such cases devinit should not be run on resume.

On GF100+ we have a reliable way to know whether we need to run devinit.
Use it instead of blindly trusting the flag set by nvkm_devinit_fini().

The code around the NvForcePost also needs to be slightly reworked in
order to keep working.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Suggested-by: Dave Airlie <airlied@redhat.com>
Suggested-by: Karol Herbst <nouveau@karolherbst.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

...

This commit is contained in:

Alexandre Courbot 2016-04-01 15:40:59 +09:00 • committed by Ben Skeggs

parent 4dc28134a8

commit c6007dc4e5

3 changed files with 13 additions and 4 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

1

drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h

View file

8

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c

View file

8

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c

View file