git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From 0602ff25e62f5356e0e669b79c909a38c5fbc726 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Tue, 30 Oct 2018 11:42:48 +0000
   4 Subject: [PATCH 273/773] staging: vc-sm-cma: Fixup driver for older VCHI APIs
   5
   6 Original patch was based off staging which included some cleanups
   7 of the VCHI APIs. Those aren't present here, so switch back to
   8 the older API.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  11 ---
  12  drivers/staging/vc04_services/vc-sm-cma/vc_sm.c          | 2 +-
  13  drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c | 5 +++++
  14  2 files changed, 6 insertions(+), 1 deletion(-)
  15
  16 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
  17 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
  18 @@ -632,7 +632,7 @@ static void vc_sm_connected_init(void)
  19                 goto err_free_mem;
  20         }
  21
  22 -       ret = vchi_connect(vchi_instance);
  23 +       ret = vchi_connect(NULL, 0, vchi_instance);
  24         if (ret) {
  25                 pr_err("[%s]: failed to connect VCHI instance (ret=%d)\n",
  26                        __func__, ret);
  27 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
  28 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
  29 @@ -325,8 +325,13 @@ struct sm_instance *vc_sm_cma_vchi_init(
  30                 SERVICE_CREATION_T params = {
  31                         .version = VCHI_VERSION_EX(VC_SM_VER, VC_SM_MIN_VER),
  32                         .service_id = VC_SM_SERVER_NAME,
  33 +                       .rx_fifo_size = 0,
  34 +                       .tx_fifo_size = 0,
  35                         .callback = vc_sm_cma_vchi_callback,
  36                         .callback_param = instance,
  37 +                       .want_unaligned_bulk_rx = 0,
  38 +                       .want_unaligned_bulk_tx = 0,
  39 +                       .want_crc = 0
  40                 };
  41
  42                 status = vchi_service_open(vchi_instance,