test: i915_pm_rpm: init devid in setup_envirnoment

Refactor out devid initialization out of init_mode_set_data().
Initialize it in setup_environment().

Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
index d2bce582..383263a1 100644
--- a/tests/i915/i915_pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
@@ -409,7 +409,6 @@ static void init_mode_set_data(struct mode_set_data *data)
 	}
 
 	igt_display_require(&data->display, drm_fd);
-	data->devid = intel_get_drm_devid(drm_fd);
 	init_modeset_cached_params(&ms_data);
 }
 
@@ -797,6 +796,8 @@ static bool setup_environment(bool display_disabled)
 	debugfs = igt_debugfs_dir(drm_fd);
 	igt_require(debugfs != -1);
 
+	ms_data.devid = intel_get_drm_devid(drm_fd);
+
 	if (!display_disabled)
 		init_mode_set_data(&ms_data);