Skip to content

Commit 5bb5258

Browse files
committed
drm/xe/tests: Add pre-GMDID IP descriptors to param generators
Recently introduced kunit parameter generators were based on the existing arrays which have only GDMID-based IPs and didn't take into account IP definitions from pre-GMDID era. Add test only arrays with pre-GMDID IPs (as those will not change) and extend param generators to start iterating over them. [ ] =================== xe_pci (2 subtests) ==================== [ ] ==================== check_graphics_ip ==================== [ ] [PASSED] 12.00 Xe_LP [ ] [PASSED] 12.10 Xe_LP+ [ ] [PASSED] 12.55 Xe_HPG [ ] [PASSED] 12.60 Xe_HPC [ ] [PASSED] 12.70 Xe_LPG [ ] [PASSED] 12.71 Xe_LPG [ ] [PASSED] 12.74 Xe_LPG+ [ ] [PASSED] 20.01 Xe2_HPG [ ] [PASSED] 20.02 Xe2_HPG [ ] [PASSED] 20.04 Xe2_LPG [ ] [PASSED] 30.00 Xe3_LPG [ ] [PASSED] 30.01 Xe3_LPG [ ] [PASSED] 30.03 Xe3_LPG [ ] ================ [PASSED] check_graphics_ip ================ [ ] ===================== check_media_ip ====================== [ ] [PASSED] 12.00 Xe_M [ ] [PASSED] 12.55 Xe_HPM [ ] [PASSED] 13.00 Xe_LPM+ [ ] [PASSED] 13.01 Xe2_HPM [ ] [PASSED] 20.00 Xe2_LPM [ ] [PASSED] 30.00 Xe3_LPM [ ] [PASSED] 30.02 Xe3_LPM [ ] ================= [PASSED] check_media_ip ================== [ ] ===================== [PASSED] xe_pci ====================== Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://lore.kernel.org/r/20250916171645.3335-1-michal.wajdeczko@intel.com
1 parent aaae483 commit 5bb5258

File tree

1 file changed

+35
-0
lines changed

1 file changed

+35
-0
lines changed

drivers/gpu/drm/xe/tests/xe_pci.c

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,27 @@ static void xe_ip_kunit_desc(const struct xe_ip *param, char *desc)
204204
param->verx100 / 100, param->verx100 % 100, param->name);
205205
}
206206

207+
/*
208+
* Pre-GMDID Graphics and Media IPs definitions.
209+
*
210+
* Mimic the way GMDID IPs are declared so the same
211+
* param generator can be used for both
212+
*/
213+
static const struct xe_ip pre_gmdid_graphics_ips[] = {
214+
graphics_ip_xelp,
215+
graphics_ip_xelpp,
216+
graphics_ip_xehpg,
217+
graphics_ip_xehpc,
218+
};
219+
220+
static const struct xe_ip pre_gmdid_media_ips[] = {
221+
media_ip_xem,
222+
media_ip_xehpm,
223+
};
224+
225+
KUNIT_ARRAY_PARAM(pre_gmdid_graphics_ip, pre_gmdid_graphics_ips, xe_ip_kunit_desc);
226+
KUNIT_ARRAY_PARAM(pre_gmdid_media_ip, pre_gmdid_media_ips, xe_ip_kunit_desc);
227+
207228
KUNIT_ARRAY_PARAM(graphics_ip, graphics_ips, xe_ip_kunit_desc);
208229
KUNIT_ARRAY_PARAM(media_ip, media_ips, xe_ip_kunit_desc);
209230

@@ -232,6 +253,13 @@ KUNIT_ARRAY_PARAM(pci_id, pciidlist, xe_pci_id_kunit_desc);
232253
*/
233254
const void *xe_pci_graphics_ip_gen_param(const void *prev, char *desc)
234255
{
256+
const void *next = pre_gmdid_graphics_ip_gen_params(prev, desc);
257+
258+
if (next)
259+
return next;
260+
if (is_insidevar(prev, pre_gmdid_graphics_ips))
261+
prev = NULL;
262+
235263
return graphics_ip_gen_params(prev, desc);
236264
}
237265
EXPORT_SYMBOL_IF_KUNIT(xe_pci_graphics_ip_gen_param);
@@ -249,6 +277,13 @@ EXPORT_SYMBOL_IF_KUNIT(xe_pci_graphics_ip_gen_param);
249277
*/
250278
const void *xe_pci_media_ip_gen_param(const void *prev, char *desc)
251279
{
280+
const void *next = pre_gmdid_media_ip_gen_params(prev, desc);
281+
282+
if (next)
283+
return next;
284+
if (is_insidevar(prev, pre_gmdid_media_ips))
285+
prev = NULL;
286+
252287
return media_ip_gen_params(prev, desc);
253288
}
254289
EXPORT_SYMBOL_IF_KUNIT(xe_pci_media_ip_gen_param);

0 commit comments

Comments
 (0)