Skip to content

Commit 390001d

Browse files
arndbjnikula
authored andcommitted
drm/i915/mtl: avoid stringop-overflow warning
The newly added memset() causes a warning for some reason I could not figure out: In file included from arch/x86/include/asm/string.h:3, from drivers/gpu/drm/i915/gt/intel_rc6.c:6: In function 'rc6_res_reg_init', inlined from 'intel_rc6_init' at drivers/gpu/drm/i915/gt/intel_rc6.c:610:2: arch/x86/include/asm/string_32.h:195:29: error: '__builtin_memset' writing 16 bytes into a region of size 0 overflows the destination [-Werror=stringop-overflow=] 195 | #define memset(s, c, count) __builtin_memset(s, c, count) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/gt/intel_rc6.c:584:9: note: in expansion of macro 'memset' 584 | memset(rc6->res_reg, INVALID_MMIO_REG.reg, sizeof(rc6->res_reg)); | ^~~~~~ In function 'intel_rc6_init': Change it to an normal initializer and an added memcpy() that does not have this problem. Fixes: 4bb9ca7 ("drm/i915/mtl: C6 residency and C state type for MTL SAMedia") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231016201012.1022812-1-arnd@kernel.org (cherry picked from commit 0520b30) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 5258dfd commit 390001d

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

drivers/gpu/drm/i915/gt/intel_rc6.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -581,19 +581,23 @@ static void __intel_rc6_disable(struct intel_rc6 *rc6)
581581

582582
static void rc6_res_reg_init(struct intel_rc6 *rc6)
583583
{
584-
memset(rc6->res_reg, INVALID_MMIO_REG.reg, sizeof(rc6->res_reg));
584+
i915_reg_t res_reg[INTEL_RC6_RES_MAX] = {
585+
[0 ... INTEL_RC6_RES_MAX - 1] = INVALID_MMIO_REG,
586+
};
585587

586588
switch (rc6_to_gt(rc6)->type) {
587589
case GT_MEDIA:
588-
rc6->res_reg[INTEL_RC6_RES_RC6] = MTL_MEDIA_MC6;
590+
res_reg[INTEL_RC6_RES_RC6] = MTL_MEDIA_MC6;
589591
break;
590592
default:
591-
rc6->res_reg[INTEL_RC6_RES_RC6_LOCKED] = GEN6_GT_GFX_RC6_LOCKED;
592-
rc6->res_reg[INTEL_RC6_RES_RC6] = GEN6_GT_GFX_RC6;
593-
rc6->res_reg[INTEL_RC6_RES_RC6p] = GEN6_GT_GFX_RC6p;
594-
rc6->res_reg[INTEL_RC6_RES_RC6pp] = GEN6_GT_GFX_RC6pp;
593+
res_reg[INTEL_RC6_RES_RC6_LOCKED] = GEN6_GT_GFX_RC6_LOCKED;
594+
res_reg[INTEL_RC6_RES_RC6] = GEN6_GT_GFX_RC6;
595+
res_reg[INTEL_RC6_RES_RC6p] = GEN6_GT_GFX_RC6p;
596+
res_reg[INTEL_RC6_RES_RC6pp] = GEN6_GT_GFX_RC6pp;
595597
break;
596598
}
599+
600+
memcpy(rc6->res_reg, res_reg, sizeof(res_reg));
597601
}
598602

599603
void intel_rc6_init(struct intel_rc6 *rc6)

0 commit comments

Comments
 (0)