Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07259f8b authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Russell King
Browse files

drm/i2c: tda998x: use drm_do_get_edid() 



Replace the internal EDID read implementation by a call to the new EDID
read core function.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Tested-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 288ffc73

drivers/gpu/drm/i2c/tda998x_drv.c

+18 −68
Original line number Diff line number Diff line
@@ -1012,8 +1012,9 @@ tda998x_encoder_detect(struct tda998x_priv *priv) 
			connector_status_disconnected;

}



static int read_edid_block(struct tda998x_priv *priv, uint8_t *buf, int blk)

static int read_edid_block(void *data, u8 *buf, unsigned int blk, size_t length)

{

	struct tda998x_priv *priv = data;

	uint8_t offset, segptr;

	int ret, i;
@@ -1057,8 +1058,8 @@ static int read_edid_block(struct tda998x_priv *priv, uint8_t *buf, int blk) 
		return -ETIMEDOUT;

	}



	ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH);

	if (ret != EDID_LENGTH) {

	ret = reg_read_range(priv, REG_EDID_DATA_0, buf, length);

	if (ret != length) {

		dev_err(&priv->hdmi->dev, "failed to read edid block %d: %d\n",

			blk, ret);

		return ret;
@@ -1067,81 +1068,30 @@ static int read_edid_block(struct tda998x_priv *priv, uint8_t *buf, int blk) 
	return 0;

}



static uint8_t *do_get_edid(struct tda998x_priv *priv)

static int

tda998x_encoder_get_modes(struct tda998x_priv *priv,

			  struct drm_connector *connector)

{

	int j, valid_extensions = 0;

	uint8_t *block, *new;

	bool print_bad_edid = drm_debug & DRM_UT_KMS;



	if ((block = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)

		return NULL;

	struct edid *edid;

	int n;



	if (priv->rev == TDA19988)

		reg_clear(priv, REG_TX4, TX4_PD_RAM);



	/* base block fetch */

	if (read_edid_block(priv, block, 0))

		goto fail;



	if (!drm_edid_block_valid(block, 0, print_bad_edid))

		goto fail;



	/* if there's no extensions, we're done */

	if (block[0x7e] == 0)

		goto done;



	new = krealloc(block, (block[0x7e] + 1) * EDID_LENGTH, GFP_KERNEL);

	if (!new)

		goto fail;

	block = new;



	for (j = 1; j <= block[0x7e]; j++) {

		uint8_t *ext_block = block + (valid_extensions + 1) * EDID_LENGTH;

		if (read_edid_block(priv, ext_block, j))

			goto fail;



		if (!drm_edid_block_valid(ext_block, j, print_bad_edid))

			goto fail;

	edid = drm_do_get_edid(connector, read_edid_block, priv);



		valid_extensions++;

	}



	if (valid_extensions != block[0x7e]) {

		block[EDID_LENGTH-1] += block[0x7e] - valid_extensions;

		block[0x7e] = valid_extensions;

		new = krealloc(block, (valid_extensions + 1) * EDID_LENGTH, GFP_KERNEL);

		if (!new)

			goto fail;

		block = new;

	}



done:

	if (priv->rev == TDA19988)

		reg_set(priv, REG_TX4, TX4_PD_RAM);



	return block;



fail:

	if (priv->rev == TDA19988)

		reg_set(priv, REG_TX4, TX4_PD_RAM);

	if (!edid) {

		dev_warn(&priv->hdmi->dev, "failed to read EDID\n");

	kfree(block);

	return NULL;

		return 0;

	}



static int

tda998x_encoder_get_modes(struct tda998x_priv *priv,

			  struct drm_connector *connector)

{

	struct edid *edid = (struct edid *)do_get_edid(priv);

	int n = 0;



	if (edid) {

	drm_mode_connector_update_edid_property(connector, edid);

	n = drm_add_edid_modes(connector, edid);

	priv->is_hdmi_sink = drm_detect_hdmi_monitor(edid);

	kfree(edid);

	}



	return n;

}