diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index d7ad5139d17c..fe05ba27440a 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
| @@ -958,7 +958,7 @@ static int check_overlay_src(struct drm_device *dev, | |||
| 958 | || rec->src_width < N_HORIZ_Y_TAPS*4) | 958 | || rec->src_width < N_HORIZ_Y_TAPS*4) |
| 959 | return -EINVAL; | 959 | return -EINVAL; |
| 960 | 960 | ||
| 961 | /* check alingment constrains */ | 961 | /* check alignment constraints */ |
| 962 | switch (rec->flags & I915_OVERLAY_TYPE_MASK) { | 962 | switch (rec->flags & I915_OVERLAY_TYPE_MASK) { |
| 963 | case I915_OVERLAY_RGB: | 963 | case I915_OVERLAY_RGB: |
| 964 | /* not implemented */ | 964 | /* not implemented */ |
| @@ -990,7 +990,10 @@ static int check_overlay_src(struct drm_device *dev, | |||
| 990 | return -EINVAL; | 990 | return -EINVAL; |
| 991 | 991 | ||
| 992 | /* stride checking */ | 992 | /* stride checking */ |
| 993 | stride_mask = 63; | 993 | if (IS_I830(dev) || IS_845G(dev)) |
| 994 | stride_mask = 255; | ||
| 995 | else | ||
| 996 | stride_mask = 63; | ||
| 994 | 997 | ||
| 995 | if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask) | 998 | if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask) |
| 996 | return -EINVAL; | 999 | return -EINVAL; |
