* [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests
@ 2023-04-05 6:00 Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 1/4] drm/i915/selftests: Rename librapl library to libpower Riana Tauro
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Riana Tauro @ 2023-04-05 6:00 UTC (permalink / raw)
To: intel-gfx
Rename librapl library to libpower. Add hwmon support in libpower for
dgfx.
Use libpower in selftests.
Rev2 : Update commit message
Rev3 : Remove redundant code
Rev4 : Add hwmon per-gt support
Rev5 : No functional changes.
Change author for last patch
Rev6 : re-order libpower library patch
add check for single gt in hwmon function
Rev7 : Same as Rev 5 with a single gt check
in hwmon function
Rev8 : Skip power comparison in live_rc6_manual for
discrete graphics
Riana Tauro (3):
drm/i915/selftests: Rename librapl library to libpower
drm/i915/hwmon: Add helper function to obtain energy values
drm/i915/selftests: skip comparison of power for discrete graphics
Tilak Tangudu (1):
drm/i915/selftests: Add hwmon support in libpower for dgfx
drivers/gpu/drm/i915/Makefile | 2 +-
drivers/gpu/drm/i915/gt/selftest_rc6.c | 20 ++++++++-----
drivers/gpu/drm/i915/gt/selftest_rps.c | 26 ++++++++---------
drivers/gpu/drm/i915/gt/selftest_slpc.c | 4 +--
drivers/gpu/drm/i915/i915_hwmon.c | 28 +++++++++++++++++++
drivers/gpu/drm/i915/i915_hwmon.h | 3 ++
drivers/gpu/drm/i915/selftests/libpower.c | 33 ++++++++++++++++++++++
drivers/gpu/drm/i915/selftests/libpower.h | 19 +++++++++++++
drivers/gpu/drm/i915/selftests/librapl.c | 34 -----------------------
drivers/gpu/drm/i915/selftests/librapl.h | 17 ------------
10 files changed, 112 insertions(+), 74 deletions(-)
create mode 100644 drivers/gpu/drm/i915/selftests/libpower.c
create mode 100644 drivers/gpu/drm/i915/selftests/libpower.h
delete mode 100644 drivers/gpu/drm/i915/selftests/librapl.c
delete mode 100644 drivers/gpu/drm/i915/selftests/librapl.h
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] [PATCH v8 1/4] drm/i915/selftests: Rename librapl library to libpower
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
@ 2023-04-05 6:00 ` Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 2/4] drm/i915/hwmon: Add helper function to obtain energy values Riana Tauro
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Riana Tauro @ 2023-04-05 6:00 UTC (permalink / raw)
To: intel-gfx
Rename librapl files to libpower and replace librapl
with libpower prefix. No functional changes
v2: update commit message (Anshuman)
v3: fix license year
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
drivers/gpu/drm/i915/Makefile | 2 +-
drivers/gpu/drm/i915/gt/selftest_rc6.c | 12 ++++++------
drivers/gpu/drm/i915/gt/selftest_rps.c | 8 ++++----
drivers/gpu/drm/i915/gt/selftest_slpc.c | 2 +-
.../i915/selftests/{librapl.c => libpower.c} | 10 +++++-----
drivers/gpu/drm/i915/selftests/libpower.h | 17 +++++++++++++++++
drivers/gpu/drm/i915/selftests/librapl.h | 17 -----------------
7 files changed, 34 insertions(+), 34 deletions(-)
rename drivers/gpu/drm/i915/selftests/{librapl.c => libpower.c} (69%)
create mode 100644 drivers/gpu/drm/i915/selftests/libpower.h
delete mode 100644 drivers/gpu/drm/i915/selftests/librapl.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 057ef22fa9c6..33f2e8038d2f 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -356,7 +356,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \
selftests/igt_mmap.o \
selftests/igt_reset.o \
selftests/igt_spinner.o \
- selftests/librapl.o
+ selftests/libpower.o
# virtual gpu code
i915-y += i915_vgpu.o
diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
index 2ceeadecc639..15b84c428f66 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@ -11,7 +11,7 @@
#include "selftest_rc6.h"
#include "selftests/i915_random.h"
-#include "selftests/librapl.h"
+#include "selftests/libpower.h"
static u64 rc6_residency(struct intel_rc6 *rc6)
{
@@ -51,7 +51,7 @@ int live_rc6_manual(void *arg)
if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915))
return 0;
- has_power = librapl_supported(gt->i915);
+ has_power = libpower_supported(gt->i915);
wakeref = intel_runtime_pm_get(gt->uncore->rpm);
/* Force RC6 off for starters */
@@ -61,9 +61,9 @@ int live_rc6_manual(void *arg)
res[0] = rc6_residency(rc6);
dt = ktime_get();
- rc0_power = librapl_energy_uJ();
+ rc0_power = libpower_get_energy_uJ();
msleep(250);
- rc0_power = librapl_energy_uJ() - rc0_power;
+ rc0_power = libpower_get_energy_uJ() - rc0_power;
dt = ktime_sub(ktime_get(), dt);
res[1] = rc6_residency(rc6);
if ((res[1] - res[0]) >> 10) {
@@ -89,9 +89,9 @@ int live_rc6_manual(void *arg)
res[0] = rc6_residency(rc6);
intel_uncore_forcewake_flush(rc6_to_uncore(rc6), FORCEWAKE_ALL);
dt = ktime_get();
- rc6_power = librapl_energy_uJ();
+ rc6_power = libpower_get_energy_uJ();
msleep(100);
- rc6_power = librapl_energy_uJ() - rc6_power;
+ rc6_power = libpower_get_energy_uJ() - rc6_power;
dt = ktime_sub(ktime_get(), dt);
res[1] = rc6_residency(rc6);
if (res[1] == res[0]) {
diff --git a/drivers/gpu/drm/i915/gt/selftest_rps.c b/drivers/gpu/drm/i915/gt/selftest_rps.c
index 84e77e8dbba1..ab534964da4d 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rps.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rps.c
@@ -19,7 +19,7 @@
#include "selftest_rps.h"
#include "selftests/igt_flush_test.h"
#include "selftests/igt_spinner.h"
-#include "selftests/librapl.h"
+#include "selftests/libpower.h"
/* Try to isolate the impact of cstates from determing frequency response */
#define CPU_LATENCY 0 /* -1 to disable pm_qos, 0 to disable cstates */
@@ -1094,10 +1094,10 @@ static u64 __measure_power(int duration_ms)
{
u64 dE, dt;
- dE = librapl_energy_uJ();
+ dE = libpower_get_energy_uJ();
dt = ktime_get();
usleep_range(1000 * duration_ms, 2000 * duration_ms);
- dE = librapl_energy_uJ() - dE;
+ dE = libpower_get_energy_uJ() - dE;
dt = ktime_get() - dt;
return div64_u64(1000 * 1000 * dE, dt);
@@ -1143,7 +1143,7 @@ int live_rps_power(void *arg)
if (!intel_rps_is_enabled(rps) || GRAPHICS_VER(gt->i915) < 6)
return 0;
- if (!librapl_supported(gt->i915))
+ if (!libpower_supported(gt->i915))
return 0;
if (igt_spinner_init(&spin, gt))
diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c
index bd44ce73a504..fc1cdda82ec6 100644
--- a/drivers/gpu/drm/i915/gt/selftest_slpc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c
@@ -169,7 +169,7 @@ static int slpc_power(struct intel_gt *gt, struct intel_engine_cs *engine)
* actually saves power. Let's see if our RAPL measurement supports
* that theory.
*/
- if (!librapl_supported(gt->i915))
+ if (!libpower_supported(gt->i915))
return 0;
min.freq = slpc->min_freq;
diff --git a/drivers/gpu/drm/i915/selftests/librapl.c b/drivers/gpu/drm/i915/selftests/libpower.c
similarity index 69%
rename from drivers/gpu/drm/i915/selftests/librapl.c
rename to drivers/gpu/drm/i915/selftests/libpower.c
index eb03b5b28bad..5d96cccd2e55 100644
--- a/drivers/gpu/drm/i915/selftests/librapl.c
+++ b/drivers/gpu/drm/i915/selftests/libpower.c
@@ -1,23 +1,23 @@
// SPDX-License-Identifier: MIT
/*
- * Copyright © 2020 Intel Corporation
+ * Copyright © 2023 Intel Corporation
*/
#include <asm/msr.h>
#include "i915_drv.h"
-#include "librapl.h"
+#include "libpower.h"
-bool librapl_supported(const struct drm_i915_private *i915)
+bool libpower_supported(const struct drm_i915_private *i915)
{
/* Discrete cards require hwmon integration */
if (IS_DGFX(i915))
return false;
- return librapl_energy_uJ();
+ return libpower_get_energy_uJ();
}
-u64 librapl_energy_uJ(void)
+u64 libpower_get_energy_uJ(void)
{
unsigned long long power;
u32 units;
diff --git a/drivers/gpu/drm/i915/selftests/libpower.h b/drivers/gpu/drm/i915/selftests/libpower.h
new file mode 100644
index 000000000000..dd4b93ccf6b0
--- /dev/null
+++ b/drivers/gpu/drm/i915/selftests/libpower.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef SELFTEST_LIBPOWER_H
+#define SELFTEST_LIBPOWER_H
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+
+bool libpower_supported(const struct drm_i915_private *i915);
+
+u64 libpower_get_energy_uJ(void);
+
+#endif /* SELFTEST_LIBPOWER_H */
diff --git a/drivers/gpu/drm/i915/selftests/librapl.h b/drivers/gpu/drm/i915/selftests/librapl.h
deleted file mode 100644
index e3b24fad0a7a..000000000000
--- a/drivers/gpu/drm/i915/selftests/librapl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2020 Intel Corporation
- */
-
-#ifndef SELFTEST_LIBRAPL_H
-#define SELFTEST_LIBRAPL_H
-
-#include <linux/types.h>
-
-struct drm_i915_private;
-
-bool librapl_supported(const struct drm_i915_private *i915);
-
-u64 librapl_energy_uJ(void);
-
-#endif /* SELFTEST_LIBRAPL_H */
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-gfx] [PATCH v8 2/4] drm/i915/hwmon: Add helper function to obtain energy values
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 1/4] drm/i915/selftests: Rename librapl library to libpower Riana Tauro
@ 2023-04-05 6:00 ` Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 3/4] drm/i915/selftests: Add hwmon support in libpower for dgfx Riana Tauro
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Riana Tauro @ 2023-04-05 6:00 UTC (permalink / raw)
To: intel-gfx
Add an interface to obtain hwmon energy values. The function returns
per-gt energy if gt level energy is available else returns the package
level energy if there is a single gt.
This is used by selftests to verify power consumption
v2 : use i915_hwmon prefix (Anshuman)
v3 : re-use is_visible function of energy to remove
redundant code (Anshuman)
v4 : fix kernel-doc (Anshuman)
add per-gt hwmon support (Ashutosh)
v5 : add check to return package level energy only when there
is a single gt and gt level energy is not available. (Ashutosh)
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
drivers/gpu/drm/i915/i915_hwmon.c | 28 ++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_hwmon.h | 3 +++
2 files changed, 31 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
index 8e7dccc8d3a0..efc2ccaf64d1 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -500,6 +500,34 @@ hwm_energy_read(struct hwm_drvdata *ddat, u32 attr, long *val)
}
}
+/**
+ * i915_hwmon_get_energy - obtains energy value
+ * @gt: intel_gt structure
+ * @energy: pointer to store energy in uJ
+ *
+ * This function checks for the validity of the underlying energy
+ * hardware register and obtains per-gt level energy
+ * values.
+ *
+ * Return: 0 on success, -EOPNOTSUPP if register is invalid
+ */
+int
+i915_hwmon_get_energy(struct intel_gt *gt, long *energy)
+{
+ struct i915_hwmon *hwmon = gt->i915->hwmon;
+ struct hwm_drvdata *ddat = &hwmon->ddat;
+ struct hwm_drvdata *ddat_gt = hwmon->ddat_gt + gt->info.id;
+
+ if (hwm_energy_is_visible(ddat_gt, hwmon_energy_input))
+ hwm_energy(ddat_gt, energy);
+ else if (!HAS_EXTRA_GT_LIST(gt->i915) && hwm_energy_is_visible(ddat, hwmon_energy_input))
+ hwm_energy(ddat, energy);
+ else
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
static umode_t
hwm_curr_is_visible(const struct hwm_drvdata *ddat, u32 attr)
{
diff --git a/drivers/gpu/drm/i915/i915_hwmon.h b/drivers/gpu/drm/i915/i915_hwmon.h
index 7ca9cf2c34c9..1c38cfdbb7e9 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.h
+++ b/drivers/gpu/drm/i915/i915_hwmon.h
@@ -8,13 +8,16 @@
#define __I915_HWMON_H__
struct drm_i915_private;
+struct intel_gt;
#if IS_REACHABLE(CONFIG_HWMON)
void i915_hwmon_register(struct drm_i915_private *i915);
void i915_hwmon_unregister(struct drm_i915_private *i915);
+int i915_hwmon_get_energy(struct intel_gt *gt, long *energy);
#else
static inline void i915_hwmon_register(struct drm_i915_private *i915) { };
static inline void i915_hwmon_unregister(struct drm_i915_private *i915) { };
+static inline int i915_hwmon_get_energy(struct intel_gt *gt, long *energy) { return -EOPNOTSUPP; }
#endif
#endif /* __I915_HWMON_H__ */
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-gfx] [PATCH v8 3/4] drm/i915/selftests: Add hwmon support in libpower for dgfx
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 1/4] drm/i915/selftests: Rename librapl library to libpower Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 2/4] drm/i915/hwmon: Add helper function to obtain energy values Riana Tauro
@ 2023-04-05 6:00 ` Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for discrete graphics Riana Tauro
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Riana Tauro @ 2023-04-05 6:00 UTC (permalink / raw)
To: intel-gfx
From: Tilak Tangudu <tilak.tangudu@intel.com>
hwmon provides an interface to read energy values for discrete graphics.
add hwmon support to the existing libpower library so that it can verify
power consumption values in different selftests.
Changed prototype of libpower_get_energy_uJ
v2: add per-gt hwmon support (Ashutosh)
Signed-off-by: Tilak Tangudu <tilak.tangudu@intel.com>
Co-developed-by: Riana Tauro <riana.tauro@intel.com>
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
drivers/gpu/drm/i915/gt/selftest_rc6.c | 10 ++++----
drivers/gpu/drm/i915/gt/selftest_rps.c | 24 +++++++++---------
drivers/gpu/drm/i915/gt/selftest_slpc.c | 4 +--
drivers/gpu/drm/i915/selftests/libpower.c | 31 +++++++++++------------
drivers/gpu/drm/i915/selftests/libpower.h | 10 +++++---
5 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
index 15b84c428f66..682f2fe67b3a 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@ -51,7 +51,7 @@ int live_rc6_manual(void *arg)
if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915))
return 0;
- has_power = libpower_supported(gt->i915);
+ has_power = libpower_supported(gt);
wakeref = intel_runtime_pm_get(gt->uncore->rpm);
/* Force RC6 off for starters */
@@ -61,9 +61,9 @@ int live_rc6_manual(void *arg)
res[0] = rc6_residency(rc6);
dt = ktime_get();
- rc0_power = libpower_get_energy_uJ();
+ rc0_power = libpower_get_energy_uJ(gt);
msleep(250);
- rc0_power = libpower_get_energy_uJ() - rc0_power;
+ rc0_power = libpower_get_energy_uJ(gt) - rc0_power;
dt = ktime_sub(ktime_get(), dt);
res[1] = rc6_residency(rc6);
if ((res[1] - res[0]) >> 10) {
@@ -89,9 +89,9 @@ int live_rc6_manual(void *arg)
res[0] = rc6_residency(rc6);
intel_uncore_forcewake_flush(rc6_to_uncore(rc6), FORCEWAKE_ALL);
dt = ktime_get();
- rc6_power = libpower_get_energy_uJ();
+ rc6_power = libpower_get_energy_uJ(gt);
msleep(100);
- rc6_power = libpower_get_energy_uJ() - rc6_power;
+ rc6_power = libpower_get_energy_uJ(gt) - rc6_power;
dt = ktime_sub(ktime_get(), dt);
res[1] = rc6_residency(rc6);
if (res[1] == res[0]) {
diff --git a/drivers/gpu/drm/i915/gt/selftest_rps.c b/drivers/gpu/drm/i915/gt/selftest_rps.c
index ab534964da4d..55ac2fdf2264 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rps.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rps.c
@@ -1090,38 +1090,38 @@ int live_rps_interrupt(void *arg)
return err;
}
-static u64 __measure_power(int duration_ms)
+static u64 __measure_power(struct intel_gt *gt, int duration_ms)
{
u64 dE, dt;
- dE = libpower_get_energy_uJ();
+ dE = libpower_get_energy_uJ(gt);
dt = ktime_get();
usleep_range(1000 * duration_ms, 2000 * duration_ms);
- dE = libpower_get_energy_uJ() - dE;
+ dE = libpower_get_energy_uJ(gt) - dE;
dt = ktime_get() - dt;
return div64_u64(1000 * 1000 * dE, dt);
}
-static u64 measure_power(struct intel_rps *rps, int *freq)
+static u64 measure_power(struct intel_gt *gt, int *freq)
{
u64 x[5];
int i;
for (i = 0; i < 5; i++)
- x[i] = __measure_power(5);
+ x[i] = __measure_power(gt, 5);
- *freq = (*freq + intel_rps_read_actual_frequency(rps)) / 2;
+ *freq = (*freq + intel_rps_read_actual_frequency(>->rps)) / 2;
/* A simple triangle filter for better result stability */
sort(x, 5, sizeof(*x), cmp_u64, NULL);
return div_u64(x[1] + 2 * x[2] + x[3], 4);
}
-static u64 measure_power_at(struct intel_rps *rps, int *freq)
+static u64 measure_power_at(struct intel_gt *gt, int *freq)
{
- *freq = rps_set_check(rps, *freq);
- return measure_power(rps, freq);
+ *freq = rps_set_check(>->rps, *freq);
+ return measure_power(gt, freq);
}
int live_rps_power(void *arg)
@@ -1143,7 +1143,7 @@ int live_rps_power(void *arg)
if (!intel_rps_is_enabled(rps) || GRAPHICS_VER(gt->i915) < 6)
return 0;
- if (!libpower_supported(gt->i915))
+ if (!libpower_supported(gt))
return 0;
if (igt_spinner_init(&spin, gt))
@@ -1187,10 +1187,10 @@ int live_rps_power(void *arg)
}
max.freq = rps->max_freq;
- max.power = measure_power_at(rps, &max.freq);
+ max.power = measure_power_at(gt, &max.freq);
min.freq = rps->min_freq;
- min.power = measure_power_at(rps, &min.freq);
+ min.power = measure_power_at(gt, &min.freq);
igt_spinner_end(&spin);
st_engine_heartbeat_enable(engine);
diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c
index fc1cdda82ec6..20b9e05d3d16 100644
--- a/drivers/gpu/drm/i915/gt/selftest_slpc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c
@@ -78,7 +78,7 @@ static u64 measure_power_at_freq(struct intel_gt *gt, int *freq, u64 *power)
if (err)
return err;
*freq = intel_rps_read_actual_frequency(>->rps);
- *power = measure_power(>->rps, freq);
+ *power = measure_power(gt, freq);
return err;
}
@@ -169,7 +169,7 @@ static int slpc_power(struct intel_gt *gt, struct intel_engine_cs *engine)
* actually saves power. Let's see if our RAPL measurement supports
* that theory.
*/
- if (!libpower_supported(gt->i915))
+ if (!libpower_supported(gt))
return 0;
min.freq = slpc->min_freq;
diff --git a/drivers/gpu/drm/i915/selftests/libpower.c b/drivers/gpu/drm/i915/selftests/libpower.c
index 5d96cccd2e55..c25771d200e2 100644
--- a/drivers/gpu/drm/i915/selftests/libpower.c
+++ b/drivers/gpu/drm/i915/selftests/libpower.c
@@ -6,29 +6,28 @@
#include <asm/msr.h>
#include "i915_drv.h"
+#include "i915_hwmon.h"
#include "libpower.h"
-bool libpower_supported(const struct drm_i915_private *i915)
-{
- /* Discrete cards require hwmon integration */
- if (IS_DGFX(i915))
- return false;
-
- return libpower_get_energy_uJ();
-}
-
-u64 libpower_get_energy_uJ(void)
+u64 libpower_get_energy_uJ(struct intel_gt *gt)
{
unsigned long long power;
u32 units;
+ long energy_uJ = 0;
- if (rdmsrl_safe(MSR_RAPL_POWER_UNIT, &power))
- return 0;
+ if (IS_DGFX(gt->i915)) {
+ if (i915_hwmon_get_energy(gt, &energy_uJ))
+ return 0;
+ } else {
+ if (rdmsrl_safe(MSR_RAPL_POWER_UNIT, &power))
+ return 0;
- units = (power & 0x1f00) >> 8;
+ units = (power & 0x1f00) >> 8;
- if (rdmsrl_safe(MSR_PP1_ENERGY_STATUS, &power))
- return 0;
+ if (rdmsrl_safe(MSR_PP1_ENERGY_STATUS, &power))
+ return 0;
- return (1000000 * power) >> units; /* convert to uJ */
+ energy_uJ = (1000000 * power) >> units; /* convert to uJ */
+ }
+ return energy_uJ;
}
diff --git a/drivers/gpu/drm/i915/selftests/libpower.h b/drivers/gpu/drm/i915/selftests/libpower.h
index dd4b93ccf6b0..52d9eee6852a 100644
--- a/drivers/gpu/drm/i915/selftests/libpower.h
+++ b/drivers/gpu/drm/i915/selftests/libpower.h
@@ -8,10 +8,12 @@
#include <linux/types.h>
-struct drm_i915_private;
+struct intel_gt;
-bool libpower_supported(const struct drm_i915_private *i915);
-
-u64 libpower_get_energy_uJ(void);
+u64 libpower_get_energy_uJ(struct intel_gt *gt);
+static inline bool libpower_supported(struct intel_gt *gt)
+{
+ return libpower_get_energy_uJ(gt);
+}
#endif /* SELFTEST_LIBPOWER_H */
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-gfx] [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for discrete graphics
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
` (2 preceding siblings ...)
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 3/4] drm/i915/selftests: Add hwmon support in libpower for dgfx Riana Tauro
@ 2023-04-05 6:00 ` Riana Tauro
2023-04-05 6:12 ` Gupta, Anshuman
2023-04-05 6:34 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add hwmon support for dgfx selftests (rev8) Patchwork
` (2 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Riana Tauro @ 2023-04-05 6:00 UTC (permalink / raw)
To: intel-gfx
skip comparison of power for discrete graphics
TODO : measure power of GT in discrete graphics and modify the
condition.
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
---
drivers/gpu/drm/i915/gt/selftest_rc6.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
index 682f2fe67b3a..57c0cb4ecc88 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@ -107,7 +107,13 @@ int live_rc6_manual(void *arg)
ktime_to_ns(dt));
pr_info("GPU consumed %llduW in RC0 and %llduW in RC6\n",
rc0_power, rc6_power);
- if (2 * rc6_power > rc0_power) {
+
+ /*
+ * Condition valid for integrated graphics
+ * TODO : Measure power of GT for discrete graphics and
+ * modify the condition
+ */
+ if (!IS_DGFX(gt->i915) && (2 * rc6_power > rc0_power)) {
pr_err("GPU leaked energy while in RC6!\n");
err = -EINVAL;
goto out_unlock;
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for discrete graphics
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for discrete graphics Riana Tauro
@ 2023-04-05 6:12 ` Gupta, Anshuman
0 siblings, 0 replies; 9+ messages in thread
From: Gupta, Anshuman @ 2023-04-05 6:12 UTC (permalink / raw)
To: Tauro, Riana, intel-gfx
> -----Original Message-----
> From: Tauro, Riana <riana.tauro@intel.com>
> Sent: Wednesday, April 5, 2023 11:30 AM
> To: intel-gfx@lists.freedesktop.org
> Cc: Tauro, Riana <riana.tauro@intel.com>; Gupta, Anshuman
> <anshuman.gupta@intel.com>; Dixit, Ashutosh <ashutosh.dixit@intel.com>;
> Tangudu, Tilak <tilak.tangudu@intel.com>; Nilawar, Badal
> <badal.nilawar@intel.com>
> Subject: [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for
> discrete graphics
>
> skip comparison of power for discrete graphics
We need to specify the reason for doing so.
Hwmon read the energy/power consumed by discrete soc, which essentially means
There are other non-gfx discrete devices will draw power same will be reported by
Hwmon interface. This test uses power consumed by GPU to validate the RC6
Power Consumption.
With that :
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
>
> TODO : measure power of GT in discrete graphics and modify the condition.
>
> Signed-off-by: Riana Tauro <riana.tauro@intel.com>
> ---
> drivers/gpu/drm/i915/gt/selftest_rc6.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c
> b/drivers/gpu/drm/i915/gt/selftest_rc6.c
> index 682f2fe67b3a..57c0cb4ecc88 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
> @@ -107,7 +107,13 @@ int live_rc6_manual(void *arg)
> ktime_to_ns(dt));
> pr_info("GPU consumed %llduW in RC0 and %llduW in
> RC6\n",
> rc0_power, rc6_power);
> - if (2 * rc6_power > rc0_power) {
> +
> + /*
> + * Condition valid for integrated graphics
> + * TODO : Measure power of GT for discrete graphics and
> + * modify the condition
> + */
> + if (!IS_DGFX(gt->i915) && (2 * rc6_power > rc0_power)) {
> pr_err("GPU leaked energy while in RC6!\n");
> err = -EINVAL;
> goto out_unlock;
> --
> 2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add hwmon support for dgfx selftests (rev8)
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
` (3 preceding siblings ...)
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for discrete graphics Riana Tauro
@ 2023-04-05 6:34 ` Patchwork
2023-04-05 6:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-04-05 6:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-04-05 6:34 UTC (permalink / raw)
To: Riana Tauro; +Cc: intel-gfx
== Series Details ==
Series: Add hwmon support for dgfx selftests (rev8)
URL : https://patchwork.freedesktop.org/series/109850/
State : warning
== Summary ==
Error: dim checkpatch failed
b73c79777750 drm/i915/selftests: Rename librapl library to libpower
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:125: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#125:
rename from drivers/gpu/drm/i915/selftests/librapl.c
total: 0 errors, 1 warnings, 0 checks, 127 lines checked
39e877cc50be drm/i915/hwmon: Add helper function to obtain energy values
dc92833dc578 drm/i915/selftests: Add hwmon support in libpower for dgfx
514d1605910d drm/i915/selftests: skip comparison of power for discrete graphics
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add hwmon support for dgfx selftests (rev8)
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
` (4 preceding siblings ...)
2023-04-05 6:34 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add hwmon support for dgfx selftests (rev8) Patchwork
@ 2023-04-05 6:34 ` Patchwork
2023-04-05 6:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-04-05 6:34 UTC (permalink / raw)
To: Riana Tauro; +Cc: intel-gfx
== Series Details ==
Series: Add hwmon support for dgfx selftests (rev8)
URL : https://patchwork.freedesktop.org/series/109850/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
-
+./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit'
+./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return'
+./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val'
+./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val'
+./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val'
+./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val'
+./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p'
+./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old'
+./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask'
+./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return'
+./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for Add hwmon support for dgfx selftests (rev8)
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
` (5 preceding siblings ...)
2023-04-05 6:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
@ 2023-04-05 6:44 ` Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-04-05 6:44 UTC (permalink / raw)
To: Riana Tauro; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5740 bytes --]
== Series Details ==
Series: Add hwmon support for dgfx selftests (rev8)
URL : https://patchwork.freedesktop.org/series/109850/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12967 -> Patchwork_109850v8
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/index.html
Participating hosts (37 -> 36)
------------------------------
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_109850v8 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@slpc:
- bat-rpls-2: NOTRUN -> [DMESG-FAIL][1] ([i915#6367] / [i915#7913] / [i915#7996])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-rpls-2/igt@i915_selftest@live@slpc.html
- bat-rpls-1: [PASS][2] -> [DMESG-FAIL][3] ([i915#6367])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/bat-rpls-1/igt@i915_selftest@live@slpc.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-rpls-1/igt@i915_selftest@live@slpc.html
- bat-dg2-11: [PASS][4] -> [DMESG-FAIL][5] ([i915#7913])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/bat-dg2-11/igt@i915_selftest@live@slpc.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-dg2-11/igt@i915_selftest@live@slpc.html
- bat-dg2-8: [PASS][6] -> [DMESG-FAIL][7] ([i915#7913])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/bat-dg2-8/igt@i915_selftest@live@slpc.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-dg2-8/igt@i915_selftest@live@slpc.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-2: NOTRUN -> [SKIP][8] ([i915#7828])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-rpls-2/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
- fi-bsw-n3050: NOTRUN -> [SKIP][9] ([fdo#109271])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/fi-bsw-n3050/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1:
- bat-dg2-8: [PASS][10] -> [FAIL][11] ([i915#7932])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1.html
* igt@kms_pipe_crc_basic@read-crc:
- bat-dg2-11: NOTRUN -> [SKIP][12] ([i915#5354]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-dg2-11/igt@kms_pipe_crc_basic@read-crc.html
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-2: NOTRUN -> [SKIP][13] ([i915#1845])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-rpls-2/igt@kms_pipe_crc_basic@suspend-read-crc.html
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-bsw-n3050: [ABORT][14] ([i915#7911] / [i915#7913]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@requests:
- bat-rpls-2: [ABORT][16] ([i915#7913] / [i915#7982]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/bat-rpls-2/igt@i915_selftest@live@requests.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-rpls-2/igt@i915_selftest@live@requests.html
* igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1:
- bat-dg2-8: [FAIL][18] ([i915#7932]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12967/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
Build changes
-------------
* Linux: CI_DRM_12967 -> Patchwork_109850v8
CI-20190529: 20190529
CI_DRM_12967: 28c342e55ec8081498c63f4a38825f055e294a3a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7236: bac5a4cc31b3212a205219a6cbc45a173d30d04b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_109850v8: 28c342e55ec8081498c63f4a38825f055e294a3a @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
5daed77dd2fe drm/i915/selftests: skip comparison of power for discrete graphics
f6aa6fb22759 drm/i915/selftests: Add hwmon support in libpower for dgfx
1e5f17b4d200 drm/i915/hwmon: Add helper function to obtain energy values
1c5e5339c241 drm/i915/selftests: Rename librapl library to libpower
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109850v8/index.html
[-- Attachment #2: Type: text/html, Size: 7015 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-04-05 6:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-05 6:00 [Intel-gfx] [PATCH v8 0/4] Add hwmon support for dgfx selftests Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 1/4] drm/i915/selftests: Rename librapl library to libpower Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 2/4] drm/i915/hwmon: Add helper function to obtain energy values Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 3/4] drm/i915/selftests: Add hwmon support in libpower for dgfx Riana Tauro
2023-04-05 6:00 ` [Intel-gfx] [PATCH v8 4/4] drm/i915/selftests: skip comparison of power for discrete graphics Riana Tauro
2023-04-05 6:12 ` Gupta, Anshuman
2023-04-05 6:34 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add hwmon support for dgfx selftests (rev8) Patchwork
2023-04-05 6:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-04-05 6:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).