From: Sagar Kamble <[email protected]>
With clipped sprites these transformations are not working. these
functions transform complete sprite irrespective of clipping present.
This leads to invisible portion of sprite show up when rotate 180 if
it was out of visible area before.
v4: Moved rotate transform for source rectangle after clipping.
Added rotate and inverse rotate transform for destination rect.
Cc: Daniel Vetter <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: David Airlie <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Sagar Kamble <[email protected]>
---
drivers/gpu/drm/i915/intel_sprite.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 62b9f84..799f6a9 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -769,9 +769,6 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
max_scale = intel_plane->max_downscale << 16;
min_scale = intel_plane->can_scale ? 1 : (1 << 16);
- drm_rect_rotate(&src, fb->width << 16, fb->height << 16,
- intel_plane->rotation);
-
hscale = drm_rect_calc_hscale_relaxed(&src, &dst, min_scale, max_scale);
BUG_ON(hscale < 0);
@@ -785,6 +782,13 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
crtc_w = drm_rect_width(&dst);
crtc_h = drm_rect_height(&dst);
+ drm_rect_rotate(&src, fb->width << 16, fb->height << 16,
+ intel_plane->rotation);
+
+ drm_rect_rotate(&dst, intel_crtc->config.pipe_src_w,
+ intel_crtc->config.pipe_src_h,
+ intel_plane->rotation);
+
if (visible) {
/* check again in case clipping clamped the results */
hscale = drm_rect_calc_hscale(&src, &dst, min_scale, max_scale);
@@ -811,7 +815,11 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
drm_rect_height(&dst) * vscale - drm_rect_height(&src));
drm_rect_rotate_inv(&src, fb->width << 16, fb->height << 16,
- intel_plane->rotation);
+ intel_plane->rotation);
+
+ drm_rect_rotate_inv(&dst, intel_crtc->config.pipe_src_w,
+ intel_crtc->config.pipe_src_h,
+ intel_plane->rotation);
/* sanity check to make sure the src viewport wasn't enlarged */
WARN_ON(src.x1 < (int) src_x ||
--
1.8.5
On Mon, Feb 10, 2014 at 01:01:18PM +0530, [email protected] wrote:
> From: Sagar Kamble <[email protected]>
>
> With clipped sprites these transformations are not working. these
> functions transform complete sprite irrespective of clipping present.
> This leads to invisible portion of sprite show up when rotate 180 if
> it was out of visible area before.
>
> v4: Moved rotate transform for source rectangle after clipping.
> Added rotate and inverse rotate transform for destination rect.
Still NAK.
I just pushed rotation support to my glplane test app [1], and with
with that my rotated clipping code works exactly as intended.
[1] git://gitorious.org/vsyrjala/glplane.git
>
> Cc: Daniel Vetter <[email protected]>
> Cc: Jani Nikula <[email protected]>
> Cc: David Airlie <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Sagar Kamble <[email protected]>
> ---
> drivers/gpu/drm/i915/intel_sprite.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 62b9f84..799f6a9 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -769,9 +769,6 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
> max_scale = intel_plane->max_downscale << 16;
> min_scale = intel_plane->can_scale ? 1 : (1 << 16);
>
> - drm_rect_rotate(&src, fb->width << 16, fb->height << 16,
> - intel_plane->rotation);
> -
> hscale = drm_rect_calc_hscale_relaxed(&src, &dst, min_scale, max_scale);
> BUG_ON(hscale < 0);
>
> @@ -785,6 +782,13 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
> crtc_w = drm_rect_width(&dst);
> crtc_h = drm_rect_height(&dst);
>
> + drm_rect_rotate(&src, fb->width << 16, fb->height << 16,
> + intel_plane->rotation);
> +
> + drm_rect_rotate(&dst, intel_crtc->config.pipe_src_w,
> + intel_crtc->config.pipe_src_h,
> + intel_plane->rotation);
> +
> if (visible) {
> /* check again in case clipping clamped the results */
> hscale = drm_rect_calc_hscale(&src, &dst, min_scale, max_scale);
> @@ -811,7 +815,11 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
> drm_rect_height(&dst) * vscale - drm_rect_height(&src));
>
> drm_rect_rotate_inv(&src, fb->width << 16, fb->height << 16,
> - intel_plane->rotation);
> + intel_plane->rotation);
> +
> + drm_rect_rotate_inv(&dst, intel_crtc->config.pipe_src_w,
> + intel_crtc->config.pipe_src_h,
> + intel_plane->rotation);
>
> /* sanity check to make sure the src viewport wasn't enlarged */
> WARN_ON(src.x1 < (int) src_x ||
> --
> 1.8.5
>
> _______________________________________________
> Intel-gfx mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrj?l?
Intel OTC