summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2017-06-28 08:24:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-06 18:59:41 -0700
commit34da5f74eb5caf1ae3873463aa5e2b801fa450c3 (patch)
tree2a37fb6f11574118148186e8763e1f09681c68cf
parente41779886b90cf928cdc3e790dd31104fdab00fa (diff)
downloadlinux-stable-34da5f74eb5caf1ae3873463aa5e2b801fa450c3.tar.gz
linux-stable-34da5f74eb5caf1ae3873463aa5e2b801fa450c3.tar.bz2
linux-stable-34da5f74eb5caf1ae3873463aa5e2b801fa450c3.zip
drm/nouveau/disp/nv50-: bump max chans to 21
commit a90e049cacd965dade4dae7263b4d3fd550e78b6 upstream. GP102's cursors go from chan 17..20. Increase the array size to hold their data properly. Fixes: e50fcff15f ("drm/nouveau/disp/gp102: fix cursor/overlay immediate channel indices") Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
index 1e1de6bfe85a..5893be9788d3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
@@ -27,7 +27,7 @@ struct nv50_disp {
u8 type[3];
} pior;
- struct nv50_disp_chan *chan[17];
+ struct nv50_disp_chan *chan[21];
};
int nv50_disp_root_scanoutpos(NV50_DISP_MTHD_V0);