aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index dc9a5c1d596c..3852cbaf9163 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2322,8 +2322,6 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,
2322 const struct drm_plane_state *plane_state) 2322 const struct drm_plane_state *plane_state)
2323{ 2323{
2324 struct intel_rotation_info *info = &view->rotation_info; 2324 struct intel_rotation_info *info = &view->rotation_info;
2325 static const struct i915_ggtt_view rotated_view =
2326 { .type = I915_GGTT_VIEW_ROTATED };
2327 2325
2328 *view = i915_ggtt_view_normal; 2326 *view = i915_ggtt_view_normal;
2329 2327
@@ -2333,7 +2331,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,
2333 if (!intel_rotation_90_or_270(plane_state->rotation)) 2331 if (!intel_rotation_90_or_270(plane_state->rotation))
2334 return 0; 2332 return 0;
2335 2333
2336 *view = rotated_view; 2334 *view = i915_ggtt_view_rotated;
2337 2335
2338 info->height = fb->height; 2336 info->height = fb->height;
2339 info->pixel_format = fb->pixel_format; 2337 info->pixel_format = fb->pixel_format;
@@ -2930,10 +2928,10 @@ u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier,
2930unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane, 2928unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane,
2931 struct drm_i915_gem_object *obj) 2929 struct drm_i915_gem_object *obj)
2932{ 2930{
2933 enum i915_ggtt_view_type view = I915_GGTT_VIEW_NORMAL; 2931 const struct i915_ggtt_view *view = &i915_ggtt_view_normal;
2934 2932
2935 if (intel_rotation_90_or_270(intel_plane->base.state->rotation)) 2933 if (intel_rotation_90_or_270(intel_plane->base.state->rotation))
2936 view = I915_GGTT_VIEW_ROTATED; 2934 view = &i915_ggtt_view_rotated;
2937 2935
2938 return i915_gem_obj_ggtt_offset_view(obj, view); 2936 return i915_gem_obj_ggtt_offset_view(obj, view);
2939} 2937}