3 files changed, 5 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 96e923648360..1f7e6b9df45d 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3328,7 +3328,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->rotation_info;
+        struct intel_rotation_info *rot_info = &ggtt_view->params.rotation_info;
         unsigned int size_pages = rot_info->size >> PAGE_SHIFT;
         unsigned int size_pages_uv;
         struct sg_page_iter sg_iter;
@@ -3560,7 +3560,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->rotation_info.size;
+                return view->params.rotation_info.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 a216397ead52..310f212a321c 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -156,13 +156,10 @@ struct i915_ggtt_view {
                         u64 offset;
                         unsigned int size;
                 } partial;
+                struct intel_rotation_info rotation_info;
         } params;
 
         struct sg_table *pages;
-
-        union {
-                struct intel_rotation_info rotation_info;
-        };
 };
 
 extern const struct i915_ggtt_view i915_ggtt_view_normal;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 78ebea06d96c..4712cca76979 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2265,7 +2265,7 @@ static void
 intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,
                         const struct drm_plane_state *plane_state)
 {
-        struct intel_rotation_info *info = &view->rotation_info;
+        struct intel_rotation_info *info = &view->params.rotation_info;
         unsigned int tile_height, tile_pitch;
 
         *view = i915_ggtt_view_normal;
@@ -2929,7 +2929,7 @@ u32 intel_plane_obj_offset(struct intel_plane *intel_plane,
         offset = vma->node.start;
 
         if (plane == 1) {
-                offset += vma->ggtt_view.rotation_info.uv_start_page *
+                offset += vma->ggtt_view.params.rotation_info.uv_start_page *
                           PAGE_SIZE;
         }