Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a5ae1b0 authored by Chandra Konduru's avatar Chandra Konduru Committed by Daniel Vetter
Browse files

drm/i915: Keep sprite plane src rect in 16.16 format 



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: default avatarChandra Konduru <chandra.konduru@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 549e2bfb

drivers/gpu/drm/i915/intel_sprite.c

+8 −8
Original line number Diff line number Diff line
@@ -1037,10 +1037,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;
@@ -1112,10 +1112,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);