openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: media: atomisp: Fix block comments warning. 

Use kernel preferred block commenting style, to fix the checkpatch
issue.

Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Varsha Rao 2017-03-19 18:00:04 +05:30 committed by Greg Kroah-Hartman
parent 217fa187ea
commit 3cd0d0920f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
View File

@ -21,8 +21,7 @@
#define INEFFECTIVE_VAL 4096 #define INEFFECTIVE_VAL 4096
#define BASIC_VAL 819 #define BASIC_VAL 819
/*Default configuration of parameters for Ctc2 /*Default configuration of parameters for Ctc2*/
*/
const struct ia_css_ctc2_config default_ctc2_config = { const struct ia_css_ctc2_config default_ctc2_config = {
INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL,
INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL,
@ -104,14 +103,14 @@ void ia_css_ctc2_vmem_encode(struct ia_css_isp_ctc2_vmem_params *to,
SH_CSS_BAYER_MAXVAL, from->y_x4); SH_CSS_BAYER_MAXVAL, from->y_x4);
/*Fill 3 arrays with: /*Fill 3 arrays with:
* - Luma input gain values y_y0, y_y1, y_y2, y_3, y_y4 * - Luma input gain values y_y0, y_y1, y_y2, y_3, y_y4
* - Luma kneepoints 0, y_x1, y_x2, y_x3, y_x4 * - Luma kneepoints 0, y_x1, y_x2, y_x3, y_x4
* - Calculated slopes dydx0, dyxd1, dydx2, dydx3, dydx4 * - Calculated slopes dydx0, dyxd1, dydx2, dydx3, dydx4
* *
* - Each 64-element array is divided in blocks of 16 elements: * - Each 64-element array is divided in blocks of 16 elements:
* the 5 parameters + zeros in the remaining 11 positions * the 5 parameters + zeros in the remaining 11 positions
* - All blocks of the same array will contain the same data * - All blocks of the same array will contain the same data
*/ */
for (i = 0; i < shffl_blck; i++) { for (i = 0; i < shffl_blck; i++) {
to->y_x[0][(i << shffl_blck)] = 0; to->y_x[0][(i << shffl_blck)] = 0;
to->y_x[0][(i << shffl_blck) + 1] = from->y_x1; to->y_x[0][(i << shffl_blck) + 1] = from->y_x1;

9
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
View File

@ -25,7 +25,8 @@
#define XNR_MAX_ALPHA ((1 << (ISP_VEC_ELEMBITS - 1)) - 1) #define XNR_MAX_ALPHA ((1 << (ISP_VEC_ELEMBITS - 1)) - 1)
/* Minimum value for sigma on host interface. Lower values translate to /* Minimum value for sigma on host interface. Lower values translate to
* max_alpha. */ * max_alpha.
*/
#define XNR_MIN_SIGMA (IA_CSS_XNR3_SIGMA_SCALE / 100) #define XNR_MIN_SIGMA (IA_CSS_XNR3_SIGMA_SCALE / 100)
/* /*
@ -118,7 +119,8 @@ compute_coring(int coring)
int32_t offset = host_scale / 2; /* fixed-point 0.5 */ int32_t offset = host_scale / 2; /* fixed-point 0.5 */
/* Convert from public host-side scale factor to isp-side scale /* Convert from public host-side scale factor to isp-side scale
* factor. Clip to [0, isp_scale-1). */ * factor. Clip to [0, isp_scale-1).
*/
isp_coring = ((coring * isp_scale) + offset) / host_scale; isp_coring = ((coring * isp_scale) + offset) / host_scale;
return min(max(isp_coring, 0), isp_scale - 1); return min(max(isp_coring, 0), isp_scale - 1);
} }
@ -138,7 +140,8 @@ compute_blending(int strength)
/* Convert from public host-side scale factor to isp-side scale /* Convert from public host-side scale factor to isp-side scale
* factor. The blending factor is positive on the host side, but * factor. The blending factor is positive on the host side, but
* negative on the ISP side because +1.0 cannot be represented * negative on the ISP side because +1.0 cannot be represented
* exactly as s0.11 fixed point, but -1.0 can. */ * exactly as s0.11 fixed point, but -1.0 can.
*/
isp_strength = -(((strength * isp_scale) + offset) / host_scale); isp_strength = -(((strength * isp_scale) + offset) / host_scale);
return max(min(isp_strength, 0), -XNR_BLENDING_SCALE_FACTOR); return max(min(isp_strength, 0), -XNR_BLENDING_SCALE_FACTOR);
} }