[PATCH 3/5] drm/i915: Implement proper clipping for video sprites

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

From: Ville Syrj?l? 

Properly clip the source when the destination gets clipped
by the pipe dimensions.

Sadly the video sprite hardware is rather limited so it can't do proper
sub-pixel postitioning. Resort to a best effort approach, where the
source coordinates are rounded to the nearest (macro)pixel boundary.

Also do some additional checking against various hardware limits.

Signed-off-by: Ville Syrj?l? 
---
 drivers/gpu/drm/i915/intel_sprite.c |  170 +++
 1 files changed, 112 insertions(+), 58 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 2a20fb0..363a16e 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -127,11 +127,14 @@ ivb_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
I915_WRITE(SPRSTRIDE(pipe), fb->pitches[0]);
I915_WRITE(SPRPOS(pipe), (crtc_y << 16) | crtc_x);
if (obj->tiling_mode != I915_TILING_NONE) {
+   y += fb->offsets[0] / fb->pitches[0];
+   x += fb->offsets[0] % fb->pitches[0] / pixel_size;
+
I915_WRITE(SPRTILEOFF(pipe), (y << 16) | x);
} else {
unsigned long offset;

-   offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8);
+   offset = fb->offsets[0] + y * fb->pitches[0] + x * pixel_size;
I915_WRITE(SPRLINOFF(pipe), offset);
}
I915_WRITE(SPRSIZE(pipe), (crtc_h << 16) | crtc_w);
@@ -288,11 +291,14 @@ ilk_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
I915_WRITE(DVSSTRIDE(pipe), fb->pitches[0]);
I915_WRITE(DVSPOS(pipe), (crtc_y << 16) | crtc_x);
if (obj->tiling_mode != I915_TILING_NONE) {
+   y += fb->offsets[0] / fb->pitches[0];
+   x += fb->offsets[0] % fb->pitches[0] / pixel_size;
+
I915_WRITE(DVSTILEOFF(pipe), (y << 16) | x);
} else {
unsigned long offset;

-   offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8);
+   offset = fb->offsets[0] + y * fb->pitches[0] + x * pixel_size;
I915_WRITE(DVSLINOFF(pipe), offset);
}
I915_WRITE(DVSSIZE(pipe), (crtc_h << 16) | crtc_w);
@@ -394,6 +400,20 @@ ilk_get_colorkey(struct drm_plane *plane, struct 
drm_intel_sprite_colorkey *key)
key->flags = I915_SET_COLORKEY_NONE;
 }

+static bool
+format_is_yuv(uint32_t format)
+{
+   switch (format) {
+   case DRM_FORMAT_YUYV:
+   case DRM_FORMAT_UYVY:
+   case DRM_FORMAT_VYUY:
+   case DRM_FORMAT_YVYU:
+   return true;
+   default:
+   return false;
+   }
+}
+
 static int
 intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
   struct drm_framebuffer *fb, int crtc_x, int crtc_y,
