vgsp: chan alloc/refusal diagnostics (PROMOTE_CTX probe benign); attribution: r958 windows were Xorg init; harness DISPLAY regression fixed; init window retires 2 consecutive cycles (SESSION 153 r962)

2 files changed, 38 insertions, 1 deletions

diff --git a/kernel/gsp_rm_emulation.c b/kernel/gsp_rm_emulation.c
index 7b7e230..fc94b7d 100644
--- a/kernel/gsp_rm_emulation.c
+++ b/kernel/gsp_rm_emulation.c
@@ -3143,6 +3143,24 @@ static void gsp_rm_register_channel(struct gsp_emu_context *ctx, u32 h_object,
 	memcpy(&desc.notifier_as, params + GSPRM_CHAN_NOTIFIER_MEM +
 	       GSPRM_CHAN_MEM_APERTURE, 4);
 
+	/*
+	 * SESSION 153-CONTINUED-15 (draw attribution): every channel-class
+	 * allocation is named with its wire shape before registration, so a
+	 * channel the service silently refuses (gpfifo VA 0 / entries < 2)
+	 * cannot hide behind an absent "registered" line. Bounded.
+	 */
+	{
+		static u32 chan_alloc_log;
+
+		if (chan_alloc_log < 32) {
+			chan_alloc_log++;
+			pr_info("vgsp-rm: chan alloc hObject=0x%x gpfifo=0x%llx ent=%u eng=%u vas=0x%x cid=%u userd=0x%llx/%u notif=0x%llx/%u\n",
+				h_object, desc.gpfifo_va, desc.gpfifo_entries,
+				desc.engine_type, desc.h_vaspace, desc.cid,
+				desc.userd_pa, desc.userd_as,
+				desc.notifier_pa, desc.notifier_as);
+		}
+	}
 	gsp_sema_service_channel_add(&desc);
 }
 
diff --git a/kernel/gsp_sema_service.c b/kernel/gsp_sema_service.c
index 6d2bee7..f15f1d2 100644
--- a/kernel/gsp_sema_service.c
+++ b/kernel/gsp_sema_service.c
@@ -1639,8 +1639,27 @@ void gsp_sema_service_channel_add(const struct sema_channel_desc *desc)
 	int i;
 
 	if (!desc || !desc->h_object || !desc->gpfifo_va ||
-	    desc->gpfifo_entries < 2)
+	    desc->gpfifo_entries < 2) {
+		/*
+		 * SESSION 153-CONTINUED-15 (draw attribution): a refused
+		 * channel registration used to be silent, so a real client
+		 * channel with an empty gpfifo VA looked identical to a
+		 * channel that was never allocated. Name every refusal.
+		 */
+		static u32 refuse_log;
+
+		if (refuse_log < 32) {
+			refuse_log++;
+			pr_info("sema-svc: chan add REFUSED h=0x%x gpfifo=0x%llx ent=%u eng=%u userd=0x%llx/%u\n",
+				desc ? desc->h_object : 0,
+				desc ? desc->gpfifo_va : 0,
+				desc ? desc->gpfifo_entries : 0,
+				desc ? desc->engine_type : 0,
+				desc ? desc->userd_pa : 0,
+				desc ? desc->userd_as : 0);
+		}
 		return;
+	}
 	if (!desc->engine_type) {
 		WRITE_ONCE(svc_gr_content_rearm, true);
 		svc_cepin_log = 0;