Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de51f04f authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Replace open-coded offset_in_page() 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bc86625a

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, 


	reloc->delta += target_offset;

	if (use_cpu_reloc(obj)) {

		uint32_t page_offset = reloc->offset & ~PAGE_MASK;

		uint32_t page_offset = offset_in_page(reloc->offset);

		char *vaddr;



		ret = i915_gem_object_set_to_cpu_domain(obj, 1);
@@ -284,7 +284,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, 
		reloc_page = io_mapping_map_atomic_wc(dev_priv->gtt.mappable,

						      reloc->offset & PAGE_MASK);

		reloc_entry = (uint32_t __iomem *)

			(reloc_page + (reloc->offset & ~PAGE_MASK));

			(reloc_page + offset_in_page(reloc->offset));

		iowrite32(reloc->delta, reloc_entry);

		io_mapping_unmap_atomic(reloc_page);

	}