diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-20 11:22:33 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-07-25 09:43:22 +1000 |
| commit | 6c320fef5835240bf414b54e697e517a160663f4 (patch) | |
| tree | 791f610df2eef6e7534fb23099a29a41dd508329 /drivers/gpu/drm/nouveau/nv50_mpeg.c | |
| parent | 70ad25ab735a016c48183875f657d90d592b773d (diff) | |
| download | lwn-6c320fef5835240bf414b54e697e517a160663f4.tar.gz lwn-6c320fef5835240bf414b54e697e517a160663f4.zip | |
drm/nouveau: pass flag to engine fini() method on suspend
It may not be necessary to fail in certain cases (such as failing to idle)
on module unload, whereas on suspend it's important to ensure a consistent
state can be restored on resume.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_mpeg.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_mpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_mpeg.c b/drivers/gpu/drm/nouveau/nv50_mpeg.c index 1dc5913f78c5..b57a2d180ad2 100644 --- a/drivers/gpu/drm/nouveau/nv50_mpeg.c +++ b/drivers/gpu/drm/nouveau/nv50_mpeg.c @@ -160,7 +160,7 @@ nv50_mpeg_init(struct drm_device *dev, int engine) } static int -nv50_mpeg_fini(struct drm_device *dev, int engine) +nv50_mpeg_fini(struct drm_device *dev, int engine, bool suspend) { /*XXX: context save for s/r */ nv_mask(dev, 0x00b32c, 0x00000001, 0x00000000); |