From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 16 Mar 2023 20:01:02 +0000 (+0200)
Subject: intel/dev: fold Gfx12 URB entries in Gfx12 HW info
X-Git-Tag: upstream/23.3.3~11240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7941db652e9308a5db70e403111941a73eb95cee;p=platform%2Fupstream%2Fmesa.git

intel/dev: fold Gfx12 URB entries in Gfx12 HW info

Also add a non-zero URB size for intel_stub_gpu

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21949>
---

diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 5234895..8057988 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -928,18 +928,6 @@ static const struct intel_device_info intel_device_info_ehl_2x4 = {
    .max_eus_per_subslice = 4,
 };
 
-#define GFX12_URB_MIN_MAX_ENTRIES                   \
-   .min_entries = {                                 \
-      [MESA_SHADER_VERTEX]    = 64,                 \
-      [MESA_SHADER_TESS_EVAL] = 34,                 \
-   },                                               \
-   .max_entries = {                                 \
-      [MESA_SHADER_VERTEX]    = 3576,               \
-      [MESA_SHADER_TESS_CTRL] = 1548,               \
-      [MESA_SHADER_TESS_EVAL] = 3576,               \
-      [MESA_SHADER_GEOMETRY]  = 1548,               \
-   }
-
 #define GFX12_HW_INFO                               \
    .ver = 12,                                       \
    .has_pln = false,                                \
@@ -952,7 +940,17 @@ static const struct intel_device_info intel_device_info_ehl_2x4 = {
    .max_threads_per_psd = 64,                       \
    .max_cs_threads = 112, /* threads per DSS */     \
    .urb = {                                         \
-      GFX12_URB_MIN_MAX_ENTRIES,                    \
+      .size = 512, /* For intel_stub_gpu */         \
+      .min_entries = {                              \
+         [MESA_SHADER_VERTEX]    = 64,              \
+         [MESA_SHADER_TESS_EVAL] = 34,              \
+      },                                            \
+      .max_entries = {                              \
+         [MESA_SHADER_VERTEX]    = 3576,            \
+         [MESA_SHADER_TESS_CTRL] = 1548,            \
+         [MESA_SHADER_TESS_EVAL] = 3576,            \
+         [MESA_SHADER_GEOMETRY]  = 1548,            \
+      },                                            \
    }
 
 #define GFX12_FEATURES(_gt, _slices, _l3)                       \