On 18/07/2023 19:37, Dixit, Ashutosh wrote:
On Tue, 18 Jul 2023 01:40:41 -0700, Tvrtko Ursulin wrote:
From: Tvrtko Ursulin <[email protected]>
Feature test also needs adjusting after sysfs helper API changes...
Signed-off-by: Tvrtko Ursulin <[email protected]>
Fixes: d86ca7e17b58 ("tests/i915_pm_rps: Exercise sysfs thresholds")
Reference: 54dc25efaf10 ("lib/igt_sysfs: add asserting helpers for read/write
operations")
Reference: 1dfa7a007a8e ("tests/i915_pm_rps: Fix test after silent conflict")
Cc: Rodrigo Vivi <[email protected]>
Cc: Lukasz Laguna <[email protected]>
Cc: Kamil Konieczny <[email protected]>
Cc: Ashutosh Dixit <[email protected]>
---
tests/i915/i915_pm_rps.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/i915/i915_pm_rps.c b/tests/i915/i915_pm_rps.c
index 15c74cc703c2..3ef5842dd7f8 100644
--- a/tests/i915/i915_pm_rps.c
+++ b/tests/i915/i915_pm_rps.c
@@ -1015,20 +1015,23 @@ static void sysfs_set_u32(int dir, const char *attr,
uint32_t set)
static void test_thresholds(int i915, unsigned int gt, unsigned int flags)
{
uint64_t ahnd = get_reloc_ahnd(i915, 0);
+ unsigned int def_up = 0, def_down = 0;
const unsigned int points = 10;
- unsigned int def_up, def_down;
igt_spin_t *spin = NULL;
const intel_ctx_t *ctx;
unsigned int *ta, *tb;
unsigned int i;
int sysfs;
+ bool ret;
sysfs = igt_sysfs_gt_open(i915, gt);
igt_require(sysfs >= 0);
/* Feature test */
- def_up = igt_sysfs_get_u32(sysfs, "rps_up_threshold_pct");
- def_down = igt_sysfs_get_u32(sysfs, "rps_down_threshold_pct");
+ ret = __igt_sysfs_get_u32(sysfs, "rps_up_threshold_pct", &def_up);
+ igt_require(ret);
+ ret = __igt_sysfs_get_u32(sysfs, "rps_down_threshold_pct", &def_down);
+ igt_require(ret);
Could also use igt_sysfs_has_attr(). Ok as is too.
Getting hard to stay on top of the API richness! :)
Reviewed-by: Ashutosh Dixit <[email protected]>
Thanks for the reviews - pushed to fix the failures.
Regards,
Tvrtko
igt_require(def_up && def_down);
/* Check invalid percentages are rejected */
--
2.39.2