@@ -405,66 +425,98 @@ intel_update_plane(struct drm_plane *plane, struct 
drm_crtc *crtc,
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_plane *intel_plane = to_intel_plane(plane);
-   struct intel_framebuffer *intel_fb;
-   struct drm_i915_gem_object *obj, *old_obj;
+   struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
+   struct drm_i915_gem_object *obj = intel_fb->obj;
+   struct drm_i915_gem_object *old_obj = intel_plane->obj;
int pipe = intel_plane->pipe;
int ret = 0;
-   int x = src_x >> 16, y = src_y >> 16;
int primary_w = crtc->mode.hdisplay, primary_h = crtc->mode.vdisplay;
bool disable_primary = false;
-
-   intel_fb = to_intel_framebuffer(fb);
-   obj = intel_fb->obj;
-
-   old_obj = intel_plane->obj;
-
-   src_w = src_w >> 16;
-   src_h = src_h >> 16;
-
-   /* Pipe must be running... */
-   if (!(I915_READ(PIPECONF(pipe)) & PIPECONF_ENABLE))
-   return -EINVAL;
-
-   if (crtc_x >= primary_w || crtc_y >= primary_h)
-   return -EINVAL;
+   bool visible;
+   int hscale, vscale;
+   int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
+   struct drm_region src = {
+   .x1 = src_x,
+   .x2 = src_x + src_w,
+   .y1 = src_y,
+   .y2 = src_y + src_h,
+   };
+   struct drm_region dst = {
+   .x1 = crtc_x,
+   .x2 = crtc_x + crtc_w,
+   .y1 = crtc_y,
+   .y2 = crtc_y + crtc_h,
+   };
+   const struct drm_region clip = {
+   .x2 = crtc->mode.hdisplay,
+   .y2 = crtc->mode.vdisplay,
+   };

/* Don't modify another pipe's plane */
if (intel_plane->pipe != intel_crtc->pipe)
return -EINVAL;

-   /*
-* Clamp the width & height into the visible area.  Note we don't
-* try to scale the source if part of the visible 

[PATCH 3/5] drm/i915: Implement proper clipping for video sprites

[ville . syrjala]

From: Ville Syrjälä ville.syrj...@linux.intel.com

Properly clip the source when the destination gets clipped
by the pipe dimensions.

Sadly the video sprite hardware is rather limited so it can't do proper
sub-pixel postitioning. Resort to a best effort approach, where the
source coordinates are rounded to the nearest (macro)pixel boundary.

Also do some additional checking against various hardware limits.

Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
---
 drivers/gpu/drm/i915/intel_sprite.c |  170 +++
 1 files changed, 112 insertions(+), 58 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 2a20fb0..363a16e 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -127,11 +127,14 @@ ivb_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
I915_WRITE(SPRSTRIDE(pipe), fb-pitches[0]);
I915_WRITE(SPRPOS(pipe), (crtc_y  16) | crtc_x);
if (obj-tiling_mode != I915_TILING_NONE) {
+   y += fb-offsets[0] / fb-pitches[0];
+   x += fb-offsets[0] % fb-pitches[0] / pixel_size;
+
I915_WRITE(SPRTILEOFF(pipe), (y  16) | x);
} else {
unsigned long offset;
 
-   offset = y * fb-pitches[0] + x * (fb-bits_per_pixel / 8);
+   offset = fb-offsets[0] + y * fb-pitches[0] + x * pixel_size;
I915_WRITE(SPRLINOFF(pipe), offset);
}
I915_WRITE(SPRSIZE(pipe), (crtc_h  16) | crtc_w);
@@ -288,11 +291,14 @@ ilk_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
I915_WRITE(DVSSTRIDE(pipe), fb-pitches[0]);
I915_WRITE(DVSPOS(pipe), (crtc_y  16) | crtc_x);
if (obj-tiling_mode != I915_TILING_NONE) {
+   y += fb-offsets[0] / fb-pitches[0];
+   x += fb-offsets[0] % fb-pitches[0] / pixel_size;
+
I915_WRITE(DVSTILEOFF(pipe), (y  16) | x);
} else {
unsigned long offset;
 
-   offset = y * fb-pitches[0] + x * (fb-bits_per_pixel / 8);
+   offset = fb-offsets[0] + y * fb-pitches[0] + x * pixel_size;
I915_WRITE(DVSLINOFF(pipe), offset);
}
I915_WRITE(DVSSIZE(pipe), (crtc_h  16) | crtc_w);
@@ -394,6 +400,20 @@ ilk_get_colorkey(struct drm_plane *plane, struct 
drm_intel_sprite_colorkey *key)
key-flags = I915_SET_COLORKEY_NONE;
 }
 
+static bool
+format_is_yuv(uint32_t format)
+{
+   switch (format) {
+   case DRM_FORMAT_YUYV:
+   case DRM_FORMAT_UYVY:
+   case DRM_FORMAT_VYUY:
+   case DRM_FORMAT_YVYU:
+   return true;
+   default:
+   return false;
+   }
+}
+
 static int
 intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
   struct drm_framebuffer *fb, int crtc_x, int crtc_y,
@@ -405,66 +425,98 @@ intel_update_plane(struct drm_plane *plane, struct 
drm_crtc *crtc,
struct drm_i915_private *dev_priv = dev-dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_plane *intel_plane = to_intel_plane(plane);
-   struct intel_framebuffer *intel_fb;
-   struct drm_i915_gem_object *obj, *old_obj;
+   struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
+   struct drm_i915_gem_object *obj = intel_fb-obj;
+   struct drm_i915_gem_object *old_obj = intel_plane-obj;
int pipe = intel_plane-pipe;
int ret = 0;
-   int x = src_x  16, y = src_y  16;
int primary_w = crtc-mode.hdisplay, primary_h = crtc-mode.vdisplay;
bool disable_primary = false;
-
-   intel_fb = to_intel_framebuffer(fb);
-   obj = intel_fb-obj;
-
-   old_obj = intel_plane-obj;
-
-   src_w = src_w  16;
-   src_h = src_h  16;
-
-   /* Pipe must be running... */
-   if (!(I915_READ(PIPECONF(pipe))  PIPECONF_ENABLE))
-   return -EINVAL;
-
-   if (crtc_x = primary_w || crtc_y = primary_h)
-   return -EINVAL;
+   bool visible;
+   int hscale, vscale;
+   int cpp = drm_format_plane_cpp(fb-pixel_format, 0);
+   struct drm_region src = {
+   .x1 = src_x,
+   .x2 = src_x + src_w,
+   .y1 = src_y,
+   .y2 = src_y + src_h,
+   };
+   struct drm_region dst = {
+   .x1 = crtc_x,
+   .x2 = crtc_x + crtc_w,
+   .y1 = crtc_y,
+   .y2 = crtc_y + crtc_h,
+   };
+   const struct drm_region clip = {
+   .x2 = crtc-mode.hdisplay,
+   .y2 = crtc-mode.vdisplay,
+   };
 
/* Don't modify another pipe's plane */
if (intel_plane-pipe != intel_crtc-pipe)
return -EINVAL;
 
-   /*
-* Clamp the width  height into the visible area.  Note we don't
-* try to scale the source if part of the visible region is offscreen.
-