|
@@ -1127,11 +1127,7 @@ i915_gem_shmem_pread(struct drm_i915_gem_object *obj,
|
|
|
offset = offset_in_page(args->offset);
|
|
|
for (idx = args->offset >> PAGE_SHIFT; remain; idx++) {
|
|
|
struct page *page = i915_gem_object_get_page(obj, idx);
|
|
|
- int length;
|
|
|
-
|
|
|
- length = remain;
|
|
|
- if (offset + length > PAGE_SIZE)
|
|
|
- length = PAGE_SIZE - offset;
|
|
|
+ unsigned int length = min_t(u64, remain, PAGE_SIZE - offset);
|
|
|
|
|
|
ret = shmem_pread(page, offset, length, user_data,
|
|
|
page_to_phys(page) & obj_do_bit17_swizzling,
|
|
@@ -1575,11 +1571,7 @@ i915_gem_shmem_pwrite(struct drm_i915_gem_object *obj,
|
|
|
offset = offset_in_page(args->offset);
|
|
|
for (idx = args->offset >> PAGE_SHIFT; remain; idx++) {
|
|
|
struct page *page = i915_gem_object_get_page(obj, idx);
|
|
|
- int length;
|
|
|
-
|
|
|
- length = remain;
|
|
|
- if (offset + length > PAGE_SIZE)
|
|
|
- length = PAGE_SIZE - offset;
|
|
|
+ unsigned int length = min_t(u64, remain, PAGE_SIZE - offset);
|
|
|
|
|
|
ret = shmem_pwrite(page, offset, length, user_data,
|
|
|
page_to_phys(page) & obj_do_bit17_swizzling,
|