[igt-dev] [PATCH i-g-t v2 0/5] Added new test file pm_dc.c.

[igt-dev] [PATCH i-g-t v2 0/5] Added new test file pm_dc.c.

[Jyoti Yadav]

This patch series adds new tests to validate Display C states.
DC states like DC5 and DC6 are validated during PSR entry/exit
and during DPMS on/off cycle.


Jyoti Yadav (5):
  [intel--gfx][igt-dev] lib/igt_pm: Moves Dmc_loaded() function into
    library.
  [intel-gfx][igt-dev] tests/pm_dc : Added new test to verify Display C
    States.
  [intel-gfx][igt-dev] tests/pm_dc: Added test for DC6 during PSR.
  [intel-gfx][igt-dev] tests/pm_dc: Added test for DC5 during DPMS.
  [intel-gfx][igt-dev] tests/pm_dc: Added test for DC6 during DPMS.

 lib/igt_pm.c           |  28 ++++++
 lib/igt_pm.h           |   1 +
 tests/Makefile.sources |   1 +
 tests/meson.build      |   1 +
 tests/pm_dc.c          | 259 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/pm_rpm.c         |  17 +---
 6 files changed, 291 insertions(+), 16 deletions(-)
 create mode 100644 tests/pm_dc.c

-- 
1.9.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t v2 1/5] [intel--gfx] lib/igt_pm: Moves Dmc_loaded() function into library.

[Jyoti Yadav]

It will be used by new test pm_dc.c which will validate Display C States.
So moving the same to igt_pm libraray.

Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
---
 lib/igt_pm.c   | 28 ++++++++++++++++++++++++++++
 lib/igt_pm.h   |  1 +
 tests/pm_rpm.c | 17 +----------------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/lib/igt_pm.c b/lib/igt_pm.c
index 4902723..9242127 100644
--- a/lib/igt_pm.c
+++ b/lib/igt_pm.c
@@ -38,6 +38,7 @@
 #include "drmtest.h"
 #include "igt_pm.h"
 #include "igt_aux.h"
+#include "igt_sysfs.h"
 
 /**
  * SECTION:igt_pm
@@ -620,3 +621,30 @@ bool igt_wait_for_pm_status(enum igt_runtime_pm_status status)
 {
 	return igt_wait(igt_get_runtime_pm_status() == status, 10000, 100);
 }
+
+/**
+ * dmc_loaded:
+ * @debugfs : It is an Fd to the debugfs dir.
+
+ * Check whether DMC FW is loaded or not. DMC FW is require for few Display C
+ * states like DC5 and DC6. FW does the Context Save and Restore during Display
+ * C States entry and exit.
+ *
+ * Returns:
+ * True if DMC FW is loaded otherwise false.
+ */
+bool igt_pm_dmc_loaded(int debugfs)
+{
+	igt_require(debugfs != -1);
+	char buf[15];
+	int len;
+
+	len = igt_sysfs_read(debugfs, "i915_dmc_info", buf, sizeof(buf) - 1);
+	if (len < 0)
+		return true; /* no CSR support, no DMC requirement */
+
+	buf[len] = '\0';
+
+	igt_info("DMC: %s\n", buf);
+	return strstr(buf, "fw loaded: yes");
+}
diff --git a/lib/igt_pm.h b/lib/igt_pm.h
index 10cc679..70d2380 100644
--- a/lib/igt_pm.h
+++ b/lib/igt_pm.h
@@ -50,5 +50,6 @@ bool igt_setup_runtime_pm(void);
 void igt_restore_runtime_pm(void);
 enum igt_runtime_pm_status igt_get_runtime_pm_status(void);
 bool igt_wait_for_pm_status(enum igt_runtime_pm_status status);
+bool igt_pm_dmc_loaded(int debugfs);
 
 #endif /* IGT_PM_H */
diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
index c24fd95..fae6750 100644
--- a/tests/pm_rpm.c
+++ b/tests/pm_rpm.c
@@ -693,21 +693,6 @@ static void setup_pc8(void)
 	has_pc8 = true;
 }
 
