diff mbox

[07/18] drm/i915: Store ggtt_view in plane_state

Message ID 20180719182214.4323-8-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä July 19, 2018, 6:22 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Stash the gtt_view structure into the plane state. This will become
useful when we do GTT remapping as the gtt_view will not come directly
from the fb anymore.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 16 +++++++++-------
 drivers/gpu/drm/i915/intel_drv.h     |  3 ++-
 drivers/gpu/drm/i915/intel_fbdev.c   |  6 ++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

Comments

Souza, Jose Aug. 24, 2018, 8:13 p.m. UTC | #1 
On Thu, 2018-07-19 at 21:22 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Stash the gtt_view structure into the plane state. This will become
> useful when we do GTT remapping as the gtt_view will not come
> directly
> from the fb anymore.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 16 +++++++++-------
>  drivers/gpu/drm/i915/intel_drv.h     |  3 ++-
>  drivers/gpu/drm/i915/intel_fbdev.c   |  6 ++++--
>  3 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index eadb8b20d504..e6cb8238f257 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2079,14 +2079,13 @@ static bool intel_plane_uses_fence(const
> struct intel_plane_state *plane_state)
>  
>  struct i915_vma *
>  intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
> -			   unsigned int rotation,
> +			   const struct i915_ggtt_view *view,
>  			   bool uses_fence,
>  			   unsigned long *out_flags)
>  {
>  	struct drm_device *dev = fb->dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	struct drm_i915_gem_object *obj = intel_fb_obj(fb);
> -	struct i915_ggtt_view view;
>  	struct i915_vma *vma;
>  	unsigned int pinctl;
>  	u32 alignment;
> @@ -2095,8 +2094,6 @@ intel_pin_and_fence_fb_obj(struct
> drm_framebuffer *fb,
>  
>  	alignment = intel_surf_alignment(fb, 0);
>  
> -	intel_fill_fb_ggtt_view(&view, fb, rotation);
> -
>  	/* Note that the w/a also requires 64 PTE of padding following
> the
>  	 * bo. We currently fill all unused PTE with the shadow page
> and so
>  	 * we should always have valid PTE following the scanout
> preventing
> @@ -2129,7 +2126,7 @@ intel_pin_and_fence_fb_obj(struct
> drm_framebuffer *fb,
>  		pinctl |= PIN_MAPPABLE;
>  
>  	vma = i915_gem_object_pin_to_display_plane(obj,
> -						   alignment, &view,
> pinctl);
> +						   alignment, view,
> pinctl);
>  	if (IS_ERR(vma))
>  		goto err;
>  
> @@ -2851,13 +2848,15 @@ intel_find_initial_plane_obj(struct
> intel_crtc *intel_crtc,
>  	return;
>  
>  valid_fb:
> +	intel_fill_fb_ggtt_view(&intel_state->view, fb,
> +				intel_state->base.rotation);
>  	intel_state->color_plane[0].stride =
>  		intel_fb_pitch(fb, 0, intel_state->base.rotation);
>  
>  	mutex_lock(&dev->struct_mutex);
>  	intel_state->vma =
>  		intel_pin_and_fence_fb_obj(fb,
> -					   primary->state->rotation,
> +					   &intel_state->view,
>  					   intel_plane_uses_fence(intel
> _state),
>  					   &intel_state->flags);
>  	mutex_unlock(&dev->struct_mutex);
> @@ -3171,6 +3170,7 @@ int skl_check_plane_surface(const struct
> intel_crtc_state *crtc_state,
>  	unsigned int rotation = plane_state->base.rotation;
>  	int ret;
>  
> +	intel_fill_fb_ggtt_view(&plane_state->view, fb, rotation);
>  	plane_state->color_plane[0].stride = intel_fb_pitch(fb, 0,
> rotation);
>  	plane_state->color_plane[1].stride = intel_fb_pitch(fb, 1,
> rotation);
>  
> @@ -3315,6 +3315,7 @@ int i9xx_check_plane_surface(struct
> intel_plane_state *plane_state)
>  	int src_y = plane_state->base.src.y1 >> 16;
>  	u32 offset;
>  
> +	intel_fill_fb_ggtt_view(&plane_state->view, fb, rotation);
>  	plane_state->color_plane[0].stride = intel_fb_pitch(fb, 0,
> rotation);
>  
>  	intel_add_fb_offsets(&src_x, &src_y, plane_state, 0);
> @@ -9691,6 +9692,7 @@ static int intel_check_cursor(struct
> intel_crtc_state *crtc_state,
>  		return -EINVAL;
>  	}
>  
> +	intel_fill_fb_ggtt_view(&plane_state->view, fb, rotation);
>  	plane_state->color_plane[0].stride = intel_fb_pitch(fb, 0,
> rotation);
>  
>  	src_x = plane_state->base.src_x >> 16;
> @@ -13029,7 +13031,7 @@ static int intel_plane_pin_fb(struct
> intel_plane_state *plane_state)
>  	}
>  
>  	vma = intel_pin_and_fence_fb_obj(fb,
> -					 plane_state->base.rotation,
> +					 &plane_state->view,
>  					 intel_plane_uses_fence(plane_s
> tate),
>  					 &plane_state->flags);
>  	if (IS_ERR(vma))
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index f647f9e1f671..d70276ff3d0e 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -494,6 +494,7 @@ struct intel_atomic_state {
>  
>  struct intel_plane_state {
>  	struct drm_plane_state base;
> +	struct i915_ggtt_view view;
>  	struct i915_vma *vma;
>  	unsigned long flags;
>  #define PLANE_HAS_FENCE BIT(0)
> @@ -1560,7 +1561,7 @@ void intel_release_load_detect_pipe(struct
> drm_connector *connector,
>  				    struct drm_modeset_acquire_ctx
> *ctx);
>  struct i915_vma *
>  intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
> -			   unsigned int rotation,
> +			   const struct i915_ggtt_view *view,
>  			   bool uses_fence,
>  			   unsigned long *out_flags);
>  void intel_unpin_fb_vma(struct i915_vma *vma, unsigned long flags);
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c
> b/drivers/gpu/drm/i915/intel_fbdev.c
> index fb2f9fce34cd..f99332972b7a 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -175,6 +175,9 @@ static int intelfb_create(struct drm_fb_helper
> *helper,
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	struct pci_dev *pdev = dev_priv->drm.pdev;
>  	struct i915_ggtt *ggtt = &dev_priv->ggtt;
> +	const struct i915_ggtt_view view = {
> +		.type = I915_GGTT_VIEW_NORMAL,
> +	};
>  	struct fb_info *info;
>  	struct drm_framebuffer *fb;
>  	struct i915_vma *vma;
> @@ -214,8 +217,7 @@ static int intelfb_create(struct drm_fb_helper
> *helper,
>  	 * BIOS is suitable for own access.
>  	 */
>  	vma = intel_pin_and_fence_fb_obj(&ifbdev->fb->base,
> -					 DRM_MODE_ROTATE_0,
> -					 false, &flags);
> +					 &view, false, &flags);
>  	if (IS_ERR(vma)) {
>  		ret = PTR_ERR(vma);
>  		goto out_unlock;
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index eadb8b20d504..e6cb8238f257 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2079,14 +2079,13 @@  static bool intel_plane_uses_fence(const struct intel_plane_state *plane_state)
 
 struct i915_vma *
 intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
-			   unsigned int rotation,
+			   const struct i915_ggtt_view *view,
 			   bool uses_fence,
 			   unsigned long *out_flags)
 {
 	struct drm_device *dev = fb->dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct drm_i915_gem_object *obj = intel_fb_obj(fb);
-	struct i915_ggtt_view view;
 	struct i915_vma *vma;
 	unsigned int pinctl;
 	u32 alignment;
@@ -2095,8 +2094,6 @@  intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
 
 	alignment = intel_surf_alignment(fb, 0);
 
-	intel_fill_fb_ggtt_view(&view, fb, rotation);
-
 	/* Note that the w/a also requires 64 PTE of padding following the
 	 * bo. We currently fill all unused PTE with the shadow page and so
 	 * we should always have valid PTE following the scanout preventing
@@ -2129,7 +2126,7 @@  intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
 		pinctl |= PIN_MAPPABLE;
 
 	vma = i915_gem_object_pin_to_display_plane(obj,
-						   alignment, &view, pinctl);
+						   alignment, view, pinctl);
 	if (IS_ERR(vma))
 		goto err;
 
@@ -2851,13 +2848,15 @@  intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
 	return;
 
 valid_fb:
+	intel_fill_fb_ggtt_view(&intel_state->view, fb,
+				intel_state->base.rotation);
 	intel_state->color_plane[0].stride =
 		intel_fb_pitch(fb, 0, intel_state->base.rotation);
 
 	mutex_lock(&dev->struct_mutex);
 	intel_state->vma =
 		intel_pin_and_fence_fb_obj(fb,
-					   primary->state->rotation,
+					   &intel_state->view,
 					   intel_plane_uses_fence(intel_state),
 					   &intel_state->flags);
 	mutex_unlock(&dev->struct_mutex);
@@ -3171,6 +3170,7 @@  int skl_check_plane_surface(const struct intel_crtc_state *crtc_state,
 	unsigned int rotation = plane_state->base.rotation;
 	int ret;
 
+	intel_fill_fb_ggtt_view(&plane_state->view, fb, rotation);
 	plane_state->color_plane[0].stride = intel_fb_pitch(fb, 0, rotation);
 	plane_state->color_plane[1].stride = intel_fb_pitch(fb, 1, rotation);
 
@@ -3315,6 +3315,7 @@  int i9xx_check_plane_surface(struct intel_plane_state *plane_state)
 	int src_y = plane_state->base.src.y1 >> 16;
 	u32 offset;
 
+	intel_fill_fb_ggtt_view(&plane_state->view, fb, rotation);
 	plane_state->color_plane[0].stride = intel_fb_pitch(fb, 0, rotation);
 
 	intel_add_fb_offsets(&src_x, &src_y, plane_state, 0);
@@ -9691,6 +9692,7 @@  static int intel_check_cursor(struct intel_crtc_state *crtc_state,
 		return -EINVAL;
 	}
 
+	intel_fill_fb_ggtt_view(&plane_state->view, fb, rotation);
 	plane_state->color_plane[0].stride = intel_fb_pitch(fb, 0, rotation);
 
 	src_x = plane_state->base.src_x >> 16;
@@ -13029,7 +13031,7 @@  static int intel_plane_pin_fb(struct intel_plane_state *plane_state)
 	}
 
 	vma = intel_pin_and_fence_fb_obj(fb,
-					 plane_state->base.rotation,
+					 &plane_state->view,
 					 intel_plane_uses_fence(plane_state),
 					 &plane_state->flags);
 	if (IS_ERR(vma))
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index f647f9e1f671..d70276ff3d0e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -494,6 +494,7 @@  struct intel_atomic_state {
 
 struct intel_plane_state {
 	struct drm_plane_state base;
+	struct i915_ggtt_view view;
 	struct i915_vma *vma;
 	unsigned long flags;
 #define PLANE_HAS_FENCE BIT(0)
@@ -1560,7 +1561,7 @@  void intel_release_load_detect_pipe(struct drm_connector *connector,
 				    struct drm_modeset_acquire_ctx *ctx);
 struct i915_vma *
 intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
-			   unsigned int rotation,
+			   const struct i915_ggtt_view *view,
 			   bool uses_fence,
 			   unsigned long *out_flags);
 void intel_unpin_fb_vma(struct i915_vma *vma, unsigned long flags);
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index fb2f9fce34cd..f99332972b7a 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -175,6 +175,9 @@  static int intelfb_create(struct drm_fb_helper *helper,
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct i915_ggtt *ggtt = &dev_priv->ggtt;
+	const struct i915_ggtt_view view = {
+		.type = I915_GGTT_VIEW_NORMAL,
+	};
 	struct fb_info *info;
 	struct drm_framebuffer *fb;
 	struct i915_vma *vma;
@@ -214,8 +217,7 @@  static int intelfb_create(struct drm_fb_helper *helper,
 	 * BIOS is suitable for own access.
 	 */
 	vma = intel_pin_and_fence_fb_obj(&ifbdev->fb->base,
-					 DRM_MODE_ROTATE_0,
-					 false, &flags);
+					 &view, false, &flags);
 	if (IS_ERR(vma)) {
 		ret = PTR_ERR(vma);
 		goto out_unlock;