Skip to content

Commit 1baeef6

Browse files
nathanchanceAndi Shyti
authored andcommitted
drm/i915/gt: Fix parameter in gmch_ggtt_insert_{entries, page}()
When building with clang's -Wincompatible-function-pointer-types-strict, the following warnings occur: drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c:102:23: error: incompatible function pointer types assigning to 'void (*)(struct i915_address_space *, dma_addr_t, u64, unsigned int, u32)' (aka 'void (*)(struct i915_address_space *, unsigned int, unsigned long long, unsigned int, unsigned int)') from 'void (struct i915_address_space *, dma_addr_t, u64, enum i915_cache_level, u32)' (aka 'void (struct i915_address_space *, unsigned int, unsigned long long, enum i915_cache_level, unsigned int)') [-Werror,-Wincompatible-function-pointer-types-strict] ggtt->vm.insert_page = gmch_ggtt_insert_page; ^ ~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c:103:26: error: incompatible function pointer types assigning to 'void (*)(struct i915_address_space *, struct i915_vma_resource *, unsigned int, u32)' (aka 'void (*)(struct i915_address_space *, struct i915_vma_resource *, unsigned int, unsigned int)') from 'void (struct i915_address_space *, struct i915_vma_resource *, enum i915_cache_level, u32)' (aka 'void (struct i915_address_space *, struct i915_vma_resource *, enum i915_cache_level, unsigned int)') [-Werror, -Wincompatible-function-pointer-types-strict] ggtt->vm.insert_entries = gmch_ggtt_insert_entries; ^ ~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. The warning is pointing out that while 'enum i915_cache_level' and 'unsigned int' are ABI compatible, these indirect calls will fail clang's kernel Control Flow Integrity (kCFI) checks, as the callback's signature does not exactly match the prototype's signature. To fix this, replace the cache_level parameter with pat_index, as was done in other places within i915 where there is no difference between cache_level and pat_index on certain generations. Fixes: 9275277 ("drm/i915: use pat_index instead of cache_level") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Reviewed-by: Fei Yang <fei.yang@intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230530-i915-gt-cache_level-wincompatible-function-pointer-types-strict-v1-2-54501d598229@kernel.org
1 parent 4722e2e commit 1baeef6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
static void gmch_ggtt_insert_page(struct i915_address_space *vm,
1919
dma_addr_t addr,
2020
u64 offset,
21-
enum i915_cache_level cache_level,
21+
unsigned int pat_index,
2222
u32 unused)
2323
{
24-
unsigned int flags = (cache_level == I915_CACHE_NONE) ?
24+
unsigned int flags = (pat_index == I915_CACHE_NONE) ?
2525
AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
2626

2727
intel_gmch_gtt_insert_page(addr, offset >> PAGE_SHIFT, flags);
2828
}
2929

3030
static void gmch_ggtt_insert_entries(struct i915_address_space *vm,
3131
struct i915_vma_resource *vma_res,
32-
enum i915_cache_level cache_level,
32+
unsigned int pat_index,
3333
u32 unused)
3434
{
35-
unsigned int flags = (cache_level == I915_CACHE_NONE) ?
35+
unsigned int flags = (pat_index == I915_CACHE_NONE) ?
3636
AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
3737

3838
intel_gmch_gtt_insert_sg_entries(vma_res->bi.pages, vma_res->start >> PAGE_SHIFT,

0 commit comments

Comments
 (0)