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

Commit 7723f47d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Rename the rotated gtt view member to 'rotated' 



Also rename 'rotation_info' to 'rotated' to match the view type exactly,
this should avoid confusion which union members is valid for each view
type.

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


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

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -3381,7 +3381,7 @@ static struct sg_table * 
intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,

			  struct drm_i915_gem_object *obj)

{

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

	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;
@@ -3613,7 +3613,7 @@ i915_ggtt_view_size(struct drm_i915_gem_object *obj, 
	if (view->type == I915_GGTT_VIEW_NORMAL) {

		return obj->base.size;

	} else if (view->type == I915_GGTT_VIEW_ROTATED) {

		return view->params.rotation_info.size;

		return view->params.rotated.size;

	} else if (view->type == I915_GGTT_VIEW_PARTIAL) {

		return view->params.partial.size << PAGE_SHIFT;

	} else {

drivers/gpu/drm/i915/i915_gem_gtt.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ struct i915_ggtt_view { 
			u64 offset;

			unsigned int size;

		} partial;

		struct intel_rotation_info rotation_info;

		struct intel_rotation_info rotated;

	} params;



	struct sg_table *pages;

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -2284,7 +2284,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, 
			const struct drm_plane_state *plane_state)

{

	struct drm_i915_private *dev_priv = to_i915(fb->dev);

	struct intel_rotation_info *info = &view->params.rotation_info;

	struct intel_rotation_info *info = &view->params.rotated;

	unsigned int tile_size, tile_width, tile_height, cpp;



	*view = i915_ggtt_view_normal;
@@ -2951,7 +2951,7 @@ u32 intel_plane_obj_offset(struct intel_plane *intel_plane, 
	offset = vma->node.start;



	if (plane == 1) {

		offset += vma->ggtt_view.params.rotation_info.uv_start_page *

		offset += vma->ggtt_view.params.rotated.uv_start_page *

			  PAGE_SIZE;

	}