A few IPU3 CIO2 fixes
Subsystems (3)
Sakari Ailus
maintainercover A few IPU3 CIO2 fixes
Hi Yong and Mauro,
The two patches are addressing a few matters Mauro pointed out whilst handling the CIO2 driver pull request.
Yong: could you review especially the latter patch?
Sakari Ailus (2):
v4l: Fix references in Intel IPU3 Bayer documentation
intel-ipu3: Rename arr_size macro, use min
Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 8 ++++---- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-)
Signature · 1 line
2.11.0
Sakari Ailus
maintainerPATCH 1/2 v4l: Fix references in Intel IPU3 Bayer documentation
The references in Intel IPU3 Bayer format documentation were wrong. Fix them.
--- Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst +4 -4
@@ -1,9 +1,9 @@ .. -*- coding: utf-8; mode: rst -*- -.. _V4L2_PIX_FMT_IPU3_SBGGR10: -.. _V4L2_PIX_FMT_IPU3_SGBRG10: -.. _V4L2_PIX_FMT_IPU3_SGRBG10: -.. _V4L2_PIX_FMT_IPU3_SRGGB10: +.. _v4l2-pix-fmt-ipu3-sbggr10: +.. _v4l2-pix-fmt-ipu3-sgbrg10: +.. _v4l2-pix-fmt-ipu3-sgrbg10: +.. _v4l2-pix-fmt-ipu3-srggb10: ********************************************************************************************************************************************** V4L2_PIX_FMT_IPU3_SBGGR10 ('ip3b'), V4L2_PIX_FMT_IPU3_SGBRG10 ('ip3g'), V4L2_PIX_FMT_IPU3_SGRBG10 ('ip3G'), V4L2_PIX_FMT_IPU3_SRGGB10 ('ip3r')
Signature · 1 line
2.11.0
Sakari Ailus
maintainerPATCH 2/2 intel-ipu3: Rename arr_size macro, use min
In reply to Sakari AilusThe arr_size() macro which is used to calculate the size of the chunk in the array to be arranged resembles ARRAY_SIZE naming-wise. Avoid confusion by renaming it to CHUNK_SIZE instead.
Also use min() macro to calculate the minimum of two numbers.
--- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/media/pci/intel/ipu3/ipu3-cio2.c +4 -7
@@ -1894,20 +1894,17 @@ static void arrange(void *ptr, size_t elem_size, size_t elems, size_t start) { start, elems - 1 }, }; -#define arr_size (a) ((a)->end - (a)->begin + 1) +#define CHUNK_SIZE (a) ((a)->end - (a)->begin + 1)/* Loop as long as we have out-of-place entries */ -while (arr_size (&arr[0 ]) &&arr_size (&arr[1 ])) { +while (CHUNK_SIZE (&arr[0 ]) &&CHUNK_SIZE (&arr[1 ])) {size_t size0, i;/* * Find the number of entries that can be arranged on this * iteration. */ -if (arr_size (&arr[0 ]) >arr_size (&arr[1 ])) - size0 =arr_size (&arr[1 ]); -else - size0 =arr_size (&arr[0 ]); + size0 =min (CHUNK_SIZE (&arr[0 ]),CHUNK_SIZE (&arr[1 ]));/* Swap the entries in two parts of the array. */ for (i =0 ; i < size0; i++) {
@@ -1919,7 +1916,7 @@ static void arrange(void *ptr, size_t elem_size, size_t elems, size_t start)swap (d[j], s[j]); } -if (arr_size (&arr[0 ]) >arr_size (&arr[1 ])) { +if (CHUNK_SIZE (&arr[0 ]) >CHUNK_SIZE (&arr[1 ])) {/* The end of the first array remains unarranged. */ arr[0 ].begin += size0; }else {
Signature · 1 line
2.11.0
Em Fri, 29 Dec 2017 14:59:12 +0200
Sakari Ailus <[email protected]> escreveu:
Quoted 6 lines
Hi Yong and Mauro,
The two patches are addressing a few matters Mauro pointed out whilst handling the CIO2 driver pull request.
Yong: could you review especially the latter patch?
I'm applying the first one, as it cleans 4 warnings. I'll wait for an ack for the second one.
Regards,
Mauro\