lkml.org 
[lkml]   [2016]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 101/238] [media] saa7134: Fix bytesperline not being set correctly for planar formats
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

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

    From: Hans de Goede <hdegoede@redhat.com>

    commit 3e71da19f9dc22e39a755d6ae9678661abb66adc upstream.

    bytesperline should be the bytesperline for the first plane for planar
    formats, not that of all planes combined.

    This fixes a crash in xawtv caused by the wrong bpl.

    BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1305389
    Reported-and-tested-by: Stas Sergeev <stsp@list.ru>

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/pci/saa7134/saa7134-video.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    --- a/drivers/media/pci/saa7134/saa7134-video.c
    +++ b/drivers/media/pci/saa7134/saa7134-video.c
    @@ -1219,10 +1219,13 @@ static int saa7134_g_fmt_vid_cap(struct
    f->fmt.pix.height = dev->height;
    f->fmt.pix.field = dev->field;
    f->fmt.pix.pixelformat = dev->fmt->fourcc;
    - f->fmt.pix.bytesperline =
    - (f->fmt.pix.width * dev->fmt->depth) >> 3;
    + if (dev->fmt->planar)
    + f->fmt.pix.bytesperline = f->fmt.pix.width;
    + else
    + f->fmt.pix.bytesperline =
    + (f->fmt.pix.width * dev->fmt->depth) / 8;
    f->fmt.pix.sizeimage =
    - f->fmt.pix.height * f->fmt.pix.bytesperline;
    + (f->fmt.pix.height * f->fmt.pix.width * dev->fmt->depth) / 8;
    f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
    return 0;
    }
    @@ -1298,10 +1301,13 @@ static int saa7134_try_fmt_vid_cap(struc
    if (f->fmt.pix.height > maxh)
    f->fmt.pix.height = maxh;
    f->fmt.pix.width &= ~0x03;
    - f->fmt.pix.bytesperline =
    - (f->fmt.pix.width * fmt->depth) >> 3;
    + if (fmt->planar)
    + f->fmt.pix.bytesperline = f->fmt.pix.width;
    + else
    + f->fmt.pix.bytesperline =
    + (f->fmt.pix.width * fmt->depth) / 8;
    f->fmt.pix.sizeimage =
    - f->fmt.pix.height * f->fmt.pix.bytesperline;
    + (f->fmt.pix.height * f->fmt.pix.width * fmt->depth) / 8;
    f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;

    return 0;

    \
     
     \ /
      Last update: 2016-04-10 22:41    [W:3.086 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site