[PORT FROM R2] atomisp: add load shading table interface

BZ: 17272

This patch adds to Atomisp driver interface to load shading table from
userspace.

Change-Id: Ie1b58b8215660c7b972c292f3f817e24ddd013fe
Orig-Change-Id: I6a1c34a899f1afc8e5ec1c384791e957992ff422
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Signed-off-by: Miikka Tuppurainen <miikka.tuppurainen@intel.com>
Reviewed-on: http://android.intel.com:8080/22559
Reviewed-by: Wada, Yoshio <yoshio.wada@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/27997
Reviewed-by: Tuominen, TeemuX <teemux.tuominen@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>

diff --git a/drivers/media/video/atomisp/atomisp_cmd.c b/drivers/media/video/atomisp/atomisp_cmd.c
index b4f70f0..957bf64 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_cmd.c
+++ b/drivers/media/video/atomisp/atomisp_cmd.c
@@ -3236,6 +3236,90 @@ int atomisp_set_fmt_file(struct video_device *vdev, struct v4l2_format *f)
        }
 }
 
+void atomisp_free_all_shading_tables(struct atomisp_device *isp)
+{
+       int i;
+
+       for (i = 0; i < isp->input_cnt; i++) {
+               if (isp->inputs[i].shading_table == NULL)
+                       continue;
+               sh_css_shading_table_free(isp->inputs[i].shading_table);
+               isp->inputs[i].shading_table = NULL;
+       }
+}
+
+int atomisp_set_shading_table(struct atomisp_device *isp,
+               struct atomisp_shading_table *user_shading_table)
+{
+       struct sh_css_shading_table *shading_table;
+       struct sh_css_shading_table *free_table;
+       unsigned int len_table;
+       int i;
+       int ret = 0;
+
+       if (!user_shading_table)
+               return -EINVAL;
+
+       if (user_shading_table->flags & ATOMISP_SC_FLAG_QUERY) {
+               user_shading_table->enable = isp->params.sc_en;
+               return 0;
+       }
+
+       if (!user_shading_table->enable) {
+               mutex_lock(&isp->isp_lock);
+               sh_css_set_shading_table(NULL);
+               isp->params.sc_en = 0;
+               mutex_unlock(&isp->isp_lock);
+               return 0;
+       }
+
+       /* If enabling, all tables must be set */
+       for (i = 0; i < ATOMISP_NUM_SC_COLORS; i++) {
+               if (!user_shading_table->data[i])
+                       return -EINVAL;
+       }
+
+       /* Shading table size per color */
+       if (user_shading_table->width > SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR ||
+           user_shading_table->height > SH_CSS_MAX_SCTBL_HEIGHT_PER_COLOR)
+               return -EINVAL;
+
+       shading_table = sh_css_shading_table_alloc(user_shading_table->width,
+                                                  user_shading_table->height);
+       if (!shading_table)
+               return -ENOMEM;
+
+       len_table = user_shading_table->width * user_shading_table->height *
+                   ATOMISP_SC_TYPE_SIZE;
+       for (i = 0; i < ATOMISP_NUM_SC_COLORS; i++) {
+               ret = copy_from_user(shading_table->data[i],
+                                    user_shading_table->data[i], len_table);
+               if (ret) {
+                       free_table = shading_table;
+                       ret = -EFAULT;
+                       goto out;
+               }
+       }
+       shading_table->sensor_width = user_shading_table->sensor_width;
+       shading_table->sensor_height = user_shading_table->sensor_height;
+       shading_table->fraction_bits = user_shading_table->fraction_bits;
+
+       mutex_lock(&isp->isp_lock);
+
+       free_table = isp->inputs[isp->input_curr].shading_table;
+       isp->inputs[isp->input_curr].shading_table = shading_table;
+       sh_css_set_shading_table(shading_table);
+       isp->params.sc_en = 1;
+
+       mutex_unlock(&isp->isp_lock);
+
+out:
+       if (free_table != NULL)
+               sh_css_shading_table_free(free_table);
+
+       return ret;
+}
+
 /*
  * atomisp_acc_get_fw - Search for firmware with given handle
  *

diff --git a/drivers/media/video/atomisp/atomisp_cmd.h b/drivers/media/video/atomisp/atomisp_cmd.h
index 21dd151..5f65763 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_cmd.h
+++ b/drivers/media/video/atomisp/atomisp_cmd.h
@@ -249,6 +249,10 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_format *f,
 int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f);
 int atomisp_set_fmt_file(struct video_device *vdev, struct v4l2_format *f);
 
+void atomisp_free_all_shading_tables(struct atomisp_device *isp);
+int atomisp_set_shading_table(struct atomisp_device *isp,
+                             struct atomisp_shading_table *shading_table);
+
 int atomisp_save_iunit_reg(struct atomisp_device *isp);
 int atomisp_restore_iunit_reg(struct atomisp_device *isp);
 

diff --git a/drivers/media/video/atomisp/atomisp_fops.c b/drivers/media/video/atomisp/atomisp_fops.c
index acac218..3ea9d8f 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_fops.c
+++ b/drivers/media/video/atomisp/atomisp_fops.c
@@ -435,6 +435,7 @@ static int atomisp_release(struct file *file)
 
        atomisp_free_3a_buffers(isp);
        atomisp_free_dis_buffers(isp);
+       atomisp_free_all_shading_tables(isp);
        atomisp_free_internal_buffers(isp);
        sh_css_uninit();
        hrt_isp_css_mm_clear();

diff --git a/drivers/media/video/atomisp/atomisp_ioctl.c b/drivers/media/video/atomisp/atomisp_ioctl.c
index f106ca9..b45a918 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_ioctl.c
+++ b/drivers/media/video/atomisp/atomisp_ioctl.c
@@ -153,15 +153,6 @@ static struct v4l2_queryctrl ci_v4l2_controls[] = {
                .default_value = 0,
        },
        {
-               .id = V4L2_CID_ATOMISP_SHADING_CORRECTION,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Lens Shading Correction",
-               .minimum = 0,
-               .maximum = 1,
-               .step = 1,
-               .default_value = 0,
-       },
-       {
                .id = V4L2_CID_REQUEST_FLASH,
                .type = V4L2_CTRL_TYPE_INTEGER,
                .name = "Request flash frames",
@@ -1228,9 +1219,6 @@ static int atomisp_g_ctrl(struct file *file, void *fh,
        case V4L2_CID_ATOMISP_FALSE_COLOR_CORRECTION:
                ret = atomisp_false_color(isp, 0, &control->value);
                break;
-       case V4L2_CID_ATOMISP_SHADING_CORRECTION:
-               ret = atomisp_shading_correction(isp, 0, &control->value);
-               break;
        case V4L2_CID_ATOMISP_LOW_LIGHT:
                ret = atomisp_low_light(isp, 0, &control->value);
                break;
@@ -1294,9 +1282,6 @@ static int atomisp_s_ctrl(struct file *file, void *fh,
        case V4L2_CID_ATOMISP_FALSE_COLOR_CORRECTION:
                ret = atomisp_false_color(isp, 1, &control->value);
                break;
-       case V4L2_CID_ATOMISP_SHADING_CORRECTION:
-               ret = atomisp_shading_correction(isp, 1, &control->value);
-               break;
        case V4L2_CID_REQUEST_FLASH:
                ret = atomisp_flash_enable(isp, control->value);
                break;
@@ -1762,6 +1747,9 @@ static long atomisp_vidioc_default(struct file *file, void *fh,
                return BC_Camera_Bridge((BC_Video_ioctl_package *)arg,
                                        (unsigned long) NULL);
 
+       case ATOMISP_IOC_S_ISP_SHD_TAB:
+               return atomisp_set_shading_table(isp, arg);
+
        default:
                return -EINVAL;
        }

diff --git a/drivers/media/video/atomisp/css/sh_css_defs.h b/drivers/media/video/atomisp/css/sh_css_defs.h
index cad730d..2b3c053 100644 (file)
--- a/drivers/media/video/atomisp/css/sh_css_defs.h
+++ b/drivers/media/video/atomisp/css/sh_css_defs.h
@@ -104,6 +104,7 @@
        (HIVE_ISP_DDR_WORD_BYTES/SH_CSS_MORPH_TABLE_ELEM_BYTES)
 
 #define SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR   (SH_CSS_MAX_BQ_GRID_WIDTH + 1)
+#define SH_CSS_MAX_SCTBL_HEIGHT_PER_COLOR   (SH_CSS_MAX_BQ_GRID_HEIGHT + 1)
 #define SH_CSS_MAX_SCTBL_ALIGNED_WIDTH_PER_COLOR \
        CEIL_MUL(SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR, ISP_VEC_NELEMS)
 

diff --git a/drivers/media/video/atomisp/include/atomisp/atomisp_internal.h b/drivers/media/video/atomisp/include/atomisp/atomisp_internal.h
index 758cb2e..2ab7842 100644 (file)
--- a/drivers/media/video/atomisp/include/atomisp/atomisp_internal.h
+++ b/drivers/media/video/atomisp/include/atomisp/atomisp_internal.h
@@ -79,6 +79,8 @@
 #define ATOM_ISP_MAX_INPUTS    4
 #define ATOMISP_ACC_FW_MAX     8
 
+#define ATOMISP_SC_TYPE_SIZE   2
+
 int atomisp_video_init(struct atomisp_video_pipe *video, const char *name);
 void atomisp_video_unregister(struct atomisp_video_pipe *video);
 int atomisp_video_register(struct atomisp_video_pipe *video,

diff --git a/include/linux/atomisp.h b/include/linux/atomisp.h
index 8c6c583..fedd737 100644 (file)
--- a/include/linux/atomisp.h
+++ b/include/linux/atomisp.h
@@ -229,19 +229,34 @@ struct atomisp_morph_table {
        unsigned short *coordinates_y[atomisp_morph_table_num_planes];
 };
 
-#define atomisp_num_sc_colors           4
+#define ATOMISP_NUM_SC_COLORS  4
+
+#define ATOMISP_SC_FLAG_QUERY  (1 << 0)
+
 struct atomisp_shading_table {
+       /*
+        * If flag ATOMISP_SC_FLAG_QUERY is set, IOCTL will only query current
+        * LSC status and return, otherwise it will set LSC according to
+        * userspace's input.
+        */
+       __u8 flags;
+       /*
+        * If ATOMISP_SC_FLAG_QUERY is set, enable is output parameter,
+        * otherwise it is an input parameter and will enable/disable LSC
+        * engine
+        */
+       __u8 enable;
        /* native sensor resolution */
