diff options
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fb.c | 8 | ||||
| -rw-r--r-- | include/drm/intel/gtt_view_types.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index c3e4c3f6d8cf..63b7644c5659 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1289,7 +1289,7 @@ bool intel_plane_uses_fence(const struct intel_plane_state *plane_state) return intel_plane_needs_fence(display) || (plane->fbc && !plane_state->no_fbc_reason && - i915_gtt_view_is_normal(&plane_state->view.gtt)); + intel_gtt_view_is_normal(&plane_state->view.gtt)); } static int intel_fb_pitch(const struct intel_framebuffer *fb, int color_plane, unsigned int rotation) @@ -1511,7 +1511,7 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p plane_view_height_tiles(fb, color_plane, dims, y)); } - if (i915_gtt_view_is_rotated(&view->gtt)) { + if (intel_gtt_view_is_rotated(&view->gtt)) { drm_WARN_ON(display->drm, remap_info->linear); check_array_bounds(display, view->gtt.rotated.plane, color_plane); @@ -1536,7 +1536,7 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p /* rotate the tile dimensions to match the GTT view */ swap(tile_width, tile_height); } else { - drm_WARN_ON(display->drm, !i915_gtt_view_is_remapped(&view->gtt)); + drm_WARN_ON(display->drm, !intel_gtt_view_is_remapped(&view->gtt)); check_array_bounds(display, view->gtt.remapped.plane, color_plane); @@ -1638,7 +1638,7 @@ static void intel_fb_view_init(struct intel_display *display, memset(view, 0, sizeof(*view)); view->gtt.type = view_type; - if (i915_gtt_view_is_remapped(&view->gtt) && + if (intel_gtt_view_is_remapped(&view->gtt) && intel_fb_needs_pot_stride_remap(fb)) view->gtt.remapped.plane_alignment = SZ_2M / PAGE_SIZE; } diff --git a/include/drm/intel/gtt_view_types.h b/include/drm/intel/gtt_view_types.h index 5770fc53b823..61d2289a8921 100644 --- a/include/drm/intel/gtt_view_types.h +++ b/include/drm/intel/gtt_view_types.h @@ -56,17 +56,17 @@ struct i915_gtt_view { }; }; -static inline bool i915_gtt_view_is_normal(const struct i915_gtt_view *view) +static inline bool intel_gtt_view_is_normal(const struct i915_gtt_view *view) { return view->type == I915_GTT_VIEW_NORMAL; } -static inline bool i915_gtt_view_is_remapped(const struct i915_gtt_view *view) +static inline bool intel_gtt_view_is_remapped(const struct i915_gtt_view *view) { return view->type == I915_GTT_VIEW_REMAPPED; } -static inline bool i915_gtt_view_is_rotated(const struct i915_gtt_view *view) +static inline bool intel_gtt_view_is_rotated(const struct i915_gtt_view *view) { return view->type == I915_GTT_VIEW_ROTATED; } |