|
@@ -480,12 +480,12 @@ EXPORT_SYMBOL_GPL(vpu_get_plat_device);
|
|
|
|
|
|
/* load vpu program/data memory */
|
|
|
static int load_requested_vpu(struct mtk_vpu *vpu,
|
|
|
- const struct firmware *vpu_fw,
|
|
|
u8 fw_type)
|
|
|
{
|
|
|
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;
|
|
|
+ const struct firmware *vpu_fw;
|
|
|
size_t dl_size = 0;
|
|
|
size_t extra_fw_size = 0;
|
|
|
void *dest;
|
|
@@ -539,7 +539,6 @@ int vpu_load_firmware(struct platform_device *pdev)
|
|
|
struct mtk_vpu *vpu;
|
|
|
struct device *dev = &pdev->dev;
|
|
|
struct vpu_run *run;
|
|
|
- const struct firmware *vpu_fw = NULL;
|
|
|
int ret;
|
|
|
|
|
|
if (!pdev) {
|
|
@@ -568,14 +567,14 @@ int vpu_load_firmware(struct platform_device *pdev)
|
|
|
run->signaled = false;
|
|
|
dev_dbg(vpu->dev, "firmware request\n");
|
|
|
/* Downloading program firmware to device*/
|
|
|
- ret = load_requested_vpu(vpu, vpu_fw, P_FW);
|
|
|
+ ret = load_requested_vpu(vpu, P_FW);
|
|
|
if (ret < 0) {
|
|
|
dev_err(dev, "Failed to request %s, %d\n", VPU_P_FW, ret);
|
|
|
goto OUT_LOAD_FW;
|
|
|
}
|
|
|
|
|
|
/* Downloading data firmware to device */
|
|
|
- ret = load_requested_vpu(vpu, vpu_fw, D_FW);
|
|
|
+ ret = load_requested_vpu(vpu, D_FW);
|
|
|
if (ret < 0) {
|
|
|
dev_err(dev, "Failed to request %s, %d\n", VPU_D_FW, ret);
|
|
|
goto OUT_LOAD_FW;
|