lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 525/717] media: ipu3-cio2: Return actual subdev format
    Date
    From: Sakari Ailus <sakari.ailus@linux.intel.com>

    commit 8160e86702e0807bd36d40f82648f9f9820b9d5a upstream.

    Return actual subdev format on ipu3-cio2 subdev pads. The earlier
    implementation was based on an infinite recursion that exhausted the
    stack.

    Reported-by: Tsuchiya Yuto <kitakar@gmail.com>
    Fixes: c2a6a07afe4a ("media: intel-ipu3: cio2: add new MIPI-CSI2 driver")
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Cc: stable@vger.kernel.org # v4.16 and up
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/pci/intel/ipu3/ipu3-cio2.c | 24 +++---------------------
    1 file changed, 3 insertions(+), 21 deletions(-)

    --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
    +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
    @@ -1233,29 +1233,11 @@ static int cio2_subdev_get_fmt(struct v4
    struct v4l2_subdev_format *fmt)
    {
    struct cio2_queue *q = container_of(sd, struct cio2_queue, subdev);
    - struct v4l2_subdev_format format;
    - int ret;

    - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
    + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
    fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
    - return 0;
    - }
    -
    - if (fmt->pad == CIO2_PAD_SINK) {
    - format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
    - ret = v4l2_subdev_call(sd, pad, get_fmt, NULL,
    - &format);
    -
    - if (ret)
    - return ret;
    - /* update colorspace etc */
    - q->subdev_fmt.colorspace = format.format.colorspace;
    - q->subdev_fmt.ycbcr_enc = format.format.ycbcr_enc;
    - q->subdev_fmt.quantization = format.format.quantization;
    - q->subdev_fmt.xfer_func = format.format.xfer_func;
    - }
    -
    - fmt->format = q->subdev_fmt;
    + else
    + fmt->format = q->subdev_fmt;

    return 0;
    }

    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:2.304 / U:0.932 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site