media: iris: Initialize HFI ops after firmware load in core init

The HFI sys ops were previously initialized in probe() but, we don't
have firmware loaded at probe time. Since HFI is tightly coupled to
firmware, initialize the HFI sys ops after firmware has been successfully
loaded and booted.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>

diff --git a/drivers/media/platform/qcom/iris/iris_core.c b/drivers/media/platform/qcom/iris/iris_core.c
index e6141012cd3dda7e029a5659dcb3048a23cdc150..a1823ded46e876a99af296f1f526e7221b36e1d9 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_core.c
+++ b/drivers/media/platform/qcom/iris/iris_core.c
@@ -74,6 +74,8 @@ int iris_core_init(struct iris_core *core)
        if (ret)
                goto error_unload_fw;
 
+       core->iris_firmware_data->init_hfi_ops(core);
+
        ret = iris_hfi_core_init(core);
        if (ret)
                goto error_unload_fw;

diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index a5342339985498514a203694096e4f0f6c80b510..c2dcb50a27824d45d5fbc8b9e22591decbe2a23b 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -266,7 +266,6 @@ static int iris_probe(struct platform_device *pdev)
                return ret;
 
        iris_init_ops(core);
-       core->iris_firmware_data->init_hfi_ops(core);
 
        ret = iris_init_resources(core);
        if (ret)