libhsakmt: Update HsaQueueInfo for GetQueueInfo

hsaKmtGetQueueInfo needs to return the control stack size, and the
wave state size for the debugger.  These changes are needed to support
returning the new values.

Change-Id: Ib4c60e0ea34446c06aef4a86996250989f348a69
Signed-off-by: Philip Cox <Philip.Cox@amd.com>

src/queues.c

@@ -373,9 +373,12 @@ static bool update_ctx_save_restore_size(uint32_t nodeid, struct queue *q)
 
 		ctl_stack_size = cu_num * WAVES_PER_CU_VI * 8 + 8;
 		wg_data_size = cu_num * WG_CONTEXT_DATA_SIZE_PER_CU_VI;
-		q->ctl_stack_size = PAGE_ALIGN_UP(ctl_stack_size);
-		q->ctx_save_restore_size = q->ctl_stack_size + PAGE_ALIGN_UP(wg_data_size);
 
+		q->ctl_stack_size = PAGE_ALIGN_UP(ctl_stack_size
+					+ sizeof(HsaUserContextSaveAreaHeader));
+
+		q->ctx_save_restore_size = q->ctl_stack_size
+					+ PAGE_ALIGN_UP(wg_data_size);
 		return true;
 	}
 	return false;
@@ -767,6 +770,7 @@ hsaKmtGetQueueInfo(
 	QueueInfo->CUMaskInfo = q->cu_mask;
 	QueueInfo->QueueDetailError = 0;
 	QueueInfo->QueueTypeExtended = 0;
+	QueueInfo->SaveAreaHeader = q->ctx_save_restore;
 
 	return HSAKMT_STATUS_SUCCESS;
 }