[igt-dev] [PATCH i-g-t] xe/xe_huc_copy: use IS_TIGERLAKE macro

[Mauro Carvalho Chehab]

On Mon, 3 Apr 2023 23:27:01 -0700
Lucas De Marchi <lucas.demarchi at intel.com> wrote:

> On Tue, Mar 28, 2023 at 10:39:08AM +0200, Mauro Carvalho Chehab wrote:
> >From: Mauro Carvalho Chehab <mchehab at kernel.org>
> >
> >Instead of hardcoding the PCI IDs at the test, use a macro
> >to check if the platform is compatible with the test.
> >
> >Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>  
> 
> neither this or the previous solution scale well. Can we get this info
> from huc_info in debugfs?
> 
> We are already loading HuC in platforms other than TGL

Changing IGT to not use IS_platform macros anymore is not an easy task,
as this is used on lots of place, for both i915 and Xe drivers.

If debugfs can be used for it on both drivers, I guess such macros
could be changed to use huc_info from debugfs. Still, not sure if 
this is worth, specially since I don't think HUC is mandatory at
the i915 driver, and such macros are meant to work with both
drivers.

Regards,
Mauro

> 
> Lucas De Marchi
> 
> >---
> > tests/xe/xe_huc_copy.c | 38 +-------------------------------------
> > 1 file changed, 1 insertion(+), 37 deletions(-)
> >
> >diff --git a/tests/xe/xe_huc_copy.c b/tests/xe/xe_huc_copy.c
> >index ee3896cef8b9..cd68dbb5ac50 100644
> >--- a/tests/xe/xe_huc_copy.c
> >+++ b/tests/xe/xe_huc_copy.c
> >@@ -152,42 +152,6 @@ test_huc_copy(int fd)
> > 	xe_vm_destroy(fd, vm);
> > }
> >
> >-static bool
> >-is_device_supported(int fd)
> >-{
> >-	struct drm_xe_query_config *config;
> >-	struct drm_xe_device_query query = {
> >-		.extensions = 0,
> >-		.query = DRM_XE_DEVICE_QUERY_CONFIG,
> >-		.size = 0,
> >-		.data = 0,
> >-	};
> >-	uint16_t devid;
> >-
> >-	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> >-
> >-	config = malloc(query.size);
> >-	igt_assert(config);
> >-
> >-	query.data = to_user_pointer(config);
> >-	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> >-
> >-	devid = config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff;
> >-	return (
> >-			devid == 0x9A60 ||
> >-			devid == 0x9A68 ||
> >-			devid == 0x9A70 ||
> >-			devid == 0x9A40 ||
> >-			devid == 0x9A49 ||
> >-			devid == 0x9A59 ||
> >-			devid == 0x9A78 ||
> >-			devid == 0x9AC0 ||
> >-			devid == 0x9AC9 ||
> >-			devid == 0x9AD9 ||
> >-			devid == 0x9AF8
> >-		);
> >-}
> >-
> > igt_main
> > {
> > 	int xe;
> >@@ -198,7 +162,7 @@ igt_main
> > 	}
> >
> > 	igt_subtest("huc_copy") {
> >-		igt_skip_on(!is_device_supported(xe));
> >+		igt_skip_on(!IS_TIGERLAKE(intel_get_drm_devid(xe)));
> > 		test_huc_copy(xe);
> > 	}
> >
> >-- 
> >2.39.2
> >