[v4] staging: media: meson: vdec: declare u32 as static const
diff mbox series

Message ID YHW8DWNUAmp4mXm3@kali
State New
Headers show
Series
  • [v4] staging: media: meson: vdec: declare u32 as static const
Related show

Commit Message

Mitali Borkar April 13, 2021, 3:43 p.m. UTC
Declared 32 bit unsigned int as static constant inside a function and
replaced u32[] {x,y} as canvas3, canvas4 in codec_h264.c
This indicates the value of canvas indexes will remain constant
throughout execution.

Signed-off-by: Mitali Borkar <mitaliborkar810@gmail.com>
---
Changes from v3:- Made commit message under 75 characters per line.
Changes from v2:- Rebased this patch and made changes against mainline code
Changes from v1:- Rectified mistake by declaring u32 as static const
properly as static const u32 canvas'x'[]

 drivers/staging/media/meson/vdec/codec_h264.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

kernel test robot April 13, 2021, 10:11 p.m. UTC | #1
Hi Mitali,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on staging/staging-testing]

url:    https://github.com/0day-ci/linux/commits/Mitali-Borkar/staging-media-meson-vdec-declare-u32-as-static-const/20210413-234504
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 07ff20cf172f31f0dfbc456662f20339767c69fd
config: riscv-randconfig-r025-20210413 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 9829f5e6b1bca9b61efc629770d28bb9014dec45)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install riscv cross compiling tool for clang build
        # apt-get install binutils-riscv64-linux-gnu
        # https://github.com/0day-ci/linux/commit/b84078e468c70722ef830e5a387ec6b89a8cdc8a
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Mitali-Borkar/staging-media-meson-vdec-declare-u32-as-static-const/20210413-234504
        git checkout b84078e468c70722ef830e5a387ec6b89a8cdc8a
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=riscv 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/staging/media/meson/vdec/codec_h264.c:290:33: error: use of undeclared identifier 'ANCO_CANVAS_ADDR'
           static const u32 canvas3[] = { ANCO_CANVAS_ADDR, 0 };
                                          ^
>> drivers/staging/media/meson/vdec/codec_h264.c:293:28: error: passing 'const u32 []' to parameter of type 'u32 *' (aka 'unsigned int *') discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
           amvdec_set_canvases(sess, canvas3, canvas4);
                                     ^~~~~~~
   drivers/staging/media/meson/vdec/vdec_helpers.h:20:8: note: passing argument to parameter 'reg_base' here
                           u32 reg_base[], u32 reg_num[]);
                               ^
   drivers/staging/media/meson/vdec/codec_h264.c:293:37: error: passing 'const u32 [2]' to parameter of type 'u32 *' (aka 'unsigned int *') discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
           amvdec_set_canvases(sess, canvas3, canvas4);
                                              ^~~~~~~
   drivers/staging/media/meson/vdec/vdec_helpers.h:20:24: note: passing argument to parameter 'reg_num' here
                           u32 reg_base[], u32 reg_num[]);
                                               ^
   3 errors generated.


vim +/ANCO_CANVAS_ADDR +290 drivers/staging/media/meson/vdec/codec_h264.c

   284	
   285	static void codec_h264_resume(struct amvdec_session *sess)
   286	{
   287		struct amvdec_core *core = sess->core;
   288		struct codec_h264 *h264 = sess->priv;
   289		u32 mb_width, mb_height, mb_total;
 > 290		static const u32 canvas3[] = { ANCO_CANVAS_ADDR, 0 };
   291		static const u32 canvas4[] = { 24, 0 };
   292	
 > 293		amvdec_set_canvases(sess, canvas3, canvas4);
   294	
   295		dev_dbg(core->dev, "max_refs = %u; actual_dpb_size = %u\n",
   296			h264->max_refs, sess->num_dst_bufs);
   297	
   298		/* Align to a multiple of 4 macroblocks */
   299		mb_width = ALIGN(h264->mb_width, 4);
   300		mb_height = ALIGN(h264->mb_height, 4);
   301		mb_total = mb_width * mb_height;
   302	
   303		h264->ref_size = mb_total * MB_MV_SIZE * h264->max_refs;
   304		h264->ref_vaddr = dma_alloc_coherent(core->dev, h264->ref_size,
   305						     &h264->ref_paddr, GFP_KERNEL);
   306		if (!h264->ref_vaddr) {
   307			amvdec_abort(sess);
   308			return;
   309		}
   310	
   311		/* Address to store the references' MVs */
   312		amvdec_write_dos(core, AV_SCRATCH_1, h264->ref_paddr);
   313		/* End of ref MV */
   314		amvdec_write_dos(core, AV_SCRATCH_4, h264->ref_paddr + h264->ref_size);
   315	
   316		amvdec_write_dos(core, AV_SCRATCH_0, (h264->max_refs << 24) |
   317						     (sess->num_dst_bufs << 16) |
   318						     ((h264->max_refs - 1) << 8));
   319	}
   320	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

Patch
diff mbox series

diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c
index c61128fc4bb9..80141b89a9f6 100644
--- a/drivers/staging/media/meson/vdec/codec_h264.c
+++ b/drivers/staging/media/meson/vdec/codec_h264.c
@@ -287,10 +287,10 @@  static void codec_h264_resume(struct amvdec_session *sess)
 	struct amvdec_core *core = sess->core;
 	struct codec_h264 *h264 = sess->priv;
 	u32 mb_width, mb_height, mb_total;
+	static const u32 canvas3[] = { ANCO_CANVAS_ADDR, 0 };
+	static const u32 canvas4[] = { 24, 0 };
 
-	amvdec_set_canvases(sess,
-			    (u32[]){ ANC0_CANVAS_ADDR, 0 },
-			    (u32[]){ 24, 0 });
+	amvdec_set_canvases(sess, canvas3, canvas4);
 
 	dev_dbg(core->dev, "max_refs = %u; actual_dpb_size = %u\n",
 		h264->max_refs, sess->num_dst_bufs);