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

Commit da6ca034 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/overlay: Replace i915_gem_obj_ggtt_offset() with the known flip_addr 



When setting up the overlay page, we pin it into the GGTT (when using
virtual addresses) and store the offset as overlay->flip_addr. Rather
than doing a lookup of the GGTT address everytime, we can use the known
address instead.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461833819-3991-2-git-send-email-chris@chris-wilson.co.uk
parent fb4b8ce1

drivers/gpu/drm/i915/intel_overlay.c

+3 −6
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ intel_overlay_map_regs(struct intel_overlay *overlay) 
		regs = (struct overlay_registers __iomem *)overlay->reg_bo->phys_handle->vaddr;

	else

		regs = io_mapping_map_wc(ggtt->mappable,

					 i915_gem_obj_ggtt_offset(overlay->reg_bo));

					 overlay->flip_addr);



	return regs;

}
@@ -1493,7 +1493,7 @@ intel_overlay_map_regs_atomic(struct intel_overlay *overlay) 
			overlay->reg_bo->phys_handle->vaddr;

	else

		regs = io_mapping_map_atomic_wc(ggtt->mappable,

						i915_gem_obj_ggtt_offset(overlay->reg_bo));

						overlay->flip_addr);



	return regs;

}
@@ -1523,10 +1523,7 @@ intel_overlay_capture_error_state(struct drm_device *dev) 


	error->dovsta = I915_READ(DOVSTA);

	error->isr = I915_READ(ISR);

	if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))

		error->base = (__force long)overlay->reg_bo->phys_handle->vaddr;

	else

		error->base = i915_gem_obj_ggtt_offset(overlay->reg_bo);

	error->base = overlay->flip_addr;



	regs = intel_overlay_map_regs_atomic(overlay);

	if (!regs)