[git:media_tree/fixes] media: imx-media-csi: Do not propagate the error when pinctrl is not found
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: imx-media-csi: Do not propagate the error when pinctrl is not
found
Author: Fabio Estevam
Date:Sat Mar 3 07:56:30 2018 -0500
Since commit 52e17089d185 ("media: imx: Don't initialize vars that
won't be used") imx_csi_probe() fails to probe after propagating the
devm_pinctrl_get_select_default() error.
devm_pinctrl_get_select_default() may return -ENODEV when the CSI pinctrl
entry is not found, so better not to propagate the error in the -ENODEV
case to avoid a regression.
Suggested-by: Philipp Zabel
Signed-off-by: Fabio Estevam
Reviewed-by: Steve Longerbeam
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/imx/imx-media-csi.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/drivers/staging/media/imx/imx-media-csi.c
b/drivers/staging/media/imx/imx-media-csi.c
index 00c9d625cfb5..16cab40156ca 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1800,7 +1800,10 @@ static int imx_csi_probe(struct platform_device *pdev)
pinctrl = devm_pinctrl_get_select_default(priv->dev);
if (IS_ERR(pinctrl)) {
ret = PTR_ERR(priv->vdev);
- goto free;
+ dev_dbg(priv->dev,
+ "devm_pinctrl_get_select_default() failed: %d\n", ret);
+ if (ret != -ENODEV)
+ goto free;
}
ret = v4l2_async_register_subdev(&priv->sd);
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: imx274: fix typo in error message
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: imx274: fix typo in error message
Author: Luca Ceresoli
Date:Fri Feb 23 03:57:15 2018 -0500
Signed-off-by: Luca Ceresoli
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/imx274.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
index 664e8acdf2a0..daec33f4196a 100644
--- a/drivers/media/i2c/imx274.c
+++ b/drivers/media/i2c/imx274.c
@@ -1426,7 +1426,7 @@ static int imx274_set_vflip(struct stimx274 *priv, int
val)
err = imx274_write_reg(priv, IMX274_VFLIP_REG, val);
if (err) {
- dev_err(&priv->client->dev, "VFILP control error\n");
+ dev_err(&priv->client->dev, "VFLIP control error\n");
return err;
}
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: cec-pin: Fixed ktime_t to ns conversion
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: cec-pin: Fixed ktime_t to ns conversion
Author: Jasmin Jessich
Date:Sat Mar 24 20:29:46 2018 -0400
Older Kernels use a struct for ktime_t, which requires the conversion
function ktime_to_ns to be used on some places. With this patch it will
compile now also for older Kernel versions.
Signed-off-by: Jasmin Jessich
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/media/cec/cec-pin.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/cec-pin.c
index fafe1ebc8aff..2a5df99735fa 100644
--- a/drivers/media/cec/cec-pin.c
+++ b/drivers/media/cec/cec-pin.c
@@ -668,7 +668,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t
ts)
/* Start bit low is too short, go back to idle */
if (delta < CEC_TIM_START_BIT_LOW_MIN - CEC_TIM_IDLE_SAMPLE) {
if (!pin->rx_start_bit_low_too_short_cnt++) {
- pin->rx_start_bit_low_too_short_ts = pin->ts;
+ pin->rx_start_bit_low_too_short_ts =
ktime_to_ns(pin->ts);
pin->rx_start_bit_low_too_short_delta = delta;
}
cec_pin_to_idle(pin);
@@ -700,7 +700,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t
ts)
/* Start bit is too short, go back to idle */
if (delta < CEC_TIM_START_BIT_TOTAL_MIN - CEC_TIM_IDLE_SAMPLE) {
if (!pin->rx_start_bit_too_short_cnt++) {
- pin->rx_start_bit_too_short_ts = pin->ts;
+ pin->rx_start_bit_too_short_ts =
ktime_to_ns(pin->ts);
pin->rx_start_bit_too_short_delta = delta;
}
cec_pin_to_idle(pin);
@@ -770,7 +770,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t
ts)
*/
if (delta < CEC_TIM_DATA_BIT_TOTAL_MIN) {
if (!pin->rx_data_bit_too_short_cnt++) {
- pin->rx_data_bit_too_short_ts = pin->ts;
+ pin->rx_data_bit_too_short_ts =
ktime_to_ns(pin->ts);
pin->rx_data_bit_too_short_delta = delta;
}
cec_pin_low(pin);
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: dw9714: Update to SPDX license identifier
This is an automatic generated email to let you know that the following patch were queued: Subject: media: dw9714: Update to SPDX license identifier Author: Rajmohan Mani Date:Tue Feb 20 19:54:05 2018 -0500 Remove the GPL v2 license boilerplate and update with the SPDX license identifier. Signed-off-by: Rajmohan Mani Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab drivers/media/i2c/dw9714.c | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) --- diff --git a/drivers/media/i2c/dw9714.c b/drivers/media/i2c/dw9714.c index 8dbbf0f917df..91fae01d052b 100644 --- a/drivers/media/i2c/dw9714.c +++ b/drivers/media/i2c/dw9714.c @@ -1,15 +1,5 @@ -/* - * Copyright (c) 2015--2017 Intel Corporation. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version - * 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2015--2017 Intel Corporation. #include #include ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov5640: fix get_/set_fmt colorspace related fields
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: ov5640: fix get_/set_fmt colorspace related fields
Author: Hugues Fruchet
Date:Tue Mar 6 12:04:39 2018 -0500
Fix set of missing colorspace related fields in get_/set_fmt.
Detected by v4l2-compliance tool.
[Sakari Ailus: Rearrange fmt declaration in ov5640_probe()]
Signed-off-by: Hugues Fruchet
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/ov5640.c | 29 +
1 file changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 03940f0cdfa6..271e8624292e 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -1874,7 +1874,13 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev
*sd,
if (ov5640_formats[i].code == fmt->code)
break;
if (i >= ARRAY_SIZE(ov5640_formats))
- fmt->code = ov5640_formats[0].code;
+ i = 0;
+
+ fmt->code = ov5640_formats[i].code;
+ fmt->colorspace = ov5640_formats[i].colorspace;
+ fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
+ fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
+ fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
return 0;
}
@@ -1885,6 +1891,7 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
{
struct ov5640_dev *sensor = to_ov5640_dev(sd);
const struct ov5640_mode_info *new_mode;
+ struct v4l2_mbus_framefmt *mbus_fmt = &format->format;
int ret;
if (format->pad != 0)
@@ -1897,7 +1904,7 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
goto out;
}
- ret = ov5640_try_fmt_internal(sd, &format->format,
+ ret = ov5640_try_fmt_internal(sd, mbus_fmt,
sensor->current_fr, &new_mode);
if (ret)
goto out;
@@ -1906,12 +1913,12 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
struct v4l2_mbus_framefmt *fmt =
v4l2_subdev_get_try_format(sd, cfg, 0);
- *fmt = format->format;
+ *fmt = *mbus_fmt;
goto out;
}
sensor->current_mode = new_mode;
- sensor->fmt = format->format;
+ sensor->fmt = *mbus_fmt;
sensor->pending_mode_change = true;
out:
mutex_unlock(&sensor->lock);
@@ -2496,6 +2503,7 @@ static int ov5640_probe(struct i2c_client *client,
struct device *dev = &client->dev;
struct fwnode_handle *endpoint;
struct ov5640_dev *sensor;
+ struct v4l2_mbus_framefmt *fmt;
int ret;
sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
@@ -2503,10 +2511,15 @@ static int ov5640_probe(struct i2c_client *client,
return -ENOMEM;
sensor->i2c_client = client;
- sensor->fmt.code = MEDIA_BUS_FMT_UYVY8_2X8;
- sensor->fmt.width = 640;
- sensor->fmt.height = 480;
- sensor->fmt.field = V4L2_FIELD_NONE;
+ fmt = &sensor->fmt;
+ fmt->code = ov5640_formats[0].code;
+ fmt->colorspace = ov5640_formats[0].colorspace;
+ fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
+ fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
+ fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
+ fmt->width = 640;
+ fmt->height = 480;
+ fmt->field = V4L2_FIELD_NONE;
sensor->frame_interval.numerator = 1;
sensor->frame_interval.denominator = ov5640_framerates[OV5640_30_FPS];
sensor->current_fr = OV5640_30_FPS;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: media: davinci_vpfe: fix spelling of resizer_configure_in_continious_mode
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: media: davinci_vpfe: fix spelling of
resizer_configure_in_continious_mode
Author: Colin Ian King
Date:Mon Mar 19 07:18:09 2018 -0400
Trivial fix: rename function resizer_configure_in_continious_mode to
resizer_configure_in_continuous_mode to fix spelling mistake.
Signed-off-by: Colin Ian King
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c
b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
index 857b0e847c5e..1ee216d71d42 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_resizer.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
@@ -480,7 +480,7 @@ resizer_configure_common_in_params(struct
vpfe_resizer_device *resizer)
return 0;
}
static int
-resizer_configure_in_continious_mode(struct vpfe_resizer_device *resizer)
+resizer_configure_in_continuous_mode(struct vpfe_resizer_device *resizer)
{
struct device *dev = resizer->crop_resizer.subdev.v4l2_dev->dev;
struct resizer_params *param = &resizer->config;
@@ -1242,7 +1242,7 @@ static int resizer_do_hw_setup(struct vpfe_resizer_device
*resizer)
ipipeif_source == IPIPEIF_OUTPUT_RESIZER)
ret = resizer_configure_in_single_shot_mode(resizer);
else
- ret = resizer_configure_in_continious_mode(resizer);
+ ret = resizer_configure_in_continuous_mode(resizer);
if (ret)
return ret;
ret = config_rsz_hw(resizer, param);
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov5645: Use v4l2_find_nearest_size
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: ov5645: Use v4l2_find_nearest_size
Author: Todor Tomov
Date:Wed Mar 21 04:42:36 2018 -0400
Use v4l2_find_nearest_size instead of a driver specific function to find
nearest matching size.
Signed-off-by: Todor Tomov
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/ov5645.c | 24 +---
1 file changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c
index a31fe18c71d6..4e3142a7e5a7 100644
--- a/drivers/media/i2c/ov5645.c
+++ b/drivers/media/i2c/ov5645.c
@@ -959,23 +959,6 @@ __ov5645_get_pad_crop(struct ov5645 *ov5645, struct
v4l2_subdev_pad_config *cfg,
}
}
-static const struct ov5645_mode_info *
-ov5645_find_nearest_mode(unsigned int width, unsigned int height)
-{
- int i;
-
- for (i = ARRAY_SIZE(ov5645_mode_info_data) - 1; i >= 0; i--) {
- if (ov5645_mode_info_data[i].width <= width &&
- ov5645_mode_info_data[i].height <= height)
- break;
- }
-
- if (i < 0)
- i = 0;
-
- return &ov5645_mode_info_data[i];
-}
-
static int ov5645_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *format)
@@ -989,8 +972,11 @@ static int ov5645_set_format(struct v4l2_subdev *sd,
__crop = __ov5645_get_pad_crop(ov5645, cfg, format->pad,
format->which);
- new_mode = ov5645_find_nearest_mode(format->format.width,
- format->format.height);
+ new_mode = v4l2_find_nearest_size(ov5645_mode_info_data,
+ ARRAY_SIZE(ov5645_mode_info_data),
+ width, height,
+ format->format.width, format->format.height);
+
__crop->width = new_mode->width;
__crop->height = new_mode->height;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: media-types.rst: rename media-entity-type to media-entity-functions
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: media-types.rst: rename media-entity-type to
media-entity-functions
Author: Hans Verkuil
Date:Mon Mar 19 11:43:24 2018 -0400
The MEDIA_ENT_F_* defines refer to functions, not types. Update the
documentation accordingly.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst | 2 +-
Documentation/media/uapi/mediactl/media-ioc-g-topology.rst| 2 +-
Documentation/media/uapi/mediactl/media-types.rst | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
b/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
index 45e76e5bc1ea..582fda488810 100644
--- a/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
@@ -89,7 +89,7 @@ id's until they get an error.
-
-
- - Entity type, see :ref:`media-entity-type` for details.
+ - Entity type, see :ref:`media-entity-functions` for details.
- .. row 4
diff --git a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
index fca4a22f6a45..c4055ddf070a 100644
--- a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
@@ -205,7 +205,7 @@ desired arrays with the media graph elements.
- ``function``
- - Entity main function, see :ref:`media-entity-type` for details.
+ - Entity main function, see :ref:`media-entity-functions` for details.
- .. row 4
diff --git a/Documentation/media/uapi/mediactl/media-types.rst
b/Documentation/media/uapi/mediactl/media-types.rst
index f92f10b7ffbd..2dda14bd89b7 100644
--- a/Documentation/media/uapi/mediactl/media-types.rst
+++ b/Documentation/media/uapi/mediactl/media-types.rst
@@ -7,11 +7,11 @@ Types and flags used to represent the media graph elements
.. tabularcolumns:: |p{8.2cm}|p{10.3cm}|
-.. _media-entity-type:
+.. _media-entity-functions:
.. cssclass:: longtable
-.. flat-table:: Media entity types
+.. flat-table:: Media entity functions
:header-rows: 0
:stub-columns: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: doc: fix ReST link syntax
This is an automatic generated email to let you know that the following patch were queued: Subject: media: doc: fix ReST link syntax Author: Luca Ceresoli Date:Wed Mar 21 13:49:39 2018 -0400 There is a ':' in excess, resulting in an unwanted ':' in the rendered output. Signed-off-by: Luca Ceresoli Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Documentation/media/kapi/v4l2-dev.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/Documentation/media/kapi/v4l2-dev.rst b/Documentation/media/kapi/v4l2-dev.rst index 7bb0505b60f1..eb03ccc41c41 100644 --- a/Documentation/media/kapi/v4l2-dev.rst +++ b/Documentation/media/kapi/v4l2-dev.rst @@ -31,7 +31,7 @@ of the video device exits. The default :c:func:`video_device_release` callback currently just calls ``kfree`` to free the allocated memory. -There is also a ::c:func:`video_device_release_empty` function that does +There is also a :c:func:`video_device_release_empty` function that does nothing (is empty) and should be used if the struct is embedded and there is nothing to do when it is released. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov5670: Update to SPDX identifier
This is an automatic generated email to let you know that the following patch were queued: Subject: media: ov5670: Update to SPDX identifier Author: Chiranjeevi Rapolu Date:Wed Feb 21 12:42:47 2018 -0500 Replace GPL v2 license notice with SPDX license identifier. Signed-off-by: Chiranjeevi Rapolu Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab drivers/media/i2c/ov5670.c | 15 ++- 1 file changed, 2 insertions(+), 13 deletions(-) --- diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c index e03d82c44dd0..7b7c74d77370 100644 --- a/drivers/media/i2c/ov5670.c +++ b/drivers/media/i2c/ov5670.c @@ -1,16 +1,5 @@ -/* - * Copyright (c) 2017 Intel Corporation. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version - * 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2017 Intel Corporation. #include #include ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: venus: vdec: fix format enumeration
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: venus: vdec: fix format enumeration
Author: Alexandre Courbot
Date:Mon Mar 19 05:32:29 2018 -0400
find_format_by_index() stops enumerating formats as soon as the index
matches, and returns NULL if venus_helper_check_codec() finds out that
the format is not supported. This prevents formats to be properly
enumerated if a non-supported format is present, as the enumeration will
end with it.
Fix this by moving the call to venus_helper_check_codec() into the loop,
and keep enumerating when it fails.
Fixes: 29f0133ec6 media: venus: use helper function to check supported codecs
Signed-off-by: Alexandre Courbot
Acked-by: Stanimir Varbanov
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/media/platform/qcom/venus/vdec.c | 13 +++--
drivers/media/platform/qcom/venus/venc.c | 13 +++--
2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/drivers/media/platform/qcom/venus/vdec.c
b/drivers/media/platform/qcom/venus/vdec.c
index c9e9576bb08a..49bbd1861d3a 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -135,20 +135,21 @@ find_format_by_index(struct venus_inst *inst, unsigned
int index, u32 type)
return NULL;
for (i = 0; i < size; i++) {
+ bool valid;
+
if (fmt[i].type != type)
continue;
- if (k == index)
+ valid = type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ||
+ venus_helper_check_codec(inst, fmt[i].pixfmt);
+ if (k == index && valid)
break;
- k++;
+ if (valid)
+ k++;
}
if (i == size)
return NULL;
- if (type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&
- !venus_helper_check_codec(inst, fmt[i].pixfmt))
- return NULL;
-
return &fmt[i];
}
diff --git a/drivers/media/platform/qcom/venus/venc.c
b/drivers/media/platform/qcom/venus/venc.c
index e3a10a852cad..6b2ce479584e 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -120,20 +120,21 @@ find_format_by_index(struct venus_inst *inst, unsigned
int index, u32 type)
return NULL;
for (i = 0; i < size; i++) {
+ bool valid;
+
if (fmt[i].type != type)
continue;
- if (k == index)
+ valid = type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
+ venus_helper_check_codec(inst, fmt[i].pixfmt);
+ if (k == index && valid)
break;
- k++;
+ if (valid)
+ k++;
}
if (i == size)
return NULL;
- if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
- !venus_helper_check_codec(inst, fmt[i].pixfmt))
- return NULL;
-
return &fmt[i];
}
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov5640: add missing output pixel format setting
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: ov5640: add missing output pixel format setting
Author: Akinobu Mita
Date:Sun Mar 11 11:34:41 2018 -0400
The output pixel format changed by set_fmt() pad operation is not
correctly applied. It is intended to be restored by calling
ov5640_set_framefmt() when the video stream is started.
However, when the device is powered on by s_power subdev operation before
the video stream is started, the current output mode setting is restored
by ov5640_restore_mode() that also clears pending_mode_change flag in
ov5640_set_mode(). So ov5640_set_framefmt() isn't called as intended and
the output pixel format is not restored.
This change adds the missing output pixel format setting in the
ov5640_restore_mode() that is called when the device is powered on.
Cc: Steve Longerbeam
Cc: Hugues Fruchet
Cc: Mauro Carvalho Chehab
Signed-off-by: Akinobu Mita
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/ov5640.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 271e8624292e..852026baa2e7 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -1641,6 +1641,9 @@ static int ov5640_set_mode(struct ov5640_dev *sensor,
return 0;
}
+static int ov5640_set_framefmt(struct ov5640_dev *sensor,
+ struct v4l2_mbus_framefmt *format);
+
/* restore the last set video mode after chip power-on */
static int ov5640_restore_mode(struct ov5640_dev *sensor)
{
@@ -1652,7 +1655,11 @@ static int ov5640_restore_mode(struct ov5640_dev *sensor)
return ret;
/* now restore the last capture mode */
- return ov5640_set_mode(sensor, &ov5640_mode_init_data);
+ ret = ov5640_set_mode(sensor, &ov5640_mode_init_data);
+ if (ret < 0)
+ return ret;
+
+ return ov5640_set_framefmt(sensor, &sensor->fmt);
}
static void ov5640_power(struct ov5640_dev *sensor, bool enable)
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: v4l: Bring back array_size parameter to v4l2_find_nearest_size
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: v4l: Bring back array_size parameter to v4l2_find_nearest_size
Author: Sakari Ailus
Date:Wed Mar 21 16:29:27 2018 -0400
An older version of the driver patches were merged accidentally which
resulted in missing the array_size parameter that tells the length of the
array that contains the different supported sizes.
Bring it back to v4l2_find_nearest size and make the corresponding change
for the drivers using it as well.
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/ov13858.c | 4 +++-
drivers/media/i2c/ov5670.c | 4 +++-
drivers/media/platform/vivid/vivid-vid-cap.c | 5 +++--
include/media/v4l2-common.h | 5 +++--
4 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index 30ee9f71bf0d..3e9ff8205991 100644
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -1375,7 +1375,9 @@ ov13858_set_pad_format(struct v4l2_subdev *sd,
if (fmt->format.code != MEDIA_BUS_FMT_SGRBG10_1X10)
fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
- mode = v4l2_find_nearest_size(supported_modes, width, height,
+ mode = v4l2_find_nearest_size(supported_modes,
+ ARRAY_SIZE(supported_modes),
+ width, height,
fmt->format.width, fmt->format.height);
ov13858_update_pad_format(mode, fmt);
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index d2db480da1b9..e03d82c44dd0 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -2230,7 +2230,9 @@ static int ov5670_set_pad_format(struct v4l2_subdev *sd,
fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
- mode = v4l2_find_nearest_size(supported_modes, width, height,
+ mode = v4l2_find_nearest_size(supported_modes,
+ ARRAY_SIZE(supported_modes),
+ width, height,
fmt->format.width, fmt->format.height);
ov5670_update_pad_format(mode, fmt);
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c
b/drivers/media/platform/vivid/vivid-vid-cap.c
index 01c703683657..1599159f2574 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -561,8 +561,9 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv,
mp->field = vivid_field_cap(dev, mp->field);
if (vivid_is_webcam(dev)) {
const struct v4l2_frmsize_discrete *sz =
- v4l2_find_nearest_size(webcam_sizes, width, height,
- mp->width, mp->height);
+ v4l2_find_nearest_size(webcam_sizes,
+ VIVID_WEBCAM_SIZES, width,
+ height, mp->width, mp->height);
w = sz->width;
h = sz->height;
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 54b689247937..160bca96d524 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -320,6 +320,7 @@ void v4l_bound_align_image(unsigned int *width, unsigned
int wmin,
* set of resolutions contained in an array of a driver specific struct.
*
* @array: a driver specific array of image sizes
+ * @array_size: the length of the driver specific array of image sizes
* @width_field: the name of the width field in the driver specific struct
* @height_field: the name of the height field in the driver specific struct
* @width: desired width.
@@ -332,13 +333,13 @@ void v4l_bound_align_image(unsigned int *width, unsigned
int wmin,
*
* Returns the best match or NULL if the length of the array is zero.
*/
-#define v4l2_find_nearest_size(array, width_field, height_field, \
+#define v4l2_find_nearest_size(array, array_size, width_field, height_field, \
width, height) \
({ \
BUILD_BUG_ON(sizeof((array)->width_field) != sizeof(u32) || \
sizeof((array)->height_field) != sizeof(u32)); \
(typeof(&(*(array__v4l2_find_nearest_size( \
- (array), ARRAY_SIZE(array), sizeof(*(array)), \
+ (array), array_size, sizeof(*(array)), \
offsetof(typeof(*(array)), width_field),\
offsetof(typeof(*(array)), height_field), \
width, height);
[git:media_tree/fixes] media: pixfmt-v4l2-mplane.rst: fix types
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: pixfmt-v4l2-mplane.rst: fix types
Author: Hans Verkuil
Date:Mon Mar 19 08:58:18 2018 -0400
The v4l2_pix_format_mplane documentation still had 'enum's as types.
Replace by __u8 and add a reference to the enum.
Also put ycbcr_enc and hsv_enc in a union.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
.../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 36 ++
1 file changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst
b/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst
index 337e8188caf1..ef52f637d8e9 100644
--- a/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst
@@ -55,12 +55,14 @@ describing all planes of that format.
- ``pixelformat``
- The pixel format. Both single- and multi-planar four character
codes can be used.
-* - enum :c:type:`v4l2_field`
+* - __u32
- ``field``
- - See struct :c:type:`v4l2_pix_format`.
-* - enum :c:type:`v4l2_colorspace`
+ - Field order, from enum :c:type:`v4l2_field`.
+See struct :c:type:`v4l2_pix_format`.
+* - __u32
- ``colorspace``
- - See struct :c:type:`v4l2_pix_format`.
+ - Colorspace encoding, from enum :c:type:`v4l2_colorspace`.
+See struct :c:type:`v4l2_pix_format`.
* - struct :c:type:`v4l2_plane_pix_format`
- ``plane_fmt[VIDEO_MAX_PLANES]``
- An array of structures describing format of each plane this pixel
@@ -73,24 +75,34 @@ describing all planes of that format.
* - __u8
- ``flags``
- Flags set by the application or driver, see :ref:`format-flags`.
-* - enum :c:type:`v4l2_ycbcr_encoding`
+* - union {
+ - (anonymous)
+ -
+* - __u8
- ``ycbcr_enc``
- - This information supplements the ``colorspace`` and must be set by
+ - Y'CbCr encoding, from enum :c:type:`v4l2_ycbcr_encoding`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
-* - enum :c:type:`v4l2_hsv_encoding`
+* - __u8
- ``hsv_enc``
- - This information supplements the ``colorspace`` and must be set by
+ - HSV encoding, from enum :c:type:`v4l2_hsv_encoding`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
-* - enum :c:type:`v4l2_quantization`
+* - }
+ -
+ -
+* - __u8
- ``quantization``
- - This information supplements the ``colorspace`` and must be set by
+ - Quantization range, from enum :c:type:`v4l2_quantization`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
-* - enum :c:type:`v4l2_xfer_func`
+* - __u8
- ``xfer_func``
- - This information supplements the ``colorspace`` and must be set by
+ - Transfer function, from enum :c:type:`v4l2_xfer_func`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
* - __u8
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: media-ioc-g-topology.rst: fix 'reserved' sizes
This is an automatic generated email to let you know that the following patch were queued: Subject: media: media-ioc-g-topology.rst: fix 'reserved' sizes Author: Hans Verkuil Date:Mon Mar 19 11:43:17 2018 -0400 The size of the reserved arrays in the documentation is wrong. Sync this with the actual header. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/mediactl/media-ioc-g-topology.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst index c8f9ea37db2d..fca4a22f6a45 100644 --- a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst +++ b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst @@ -211,7 +211,7 @@ desired arrays with the media graph elements. - __u32 - - ``reserved``\ [12] + - ``reserved``\ [6] - Reserved for future extensions. Drivers and applications must set this array to zero. @@ -334,7 +334,7 @@ desired arrays with the media graph elements. - __u32 - - ``reserved``\ [9] + - ``reserved``\ [5] - Reserved for future extensions. Drivers and applications must set this array to zero. @@ -390,7 +390,7 @@ desired arrays with the media graph elements. - __u32 - - ``reserved``\ [5] + - ``reserved``\ [6] - Reserved for future extensions. Drivers and applications must set this array to zero. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov5645: add missing of_node_put() in error path
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: ov5645: add missing of_node_put() in error path
Author: Akinobu Mita
Date:Mon Mar 19 12:14:17 2018 -0400
The device node obtained with of_graph_get_next_endpoint() should be
released by calling of_node_put(). But it was not released when
v4l2_fwnode_endpoint_parse() failed.
This change moves the of_node_put() call before the error check and
fixes the issue.
Cc: Mauro Carvalho Chehab
Signed-off-by: Akinobu Mita
Acked-by: Todor Tomov
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/ov5645.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c
index d28845f7356f..a31fe18c71d6 100644
--- a/drivers/media/i2c/ov5645.c
+++ b/drivers/media/i2c/ov5645.c
@@ -1131,13 +1131,14 @@ static int ov5645_probe(struct i2c_client *client,
ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
&ov5645->ep);
+
+ of_node_put(endpoint);
+
if (ret < 0) {
dev_err(dev, "parsing endpoint node failed\n");
return ret;
}
- of_node_put(endpoint);
-
if (ov5645->ep.bus_type != V4L2_MBUS_CSI2) {
dev_err(dev, "invalid bus type, must be CSI2\n");
return -EINVAL;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: gspca: fix Kconfig help info
This is an automatic generated email to let you know that the following patch were queued: Subject: media: gspca: fix Kconfig help info Author: winton.liu <18502523...@163.com> Date:Tue Apr 3 08:04:45 2018 -0400 Documentation/video4linux/gspca.txt is missing. It has moved to Documentation/media/v4l-drivers/gspca-cardlist.rst Signed-off-by: winton.liu <18502523...@163.com> Signed-off-by: Mauro Carvalho Chehab drivers/media/usb/gspca/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig index d214a21acff7..bc9a439745aa 100644 --- a/drivers/media/usb/gspca/Kconfig +++ b/drivers/media/usb/gspca/Kconfig @@ -7,7 +7,7 @@ menuconfig USB_GSPCA Say Y here if you want to enable selecting webcams based on the GSPCA framework. - See for more info. + See for more info. This driver uses the Video For Linux API. You must say Y or M to "Video For Linux" to use this driver. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: vcodec: fix error return value from mtk_jpeg_clk_init()
This is an automatic generated email to let you know that the following patch were queued: Subject: media: vcodec: fix error return value from mtk_jpeg_clk_init() Author: Ryder Lee Date:Thu Mar 22 23:44:13 2018 -0400 The error return value should be fixed as it may return EPROBE_DEFER. Cc: Bin Liu Signed-off-by: Ryder Lee Reviewed-by: Matthias Brugger Acked-by: Rick Chang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c index 226f90886484..af17aaa21f58 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -1081,11 +1081,11 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) jpeg->clk_jdec = devm_clk_get(jpeg->dev, "jpgdec"); if (IS_ERR(jpeg->clk_jdec)) - return -EINVAL; + return PTR_ERR(jpeg->clk_jdec); jpeg->clk_jdec_smi = devm_clk_get(jpeg->dev, "jpgdec-smi"); if (IS_ERR(jpeg->clk_jdec_smi)) - return -EINVAL; + return PTR_ERR(jpeg->clk_jdec_smi); return 0; } ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: pixfmt-v4l2.rst: fix types
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: pixfmt-v4l2.rst: fix types
Author: Hans Verkuil
Date:Mon Mar 19 08:58:19 2018 -0400
The v4l2_pix_format documentation still had 'enum's as types.
Replace by __u32 and add a reference to the enum.
Also put ycbcr_enc and hsv_enc in a union.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 36 ++--
1 file changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
b/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
index 6622938c1b41..826f2305da01 100644
--- a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
@@ -40,9 +40,10 @@ Single-planar format structure
RGB formats in :ref:`rgb-formats`, YUV formats in
:ref:`yuv-formats`, and reserved codes in
:ref:`reserved-formats`
-* - enum :c:type:`v4l2_field`
+* - __u32
- ``field``
- - Video images are typically interlaced. Applications can request to
+ - Field order, from enum :c:type:`v4l2_field`.
+Video images are typically interlaced. Applications can request to
capture or output only the top or bottom field, or both fields
interlaced or sequentially stored in one buffer or alternating in
separate buffers. Drivers return the actual field order selected.
@@ -82,9 +83,10 @@ Single-planar format structure
driver. Usually this is ``bytesperline`` times ``height``. When
the image consists of variable length compressed data this is the
maximum number of bytes required to hold an image.
-* - enum :c:type:`v4l2_colorspace`
+* - __u32
- ``colorspace``
- - This information supplements the ``pixelformat`` and must be set
+ - Image colorspace, from enum :c:type:`v4l2_colorspace`.
+This information supplements the ``pixelformat`` and must be set
by the driver for capture streams and by the application for
output streams, see :ref:`colorspaces`.
* - __u32
@@ -116,23 +118,33 @@ Single-planar format structure
* - __u32
- ``flags``
- Flags set by the application or driver, see :ref:`format-flags`.
-* - enum :c:type:`v4l2_ycbcr_encoding`
+* - union {
+ - (anonymous)
+ -
+* - __u32
- ``ycbcr_enc``
- - This information supplements the ``colorspace`` and must be set by
+ - Y'CbCr encoding, from enum :c:type:`v4l2_ycbcr_encoding`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
-* - enum :c:type:`v4l2_hsv_encoding`
+* - __u32
- ``hsv_enc``
- - This information supplements the ``colorspace`` and must be set by
+ - HSV encoding, from enum :c:type:`v4l2_hsv_encoding`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
-* - enum :c:type:`v4l2_quantization`
+* - }
+ -
+ -
+* - __u32
- ``quantization``
- - This information supplements the ``colorspace`` and must be set by
+ - Quantization range, from enum :c:type:`v4l2_quantization`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
-* - enum :c:type:`v4l2_xfer_func`
+* - __u32
- ``xfer_func``
- - This information supplements the ``colorspace`` and must be set by
+ - Transfer function, from enum :c:type:`v4l2_xfer_func`.
+This information supplements the ``colorspace`` and must be set by
the driver for capture streams and by the application for output
streams, see :ref:`colorspaces`.
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: dvb_frontend: fix wrong cast in compat_ioctl
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: dvb_frontend: fix wrong cast in compat_ioctl
Author: Katsuhiro Suzuki
Date:Wed Apr 4 04:17:56 2018 -0400
FE_GET_PROPERTY has always failed as following situations:
- Use compatible ioctl
- The array of 'struct dtv_property' has 2 or more items
This patch fixes wrong cast to a pointer 'struct dtv_property' from a
pointer of 2nd or after item of 'struct compat_dtv_property' array.
Signed-off-by: Katsuhiro Suzuki
Signed-off-by: Mauro Carvalho Chehab
drivers/media/dvb-core/dvb_frontend.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/drivers/media/dvb-core/dvb_frontend.c
b/drivers/media/dvb-core/dvb_frontend.c
index 21a7d4b47e1a..e33414975065 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2089,7 +2089,7 @@ static int dvb_frontend_handle_compat_ioctl(struct file
*file, unsigned int cmd,
}
for (i = 0; i < tvps->num; i++) {
err = dtv_property_process_get(
- fe, &getp, (struct dtv_property *)tvp + i, file);
+ fe, &getp, (struct dtv_property *)(tvp + i), file);
if (err < 0) {
kfree(tvp);
return err;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: vsp1: Fix BRx conditional path in WPF
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: vsp1: Fix BRx conditional path in WPF
Author: Kieran Bingham
Date:Mon Mar 26 09:29:17 2018 -0400
When a BRx is provided by a pipeline, the WPF must determine the master
layer. Currently the condition to check this identifies pipe->bru ||
pipe->num_inputs > 1.
The code then moves on to dereference pipe->bru, thus the check fails
static analysers on the possibility that pipe->num_inputs could be
greater than 1 without pipe->bru being set.
The reality is that the pipeline must have a BRx to support more than
one input, thus this could never cause a fault - however it also
identifies that the num_inputs > 1 check is redundant.
Remove the redundant check - and always configure the master layer
appropriately when we have a BRx configured in our pipeline.
Fixes: 6134148f6098 ("v4l: vsp1: Add support for the BRS entity")
Cc: sta...@vger.kernel.org
Suggested-by: Mauro Carvalho Chehab
Signed-off-by: Kieran Bingham
Reviewed-by: Laurent Pinchart
Signed-off-by: Mauro Carvalho Chehab
drivers/media/platform/vsp1/vsp1_wpf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c
b/drivers/media/platform/vsp1/vsp1_wpf.c
index f7f3b4b2c2de..8bd6b2f1af15 100644
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -452,7 +452,7 @@ static void wpf_configure(struct vsp1_entity *entity,
: VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);
}
- if (pipe->bru || pipe->num_inputs > 1)
+ if (pipe->bru)
srcrpf |= pipe->bru->type == VSP1_ENTITY_BRU
? VI6_WPF_SRCRPF_VIRACT_MST
: VI6_WPF_SRCRPF_VIRACT2_MST;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: imx: work around false-positive warning
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: imx: work around false-positive warning
Author: Arnd Bergmann
Date:Tue Mar 13 09:14:09 2018 -0400
The IS_ERR()/PTR_ERR() combination confuses gcc to the point that it
cannot prove the upstream_ep variable to be initialized:
drivers/staging/media/imx/imx-media-csi.c: In function 'csi_link_validate':
drivers/staging/media/imx/imx-media-csi.c:1025:20: error: 'upstream_ep' may be
used uninitialized in this function [-Werror=maybe-uninitialized]
priv->upstream_ep = upstream_ep;
~~^
drivers/staging/media/imx/imx-media-csi.c:1026:24: error:
'upstream_ep.bus_type' may be used uninitialized in this function
[-Werror=maybe-uninitialized]
is_csi2 = (upstream_ep.bus_type == V4L2_MBUS_CSI2);
~~~^
drivers/staging/media/imx/imx-media-csi.c:127:19: error:
'upstream_ep.bus.parallel.bus_width' may be used uninitialized in this function
[-Werror=maybe-uninitialized]
I could come up with no good way to rewrite this function, as a last
resort, this adds an explicit zero-intialization of the structure.
Fixes: 52e17089d185 ("media: imx: Don't initialize vars that won't be used")
Signed-off-by: Arnd Bergmann
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/imx/imx-media-csi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/drivers/staging/media/imx/imx-media-csi.c
b/drivers/staging/media/imx/imx-media-csi.c
index 1aa2be891704..00c9d625cfb5 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1005,7 +1005,7 @@ static int csi_link_validate(struct v4l2_subdev *sd,
struct v4l2_subdev_format *sink_fmt)
{
struct csi_priv *priv = v4l2_get_subdevdata(sd);
- struct v4l2_fwnode_endpoint upstream_ep;
+ struct v4l2_fwnode_endpoint upstream_ep = {};
const struct imx_media_pixfmt *incc;
bool is_csi2;
int ret;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov2685: Remove owner assignment from i2c_driver
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: ov2685: Remove owner assignment from i2c_driver
Author: Fabio Estevam
Date:Sat Mar 17 14:24:58 2018 -0400
Structure i2c_driver does not need to set the owner field, as this will
be populated by the driver core.
Generated by scripts/coccinelle/api/platform_no_drv_owner.cocci.
Signed-off-by: Fabio Estevam
Signed-off-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/media/i2c/ov2685.c | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
index 83c55e8288e7..385c1886a947 100644
--- a/drivers/media/i2c/ov2685.c
+++ b/drivers/media/i2c/ov2685.c
@@ -832,7 +832,6 @@ MODULE_DEVICE_TABLE(of, ov2685_of_match);
static struct i2c_driver ov2685_i2c_driver = {
.driver = {
.name = "ov2685",
- .owner = THIS_MODULE,
.pm = &ov2685_pm_ops,
.of_match_table = of_match_ptr(ov2685_of_match),
},
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: v4l2-tpg-core.c: add space after %
This is an automatic generated email to let you know that the following patch were queued: Subject: media: v4l2-tpg-core.c: add space after % Author: Hans Verkuil Date:Sun Mar 25 17:40:30 2018 -0400 I know, it's a measly space, but I can't stand it since the V4L2_PIX_FMT_NV24 case before this case does it right. So add the space in order to restore blessed symmetry and consistency and to make the world whole again... Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c index 37632bc524d4..9b64f4f354bf 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c @@ -1149,7 +1149,7 @@ static void gen_twopix(struct tpg_data *tpg, case V4L2_PIX_FMT_NV42: buf[0][offset] = r_y_h; buf[1][2 * offset] = b_v; - buf[1][(2 * offset + 1) %8] = g_u_s; + buf[1][(2 * offset + 1) % 8] = g_u_s; break; case V4L2_PIX_FMT_YUYV: ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: ov13858: Update to SPDX identifier
This is an automatic generated email to let you know that the following patch were queued: Subject: media: ov13858: Update to SPDX identifier Author: Chiranjeevi Rapolu Date:Wed Feb 21 12:55:20 2018 -0500 Replace GPL v2 license notice with SPDX license identifier. Signed-off-by: Chiranjeevi Rapolu Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab drivers/media/i2c/ov13858.c | 15 ++- 1 file changed, 2 insertions(+), 13 deletions(-) --- diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c index 3e9ff8205991..3dbcae257164 100644 --- a/drivers/media/i2c/ov13858.c +++ b/drivers/media/i2c/ov13858.c @@ -1,16 +1,5 @@ -/* - * Copyright (c) 2017 Intel Corporation. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version - * 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2017 Intel Corporation. #include #include ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: cx231xx: Increase USB bridge bandwidth
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: cx231xx: Increase USB bridge bandwidth
Author: Brad Love
Date:Mon Apr 2 15:59:01 2018 -0400
The cx231xx USB bridge has issue streaming QAM256 DVB-C channels.
QAM64 channels were fine, but QAM256 channels produced corrupted
transport streams.
cx231xx alt mode 4 does not provide enough bandwidth to acommodate
QAM256 DVB-C channels, most likely DVB-T2 channels would break up
as well. Alt mode 5 increases bridge bandwidth to 90Mbps, and
fixes QAM256 DVB-C streaming.
Signed-off-by: Brad Love
Signed-off-by: Mauro Carvalho Chehab
drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c
b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 713029420fcf..67ed66712d05 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -276,7 +276,7 @@ static int start_streaming(struct cx231xx_dvb *dvb)
if (dev->USE_ISO) {
dev_dbg(dev->dev, "DVB transfer mode is ISO.\n");
- cx231xx_set_alt_setting(dev, INDEX_TS1, 4);
+ cx231xx_set_alt_setting(dev, INDEX_TS1, 5);
rc = cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
if (rc < 0)
return rc;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: avoid a warning if 32 bits build
This is an automatic generated email to let you know that the following patch were queued: Subject: media: staging: atomisp: avoid a warning if 32 bits build Author: Mauro Carvalho Chehab Date:Mon Mar 26 15:06:00 2018 -0400 Checking if a size_t value is bigger than ULONG_INT only makes sense if building on 64 bits, as warned by: drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:697 gmin_get_config_var() warn: impossible condition '(*out_len > (~0)) => (0-u32max > u32max)' Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab .../staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c| 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c index be0c5e11e86b..3283c1b05d6a 100644 --- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c +++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c @@ -693,9 +693,11 @@ static int gmin_get_config_var(struct device *dev, const char *var, for (i = 0; i < sizeof(var8) && var8[i]; i++) var16[i] = var8[i]; +#ifdef CONFIG_64BIT /* To avoid owerflows when calling the efivar API */ if (*out_len > ULONG_MAX) return -EINVAL; +#endif /* Not sure this API usage is kosher; efivar_entry_get()'s * implementation simply uses VariableName and VendorGuid from ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: declare static vars as such
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: declare static vars as such
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 10:27:10 2018 -0400
Fix a bunch of warnings:
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c:93:23:
warning: symbol 'css_queues' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c:27:32:
warning: symbol 'handle_table' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c:32:30:
warning: symbol 'refpool' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c:43:30:
warning: symbol 'writepool' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c:54:30:
warning: symbol 'hmmbufferpool' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c:48:12:
warning: symbol 'HIVE_IF_BIN_COPY' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c:33:1:
warning: symbol 'gp_timer_reg_load' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:74:33:
warning: symbol 'sh_css_sp_output' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c:32:25:
warning: symbol 'debug_data' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c:32:21:
warning: symbol 'IB_BUFFER_NULL' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c:647:24:
warning: symbol 'config' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c:2894:10:
warning: symbol 'g_param_buffer_dequeue_count' was not declared. Should it be
static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c:2895:10:
warning: symbol 'g_param_buffer_enqueue_count' was not declared. Should it be
static?
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c | 2 +-
.../pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c | 2 +-
.../pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c | 4 ++--
.../media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c| 7 +++
.../atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 8
.../staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c| 6 +++---
6 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c
index c412810887b3..dcb9a3127cfe 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c
@@ -29,7 +29,7 @@
hrt_addressdebug_buffer_address = (hrt_address)-1;
hrt_vaddress debug_buffer_ddr_address = (hrt_vaddress)-1;
/* The local copy */
-debug_data_t debug_data;
+static debug_data_tdebug_data;
debug_data_t *debug_data_ptr = &debug_data;
void debug_buffer_init(const hrt_address addr)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c
index bcfd443f5202..b6b1344786b1 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c
@@ -29,7 +29,7 @@ gp_timer_reg_load(uint32_t reg);
static void
gp_timer_reg_store(uint32_t reg, uint32_t value);
-uint32_t
+static uint32_t
gp_timer_reg_load(uint32_t reg)
{
return ia_css_device_load_uint32(
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c
index bd6821e436b2..c9cb8e0621e5 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c
@@ -29,7 +29,7 @@
#define ZERO (0x0)
#define ONE (1U)
-const ib_buffer_t IB_BUFFER_NULL = {0 ,0, 0 };
+static const ib_buff
[git:media_tree/fixes] media: staging: atomisp: use %p to print pointers
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: use %p to print pointers
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 15:31:33 2018 -0400
Instead of a converting pointers to unsigned long, just print
them as-is, using %p.
Fixes this warning:
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c:3012
ia_css_debug_pipe_graph_dump_sp_raw_copy() warn: argument 4 to %08lx specifier
is cast from pointer
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../css2400/runtime/debug/src/ia_css_debug.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
---
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
index 60395904f89a..aa9a2d115265 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
@@ -2679,9 +2679,9 @@ ia_css_debug_pipe_graph_dump_frame(
}
dtrace_dot(
"node [shape = box, "
- "fixedsize=true, width=2, height=0.7]; \"0x%08lx\" "
+ "fixedsize=true, width=2, height=0.7]; \"%p\" "
"[label = \"%s\\n%d(%d) x %d, %dbpp\\n%s\"];",
- HOST_ADDRESS(frame),
+ frame,
debug_frame_format2str(frame->info.format),
frame->info.res.width,
frame->info.padded_width,
@@ -2691,16 +2691,16 @@ ia_css_debug_pipe_graph_dump_frame(
if (in_frame) {
dtrace_dot(
- "\"0x%08lx\"->\"%s(pipe%d)\" "
+ "\"%p\"->\"%s(pipe%d)\" "
"[label = %s_frame];",
- HOST_ADDRESS(frame),
+ frame,
blob_name, id, frame_name);
} else {
dtrace_dot(
- "\"%s(pipe%d)\"->\"0x%08lx\" "
+ "\"%s(pipe%d)\"->\"%p\" "
"[label = %s_frame];",
blob_name, id,
- HOST_ADDRESS(frame),
+ frame,
frame_name);
}
}
@@ -3011,9 +3011,9 @@ ia_css_debug_pipe_graph_dump_sp_raw_copy(
snprintf(ring_buffer, sizeof(ring_buffer),
"node [shape = box, "
- "fixedsize=true, width=2, height=0.7]; \"0x%08lx\" "
+ "fixedsize=true, width=2, height=0.7]; \"%p\" "
"[label = \"%s\\n%d(%d) x %d\\nRingbuffer\"];",
- HOST_ADDRESS(out_frame),
+ out_frame,
debug_frame_format2str(out_frame->info.format),
out_frame->info.res.width,
out_frame->info.padded_width,
@@ -3022,9 +3022,9 @@ ia_css_debug_pipe_graph_dump_sp_raw_copy(
dtrace_dot(ring_buffer);
dtrace_dot(
- "\"%s(pipe%d)\"->\"0x%08lx\" "
+ "\"%s(pipe%d)\"->\"%p\" "
"[label = out_frame];",
- "sp_raw_copy", 1, HOST_ADDRESS(out_frame));
+ "sp_raw_copy", 1, out_frame);
snprintf(dot_id_input_bin, sizeof(dot_id_input_bin), "%s(pipe%d)",
"sp_raw_copy", 1);
}
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: add a missing include
This is an automatic generated email to let you know that the following patch were queued: Subject: media: staging: atomisp: add a missing include Author: Mauro Carvalho Chehab Date:Mon Mar 26 11:00:05 2018 -0400 atomisp_drvfs.c is not including its own header, causing those warnings: drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c:185:5: warning: symbol 'atomisp_drvfs_init' was not declared. Should it be static? drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c:201:6: warning: symbol 'atomisp_drvfs_exit' was not declared. Should it be static? Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c | 1 + 1 file changed, 1 insertion(+) --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c index ceedb82b6beb..a815c768bda9 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c @@ -22,6 +22,7 @@ #include "atomisp_compat.h" #include "atomisp_internal.h" #include "atomisp_ioctl.h" +#include "atomisp_drvfs.h" #include "hmm/hmm.h" /* ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: remove unused set_pd_base()
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: remove unused set_pd_base()
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 14:22:32 2018 -0400
There's an implementation for set_pd_base at sh_mmu logic
with is said to be mandatory. However, the implementation
ends by calling a routine that does nothing.
So get rid of this entire nonsense.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../staging/media/atomisp/pci/atomisp2/atomisp_compat.h | 2 --
.../media/atomisp/pci/atomisp2/atomisp_compat_css20.c | 4
.../media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 4 +---
drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 13 ++---
.../staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 15 ---
5 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
index 3ef850cd25bd..398ee02229f8 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
@@ -182,8 +182,6 @@ void atomisp_css_mmu_invalidate_cache(void);
void atomisp_css_mmu_invalidate_tlb(void);
-void atomisp_css_mmu_set_page_table_base_index(unsigned long base_index);
-
int atomisp_css_start(struct atomisp_sub_device *asd,
enum atomisp_css_pipe_id pipe_id, bool in_reset);
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
index 7621b4537147..bbed1ed02074 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
@@ -1159,10 +1159,6 @@ void atomisp_css_mmu_invalidate_tlb(void)
ia_css_mmu_invalidate_cache();
}
-void atomisp_css_mmu_set_page_table_base_index(unsigned long base_index)
-{
-}
-
/*
* Check whether currently running MIPI buffer size fulfill
* the requirement of the stream to be run
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h
b/drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h
index 560014add005..4b2d94a37ea1 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h
@@ -80,12 +80,10 @@ struct isp_mmu_client {
unsigned int null_pte;
/*
-* set/get page directory base address (physical address).
+* get page directory base address (physical address).
*
* must be provided.
*/
- int (*set_pd_base) (struct isp_mmu *mmu,
- phys_addr_t pd_base);
unsigned int (*get_pd_base) (struct isp_mmu *mmu, phys_addr_t pd_base);
/*
* callback to flush tlb.
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c
b/drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c
index f21075c1e503..198f29f4a324 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c
@@ -344,13 +344,6 @@ static int mmu_map(struct isp_mmu *mmu, unsigned int
isp_virt,
/*
* setup L1 page table physical addr to MMU
*/
- ret = mmu->driver->set_pd_base(mmu, l1_pt);
- if (ret) {
- dev_err(atomisp_dev,
-"set page directory base address fail.\n");
- mutex_unlock(&mmu->pt_mutex);
- return ret;
- }
mmu->base_address = l1_pt;
mmu->l1_pte = isp_pgaddr_to_pte_valid(mmu, l1_pt);
memset(mmu->l2_pgt_refcount, 0, sizeof(int) * ISP_L1PT_PTES);
@@ -531,10 +524,8 @@ int isp_mmu_init(struct isp_mmu *mmu, struct
isp_mmu_client *driver)
mmu->driver = driver;
- if (!driver->set_pd_base || !driver->tlb_flush_all) {
- dev_err(atomisp_dev,
- "set_pd_base or tlb_flush_all operation "
-"not provided.\n");
+ if (!driver->tlb_flush_all) {
+ dev_err(atomisp_dev, "tlb_flush_all operation not provided.\n");
return -EINVAL;
}
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c
b/drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c
index c59bcc982966..4cbf907bd07b 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c
@@ -40,20 +40,6 @@ static phys_addr_t sh_pte_to_phys(struct isp_mmu *mmu,
return (phys_addr_t)((pte & ~mask) << ISP_PAGE_OFFSET);
}
-/*
- * set page directory base address (physical address).
-
[git:media_tree/fixes] media: staging: atomisp: get rid of an unused var
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: get rid of an unused var
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 16:13:36 2018 -0400
As warned:
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:8085
create_host_regular_capture_pipeline() error: uninitialized symbol 'frm'.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index 33024b92911f..2f0b76a33414 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -8044,7 +8044,6 @@ create_host_regular_capture_pipeline(struct ia_css_pipe
*pipe)
}
if (mode == IA_CSS_CAPTURE_MODE_PRIMARY) {
- unsigned int frm;
struct ia_css_frame *local_in_frame = NULL;
struct ia_css_frame *local_out_frame = NULL;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: stop mixing enum types
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: stop mixing enum types
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 16:08:34 2018 -0400
This driver abuses on enum types:
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37:
warning: mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37:
int enum ia_css_csi2_port versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37:
int enum mipi_port_ID_t
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39:
warning: mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39:
int enum ia_css_csi2_port versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39:
int enum mipi_port_ID_t
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62:
warning: mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62:
int enum mipi_port_ID_t versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62:
int enum ia_css_csi2_port
Doing some "implicit" typecast. Fix it by using just one enum
everywhere, and stopping using typedef to refer to it.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../media/atomisp/pci/atomisp2/atomisp_cmd.c | 10 +++---
.../media/atomisp/pci/atomisp2/atomisp_cmd.h | 2 +-
.../media/atomisp/pci/atomisp2/atomisp_compat.h| 6 ++--
.../atomisp/pci/atomisp2/atomisp_compat_css20.c| 6 ++--
.../css2400/css_2401_csi2p_system/system_global.h | 4 +--
.../hive_isp_css_common/host/input_system.c| 20 ++--
.../hive_isp_css_common/host/input_system_local.h | 2 +-
.../host/input_system_private.h| 4 +--
.../css2400/hive_isp_css_common/system_global.h| 4 +--
.../host/input_system_public.h | 14 -
.../pci/atomisp2/css2400/ia_css_input_port.h | 20 +---
.../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 4 +--
.../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 2 +-
.../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 4 +--
.../css2400/runtime/isys/interface/ia_css_isys.h | 16 +-
.../css2400/runtime/isys/src/csi_rx_rmgr.c | 4 +--
.../pci/atomisp2/css2400/runtime/isys/src/rx.c | 36 +++---
.../css2400/runtime/pipeline/src/pipeline.c| 4 +--
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 30 +-
.../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 2 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 2 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css_sp.h | 2 +-
22 files changed, 96 insertions(+), 102 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
index b1efbd4d2828..fa6ea506f8b1 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
@@ -437,7 +437,7 @@ static void atomisp_reset_event(struct atomisp_sub_device
*asd)
}
-static void print_csi_rx_errors(enum ia_css_csi2_port port,
+static void print_csi_rx_errors(enum mipi_port_id port,
struct atomisp_device *isp)
{
u32 infos = 0;
@@ -481,7 +481,7 @@ static void clear_irq_reg(struct atomisp_device *isp)
}
static struct atomisp_sub_device *
-__get_asd_from_port(struct atomisp_device *isp, mipi_port_ID_t port)
+__get_asd_from_port(struct atomisp_device *isp, enum mipi_port_id port)
{
int i;
@@ -570,9 +570,9 @@ irqreturn_t atomisp_isr(int irq, void *dev)
(irq_infos & CSS_IRQ_INFO_IF_ERROR)) {
/* handle mipi receiver error */
u32 rx_infos;
- enum ia_css_csi2_port port;
+ enum mipi_port_id port;
- for (port = IA_CSS_CSI2_PORT0; port <= IA_CSS_CSI2_PORT2;
+ for (port = MIPI_PORT0_ID; port <= MIPI_PORT2_ID;
port++) {
print_csi_rx_errors(port, isp);
atomisp_css_rx_get_irq_info(port, &rx_infos);
@@ -5028,7 +5028,7 @@ atomisp_try_fmt_file(struct atomisp_device *isp, struct
v4l2_format *f)
return 0;
}
-mipi_port_ID_t __get_mipi_port(struct atomisp_device *isp,
+enum mipi_port_id __get_mipi_port(struct atomisp_device *isp,
enum atomisp_camera_port port)
{
switch (port) {
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
index bdc73862fb79..79d493dba403 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atom
[git:media_tree/fixes] media: staging: atomisp: don't access a NULL var
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: don't access a NULL var
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 14:54:47 2018 -0400
Get rid of those warnings:
drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:446
gmin_v1p2_ctrl() error: we previously assumed 'gs' could be null (see line 444)
drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:480
gmin_v1p8_ctrl() error: we previously assumed 'gs' could be null (see line 478)
drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:516
gmin_v2p8_ctrl() error: we previously assumed 'gs' could be null (see line 514)
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../media/atomisp/platform/intel-mid/atomisp_gmin_platform.c| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git
a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
index d8b7183db252..be0c5e11e86b 100644
--- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
@@ -441,7 +441,7 @@ static int gmin_v1p2_ctrl(struct v4l2_subdev *subdev, int
on)
{
struct gmin_subdev *gs = find_gmin_subdev(subdev);
- if (gs && gs->v1p2_on == on)
+ if (!gs || gs->v1p2_on == on)
return 0;
gs->v1p2_on = on;
@@ -475,7 +475,7 @@ static int gmin_v1p8_ctrl(struct v4l2_subdev *subdev, int
on)
}
}
- if (gs && gs->v1p8_on == on)
+ if (!gs || gs->v1p8_on == on)
return 0;
gs->v1p8_on = on;
@@ -511,7 +511,7 @@ static int gmin_v2p8_ctrl(struct v4l2_subdev *subdev, int
on)
}
}
- if (gs && gs->v2p8_on == on)
+ if (!gs || gs->v2p8_on == on)
return 0;
gs->v2p8_on = on;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: fix endianess issues
This is an automatic generated email to let you know that the following patch were queued: Subject: media: staging: atomisp: fix endianess issues Author: Mauro Carvalho Chehab Date:Mon Mar 26 11:51:18 2018 -0400 There are lots of be-related warnings there, as it doesn't properly mark what data uses bigendian. Warnings fixed: drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:134:15: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:134:15:expected unsigned short [unsigned] [short] [usertype] drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:134:15:got restricted __be16 [usertype] drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:140:26: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:140:26: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:140:26: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:140:26: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:144:26: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:144:26: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:144:26: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:144:26: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:144:26: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:144:26: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:256:27: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:256:27:expected unsigned short [unsigned] [usertype] addr drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:256:27:got restricted __be16 [usertype] drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:302:25: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:302:25:expected unsigned short [unsigned] [short] [usertype] drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:302:25:got restricted __be16 [usertype] drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:306:25: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:306:25:expected unsigned int [unsigned] [usertype] drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c:306:25:got restricted __be32 [usertype] drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:97:24: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:97:24: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:97:24: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:97:24: warning: cast to restricted __be16 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:99:24: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:99:24: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:99:24: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:99:24: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:99:24: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:99:24: warning: cast to restricted __be32 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:134:15: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:134:15:expected unsigned short [unsigned] [short] [usertype] drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:134:15:got restricted __be16 [usertype] drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:141:24: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:141:24:expected unsigned short [unsigned] [short] [usertype] drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:141:24:got restricted __be16 [usertype] drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:177:27: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:177:27:expected unsigned short [unsigned] [usertype] addr drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:177:27:got restricted __be16 [usertype] drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:198:25: warning: incorrect type in assignment (different base types) drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:198:25:expected unsigned short [unsigned] [short] [usertype]
[git:media_tree/fixes] media: staging: atomisp: stop duplicating input format types
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: stop duplicating input format types
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 16:50:34 2018 -0400
The same formats are defined twice with different names,
as warned:
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5092:58: warning:
mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5092:58: int
enum atomisp_input_format versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5092:58: int
enum ia_css_stream_format
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5112:50: warning:
mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5112:50: int
enum atomisp_input_format versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5112:50: int
enum ia_css_stream_format
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5288:42: warning:
mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5288:42: int
enum atomisp_input_format versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5288:42: int
enum ia_css_stream_format
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62: warning:
incorrect type in argument 2 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62:
expected void const [noderef] *from
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62:got
unsigned short [usertype] *
Stop this enum abuse.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../media/atomisp/include/linux/atomisp_platform.h | 4 +
.../media/atomisp/pci/atomisp2/atomisp_compat.h| 12 +-
.../atomisp/pci/atomisp2/atomisp_compat_css20.c| 16 +--
.../atomisp/pci/atomisp2/atomisp_compat_css20.h| 3 +-
.../media/atomisp/pci/atomisp2/atomisp_subdev.c| 14 +--
.../media/atomisp/pci/atomisp2/atomisp_subdev.h| 8 +-
.../css2400/camera/util/interface/ia_css_util.h| 6 +-
.../pci/atomisp2/css2400/camera/util/src/util.c| 72 +--
.../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 4 +-
.../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 2 +-
.../pci/atomisp2/css2400/ia_css_stream_format.h| 71 +--
.../pci/atomisp2/css2400/ia_css_stream_public.h| 8 +-
.../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 42 +++
.../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 2 +-
.../runtime/binary/interface/ia_css_binary.h | 8 +-
.../atomisp2/css2400/runtime/binary/src/binary.c | 6 +-
.../css2400/runtime/debug/src/ia_css_debug.c | 91 +++---
.../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 92 +++---
.../runtime/inputfifo/interface/ia_css_inputfifo.h | 6 +-
.../css2400/runtime/inputfifo/src/inputfifo.c | 22 ++--
.../css2400/runtime/isys/interface/ia_css_isys.h | 4 +-
.../pci/atomisp2/css2400/runtime/isys/src/rx.c | 110 -
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 132 ++---
.../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 56 -
.../atomisp/pci/atomisp2/css2400/sh_css_params.c | 2 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 4 +-
.../pci/atomisp2/css2400/sh_css_stream_format.c| 58 -
.../pci/atomisp2/css2400/sh_css_stream_format.h| 2 +-
28 files changed, 396 insertions(+), 461 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index e0f0c379e7ce..aa5e294e7b7d 100644
--- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
@@ -104,6 +104,10 @@ enum atomisp_input_format {
ATOMISP_INPUT_FORMAT_USER_DEF8, /* User defined 8-bit data type 8 */
};
+#define N_ATOMISP_INPUT_FORMAT (ATOMISP_INPUT_FORMAT_USER_DEF8 + 1)
+
+
+
enum intel_v4l2_subdev_type {
RAW_CAMERA = 1,
SOC_CAMERA = 2,
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
index 1567572e5b49..6c829d0a1e4c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
@@ -253,7 +253,7 @@ void atomisp_css_isys_set_valid(struct atomisp_sub_device
*asd,
void atomisp_css_isys_set_format(struct atomisp_sub_device *asd,
enum atomisp_input_stream_id stream_id,
-enum atomisp_css_stream_format format,
+enum atomisp_input_format format,
int isys_stream);
int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd,
@@ -
[git:media_tree/fixes] media: staging: atomisp: get rid of stupid statements
This is an automatic generated email to let you know that the following patch were queued: Subject: media: staging: atomisp: get rid of stupid statements Author: Mauro Carvalho Chehab Date:Mon Mar 26 10:30:21 2018 -0400 It makes no sense to have a do nothing statement like: (void)stage; Fix those warnings: drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c:3808 sh_css_param_update_isp_params() error: uninitialized symbol 'stage'. drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1444 sh_css_update_host2sp_offline_frame() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'. drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1475 sh_css_update_host2sp_mipi_frame() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'. drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1502 sh_css_update_host2sp_mipi_metadata() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'. drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1522 sh_css_update_host2sp_num_mipi_frames() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'. drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1541 sh_css_update_host2sp_cont_num_raw_frames() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'. Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab .../staging/media/atomisp/pci/atomisp2/css2400/sh_css.c | 1 - .../media/atomisp/pci/atomisp2/css2400/sh_css_params.c | 1 - .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 16 +++- 3 files changed, 3 insertions(+), 15 deletions(-) --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c index 034437f8ca07..9958b275bd50 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c @@ -8082,7 +8082,6 @@ create_host_regular_capture_pipeline(struct ia_css_pipe *pipe) return err; } } - (void)frm; /* If we use copy iso primary, the input must be yuv iso raw */ current_stage->args.copy_vf = diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c index 3c0e8f66f59a..ba2b96e330d0 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c @@ -3805,7 +3805,6 @@ sh_css_param_update_isp_params(struct ia_css_pipe *curr_pipe, enum sh_css_queue_id queue_id; - (void)stage; pipe = curr_pipe->stream->pipes[i]; pipeline = ia_css_pipe_get_pipeline(pipe); pipe_num = ia_css_pipe_get_pipe_num(pipe); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c index 9c6330783358..bb297184ba3a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c @@ -71,7 +71,7 @@ struct sh_css_sp_group sh_css_sp_group; struct sh_css_sp_stage sh_css_sp_stage; struct sh_css_isp_stagesh_css_isp_stage; -struct sh_css_sp_outputsh_css_sp_output; +static struct sh_css_sp_output sh_css_sp_output; static struct sh_css_sp_per_frame_data per_frame_data; /* true if SP supports frame loop and host2sp_commands */ @@ -117,9 +117,9 @@ copy_isp_stage_to_sp_stage(void) */ sh_css_sp_stage.enable.sdis = sh_css_isp_stage.binary_info.enable.dis; sh_css_sp_stage.enable.s3a = sh_css_isp_stage.binary_info.enable.s3a; -#ifdef ISP2401 +#ifdef ISP2401 sh_css_sp_stage.enable.lace_stats = sh_css_isp_stage.binary_info.enable.lace_stats; -#endif +#endif } void @@ -1441,8 +1441,6 @@ sh_css_update_host2sp_offline_frame( unsigned int HIVE_ADDR_host_sp_com; unsigned int offset; - (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ - assert(frame_num < NUM_CONTINUOUS_FRAMES); /* Write new frame data into SP DMEM */ @@ -1472,8 +1470,6 @@ sh_css_update_host2sp_mipi_frame( unsigned int HIVE_ADDR_host_sp_com; unsigned int offset; - (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ - /* MIPI buffers are dedicated to port, so now there are more of them. */ assert(frame_num < (N_CSI_PORTS * NUM_MIPI_FRAMES_PER_STREAM)); @@ -1499,8 +1495,6 @@ sh_css_update_host2sp_mipi_metadata( unsigned int HIVE_ADDR_host_sp_com; unsigned int o; - (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ - /* MIPI buffers are dedicated to port, so now
[git:media_tree/fixes] media: staging: atomisp: Get rid of *default.host.[ch]
This is an automatic generated email to let you know that the following patch were queued: Subject: media: staging: atomisp: Get rid of *default.host.[ch] Author: Mauro Carvalho Chehab Date:Mon Mar 26 14:31:33 2018 -0400 There are a number of files at atomisp that aren't used anywhere, called as "*default.host.[ch]": css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.[ch] css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.[ch] css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.[ch] css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.[ch] Remove them. Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab .../staging/media/atomisp/pci/atomisp2/Makefile| 4 - .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.h| 1 - .../isp/kernels/bnlm/ia_css_bnlm_default.host.c| 71 .../isp/kernels/bnlm/ia_css_bnlm_default.host.h| 22 - .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.h| 1 - .../isp/kernels/dpc2/ia_css_dpc2_default.host.c| 26 -- .../isp/kernels/dpc2/ia_css_dpc2_default.host.h| 23 -- .../isp/kernels/eed1_8/ia_css_eed1_8.host.h| 1 - .../kernels/eed1_8/ia_css_eed1_8_default.host.c| 94 -- .../kernels/eed1_8/ia_css_eed1_8_default.host.h| 22 - .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 1 - .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c | 36 - .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h | 23 -- 13 files changed, 325 deletions(-) --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/drivers/staging/media/atomisp/pci/atomisp2/Makefile index 83f816faba1b..7fead5fc9a7d 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile +++ b/drivers/staging/media/atomisp/pci/atomisp2/Makefile @@ -59,17 +59,14 @@ atomisp-objs += \ css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.o \ css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.o \ css2400/isp/kernels/dpc2/ia_css_dpc2.host.o \ - css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.o \ css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.o \ css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.o \ css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.o \ css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.o \ css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.o \ css2400/isp/kernels/bh/bh_2/ia_css_bh.host.o \ - css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.o \ css2400/isp/kernels/bnlm/ia_css_bnlm.host.o \ css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.o \ - css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.o \ css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.o \ css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \ css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.o \ @@ -96,7 +93,6 @@ atomisp-objs += \ css2400/isp/kernels/ob/ob2/ia_css_ob2.host.o \ css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.o \ css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.o \ - css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.o \ css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.o \ css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.o \ css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h index b99c0644ab38..675f6e539b3f 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h @@ -17,7 +17,6 @@ #include "ia_css_bnlm_types.h" #include "ia_css_bnlm_param.h" -#include "ia_css_bnlm_default.host.h" void ia_css_bnlm_vmem_encode( diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c deleted file mode 100644 index e2eb88c0f123.. --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - */ - -#include "ia_css_bnlm_types.h" - -const struct ia_css_bnlm_config default_bnlm_config =
[git:media_tree/fixes] media: staging: atomisp: remove an useless check
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: remove an useless check
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 15:27:54 2018 -0400
There's a check at ia_css_vf_configure() to verify if
binary is not null. However, this is called too late:
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c:133
ia_css_vf_configure() warn: variable dereferenced before check 'binary' (see
line 129)
This test is wrong, as this fuction is only called by
ia_css_binary_fill_info(), in a place that already assumes that
binary is not null, and checks with:
assert(binary != NULL);
So, remove the useless broken extra check.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c| 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
index 5610833ed595..c2076e412410 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
@@ -130,11 +130,11 @@ ia_css_vf_configure(
err = configure_kernel(info, out_info, vf_info, downscale_log2,
&config);
configure_dma(&config, vf_info);
- if (binary) {
- if (vf_info)
- vf_info->raw_bit_depth = info->dma.vfdec_bits_per_pixel;
- ia_css_configure_vf (binary, &config);
- }
+
+ if (vf_info)
+ vf_info->raw_bit_depth = info->dma.vfdec_bits_per_pixel;
+ ia_css_configure_vf (binary, &config);
+
return IA_CSS_SUCCESS;
}
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: do some coding style improvements
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: do some coding style improvements
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 09:45:05 2018 -0400
Use make coccicheck in patch mode to do some coding style
improvements. Adjust the results manually.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../media/atomisp/pci/atomisp2/atomisp_cmd.c | 14 +-
.../media/atomisp/pci/atomisp2/atomisp_fops.c | 14 +-
.../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 2 +-
.../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +-
.../atomisp2/css2400/runtime/isys/src/isys_init.c | 4 +--
.../css2400/runtime/isys/src/virtual_isys.c| 12 -
.../css2400/runtime/pipeline/src/pipeline.c| 2 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 30 ++
.../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 3 +--
9 files changed, 38 insertions(+), 45 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
index 22f2dbcecc15..2f6c88a0f4ee 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
@@ -515,7 +515,7 @@ irqreturn_t atomisp_isr(int irq, void *dev)
spin_lock_irqsave(&isp->lock, flags);
if (isp->sw_contex.power_state != ATOM_ISP_POWER_UP ||
- isp->css_initialized == false) {
+ !isp->css_initialized) {
spin_unlock_irqrestore(&isp->lock, flags);
return IRQ_HANDLED;
}
@@ -4603,7 +4603,7 @@ int atomisp_fixed_pattern(struct atomisp_sub_device *asd,
int flag,
}
if (*value == 0) {
- asd->params.fpn_en = 0;
+ asd->params.fpn_en = false;
return 0;
}
@@ -5524,7 +5524,7 @@ static void atomisp_get_dis_envelop(struct
atomisp_sub_device *asd,
/* if subdev type is SOC camera,we do not need to set DVS */
if (isp->inputs[asd->input_curr].type == SOC_CAMERA)
- asd->params.video_dis_en = 0;
+ asd->params.video_dis_en = false;
if (asd->params.video_dis_en &&
asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO) {
@@ -5624,7 +5624,7 @@ static int atomisp_set_fmt_to_snr(struct video_device
*vdev,
ffmt = req_ffmt;
dev_warn(isp->dev,
"can not enable video dis due to sensor limitation.");
- asd->params.video_dis_en = 0;
+ asd->params.video_dis_en = false;
}
}
dev_dbg(isp->dev, "sensor width: %d, height: %d\n",
@@ -5649,7 +5649,7 @@ static int atomisp_set_fmt_to_snr(struct video_device
*vdev,
(ffmt->width < req_ffmt->width || ffmt->height < req_ffmt->height))
{
dev_warn(isp->dev,
"can not enable video dis due to sensor limitation.");
- asd->params.video_dis_en = 0;
+ asd->params.video_dis_en = false;
}
atomisp_subdev_set_ffmt(&asd->subdev, fh.pad,
@@ -6152,7 +6152,7 @@ int atomisp_set_shading_table(struct atomisp_sub_device
*asd,
if (!user_shading_table->enable) {
atomisp_css_set_shading_table(asd, NULL);
- asd->params.sc_en = 0;
+ asd->params.sc_en = false;
return 0;
}
@@ -6190,7 +6190,7 @@ int atomisp_set_shading_table(struct atomisp_sub_device
*asd,
free_table = asd->params.css_param.shading_table;
asd->params.css_param.shading_table = shading_table;
atomisp_css_set_shading_table(asd, shading_table);
- asd->params.sc_en = 1;
+ asd->params.sc_en = true;
out:
if (free_table != NULL)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
index 545ef024841d..709137f25700 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
@@ -689,7 +689,7 @@ static void atomisp_dev_init_struct(struct atomisp_device
*isp)
{
unsigned int i;
- isp->sw_contex.file_input = 0;
+ isp->sw_contex.file_input = false;
isp->need_gfx_throttle = true;
isp->isp_fatal_error = false;
isp->mipi_frame_size = 0;
@@ -708,12 +708,12 @@ static void atomisp_subdev_init_struct(struct
atomisp_sub_device *asd)
v4l2_ctrl_s_ctrl(asd->run_mode, ATOMISP_RUN_MODE_STILL_CAPTURE);
memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));
asd->params.color_effect = V4L2_COLORFX_NONE;
- asd->params.bad_pixel_en = 1;
- asd->params.gdc_cac_en = 0;
- asd->params.video_dis_en = 0;
- asd->params.sc_en = 0;
- asd-
[git:media_tree/fixes] media: staging: atomisp: get rid of an unused function
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: get rid of an unused function
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 14:25:24 2018 -0400
The function __need_realloc_mipi_buffer() is not used anywhere.
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
.../atomisp/pci/atomisp2/atomisp_compat_css20.c | 21 -
1 file changed, 21 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
index bbed1ed02074..b0e584b3cfc7 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
@@ -1159,27 +1159,6 @@ void atomisp_css_mmu_invalidate_tlb(void)
ia_css_mmu_invalidate_cache();
}
-/*
- * Check whether currently running MIPI buffer size fulfill
- * the requirement of the stream to be run
- */
-bool __need_realloc_mipi_buffer(struct atomisp_device *isp)
-{
- unsigned int i;
-
- for (i = 0; i < isp->num_of_streams; i++) {
- struct atomisp_sub_device *asd = &isp->asd[i];
-
- if (asd->streaming !=
- ATOMISP_DEVICE_STREAMING_ENABLED)
- continue;
- if (asd->mipi_frame_size < isp->mipi_frame_size)
- return true;
- }
-
- return false;
-}
-
int atomisp_css_start(struct atomisp_sub_device *asd,
enum atomisp_css_pipe_id pipe_id, bool in_reset)
{
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: staging: atomisp: get rid of some static warnings
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: staging: atomisp: get rid of some static warnings
Author: Mauro Carvalho Chehab
Date:Mon Mar 26 11:14:10 2018 -0400
Get rid of those warnings:
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c:18:15:
warning: symbol 'g_pyramid' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c:66:23:
warning: symbol 'sh_mmu_mrfld' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/gc0310.h:381:26: warning: symbol
'gc0310_res_preview' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c:622:25: warning: symbol
'gc0310_controls' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/ov2722.h:1099:26: warning: symbol
'ov2722_res_preview' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c:574:25: warning: symbol
'ov2722_controls' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:727:25: warning: symbol
'ov2680_controls' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h:1090:26: warning: symbol
'ov5693_res_preview' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c:958:5: warning:
symbol 'ad5823_t_focus_abs' was not declared. Should it be static?
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c:1139:25: warning:
symbol 'ov5693_controls' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:91:6:
warning: symbol 'atomisp_css2_hw_store_8' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:129:10:
warning: symbol 'atomisp_css2_hw_load_16' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:139:10:
warning: symbol 'atomisp_css2_hw_load_32' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2868:14:
warning: symbol 'atomisp_get_pipe_index' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5165:5: warning:
symbol 'configure_pp_input_nop' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5171:5: warning:
symbol 'configure_output_nop' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5179:5: warning:
symbol 'get_frame_info_nop' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6630:5: warning:
symbol 'atomisp_get_pipe_id' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c:48:12:
warning: symbol 'HIVE_IF_BIN_COPY' was not declared. Should it be static?
drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c:1610:6: warning:
symbol '__wdt_on_master_slave_sensor' was not declared. Should it be static?
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +-
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 2 +-
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +-
drivers/staging/media/atomisp/i2c/gc0310.h | 3 +--
drivers/staging/media/atomisp/i2c/ov2722.h | 2 +-
.../staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 4 ++--
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 +-
.../staging/media/atomisp/pci/atomisp2/atomisp_cmd.c | 18 +-
.../media/atomisp/pci/atomisp2/atomisp_compat_css20.c | 11 ++-
.../staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c | 8 +---
.../css2400/hive_isp_css_common/host/input_formatter.c | 5 +++--
.../css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 2 +-
.../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 1 +
13 files changed, 33 insertions(+), 29 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 93753cb96180..512fa87fa11b 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -619,7 +619,7 @@ static const struct v4l2_ctrl_ops ctrl_ops = {
.g_volatile_ctrl = gc0310_g_volatile_ctrl
};
-struct v4l2_ctrl_config gc0310_controls[] = {
+static const struct v4l2_ctrl_config gc0310_controls[] = {
{
.ops = &ctrl_ops,
.id = V4L2_CID_EXPOSURE_ABSOLUTE,
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index 1d814bcb18b8..c0849299d592 100644
--- a/drivers/st
[git:media_tree/fixes] media: staging: atomisp: ia_css_output.host: don't use var before check
This is an automatic generated email to let you know that the following patch were queued: Subject: media: staging: atomisp: ia_css_output.host: don't use var before check Author: Mauro Carvalho Chehab Date:Mon Mar 26 10:16:07 2018 -0400 Fix this warning: drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c:64 ia_css_output_config() warn: variable dereferenced before check 'from->info' (see line 63) Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab .../atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c index 8fdf47c9310c..9efe5e5e4e06 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c @@ -60,7 +60,7 @@ ia_css_output_config( (void)size; ia_css_dma_configure_from_info(&to->port_b, from->info); to->width_a_over_b = elems_a / to->port_b.elems; - to->height = from->info->res.height; + to->height = from->info ? from->info->res.height : 0; to->enable = from->info != NULL; ia_css_frame_info_to_frame_sp_info(&to->info, from->info); ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] media: extended-controls.rst: transmitter -> receiver
This is an automatic generated email to let you know that the following patch were queued: Subject: media: extended-controls.rst: transmitter -> receiver Author: Hans Verkuil Date:Fri Mar 30 03:30:06 2018 -0400 V4L2_CID_DV_RX_POWER_PRESENT refers to a receiver, not a transmitter. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/extended-controls.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst index d5f3eb6e674a..03931f9b1285 100644 --- a/Documentation/media/uapi/v4l/extended-controls.rst +++ b/Documentation/media/uapi/v4l/extended-controls.rst @@ -3565,7 +3565,7 @@ enum v4l2_dv_it_content_type - HDMI carries 5V on one of the pins). This is often used to power an eeprom which contains EDID information, such that the source can read the EDID even if the sink is in standby/power off. Each bit -corresponds to an input pad on the transmitter. If an input pad +corresponds to an input pad on the receiver. If an input pad cannot detect whether power is present, then the bit for that pad will be 0. This read-only control is applicable to DVI-D, HDMI and DisplayPort connectors. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:v4l-utils/master] cec-ctl: Prepare for __inline__ instead of inline
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: cec-ctl: Prepare for __inline__ instead of inline
Author: Sakari Ailus
Date:Wed Apr 4 17:51:56 2018 +0300
Once formatted for user space consumption, inlined functions in
include/uapi/linux/cec-funcs.h have "__inline__" modifier instead of
"inline" at least in some circumstances. msg2ctl.pl gets confused of
__inline__, allow both to avoid trouble.
Signed-off-by: Sakari Ailus
Signed-off-by: Hans Verkuil
utils/cec-ctl/msg2ctl.pl | 8
1 file changed, 4 insertions(+), 4 deletions(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=47d43b130dc6e9e0edc900759fb37649208371e4
diff --git a/utils/cec-ctl/msg2ctl.pl b/utils/cec-ctl/msg2ctl.pl
index 0e494c543bd0..d95e8af4088c 100755
--- a/utils/cec-ctl/msg2ctl.pl
+++ b/utils/cec-ctl/msg2ctl.pl
@@ -383,14 +383,14 @@ while (<>) {
next if /^\s*$/;
next if /cec_msg_reply_feature_abort/;
next if /cec_msg_htng_init/;
- if (/^static inline void cec_msg.*\(.*\)/) {
- s/static\sinline\svoid\s//;
+ if (/^static (__)?inline(__)? void cec_msg.*\(.*\)/) {
+ s/static\s(__)?inline(__)?\svoid\s//;
s/struct cec_msg \*msg, //;
s/struct cec_msg \*msg//;
process_func($feature, $_);
next;
}
- if (/^static inline void cec_msg/) {
+ if (/^static (__)?inline(__)? void cec_msg/) {
$func = $_;
next;
}
@@ -398,7 +398,7 @@ while (<>) {
$func .= $_;
next unless /\)$/;
$func =~ s/\s+/ /g;
- $func =~ s/static\sinline\svoid\s//;
+ $func =~ s/static\s(__)?inline(__)?\svoid\s//;
$func =~ s/struct cec_msg \*msg, //;
$func =~ s/struct cec_msg \*msg//;
process_func($feature, $func);
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
