From: Ashutosh Dixit <ashutosh.dixit@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Badal Nilawar <badal.nilawar@intel.com>,
Andi Shyti <andi.shyti@intel.com>
Subject: [PATCH] drm/i915: Don't enable hwmon for selftests
Date: Wed, 10 Apr 2024 13:07:27 -0700 [thread overview]
Message-ID: <20240410200727.270913-1-ashutosh.dixit@intel.com> (raw)
There are no hwmon selftests so there is no need to enable hwmon for
selftests. So enable hwmon only for real driver load.
v2: Move the logic inside i915_hwmon.c
v3: Move is_i915_selftest definition to i915_selftest.h (Badal)
v4: s/is_i915_selftest/is_i915_selftest_module/
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10366
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
---
drivers/gpu/drm/i915/i915_hwmon.c | 3 ++-
drivers/gpu/drm/i915/i915_selftest.h | 9 +++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
index 8c3f443c8347..86d7cd1ef45e 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -10,6 +10,7 @@
#include "i915_drv.h"
#include "i915_hwmon.h"
#include "i915_reg.h"
+#include "i915_selftest.h"
#include "intel_mchbar_regs.h"
#include "intel_pcode.h"
#include "gt/intel_gt.h"
@@ -789,7 +790,7 @@ void i915_hwmon_register(struct drm_i915_private *i915)
int i;
/* hwmon is available only for dGfx */
- if (!IS_DGFX(i915))
+ if (!IS_DGFX(i915) || is_i915_selftest_module())
return;
hwmon = devm_kzalloc(dev, sizeof(*hwmon), GFP_KERNEL);
diff --git a/drivers/gpu/drm/i915/i915_selftest.h b/drivers/gpu/drm/i915/i915_selftest.h
index bdf3e22c0a34..bba3fafaac8d 100644
--- a/drivers/gpu/drm/i915/i915_selftest.h
+++ b/drivers/gpu/drm/i915/i915_selftest.h
@@ -123,6 +123,15 @@ static inline int i915_perf_selftests(struct pci_dev *pdev) { return 0; }
#endif
+static inline bool is_i915_selftest_module(void)
+{
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
+ return i915_selftest.live || i915_selftest.perf || i915_selftest.mock;
+#else
+ return false;
+#endif
+}
+
/* Using the i915_selftest_ prefix becomes a little unwieldy with the helpers.
* Instead we use the igt_ shorthand, in reference to the intel-gpu-tools
* suite of uabi test cases (which includes a test runner for our selftests).
--
2.41.0
next reply other threads:[~2024-04-10 20:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 20:07 Ashutosh Dixit [this message]
2024-04-10 21:40 ` ✗ Fi.CI.SPARSE: warning for drm/i915: Don't enable hwmon for selftests (rev4) Patchwork
2024-04-10 21:59 ` ✗ Fi.CI.BAT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2024-04-10 6:05 [PATCH] drm/i915: Don't enable hwmon for selftests Ashutosh Dixit
2024-04-10 6:45 ` Nilawar, Badal
2024-04-10 13:53 ` Andi Shyti
2024-04-11 4:59 ` Dixit, Ashutosh
2024-04-10 4:58 Ashutosh Dixit
2024-04-10 5:17 ` Nilawar, Badal
2024-04-10 6:06 ` Dixit, Ashutosh
2024-04-10 4:28 Ashutosh Dixit
2024-04-10 4:37 ` Dixit, Ashutosh
2024-04-10 4:56 ` Nilawar, Badal
2024-04-10 11:42 ` Ville Syrjälä
2024-04-11 5:09 ` Dixit, Ashutosh
2024-04-11 10:47 ` Ville Syrjälä
2024-04-13 0:35 ` Dixit, Ashutosh
2024-04-13 0:37 ` Dixit, Ashutosh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240410200727.270913-1-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=andi.shyti@intel.com \
--cc=badal.nilawar@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox