From 02923d768501d596171a3ecaef0946c41aed4423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Fri, 6 May 2022 16:37:27 +0200 Subject: [PATCH] intel/common: allocate space for at least one task urb Fixes: c93cbc77f78 ("intel/common: Add helper for URB allocation in Mesh pipeline") Acked-by: Lionel Landwerlin Part-of: (cherry picked from commit 3dc6a98d78c669b28ee600b9da7086febb859e8f) --- .pick_status.json | 2 +- src/intel/common/intel_urb_config.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 35719bca391..8bb44c8b8d7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -85,7 +85,7 @@ "description": "intel/common: allocate space for at least one task urb", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c93cbc77f78ac4d6c479f657e6f92952fd357211" }, diff --git a/src/intel/common/intel_urb_config.c b/src/intel/common/intel_urb_config.c index 2f7d72cc31f..63dc04cb829 100644 --- a/src/intel/common/intel_urb_config.c +++ b/src/intel/common/intel_urb_config.c @@ -338,7 +338,10 @@ intel_get_mesh_urb_config(const struct intel_device_info *devinfo, task_urb_share = task_urb_share_percentage / 100.0f; } - const unsigned task_urb_kb = ALIGN(total_urb_kb * task_urb_share, 8); + const unsigned one_task_urb_kb = ALIGN(r.task_entry_size_64b * 64, 1024) / 1024; + + const unsigned task_urb_kb = ALIGN(MAX2(total_urb_kb * task_urb_share, one_task_urb_kb), 8); + const unsigned mesh_urb_kb = total_urb_kb - task_urb_kb; /* TODO(mesh): Could we avoid allocating URB for Mesh if rasterization is