Re: [PATCH] drm/xe/hwmon: Prevent unintended VRAM channel creation

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, Feb 11, 2026 at 12:17:04PM +0100, Raag Jadav wrote:
> On Fri, Feb 06, 2026 at 01:46:55PM +0530, Karthik Poosa wrote:
> > Remove the unnecessary VRAM channel entry introduced in xe_hwmon_channel.
> > Without this, adding any new hwmon channel causes extra VRAM channel
> > to appear. This remained unnoticed earlier because VRAM was the
> > final xe hwmon channel.
> > 
> > v2: Use MAX_VRAM_CHANNELS with in_range() instead of
> >     CHANNEL_VRAM_N_MAX. (Raag)
> > 
> > Signed-off-by: Karthik Poosa <karthik.poosa@intel.com>
> > Fixes: 49a498338417 ("drm/xe/hwmon: Expose individual VRAM channel temperature")
> 
> Fixes tag usually goes first, but perhaps it can be re-ordered while
> applying. In any case,

done and pushed, thank you both

> 
> Reviewed-by: Raag Jadav <raag.jadav@intel.com>
> 
> > ---
> >  drivers/gpu/drm/xe/xe_hwmon.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
> > index baf277955b33..0fd4d4f1014a 100644
> > --- a/drivers/gpu/drm/xe/xe_hwmon.c
> > +++ b/drivers/gpu/drm/xe/xe_hwmon.c
> > @@ -48,7 +48,7 @@ enum xe_hwmon_channel {
> >  	CHANNEL_MCTRL,
> >  	CHANNEL_PCIE,
> >  	CHANNEL_VRAM_N,
> > -	CHANNEL_VRAM_N_MAX = CHANNEL_VRAM_N + MAX_VRAM_CHANNELS,
> > +	CHANNEL_VRAM_N_MAX = CHANNEL_VRAM_N + MAX_VRAM_CHANNELS - 1,
> >  	CHANNEL_MAX,
> >  };
> >  
> > @@ -264,7 +264,7 @@ static struct xe_reg xe_hwmon_get_reg(struct xe_hwmon *hwmon, enum xe_hwmon_reg
> >  				return BMG_PACKAGE_TEMPERATURE;
> >  			else if (channel == CHANNEL_VRAM)
> >  				return BMG_VRAM_TEMPERATURE;
> > -			else if (in_range(channel, CHANNEL_VRAM_N, CHANNEL_VRAM_N_MAX))
> > +			else if (in_range(channel, CHANNEL_VRAM_N, MAX_VRAM_CHANNELS))
> >  				return BMG_VRAM_TEMPERATURE_N(channel - CHANNEL_VRAM_N);
> >  		} else if (xe->info.platform == XE_DG2) {
> >  			if (channel == CHANNEL_PKG)
> > @@ -1427,7 +1427,7 @@ static int xe_hwmon_read_label(struct device *dev,
> >  			*str = "mctrl";
> >  		else if (channel == CHANNEL_PCIE)
> >  			*str = "pcie";
> > -		else if (in_range(channel, CHANNEL_VRAM_N, CHANNEL_VRAM_N_MAX))
> > +		else if (in_range(channel, CHANNEL_VRAM_N, MAX_VRAM_CHANNELS))
> >  			*str = hwmon->temp.vram_label[channel - CHANNEL_VRAM_N];
> >  		return 0;
> >  	case hwmon_power:
> > -- 
> > 2.25.1
> >