DC states IGT misc

cover

 tests/i915/i915_pm_dc.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)
2.25.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/i915/i915_pm_dc.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
index afcc10bc..d27ba0a7 100644
@@ -39,6 +39,8 @@
 #define CHECK_DC6	(1 << 1)
 #define CHECK_DC3CO	(1 << 2)
 
+#define PWR_DOMAIN_INFO "i915_power_domain_info"
+
 typedef struct {
 	double r, g, b;
 } color_t;

@@ -48,6 +50,7 @@ typedef struct {
 	int msr_fd;
 	int debugfs_fd;
 	uint32_t devid;
+	char *pwr_dmn_info;
 	igt_display_t display;
 	struct igt_fb fb_white, fb_rgb, fb_rgr;
 	enum psr_mode op_psr_mode;

@@ -57,7 +60,7 @@ typedef struct {
 } data_t;
 
 static bool dc_state_wait_entry(int drm_fd, int dc_flag, int prev_dc_count);
-static void check_dc_counter(int drm_fd, int dc_flag, uint32_t prev_dc_count);
+static void check_dc_counter(data_t *data, int dc_flag, uint32_t prev_dc_count);
 
 static void setup_output(data_t *data)
 {

@@ -203,14 +206,15 @@ static bool dc_state_wait_entry(int debugfs_fd, int dc_flag, int prev_dc_count)
 			prev_dc_count, 3000, 100);
 }
 
-static void check_dc_counter(int debugfs_fd, int dc_flag, uint32_t prev_dc_count)
+static void check_dc_counter(data_t *data, int dc_flag, uint32_t prev_dc_count)
 {
 	char tmp[64];
 
 	snprintf(tmp, sizeof(tmp), "%s", dc_flag & CHECK_DC3CO ? "DC3CO" :
 		(dc_flag & CHECK_DC5 ? "DC5" : "DC6"));
-	igt_assert_f(dc_state_wait_entry(debugfs_fd, dc_flag, prev_dc_count),
-		     "%s state is not achieved\n", tmp);
+	igt_assert_f(dc_state_wait_entry(data->debugfs_fd, dc_flag, prev_dc_count),
+		     "%s state is not achieved\n%s:\n%s\n", tmp, PWR_DOMAIN_INFO,
+		     data->pwr_dmn_info = igt_sysfs_get(data->debugfs_fd, PWR_DOMAIN_INFO));
 }
 
 static void setup_videoplayback(data_t *data)

@@ -256,7 +260,7 @@ static void check_dc3co_with_videoplayback_like_load(data_t *data)
 		usleep(delay);
 	}
 
-	check_dc_counter(data->debugfs_fd, CHECK_DC3CO, dc3co_prev_cnt);
+	check_dc_counter(data, CHECK_DC3CO, dc3co_prev_cnt);
 }
 
 static void require_dc_counter(int debugfs_fd, int dc_flag)

@@ -311,7 +315,7 @@ static void test_dc_state_psr(data_t *data, int dc_flag)
 	setup_output(data);
 	setup_primary(data);
 	igt_assert(psr_wait_entry(data->debugfs_fd, data->op_psr_mode));
-	check_dc_counter(data->debugfs_fd, dc_flag, dc_counter_before_psr);
+	check_dc_counter(data, dc_flag, dc_counter_before_psr);
 	cleanup_dc_psr(data);
 }
 

@@ -372,7 +376,7 @@ static void test_dc_state_dpms(data_t *data, int dc_flag)
 	setup_dc_dpms(data);
 	dc_counter = read_dc_counter(data->debugfs_fd, dc_flag);
 	dpms_off(data);
-	check_dc_counter(data->debugfs_fd, dc_flag, dc_counter);
+	check_dc_counter(data, dc_flag, dc_counter);
 	dpms_on(data);
 	cleanup_dc_dpms(data);
 }

@@ -441,6 +445,7 @@ int main(int argc, char *argv[])
 	}
 
 	igt_fixture {
+		free(data.pwr_dmn_info);
 		close(data.debugfs_fd);
 		close(data.msr_fd);
 		display_fini(&data);

2.25.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/i915/i915_pm_dc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
index d27ba0a7..2dd6191d 100644
@@ -397,7 +397,6 @@ int main(int argc, char *argv[])
 		igt_require(igt_setup_runtime_pm(data.drm_fd));
 		igt_require(igt_pm_dmc_loaded(data.debugfs_fd));
 		igt_display_require(&data.display, data.drm_fd);
-		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		/* Make sure our Kernel supports MSR and the module is loaded */
 		igt_require(igt_kmod_load("msr", NULL) == 0);
 

@@ -409,12 +408,14 @@ int main(int argc, char *argv[])
 	igt_describe("In this test we make sure that system enters DC3CO "
 		     "when PSR2 is active and system is in SLEEP state");
 	igt_subtest("dc3co-vpb-simulation") {
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_2));
 		test_dc3co_vpb_simulation(&data);
 	}
 
 	igt_describe("This test validates display engine entry to DC5 state "
 		     "while PSR is active");
 	igt_subtest("dc5-psr") {
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		data.op_psr_mode = PSR_MODE_1;
 		psr_enable(data.debugfs_fd, data.op_psr_mode);
 		test_dc_state_psr(&data, CHECK_DC5);

@@ -423,6 +424,7 @@ int main(int argc, char *argv[])
 	igt_describe("This test validates display engine entry to DC6 state "
 		     "while PSR is active");
 	igt_subtest("dc6-psr") {
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		data.op_psr_mode = PSR_MODE_1;
 		psr_enable(data.debugfs_fd, data.op_psr_mode);
 		igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.msr_fd),

2.25.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

DC states IGT misc

Anshuman Gupta

Anshuman Gupta

Anshuman Gupta

Patchwork

Patchwork

Anshuman Gupta

Vudum, Lakshminarayana

Souza, Jose

Souza, Jose

Anshuman Gupta

Souza, Jose

Anshuman Gupta

Patchwork