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

Commit 11d23e6f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass rotation_info to intel_rotate_fb_obj_pages() 



intel_rotate_fb_obj_pages() doens't need the entire gtt view, just the
rotation info suffices.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453316739-13296-4-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 87130255

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −3
Original line number Diff line number Diff line
@@ -3379,10 +3379,9 @@ rotate_pages(const dma_addr_t *in, unsigned int offset, 
}



static struct sg_table *

intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,

intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,

			  struct drm_i915_gem_object *obj)

{

	struct intel_rotation_info *rot_info = &ggtt_view->params.rotated;

	unsigned int size_pages = rot_info->size >> PAGE_SHIFT;

	unsigned int size_pages_uv;

	struct sg_page_iter sg_iter;
@@ -3522,7 +3521,7 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma) 
		vma->ggtt_view.pages = vma->obj->pages;

	else if (vma->ggtt_view.type == I915_GGTT_VIEW_ROTATED)

		vma->ggtt_view.pages =

			intel_rotate_fb_obj_pages(&vma->ggtt_view, vma->obj);

			intel_rotate_fb_obj_pages(&vma->ggtt_view.params.rotated, vma->obj);

	else if (vma->ggtt_view.type == I915_GGTT_VIEW_PARTIAL)

		vma->ggtt_view.pages =

			intel_partial_pages(&vma->ggtt_view, vma->obj);