-static bool dmc_loaded(void)
-{
-	char buf[15];
-	int len;
-
-	len = igt_sysfs_read(debugfs, "i915_dmc_info", buf, sizeof(buf) - 1);
-	if (len < 0)
-	    return true; /* no CSR support, no DMC requirement */
-
-	buf[len] = '\0';
-
-	igt_info("DMC: %s\n", buf);
-	return strstr(buf, "fw loaded: yes");
-}
-
 static bool setup_environment(void)
 {
 	if (has_runtime_pm)
@@ -730,7 +715,7 @@ static bool setup_environment(void)
 	igt_info("Runtime PM support: %d\n", has_runtime_pm);
 	igt_info("PC8 residency support: %d\n", has_pc8);
 	igt_require(has_runtime_pm);
-	igt_require(dmc_loaded());
+	igt_require(igt_pm_dmc_loaded(debugfs));
 
 out:
 	disable_all_screens(&ms_data);
-- 
1.9.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t v2 3/5] [intel-gfx] tests/pm_dc: Added test for DC6 during PSR.

[Jyoti Yadav]

This patch add subtest to check DC6 entry on PSR for the supported
platforms.

Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
---
 tests/pm_dc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/pm_dc.c b/tests/pm_dc.c
index 4125d83..98e011f 100644
--- a/tests/pm_dc.c
+++ b/tests/pm_dc.c
@@ -208,6 +208,13 @@ int main(int argc, char *argv[])
 		test_dc_state_psr(&data);
 		cleanup(&data);
 	}
+
+	igt_subtest("dc6-psr") {
+		data.dc_flags |= CHECK_DC6;
+		test_dc_state_psr(&data);
+		cleanup(&data);
+	}
+
 	igt_fixture {
 		close(data.debugfs_fd);
 		display_fini(&data);
-- 
1.9.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t v2 4/5] [intel-gfx] tests/pm_dc: Added test for DC5 during DPMS.

[Jyoti Yadav]

Added new subtest for DC5 entry during DPMS on/off cycle.
During DPMS on/off cycle DC5 counter is incremented.

Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
---
 tests/pm_dc.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/pm_dc.c b/tests/pm_dc.c
index 98e011f..dac6035 100644
--- a/tests/pm_dc.c
+++ b/tests/pm_dc.c
@@ -180,6 +180,29 @@ static void test_dc_state_psr(data_t *data)
 	check_dc_counter(data, dc_counter_before_psr);
 }
 
+static void dpms_off_on(data_t *data)
+{
+	for (int i = 0; i < data->display.n_outputs; i++) {
+		kmstest_set_connector_dpms(data->drm_fd, data->display.outputs[i].config.connector,
+					   DRM_MODE_DPMS_OFF);
+	}
+	igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
+	for (int i = 0; i < data->display.n_outputs; i++) {
+		kmstest_set_connector_dpms(data->drm_fd, data->display.outputs[i].config.connector,
+				   DRM_MODE_DPMS_ON);
+	}
+	igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_ACTIVE));
+}
+
+static void test_dc_state_dpms(data_t *data)
+{
+	uint32_t dc_counter;
+
+	dc_counter = read_dc_counter(data->drm_fd, data->dc_flags);
+	dpms_off_on(data);
+	check_dc_counter(data, dc_counter);
+}
+
 int main(int argc, char *argv[])
 {
 	data_t data = {};
@@ -215,6 +238,12 @@ int main(int argc, char *argv[])
 		cleanup(&data);
 	}
 
+	igt_subtest("dc5-dpms") {
+		data.dc_flags |= CHECK_DC5;
+		test_dc_state_dpms(&data);
+		cleanup(&data);
+	}
+
 	igt_fixture {
 		close(data.debugfs_fd);
 		display_fini(&data);
-- 
1.9.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t v2 5/5] [intel-gfx] tests/pm_dc: Added test for DC6 during DPMS.

[Jyoti Yadav]

Added new subtest for DC6 entry during DPMS on/off cycle.
During DPMS on/off cycle DC6 counter is incremented.

Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
---
 tests/pm_dc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/pm_dc.c b/tests/pm_dc.c
index dac6035..cb0aed7 100644
--- a/tests/pm_dc.c
+++ b/tests/pm_dc.c
@@ -244,6 +244,12 @@ int main(int argc, char *argv[])
 		cleanup(&data);
 	}
 
