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>
This commit is contained in:
Mauro Carvalho Chehab 2019-07-25 12:25:52 -04:00
Родитель 73fb5bfa53
Коммит 620428820d
4 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -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:

Просмотреть файл

@ -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);

Просмотреть файл

@ -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 },

Просмотреть файл

@ -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]);
}
}
}