Commit 467360e2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-09-10' of... 

Merge tag 'drm-intel-fixes-2025-09-10' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Fix size for for_each_set_bit() in abox iteration [display] (Jani Nikula)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://lore.kernel.org/r/aMFUtRdJ46qK-EXl@linux
parents 2c38074c cfa7b765

drivers/gpu/drm/i915/display/intel_display_power.c

+3 −3
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static void icl_mbus_init(struct intel_display *display) 
	if (DISPLAY_VER(display) == 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(abox_regs))

		intel_de_rmw(display, MBUS_ABOX_CTL(i), mask, val);

}
@@ -1629,11 +1629,11 @@ static void tgl_bw_buddy_init(struct intel_display *display) 
	if (table[config].page_mask == 0) {

		drm_dbg_kms(display->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(abox_mask))

			intel_de_write(display, 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(abox_mask)) {

			intel_de_write(display, BW_BUDDY_PAGE_MASK(i),

				       table[config].page_mask);