Commit d2989b53 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Ben Skeggs

drm/nvc0/gr: fix gpc firmware regression

"drm/nve0-/gr: some new gpc registers can have multiple copies"
5ee86c41 caused a regression for nvc0, because the bit indicating last
transfer has occured was no longer set, resulting in random system lockups.
Reported-by: default avatarRonald Uitermark <ronald645@gmail.com>
Tested-by: default avatarRonald Uitermark <ronald645@gmail.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 1bb3f6a2
...@@ -352,6 +352,9 @@ ctx_xfer: ...@@ -352,6 +352,9 @@ ctx_xfer:
// per-TPC mmio context // per-TPC mmio context
xbit $r10 $flags $p1 // direction xbit $r10 $flags $p1 // direction
#if !NV_PGRAPH_GPCX_UNK__SIZE
or $r10 4 // last
#endif
mov $r11 0x4000 mov $r11 0x4000
sethi $r11 0x500000 // base = NV_PGRAPH_GPC0_TPC0 sethi $r11 0x500000 // base = NV_PGRAPH_GPC0_TPC0
ld b32 $r12 D[$r0 + #gpc_id] ld b32 $r12 D[$r0 + #gpc_id]
......
...@@ -400,26 +400,26 @@ uint32_t nvc0_grgpc_code[] = { ...@@ -400,26 +400,26 @@ uint32_t nvc0_grgpc_code[] = {
0x0d98000c, 0x0d98000c,
0x00e7f001, 0x00e7f001,
0x016621f5, 0x016621f5,
0xf101acf0, 0xf001acf0,
0xf04000b7, 0xb7f104a5,
0x0c9850b3, 0xb3f04000,
0x0fc4b604, 0x040c9850,
0x9800bcbb, 0xbb0fc4b6,
0x0d98010c, 0x0c9800bc,
0x060f9802, 0x020d9801,
0x0800e7f1, 0xf1060f98,
0x016621f5, 0xf50800e7,
0x021521f5, 0xf5016621,
0xf40601f4, 0xf4021521,
/* 0x0532: ctx_xfer_post */ 0x12f40601,
0x17f11412, /* 0x0535: ctx_xfer_post */
0x13f04afc, 0xfc17f114,
0x0d27f002, 0x0213f04a,
0xf50012d0, 0xd00d27f0,
/* 0x0543: ctx_xfer_done */ 0x21f50012,
0xf5021521, /* 0x0546: ctx_xfer_done */
0xf8047921, 0x21f50215,
0x00000000, 0x00f80479,
0x00000000, 0x00000000,
0x00000000, 0x00000000,
0x00000000, 0x00000000,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment