From: Tvrtko Ursulin <tvrtko.ursu...@intel.com> For_each_set_bit wants the max number of bits to walk and not the byte storage size of the source field.
In this case there is no bug since abox_mask can mostly contain bits 0-2. Another funny thing is that both sizeof(abox_mask), where abox_mask is unsigned long, and BITS_PER_TYPE(DISPLAY_INFO->abox_mask)), are 8 (on 64-bit builds) so there is even less between them. Anyway, why not make it explicit to what the constraint is. Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com> References: 62afef2811e4 ("drm/i915/rkl: RKL uses ABOX0 for pixel transfers") Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> Cc: Aditya Swarup <aditya.swa...@intel.com> Cc: Matt Roper <matthew.d.ro...@intel.com> --- drivers/gpu/drm/i915/display/intel_display_power.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 38225e5d311e..27a484892908 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1170,7 +1170,8 @@ static void icl_mbus_init(struct drm_i915_private *dev_priv) if (DISPLAY_VER(dev_priv) == 12) abox_regs |= BIT(0); - for_each_set_bit(i, &abox_regs, sizeof(abox_regs)) + for_each_set_bit(i, &abox_regs, + BITS_PER_TYPE(DISPLAY_INFO(dev_priv)->abox_mask)) intel_de_rmw(dev_priv, MBUS_ABOX_CTL(i), mask, val); } @@ -1623,11 +1624,13 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv) if (table[config].page_mask == 0) { drm_dbg(&dev_priv->drm, "Unknown memory configuration; disabling address buddy logic.\n"); - for_each_set_bit(i, &abox_mask, sizeof(abox_mask)) + for_each_set_bit(i, &abox_mask, + BITS_PER_TYPE(DISPLAY_INFO(dev_priv)->abox_mask)) intel_de_write(dev_priv, BW_BUDDY_CTL(i), BW_BUDDY_DISABLE); } else { - for_each_set_bit(i, &abox_mask, sizeof(abox_mask)) { + for_each_set_bit(i, &abox_mask, + BITS_PER_TYPE(DISPLAY_INFO(dev_priv)->abox_mask)) { intel_de_write(dev_priv, BW_BUDDY_PAGE_MASK(i), table[config].page_mask); -- 2.39.2