Hi Alex,

On 08/24/2018 10:39 AM, Alexandre Courbot wrote:

On Thu, Aug 23, 2018 at 11:29 PM Vikash Garodia [off-list ref] wrote:

quoted

Separate firmware loading part into a new function.

Signed-off-by: Vikash Garodia <redacted>
---
 drivers/media/platform/qcom/venus/core.c     |  4 +-
 drivers/media/platform/qcom/venus/firmware.c | 55 ++++++++++++++++++----------
 drivers/media/platform/qcom/venus/firmware.h |  2 +-
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index bb6add9..75b9785 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c

@@ -84,7 +84,7 @@ static void venus_sys_error_handler(struct work_struct *work)

        pm_runtime_get_sync(core->dev);

-       ret |= venus_boot(core->dev, core->res->fwname);
+       ret |= venus_boot(core);

        ret |= hfi_core_resume(core, true);

@@ -284,7 +284,7 @@ static int venus_probe(struct platform_device *pdev)
        if (ret < 0)
                goto err_runtime_disable;

-       ret = venus_boot(dev, core->res->fwname);
+       ret = venus_boot(core);
        if (ret)
                goto err_runtime_disable;

diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
index a9d042e..34224eb 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c

@@ -60,20 +60,18 @@ int venus_set_hw_state(struct venus_core *core, bool resume)
        return 0;
 }

-int venus_boot(struct device *dev, const char *fwname)
+static int venus_load_fw(struct venus_core *core, const char *fwname,
+                        phys_addr_t *mem_phys, size_t *mem_size)

Following the remarks of the previous patch, you would have mem_phys
and mem_size as members of venus_core (probably renamed as fw_mem_addr
and fw_mem_size).

quoted

 {
        const struct firmware *mdt;
        struct device_node *node;
-       phys_addr_t mem_phys;
+       struct device *dev;
        struct resource r;
        ssize_t fw_size;
-       size_t mem_size;
        void *mem_va;
        int ret;

-       if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || !qcom_scm_is_available())
-               return -EPROBE_DEFER;

!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) is not a condition that can change
at runtime, and returning -EPROBE_DEFER in that case seems erroneous
to me. Instead, wouldn't it make more sense to make the driver depend
on QCOM_MDT_LOADER?

That was made on purpose, for more info git show b8f9bdc151e4a

-- 
regards,
Stan