[PATCH] tests/intel/kms: Drop unneeded igt_device_set_master calls

[Jonathan Cavitt <jonathan.cavitt@intel.com>]

In kms_fbcon_fbt, igt_set_device_master is already called on the target
fd by drm_open_driver_master, so doing so again in the subtest function
is unnecessary.

In kms_pm_rpm, we call __drm_open_driver and igt_set_device_master while
asserting the return of the former is not -1.  This is already
accomplished by drm_open_driver_master, which also has additional guards
in place for i915, so just call that instead.

Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
---
 tests/intel/kms_fbcon_fbt.c | 1 -
 tests/intel/kms_pm_rpm.c    | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/intel/kms_fbcon_fbt.c b/tests/intel/kms_fbcon_fbt.c
index 36de84f985..e44be15f60 100644
--- a/tests/intel/kms_fbcon_fbt.c
+++ b/tests/intel/kms_fbcon_fbt.c
@@ -371,7 +371,6 @@ static void restore_fbcon(struct drm_info *drm)
 
 static void subtest(struct drm_info *drm, struct feature *feature, bool suspend)
 {
-	igt_device_set_master(drm->fd);
 	kmstest_set_vt_graphics_mode();
 
 	igt_require(feature->supported_on_chipset(drm->fd, drm->debugfs_fd));
diff --git a/tests/intel/kms_pm_rpm.c b/tests/intel/kms_pm_rpm.c
index 5f24fd49b1..e16218ceeb 100644
--- a/tests/intel/kms_pm_rpm.c
+++ b/tests/intel/kms_pm_rpm.c
@@ -750,9 +750,7 @@ static bool setup_environment(void)
 	if (has_runtime_pm)
 		goto out;
 
-	drm_fd = __drm_open_driver(DRIVER_INTEL | DRIVER_XE);
-	igt_require(drm_fd != -1);
-	igt_device_set_master(drm_fd);
+	drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_XE);
 
 	debugfs = igt_debugfs_dir(drm_fd);
 	igt_require(debugfs != -1);
-- 
2.43.0