From: Jean-Francois Moine <moinejf@free.fr> To: Mark Brown <broonie@kernel.org>, Russell King - ARM Linux <linux@arm.linux.org.uk> Cc: Dave Airlie <airlied@gmail.com>, Andrew Jackson <Andrew.Jackson@arm.com>, Jyri Sarha <jsarha@ti.com>, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 2/4] drm/i2c: tda998x: Change drvdata for audio extension Date: Wed, 7 Jan 2015 11:00:50 +0100 [thread overview] Message-ID: <f682ee5ef933fd71d7e9ecaa503dff20304c1d75.1420628786.git.moinejf@free.fr> (raw) In-Reply-To: <cover.1420628786.git.moinejf@free.fr> The device drvdata is used for component bind, but points to the encoder/connector structure which is hidden from the slave encoder. For audio extension, the slave encoder private data must be accessible, so, this patch changes drvdata to the slave encoder private data and sets it in case of slave encoder use. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> --- drivers/gpu/drm/i2c/tda998x_drv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 9d9b072..ce1478d 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -1437,6 +1437,8 @@ static int tda998x_encoder_init(struct i2c_client *client, encoder_slave->slave_priv = priv; encoder_slave->slave_funcs = &tda998x_encoder_slave_funcs; + dev_set_drvdata(&client->dev, priv); + return 0; } @@ -1563,7 +1565,7 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data) if (!priv) return -ENOMEM; - dev_set_drvdata(dev, priv); + dev_set_drvdata(dev, &priv->base); priv->base.encoder = &priv->encoder; priv->connector.interlace_allowed = 1; @@ -1613,7 +1615,9 @@ err_encoder: static void tda998x_unbind(struct device *dev, struct device *master, void *data) { - struct tda998x_priv2 *priv = dev_get_drvdata(dev); + struct tda998x_priv *priv_s = dev_get_drvdata(dev); + struct tda998x_priv2 *priv = + container_of(priv_s, struct tda998x_priv2, base); drm_connector_cleanup(&priv->connector); drm_encoder_cleanup(&priv->encoder); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Francois Moine <moinejf@free.fr> To: Mark Brown <broonie@kernel.org>, Russell King - ARM Linux <linux@arm.linux.org.uk> Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Andrew Jackson <Andrew.Jackson@arm.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jyri Sarha <jsarha@ti.com> Subject: [PATCH v9 2/4] drm/i2c: tda998x: Change drvdata for audio extension Date: Wed, 7 Jan 2015 11:00:50 +0100 [thread overview] Message-ID: <f682ee5ef933fd71d7e9ecaa503dff20304c1d75.1420628786.git.moinejf@free.fr> (raw) In-Reply-To: <cover.1420628786.git.moinejf@free.fr> The device drvdata is used for component bind, but points to the encoder/connector structure which is hidden from the slave encoder. For audio extension, the slave encoder private data must be accessible, so, this patch changes drvdata to the slave encoder private data and sets it in case of slave encoder use. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> --- drivers/gpu/drm/i2c/tda998x_drv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 9d9b072..ce1478d 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -1437,6 +1437,8 @@ static int tda998x_encoder_init(struct i2c_client *client, encoder_slave->slave_priv = priv; encoder_slave->slave_funcs = &tda998x_encoder_slave_funcs; + dev_set_drvdata(&client->dev, priv); + return 0; } @@ -1563,7 +1565,7 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data) if (!priv) return -ENOMEM; - dev_set_drvdata(dev, priv); + dev_set_drvdata(dev, &priv->base); priv->base.encoder = &priv->encoder; priv->connector.interlace_allowed = 1; @@ -1613,7 +1615,9 @@ err_encoder: static void tda998x_unbind(struct device *dev, struct device *master, void *data) { - struct tda998x_priv2 *priv = dev_get_drvdata(dev); + struct tda998x_priv *priv_s = dev_get_drvdata(dev); + struct tda998x_priv2 *priv = + container_of(priv_s, struct tda998x_priv2, base); drm_connector_cleanup(&priv->connector); drm_encoder_cleanup(&priv->encoder); -- 2.1.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-01-07 11:52 UTC|newest] Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-07 11:06 [PATCH v9 0/4] ASoC: tda998x: add a codec to the HDMI transmitter Jean-Francois Moine 2015-01-07 11:06 ` Jean-Francois Moine 2015-01-07 9:10 ` [PATCH v9 1/4] drm/i2c: tda998x: Add DT support for audio Jean-Francois Moine 2015-01-07 9:10 ` Jean-Francois Moine 2015-01-07 14:39 ` Andrew Jackson 2015-01-07 14:39 ` Andrew Jackson 2015-01-07 17:08 ` Jean-Francois Moine 2015-01-07 17:08 ` Jean-Francois Moine 2015-01-07 17:18 ` Andrew Jackson 2015-01-07 17:18 ` Andrew Jackson 2015-01-07 17:33 ` Mark Brown 2015-01-08 14:53 ` Jyri Sarha 2015-01-08 14:53 ` Jyri Sarha 2015-01-08 16:42 ` Jean-Francois Moine 2015-01-08 16:42 ` Jean-Francois Moine 2015-01-08 20:04 ` Mark Brown 2015-01-08 20:04 ` Mark Brown 2015-01-09 9:25 ` Andrew Jackson 2015-01-09 9:25 ` Andrew Jackson 2015-01-09 10:13 ` Jyri Sarha 2015-01-09 10:13 ` Jyri Sarha 2015-01-09 11:30 ` Jean-Francois Moine 2015-01-09 11:30 ` Jean-Francois Moine 2015-01-09 11:45 ` Russell King - ARM Linux 2015-01-09 11:45 ` Russell King - ARM Linux 2015-01-09 12:54 ` Jean-Francois Moine 2015-01-09 12:54 ` Jean-Francois Moine 2015-01-09 13:07 ` Russell King - ARM Linux 2015-01-09 13:07 ` Russell King - ARM Linux 2015-01-09 13:58 ` Andrew Jackson 2015-01-09 13:58 ` Andrew Jackson 2015-01-09 14:57 ` Russell King - ARM Linux 2015-01-09 17:38 ` Jean-Francois Moine 2015-01-09 17:38 ` Jean-Francois Moine 2015-01-09 20:01 ` Russell King - ARM Linux 2015-01-09 20:01 ` Russell King - ARM Linux 2015-01-10 15:47 ` [alsa-devel] " Jean-Francois Moine 2015-01-10 15:47 ` Jean-Francois Moine 2015-01-12 9:25 ` Philipp Zabel 2015-01-12 9:25 ` Philipp Zabel 2015-01-12 12:25 ` Russell King - ARM Linux 2015-01-12 13:59 ` Philipp Zabel 2015-01-12 13:59 ` Philipp Zabel 2015-01-12 14:04 ` Russell King - ARM Linux 2015-01-12 14:04 ` Russell King - ARM Linux 2015-01-12 17:13 ` Jean-Francois Moine 2015-01-12 17:13 ` Jean-Francois Moine 2015-01-12 17:57 ` Russell King - ARM Linux 2015-01-12 17:57 ` Russell King - ARM Linux 2015-01-12 19:14 ` Jean-Francois Moine 2015-01-12 19:14 ` Jean-Francois Moine 2015-01-13 12:21 ` Philipp Zabel 2015-01-13 12:21 ` Philipp Zabel 2015-01-13 12:27 ` Russell King - ARM Linux 2015-01-13 12:27 ` Russell King - ARM Linux 2015-01-13 15:54 ` Jean-Francois Moine 2015-01-13 15:54 ` Jean-Francois Moine 2015-01-13 16:03 ` Russell King - ARM Linux 2015-01-13 16:03 ` Russell King - ARM Linux 2015-01-13 19:02 ` Jean-Francois Moine 2015-01-13 19:02 ` Jean-Francois Moine 2015-01-13 19:26 ` Russell King - ARM Linux 2015-01-13 19:26 ` Russell King - ARM Linux 2015-01-13 19:41 ` Jyri Sarha 2015-01-13 19:41 ` Jyri Sarha 2015-01-13 19:54 ` Russell King - ARM Linux 2015-01-13 19:54 ` Russell King - ARM Linux 2015-01-14 7:55 ` Jean-Francois Moine 2015-01-14 7:55 ` Jean-Francois Moine 2015-01-14 12:12 ` Russell King - ARM Linux 2015-01-14 12:12 ` Russell King - ARM Linux 2015-01-14 10:46 ` Philipp Zabel 2015-01-14 10:46 ` Philipp Zabel 2015-01-14 12:50 ` Mark Brown 2015-01-14 12:50 ` Mark Brown 2015-01-14 14:23 ` Russell King - ARM Linux 2015-01-14 14:23 ` Russell King - ARM Linux 2015-01-07 10:00 ` Jean-Francois Moine [this message] 2015-01-07 10:00 ` [PATCH v9 2/4] drm/i2c: tda998x: Change drvdata for audio extension Jean-Francois Moine 2015-01-07 10:51 ` [PATCH v9 3/4] ASoC: tda998x: add a codec to the HDMI transmitter Jean-Francois Moine 2015-01-07 15:10 ` Andrew Jackson 2015-01-07 15:10 ` Andrew Jackson 2015-01-07 15:41 ` Russell King - ARM Linux 2015-01-07 15:41 ` Russell King - ARM Linux 2015-01-07 18:02 ` Jean-Francois Moine 2015-01-09 10:24 ` Jyri Sarha 2015-01-09 10:24 ` Jyri Sarha 2015-01-09 11:15 ` Jean-Francois Moine 2015-01-09 11:15 ` Jean-Francois Moine 2015-01-09 11:19 ` Russell King - ARM Linux 2015-01-09 11:19 ` Russell King - ARM Linux 2015-01-09 11:45 ` Jean-Francois Moine 2015-01-09 11:45 ` Jean-Francois Moine 2015-01-09 11:48 ` Russell King - ARM Linux 2015-01-09 11:48 ` Russell King - ARM Linux 2015-01-07 17:34 ` Mark Brown 2015-01-07 17:34 ` Mark Brown 2015-01-08 14:55 ` Jyri Sarha 2015-01-08 14:55 ` Jyri Sarha 2015-01-09 17:39 ` Andrew Jackson 2015-01-09 17:39 ` Andrew Jackson 2015-01-09 17:54 ` Mark Brown 2015-01-09 17:54 ` Mark Brown 2015-01-13 9:24 ` Jean-Francois Moine 2015-01-13 9:24 ` Jean-Francois Moine 2015-01-11 21:03 ` Jyri Sarha 2015-01-11 21:03 ` Jyri Sarha 2015-01-13 7:41 ` Jean-Francois Moine 2015-01-13 7:41 ` Jean-Francois Moine 2015-01-07 11:01 ` [PATCH v9 4/4] drm/i2c: tda998x: set cts_n according to the sample width Jean-Francois Moine 2015-01-08 14:53 ` [PATCH v9 0/4] ASoC: tda998x: add a codec to the HDMI transmitter Jyri Sarha 2015-01-08 14:53 ` Jyri Sarha 2015-01-08 20:05 ` Mark Brown 2015-01-09 10:15 ` Jyri Sarha 2015-01-09 10:15 ` Jyri Sarha
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=f682ee5ef933fd71d7e9ecaa503dff20304c1d75.1420628786.git.moinejf@free.fr \ --to=moinejf@free.fr \ --cc=Andrew.Jackson@arm.com \ --cc=airlied@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=jsarha@ti.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.