This patchset aims to add a method to display the correct order of
colors for a test image generated. It does so by adding a function
which returns a string of correct order of the colors for a test
pattern. It then adds a control in vimc which displays the string
over test image. It also displays some other information like saturation,
hue, contrast brightness and time since the stream started over test
image generated by vimc.
Changes since v8:
In patch 1:
- Add more details to commit message.
In patch 3:
- Formatting nits.
Changes since v7:
In patch 3:
- Use fallthrough; to indicate a fall through in switch-case
- Use enum type instead of int for osd_value
- Change varaible to osd_value instead of osd_mode as the enum
osd_mode defines the modes.
Changes since v6:
In patch 3:
- Use switch case instead of if()
- reorder declarartions.
Changes since v5:
In patch 2:
- Add missing EXPORT_SYMBOL_GPL()
In patch 3:
- Renamed varaibles.
- use u64 instead of int for getting current time in
nanoseconds.
- Use enum instead of numbers to describe the state of osd_mode
control in code.
Changes since v4:
- Add another patch which changes char argument to const char
in function tpg_gen_text()
- Return const char * from function tpg_g_color_order() in patch
2
In 3rd patch:
- Check font in probe() instead of s_stream()
- Use dev_err instead of pr_err
- Fix errors in commit message.
- Base VIMC_CID_SHOW_INFO on VIVID_CID_OSD_TEXT_MODE
Changes since v3:
In 1st patch:
-Improved formatting of returned string.
In 2nd patch:
- Add CID prefix in control name and change it to a more
generic name.
- Rename bool variable to a generic name.
- Disable text rendering instead of stopping stream if no
font found.
- Display more info like VIVID in VIMC.
Changes since v2:
In 1st patch:
- Create a 'define' to prevent repetition of the common color
sequence string.
- Use 'fallthrough' on case statement to prevent repetition of
code.
Changes since v1:
- Divided the patch into two patches.
- Returned NULL for patterns whose color order cannot be
defined. (Reported-by: kernel test robot <[email protected]>)
- Made separate switch cases for separate test patterns
(Reported-by: kernel test robot <[email protected]>)
- Renamed variables from camelcase to use '_'
- prefixed 'media' to the patches.
Kaaira Gupta (3):
media: tpg: change char argument to const char
media: tpg: Add function to return colors' order of test image
media: vimc: Add a control to display info on test image
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 40 +++++++++--
drivers/media/test-drivers/vimc/Kconfig | 2 +
drivers/media/test-drivers/vimc/vimc-common.h | 1 +
drivers/media/test-drivers/vimc/vimc-core.c | 10 +++
drivers/media/test-drivers/vimc/vimc-sensor.c | 71 +++++++++++++++++++
include/media/tpg/v4l2-tpg.h | 3 +-
6 files changed, 119 insertions(+), 8 deletions(-)
--
2.17.1
Change the argument of type char * to const char * for function
tpg_gen_text().
This function should take in a const char pointer as opposed to a char
* as there is no modification. This issue was found while passing the
order of colors of tpg generated test image (which is a const char *)
to this function.
Signed-off-by: Kaaira Gupta <[email protected]>
Reviewed-by: Helen Koike <[email protected]>
---
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 10 +++++-----
include/media/tpg/v4l2-tpg.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
index 50f1e0b28b25..dde22a4cbd6c 100644
--- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
+++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
@@ -1927,34 +1927,34 @@ typedef struct { u16 __; u8 _; } __packed x24;
static noinline void tpg_print_str_2(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
unsigned p, unsigned first, unsigned div, unsigned step,
- int y, int x, char *text, unsigned len)
+ int y, int x, const char *text, unsigned len)
{
PRINTSTR(u8);
}
static noinline void tpg_print_str_4(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
unsigned p, unsigned first, unsigned div, unsigned step,
- int y, int x, char *text, unsigned len)
+ int y, int x, const char *text, unsigned len)
{
PRINTSTR(u16);
}
static noinline void tpg_print_str_6(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
unsigned p, unsigned first, unsigned div, unsigned step,
- int y, int x, char *text, unsigned len)
+ int y, int x, const char *text, unsigned len)
{
PRINTSTR(x24);
}
static noinline void tpg_print_str_8(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
unsigned p, unsigned first, unsigned div, unsigned step,
- int y, int x, char *text, unsigned len)
+ int y, int x, const char *text, unsigned len)
{
PRINTSTR(u32);
}
void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
- int y, int x, char *text)
+ int y, int x, const char *text)
{
unsigned step = V4L2_FIELD_HAS_T_OR_B(tpg->field) ? 2 : 1;
unsigned div = step;
diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
index eb191e85d363..9749ed409856 100644
--- a/include/media/tpg/v4l2-tpg.h
+++ b/include/media/tpg/v4l2-tpg.h
@@ -241,7 +241,7 @@ void tpg_log_status(struct tpg_data *tpg);
void tpg_set_font(const u8 *f);
void tpg_gen_text(const struct tpg_data *tpg,
- u8 *basep[TPG_MAX_PLANES][2], int y, int x, char *text);
+ u8 *basep[TPG_MAX_PLANES][2], int y, int x, const char *text);
void tpg_calc_text_basep(struct tpg_data *tpg,
u8 *basep[TPG_MAX_PLANES][2], unsigned p, u8 *vbuf);
unsigned tpg_g_interleaved_plane(const struct tpg_data *tpg, unsigned buf_line);
--
2.17.1
Currently there is no method to know the correct order of the colors for
a test image generated by tpg. Write a function that returns a string of
colors' order given a tpg. It returns a NULL pointer in case of test
patterns which do not have a well defined colors' order. Hence add a
NULL check for text in tpg_gen_text().
Signed-off-by: Kaaira Gupta <[email protected]>
Reviewed-by: Kieran Bingham <[email protected]>
Reviewed-by: Helen Koike <[email protected]>
---
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 30 +++++++++++++++++--
include/media/tpg/v4l2-tpg.h | 1 +
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
index dde22a4cbd6c..c46ddd902675 100644
--- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
+++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
@@ -1959,12 +1959,14 @@ void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
unsigned step = V4L2_FIELD_HAS_T_OR_B(tpg->field) ? 2 : 1;
unsigned div = step;
unsigned first = 0;
- unsigned len = strlen(text);
+ unsigned len;
unsigned p;
- if (font8x16 == NULL || basep == NULL)
+ if (font8x16 == NULL || basep == NULL || text == NULL)
return;
+ len = strlen(text);
+
/* Checks if it is possible to show string */
if (y + 16 >= tpg->compose.height || x + 8 >= tpg->compose.width)
return;
@@ -2006,6 +2008,30 @@ void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
}
EXPORT_SYMBOL_GPL(tpg_gen_text);
+const char *tpg_g_color_order(const struct tpg_data *tpg)
+{
+ switch (tpg->pattern) {
+ case TPG_PAT_75_COLORBAR:
+ case TPG_PAT_100_COLORBAR:
+ case TPG_PAT_CSC_COLORBAR:
+ case TPG_PAT_100_HCOLORBAR:
+ return "white, yellow, cyan, green, magenta, red, blue, black";
+ case TPG_PAT_BLACK:
+ return "Black";
+ case TPG_PAT_WHITE:
+ return "White";
+ case TPG_PAT_RED:
+ return "Red";
+ case TPG_PAT_GREEN:
+ return "Green";
+ case TPG_PAT_BLUE:
+ return "Blue";
+ default:
+ return NULL;
+ }
+}
+EXPORT_SYMBOL_GPL(tpg_g_color_order);
+
void tpg_update_mv_step(struct tpg_data *tpg)
{
int factor = tpg->mv_hor_mode > TPG_MOVE_NONE ? -1 : 1;
diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
index 9749ed409856..0b0ddb87380e 100644
--- a/include/media/tpg/v4l2-tpg.h
+++ b/include/media/tpg/v4l2-tpg.h
@@ -252,6 +252,7 @@ void tpg_fillbuffer(struct tpg_data *tpg, v4l2_std_id std,
bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc);
void tpg_s_crop_compose(struct tpg_data *tpg, const struct v4l2_rect *crop,
const struct v4l2_rect *compose);
+const char *tpg_g_color_order(const struct tpg_data *tpg);
static inline void tpg_s_pattern(struct tpg_data *tpg, enum tpg_pattern pattern)
{
--
2.17.1
Add a control in VIMC to display information such as the correct order of
colors for a given test pattern, counter, brightness, hue, saturation,
contrast, width and height at sensor over test image.
Signed-off-by: Kaaira Gupta <[email protected]>
Acked-by: Helen Koike <[email protected]>
---
drivers/media/test-drivers/vimc/Kconfig | 2 +
drivers/media/test-drivers/vimc/vimc-common.h | 1 +
drivers/media/test-drivers/vimc/vimc-core.c | 10 +++
drivers/media/test-drivers/vimc/vimc-sensor.c | 71 +++++++++++++++++++
4 files changed, 84 insertions(+)
diff --git a/drivers/media/test-drivers/vimc/Kconfig b/drivers/media/test-drivers/vimc/Kconfig
index 4068a67585f9..da4b2ad6e40c 100644
--- a/drivers/media/test-drivers/vimc/Kconfig
+++ b/drivers/media/test-drivers/vimc/Kconfig
@@ -2,6 +2,8 @@
config VIDEO_VIMC
tristate "Virtual Media Controller Driver (VIMC)"
depends on VIDEO_DEV && VIDEO_V4L2
+ select FONT_SUPPORT
+ select FONT_8x16
select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API
select VIDEOBUF2_VMALLOC
diff --git a/drivers/media/test-drivers/vimc/vimc-common.h b/drivers/media/test-drivers/vimc/vimc-common.h
index ae163dec2459..a289434e75ba 100644
--- a/drivers/media/test-drivers/vimc/vimc-common.h
+++ b/drivers/media/test-drivers/vimc/vimc-common.h
@@ -20,6 +20,7 @@
#define VIMC_CID_VIMC_CLASS (0x00f00000 | 1)
#define VIMC_CID_TEST_PATTERN (VIMC_CID_VIMC_BASE + 0)
#define VIMC_CID_MEAN_WIN_SIZE (VIMC_CID_VIMC_BASE + 1)
+#define VIMC_CID_OSD_TEXT_MODE (VIMC_CID_VIMC_BASE + 2)
#define VIMC_FRAME_MAX_WIDTH 4096
#define VIMC_FRAME_MAX_HEIGHT 2160
diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c
index 11210aaa2551..4b0ae6f51d76 100644
--- a/drivers/media/test-drivers/vimc/vimc-core.c
+++ b/drivers/media/test-drivers/vimc/vimc-core.c
@@ -5,10 +5,12 @@
* Copyright (C) 2015-2017 Helen Koike <[email protected]>
*/
+#include <linux/font.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <media/media-device.h>
+#include <media/tpg/v4l2-tpg.h>
#include <media/v4l2-device.h>
#include "vimc-common.h"
@@ -263,11 +265,19 @@ static int vimc_register_devices(struct vimc_device *vimc)
static int vimc_probe(struct platform_device *pdev)
{
+ const struct font_desc *font = find_font("VGA8x16");
struct vimc_device *vimc;
int ret;
dev_dbg(&pdev->dev, "probe");
+ if (!font) {
+ dev_err(&pdev->dev, "could not find font\n");
+ return -ENODEV;
+ }
+
+ tpg_set_font(font->data);
+
vimc = kzalloc(sizeof(*vimc), GFP_KERNEL);
if (!vimc)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vimc/vimc-sensor.c b/drivers/media/test-drivers/vimc/vimc-sensor.c
index a2f09ac9a360..f5674b9b757e 100644
--- a/drivers/media/test-drivers/vimc/vimc-sensor.c
+++ b/drivers/media/test-drivers/vimc/vimc-sensor.c
@@ -14,11 +14,19 @@
#include "vimc-common.h"
+enum vimc_sen_osd_mode {
+ VIMC_SEN_OSD_SHOW_ALL = 0,
+ VIMC_SEN_OSD_SHOW_COUNTERS = 1,
+ VIMC_SEN_OSD_SHOW_NONE = 2
+};
+
struct vimc_sen_device {
struct vimc_ent_device ved;
struct v4l2_subdev sd;
struct tpg_data tpg;
u8 *frame;
+ enum vimc_sen_osd_mode osd_value;
+ u64 start_stream_ts;
/* The active format */
struct v4l2_mbus_framefmt mbus_format;
struct v4l2_ctrl_handler hdl;
@@ -187,8 +195,49 @@ static void *vimc_sen_process_frame(struct vimc_ent_device *ved,
{
struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device,
ved);
+ const unsigned int line_height = 16;
+ u8 *basep[TPG_MAX_PLANES][2];
+ unsigned int line = 1;
+ char str[100];
tpg_fill_plane_buffer(&vsen->tpg, 0, 0, vsen->frame);
+ tpg_calc_text_basep(&vsen->tpg, basep, 0, vsen->frame);
+ switch (vsen->osd_value) {
+ case VIMC_SEN_OSD_SHOW_ALL: {
+ const char *order = tpg_g_color_order(&vsen->tpg);
+
+ tpg_gen_text(&vsen->tpg, basep, line++ * line_height,
+ 16, order);
+ snprintf(str, sizeof(str),
+ "brightness %3d, contrast %3d, saturation %3d, hue %d ",
+ vsen->tpg.brightness,
+ vsen->tpg.contrast,
+ vsen->tpg.saturation,
+ vsen->tpg.hue);
+ tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
+ snprintf(str, sizeof(str), "sensor size: %dx%d",
+ vsen->mbus_format.width,
+ vsen->mbus_format.height);
+ tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
+ fallthrough;
+ }
+ case VIMC_SEN_OSD_SHOW_COUNTERS: {
+ unsigned int ms;
+
+ ms = (ktime_get_ns() - vsen->start_stream_ts) / 1000000;
+ snprintf(str, sizeof(str), "%02d:%02d:%02d:%03d",
+ (ms / (60 * 60 * 1000)) % 24,
+ (ms / (60 * 1000)) % 60,
+ (ms / 1000) % 60,
+ ms % 1000);
+ tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
+ break;
+ }
+ case VIMC_SEN_OSD_SHOW_NONE:
+ default:
+ break;
+ }
+
return vsen->frame;
}
@@ -201,6 +250,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
const struct vimc_pix_map *vpix;
unsigned int frame_size;
+ vsen->start_stream_ts = ktime_get_ns();
+
/* Calculate the frame size */
vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
frame_size = vsen->mbus_format.width * vpix->bpp *
@@ -269,6 +320,9 @@ static int vimc_sen_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_SATURATION:
tpg_s_saturation(&vsen->tpg, ctrl->val);
break;
+ case VIMC_CID_OSD_TEXT_MODE:
+ vsen->osd_value = ctrl->val;
+ break;
default:
return -EINVAL;
}
@@ -307,6 +361,22 @@ static const struct v4l2_ctrl_config vimc_sen_ctrl_test_pattern = {
.qmenu = tpg_pattern_strings,
};
+static const char * const vimc_ctrl_osd_mode_strings[] = {
+ "All",
+ "Counters Only",
+ "None",
+ NULL,
+};
+
+static const struct v4l2_ctrl_config vimc_sen_ctrl_osd_mode = {
+ .ops = &vimc_sen_ctrl_ops,
+ .id = VIMC_CID_OSD_TEXT_MODE,
+ .name = "Show Information",
+ .type = V4L2_CTRL_TYPE_MENU,
+ .max = ARRAY_SIZE(vimc_ctrl_osd_mode_strings) - 2,
+ .qmenu = vimc_ctrl_osd_mode_strings,
+};
+
static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
const char *vcfg_name)
{
@@ -323,6 +393,7 @@ static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_class, NULL);
v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_test_pattern, NULL);
+ v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_osd_mode, NULL);
v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
V4L2_CID_VFLIP, 0, 1, 1, 0);
v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
--
2.17.1
Hi Kaaira,
On 01/07/2020 14:29, Kaaira Gupta wrote:
> Add a control in VIMC to display information such as the correct order of
> colors for a given test pattern, counter, brightness, hue, saturation,
> contrast, width and height at sensor over test image.
>
> Signed-off-by: Kaaira Gupta <[email protected]>
> Acked-by: Helen Koike <[email protected]>
> ---
> drivers/media/test-drivers/vimc/Kconfig | 2 +
> drivers/media/test-drivers/vimc/vimc-common.h | 1 +
> drivers/media/test-drivers/vimc/vimc-core.c | 10 +++
> drivers/media/test-drivers/vimc/vimc-sensor.c | 71 +++++++++++++++++++
> 4 files changed, 84 insertions(+)
>
> diff --git a/drivers/media/test-drivers/vimc/Kconfig b/drivers/media/test-drivers/vimc/Kconfig
> index 4068a67585f9..da4b2ad6e40c 100644
> --- a/drivers/media/test-drivers/vimc/Kconfig
> +++ b/drivers/media/test-drivers/vimc/Kconfig
> @@ -2,6 +2,8 @@
> config VIDEO_VIMC
> tristate "Virtual Media Controller Driver (VIMC)"
> depends on VIDEO_DEV && VIDEO_V4L2
> + select FONT_SUPPORT
> + select FONT_8x16
> select MEDIA_CONTROLLER
> select VIDEO_V4L2_SUBDEV_API
> select VIDEOBUF2_VMALLOC
> diff --git a/drivers/media/test-drivers/vimc/vimc-common.h b/drivers/media/test-drivers/vimc/vimc-common.h
> index ae163dec2459..a289434e75ba 100644
> --- a/drivers/media/test-drivers/vimc/vimc-common.h
> +++ b/drivers/media/test-drivers/vimc/vimc-common.h
> @@ -20,6 +20,7 @@
> #define VIMC_CID_VIMC_CLASS (0x00f00000 | 1)
> #define VIMC_CID_TEST_PATTERN (VIMC_CID_VIMC_BASE + 0)
> #define VIMC_CID_MEAN_WIN_SIZE (VIMC_CID_VIMC_BASE + 1)
> +#define VIMC_CID_OSD_TEXT_MODE (VIMC_CID_VIMC_BASE + 2)
>
> #define VIMC_FRAME_MAX_WIDTH 4096
> #define VIMC_FRAME_MAX_HEIGHT 2160
> diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c
> index 11210aaa2551..4b0ae6f51d76 100644
> --- a/drivers/media/test-drivers/vimc/vimc-core.c
> +++ b/drivers/media/test-drivers/vimc/vimc-core.c
> @@ -5,10 +5,12 @@
> * Copyright (C) 2015-2017 Helen Koike <[email protected]>
> */
>
> +#include <linux/font.h>
> #include <linux/init.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <media/media-device.h>
> +#include <media/tpg/v4l2-tpg.h>
> #include <media/v4l2-device.h>
>
> #include "vimc-common.h"
> @@ -263,11 +265,19 @@ static int vimc_register_devices(struct vimc_device *vimc)
>
> static int vimc_probe(struct platform_device *pdev)
> {
> + const struct font_desc *font = find_font("VGA8x16");
> struct vimc_device *vimc;
> int ret;
>
> dev_dbg(&pdev->dev, "probe");
>
> + if (!font) {
> + dev_err(&pdev->dev, "could not find font\n");
> + return -ENODEV;
> + }
> +
> + tpg_set_font(font->data);
> +
> vimc = kzalloc(sizeof(*vimc), GFP_KERNEL);
> if (!vimc)
> return -ENOMEM;
> diff --git a/drivers/media/test-drivers/vimc/vimc-sensor.c b/drivers/media/test-drivers/vimc/vimc-sensor.c
> index a2f09ac9a360..f5674b9b757e 100644
> --- a/drivers/media/test-drivers/vimc/vimc-sensor.c
> +++ b/drivers/media/test-drivers/vimc/vimc-sensor.c
> @@ -14,11 +14,19 @@
>
> #include "vimc-common.h"
>
> +enum vimc_sen_osd_mode {
> + VIMC_SEN_OSD_SHOW_ALL = 0,
> + VIMC_SEN_OSD_SHOW_COUNTERS = 1,
> + VIMC_SEN_OSD_SHOW_NONE = 2
> +};
> +
> struct vimc_sen_device {
> struct vimc_ent_device ved;
> struct v4l2_subdev sd;
> struct tpg_data tpg;
> u8 *frame;
> + enum vimc_sen_osd_mode osd_value;
> + u64 start_stream_ts;
> /* The active format */
> struct v4l2_mbus_framefmt mbus_format;
> struct v4l2_ctrl_handler hdl;
> @@ -187,8 +195,49 @@ static void *vimc_sen_process_frame(struct vimc_ent_device *ved,
> {
> struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device,
> ved);
> + const unsigned int line_height = 16;
> + u8 *basep[TPG_MAX_PLANES][2];
> + unsigned int line = 1;
> + char str[100];
>
> tpg_fill_plane_buffer(&vsen->tpg, 0, 0, vsen->frame);
> + tpg_calc_text_basep(&vsen->tpg, basep, 0, vsen->frame);
> + switch (vsen->osd_value) {
> + case VIMC_SEN_OSD_SHOW_ALL: {
> + const char *order = tpg_g_color_order(&vsen->tpg);
> +
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height,
> + 16, order);
> + snprintf(str, sizeof(str),
> + "brightness %3d, contrast %3d, saturation %3d, hue %d ",
> + vsen->tpg.brightness,
> + vsen->tpg.contrast,
> + vsen->tpg.saturation,
> + vsen->tpg.hue);
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
> + snprintf(str, sizeof(str), "sensor size: %dx%d",
> + vsen->mbus_format.width,
> + vsen->mbus_format.height);
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
> + fallthrough;
Does this compile?
I would expect this line to be:
/* fallthrough */
Hrm ... looks like it probably should compile. There are other uses of
this in the kernel.
and more digging shows:
Fixes: 294f69e662d1 ("compiler_attributes.h: Add 'fallthrough' pseudo
keyword for switch/case use")
So - yes, this is right ;-)
> + }
> + case VIMC_SEN_OSD_SHOW_COUNTERS: {
> + unsigned int ms;
> +
> + ms = (ktime_get_ns() - vsen->start_stream_ts) / 1000000;
> + snprintf(str, sizeof(str), "%02d:%02d:%02d:%03d",
> + (ms / (60 * 60 * 1000)) % 24,
> + (ms / (60 * 1000)) % 60,
> + (ms / 1000) % 60,
> + ms % 1000);
I think I saw some build-bot failures around here on earlier versions.
(vimc-sensor.c:(.text+0x141): undefined reference to `__udivdi3').
Are those issues now solved?
Anyway, if it gets through the build-bots, then I think we should be
good here.
Assuming the build bots are happy with the / 1000000 from the u64 ktime
values:
Reviewed-by: Kieran Bingham <[email protected]>
But you might have to look at the divide helpers to support
32-bit/64-bit divide operations correctly.
--
Kieran
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
> + break;
> + }
> + case VIMC_SEN_OSD_SHOW_NONE:
> + default:
> + break;
> + }
> +
> return vsen->frame;
> }
>
> @@ -201,6 +250,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
> const struct vimc_pix_map *vpix;
> unsigned int frame_size;
>
> + vsen->start_stream_ts = ktime_get_ns();
> +
> /* Calculate the frame size */
> vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
> frame_size = vsen->mbus_format.width * vpix->bpp *
> @@ -269,6 +320,9 @@ static int vimc_sen_s_ctrl(struct v4l2_ctrl *ctrl)
> case V4L2_CID_SATURATION:
> tpg_s_saturation(&vsen->tpg, ctrl->val);
> break;
> + case VIMC_CID_OSD_TEXT_MODE:
> + vsen->osd_value = ctrl->val;
> + break;
> default:
> return -EINVAL;
> }
> @@ -307,6 +361,22 @@ static const struct v4l2_ctrl_config vimc_sen_ctrl_test_pattern = {
> .qmenu = tpg_pattern_strings,
> };
>
> +static const char * const vimc_ctrl_osd_mode_strings[] = {
> + "All",
> + "Counters Only",
> + "None",
> + NULL,
> +};
> +
> +static const struct v4l2_ctrl_config vimc_sen_ctrl_osd_mode = {
> + .ops = &vimc_sen_ctrl_ops,
> + .id = VIMC_CID_OSD_TEXT_MODE,
> + .name = "Show Information",
> + .type = V4L2_CTRL_TYPE_MENU,
> + .max = ARRAY_SIZE(vimc_ctrl_osd_mode_strings) - 2,
> + .qmenu = vimc_ctrl_osd_mode_strings,
> +};
> +
> static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
> const char *vcfg_name)
> {
> @@ -323,6 +393,7 @@ static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
>
> v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_class, NULL);
> v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_test_pattern, NULL);
> + v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_osd_mode, NULL);
> v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
> V4L2_CID_VFLIP, 0, 1, 1, 0);
> v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
>
--
Regards
--
Kieran
Hi Kaaira,
On 01/07/2020 14:29, Kaaira Gupta wrote:
> Change the argument of type char * to const char * for function
> tpg_gen_text().
>
> This function should take in a const char pointer as opposed to a char
> * as there is no modification. This issue was found while passing the
> order of colors of tpg generated test image (which is a const char *)
> to this function.
>
> Signed-off-by: Kaaira Gupta <[email protected]>
> Reviewed-by: Helen Koike <[email protected]>
Reviewed-by: Kieran Bingham <[email protected]>
> ---
> drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 10 +++++-----
> include/media/tpg/v4l2-tpg.h | 2 +-
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
> index 50f1e0b28b25..dde22a4cbd6c 100644
> --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
> +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
> @@ -1927,34 +1927,34 @@ typedef struct { u16 __; u8 _; } __packed x24;
>
> static noinline void tpg_print_str_2(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
> unsigned p, unsigned first, unsigned div, unsigned step,
> - int y, int x, char *text, unsigned len)
> + int y, int x, const char *text, unsigned len)
> {
> PRINTSTR(u8);
> }
>
> static noinline void tpg_print_str_4(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
> unsigned p, unsigned first, unsigned div, unsigned step,
> - int y, int x, char *text, unsigned len)
> + int y, int x, const char *text, unsigned len)
> {
> PRINTSTR(u16);
> }
>
> static noinline void tpg_print_str_6(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
> unsigned p, unsigned first, unsigned div, unsigned step,
> - int y, int x, char *text, unsigned len)
> + int y, int x, const char *text, unsigned len)
> {
> PRINTSTR(x24);
> }
>
> static noinline void tpg_print_str_8(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
> unsigned p, unsigned first, unsigned div, unsigned step,
> - int y, int x, char *text, unsigned len)
> + int y, int x, const char *text, unsigned len)
> {
> PRINTSTR(u32);
> }
>
> void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
> - int y, int x, char *text)
> + int y, int x, const char *text)
> {
> unsigned step = V4L2_FIELD_HAS_T_OR_B(tpg->field) ? 2 : 1;
> unsigned div = step;
> diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
> index eb191e85d363..9749ed409856 100644
> --- a/include/media/tpg/v4l2-tpg.h
> +++ b/include/media/tpg/v4l2-tpg.h
> @@ -241,7 +241,7 @@ void tpg_log_status(struct tpg_data *tpg);
>
> void tpg_set_font(const u8 *f);
> void tpg_gen_text(const struct tpg_data *tpg,
> - u8 *basep[TPG_MAX_PLANES][2], int y, int x, char *text);
> + u8 *basep[TPG_MAX_PLANES][2], int y, int x, const char *text);
> void tpg_calc_text_basep(struct tpg_data *tpg,
> u8 *basep[TPG_MAX_PLANES][2], unsigned p, u8 *vbuf);
> unsigned tpg_g_interleaved_plane(const struct tpg_data *tpg, unsigned buf_line);
>
--
Regards
--
Kieran
Hi Kaaira,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v5.8-rc3 next-20200702]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kaaira-Gupta/media-Add-colors-order-and-other-info-over-test-image/20200701-213129
base: git://linuxtv.org/media_tree.git master
config: arm-randconfig-r023-20200702 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
arm-linux-gnueabi-ld: section .data VMA [0000000080008000,0000000080346f97] overlaps section .text VMA [000000007f0801c0,0000000080b4332f]
arm-linux-gnueabi-ld: drivers/media/test-drivers/vimc/vimc-sensor.o: in function `vimc_sen_process_frame':
>> drivers/media/test-drivers/vimc/vimc-sensor.c:227: undefined reference to `__aeabi_uldivmod'
vim +227 drivers/media/test-drivers/vimc/vimc-sensor.c
192
193 static void *vimc_sen_process_frame(struct vimc_ent_device *ved,
194 const void *sink_frame)
195 {
196 struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device,
197 ved);
198 const unsigned int line_height = 16;
199 u8 *basep[TPG_MAX_PLANES][2];
200 unsigned int line = 1;
201 char str[100];
202
203 tpg_fill_plane_buffer(&vsen->tpg, 0, 0, vsen->frame);
204 tpg_calc_text_basep(&vsen->tpg, basep, 0, vsen->frame);
205 switch (vsen->osd_value) {
206 case VIMC_SEN_OSD_SHOW_ALL: {
207 const char *order = tpg_g_color_order(&vsen->tpg);
208
209 tpg_gen_text(&vsen->tpg, basep, line++ * line_height,
210 16, order);
211 snprintf(str, sizeof(str),
212 "brightness %3d, contrast %3d, saturation %3d, hue %d ",
213 vsen->tpg.brightness,
214 vsen->tpg.contrast,
215 vsen->tpg.saturation,
216 vsen->tpg.hue);
217 tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
218 snprintf(str, sizeof(str), "sensor size: %dx%d",
219 vsen->mbus_format.width,
220 vsen->mbus_format.height);
221 tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
222 fallthrough;
223 }
224 case VIMC_SEN_OSD_SHOW_COUNTERS: {
225 unsigned int ms;
226
> 227 ms = (ktime_get_ns() - vsen->start_stream_ts) / 1000000;
228 snprintf(str, sizeof(str), "%02d:%02d:%02d:%03d",
229 (ms / (60 * 60 * 1000)) % 24,
230 (ms / (60 * 1000)) % 60,
231 (ms / 1000) % 60,
232 ms % 1000);
233 tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
234 break;
235 }
236 case VIMC_SEN_OSD_SHOW_NONE:
237 default:
238 break;
239 }
240
241 return vsen->frame;
242 }
243
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]