diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-04 18:28:26 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-08 00:39:58 -0500 |
commit | 13d2b35a065399fb447c84e80368927e5f8bf086 (patch) | |
tree | f091ede985526c11f2bdd4d6497e5fc5bdd6e896 | |
parent | 0c0888473decef2e06e8ea5d5cb2306501a2f822 (diff) |
drm/nvc0-/gr: fix a number of missing explicit array terminators...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c index e5be3ee7f172..71b4283f7fad 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c | |||
@@ -587,6 +587,7 @@ nvc1_grctx_init_unk58xx[] = { | |||
587 | { 0x405870, 4, 0x04, 0x00000001 }, | 587 | { 0x405870, 4, 0x04, 0x00000001 }, |
588 | { 0x405a00, 2, 0x04, 0x00000000 }, | 588 | { 0x405a00, 2, 0x04, 0x00000000 }, |
589 | { 0x405a18, 1, 0x04, 0x00000000 }, | 589 | { 0x405a18, 1, 0x04, 0x00000000 }, |
590 | {} | ||
590 | }; | 591 | }; |
591 | 592 | ||
592 | static struct nvc0_graph_init | 593 | static struct nvc0_graph_init |
@@ -598,6 +599,7 @@ nvc1_grctx_init_rop[] = { | |||
598 | { 0x408904, 1, 0x04, 0x62000001 }, | 599 | { 0x408904, 1, 0x04, 0x62000001 }, |
599 | { 0x408908, 1, 0x04, 0x00c80929 }, | 600 | { 0x408908, 1, 0x04, 0x00c80929 }, |
600 | { 0x408980, 1, 0x04, 0x0000011d }, | 601 | { 0x408980, 1, 0x04, 0x0000011d }, |
602 | {} | ||
601 | }; | 603 | }; |
602 | 604 | ||
603 | static struct nvc0_graph_init | 605 | static struct nvc0_graph_init |
@@ -671,6 +673,7 @@ nvc1_grctx_init_gpc_0[] = { | |||
671 | { 0x419000, 1, 0x04, 0x00000780 }, | 673 | { 0x419000, 1, 0x04, 0x00000780 }, |
672 | { 0x419004, 2, 0x04, 0x00000000 }, | 674 | { 0x419004, 2, 0x04, 0x00000000 }, |
673 | { 0x419014, 1, 0x04, 0x00000004 }, | 675 | { 0x419014, 1, 0x04, 0x00000004 }, |
676 | {} | ||
674 | }; | 677 | }; |
675 | 678 | ||
676 | static struct nvc0_graph_init | 679 | static struct nvc0_graph_init |
@@ -717,6 +720,7 @@ nvc1_grctx_init_tpc[] = { | |||
717 | { 0x419e98, 1, 0x04, 0x00000000 }, | 720 | { 0x419e98, 1, 0x04, 0x00000000 }, |
718 | { 0x419ee0, 1, 0x04, 0x00011110 }, | 721 | { 0x419ee0, 1, 0x04, 0x00011110 }, |
719 | { 0x419f30, 11, 0x04, 0x00000000 }, | 722 | { 0x419f30, 11, 0x04, 0x00000000 }, |
723 | {} | ||
720 | }; | 724 | }; |
721 | 725 | ||
722 | void | 726 | void |
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c index 438e78410808..c4740d528532 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c | |||
@@ -258,6 +258,7 @@ nvd7_grctx_init_hub[] = { | |||
258 | nvc0_grctx_init_unk78xx, | 258 | nvc0_grctx_init_unk78xx, |
259 | nvc0_grctx_init_unk80xx, | 259 | nvc0_grctx_init_unk80xx, |
260 | nvd9_grctx_init_rop, | 260 | nvd9_grctx_init_rop, |
261 | NULL | ||
261 | }; | 262 | }; |
262 | 263 | ||
263 | struct nvc0_graph_init * | 264 | struct nvc0_graph_init * |
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c index 818a4751df46..a1102cbf2fdc 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c | |||
@@ -466,6 +466,7 @@ nvd9_grctx_init_hub[] = { | |||
466 | nvc0_grctx_init_unk78xx, | 466 | nvc0_grctx_init_unk78xx, |
467 | nvc0_grctx_init_unk80xx, | 467 | nvc0_grctx_init_unk80xx, |
468 | nvd9_grctx_init_rop, | 468 | nvd9_grctx_init_rop, |
469 | NULL | ||
469 | }; | 470 | }; |
470 | 471 | ||
471 | struct nvc0_graph_init * | 472 | struct nvc0_graph_init * |