[PATCH 4.12 25/31] drm/nouveau/disp/nv50-: bump max chans to 21

From: Greg Kroah-Hartman
Date: Thu Aug 03 2017 - 19:18:37 EST


4.12-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ilia Mirkin <imirkin@xxxxxxxxxxxx>

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@xxxxxxxxxxxx>
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- 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);