+	igt_subtest("dc6-dpms") {
+		data.dc_flags |= CHECK_DC6;
+		test_dc_state_dpms(&data);
+		cleanup(&data);
+	}
+
 	igt_fixture {
 		close(data.debugfs_fd);
 		display_fini(&data);
-- 
1.9.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for Added new test file pm_dc.c. (rev2)

[Patchwork]

== Series Details ==

Series: Added new test file pm_dc.c. (rev2)
URL   : https://patchwork.freedesktop.org/series/50229/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4958 -> IGTPW_1932 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/50229/revisions/2/mbox/

== Known issues ==

  Here are the changes found in IGTPW_1932 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_chamelium@dp-edid-read:
      fi-kbl-7500u:       PASS -> FAIL (fdo#103841)

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-peppy:       PASS -> DMESG-WARN (fdo#102614)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-byt-clapper:     PASS -> FAIL (fdo#107362, fdo#103191) +1
      fi-blb-e6850:       PASS -> INCOMPLETE (fdo#107718)

    
    ==== Possible fixes ====

    igt@pm_rpm@basic-pci-d3-state:
      fi-skl-6600u:       FAIL (fdo#107707) -> PASS

    igt@prime_vgem@basic-fence-flip:
      fi-ilk-650:         FAIL (fdo#104008) -> PASS

    
  fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
  fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
  fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
  fdo#107707 https://bugs.freedesktop.org/show_bug.cgi?id=107707
  fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718


== Participating hosts (48 -> 41) ==

  Missing    (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-snb-2520m fi-ctg-p8600 


== Build changes ==

    * IGT: IGT_4672 -> IGTPW_1932

  CI_DRM_4958: 9990e1665029dc2ef4a9c0632b8a2f516263e595 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_1932: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1932/
  IGT_4672: 4497591d2572831a9f07fd9e48a2571bfcffe354 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools



== Testlist changes ==

+igt@pm_dc@dc5-dpms
+igt@pm_dc@dc5-psr
+igt@pm_dc@dc6-dpms
+igt@pm_dc@dc6-psr

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1932/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.IGT: success for Added new test file pm_dc.c. (rev2)

[Patchwork]

== Series Details ==

Series: Added new test file pm_dc.c. (rev2)
URL   : https://patchwork.freedesktop.org/series/50229/
State : success

== Summary ==

= CI Bug Log - changes from IGT_4672_full -> IGTPW_1932_full =

== Summary - WARNING ==

  Minor unknown changes coming with IGTPW_1932_full need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_1932_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/50229/revisions/2/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in IGTPW_1932_full:

  === IGT changes ===

    ==== Warnings ====

    igt@pm_rc6_residency@rc6-accuracy:
      shard-snb:          PASS -> SKIP

    
== Known issues ==

  Here are the changes found in IGTPW_1932_full that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_hangman@error-state-capture-vebox:
      shard-snb:          SKIP -> INCOMPLETE (fdo#105411)

    igt@kms_color@pipe-a-legacy-gamma:
      shard-apl:          PASS -> FAIL (fdo#108145, fdo#104782) +1

    igt@kms_cursor_crc@cursor-128x128-suspend:
      shard-apl:          PASS -> FAIL (fdo#103232, fdo#103191)

    igt@kms_cursor_crc@cursor-256x256-dpms:
      shard-glk:          PASS -> FAIL (fdo#103232) +1
      shard-kbl:          PASS -> FAIL (fdo#103232)

    igt@kms_cursor_crc@cursor-256x256-random:
      shard-apl:          PASS -> FAIL (fdo#103232) +2

    igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
      shard-glk:          PASS -> DMESG-WARN (fdo#105763, fdo#106538)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc:
      shard-glk:          PASS -> FAIL (fdo#103167) +7

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
      shard-kbl:          PASS -> FAIL (fdo#103167) +2

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
      shard-apl:          PASS -> FAIL (fdo#103167) +4

    igt@kms_plane@plane-position-covered-pipe-b-planes:
      shard-glk:          PASS -> FAIL (fdo#103166) +2

    {igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max}:
      shard-glk:          PASS -> FAIL (fdo#108145)
      shard-kbl:          PASS -> FAIL (fdo#108145)
      shard-apl:          PASS -> FAIL (fdo#108145)

    igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
      shard-kbl:          PASS -> FAIL (fdo#103166) +1

    igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
      shard-apl:          PASS -> FAIL (fdo#103166) +3

    igt@kms_rotation_crc@primary-rotation-180:
      shard-snb:          NOTRUN -> FAIL (fdo#103925)

    
    ==== Possible fixes ====

    igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
      shard-apl:          DMESG-WARN (fdo#107956) -> PASS

    igt@kms_cursor_crc@cursor-256x256-sliding:
      shard-glk:          FAIL (fdo#103232) -> PASS +3

    igt@kms_cursor_crc@cursor-64x64-suspend:
      shard-glk:          INCOMPLETE (fdo#103359, k.org#198133) -> PASS
      shard-apl:          FAIL (fdo#103232, fdo#103191) -> PASS

    igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
      shard-hsw:          FAIL (fdo#105767) -> PASS

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
      shard-snb:          INCOMPLETE (fdo#105411) -> PASS

    igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-wc:
      shard-glk:          FAIL (fdo#103167) -> PASS +1

    igt@kms_plane@plane-position-covered-pipe-a-planes:
      shard-glk:          FAIL (fdo#103166) -> PASS +2

    igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
      shard-apl:          FAIL (fdo#103166) -> PASS +2

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS

    
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
  fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
  fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
  fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
  fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
  fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
  fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
  fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
  fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
  fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
  k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133


== Participating hosts (6 -> 5) ==

  Missing    (1): shard-skl 


== Build changes ==

    * IGT: IGT_4672 -> IGTPW_1932
    * Linux: CI_DRM_4952 -> CI_DRM_4958

  CI_DRM_4952: a62e43ba13605a478b22307ea1790d48aea029a6 @ git://anongit.freedesktop.org/gfx-ci/linux
  CI_DRM_4958: 9990e1665029dc2ef4a9c0632b8a2f516263e595 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_1932: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1932/
  IGT_4672: 4497591d2572831a9f07fd9e48a2571bfcffe354 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1932/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 1/5] [intel--gfx] lib/igt_pm: Moves Dmc_loaded() function into library.

[Imre Deak]

No need for a '.' at the end of the subject line.

On Wed, Oct 10, 2018 at 08:01:44AM -0400, Jyoti Yadav wrote:
> It will be used by new test pm_dc.c which will validate Display C States.
> So moving the same to igt_pm libraray.

Please check spelling everywhere.

> 
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
> ---
>  lib/igt_pm.c   | 28 ++++++++++++++++++++++++++++
>  lib/igt_pm.h   |  1 +
>  tests/pm_rpm.c | 17 +----------------
>  3 files changed, 30 insertions(+), 16 deletions(-)
> 
> diff --git a/lib/igt_pm.c b/lib/igt_pm.c
> index 4902723..9242127 100644
> --- a/lib/igt_pm.c
> +++ b/lib/igt_pm.c
> @@ -38,6 +38,7 @@
>  #include "drmtest.h"
>  #include "igt_pm.h"
>  #include "igt_aux.h"
> +#include "igt_sysfs.h"
>  
>  /**
>   * SECTION:igt_pm
> @@ -620,3 +621,30 @@ bool igt_wait_for_pm_status(enum igt_runtime_pm_status status)
>  {
>  	return igt_wait(igt_get_runtime_pm_status() == status, 10000, 100);
>  }
> +
> +/**
> + * dmc_loaded:
> + * @debugfs : It is an Fd to the debugfs dir.

No need for the space before ':' and you can just state what each
parameter is instead of a full sentence, so

	@debugfs: fd to debugfs dir

> +
> + * Check whether DMC FW is loaded or not. DMC FW is require for few Display C
> + * states like DC5 and DC6. FW does the Context Save and Restore during Display
> + * C States entry and exit.
> + *
> + * Returns:
> + * True if DMC FW is loaded otherwise false.
> + */
> +bool igt_pm_dmc_loaded(int debugfs)
> +{
> +	igt_require(debugfs != -1);
> +	char buf[15];
> +	int len;
> +
> +	len = igt_sysfs_read(debugfs, "i915_dmc_info", buf, sizeof(buf) - 1);
> +	if (len < 0)
> +		return true; /* no CSR support, no DMC requirement */
> +
> +	buf[len] = '\0';
> +
> +	igt_info("DMC: %s\n", buf);
> +	return strstr(buf, "fw loaded: yes");
> +}
> diff --git a/lib/igt_pm.h b/lib/igt_pm.h
> index 10cc679..70d2380 100644
> --- a/lib/igt_pm.h
> +++ b/lib/igt_pm.h
> @@ -50,5 +50,6 @@ bool igt_setup_runtime_pm(void);
>  void igt_restore_runtime_pm(void);
>  enum igt_runtime_pm_status igt_get_runtime_pm_status(void);
>  bool igt_wait_for_pm_status(enum igt_runtime_pm_status status);
> +bool igt_pm_dmc_loaded(int debugfs);
>  
>  #endif /* IGT_PM_H */
> diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
> index c24fd95..fae6750 100644
> --- a/tests/pm_rpm.c
> +++ b/tests/pm_rpm.c
> @@ -693,21 +693,6 @@ static void setup_pc8(void)
>  	has_pc8 = true;
>  }
>  
> -static bool dmc_loaded(void)
> -{
> -	char buf[15];
> -	int len;
> -
> -	len = igt_sysfs_read(debugfs, "i915_dmc_info", buf, sizeof(buf) - 1);
> -	if (len < 0)
> -	    return true; /* no CSR support, no DMC requirement */
> -
> -	buf[len] = '\0';
> -
> -	igt_info("DMC: %s\n", buf);
> -	return strstr(buf, "fw loaded: yes");
> -}
> -
>  static bool setup_environment(void)
>  {
>  	if (has_runtime_pm)
> @@ -730,7 +715,7 @@ static bool setup_environment(void)
>  	igt_info("Runtime PM support: %d\n", has_runtime_pm);
>  	igt_info("PC8 residency support: %d\n", has_pc8);
>  	igt_require(has_runtime_pm);
> -	igt_require(dmc_loaded());
> +	igt_require(igt_pm_dmc_loaded(debugfs));
>  
>  out:
>  	disable_all_screens(&ms_data);
> -- 
> 1.9.1
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 2/5] [intel-gfx] tests/pm_dc : Added new test to verify Display C States.

[Imre Deak]

Extra space after ':' in the subject line.

On Wed, Oct 10, 2018 at 08:01:45AM -0400, Jyoti Yadav wrote:
> Currently this test validate DC5 upon PSR entry for supported platforms.
> Added new file for compilation inside Makefile and Meson.
> 
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
> ---
>  tests/Makefile.sources |   1 +
>  tests/meson.build      |   1 +
>  tests/pm_dc.c          | 217 +++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 219 insertions(+)
>  create mode 100644 tests/pm_dc.c
> 
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index c84933f..d491420 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -214,6 +214,7 @@ TESTS_progs = \
>  	pm_lpsp \
>  	pm_rc6_residency \
>  	pm_rpm \
> +	pm_dc \
>  	pm_rps \
>  	pm_sseu \
>  	prime_busy \
> diff --git a/tests/meson.build b/tests/meson.build
> index 17deb94..50b0687 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -188,6 +188,7 @@ test_progs = [
>  	'pm_lpsp',
>  	'pm_rc6_residency',
>  	'pm_rpm',
> +	'pm_dc',
>  	'pm_rps',
>  	'pm_sseu',
>  	'prime_busy',
> diff --git a/tests/pm_dc.c b/tests/pm_dc.c
> new file mode 100644
> index 0000000..4125d83
> --- /dev/null
> +++ b/tests/pm_dc.c
> @@ -0,0 +1,217 @@
> +/*
> + * Copyright © 2018 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt.h"
> +#include "igt_sysfs.h"
> +#include "igt_psr.h"
> +#include <errno.h>
> +#include <stdbool.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include "intel_bufmgr.h"
> +#include "intel_io.h"
> +
> +
> +typedef struct {
> +	int drm_fd;
> +	int debugfs_fd;
> +	uint32_t devid;
> +	igt_display_t display;
> +	struct igt_fb fb_white;
> +	drmModeModeInfo *mode;
> +	igt_output_t *output;
> +	int dc_flags;
> +} data_t;
> +
> +bool has_runtime_pm;

Can't see the above used outside of main().

> +/* DC State Flags */
> +#define CHECK_DC5	1
> +#define CHECK_DC6	2
> +
> +static void setup_output(data_t *data)
> +{
> +	igt_display_t *display = &data->display;
> +	igt_output_t *output;
> +	enum pipe pipe;
> +
> +	for_each_pipe_with_valid_output(display, pipe, output) {
> +		drmModeConnectorPtr c = output->config.connector;
> +
> +		if (c->connector_type != DRM_MODE_CONNECTOR_eDP)
> +			continue;
> +
> +		igt_output_set_pipe(output, pipe);
> +		data->output = output;
> +		data->mode = igt_output_get_mode(output);
> +
> +		return;
> +	}
> +}
> +
> +static void display_init(data_t *data)
> +{
> +	igt_display_init(&data->display, data->drm_fd);
> +	setup_output(data);
> +}
> +
> +static void display_fini(data_t *data)
> +{
> +	igt_display_fini(&data->display);
> +}
> +
> +static bool sink_support(data_t *data)

The function name should reflect what it really checks.

> +{
> +	char buf[512];
> +
> +	igt_debugfs_simple_read(data->debugfs_fd, "i915_edp_psr_status",
> +			 buf, sizeof(buf));
> +
> +	return strstr(buf, "Sink_Support: yes\n");
> +}
> +
> +static void cleanup(data_t *data)
> +{
> +	igt_plane_t *primary;
> +
> +	primary = igt_output_get_plane_type(data->output,
> +					    DRM_PLANE_TYPE_PRIMARY);
> +	igt_plane_set_fb(primary, NULL);
> +	igt_display_commit(&data->display);
> +	igt_remove_fb(data->drm_fd, &data->fb_white);
> +}
> +
> +static void setup_primary(data_t *data)
> +{
> +	igt_plane_t *primary;
> +
> +	primary = igt_output_get_plane_type(data->output,
> +					    DRM_PLANE_TYPE_PRIMARY);
> +	igt_plane_set_fb(primary, NULL);
> +	igt_create_color_fb(data->drm_fd,
> +			    data->mode->hdisplay, data->mode->vdisplay,
> +			    DRM_FORMAT_XRGB8888,
> +			    LOCAL_I915_FORMAT_MOD_X_TILED,
> +			    1.0, 1.0, 1.0,
> +			    &data->fb_white);
> +	igt_display_commit(&data->display);
> +
> +	igt_plane_set_fb(primary, &data->fb_white);
> +	igt_display_commit(&data->display);
> +}
> +
> +static uint32_t get_dc_counter(char *dc_data)
> +{
> +	/* store the DC string till new line inside array */
> +	char buf[20];
> +	int i = 0;
> +	char *token;
> +	unsigned int counter;
> +
> +	while (dc_data[i] != '\n') {
> +		buf[i] = dc_data[i];
> +		i++;
> +	}
> +	buf[i] = '\0';
> +	token = strtok(buf, ":");
> +	token = strtok(NULL, ":");
> +	counter = strtoul(token, NULL, 10);
> +	return counter;
> +}

The following would be safer:

	char *s = strchr(dc_data, ':');
	char *e;
	long ret;

	assert(s);
	s++;
	ret = strtol(s, &e, 10);
	assert(((ret != LONG_MIN && ret != LONG_MAX) || errno != ERANGE) &&
	       (ret != 0 || errno =) &&
	       e > s && *e == '\n' &&
	       ret >= 0);

	return ret;


> +
> +static uint32_t read_dc_counter(uint32_t drm_fd, int dc_flags)
> +{
> +	char buf[4096];
> +	char *str;
> +
> +	igt_debugfs_read(drm_fd, "i915_dmc_info", buf);
> +	igt_skip_on(buf[0] == '\0');

This can't happen since we skip the test if dmc_loaded() returns false.

> +	if (dc_flags & CHECK_DC5)
> +		str = strstr(buf, "DC3 -> DC5 count");
> +	else if (dc_flags & CHECK_DC6)
> +		str = strstr(buf, "DC5 -> DC6 count");
> +	igt_assert(str);
> +	return get_dc_counter(str);
> +}
> +
> +bool dc_state_wait_entry(data_t *data, int prev_dc_count)
> +{
> +	return igt_wait(read_dc_counter(data->drm_fd, data->dc_flags) > prev_dc_count, 5000, 100);

I think 5 second would already point to some problem, the 1 second
suggested by DK seems ok to me.

> +}
> +
> +void check_dc_counter(data_t *data, uint32_t prev_dc_count)
> +{
> +	if (data->dc_flags & CHECK_DC5) {
> +		igt_assert_f(dc_state_wait_entry(data, prev_dc_count),
> +				"DC5 state is not achieved\n");
> +	} else if (data->dc_flags & CHECK_DC6) {
> +		igt_assert_f(dc_state_wait_entry(data, prev_dc_count),
> +				"DC6 state is not achieved\n");
> +	}

	igt_assert_f(dc_state_wait_entry(data, prev_dc_count),
		     "DC%d state is not achieved\n",
		     data->dc_flags & CHECK_DC5 ? 5 : 6);

would be simpler to read.

> +}
> +
> +static void test_dc_state_psr(data_t *data)
> +{
> +	uint32_t dc_counter_before_psr;
> +
> +	dc_counter_before_psr = read_dc_counter(data->drm_fd, data->dc_flags);
> +	setup_primary(data);
> +	igt_assert(psr_wait_entry(data->debugfs_fd));
> +	check_dc_counter(data, dc_counter_before_psr);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> +	data_t data = {};
> +
> +	igt_skip_on_simulation();
> +	igt_subtest_init(argc, argv);
> +	igt_fixture {
> +		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> +		data.debugfs_fd = igt_debugfs_dir(data.drm_fd);
> +		igt_require(data.debugfs_fd != -1);
> +		kmstest_set_vt_graphics_mode();
> +		data.devid = intel_get_drm_devid(data.drm_fd);
> +		psr_enable(data.debugfs_fd);
> +		has_runtime_pm = igt_setup_runtime_pm();
> +		igt_info("Runtime PM support: %d\n", has_runtime_pm);
> +		igt_require(has_runtime_pm);
> +		igt_require(igt_pm_dmc_loaded(data.debugfs_fd));
> +
> +		igt_require_f(sink_support(&data),
> +			      "Sink does not support PSR\n");

Would be clearer to put the above and psr_enable() to the relevant
subtests.

> +		display_init(&data);
> +	}
> +
> +	igt_subtest("dc5-psr") {
> +		data.dc_flags |= CHECK_DC5;

You could just pass the flag directly to the test function.

> +		test_dc_state_psr(&data);
> +		cleanup(&data);
> +	}
> +	igt_fixture {
> +		close(data.debugfs_fd);
> +		display_fini(&data);
> +	}
> +
> +	igt_exit();
> +}
> -- 
> 1.9.1
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 3/5] [intel-gfx] tests/pm_dc: Added test for DC6 during PSR.

[Imre Deak]

On Wed, Oct 10, 2018 at 08:01:46AM -0400, Jyoti Yadav wrote:
> This patch add subtest to check DC6 entry on PSR for the supported
> platforms.
> 
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
> ---
>  tests/pm_dc.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/tests/pm_dc.c b/tests/pm_dc.c
> index 4125d83..98e011f 100644
> --- a/tests/pm_dc.c
> +++ b/tests/pm_dc.c
> @@ -208,6 +208,13 @@ int main(int argc, char *argv[])
>  		test_dc_state_psr(&data);
>  		cleanup(&data);
>  	}
> +
> +	igt_subtest("dc6-psr") {
> +		data.dc_flags |= CHECK_DC6;
> +		test_dc_state_psr(&data);

The subtest should be skipped on platforms without a DC6 counter. You
could check upfront the available counters and skip each DC5/DC6
subtests accordingly.

> +		cleanup(&data);
> +	}
> +
>  	igt_fixture {
>  		close(data.debugfs_fd);
>  		display_fini(&data);
> -- 
> 1.9.1
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev