drm/nv50: sync up gr data error names with rnn, use for nvc0 also

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index e81575687354571e9c395250217c5f1f388fe00d..6d749b7920883fe10f78a92de398c7c9b3387d7b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -1189,6 +1189,7 @@ extern int  nv50_graph_unload_context(struct drm_device *);
 extern int  nv50_grctx_init(struct nouveau_grctx *);
 extern void nv50_graph_tlb_flush(struct drm_device *dev);
 extern void nv86_graph_tlb_flush(struct drm_device *dev);
+extern struct nouveau_enum nv50_data_error_names[];
 
 /* nvc0_graph.c */
 extern int  nvc0_graph_init(struct drm_device *);

diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index c510e74acf4d5c87706da1d9292dd7d2bd021c29..2d7ea75a09d49deb0f21f9228828dd58c7663c47 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -554,13 +554,48 @@ static struct nouveau_bitfield nv50_graph_trap_ccache[] = {
 };
 
 /* There must be a *lot* of these. Will take some time to gather them up. */
-static struct nouveau_enum nv50_data_error_names[] = {
-       { 4,    "INVALID_VALUE" },
-       { 5,    "INVALID_ENUM" },
-       { 8,    "INVALID_OBJECT" },
-       { 0xc,  "INVALID_BITFIELD" },
-       { 0x28, "MP_NO_REG_SPACE" },
-       { 0x2b, "MP_BLOCK_SIZE_MISMATCH" },
+struct nouveau_enum nv50_data_error_names[] = {
+       { 0x00000003, "INVALID_QUERY_OR_TEXTURE" },
+       { 0x00000004, "INVALID_VALUE" },
+       { 0x00000005, "INVALID_ENUM" },
+       { 0x00000008, "INVALID_OBJECT" },
+       { 0x00000009, "READ_ONLY_OBJECT" },
+       { 0x0000000a, "SUPERVISOR_OBJECT" },
+       { 0x0000000b, "INVALID_ADDRESS_ALIGNMENT" },
+       { 0x0000000c, "INVALID_BITFIELD" },
+       { 0x0000000d, "BEGIN_END_ACTIVE" },
+       { 0x0000000e, "SEMANTIC_COLOR_BACK_OVER_LIMIT" },
+       { 0x0000000f, "VIEWPORT_ID_NEEDS_GP" },
+       { 0x00000010, "RT_DOUBLE_BIND" },
+       { 0x00000011, "RT_TYPES_MISMATCH" },
+       { 0x00000012, "RT_LINEAR_WITH_ZETA" },
+       { 0x00000015, "FP_TOO_FEW_REGS" },
+       { 0x00000016, "ZETA_FORMAT_CSAA_MISMATCH" },
+       { 0x00000017, "RT_LINEAR_WITH_MSAA" },
+       { 0x00000018, "FP_INTERPOLANT_START_OVER_LIMIT" },
+       { 0x00000019, "SEMANTIC_LAYER_OVER_LIMIT" },
+       { 0x0000001a, "RT_INVALID_ALIGNMENT" },
+       { 0x0000001b, "SAMPLER_OVER_LIMIT" },
+       { 0x0000001c, "TEXTURE_OVER_LIMIT" },
+       { 0x0000001e, "GP_TOO_MANY_OUTPUTS" },
+       { 0x0000001f, "RT_BPP128_WITH_MS8" },
+       { 0x00000021, "Z_OUT_OF_BOUNDS" },
+       { 0x00000023, "XY_OUT_OF_BOUNDS" },
+       { 0x00000027, "CP_MORE_PARAMS_THAN_SHARED" },
+       { 0x00000028, "CP_NO_REG_SPACE_STRIPED" },
+       { 0x00000029, "CP_NO_REG_SPACE_PACKED" },
+       { 0x0000002a, "CP_NOT_ENOUGH_WARPS" },
+       { 0x0000002b, "CP_BLOCK_SIZE_MISMATCH" },
+       { 0x0000002c, "CP_NOT_ENOUGH_LOCAL_WARPS" },
+       { 0x0000002d, "CP_NOT_ENOUGH_STACK_WARPS" },
+       { 0x0000002e, "CP_NO_BLOCKDIM_LATCH" },
+       { 0x00000031, "ENG2D_FORMAT_MISMATCH" },
+       { 0x0000003f, "PRIMITIVE_ID_NEEDS_GP" },
+       { 0x00000044, "SEMANTIC_VIEWPORT_OVER_LIMIT" },
+       { 0x00000045, "SEMANTIC_COLOR_FRONT_OVER_LIMIT" },
+       { 0x00000046, "LAYER_ID_NEEDS_GP" },
+       { 0x00000047, "SEMANTIC_CLIP_OVER_LIMIT" },
+       { 0x00000048, "SEMANTIC_PTSZ_OVER_LIMIT" },
        {}
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index 8352d6b92cca2f347e5c5a31aa14198caab1c5a3..43b44a4b3ab88b0b35c627c5d8dbbf754bc79128 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -693,11 +693,6 @@ nvc0_graph_init(struct drm_device *dev)
        return 0;
 }
 
-static struct nouveau_enum nvc0_graph_data_error[] = {
-       { 5, "INVALID_ENUM" },
-       {}
-};
-
 static int
 nvc0_graph_isr_chid(struct drm_device *dev, u64 inst)
 {
@@ -750,7 +745,7 @@ nvc0_graph_isr(struct drm_device *dev)
 
        if (stat & 0x00100000) {
                NV_INFO(dev, "PGRAPH: DATA_ERROR [");
-               nouveau_enum_print(nvc0_graph_data_error, code);
+               nouveau_enum_print(nv50_data_error_names, code);
                printk("] ch %d [0x%010llx] subc %d class 0x%04x "
                       "mthd 0x%04x data 0x%08x\n",
                       chid, inst, subc, class, mthd, data);