diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2018-01-29 23:26:40 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-01-30 19:30:00 +0300 |
| commit | e7996a9a77fc669387da43ff4823b91cc4872bd0 (patch) | |
| tree | 617f0a128e222539d67e8cccc359f1bc4b984900 /drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h | |
| parent | b5fa635aab8f0d39a824c01991266a6d06f007fb (diff) | |
| parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff (diff) | |
| download | linux-e7996a9a77fc669387da43ff4823b91cc4872bd0.tar.xz | |
Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
To resolve conflicts in:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h index 3d510bf5886a..9cd31c2c0253 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h @@ -15,22 +15,22 @@ #ifndef __IA_CSS_MACC1_5_TYPES_H #define __IA_CSS_MACC1_5_TYPES_H -/** @file +/* @file * CSS-API header file for Multi-Axis Color Conversion algorithm parameters. */ -/** Multi-Axis Color Conversion configuration +/* Multi-Axis Color Conversion configuration * * ISP2.6.1: MACC1_5 is used. */ -/** Number of axes in the MACC table. */ +/* Number of axes in the MACC table. */ #define IA_CSS_MACC_NUM_AXES 16 -/** Number of coefficients per MACC axes. */ +/* Number of coefficients per MACC axes. */ #define IA_CSS_MACC_NUM_COEFS 4 -/** Multi-Axes Color Correction (MACC) table. +/* Multi-Axes Color Correction (MACC) table. * * ISP block: MACC (MACC by only matrix) * MACC1_5 (MACC by matrix and exponent(ia_css_macc_config)) @@ -55,19 +55,19 @@ */ struct ia_css_macc1_5_table { int16_t data[IA_CSS_MACC_NUM_COEFS * IA_CSS_MACC_NUM_AXES]; - /**< 16 of 2x2 matix + /** 16 of 2x2 matix MACC1_5: s[macc_config.exp].[13-macc_config.exp], [-8192,8191] default/ineffective: (s1.12) 16 of "identity 2x2 matix" {4096,0,0,4096} */ }; -/** Multi-Axes Color Correction (MACC) configuration. +/* Multi-Axes Color Correction (MACC) configuration. * * ISP block: MACC1_5 (MACC by matrix and exponent(ia_css_macc_config)) * ISP2: MACC1_5 is used. */ struct ia_css_macc1_5_config { - uint8_t exp; /**< Common exponent of ia_css_macc_table. + uint8_t exp; /** Common exponent of ia_css_macc_table. u8.0, [0,13], default 1, ineffective 1 */ }; |