diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-07-06 20:17:30 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-07-06 20:24:05 +0300 |
| commit | d6e1cff14875d6ce338c1f27afe0639ef0f97b79 (patch) | |
| tree | 2449859b19a9e58abb0414700621a86f234d91d6 /drivers/mxc/vpu_malone/vpu_b0.h | |
| parent | 453fdfde79e13e27030a56c7ea787e98698b0dba (diff) | |
| parent | 0347fe7527d062e1762498cb5863bcd5bde0997b (diff) | |
Merge branch 'imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx
Fix conflicts after merging changes from the latest NXP branch.
Conflicts:
arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
drivers/pci/dwc/pci-imx6.c
Related-to: ELB-1306
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'drivers/mxc/vpu_malone/vpu_b0.h')
| -rw-r--r-- | drivers/mxc/vpu_malone/vpu_b0.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mxc/vpu_malone/vpu_b0.h b/drivers/mxc/vpu_malone/vpu_b0.h index e1e0949e5237..3756a9ea7765 100644 --- a/drivers/mxc/vpu_malone/vpu_b0.h +++ b/drivers/mxc/vpu_malone/vpu_b0.h @@ -314,6 +314,8 @@ struct vpu_dev { char precheck_content[1024]; struct kfifo mu_msg_fifo; + void *mu_msg_buffer; + unsigned int mu_msg_buffer_size; u_int32 vpu_irq; /* reserve for kernel version 5.4 or later */ @@ -399,6 +401,8 @@ struct vpu_ctx { int str_index; struct queue_data q_data[2]; struct kfifo msg_fifo; + void *msg_buffer; + unsigned int msg_buffer_size; struct mutex instance_mutex; struct work_struct instance_work; struct workqueue_struct *instance_wq; |