diff options
Diffstat (limited to 'kernel/gsp_sema_service.c')
| -rw-r--r-- | kernel/gsp_sema_service.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/kernel/gsp_sema_service.c b/kernel/gsp_sema_service.c index aeddb7f..4cd2eca 100644 --- a/kernel/gsp_sema_service.c +++ b/kernel/gsp_sema_service.c @@ -9808,7 +9808,7 @@ static u32 svc_gl_vs_log; * call; capture the last observed payload (3 words) so the booter can * replay it before the DRAW_IAB. The census scans every beef push. */ -static u32 svc_gl_vs_call[3]; +static u32 svc_gl_vs_call[5]; static u8 svc_gl_vs_call_ok; static u32 svc_gl_vs_call_log; @@ -9819,6 +9819,8 @@ bool gsp_sema_gl_vs_call(u32 out[3]) out[0] = READ_ONCE(svc_gl_vs_call[0]); out[1] = READ_ONCE(svc_gl_vs_call[1]); out[2] = READ_ONCE(svc_gl_vs_call[2]); + out[3] = READ_ONCE(svc_gl_vs_call[3]); + out[4] = READ_ONCE(svc_gl_vs_call[4]); return true; } @@ -10971,11 +10973,16 @@ static void svc_gl_field(u32 addr, u32 count, const u8 *data, u32 dlen) if (addr == 0x3810u) { u32 k; - for (k = 1; k < count && k < 4u; k++) { + /* + * [stream, end_hi, end_lo, base_hi, base_lo]: collect the + * 32-bit end/base words (v[2], v[4]) - the base page carries + * the vertex payload. + */ + for (k = 2; k < count && k < 5u; k++) { u32 w = v[k]; if (w >= 0x100000u && w < 0x1000000000ULL && - !(w & 3u)) + !(w & 3u) && (k == 2u || k == 4u)) svc_gl_add_ptr((u64)w); } return; @@ -18362,7 +18369,7 @@ static void svc_mme_census(const u8 *buf, u32 len, u64 push_va, u32 h_object) (addr >= 0x1c00u && addr <= 0x1cf8u) || (addr >= 0x3400u && addr <= 0x34fcu) || (addr >= 0x3800u && addr <= 0x39fcu)) { - u32 v0 = 0, v1 = 0, v2 = 0; + u32 v0 = 0, v1 = 0, v2 = 0, v3 = 0, v4 = 0; if (off + 8 <= len) memcpy(&v0, buf + off + 4, 4); @@ -18370,23 +18377,29 @@ static void svc_mme_census(const u8 *buf, u32 len, u64 push_va, u32 h_object) memcpy(&v1, buf + off + 8, 4); if (off + 16 <= len) memcpy(&v2, buf + off + 12, 4); + if (off + 20 <= len) + memcpy(&v3, buf + off + 16, 4); + if (off + 24 <= len) + memcpy(&v4, buf + off + 20, 4); /* * eng77: remember the VERTEX_STREAM_TURING * CALL_MME_MACRO(2) payload (the VTG stream state * the DRAW window slices omit). */ - if (addr == 0x3810u && off + 16 <= len) { + if (addr == 0x3810u && off + 24 <= len) { bool changed = !READ_ONCE(svc_gl_vs_call_ok) || - READ_ONCE(svc_gl_vs_call[2]) != v2; + READ_ONCE(svc_gl_vs_call[4]) != v4; WRITE_ONCE(svc_gl_vs_call[0], v0); WRITE_ONCE(svc_gl_vs_call[1], v1); WRITE_ONCE(svc_gl_vs_call[2], v2); + WRITE_ONCE(svc_gl_vs_call[3], v3); + WRITE_ONCE(svc_gl_vs_call[4], v4); WRITE_ONCE(svc_gl_vs_call_ok, 1); if (changed && svc_gl_vs_call_log < 8u) { svc_gl_vs_call_log++; - pr_info("sema-gl: VS-CALL 0x3810 payload=%08x,%08x,%08x\n", - v0, v1, v2); + pr_info("sema-gl: VS-CALL 0x3810 payload=%08x,%08x,%08x,%08x,%08x\n", + v0, v1, v2, v3, v4); } } lc += scnprintf(line + lc, sizeof(line) - lc, |
