On 10-04-2024 09:58, Ashutosh Dixit wrote:
There are no hwmon selftests so there is no need to enable hwmon for
selftests. So enable hwmon only for real driver load.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10366
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx>
LGTM.
Reviewed-by: Badal Nilawar <badal.nilawar@xxxxxxxxx>
---
drivers/gpu/drm/i915/i915_driver.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 9ee902d5b72c..6fa6d2c8109f 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -94,6 +94,7 @@
#include "i915_memcpy.h"
#include "i915_perf.h"
#include "i915_query.h"
+#include "i915_selftest.h"
#include "i915_suspend.h"
#include "i915_switcheroo.h"
#include "i915_sysfs.h"
@@ -589,6 +590,15 @@ static void i915_driver_hw_remove(struct drm_i915_private *dev_priv)
pci_disable_msi(pdev);
}
+static bool is_selftest(void)
+{
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
+ return i915_selftest.live || i915_selftest.perf || i915_selftest.mock;
+#else
+ return false;
+#endif
+}
+
/**
* i915_driver_register - register the driver with the rest of the system
* @dev_priv: device private
@@ -624,7 +634,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
intel_pxp_debugfs_register(dev_priv->pxp);
- i915_hwmon_register(dev_priv);
+ if (!is_selftest())
+ i915_hwmon_register(dev_priv);
intel_display_driver_register(dev_priv);
@@ -660,7 +671,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
for_each_gt(gt, dev_priv, i)
intel_gt_driver_unregister(gt);
- i915_hwmon_unregister(dev_priv);
+ if (!is_selftest())
+ i915_hwmon_unregister(dev_priv);
i915_perf_unregister(dev_priv);
i915_pmu_unregister(dev_priv);
