[PATCH i-g-t] tests/kms: Move kms_plane_scaling to intel directory

[Bhanuprakash Modem <bhanuprakash.modem@intel.com>]

As kms_plane_scaling is limited to run on Intel hw only,
move this test to tests/intel directory.

Cc: Mark Yacoub <markyacoub@chromium.org>
Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/{ => intel}/kms_plane_scaling.c | 6 ++----
 tests/meson.build                     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename tests/{ => intel}/kms_plane_scaling.c (99%)

diff --git a/tests/kms_plane_scaling.c b/tests/intel/kms_plane_scaling.c
similarity index 99%
rename from tests/kms_plane_scaling.c
rename to tests/intel/kms_plane_scaling.c
index acb4a1da1..620dba911 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/intel/kms_plane_scaling.c
@@ -1291,10 +1291,9 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 	enum pipe pipe;
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
+		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_XE);
 		igt_display_require(&data.display, data.drm_fd);
-		data.devid = is_intel_device(data.drm_fd) ?
-			intel_get_drm_devid(data.drm_fd) : 0;
+		data.devid = intel_get_drm_devid(data.drm_fd);
 		igt_require(data.display.is_atomic);
 	}
 
@@ -1464,7 +1463,6 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 		for (int index = 0; index < ARRAY_SIZE(intel_paramtests); index++) {
 			igt_describe("Test for validating max source size.");
 			igt_subtest_with_dynamic(intel_paramtests[index].testname) {
-				igt_require_intel(data.drm_fd);
 				for_each_pipe(&data.display, pipe) {
 					for_each_valid_output_on_pipe(&data.display, pipe, output) {
 						drmModeModeInfo *mode = NULL;
diff --git a/tests/meson.build b/tests/meson.build
index 758ae090c..c53e3bc3c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -47,7 +47,6 @@ test_progs = [
 	'kms_plane_cursor',
 	'kms_plane_lowres',
 	'kms_plane_multiple',
-	'kms_plane_scaling',
 	'kms_prime',
 	'kms_prop_blob',
 	'kms_properties',
@@ -262,6 +261,7 @@ intel_kms_progs = [
 	'kms_legacy_colorkey',
 	'kms_mmap_write_crc',
 	'kms_pipe_b_c_ivb',
+	'kms_plane_scaling',
 	'kms_pm_backlight',
 	'kms_pm_dc',
 	'kms_pm_lpsp',
-- 
2.43.2