diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-13 09:56:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-13 09:56:05 +1000 |
| commit | 2ca62d8a606a95e098799f128f6a40a6300d2a2a (patch) | |
| tree | 0d266e0abab449ea1a07b04f6f9e591e4c8bcac3 /drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | |
| parent | 88b0b92bdaadfc43b11dc4172219ff0972673790 (diff) | |
| parent | da2ba564a6dcf46df4f828624ff55531ff11d5b0 (diff) | |
| download | blackbird-op-linux-2ca62d8a606a95e098799f128f6a40a6300d2a2a.tar.gz blackbird-op-linux-2ca62d8a606a95e098799f128f6a40a6300d2a2a.zip | |
Merge branch 'linux-4.11' of git://github.com/skeggsb/linux into drm-fixes
GP107 modesetting support (just recognising the chipset, no other changes until 4.12)
a couple of regression fixes, one of them a rather serious double-free issue that appeared in 4.10.
* 'linux-4.11' of git://github.com/skeggsb/linux:
drm/nouveau: initial support (display-only) for GP107
drm/nouveau/kms/nv50: fix double dma_fence_put() when destroying plane state
drm/nouveau/kms/nv50: fix setting of HeadSetRasterVertBlankDmi method
drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
drm/nouveau/mpeg: mthd returns true on success now
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 2 |
1 files changed, 1 insertions, 1 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) } if (type == 0x00000010) { - if (!nv31_mpeg_mthd(mpeg, mthd, data)) + if (nv31_mpeg_mthd(mpeg, mthd, data)) show &= ~0x01000000; } } |
