diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2017-03-18 21:53:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-21 03:31:19 -0400 |
| commit | b29a17524bc11e4a8b0a688eae535491bac18001 (patch) | |
| tree | 23ba270a8e9388c74a6526fffd954a2f005ceac1 /drivers/gpu/drm | |
| parent | 975a7ea950c6d9bcb3666505c6ca9df9b404105c (diff) | |
drm/nouveau/mpeg: mthd returns true on success now
commit 83bce9c2baa51e439480a713119a73d3c8b61083 upstream.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Fixes: 590801c1a3 ("drm/nouveau/mpeg: remove dependence on namedb/engctx lookup")
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c index 003ac915eaad..8a8895246d26 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | |||
| @@ -198,7 +198,7 @@ nv31_mpeg_intr(struct nvkm_engine *engine) | |||
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | if (type == 0x00000010) { | 200 | if (type == 0x00000010) { |
| 201 | if (!nv31_mpeg_mthd(mpeg, mthd, data)) | 201 | if (nv31_mpeg_mthd(mpeg, mthd, data)) |
| 202 | show &= ~0x01000000; | 202 | show &= ~0x01000000; |
| 203 | } | 203 | } |
| 204 | } | 204 | } |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c index e536f37e24b0..c3cf02ed468e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | |||
| @@ -172,7 +172,7 @@ nv44_mpeg_intr(struct nvkm_engine *engine) | |||
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | if (type == 0x00000010) { | 174 | if (type == 0x00000010) { |
| 175 | if (!nv44_mpeg_mthd(subdev->device, mthd, data)) | 175 | if (nv44_mpeg_mthd(subdev->device, mthd, data)) |
| 176 | show &= ~0x01000000; | 176 | show &= ~0x01000000; |
| 177 | } | 177 | } |
| 178 | } | 178 | } |
