diff options
| author |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-25 12:25:52 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-25 12:27:14 -0400 |
| commit | 620428820d0d76de5b29314457a3b27c0634b4f2 (patch) | |
| tree | 1b707906381f642415d9043ccadc21e51abb38ef /drivers/staging/media | |
| parent | media: hantro: Support RK3399 VP8 decoding (diff) | |
| download | linux-dev-620428820d0d76de5b29314457a3b27c0634b4f2.tar.xz linux-dev-620428820d0d76de5b29314457a3b27c0634b4f2.zip | |
media: staging: hantro: avoid future namespace collisions
Rename:
vp8_dec_mc_filter -> hantro_vp8_dec_mc_filter
As other drivers may end implementing something with the same
name.
So, prepend driver's name here, in order to make symbol namespace
cleaner.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 5 | ||||
| -rw-r--r-- | drivers/staging/media/hantro/hantro_hw.h | 2 | ||||
| -rw-r--r-- | drivers/staging/media/hantro/hantro_vp8.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c index 181e2f76d8cb..6d99c2be01cf 100644 --- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c +++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c @@ -342,11 +342,12 @@ static void cfg_tap(struct hantro_ctx *ctx, return; /* Tap filter not used. */ for (i = 0; i < 8; i++) { - val = (vp8_dec_mc_filter[i][0] << 2) | vp8_dec_mc_filter[i][5]; + val = (hantro_vp8_dec_mc_filter[i][0] << 2) | + hantro_vp8_dec_mc_filter[i][5]; for (j = 0; j < 4; j++) hantro_reg_write(vpu, &vp8_dec_pred_bc_tap[i][j], - vp8_dec_mc_filter[i][j + 1]); + hantro_vp8_dec_mc_filter[i][j + 1]); switch (i) { case 2: diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h index e86c84fbfe1a..2b8029674a75 100644 --- a/drivers/staging/media/hantro/hantro_hw.h +++ b/drivers/staging/media/hantro/hantro_hw.h @@ -95,7 +95,7 @@ extern const struct hantro_variant rk3399_vpu_variant; extern const struct hantro_variant rk3328_vpu_variant; extern const struct hantro_variant rk3288_vpu_variant; -extern const u32 vp8_dec_mc_filter[8][6]; +extern const u32 hantro_vp8_dec_mc_filter[8][6]; void hantro_watchdog(struct work_struct *work); void hantro_run(struct hantro_ctx *ctx); diff --git a/drivers/staging/media/hantro/hantro_vp8.c b/drivers/staging/media/hantro/hantro_vp8.c index cd01661cac21..0e02d147b189 100644 --- a/drivers/staging/media/hantro/hantro_vp8.c +++ b/drivers/staging/media/hantro/hantro_vp8.c @@ -35,7 +35,7 @@ struct vp8_prob_tbl_packed { * filter taps taken to 7-bit precision, * reference RFC6386#Page-16, filters[8][6] */ -const u32 vp8_dec_mc_filter[8][6] = { +const u32 hantro_vp8_dec_mc_filter[8][6] = { { 0, 0, 128, 0, 0, 0 }, { 0, -6, 123, 12, -1, 0 }, { 2, -11, 108, 36, -8, 1 }, diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c index c5e9f8befe9c..f17e32620b08 100644 --- a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c +++ b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c @@ -439,7 +439,7 @@ static void cfg_tap(struct hantro_ctx *ctx, if (vp8_dec_pred_bc_tap[i][j].base != 0) hantro_reg_write(vpu, &vp8_dec_pred_bc_tap[i][j], - vp8_dec_mc_filter[i][j]); + hantro_vp8_dec_mc_filter[i][j]); } } } |