Commit 3bb6a442 authored by Niranjana Vishwanathapura's avatar Niranjana Vishwanathapura Committed by Tvrtko Ursulin
Browse files

drm/i915: Rename ggtt_view as gtt_view 



So far, different views (normal, partial, rotated and remapped)
into the same object are only supported for GGTT mappings.
But with the upcoming VM_BIND feature, PPGTT will also use the
partial view mapping. Hence rename ggtt_view to more generic
gtt_view.

Signed-off-by: default avatarNiranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220901183854.3446-1-niranjana.vishwanathapura@intel.com
parent 65332a5b

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ bool intel_plane_uses_fence(const struct intel_plane_state *plane_state) 


	return DISPLAY_VER(dev_priv) < 4 ||

		(plane->fbc &&

		 plane_state->view.gtt.type == I915_GGTT_VIEW_NORMAL);

		 plane_state->view.gtt.type == I915_GTT_VIEW_NORMAL);

}



/*

drivers/gpu/drm/i915/display/intel_display.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct drm_modeset_acquire_ctx; 
struct drm_plane;

struct drm_plane_state;

struct i915_address_space;

struct i915_ggtt_view;

struct i915_gtt_view;

struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;

drivers/gpu/drm/i915/display/intel_display_types.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct intel_fb_view { 
	 * In the normal view the FB object's backing store sg list is used

	 * directly and hence the remap information here is not used.

	 */

	struct i915_ggtt_view gtt;

	struct i915_gtt_view gtt;



	/*

	 * The GTT view (gtt.type) specific information for each FB color

drivers/gpu/drm/i915/display/intel_fb.c

+9 −9
Original line number Diff line number Diff line
@@ -1394,7 +1394,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 (view->gtt.type == I915_GGTT_VIEW_ROTATED) {

	if (view->gtt.type == I915_GTT_VIEW_ROTATED) {

		drm_WARN_ON(&i915->drm, remap_info->linear);

		check_array_bounds(i915, view->gtt.rotated.plane, color_plane);
@@ -1419,7 +1419,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(&i915->drm, view->gtt.type != I915_GGTT_VIEW_REMAPPED);

		drm_WARN_ON(&i915->drm, view->gtt.type != I915_GTT_VIEW_REMAPPED);



		check_array_bounds(i915, view->gtt.remapped.plane, color_plane);
@@ -1502,12 +1502,12 @@ calc_plane_normal_size(const struct intel_framebuffer *fb, int color_plane, 
}



static void intel_fb_view_init(struct drm_i915_private *i915, struct intel_fb_view *view,

			       enum i915_ggtt_view_type view_type)

			       enum i915_gtt_view_type view_type)

{

	memset(view, 0, sizeof(*view));

	view->gtt.type = view_type;



	if (view_type == I915_GGTT_VIEW_REMAPPED && IS_ALDERLAKE_P(i915))

	if (view_type == I915_GTT_VIEW_REMAPPED && IS_ALDERLAKE_P(i915))

		view->gtt.remapped.plane_alignment = SZ_2M / PAGE_SIZE;

}
@@ -1529,16 +1529,16 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer * 
	int i, num_planes = fb->base.format->num_planes;

	unsigned int tile_size = intel_tile_size(i915);



	intel_fb_view_init(i915, &fb->normal_view, I915_GGTT_VIEW_NORMAL);

	intel_fb_view_init(i915, &fb->normal_view, I915_GTT_VIEW_NORMAL);



	drm_WARN_ON(&i915->drm,

		    intel_fb_supports_90_270_rotation(fb) &&

		    intel_fb_needs_pot_stride_remap(fb));



	if (intel_fb_supports_90_270_rotation(fb))

		intel_fb_view_init(i915, &fb->rotated_view, I915_GGTT_VIEW_ROTATED);

		intel_fb_view_init(i915, &fb->rotated_view, I915_GTT_VIEW_ROTATED);

	if (intel_fb_needs_pot_stride_remap(fb))

		intel_fb_view_init(i915, &fb->remapped_view, I915_GGTT_VIEW_REMAPPED);

		intel_fb_view_init(i915, &fb->remapped_view, I915_GTT_VIEW_REMAPPED);



	for (i = 0; i < num_planes; i++) {

		struct fb_plane_view_dims view_dims;
@@ -1619,8 +1619,8 @@ static void intel_plane_remap_gtt(struct intel_plane_state *plane_state) 
	u32 gtt_offset = 0;



	intel_fb_view_init(i915, &plane_state->view,

			   drm_rotation_90_or_270(rotation) ? I915_GGTT_VIEW_ROTATED :

							      I915_GGTT_VIEW_REMAPPED);

			   drm_rotation_90_or_270(rotation) ? I915_GTT_VIEW_ROTATED :

							      I915_GTT_VIEW_REMAPPED);



	src_x = plane_state->uapi.src.x1 >> 16;

	src_y = plane_state->uapi.src.y1 >> 16;

drivers/gpu/drm/i915/display/intel_fb_pin.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


static struct i915_vma *

intel_pin_fb_obj_dpt(struct drm_framebuffer *fb,

		     const struct i915_ggtt_view *view,

		     const struct i915_gtt_view *view,

		     bool uses_fence,

		     unsigned long *out_flags,

		     struct i915_address_space *vm)
@@ -79,7 +79,7 @@ intel_pin_fb_obj_dpt(struct drm_framebuffer *fb, 
struct i915_vma *

intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,

			   bool phys_cursor,

			   const struct i915_ggtt_view *view,

			   const struct i915_gtt_view *view,

			   bool uses_fence,

			   unsigned long *out_flags)

{