-       unsigned int sensor_width;
-       unsigned int sensor_height;
+       __u32 sensor_width;
+       __u32 sensor_height;
        /* number of data points per line per color (bayer quads) */
-       unsigned int width;
+       __u32 width;
        /* number of lines of data points per color (bayer quads) */
-       unsigned int height;
+       __u32 height;
        /* bits of fraction part for shading table values */
-       unsigned int fraction_bits;
+       __u32 fraction_bits;
        /* one table for each color (use sh_css_sc_color to index) */
-       unsigned short *data[atomisp_num_sc_colors];
+       __u16 __user *data[ATOMISP_NUM_SC_COLORS];
 };
 
 struct atomisp_makernote_info {
@@ -755,6 +770,10 @@ struct v4l2_private_int_data {
 #define ATOMISP_IOC_G_SENSOR_PRIV_INT_DATA \
        _IOWR('v', BASE_VIDIOC_PRIVATE + 51, struct v4l2_private_int_data)
 
+/* LCS (shading) table write */
+#define ATOMISP_IOC_S_ISP_SHD_TAB \
+       _IOWR('v', BASE_VIDIOC_PRIVATE + 52, struct atomisp_shading_table)
+
 /*  ISP Private control IDs */
 #define V4L2_CID_ATOMISP_BAD_PIXEL_DETECTION \
        (V4L2_CID_PRIVATE_BASE + 0)
@@ -766,6 +785,8 @@ struct v4l2_private_int_data {
        (V4L2_CID_PRIVATE_BASE + 3)
 #define V4L2_CID_ATOMISP_FALSE_COLOR_CORRECTION \
        (V4L2_CID_PRIVATE_BASE + 4)
+
+/* Deprecated. Use ATOMISP_IOC_S_ISP_SHD_TAB instead. */
 #define V4L2_CID_ATOMISP_SHADING_CORRECTION \
        (V4L2_CID_PRIVATE_BASE + 5)
 #define V4L2_CID_ATOMISP_LOW_LIGHT \