|
@@ -958,7 +958,7 @@ static int check_overlay_src(struct drm_device *dev,
|
|
|| rec->src_width < N_HORIZ_Y_TAPS*4)
|
|
|| rec->src_width < N_HORIZ_Y_TAPS*4)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- /* check alingment constrains */
|
|
|
|
|
|
+ /* check alignment constraints */
|
|
switch (rec->flags & I915_OVERLAY_TYPE_MASK) {
|
|
switch (rec->flags & I915_OVERLAY_TYPE_MASK) {
|
|
case I915_OVERLAY_RGB:
|
|
case I915_OVERLAY_RGB:
|
|
/* not implemented */
|
|
/* not implemented */
|
|
@@ -990,7 +990,10 @@ static int check_overlay_src(struct drm_device *dev,
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
/* stride checking */
|
|
/* stride checking */
|
|
- stride_mask = 63;
|
|
|
|
|
|
+ if (IS_I830(dev) || IS_845G(dev))
|
|
|
|
+ stride_mask = 255;
|
|
|
|
+ else
|
|
|
|
+ stride_mask = 63;
|
|
|
|
|
|
if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask)
|
|
if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask)
|
|
return -EINVAL;
|
|
return -EINVAL;
|