Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

tda998x: use helpers for infoframe.
* 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  drm/i2c: tda998x: use drm_hdmi_avi_infoframe_from_display_mode()

diff --combined drivers/gpu/drm/i2c/tda998x_drv.c
index 5febffdb027d9ae72d0e5e4b2725b7bb6d5d4274,fbc9c1facdfe21f775bdbea528ef71a2edfb5486..011e1cac3e4ce0b17e1d3fa2a5bd31a1ad38b3ff
--- 1/drivers/gpu/drm/i2c/tda998x_drv.c
--- 2/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -33,8 -33,6 +33,8 @@@
  struct tda998x_priv {
        struct i2c_client *cec;
        struct i2c_client *hdmi;
 +      struct mutex mutex;
 +      struct delayed_work dwork;
        uint16_t rev;
        uint8_t current_page;
        int dpms;
@@@ -405,10 -403,9 +405,10 @@@ reg_read_range(struct tda998x_priv *pri
        uint8_t addr = REG2ADDR(reg);
        int ret;
  
 +      mutex_lock(&priv->mutex);
        ret = set_page(priv, reg);
        if (ret < 0)
 -              return ret;
 +              goto out;
  
        ret = i2c_master_send(client, &addr, sizeof(addr));
        if (ret < 0)
@@@ -418,12 -415,10 +418,12 @@@
        if (ret < 0)
                goto fail;
  
 -      return ret;
 +      goto out;
  
  fail:
        dev_err(&client->dev, "Error %d reading from 0x%x\n", ret, reg);
 +out:
 +      mutex_unlock(&priv->mutex);
        return ret;
  }
  
@@@ -437,16 -432,13 +437,16 @@@ reg_write_range(struct tda998x_priv *pr
        buf[0] = REG2ADDR(reg);
        memcpy(&buf[1], p, cnt);
  
 +      mutex_lock(&priv->mutex);
        ret = set_page(priv, reg);
        if (ret < 0)
 -              return;
 +              goto out;
  
        ret = i2c_master_send(client, buf, cnt + 1);
        if (ret < 0)
                dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
 +out:
 +      mutex_unlock(&priv->mutex);
  }
  
  static int
@@@ -468,16 -460,13 +468,16 @@@ reg_write(struct tda998x_priv *priv, ui
        uint8_t buf[] = {REG2ADDR(reg), val};
        int ret;
  
 +      mutex_lock(&priv->mutex);
        ret = set_page(priv, reg);
        if (ret < 0)
 -              return;
 +              goto out;
  
        ret = i2c_master_send(client, buf, sizeof(buf));
        if (ret < 0)
                dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
 +out:
 +      mutex_unlock(&priv->mutex);
  }
  
  static void
@@@ -487,16 -476,13 +487,16 @@@ reg_write16(struct tda998x_priv *priv, 
        uint8_t buf[] = {REG2ADDR(reg), val >> 8, val};
        int ret;
  
 +      mutex_lock(&priv->mutex);
        ret = set_page(priv, reg);
        if (ret < 0)
 -              return;
 +              goto out;
  
        ret = i2c_master_send(client, buf, sizeof(buf));
        if (ret < 0)
                dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
 +out:
 +      mutex_unlock(&priv->mutex);
  }
  
  static void
@@@ -551,17 -537,6 +551,17 @@@ tda998x_reset(struct tda998x_priv *priv
        reg_write(priv, REG_MUX_VP_VIP_OUT, 0x24);
  }
  
 +/* handle HDMI connect/disconnect */
 +static void tda998x_hpd(struct work_struct *work)
 +{
 +      struct delayed_work *dwork = to_delayed_work(work);
 +      struct tda998x_priv *priv =
 +                      container_of(dwork, struct tda998x_priv, dwork);
 +
 +      if (priv->encoder && priv->encoder->dev)
 +              drm_kms_helper_hotplug_event(priv->encoder->dev);
 +}
 +
  /*
   * only 2 interrupts may occur: screen plug/unplug and EDID read
   */
@@@ -585,7 -560,8 +585,7 @@@ static irqreturn_t tda998x_irq_thread(i
                priv->wq_edid_wait = 0;
                wake_up(&priv->wq_edid);
        } else if (cec != 0) {                  /* HPD change */
 -              if (priv->encoder && priv->encoder->dev)
 -                      drm_helper_hpd_irq_event(priv->encoder->dev);
 +              schedule_delayed_work(&priv->dwork, HZ/10);
        }
        return IRQ_HANDLED;
  }
@@@ -634,19 -610,21 +634,21 @@@ tda998x_write_aif(struct tda998x_priv *
  static void
  tda998x_write_avi(struct tda998x_priv *priv, struct drm_display_mode *mode)
  {
-       u8 buf[PB(HDMI_AVI_INFOFRAME_SIZE) + 1];
+       struct hdmi_avi_infoframe frame;
+       u8 buf[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];
+       ssize_t len;
  
-       memset(buf, 0, sizeof(buf));
-       buf[HB(0)] = HDMI_INFOFRAME_TYPE_AVI;
-       buf[HB(1)] = 0x02;
-       buf[HB(2)] = HDMI_AVI_INFOFRAME_SIZE;
-       buf[PB(1)] = HDMI_SCAN_MODE_UNDERSCAN;
-       buf[PB(2)] = HDMI_ACTIVE_ASPECT_PICTURE;
-       buf[PB(3)] = HDMI_QUANTIZATION_RANGE_FULL << 2;
-       buf[PB(4)] = drm_match_cea_mode(mode);
- 
-       tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, buf,
-                        sizeof(buf));
+       drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
+ 
+       frame.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;
+ 
+       len = hdmi_avi_infoframe_pack(&frame, buf, sizeof(buf));
+       if (len < 0) {
+               dev_err(&priv->hdmi->dev, "hdmi_avi_infoframe_pack() failed: %d\n", len);
+               return;
+       }
+ 
+       tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, buf, len);
  }
  
  static void tda998x_audio_mute(struct tda998x_priv *priv, bool on)
@@@ -1145,10 -1123,8 +1147,10 @@@ static void tda998x_destroy(struct tda9
        /* disable all IRQs and free the IRQ handler */
        cec_write(priv, REG_CEC_RXSHPDINTENA, 0);
        reg_clear(priv, REG_INT_FLAGS_2, INT_FLAGS_2_EDID_BLK_RD);
 -      if (priv->hdmi->irq)
 +      if (priv->hdmi->irq) {
                free_irq(priv->hdmi->irq, priv);
 +              cancel_delayed_work_sync(&priv->dwork);
 +      }
  
        i2c_unregister_device(priv->cec);
  }
@@@ -1232,7 -1208,6 +1234,7 @@@ static int tda998x_create(struct i2c_cl
        struct device_node *np = client->dev.of_node;
        u32 video;
        int rev_lo, rev_hi, ret;
 +      unsigned short cec_addr;
  
        priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3);
        priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1);
@@@ -1240,16 -1215,12 +1242,16 @@@
  
        priv->current_page = 0xff;
        priv->hdmi = client;
 -      priv->cec = i2c_new_dummy(client->adapter, 0x34);
 +      /* CEC I2C address bound to TDA998x I2C addr by configuration pins */
 +      cec_addr = 0x34 + (client->addr & 0x03);
 +      priv->cec = i2c_new_dummy(client->adapter, cec_addr);
        if (!priv->cec)
                return -ENODEV;
  
        priv->dpms = DRM_MODE_DPMS_OFF;
  
 +      mutex_init(&priv->mutex);       /* protect the page access */
 +
        /* wake up the device: */
        cec_write(priv, REG_CEC_ENAMODS,
                        CEC_ENAMODS_EN_RXSENS | CEC_ENAMODS_EN_HDMI);
@@@ -1305,9 -1276,8 +1307,9 @@@
        if (client->irq) {
                int irqf_trigger;
  
 -              /* init read EDID waitqueue */
 +              /* init read EDID waitqueue and HDP work */
                init_waitqueue_head(&priv->wq_edid);
 +              INIT_DELAYED_WORK(&priv->dwork, tda998x_hpd);
  
                /* clear pending interrupts */
                reg_read(priv, REG_INT_FLAGS_0);