[igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_pm_rpm: Add XE support

[Swati Sharma]

Add XE driver support.

Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
---
 tests/intel/kms_pm_rpm.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/intel/kms_pm_rpm.c b/tests/intel/kms_pm_rpm.c
index a46735875..14f34d904 100644
--- a/tests/intel/kms_pm_rpm.c
+++ b/tests/intel/kms_pm_rpm.c
@@ -11,7 +11,7 @@
  * TEST: kms pm rpm
  * Category: Display
  * Description: Test to validate Runtime PM
- * Driver requirement: i915
+ * Driver requirement: i915, xe
  * Functionality: pm_rpm
  * Mega feature: Display Power Management
  * Test category: functionality test
@@ -37,6 +37,8 @@
 #include "igt_kmod.h"
 #include "igt_sysfs.h"
 #include "intel_blt.h"
+#include "xe/xe_ioctl.h"
+#include "xe/xe_query.h"
 
 /**
  * SUBTEST: basic-pci-d3-state
@@ -738,7 +740,7 @@ static bool setup_environment(void)
 	if (has_runtime_pm)
 		goto out;
 
-	drm_fd = __drm_open_driver(DRIVER_INTEL);
+	drm_fd = __drm_open_driver(DRIVER_INTEL | DRIVER_XE);
 	igt_require(drm_fd != -1);
 	igt_device_set_master(drm_fd);
 
@@ -1108,6 +1110,7 @@ static bool device_in_pci_d3(struct pci_device *pci_dev)
 static void pci_d3_state_subtest(void)
 {
 	struct pci_device *pci_dev, *bridge_pci_dev;
+	bool is_dgfx;
 
 	igt_require(has_runtime_pm);
 
@@ -1117,7 +1120,8 @@ static void pci_d3_state_subtest(void)
 	disable_all_screens_and_wait(&ms_data);
 	igt_assert(igt_wait(device_in_pci_d3(pci_dev), 2000, 100));
 
-	if (gem_has_lmem(drm_fd))
+	is_dgfx = is_xe_device(drm_fd) ? xe_has_vram(drm_fd) : gem_has_lmem(drm_fd);
+	if (is_dgfx)
 		igt_require_f(pci_device_has_kernel_driver(bridge_pci_dev),
 			      "pci bridge device does not bind with pcieport driver\n");
 
@@ -1164,7 +1168,11 @@ static void fill_igt_fb(struct igt_fb *fb, uint32_t color)
 	int i;
 	uint32_t *ptr;
 
-	ptr = gem_mmap__device_coherent(drm_fd, fb->gem_handle, 0, fb->size, PROT_WRITE);
+	if (is_xe_device(fb->fd))
+		ptr = xe_bo_mmap_ext(drm_fd, fb->gem_handle, fb->size, PROT_WRITE);
+	else
+		ptr = gem_mmap__device_coherent(drm_fd, fb->gem_handle, 0, fb->size, PROT_WRITE);
+
 	for (i = 0; i < fb->size/sizeof(uint32_t); i++)
 		ptr[i] = color;
 	igt_assert(munmap(ptr, fb->size) == 0);
@@ -1654,10 +1662,12 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 	igt_subtest("dpms-mode-unset-non-lpsp")
 		dpms_mode_unset_subtest(SCREEN_TYPE_NON_LPSP);
 	igt_subtest("fences") {
+		igt_require_i915(drm_fd);
 		gem_require_mappable_ggtt(drm_fd);
 		fences_subtest(false);
 	}
 	igt_subtest("fences-dpms") {
+		igt_require_i915(drm_fd);
 		gem_require_mappable_ggtt(drm_fd);
 		fences_subtest(true);
 	}
@@ -1685,10 +1695,12 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 
 	/* power-wake reference tests */
 	igt_subtest("pm-tiling") {
+		igt_require_i915(drm_fd);
 		gem_require_mappable_ggtt(drm_fd);
 		pm_test_tiling();
 	}
 	igt_subtest("pm-caching") {
+		igt_require_i915(drm_fd);
 		gem_require_mappable_ggtt(drm_fd);
 		pm_test_caching();
 	}
-- 
2.25.1