diff options
| -rw-r--r-- | kernel/gsp_phys_booter.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c index a1fefa9..deb8adc 100644 --- a/kernel/gsp_phys_booter.c +++ b/kernel/gsp_phys_booter.c @@ -19445,6 +19445,7 @@ static void gsp_phys_gr_mme_release_save(const struct gsp_phys_gr_submit *req, struct gsp_phys_gr_mme_release_state *s = &gsp_phys_gr_mme_release; unsigned long flags; bool draw_ia, keep = false; + bool call2; const char *prefer = NULL; u32 old_h = 0, old_win = 0; u32 vs_pre[24]; @@ -19470,6 +19471,7 @@ static void gsp_phys_gr_mme_release_save(const struct gsp_phys_gr_submit *req, } draw_ia = gsp_phys_gr_mme_window_has_draw_ia(req->stream, req->stream_n); + call2 = gsp_phys_gr_mme_window_has_call2(req->stream, req->stream_n); gsp_phys_gr_mme_call_census(req, held, win_n); spin_lock_irqsave(&gsp_phys_gr_mme_release_lock, flags); /* @@ -19479,7 +19481,17 @@ static void gsp_phys_gr_mme_release_save(const struct gsp_phys_gr_submit *req, * released or consumed record is never protected, so the no-DRAW_IAB * case keeps the historical last-held-window-wins behaviour. */ - if (s->valid && !s->consumed && s->draw_ia && !draw_ia) { + /* + * eng80: the window that carries the client's VERTEX_STREAM_TURING + * CALL(2) (0x3810) supplies the VTG stream state; prefer it over a + * DRAW-only window without the call, even when the latter is the + * smaller draw window (c835: the 151-word draw window lacks the + * 0x3810 call; the 247-word state window carries it and slot 34). + */ + if (s->valid && !s->consumed && call2 && + !gsp_phys_gr_mme_window_has_call2(s->win, s->stream_n)) { + keep = false; + } else if (s->valid && !s->consumed && s->draw_ia && !draw_ia) { old_h = s->h_object; old_win = s->win_n; keep = true; |
