leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/selftests: Improve handling of iomem around stolen

Browse Source 
Use memset_io() on the iomem, and silence sparse as we copy from the
iomem to normal system pages.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210106123939.18435-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2021-01-06 12:39:37 +00:00
parent 989536a4e6
commit 88b39600da
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/gt/selftest_reset.c
View File

@@ -96,10 +96,10 @@ __igt_reset_stolen(struct intel_gt *gt,
if (!__drm_mm_interval_first(&gt->i915->mm.stolen, if (!__drm_mm_interval_first(&gt->i915->mm.stolen,
page << PAGE_SHIFT, page << PAGE_SHIFT,
((page + 1) << PAGE_SHIFT) - 1)) ((page + 1) << PAGE_SHIFT) - 1))
memset32(s, STACK_MAGIC, PAGE_SIZE / sizeof(u32)); memset_io(s, STACK_MAGIC, PAGE_SIZE);
in = s; in = (void __force *)s;
if (i915_memcpy_from_wc(tmp, s, PAGE_SIZE)) if (i915_memcpy_from_wc(tmp, in, PAGE_SIZE))
in = tmp; in = tmp;
crc[page] = crc32_le(0, in, PAGE_SIZE); crc[page] = crc32_le(0, in, PAGE_SIZE);
@@ -134,8 +134,8 @@ __igt_reset_stolen(struct intel_gt *gt,
ggtt->error_capture.start, ggtt->error_capture.start,
PAGE_SIZE); PAGE_SIZE);
in = s; in = (void __force *)s;
if (i915_memcpy_from_wc(tmp, s, PAGE_SIZE)) if (i915_memcpy_from_wc(tmp, in, PAGE_SIZE))
in = tmp; in = tmp;
x = crc32_le(0, in, PAGE_SIZE); x = crc32_le(0, in, PAGE_SIZE);