Skip to content

Commit 55a6e46

Browse files
trueptolemytursulin
authored andcommitted
drm/i915: Use memcpy_from_page() in gt/uc/intel_uc_fw.c
The use of kmap_atomic() is being deprecated in favor of kmap_local_page()[1], and this patch converts the call from kmap_atomic() to kmap_local_page(). The main difference between atomic and local mappings is that local mappings doesn't disable page faults or preemption (the preemption is disabled for !PREEMPT_RT case, otherwise it only disables migration). With kmap_local_page(), we can avoid the often unwanted side effect of unnecessary page faults or preemption disables. In drm/i915/gt/uc/intel_us_fw.c, the function intel_uc_fw_copy_rsa() just use the mapping to do memory copy so it doesn't need to disable pagefaults and preemption for mapping. Thus the local mapping without atomic context (not disable pagefaults / preemption) is enough. Therefore, intel_uc_fw_copy_rsa() is a function where the use of memcpy_from_page() with kmap_local_page() in place of memcpy() with kmap_atomic() is correctly suited. Convert the calls of memcpy() with kmap_atomic() / kunmap_atomic() to memcpy_from_page() which uses local mapping to copy. [1]: https://lore.kernel.org/all/20220813220034.806698-1-ira.weiny@intel.com/T/#u Suggested-by: Ira Weiny <ira.weiny@intel.com> Suggested-by: Fabio M. De Francesco <fmdefrancesco@gmail.com> Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Fabio M. De Francesco <fmdefrancesco@gmail.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231203132947.2328805-8-zhao1.liu@linux.intel.com
1 parent b1c51b0 commit 55a6e46

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,16 +1343,13 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len)
13431343

13441344
for_each_sgt_page(page, iter, uc_fw->obj->mm.pages) {
13451345
u32 len = min_t(u32, size, PAGE_SIZE - offset);
1346-
void *vaddr;
13471346

13481347
if (idx > 0) {
13491348
idx--;
13501349
continue;
13511350
}
13521351

1353-
vaddr = kmap_atomic(page);
1354-
memcpy(dst, vaddr + offset, len);
1355-
kunmap_atomic(vaddr);
1352+
memcpy_from_page(dst, page, offset, len);
13561353

13571354
offset = 0;
13581355
dst += len;

0 commit comments

Comments
 (0)