lkml.org 
[lkml]   [2010]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[38/38] drm/i915: Check overlay stride errata for i830 and i845
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Chris Wilson <chris@chris-wilson.co.uk>

    commit a1efd14a99483a4fb9308902397ed86b69454c99 upstream.

    Apparently i830 and i845 cannot handle any stride that is not a multiple
    of 256, unlike their brethren which do support 64 byte aligned strides.

    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/i915/intel_overlay.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- 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_
    || rec->src_width < N_HORIZ_Y_TAPS*4)
    return -EINVAL;

    - /* check alingment constrains */
    + /* check alignment constraints */
    switch (rec->flags & I915_OVERLAY_TYPE_MASK) {
    case I915_OVERLAY_RGB:
    /* not implemented */
    @@ -990,7 +990,10 @@ static int check_overlay_src(struct drm_
    return -EINVAL;

    /* 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)
    return -EINVAL;



    \
     
     \ /
      Last update: 2010-08-06 21:05    [W:0.020 / U:30.456 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site