[PATCH 4/9] drm/i915: Use drm_plane_state.{src,dst,visible}

[Sean Paul]

On Tue, Jul 26, 2016 at 12:06 PM,   wrote:
> From: Ville Syrjälä 
>
> Replace the private drm_rects/flags in intel_plane_state
> with the ones now living in drm_plane_state.
>
> Signed-off-by: Ville Syrjälä 

Reviewed-by: Sean Paul 

> ---
>  drivers/gpu/drm/i915/intel_atomic_plane.c |  20 ++---
>  drivers/gpu/drm/i915/intel_display.c  | 132 
> +++---
>  drivers/gpu/drm/i915/intel_drv.h  |   3 -
>  drivers/gpu/drm/i915/intel_fbc.c  |  12 +--
>  drivers/gpu/drm/i915/intel_pm.c   |  60 +++---
>  drivers/gpu/drm/i915/intel_sprite.c   |  84 +--
>  6 files changed, 156 insertions(+), 155 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c 
> b/drivers/gpu/drm/i915/intel_atomic_plane.c
> index 7de7721f65bc..14d40261db21 100644
> --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
> @@ -139,14 +139,14 @@ static int intel_plane_atomic_check(struct drm_plane 
> *plane,
>  * we want to keep another copy internal to our driver that we can
>  * clip/modify ourselves.
>  */
> -   intel_state->src.x1 = state->src_x;
> -   intel_state->src.y1 = state->src_y;
> -   intel_state->src.x2 = state->src_x + state->src_w;
> -   intel_state->src.y2 = state->src_y + state->src_h;
> -   intel_state->dst.x1 = state->crtc_x;
> -   intel_state->dst.y1 = state->crtc_y;
> -   intel_state->dst.x2 = state->crtc_x + state->crtc_w;
> -   intel_state->dst.y2 = state->crtc_y + state->crtc_h;
> +   intel_state->base.src.x1 = state->src_x;
> +   intel_state->base.src.y1 = state->src_y;
> +   intel_state->base.src.x2 = state->src_x + state->src_w;
> +   intel_state->base.src.y2 = state->src_y + state->src_h;
> +   intel_state->base.dst.x1 = state->crtc_x;
> +   intel_state->base.dst.y1 = state->crtc_y;
> +   intel_state->base.dst.x2 = state->crtc_x + state->crtc_w;
> +   intel_state->base.dst.y2 = state->crtc_y + state->crtc_h;
>
> /* Clip all planes to CRTC size, or 0x0 if CRTC is disabled */
> intel_state->clip.x1 = 0;
> @@ -180,7 +180,7 @@ static int intel_plane_atomic_check(struct drm_plane 
> *plane,
> }
> }
>
> -   intel_state->visible = false;
> +   intel_state->base.visible = false;
> ret = intel_plane->check_plane(plane, crtc_state, intel_state);
> if (ret)
> return ret;
> @@ -196,7 +196,7 @@ static void intel_plane_atomic_update(struct drm_plane 
> *plane,
> to_intel_plane_state(plane->state);
> struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc;
>
> -   if (intel_state->visible)
> +   if (intel_state->base.visible)
> intel_plane->update_plane(plane,
>   to_intel_crtc_state(crtc->state),
>   intel_state);
> diff --git a/drivers/gpu/drm/i915/intel_display.c 
> b/drivers/gpu/drm/i915/intel_display.c
> index 78beb7e9d384..4f67b7c19b75 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2565,7 +2565,7 @@ intel_find_initial_plane_obj(struct intel_crtc 
> *intel_crtc,
>  * simplest solution is to just disable the primary plane now and
>  * pretend the BIOS never had it enabled.
>  */
> -   to_intel_plane_state(plane_state)->visible = false;
> +   to_intel_plane_state(plane_state)->base.visible = false;
> crtc_state->plane_mask &= ~(1 << drm_plane_index(primary));
> intel_pre_disable_primary_noatomic(_crtc->base);
> intel_plane->disable_plane(primary, _crtc->base);
> @@ -2583,14 +2583,14 @@ valid_fb:
> plane_state->crtc_w = fb->width;
> plane_state->crtc_h = fb->height;
>
> -   intel_state->src.x1 = plane_state->src_x;
> -   intel_state->src.y1 = plane_state->src_y;
> -   intel_state->src.x2 = plane_state->src_x + plane_state->src_w;
> -   intel_state->src.y2 = plane_state->src_y + plane_state->src_h;
> -   intel_state->dst.x1 = plane_state->crtc_x;
> -   intel_state->dst.y1 = plane_state->crtc_y;
> -   intel_state->dst.x2 = plane_state->crtc_x + plane_state->crtc_w;
> -   intel_state->dst.y2 = plane_state->crtc_y + plane_state->crtc_h;
> +   intel_state->base.src.x1 = plane_state->src_x;
> +   intel_state->base.src.y1 = plane_state->src_y;
> +   intel_state->base.src.x2 = plane_state->src_x + plane_state->src_w;
> +   intel_state->base.src.y2 = plane_state->src_y + plane_state->src_h;
> +   intel_state->base.dst.x1 = plane_state->crtc_x;
> +   intel_state->base.dst.y1 = plane_state->crtc_y;
> +   intel_state->base.dst.x2 = plane_state->crtc_x + plane_state->crtc_w;
> +   intel_state->base.dst.y2 = plane_state->crtc_y + plane_state->crtc_h;
>
> obj = intel_fb_obj(fb);
> if (obj->tiling_mode != 

[PATCH 4/9] drm/i915: Use drm_plane_state.{src,dst,visible}

[ville.syrj...@linux.intel.com]

From: Ville Syrjälä 

Replace the private drm_rects/flags in intel_plane_state
with the ones now living in drm_plane_state.

Signed-off-by: Ville Syrjälä 
---
 drivers/gpu/drm/i915/intel_atomic_plane.c |  20 ++---
 drivers/gpu/drm/i915/intel_display.c  | 132 +++---
 drivers/gpu/drm/i915/intel_drv.h  |   3 -
 drivers/gpu/drm/i915/intel_fbc.c  |  12 +--
 drivers/gpu/drm/i915/intel_pm.c   |  60 +++---
 drivers/gpu/drm/i915/intel_sprite.c   |  84 +--
 6 files changed, 156 insertions(+), 155 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c 
b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 7de7721f65bc..14d40261db21 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -139,14 +139,14 @@ static int intel_plane_atomic_check(struct drm_plane 
*plane,
 * we want to keep another copy internal to our driver that we can
 * clip/modify ourselves.
 */
-   intel_state->src.x1 = state->src_x;
-   intel_state->src.y1 = state->src_y;
-   intel_state->src.x2 = state->src_x + state->src_w;
-   intel_state->src.y2 = state->src_y + state->src_h;
-   intel_state->dst.x1 = state->crtc_x;
-   intel_state->dst.y1 = state->crtc_y;
-   intel_state->dst.x2 = state->crtc_x + state->crtc_w;
-   intel_state->dst.y2 = state->crtc_y + state->crtc_h;
+   intel_state->base.src.x1 = state->src_x;
+   intel_state->base.src.y1 = state->src_y;
+   intel_state->base.src.x2 = state->src_x + state->src_w;
+   intel_state->base.src.y2 = state->src_y + state->src_h;
+   intel_state->base.dst.x1 = state->crtc_x;
+   intel_state->base.dst.y1 = state->crtc_y;
+   intel_state->base.dst.x2 = state->crtc_x + state->crtc_w;
+   intel_state->base.dst.y2 = state->crtc_y + state->crtc_h;

/* Clip all planes to CRTC size, or 0x0 if CRTC is disabled */
intel_state->clip.x1 = 0;
@@ -180,7 +180,7 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
}
}

-   intel_state->visible = false;
+   intel_state->base.visible = false;
ret = intel_plane->check_plane(plane, crtc_state, intel_state);
if (ret)
return ret;
@@ -196,7 +196,7 @@ static void intel_plane_atomic_update(struct drm_plane 
*plane,
to_intel_plane_state(plane->state);
struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc;

-   if (intel_state->visible)
+   if (intel_state->base.visible)
intel_plane->update_plane(plane,
  to_intel_crtc_state(crtc->state),
  intel_state);
diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 78beb7e9d384..4f67b7c19b75 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2565,7 +2565,7 @@ intel_find_initial_plane_obj(struct intel_crtc 
*intel_crtc,
 * simplest solution is to just disable the primary plane now and
 * pretend the BIOS never had it enabled.
 */
-   to_intel_plane_state(plane_state)->visible = false;
+   to_intel_plane_state(plane_state)->base.visible = false;
crtc_state->plane_mask &= ~(1 << drm_plane_index(primary));
intel_pre_disable_primary_noatomic(_crtc->base);
intel_plane->disable_plane(primary, _crtc->base);
@@ -2583,14 +2583,14 @@ valid_fb:
plane_state->crtc_w = fb->width;
plane_state->crtc_h = fb->height;

-   intel_state->src.x1 = plane_state->src_x;
-   intel_state->src.y1 = plane_state->src_y;
-   intel_state->src.x2 = plane_state->src_x + plane_state->src_w;
-   intel_state->src.y2 = plane_state->src_y + plane_state->src_h;
-   intel_state->dst.x1 = plane_state->crtc_x;
-   intel_state->dst.y1 = plane_state->crtc_y;
-   intel_state->dst.x2 = plane_state->crtc_x + plane_state->crtc_w;
-   intel_state->dst.y2 = plane_state->crtc_y + plane_state->crtc_h;
+   intel_state->base.src.x1 = plane_state->src_x;
+   intel_state->base.src.y1 = plane_state->src_y;
+   intel_state->base.src.x2 = plane_state->src_x + plane_state->src_w;
+   intel_state->base.src.y2 = plane_state->src_y + plane_state->src_h;
+   intel_state->base.dst.x1 = plane_state->crtc_x;
+   intel_state->base.dst.y1 = plane_state->crtc_y;
+   intel_state->base.dst.x2 = plane_state->crtc_x + plane_state->crtc_w;
+   intel_state->base.dst.y2 = plane_state->crtc_y + plane_state->crtc_h;

obj = intel_fb_obj(fb);
if (obj->tiling_mode != I915_TILING_NONE)
@@ -2618,8 +2618,8 @@ static void i9xx_update_primary_plane(struct drm_plane 
*primary,
i915_reg_t reg = DSPCNTR(plane);
unsigned int rotation = plane_state->base.rotation;
int cpp = 

[PATCH 4/9] drm/i915: Use drm_plane_state.{src,dst,visible}

[Chris Wilson]

On Tue, Jul 26, 2016 at 07:06:59PM +0300, ville.syrjala at linux.intel.com 
wrote:
> From: Ville Syrjälä 
> 
> Replace the private drm_rects/flags in intel_plane_state
> with the ones now living in drm_plane_state.
> 
> Signed-off-by: Ville Syrjälä 

Didn't spot any mistakes creeping in, and assuming the patch is
complete:
Reviewed-by: Chris Wilson 
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre