From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
Russell King <linux@armlinux.org.uk>
Subject: [PATCH 10/15] drm/i2c: tda998x: switch to struct drm_edid
Date: Tue, 16 Apr 2024 16:22:24 +0300 [thread overview]
Message-ID: <3b93bd58e07284bc21c56f10e5df4f322dd8427d.1713273659.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1713273659.git.jani.nikula@intel.com>
Prefer struct drm_edid based functions over struct edid.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Cc: Russell King <linux@armlinux.org.uk>
---
drivers/gpu/drm/i2c/tda998x_drv.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index d8d7de18dd65..2160f05bbd16 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1283,7 +1283,7 @@ static int read_edid_block(void *data, u8 *buf, unsigned int blk, size_t length)
static int tda998x_connector_get_modes(struct drm_connector *connector)
{
struct tda998x_priv *priv = conn_to_tda998x_priv(connector);
- struct edid *edid;
+ const struct drm_edid *drm_edid;
int n;
/*
@@ -1297,25 +1297,26 @@ static int tda998x_connector_get_modes(struct drm_connector *connector)
if (priv->rev == TDA19988)
reg_clear(priv, REG_TX4, TX4_PD_RAM);
- edid = drm_do_get_edid(connector, read_edid_block, priv);
+ drm_edid = drm_edid_read_custom(connector, read_edid_block, priv);
if (priv->rev == TDA19988)
reg_set(priv, REG_TX4, TX4_PD_RAM);
- if (!edid) {
+ drm_edid_connector_update(connector, drm_edid);
+ cec_notifier_set_phys_addr(priv->cec_notify,
+ connector->display_info.source_physical_address);
+
+ if (!drm_edid) {
dev_warn(&priv->hdmi->dev, "failed to read EDID\n");
return 0;
}
- drm_connector_update_edid_property(connector, edid);
- cec_notifier_set_phys_addr_from_edid(priv->cec_notify, edid);
-
mutex_lock(&priv->audio_mutex);
- n = drm_add_edid_modes(connector, edid);
- priv->sink_has_audio = drm_detect_monitor_audio(edid);
+ n = drm_edid_connector_add_modes(connector);
+ priv->sink_has_audio = connector->display_info.has_audio;
mutex_unlock(&priv->audio_mutex);
- kfree(edid);
+ drm_edid_free(drm_edid);
return n;
}
--
2.39.2
next prev parent reply other threads:[~2024-04-16 13:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 13:22 [PATCH 00/15] drm: struct drm_edid conversions Jani Nikula
2024-04-16 13:22 ` [PATCH 01/15] drm/panel: simple: switch to struct drm_edid Jani Nikula
2024-04-16 17:41 ` Neil Armstrong
2024-04-16 13:22 ` [PATCH 02/15] drm/panel-samsung-atna33xc20: " Jani Nikula
2024-04-16 17:41 ` Neil Armstrong
2024-04-16 13:22 ` [PATCH 03/15] drm/panel-edp: " Jani Nikula
2024-04-16 17:43 ` Neil Armstrong
2024-04-16 13:22 ` [PATCH 04/15] drm/bridge/analogix/anx6345: " Jani Nikula
2024-04-16 13:22 ` [PATCH 05/15] drm/bridge/analogix/anx78xx: " Jani Nikula
2024-04-16 13:22 ` [PATCH 06/15] drm/sun4i: hdmi: " Jani Nikula
2024-04-18 11:51 ` Maxime Ripard
2024-04-16 13:22 ` [PATCH 07/15] drm/vc4: " Jani Nikula
2024-04-18 11:51 ` Maxime Ripard
2024-04-16 13:22 ` [PATCH 08/15] drm/bridge: anx7625: use struct drm_edid more Jani Nikula
2024-04-16 13:22 ` [PATCH 09/15] drm/gud: switch to struct drm_edid Jani Nikula
2024-04-17 15:26 ` Noralf Trønnes
2024-04-16 13:22 ` Jani Nikula [this message]
2024-04-16 13:22 ` [PATCH 11/15] drm/bochs: " Jani Nikula
2024-04-16 13:22 ` [PATCH 12/15] drm/virtio: " Jani Nikula
2024-04-16 13:22 ` [PATCH 13/15] drm/rockchip: cdn-dp: " Jani Nikula
2024-04-19 10:58 ` Heiko Stuebner
2024-04-16 13:22 ` [PATCH 14/15] drm/rockchip: inno_hdmi: " Jani Nikula
2024-04-19 10:58 ` Heiko Stuebner
2024-04-16 13:22 ` [PATCH 15/15] drm/rockchip: rk3066_hdmi: " Jani Nikula
2024-04-19 10:58 ` Heiko Stuebner
2024-05-07 15:34 ` [PATCH 00/15] drm: struct drm_edid conversions Thomas Zimmermann
2024-05-10 13:28 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3b93bd58e07284bc21c56f10e5df4f322dd8427d.1713273659.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).