Re: [PATCH 06/14] drm/i915: Keep sprite plane src rect in 16.16 format

Matt Roper
2015-04-09T23:57:48Z

On Thu, Apr 09, 2015 at 04:41:54PM -0700, Chandra Konduru wrote:
> This patch keeps intel_plane_state->src rect back
> into 16.16 format.
>
> v2:
> -sprite src rect to match primary format (Matt, Daniel)
>
> v3:
> -moved a hunk from #14 to keep src rect in check & commit in tandom (Matt)
>
> Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

> ---
> drivers/gpu/drm/i915/intel_sprite.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index ac4aa68..1ffbe86 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1006,10 +1006,10 @@ intel_check_sprite_plane(struct drm_plane *plane,
> }
>
> if (state->visible) {
> - src->x1 = src_x;
> - src->x2 = src_x + src_w;
> - src->y1 = src_y;
> - src->y2 = src_y + src_h;
> + src->x1 = src_x << 16;
> + src->x2 = (src_x + src_w) << 16;
> + src->y1 = src_y << 16;
> + src->y2 = (src_y + src_h) << 16;
> }
>
> dst->x1 = crtc_x;
> @@ -1081,10 +1081,10 @@ intel_commit_sprite_plane(struct drm_plane *plane,
> crtc_y = state->dst.y1;
> crtc_w = drm_rect_width(&state->dst);
> crtc_h = drm_rect_height(&state->dst);
> - src_x = state->src.x1;
> - src_y = state->src.y1;
> - src_w = drm_rect_width(&state->src);
> - src_h = drm_rect_height(&state->src);
> + src_x = state->src.x1 >> 16;
> + src_y = state->src.y1 >> 16;
> + src_w = drm_rect_width(&state->src) >> 16;
> + src_h = drm_rect_height(&state->src) >> 16;
> intel_plane->update_plane(plane, crtc, fb,
> crtc_x, crtc_y, crtc_w, crtc_h,
> src_x, src_y, src_w, src_h);
> --
> 1.7.9.5
>

--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795