[media] media: ov13858: Calculate pixel-rate at runtime, use mode

Calculate pixel-rate at run time instead of compile time.

Instead of using hardcoded pixels-per-line, extract it from current sensor
mode.

Signed-off-by: Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index af7af0d..4e331b4 100644 (file)
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -104,7 +104,6 @@ struct ov13858_reg_list {
 
 /* Link frequency config */
 struct ov13858_link_freq_config {
-       u32 pixel_rate;
        u32 pixels_per_line;
 
        /* PLL registers for this link frequency */
@@ -948,6 +947,12 @@ static const char * const ov13858_test_pattern_menu[] = {
 #define OV13858_LINK_FREQ_INDEX_0      0
 #define OV13858_LINK_FREQ_INDEX_1      1
 
+/*
+ * pixel_rate = link_freq * data-rate * nr_of_lanes / bits_per_sample
+ * data rate => double data rate; number of lanes => 4; bits per pixel => 10
+ */
+#define LINK_FREQ_TO_PIXEL_RATE(f)     (((f) * 2 * 4) / 10)
+
 /* Menu items for LINK_FREQ V4L2 control */
 static const s64 link_freq_menu_items[OV13858_NUM_OF_LINK_FREQS] = {
        OV13858_LINK_FREQ_540MHZ,
@@ -958,8 +963,6 @@ static const s64 link_freq_menu_items[OV13858_NUM_OF_LINK_FREQS] = {
 static const struct ov13858_link_freq_config
                        link_freq_configs[OV13858_NUM_OF_LINK_FREQS] = {
        {
-               /* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-               .pixel_rate = (OV13858_LINK_FREQ_540MHZ * 2 * 4) / 10,
                .pixels_per_line = OV13858_PPL_540MHZ,
                .reg_list = {
                        .num_of_regs = ARRAY_SIZE(mipi_data_rate_1080mbps),
@@ -967,8 +970,6 @@ static const struct ov13858_link_freq_config
                }
        },
        {
-               /* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-               .pixel_rate = (OV13858_LINK_FREQ_270MHZ * 2 * 4) / 10,
                .pixels_per_line = OV13858_PPL_270MHZ,
                .reg_list = {
                        .num_of_regs = ARRAY_SIZE(mipi_data_rate_540mbps),
@@ -1385,6 +1386,8 @@ ov13858_set_pad_format(struct v4l2_subdev *sd,
        s32 vblank_def;
        s32 vblank_min;
        s64 h_blank;
+       s64 pixel_rate;
+       s64 link_freq;
 
        mutex_lock(&ov13858->mutex);
 
@@ -1400,9 +1403,10 @@ ov13858_set_pad_format(struct v4l2_subdev *sd,
        } else {
                ov13858->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(ov13858->link_freq, mode->link_freq_index);
-               __v4l2_ctrl_s_ctrl_int64(
-                       ov13858->pixel_rate,
-                       link_freq_configs[mode->link_freq_index].pixel_rate);
+               link_freq = link_freq_menu_items[mode->link_freq_index];
+               pixel_rate = LINK_FREQ_TO_PIXEL_RATE(link_freq);
+               __v4l2_ctrl_s_ctrl_int64(ov13858->pixel_rate, pixel_rate);
+
                /* Update limits and set FPS to default */
                vblank_def = ov13858->cur_mode->vts_def -
                             ov13858->cur_mode->height;
@@ -1617,6 +1621,10 @@ static int ov13858_init_controls(struct ov13858 *ov13858)
        s64 exposure_max;
        s64 vblank_def;
        s64 vblank_min;
+       s64 hblank;
+       s64 pixel_rate_min;
+       s64 pixel_rate_max;
+       const struct ov13858_mode *mode;
        int ret;
 
        ctrl_hdlr = &ov13858->ctrl_handler;
@@ -1634,29 +1642,30 @@ static int ov13858_init_controls(struct ov13858 *ov13858)
                                link_freq_menu_items);
        ov13858->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
 
+       pixel_rate_max = LINK_FREQ_TO_PIXEL_RATE(link_freq_menu_items[0]);
+       pixel_rate_min = LINK_FREQ_TO_PIXEL_RATE(link_freq_menu_items[1]);
        /* By default, PIXEL_RATE is read only */
        ov13858->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &ov13858_ctrl_ops,
-                                       V4L2_CID_PIXEL_RATE, 0,
-                                       link_freq_configs[0].pixel_rate, 1,
-                                       link_freq_configs[0].pixel_rate);
+                                               V4L2_CID_PIXEL_RATE,
+                                               pixel_rate_min, pixel_rate_max,
+                                               1, pixel_rate_max);
 
-       vblank_def = ov13858->cur_mode->vts_def - ov13858->cur_mode->height;
-       vblank_min = ov13858->cur_mode->vts_min - ov13858->cur_mode->height;
+       mode = ov13858->cur_mode;
+       vblank_def = mode->vts_def - mode->height;
+       vblank_min = mode->vts_min - mode->height;
        ov13858->vblank = v4l2_ctrl_new_std(
                                ctrl_hdlr, &ov13858_ctrl_ops, V4L2_CID_VBLANK,
-                               vblank_min,
-                               OV13858_VTS_MAX - ov13858->cur_mode->height, 1,
+                               vblank_min, OV13858_VTS_MAX - mode->height, 1,
                                vblank_def);
 
+       hblank = link_freq_configs[mode->link_freq_index].pixels_per_line -
+                mode->width;
        ov13858->hblank = v4l2_ctrl_new_std(
                                ctrl_hdlr, &ov13858_ctrl_ops, V4L2_CID_HBLANK,
-                               OV13858_PPL_540MHZ - ov13858->cur_mode->width,
-                               OV13858_PPL_540MHZ - ov13858->cur_mode->width,
-                               1,
-                               OV13858_PPL_540MHZ - ov13858->cur_mode->width);
+                               hblank, hblank, 1, hblank);
        ov13858->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
 
-       exposure_max = ov13858->cur_mode->vts_def - 8;
+       exposure_max = mode->vts_def - 8;
        ov13858->exposure = v4l2_ctrl_new_std(
                                ctrl_hdlr, &ov13858_ctrl_ops,
                                V4L2_CID_EXPOSURE, OV13858_EXPOSURE_MIN,