]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/xe/tests: Fix build break on clang 16.0.6
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Mon, 22 Sep 2025 10:12:07 +0000 (12:12 +0200)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 3 Oct 2025 04:57:51 +0000 (21:57 -0700)
The following error was reported when building with clang 16.0.6:

   In file included from drivers/gpu/drm/xe/xe_pci.c:1104:
>> drivers/gpu/drm/xe/tests/xe_pci.c:214:2: error: initializer \
   element is not a compile-time constant
           graphics_ip_xelp,
           ^~~~~~~~~~~~~~~~
   drivers/gpu/drm/xe/tests/xe_pci.c:221:2: error: initializer \
   element is not a compile-time constant
           media_ip_xem,
           ^~~~~~~~~~~~
   2 errors generated.

Fix that by explicit re-definition of pre-GMDID IPs, as there are
not so many of them.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202509192041.tQwdE4DS-lkp@intel.com/
Fixes: 5bb5258e357e ("drm/xe/tests: Add pre-GMDID IP descriptors to param generators")
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250922101207.192028-1-michal.wajdeczko@intel.com
(cherry picked from commit 2de80e2da74b402a9d838b8e729cd01cf94cdcbc)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/tests/xe_pci.c

index aa29ac759d5db27c0360b585a026a6a07d2f5616..0f136bc85b76104d78e4f577f0fd8fe663b6fddc 100644 (file)
@@ -211,15 +211,15 @@ static void xe_ip_kunit_desc(const struct xe_ip *param, char *desc)
  * param generator can be used for both
  */
 static const struct xe_ip pre_gmdid_graphics_ips[] = {
-       graphics_ip_xelp,
-       graphics_ip_xelpp,
-       graphics_ip_xehpg,
-       graphics_ip_xehpc,
+       { 1200, "Xe_LP", &graphics_xelp },
+       { 1210, "Xe_LP+", &graphics_xelp },
+       { 1255, "Xe_HPG", &graphics_xehpg },
+       { 1260, "Xe_HPC", &graphics_xehpc },
 };
 
 static const struct xe_ip pre_gmdid_media_ips[] = {
-       media_ip_xem,
-       media_ip_xehpm,
+       { 1200, "Xe_M", &media_xem },
+       { 1255, "Xe_HPM", &media_xem },
 };
 
 KUNIT_ARRAY_PARAM(pre_gmdid_graphics_ip, pre_gmdid_graphics_ips, xe_ip_kunit_desc);