hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: mtk-vpu: load vpu firmware from the new location 

mt8173 VPU firmware has been moved to a sub-folder of
linux-firmware, so load vpu-fw from the new location first,
if it fails, then from the old one.

Signed-off-by: Rui Wang <gtk_ruiwang@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Rui Wang 2020-03-24 13:48:49 +01:00 committed by Mauro Carvalho Chehab
parent 64d4fc9926
commit ad71693f41
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/mtk-vpu/mtk_vpu.c
View File

@ -46,6 +46,8 @@
/* binary firmware name */
#define VPU_P_FW "vpu_p.bin"
#define VPU_D_FW "vpu_d.bin"
#define VPU_P_FW_NEW "mediatek/mt8173/vpu_p.bin"
#define VPU_D_FW_NEW "mediatek/mt8173/vpu_d.bin"
#define VPU_RESET 0x0
#define VPU_TCM_CFG 0x0008
@ -477,16 +479,24 @@ static int load_requested_vpu(struct mtk_vpu *vpu,
size_t tcm_size = fw_type ? VPU_DTCM_SIZE : VPU_PTCM_SIZE;
size_t fw_size = fw_type ? VPU_D_FW_SIZE : VPU_P_FW_SIZE;
char *fw_name = fw_type ? VPU_D_FW : VPU_P_FW;
char *fw_new_name = fw_type ? VPU_D_FW_NEW : VPU_P_FW_NEW;
const struct firmware *vpu_fw;
size_t dl_size = 0;
size_t extra_fw_size = 0;
void *dest;
int ret;
ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
ret = request_firmware(&vpu_fw, fw_new_name, vpu->dev);
if (ret < 0) {
dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name, ret);
return ret;
dev_info(vpu->dev, "Failed to load %s, %d, retry\n",
fw_new_name, ret);
ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
if (ret < 0) {
dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name,
ret);
return ret;
}
}
dl_size = vpu_fw->size;
if (dl_size > fw_size) {