Merge "dsp: audio_prm: check if gpr is ready"

dsp/audio_prm.c

@@ -96,7 +96,8 @@ static int prm_gpr_send_pkt(struct gpr_pkt *pkt, wait_queue_head_t *wait)
 		mutex_unlock(&g_prm.lock);
 		return -ENODEV;
 	}
-	if (!is_apm_ready_check_done && g_prm.is_adsp_up) {
+	if (!is_apm_ready_check_done && g_prm.is_adsp_up &&
+			(gpr_get_q6_state() == GPR_SUBSYS_LOADED)) {
 		pr_info("%s: apm ready check not done\n", __func__);
 		retry = 0;
 		while (!spf_core_is_apm_ready() || retry < MAX_RETRY_COUNT) {

include/ipc/gpr-lite.h

@@ -284,4 +284,5 @@ void gpr_driver_unregister(struct gpr_driver *drv);
 int gpr_send_pkt(struct gpr_device *adev, struct gpr_pkt *pkt);
 
 enum gpr_subsys_state gpr_get_modem_state(void);
+enum gpr_subsys_state gpr_get_q6_state(void);
 #endif /* __QCOM_GPR_H_ */