On Wed, 10 Apr 2024 06:53:15 -0700, Andi Shyti wrote: > Hi Andi, > please use "git format-patch -v 3 ..." which generates subject > [PATCH v3] ...". Otherwise it gets confusing to see the patch > that needs to be reviewed. Sure, sorry! > > On Tue, Apr 09, 2024 at 11:05:49PM -0700, 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. > > > > v2: Move the logic inside i915_hwmon.c > > v3: Move is_i915_selftest definition to i915_selftest.h (Badal) > > > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10366 > > Signed-off-by: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/i915_hwmon.c | 3 ++- > > drivers/gpu/drm/i915/i915_selftest.h | 10 ++++++++++ > > 2 files changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c > > index 8c3f443c8347..cf1689333ebf 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()) > > return; > > I wonder if this is the right place to put it or rather place it > in i915_driver.c and avoid calling i915_hwmon_register() at all. I thought it was better put it here rather than clutter up common code in i915_driver.c. > > In any case, it's good: > > Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx> Thanks. -- Ashutosh
