Re: [PATCH i-g-t] lib/igt_pm: Move DC State Counter Functions to common library

["Thasleem, Mohammed" <mohammed.thasleem@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 11834 bytes --]


On 08-12-2025 04:01 pm, Thasleem, Mohammed wrote:
>
> -----Original Message-----
> From: B, Jeevan<jeevan.b@intel.com> 
> Sent: 08 December 2025 02:10 PM
> To:igt-dev@lists.freedesktop.org
> Cc: B S, Karthik<karthik.b.s@intel.com>; Thasleem, Mohammed<mohammed.thasleem@intel.com>; B, Jeevan<jeevan.b@intel.com>
> Subject: [PATCH i-g-t] lib/igt_pm: Move DC State Counter Functions to common library
>
> Move DC counter utility functions from tests/intel/kms_pm_dc.c to lib/igt_pm.c for reuse across other tests.
>
> Signed-off-by: Jeevan B<jeevan.b@intel.com>
> ---
>   lib/igt_pm.c            | 169 ++++++++++++++++++++++++++++++++++++++++
>   lib/igt_pm.h            |  15 ++++
>   tests/intel/kms_pm_dc.c | 121 ----------------------------
>   3 files changed, 184 insertions(+), 121 deletions(-)
>
> diff --git a/lib/igt_pm.c b/lib/igt_pm.c index 1ffcdcef3..7873c68a4 100644
> --- a/lib/igt_pm.c
> +++ b/lib/igt_pm.c
> @@ -1543,3 +1543,172 @@ void igt_pm_dpms_toggle(igt_output_t *output)
>   				   DRM_MODE_DPMS_ON);
>   	igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_ACTIVE));
>   }
> +
> +/**
> + * get_dc_counter:
> + * @dc_data: String containing DC counter data in format
> + *
> + * Returns the counter value as uint32_t  */ uint32_t
> +get_dc_counter(char *dc_data) {

*-->Use the 'igt_' prefix before all lib.c/h functions.*


> +	char *e;
> +	long ret;
> +	char *s = strchr(dc_data, ':');
> +
> +	igt_assert(s);
> +	s++;
> +	ret = strtol(s, &e, 10);
> +	igt_assert(((ret != LONG_MIN && ret != LONG_MAX) || errno != ERANGE) &&
> +		   e > s && *e == '\n' && ret >= 0);
> +	return ret;
> +}
> +
> +/**
> + * support_dc6:
> + * @debugfs_fd: DRM file descriptor
> + *
> + * Returns true if DC6 is supported.
> + */
> +bool support_dc6(int debugfs_fd)
> +{
> +	char buf[4096];
> +
> +	igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info",
> +				buf, sizeof(buf));
> +	return strstr(buf, "DC5 -> DC6 count"); }
> +
> +/**
> + * get_dc6_counter:Locate DC6 counter string in debugfs buffer
> + * @buf: Buffer containing i915_dmc_info debugfs output
> + *
> + * Searches for DC6 counter information in the DMC info buffer.
> + */
> +char *get_dc6_counter(const char *buf)
> +{
> +	char *str;
> +
> +	str = strstr(buf, "DC5 -> DC6 count");
> +	if (!str)
> +		str = strstr(buf, "DC5 -> DC6 allowed count");
> +
> +	return str;
> +}
> +
> +/**
> + * read_dc_counter:
> + * @debugfs_fd: DRM file descriptor
> + * @dc_flag: DC state flag (CHECK_DC5, CHECK_DC6, or CHECK_DC3CO)
> + *
> + * Returns current counter value for the specified DC state  */
> +uint32_t read_dc_counter(uint32_t debugfs_fd, int dc_flag) {
> +	char buf[4096];
> +	char *str;
> +
> +	igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info", buf,
> +sizeof(buf));
> +
> +	if (dc_flag & CHECK_DC5) {
> +		str = strstr(buf, "DC3 -> DC5 count");
> +		igt_assert_f(str, "DC5 counter is not available\n");
> +	} else if (dc_flag & CHECK_DC6) {
> +		str = get_dc6_counter(buf);
> +		igt_assert_f(str, "No DC6 counter available\n");
> +	} else if (dc_flag & CHECK_DC3CO) {
> +		str = strstr(buf, "DC3CO count");
> +		igt_assert_f(str, "DC3CO counter is not available\n");
> +	} else {
> +		igt_assert(!"reached");
> +		str = NULL;
> +	}
> +
> +	return get_dc_counter(str);
> +}
> +
> +/**
> + * dc_state_wait_entry:
> + * @debugfs_fd: DRM file descriptor
> + * @dc_flag: DC state flag
> + * @prev_dc_count: Previous counter value to compare against
> + *
> + * Returns true if DC state entry detected within timeout, false
> +otherwise  */ bool dc_state_wait_entry(int debugfs_fd, int dc_flag, int
> +prev_dc_count) {
> +	return igt_wait(read_dc_counter(debugfs_fd, dc_flag) >
> +			prev_dc_count, 3000, 100);
> +}
> +
> +/**
> + * dc_state_name:
> + * @dc_flag: DC state flag
> + *
> + * Converts DC state flag constants to readable string names  */ const
> +char *dc_state_name(int dc_flag) {
> +	if (dc_flag & CHECK_DC3CO)
> +		return "DC3CO";
> +	else if (dc_flag & CHECK_DC5)
> +		return "DC5";
> +	else
> +		return "DC6";
> +}
> +
> +/**
> + * require_dc_counter:
> + * @debugfs_fd: File descriptor for the debugfs
> + * @dc_flag: DC counter type to check (CHECK_DC3CO, CHECK_DC5,
> + * or CHECK_DC6)
> + *
> + * Skips the current test if the requested DC counter is not available
> + * on the system.
> + */
> +void require_dc_counter(int debugfs_fd, int dc_flag) {
> +	char *str;
> +	char buf[4096];
> +
> +	igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info",
> +				buf, sizeof(buf));
> +
> +	switch (dc_flag) {
> +	case CHECK_DC3CO:
> +		igt_skip_on_f(!strstr(buf, "DC3CO count"),
> +			      "DC3CO counter is not available\n");
> +		break;
> +	case CHECK_DC5:
> +		igt_skip_on_f(!strstr(buf, "DC3 -> DC5 count"),
> +			      "DC5 counter is not available\n");
> +		break;
> +	case CHECK_DC6:
> +		str = get_dc6_counter(buf);
> +		igt_skip_on_f(!str, "No DC6 counter available\n");
> +		break;
> +	default:
> +		igt_assert_f(0, "Unknown DC counter %d\n", dc_flag);
> +	}
> +}
> +
> +/**
> + * read_pkgc_counter:
> + * @debugfs_root_fd: File descriptor for the debugfs
> + *
> + * Returns PC10 counter value.
> + */
> +unsigned int read_pkgc_counter(int debugfs_root_fd) {
> +	char buf[4096];
> +	char *str;
> +	int len;
> +
> +	len = igt_sysfs_read(debugfs_root_fd, PACKAGE_CSTATE_PATH, buf, sizeof(buf) - 1);
> +	igt_skip_on_f(len < 0, "PKGC state file not found\n");
> +	buf[len] = '\0';
> +	str = strstr(buf, "Package C10");
> +	igt_skip_on_f(!str, "PKGC10 is not supported.\n");
> +
> +	return get_dc_counter(str);
> +}
> diff --git a/lib/igt_pm.h b/lib/igt_pm.h index e931e51af..2db71e826 100644
> --- a/lib/igt_pm.h
> +++ b/lib/igt_pm.h
> @@ -29,6 +29,13 @@
>   
>   #include "igt_kms.h"
>   
> +#define PACKAGE_CSTATE_PATH  "pmc_core/package_cstate_show"
> +
> +/* DC State Flags */
> +#define CHECK_DC5       (1 << 0)
> +#define CHECK_DC6       (1 << 1)
> +#define CHECK_DC3CO     (1 << 2)
> +
>   void igt_pm_enable_audio_runtime_pm(void);
>   void igt_pm_enable_sata_link_power_management(void);
>   void igt_pm_restore_sata_link_power_management(void);
> @@ -99,5 +106,13 @@ int igt_pm_get_runtime_usage(struct pci_device *pci_dev);  void igt_pm_ignore_slpc_efficient_freq(int i915, int gtfd, bool val);  bool igt_has_pci_pm_capability(struct pci_device *pci_dev);  void igt_pm_dpms_toggle(igt_output_t *output);
> +uint32_t get_dc_counter(char *dc_data); bool support_dc6(int
> +debugfs_fd); char *get_dc6_counter(const char *buf); uint32_t
> +read_dc_counter(uint32_t debugfs_fd, int dc_flag); bool
> +dc_state_wait_entry(int debugfs_fd, int dc_flag, int prev_dc_count);
> +const char *dc_state_name(int dc_flag); void require_dc_counter(int
> +debugfs_fd, int dc_flag); unsigned int read_pkgc_counter(int
> +debugfs_root_fd);
>   
>   #endif /* IGT_PM_H */
> diff --git a/tests/intel/kms_pm_dc.c b/tests/intel/kms_pm_dc.c index 8cdf312f6..226bb753d 100644
> --- a/tests/intel/kms_pm_dc.c
> +++ b/tests/intel/kms_pm_dc.c
> @@ -79,15 +79,9 @@
>    * Description: This test validates display engine entry to DC5 state while PSR is active on Pipe B
>    */
>   
> -/* DC State Flags */
> -#define CHECK_DC5	(1 << 0)
> -#define CHECK_DC6	(1 << 1)
> -#define CHECK_DC3CO	(1 << 2)
> -
>   #define PWR_DOMAIN_INFO "i915_power_domain_info"
>   #define RPM_STATUS "i915_runtime_pm_status"
>   #define KMS_HELPER "/sys/module/drm_kms_helper/parameters/"
> -#define PACKAGE_CSTATE_PATH  "pmc_core/package_cstate_show"
>   #define KMS_POLL_DISABLE 0
>   #define DC9_RESETS_DC_COUNTERS(devid) (!(IS_DG1(devid) || IS_DG2(devid) || intel_display_ver(devid) >= 14))  #define SEC 1 @@ -116,7 +110,6 @@ typedef struct {
>   	bool runtime_suspend_disabled;
>   } data_t;
>   
> -static bool dc_state_wait_entry(int drm_fd, int dc_flag, int prev_dc_count);  static void check_dc_counter(data_t *data, int dc_flag, uint32_t prev_dc_count);
>   
>   static void set_output_on_pipe_b(data_t *data) @@ -260,70 +253,6 @@ static void create_color_fb(data_t *data, igt_fb_t *fb, color_t *fb_color)
>   	paint_rectangles(data, data->mode, fb_color, fb);  }
>   
> -static uint32_t get_dc_counter(char *dc_data) -{
> -	char *e;
> -	long ret;
> -	char *s = strchr(dc_data, ':');
> -
> -	igt_assert(s);
> -	s++;
> -	ret = strtol(s, &e, 10);
> -	igt_assert(((ret != LONG_MIN && ret != LONG_MAX) || errno != ERANGE) && e > s && *e == '\n' && ret >= 0);
> -	return ret;
> -}
> -
> -static char *get_dc6_counter(const char *buf) -{
> -	char *str;
> -
> -	str = strstr(buf, "DC5 -> DC6 count");
> -	if (!str)
> -		str = strstr(buf, "DC5 -> DC6 allowed count");
> -
> -	return str;
> -}
> -
> -static uint32_t read_dc_counter(uint32_t debugfs_fd, int dc_flag) -{
> -	char buf[4096];
> -	char *str;
> -
> -	igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info", buf, sizeof(buf));
> -
> -	if (dc_flag & CHECK_DC5) {
> -		str = strstr(buf, "DC3 -> DC5 count");
> -		igt_assert_f(str, "DC5 counter is not available\n");
> -	} else if (dc_flag & CHECK_DC6) {
> -		str = get_dc6_counter(buf);
> -		igt_assert_f(str, "No DC6 counter available\n");
> -	} else if (dc_flag & CHECK_DC3CO) {
> -		str = strstr(buf, "DC3CO count");
> -		igt_assert_f(str, "DC3CO counter is not available\n");
> -	} else {
> -		igt_assert(!"reached");
> -		str = NULL;
> -	}
> -
> -	return get_dc_counter(str);
> -}
> -
> -static bool dc_state_wait_entry(int debugfs_fd, int dc_flag, int prev_dc_count) -{
> -	return igt_wait(read_dc_counter(debugfs_fd, dc_flag) >
> -			prev_dc_count, 3000, 100);
> -}
> -
> -static const char *dc_state_name(int dc_flag) -{
> -	if (dc_flag & CHECK_DC3CO)
> -		return "DC3CO";
> -	else if (dc_flag & CHECK_DC5)
> -		return "DC5";
> -	else
> -		return "DC6";
> -}
> -
>   static void check_dc_counter(data_t *data, int dc_flag, uint32_t prev_dc_count)  {
>   	igt_assert_f(dc_state_wait_entry(data->debugfs_fd, dc_flag, prev_dc_count), @@ -385,32 +314,6 @@ static void check_dc3co_with_videoplayback_like_load(data_t *data)
>   		      CHECK_DC3CO, dc3co_prev_cnt), "dc3co-vpb-simulation not enabled\n");  }
>   
> -static void require_dc_counter(int debugfs_fd, int dc_flag) -{
> -	char *str;
> -	char buf[4096];
> -
> -	igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info",
> -				buf, sizeof(buf));
> -
> -	switch (dc_flag) {
> -	case CHECK_DC3CO:
> -		igt_skip_on_f(!strstr(buf, "DC3CO count"),
> -			      "DC3CO counter is not available\n");
> -		break;
> -	case CHECK_DC5:
> -		igt_skip_on_f(!strstr(buf, "DC3 -> DC5 count"),
> -			      "DC5 counter is not available\n");
> -		break;
> -	case CHECK_DC6:
> -		str = get_dc6_counter(buf);
> -		igt_skip_on_f(!str, "No DC6 counter available\n");
> -		break;
> -	default:
> -		igt_assert_f(0, "Unknown DC counter %d\n", dc_flag);
> -	}
> -}
> -
>   static void setup_dc3co(data_t *data)
>   {
>   	data->op_psr_mode = PSR_MODE_2;
> @@ -531,15 +434,6 @@ static void test_dc_state_dpms_negative(data_t *data, int dc_flag)
>   	cleanup_dc_dpms(data);
>   }
>   
> -static bool support_dc6(int debugfs_fd) -{
> -	char buf[4096];
> -
> -	igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info",
> -				buf, sizeof(buf));
> -	return strstr(buf, "DC5 -> DC6 count");
> -}
> -
>   static uint64_t read_runtime_suspended_time(int drm_fd)  {
>   	struct pci_device *i915;
> @@ -621,21 +515,6 @@ static int has_panels_without_dc_support(igt_display_t *display)
>   	return external_panel;
>   }
>   
> -static unsigned int read_pkgc_counter(int debugfs_root_fd) -{
> -	char buf[4096];
> -	char *str;
> -	int len;
> -
> -	len = igt_sysfs_read(debugfs_root_fd, PACKAGE_CSTATE_PATH, buf, sizeof(buf) - 1);
> -	igt_skip_on_f(len < 0, "PKGC state file not found\n");
> -	buf[len] = '\0';
> -	str = strstr(buf, "Package C10");
> -	igt_skip_on_f(!str, "PKGC10 is not supported.\n");
> -
> -	return get_dc_counter(str);
> -}
> -
>   static void test_deep_pkgc_state(data_t *data)  {
>   	unsigned int pre_val = 0, cur_val = 0;
> --
> 2.43.0
>

[-- Attachment #2: Type: text/html, Size: 48954 bytes --]