Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit d4f36db

Browse files
arndbjnikula
authored andcommitted
drm/i915/guc: avoid FIELD_PREP warning
With gcc-7 and earlier, there are lots of warnings like In file included from <command-line>:0:0: In function '__guc_context_policy_add_priority.isra.66', inlined from '__guc_context_set_prio.isra.67' at drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3292:3, inlined from 'guc_context_set_prio' at drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3320:2: include/linux/compiler_types.h:399:38: error: call to '__compiletime_assert_631' declared with attribute error: FIELD_PREP: mask is not constant _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ ... drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:2422:3: note: in expansion of macro 'FIELD_PREP' FIELD_PREP(GUC_KLV_0_KEY, GUC_CONTEXT_POLICIES_KLV_ID_##id) | \ ^~~~~~~~~~ Make sure that GUC_KLV_0_KEY is an unsigned value to avoid the warning. Fixes: 77b6f79 ("drm/i915/guc: Update to GuC version 69.0.3") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Signed-off-by: Julia Filipchuk <julia.filipchuk@intel.com> Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240430164809.482131-1-julia.filipchuk@intel.com (cherry picked from commit 364e039) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 70cb918 commit d4f36db

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
*/
3030

3131
#define GUC_KLV_LEN_MIN 1u
32-
#define GUC_KLV_0_KEY (0xffff << 16)
33-
#define GUC_KLV_0_LEN (0xffff << 0)
34-
#define GUC_KLV_n_VALUE (0xffffffff << 0)
32+
#define GUC_KLV_0_KEY (0xffffu << 16)
33+
#define GUC_KLV_0_LEN (0xffffu << 0)
34+
#define GUC_KLV_n_VALUE (0xffffffffu << 0)
3535

3636
/**
3737
* DOC: GuC Self Config KLVs

0 commit comments

Comments
 (0)