On Thu, 13 Nov 2014 10:43:26 -0800
Matt Roper <matthew.d.roper@xxxxxxxxx> wrote:
> The userspace-requested plane coordinates are now stored in
> plane->state.base (and the i915-adjusted values are stored in
> plane->state), so we no longer use the coordinate fields in intel_plane
> or the orig_{src,dst} fields in intel_plane_state. Drop them.
>
> Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
Reviewed-by: Bob Paauwe <bob.j.paauwe@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 16 ----------------
> drivers/gpu/drm/i915/intel_drv.h | 6 ------
> drivers/gpu/drm/i915/intel_sprite.c | 8 --------
> 3 files changed, 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8d5a3b4..a595a58 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11526,14 +11526,6 @@ intel_commit_primary_plane(struct drm_plane *plane,
> crtc->x = src->x1;
> crtc->y = src->y1;
>
> - intel_plane->crtc_x = state->orig_dst.x1;
> - intel_plane->crtc_y = state->orig_dst.y1;
> - intel_plane->crtc_w = drm_rect_width(&state->orig_dst);
> - intel_plane->crtc_h = drm_rect_height(&state->orig_dst);
> - intel_plane->src_x = state->orig_src.x1;
> - intel_plane->src_y = state->orig_src.y1;
> - intel_plane->src_w = drm_rect_width(&state->orig_src);
> - intel_plane->src_h = drm_rect_height(&state->orig_src);
> intel_plane->obj = obj;
>
> if (intel_crtc->active) {
> @@ -11748,14 +11740,6 @@ intel_commit_cursor_plane(struct drm_plane *plane,
> crtc->cursor_x = state->base.crtc_x;
> crtc->cursor_y = state->base.crtc_y;
>
> - intel_plane->crtc_x = state->orig_dst.x1;
> - intel_plane->crtc_y = state->orig_dst.y1;
> - intel_plane->crtc_w = drm_rect_width(&state->orig_dst);
> - intel_plane->crtc_h = drm_rect_height(&state->orig_dst);
> - intel_plane->src_x = state->orig_src.x1;
> - intel_plane->src_y = state->orig_src.y1;
> - intel_plane->src_w = drm_rect_width(&state->orig_src);
> - intel_plane->src_h = drm_rect_height(&state->orig_src);
> intel_plane->obj = obj;
>
> if (fb != crtc->cursor->fb) {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 1882de1..fdebeea 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -248,8 +248,6 @@ struct intel_plane_state {
> struct drm_rect src;
> struct drm_rect dst;
> struct drm_rect clip;
> - struct drm_rect orig_src;
> - struct drm_rect orig_dst;
> bool visible;
> };
>
> @@ -485,10 +483,6 @@ struct intel_plane {
> struct drm_i915_gem_object *obj;
> bool can_scale;
> int max_downscale;
> - int crtc_x, crtc_y;
> - unsigned int crtc_w, crtc_h;
> - uint32_t src_x, src_y;
> - uint32_t src_w, src_h;
> unsigned int rotation;
>
> /* Since we need to change the watermarks before/after
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 28ccaf7..9c00b68 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1282,14 +1282,6 @@ intel_commit_sprite_plane(struct drm_plane *plane,
> primary_enabled = !drm_rect_equals(dst, clip) || colorkey_enabled(intel_plane);
> WARN_ON(!primary_enabled && !state->visible && intel_crtc->active);
>
> - intel_plane->crtc_x = state->orig_dst.x1;
> - intel_plane->crtc_y = state->orig_dst.y1;
> - intel_plane->crtc_w = drm_rect_width(&state->orig_dst);
> - intel_plane->crtc_h = drm_rect_height(&state->orig_dst);
> - intel_plane->src_x = state->orig_src.x1;
> - intel_plane->src_y = state->orig_src.y1;
> - intel_plane->src_w = drm_rect_width(&state->orig_src);
> - intel_plane->src_h = drm_rect_height(&state->orig_src);
> intel_plane->obj = obj;
>
> if (intel_crtc->active) {
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
