Commit 53d98420 authored by Jacek Lawrynowicz's avatar Jacek Lawrynowicz Committed by Stanislaw Gruszka
Browse files

accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init() 



ivpu_fw_load() doesn't have to be called separately in ivpu_dev_init().

Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230901094957.168898-8-stanislaw.gruszka@linux.intel.com
Link: https://patchwork.freedesktop.org/patch/msgid/20230901094957.168898-7-stanislaw.gruszka@linux.intel.com
parent 34d03f2a

drivers/accel/ivpu/ivpu_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -561,10 +561,6 @@ static int ivpu_dev_init(struct ivpu_device *vdev) 
	if (ret)

		goto err_ipc_fini;



	ret = ivpu_fw_load(vdev);

	if (ret)

		goto err_job_done_thread_fini;



	ret = ivpu_boot(vdev);

	if (ret)

		goto err_job_done_thread_fini;

drivers/accel/ivpu/ivpu_fw.c

+3 −3
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ int ivpu_fw_init(struct ivpu_device *vdev) 
	if (ret)

		goto err_fw_release;



	ivpu_fw_load(vdev);



	return 0;



err_fw_release:
@@ -314,7 +316,7 @@ void ivpu_fw_fini(struct ivpu_device *vdev) 
	ivpu_fw_release(vdev);

}



int ivpu_fw_load(struct ivpu_device *vdev)

void ivpu_fw_load(struct ivpu_device *vdev)

{

	struct ivpu_fw_info *fw = vdev->fw;

	u64 image_end_offset = fw->image_load_offset + fw->image_size;
@@ -331,8 +333,6 @@ int ivpu_fw_load(struct ivpu_device *vdev) 
	}



	wmb(); /* Flush WC buffers after writing fw->mem */



	return 0;

}



static void ivpu_fw_boot_params_print(struct ivpu_device *vdev, struct vpu_boot_params *boot_params)

drivers/accel/ivpu/ivpu_fw.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct ivpu_fw_info { 


int ivpu_fw_init(struct ivpu_device *vdev);

void ivpu_fw_fini(struct ivpu_device *vdev);

int ivpu_fw_load(struct ivpu_device *vdev);

void ivpu_fw_load(struct ivpu_device *vdev);

void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params *bp);



static inline bool ivpu_fw_is_cold_boot(struct ivpu_device *vdev)