target/linux/layerscape/patches-5.4/805-display-0020-drm-bridge-cdns-cec-fix-LA-failed-set-issue.patch

   1 From 4e8d26c363c6e4b8b89d21feeb8c6dc57085b27d Mon Sep 17 00:00:00 2001
   2 From: Sandor Yu <Sandor.yu@nxp.com>
   3 Date: Fri, 27 Sep 2019 17:15:34 +0800
   4 Subject: [PATCH] drm: bridge: cdns cec: fix LA failed set issue
   5
   6 improved function set_logical_addr() function.
   7 Fix LA set failed issue in some case.
   8
   9 Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  10 ---
  11  drivers/gpu/drm/bridge/cadence/Kconfig         |  6 ++++
  12  drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c | 38 +++++++++++---------------
  13  2 files changed, 22 insertions(+), 22 deletions(-)
  14
  15 --- a/drivers/gpu/drm/bridge/cadence/Kconfig
  16 +++ b/drivers/gpu/drm/bridge/cadence/Kconfig
  17 @@ -8,12 +8,18 @@ config DRM_CDNS_MHDP
  18
  19  config DRM_CDNS_HDMI
  20         tristate "Cadence HDMI DRM driver"
  21 +       depends on DRM_CDNS_MHDP
  22
  23  config DRM_CDNS_DP
  24         tristate "Cadence DP DRM driver"
  25 +       depends on DRM_CDNS_MHDP
  26
  27  config DRM_CDNS_AUDIO
  28         tristate "Cadence MHDP Audio driver"
  29 +       depends on DRM_CDNS_MHDP
  30
  31  config DRM_CDNS_HDMI_CEC
  32         tristate "Cadence MHDP HDMI CEC driver"
  33 +       depends on DRM_CDNS_HDMI
  34 +       select CEC_CORE
  35 +       select CEC_NOTIFIER
  36 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c
  37 +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c
  38 @@ -20,8 +20,6 @@
  39  #define CEC_NAME       "cdns-mhdp-cec"
  40
  41  #define REG_ADDR_OFF 4
  42 -#define MAX_LA_IDX 4
  43 -#define MAX_LA_VAL 15
  44
  45  /* regsiter define */
  46  #define TX_MSG_HEADER 0x33800
  47 @@ -158,26 +156,22 @@ static u32 mhdp_cec_write_message(struct
  48         return true;
  49  }
  50
  51 -//static void cec_abort_tx_transfer(struct cdns_mhdp_cec *cec)
  52 -//{
  53 -//     cec_write(cec, TX_MSG_CMD, CEC_TX_ABORT);
  54 -//     cec_write(cec, TX_MSG_CMD, CEC_TX_STOP);
  55 -//}
  56 -
  57  static int mhdp_cec_set_logical_addr(struct cdns_mhdp_cec *cec, u32 la)
  58  {
  59 -       u8 i;
  60         u8 la_reg;
  61 +       u8 i;
  62
  63 -       if (la >= MAX_LA_VAL) {
  64 -               dev_err(cec->dev, "Error logical Addr\n");
  65 -               return -EINVAL;
  66 -       }
  67 -
  68 -       for (i = 0; i < MAX_LA_IDX; ++i) {
  69 -               la_reg =
  70 -                   mhdp_cec_read(cec, LOGICAL_ADDRESS_LA0 + (i * REG_ADDR_OFF));
  71 +       if (la == CEC_LOG_ADDR_INVALID)
  72 +               /* invalid all LA address */
  73 +               for (i = 0; i < CEC_MAX_LOG_ADDRS; ++i) {
  74 +                       mhdp_cec_write(cec, LOGICAL_ADDRESS_LA0 + (i * REG_ADDR_OFF), 0);
  75 +                       return 0;
  76 +               }
  77
  78 +       /* In fact cdns mhdp cec could support max 5 La address */
  79 +       for (i = 0; i < CEC_MAX_LOG_ADDRS; ++i) {
  80 +               la_reg = mhdp_cec_read(cec, LOGICAL_ADDRESS_LA0 + (i * REG_ADDR_OFF));
  81 +               /* Check LA already used */
  82                 if (la_reg & 0x10)
  83                         continue;
  84
  85 @@ -194,7 +188,7 @@ static int mhdp_cec_set_logical_addr(str
  86
  87         dev_warn(cec->dev, "All LA in use\n");
  88
  89 -       return -EINVAL;
  90 +       return -ENXIO;
  91  }
  92
  93  static int mhdp_cec_poll_worker(void *_cec)
  94 @@ -263,7 +257,7 @@ static int mhdp_cec_poll_worker(void *_c
  95
  96  static int mhdp_cec_adap_enable(struct cec_adapter *adap, bool enable)
  97  {
  98 -       struct cdns_mhdp_cec *cec = adap->priv;
  99 +       struct cdns_mhdp_cec *cec = cec_get_drvdata(adap);
 100
 101         if (enable) {
 102                 mhdp_cec_write(cec, DB_L_TIMER, 0x10);
 103 @@ -276,7 +270,7 @@ static int mhdp_cec_adap_enable(struct c
 104
 105  static int mhdp_cec_adap_log_addr(struct cec_adapter *adap, u8 addr)
 106  {
 107 -       struct cdns_mhdp_cec *cec = adap->priv;
 108 +       struct cdns_mhdp_cec *cec = cec_get_drvdata(adap);
 109
 110         return mhdp_cec_set_logical_addr(cec, addr);
 111  }
 112 @@ -284,7 +278,7 @@ static int mhdp_cec_adap_log_addr(struct
 113  static int mhdp_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
 114                                  u32 signal_free_time, struct cec_msg *msg)
 115  {
 116 -       struct cdns_mhdp_cec *cec = adap->priv;
 117 +       struct cdns_mhdp_cec *cec = cec_get_drvdata(adap);
 118
 119         mhdp_cec_write_message(cec, msg);
 120
 121 @@ -307,7 +301,7 @@ int cdns_mhdp_register_cec_driver(struct
 122                                          CEC_NAME,
 123                                          CEC_CAP_PHYS_ADDR | CEC_CAP_LOG_ADDRS |
 124                                          CEC_CAP_TRANSMIT | CEC_CAP_PASSTHROUGH
 125 -                                        | CEC_CAP_RC, 1);
 126 +                                        | CEC_CAP_RC, CEC_MAX_LOG_ADDRS);
 127         ret = PTR_ERR_OR_ZERO(cec->adap);
 128         if (ret)
 129                 return ret;