On Wed, Jan 20, 2016 at 09:05:22PM +0200, ville.syrj...@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> 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: Ville Syrjälä <ville.syrj...@linux.intel.com>
Assuming gcc is happy: Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
> drivers/gpu/drm/i915/i915_gem_gtt.h | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
> b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 7377b6725c33..a3ea6b15c762 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -3366,7 +3366,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;
> @@ -3598,7 +3598,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 {
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h
> b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index e5737963ab79..f520c90e5377 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 06ab6df8ad48..5f8e3f7abca1 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -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;
> }
>
> --
> 2.4.10
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
