| Message ID | 20180419162751.25223-8-peda@axentia.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Peter, Thank you for the patch. On Thursday, 19 April 2018 19:27:51 EEST Peter Rosin wrote: > This makes this driver work with all(?) drivers that are not > componentized and instead expect to connect to a panel/bridge. That > said, the only one tested is atmel_hlcdc. > > This hooks the relevant work function previously called by the encoder > and the component also to the bridge, since the encoder goes away when > connecting to the bridge interface of the driver and the equivalent of > bind/unbind of the component is handled by bridge attach/detach. > > The lifetime requirements of a bridge and a component are slightly > different, which is the reason for struct tda998x_bridge. Couldn't you move the allocation and initialization (tda998x_create) of the tda998x_priv structure to probe time ? I think you wouldn't need a separate structure in that case. Unless I'm mistaken there would be an added benefit of separating component and bridge initialization, resulting in the encoder not being initialized at all if the component isn't used. You wouldn't need to add a local_encoder parameter to the tda998x_init() function. > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > drivers/gpu/drm/i2c/tda998x_drv.c | 157 ++++++++++++++++++++++++++++++++--- > 1 file changed, 137 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c > b/drivers/gpu/drm/i2c/tda998x_drv.c index 9c78f7bde49c..012dee61d817 100644 > --- a/drivers/gpu/drm/i2c/tda998x_drv.c > +++ b/drivers/gpu/drm/i2c/tda998x_drv.c > @@ -36,6 +36,14 @@ struct tda998x_audio_port { > u8 config; /* AP value */ > }; > > +struct tda998x_priv; > + > +struct tda998x_bridge { > + struct tda998x_priv *priv; > + struct device *dev; > + struct drm_bridge bridge; > +}; > + > struct tda998x_priv { > struct i2c_client *cec; > struct i2c_client *hdmi; > @@ -63,6 +71,8 @@ struct tda998x_priv { > wait_queue_head_t edid_delay_waitq; > bool edid_delay_active; > > + struct tda998x_bridge *bridge; > + bool local_encoder; > struct drm_encoder encoder; > struct drm_connector connector; > > @@ -75,6 +85,9 @@ struct tda998x_priv { > #define enc_to_tda998x_priv(x) \ > container_of(x, struct tda998x_priv, encoder) > > +#define bridge_to_tda998x_bridge(x) \ > + container_of(x, struct tda998x_bridge, bridge) > + > /* The TDA9988 series of devices use a paged register scheme.. to simplify > * things we encode the page # in upper bits of the register #. To read/ > * write a given register, we need to make sure CURPAGE register is set > @@ -842,7 +855,8 @@ static int tda998x_audio_hw_params(struct device *dev, > void *data, struct hdmi_codec_daifmt *daifmt, > struct hdmi_codec_params *params) > { > - struct tda998x_priv *priv = dev_get_drvdata(dev); > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > + struct tda998x_priv *priv = bridge->priv; > int i, ret; > struct tda998x_audio_params audio = { > .sample_width = params->sample_width, > @@ -899,7 +913,8 @@ static int tda998x_audio_hw_params(struct device *dev, > void *data, > > static void tda998x_audio_shutdown(struct device *dev, void *data) > { > - struct tda998x_priv *priv = dev_get_drvdata(dev); > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > + struct tda998x_priv *priv = bridge->priv; > > mutex_lock(&priv->audio_mutex); > > @@ -912,7 +927,8 @@ static void tda998x_audio_shutdown(struct device *dev, > void *data) > > int tda998x_audio_digital_mute(struct device *dev, void *data, bool enable) > { > - struct tda998x_priv *priv = dev_get_drvdata(dev); > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > + struct tda998x_priv *priv = bridge->priv; > > mutex_lock(&priv->audio_mutex); > > @@ -925,7 +941,8 @@ int tda998x_audio_digital_mute(struct device *dev, void > *data, bool enable) static int tda998x_audio_get_eld(struct device *dev, > void *data, > uint8_t *buf, size_t len) > { > - struct tda998x_priv *priv = dev_get_drvdata(dev); > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > + struct tda998x_priv *priv = bridge->priv; > > mutex_lock(&priv->audio_mutex); > memcpy(buf, priv->connector.eld, > @@ -1126,7 +1143,10 @@ tda998x_connector_best_encoder(struct drm_connector > *connector) { > struct tda998x_priv *priv = conn_to_tda998x_priv(connector); > > - return &priv->encoder; > + if (priv->local_encoder) > + return &priv->encoder; > + else > + return priv->bridge->bridge.encoder; > } > > static > @@ -1140,6 +1160,7 @@ static int tda998x_connector_init(struct tda998x_priv > *priv, struct drm_device *drm) > { > struct drm_connector *connector = &priv->connector; > + struct drm_encoder *encoder; > int ret; > > connector->interlace_allowed = 1; > @@ -1156,7 +1177,8 @@ static int tda998x_connector_init(struct tda998x_priv > *priv, if (ret) > return ret; > > - drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder); > + encoder = tda998x_connector_best_encoder(&priv->connector); > + drm_mode_connector_attach_encoder(&priv->connector, encoder); > > return 0; > } > @@ -1668,8 +1690,10 @@ static void tda998x_set_config(struct tda998x_priv > *priv, priv->audio_params = p->audio_params; > } > > -static int tda998x_init(struct device *dev, struct drm_device *drm) > +static int tda998x_init(struct device *dev, struct drm_device *drm, > + bool local_encoder) > { > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > struct tda998x_encoder_params *params = dev->platform_data; > struct i2c_client *client = to_i2c_client(dev); > struct tda998x_priv *priv; > @@ -1680,7 +1704,9 @@ static int tda998x_init(struct device *dev, struct > drm_device *drm) if (!priv) > return -ENOMEM; > > - dev_set_drvdata(dev, priv); > + bridge->priv = priv; > + priv->bridge = bridge; > + priv->local_encoder = local_encoder; > > if (dev->of_node) > crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); > @@ -1691,7 +1717,8 @@ static int tda998x_init(struct device *dev, struct > drm_device *drm) crtcs = 1 << 0; > } > > - priv->encoder.possible_crtcs = crtcs; > + if (local_encoder) > + priv->encoder.possible_crtcs = crtcs; > > ret = tda998x_create(client, priv); > if (ret) > @@ -1700,11 +1727,15 @@ static int tda998x_init(struct device *dev, struct > drm_device *drm) if (!dev->of_node && params) > tda998x_set_config(priv, params); > > - drm_encoder_helper_add(&priv->encoder, &tda998x_encoder_helper_funcs); > - ret = drm_encoder_init(drm, &priv->encoder, &tda998x_encoder_funcs, > - DRM_MODE_ENCODER_TMDS, NULL); > - if (ret) > - goto err_encoder; > + if (local_encoder) { > + drm_encoder_helper_add(&priv->encoder, > + &tda998x_encoder_helper_funcs); > + ret = drm_encoder_init(drm, &priv->encoder, > + &tda998x_encoder_funcs, > + DRM_MODE_ENCODER_TMDS, NULL); > + if (ret) > + goto err_encoder; > + } > > ret = tda998x_connector_init(priv, drm); > if (ret) > @@ -1713,7 +1744,8 @@ static int tda998x_init(struct device *dev, struct > drm_device *drm) return 0; > > err_connector: > - drm_encoder_cleanup(&priv->encoder); > + if (local_encoder) > + drm_encoder_cleanup(&priv->encoder); > err_encoder: > tda998x_destroy(priv); > return ret; > @@ -1721,10 +1753,12 @@ static int tda998x_init(struct device *dev, struct > drm_device *drm) > > static void tda998x_fini(struct device *dev) > { > - struct tda998x_priv *priv = dev_get_drvdata(dev); > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > + struct tda998x_priv *priv = bridge->priv; > > drm_connector_cleanup(&priv->connector); > - drm_encoder_cleanup(&priv->encoder); > + if (priv->local_encoder) > + drm_encoder_cleanup(&priv->encoder); > tda998x_destroy(priv); > } > > @@ -1732,7 +1766,7 @@ static int tda998x_bind(struct device *dev, struct > device *master, void *data) { > struct drm_device *drm = data; > > - return tda998x_init(dev, drm); > + return tda998x_init(dev, drm, true); > } > > static void tda998x_unbind(struct device *dev, struct device *master, > @@ -1746,19 +1780,102 @@ static const struct component_ops tda998x_ops = { > .unbind = tda998x_unbind, > }; > > +/* DRM bridge functions */ > + > +static int tda998x_bridge_attach(struct drm_bridge *dbridge) > +{ > + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); > + struct device *dev = bridge->dev; > + struct drm_device *drm = bridge->bridge.dev; > + > + dev_info(dev, "attach\n"); You can drop all the dev_info messages. > + return tda998x_init(dev, drm, false); > +} > + > +static void tda998x_bridge_detach(struct drm_bridge *dbridge) > +{ > + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); > + struct device *dev = bridge->dev; > + > + dev_info(dev, "detach\n"); > + tda998x_fini(dev); > +} > + > +static void tda998x_bridge_enable(struct drm_bridge *dbridge) > +{ > + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); > + struct tda998x_priv *priv = bridge->priv; > + > + dev_info(bridge->dev, "enable\n"); > + tda998x_dpms(priv, DRM_MODE_DPMS_ON); > +} > + > +static void tda998x_bridge_disable(struct drm_bridge *dbridge) > +{ > + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); > + struct tda998x_priv *priv = bridge->priv; > + > + dev_info(bridge->dev, "disable\n"); > + tda998x_dpms(priv, DRM_MODE_DPMS_OFF); > +} > + > +static void tda998x_bridge_mode_set(struct drm_bridge *dbridge, > + struct drm_display_mode *mode, > + struct drm_display_mode *adjusted_mode) > +{ > + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); > + struct tda998x_priv *priv = bridge->priv; > + > + tda998x_mode_set(priv, mode, adjusted_mode); > +} > + > +static const struct drm_bridge_funcs tda998x_bridge_funcs = { > + .attach = tda998x_bridge_attach, > + .detach = tda998x_bridge_detach, > + .enable = tda998x_bridge_enable, > + .disable = tda998x_bridge_disable, > + .mode_set = tda998x_bridge_mode_set, > +}; > + > static int > tda998x_probe(struct i2c_client *client, const struct i2c_device_id *id) > { > + struct device *dev = &client->dev; > + struct tda998x_bridge *bridge; > + int ret; > + > if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { > dev_warn(&client->dev, "adapter does not support I2C\n"); > return -EIO; > } > - return component_add(&client->dev, &tda998x_ops); > + > + bridge = devm_kzalloc(dev, sizeof(*bridge), GFP_KERNEL); > + if (!bridge) > + return -ENOMEM; > + > + bridge->dev = dev; > + dev_set_drvdata(dev, bridge); > + > + bridge->bridge.funcs = &tda998x_bridge_funcs; > + bridge->bridge.of_node = dev->of_node; > + drm_bridge_add(&bridge->bridge); > + > + ret = component_add(dev, &tda998x_ops); > + > + if (ret) > + drm_bridge_remove(&bridge->bridge); > + > + return ret; > } > > static int tda998x_remove(struct i2c_client *client) > { > - component_del(&client->dev, &tda998x_ops); > + struct device *dev = &client->dev; > + struct tda998x_bridge *bridge = dev_get_drvdata(dev); > + > + drm_bridge_remove(&bridge->bridge); > + component_del(dev, &tda998x_ops); > + > return 0; > }
On Fri, Apr 20, 2018 at 01:06:49PM +0300, Laurent Pinchart wrote: > Hi Peter, > > Thank you for the patch. > > On Thursday, 19 April 2018 19:27:51 EEST Peter Rosin wrote: > > This makes this driver work with all(?) drivers that are not > > componentized and instead expect to connect to a panel/bridge. That > > said, the only one tested is atmel_hlcdc. > > > > This hooks the relevant work function previously called by the encoder > > and the component also to the bridge, since the encoder goes away when > > connecting to the bridge interface of the driver and the equivalent of > > bind/unbind of the component is handled by bridge attach/detach. > > > > The lifetime requirements of a bridge and a component are slightly > > different, which is the reason for struct tda998x_bridge. > > Couldn't you move the allocation and initialization (tda998x_create) of the > tda998x_priv structure to probe time ? I think you wouldn't need a separate > structure in that case. Unless I'm mistaken there would be an added benefit of > separating component and bridge initialization, resulting in the encoder not > being initialized at all if the component isn't used. You wouldn't need to add > a local_encoder parameter to the tda998x_init() function. No, I don't like that idea one bit, as I've stated in the past about the component API. The same (probably) goes for the bridge stuff too. Consider the following: Your DRM system is initialised. You then remove a module, which results in the DRM system being torn down. You re-insert the module (eg, having made a change to it). The DRM system is then re-initialised. At this point, what is the state of variables such as priv->is_on if you allocate the structure at probe time? What about all the other variables in the driver private structure - are you sure that the driver can cope with random values from the previous "usage" remaining there? At the moment, this isn't a concern for the driver because we dev_kzalloc() the structure in the bind callback. Move that to the probe function, and the structure is no longer re-initialised each time, and so it retains the previous state. The driver is not setup to cope with that. So, to work around that, you would need to reinitialise _everything_ in the structure that the driver requires, which IMHO is a very open to bugs (eg, if a member is missed, or added without the necessary re-initialisation), _especially_ when this is not a path that will get regular testing. If you want to do this for a subset of data, it would be much better to separate them into independent structures (maybe one embedded into the other) so that this problem can not occur. That way, a subset of the data can be memset() when bound to the rest of the DRM system ensuring a consistent driver state and still achieve what you're suggesting.
Hi Peter,
I love your patch! Yet something to improve:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on v4.17-rc1 next-20180420]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Peter-Rosin/Add-tda998x-HDMI-support-to-atmel-hlcdc/20180420-160131
base: git://people.freedesktop.org/~airlied/linux.git drm-next
config: i386-randconfig-a0-201815 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
drivers/gpu/drm/i2c/tda998x_drv.c: In function 'tda998x_probe':
>> drivers/gpu/drm/i2c/tda998x_drv.c:1859:16: error: 'struct drm_bridge' has no member named 'of_node'
bridge->bridge.of_node = dev->of_node;
^
vim +1859 drivers/gpu/drm/i2c/tda998x_drv.c
1838
1839 static int
1840 tda998x_probe(struct i2c_client *client, const struct i2c_device_id *id)
1841 {
1842 struct device *dev = &client->dev;
1843 struct tda998x_bridge *bridge;
1844 int ret;
1845
1846 if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
1847 dev_warn(&client->dev, "adapter does not support I2C\n");
1848 return -EIO;
1849 }
1850
1851 bridge = devm_kzalloc(dev, sizeof(*bridge), GFP_KERNEL);
1852 if (!bridge)
1853 return -ENOMEM;
1854
1855 bridge->dev = dev;
1856 dev_set_drvdata(dev, bridge);
1857
1858 bridge->bridge.funcs = &tda998x_bridge_funcs;
> 1859 bridge->bridge.of_node = dev->of_node;
1860 drm_bridge_add(&bridge->bridge);
1861
1862 ret = component_add(dev, &tda998x_ops);
1863
1864 if (ret)
1865 drm_bridge_remove(&bridge->bridge);
1866
1867 return ret;
1868 }
1869
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On 2018-04-20 12:41, kbuild test robot wrote: > Hi Peter, > > I love your patch! Yet something to improve: Yup, right you are! > [auto build test ERROR on drm/drm-next] > [also build test ERROR on v4.17-rc1 next-20180420] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/Peter-Rosin/Add-tda998x-HDMI-support-to-atmel-hlcdc/20180420-160131 > base: git://people.freedesktop.org/~airlied/linux.git drm-next > config: i386-randconfig-a0-201815 (attached as .config) > compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > All errors (new ones prefixed by >>): > > drivers/gpu/drm/i2c/tda998x_drv.c: In function 'tda998x_probe': >>> drivers/gpu/drm/i2c/tda998x_drv.c:1859:16: error: 'struct drm_bridge' has no member named 'of_node' > bridge->bridge.of_node = dev->of_node; > ^ Anybody got a better fix than this? #ifdef CONFIG_OF bridge->bridge.of_node = dev->of_node; #endif Cheers, Peter
On Fri, Apr 20, 2018 at 12:49:42PM +0200, Peter Rosin wrote: > On 2018-04-20 12:41, kbuild test robot wrote: > > Hi Peter, > > > > I love your patch! Yet something to improve: > > Yup, right you are! > > > [auto build test ERROR on drm/drm-next] > > [also build test ERROR on v4.17-rc1 next-20180420] > > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > > > url: https://github.com/0day-ci/linux/commits/Peter-Rosin/Add-tda998x-HDMI-support-to-atmel-hlcdc/20180420-160131 > > base: git://people.freedesktop.org/~airlied/linux.git drm-next > > config: i386-randconfig-a0-201815 (attached as .config) > > compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 > > reproduce: > > # save the attached .config to linux build tree > > make ARCH=i386 > > > > All errors (new ones prefixed by >>): > > > > drivers/gpu/drm/i2c/tda998x_drv.c: In function 'tda998x_probe': > >>> drivers/gpu/drm/i2c/tda998x_drv.c:1859:16: error: 'struct drm_bridge' has no member named 'of_node' > > bridge->bridge.of_node = dev->of_node; > > ^ > > Anybody got a better fix than this? > > #ifdef CONFIG_OF > bridge->bridge.of_node = dev->of_node; > #endif How about the bridge code provides a helper to do this, something like: static inline void bridge_set_device(struct drm_bridge *bridge, struct device *dev) { #ifdef CONFIG_OF bridge->of_node = dev->of_node; #endif } which (a) nicely hides the firmware flavour, and (b) hides the ifdef in the bridge header where it belongs. If the bridge code needs to be converted to fwnode in the future, at least this would be abstracted from the drivers.
On 2018-04-20 12:53, Russell King - ARM Linux wrote: > On Fri, Apr 20, 2018 at 12:49:42PM +0200, Peter Rosin wrote: >> On 2018-04-20 12:41, kbuild test robot wrote: >>> Hi Peter, >>> >>> I love your patch! Yet something to improve: >> >> Yup, right you are! >> >>> [auto build test ERROR on drm/drm-next] >>> [also build test ERROR on v4.17-rc1 next-20180420] >>> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] >>> >>> url: https://github.com/0day-ci/linux/commits/Peter-Rosin/Add-tda998x-HDMI-support-to-atmel-hlcdc/20180420-160131 >>> base: git://people.freedesktop.org/~airlied/linux.git drm-next >>> config: i386-randconfig-a0-201815 (attached as .config) >>> compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 >>> reproduce: >>> # save the attached .config to linux build tree >>> make ARCH=i386 >>> >>> All errors (new ones prefixed by >>): >>> >>> drivers/gpu/drm/i2c/tda998x_drv.c: In function 'tda998x_probe': >>>>> drivers/gpu/drm/i2c/tda998x_drv.c:1859:16: error: 'struct drm_bridge' has no member named 'of_node' >>> bridge->bridge.of_node = dev->of_node; >>> ^ >> >> Anybody got a better fix than this? >> >> #ifdef CONFIG_OF >> bridge->bridge.of_node = dev->of_node; >> #endif > > How about the bridge code provides a helper to do this, something like: > > static inline void bridge_set_device(struct drm_bridge *bridge, > struct device *dev) > { > #ifdef CONFIG_OF > bridge->of_node = dev->of_node; > #endif > } > > which (a) nicely hides the firmware flavour, and (b) hides the ifdef in > the bridge header where it belongs. If the bridge code needs to be > converted to fwnode in the future, at least this would be abstracted > from the drivers. > Hmm, I looked around and found numerous other #ifdefs for this, so my plan is to just add one more. Fixing up all these ifdefs is orthogonal and can be done later. Cheers, Peter PS. I also noted that I had forgotten to remove a couple of dev_info calls in this patch. Will remove for v4.
On 2018-04-20 12:24, Russell King - ARM Linux wrote: > On Fri, Apr 20, 2018 at 01:06:49PM +0300, Laurent Pinchart wrote: >> Hi Peter, >> >> Thank you for the patch. >> >> On Thursday, 19 April 2018 19:27:51 EEST Peter Rosin wrote: >>> This makes this driver work with all(?) drivers that are not >>> componentized and instead expect to connect to a panel/bridge. That >>> said, the only one tested is atmel_hlcdc. >>> >>> This hooks the relevant work function previously called by the encoder >>> and the component also to the bridge, since the encoder goes away when >>> connecting to the bridge interface of the driver and the equivalent of >>> bind/unbind of the component is handled by bridge attach/detach. >>> >>> The lifetime requirements of a bridge and a component are slightly >>> different, which is the reason for struct tda998x_bridge. >> >> Couldn't you move the allocation and initialization (tda998x_create) of the >> tda998x_priv structure to probe time ? I think you wouldn't need a separate >> structure in that case. Unless I'm mistaken there would be an added benefit of >> separating component and bridge initialization, resulting in the encoder not >> being initialized at all if the component isn't used. You wouldn't need to add >> a local_encoder parameter to the tda998x_init() function. > > No, I don't like that idea one bit, as I've stated in the past about the > component API. The same (probably) goes for the bridge stuff too. > > Consider the following: > > Your DRM system is initialised. You then remove a module, which results > in the DRM system being torn down. You re-insert the module (eg, having > made a change to it). The DRM system is then re-initialised. > > At this point, what is the state of variables such as priv->is_on if > you allocate the structure at probe time? > > What about all the other variables in the driver private structure - are > you sure that the driver can cope with random values from the previous > "usage" remaining there? > > At the moment, this isn't a concern for the driver because we > dev_kzalloc() the structure in the bind callback. Move that to the > probe function, and the structure is no longer re-initialised each > time, and so it retains the previous state. The driver is not setup > to cope with that. > > So, to work around that, you would need to reinitialise _everything_ > in the structure that the driver requires, which IMHO is a very > open to bugs (eg, if a member is missed, or added without the > necessary re-initialisation), _especially_ when this is not a path > that will get regular testing. > > If you want to do this for a subset of data, it would be much better > to separate them into independent structures (maybe one embedded into > the other) so that this problem can not occur. That way, a subset > of the data can be memset() when bound to the rest of the DRM system > ensuring a consistent driver state and still achieve what you're > suggesting. This was the exact reason I added struct tda998x_bridge. It seemed very risky to move the tda998x_create call (or some of its meat) to the probe function. Even if that could be done I think it should definitely be a separate patch. Cheers, Peter
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 9c78f7bde49c..012dee61d817 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -36,6 +36,14 @@ struct tda998x_audio_port { u8 config; /* AP value */ }; +struct tda998x_priv; + +struct tda998x_bridge { + struct tda998x_priv *priv; + struct device *dev; + struct drm_bridge bridge; +}; + struct tda998x_priv { struct i2c_client *cec; struct i2c_client *hdmi; @@ -63,6 +71,8 @@ struct tda998x_priv { wait_queue_head_t edid_delay_waitq; bool edid_delay_active; + struct tda998x_bridge *bridge; + bool local_encoder; struct drm_encoder encoder; struct drm_connector connector; @@ -75,6 +85,9 @@ struct tda998x_priv { #define enc_to_tda998x_priv(x) \ container_of(x, struct tda998x_priv, encoder) +#define bridge_to_tda998x_bridge(x) \ + container_of(x, struct tda998x_bridge, bridge) + /* The TDA9988 series of devices use a paged register scheme.. to simplify * things we encode the page # in upper bits of the register #. To read/ * write a given register, we need to make sure CURPAGE register is set @@ -842,7 +855,8 @@ static int tda998x_audio_hw_params(struct device *dev, void *data, struct hdmi_codec_daifmt *daifmt, struct hdmi_codec_params *params) { - struct tda998x_priv *priv = dev_get_drvdata(dev); + struct tda998x_bridge *bridge = dev_get_drvdata(dev); + struct tda998x_priv *priv = bridge->priv; int i, ret; struct tda998x_audio_params audio = { .sample_width = params->sample_width, @@ -899,7 +913,8 @@ static int tda998x_audio_hw_params(struct device *dev, void *data, static void tda998x_audio_shutdown(struct device *dev, void *data) { - struct tda998x_priv *priv = dev_get_drvdata(dev); + struct tda998x_bridge *bridge = dev_get_drvdata(dev); + struct tda998x_priv *priv = bridge->priv; mutex_lock(&priv->audio_mutex); @@ -912,7 +927,8 @@ static void tda998x_audio_shutdown(struct device *dev, void *data) int tda998x_audio_digital_mute(struct device *dev, void *data, bool enable) { - struct tda998x_priv *priv = dev_get_drvdata(dev); + struct tda998x_bridge *bridge = dev_get_drvdata(dev); + struct tda998x_priv *priv = bridge->priv; mutex_lock(&priv->audio_mutex); @@ -925,7 +941,8 @@ int tda998x_audio_digital_mute(struct device *dev, void *data, bool enable) static int tda998x_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len) { - struct tda998x_priv *priv = dev_get_drvdata(dev); + struct tda998x_bridge *bridge = dev_get_drvdata(dev); + struct tda998x_priv *priv = bridge->priv; mutex_lock(&priv->audio_mutex); memcpy(buf, priv->connector.eld, @@ -1126,7 +1143,10 @@ tda998x_connector_best_encoder(struct drm_connector *connector) { struct tda998x_priv *priv = conn_to_tda998x_priv(connector); - return &priv->encoder; + if (priv->local_encoder) + return &priv->encoder; + else + return priv->bridge->bridge.encoder; } static @@ -1140,6 +1160,7 @@ static int tda998x_connector_init(struct tda998x_priv *priv, struct drm_device *drm) { struct drm_connector *connector = &priv->connector; + struct drm_encoder *encoder; int ret; connector->interlace_allowed = 1; @@ -1156,7 +1177,8 @@ static int tda998x_connector_init(struct tda998x_priv *priv, if (ret) return ret; - drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder); + encoder = tda998x_connector_best_encoder(&priv->connector); + drm_mode_connector_attach_encoder(&priv->connector, encoder); return 0; } @@ -1668,8 +1690,10 @@ static void tda998x_set_config(struct tda998x_priv *priv, priv->audio_params = p->audio_params; } -static int tda998x_init(struct device *dev, struct drm_device *drm) +static int tda998x_init(struct device *dev, struct drm_device *drm, + bool local_encoder) { + struct tda998x_bridge *bridge = dev_get_drvdata(dev); struct tda998x_encoder_params *params = dev->platform_data; struct i2c_client *client = to_i2c_client(dev); struct tda998x_priv *priv; @@ -1680,7 +1704,9 @@ static int tda998x_init(struct device *dev, struct drm_device *drm) if (!priv) return -ENOMEM; - dev_set_drvdata(dev, priv); + bridge->priv = priv; + priv->bridge = bridge; + priv->local_encoder = local_encoder; if (dev->of_node) crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); @@ -1691,7 +1717,8 @@ static int tda998x_init(struct device *dev, struct drm_device *drm) crtcs = 1 << 0; } - priv->encoder.possible_crtcs = crtcs; + if (local_encoder) + priv->encoder.possible_crtcs = crtcs; ret = tda998x_create(client, priv); if (ret) @@ -1700,11 +1727,15 @@ static int tda998x_init(struct device *dev, struct drm_device *drm) if (!dev->of_node && params) tda998x_set_config(priv, params); - drm_encoder_helper_add(&priv->encoder, &tda998x_encoder_helper_funcs); - ret = drm_encoder_init(drm, &priv->encoder, &tda998x_encoder_funcs, - DRM_MODE_ENCODER_TMDS, NULL); - if (ret) - goto err_encoder; + if (local_encoder) { + drm_encoder_helper_add(&priv->encoder, + &tda998x_encoder_helper_funcs); + ret = drm_encoder_init(drm, &priv->encoder, + &tda998x_encoder_funcs, + DRM_MODE_ENCODER_TMDS, NULL); + if (ret) + goto err_encoder; + } ret = tda998x_connector_init(priv, drm); if (ret) @@ -1713,7 +1744,8 @@ static int tda998x_init(struct device *dev, struct drm_device *drm) return 0; err_connector: - drm_encoder_cleanup(&priv->encoder); + if (local_encoder) + drm_encoder_cleanup(&priv->encoder); err_encoder: tda998x_destroy(priv); return ret; @@ -1721,10 +1753,12 @@ static int tda998x_init(struct device *dev, struct drm_device *drm) static void tda998x_fini(struct device *dev) { - struct tda998x_priv *priv = dev_get_drvdata(dev); + struct tda998x_bridge *bridge = dev_get_drvdata(dev); + struct tda998x_priv *priv = bridge->priv; drm_connector_cleanup(&priv->connector); - drm_encoder_cleanup(&priv->encoder); + if (priv->local_encoder) + drm_encoder_cleanup(&priv->encoder); tda998x_destroy(priv); } @@ -1732,7 +1766,7 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data) { struct drm_device *drm = data; - return tda998x_init(dev, drm); + return tda998x_init(dev, drm, true); } static void tda998x_unbind(struct device *dev, struct device *master, @@ -1746,19 +1780,102 @@ static const struct component_ops tda998x_ops = { .unbind = tda998x_unbind, }; +/* DRM bridge functions */ + +static int tda998x_bridge_attach(struct drm_bridge *dbridge) +{ + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); + struct device *dev = bridge->dev; + struct drm_device *drm = bridge->bridge.dev; + + dev_info(dev, "attach\n"); + return tda998x_init(dev, drm, false); +} + +static void tda998x_bridge_detach(struct drm_bridge *dbridge) +{ + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); + struct device *dev = bridge->dev; + + dev_info(dev, "detach\n"); + tda998x_fini(dev); +} + +static void tda998x_bridge_enable(struct drm_bridge *dbridge) +{ + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); + struct tda998x_priv *priv = bridge->priv; + + dev_info(bridge->dev, "enable\n"); + tda998x_dpms(priv, DRM_MODE_DPMS_ON); +} + +static void tda998x_bridge_disable(struct drm_bridge *dbridge) +{ + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); + struct tda998x_priv *priv = bridge->priv; + + dev_info(bridge->dev, "disable\n"); + tda998x_dpms(priv, DRM_MODE_DPMS_OFF); +} + +static void tda998x_bridge_mode_set(struct drm_bridge *dbridge, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + struct tda998x_bridge *bridge = bridge_to_tda998x_bridge(dbridge); + struct tda998x_priv *priv = bridge->priv; + + tda998x_mode_set(priv, mode, adjusted_mode); +} + +static const struct drm_bridge_funcs tda998x_bridge_funcs = { + .attach = tda998x_bridge_attach, + .detach = tda998x_bridge_detach, + .enable = tda998x_bridge_enable, + .disable = tda998x_bridge_disable, + .mode_set = tda998x_bridge_mode_set, +}; + static int tda998x_probe(struct i2c_client *client, const struct i2c_device_id *id) { + struct device *dev = &client->dev; + struct tda998x_bridge *bridge; + int ret; + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { dev_warn(&client->dev, "adapter does not support I2C\n"); return -EIO; } - return component_add(&client->dev, &tda998x_ops); + + bridge = devm_kzalloc(dev, sizeof(*bridge), GFP_KERNEL); + if (!bridge) + return -ENOMEM; + + bridge->dev = dev; + dev_set_drvdata(dev, bridge); + + bridge->bridge.funcs = &tda998x_bridge_funcs; + bridge->bridge.of_node = dev->of_node; + drm_bridge_add(&bridge->bridge); + + ret = component_add(dev, &tda998x_ops); + + if (ret) + drm_bridge_remove(&bridge->bridge); + + return ret; } static int tda998x_remove(struct i2c_client *client) { - component_del(&client->dev, &tda998x_ops); + struct device *dev = &client->dev; + struct tda998x_bridge *bridge = dev_get_drvdata(dev); + + drm_bridge_remove(&bridge->bridge); + component_del(dev, &tda998x_ops); + return 0; }
This makes this driver work with all(?) drivers that are not componentized and instead expect to connect to a panel/bridge. That said, the only one tested is atmel_hlcdc. This hooks the relevant work function previously called by the encoder and the component also to the bridge, since the encoder goes away when connecting to the bridge interface of the driver and the equivalent of bind/unbind of the component is handled by bridge attach/detach. The lifetime requirements of a bridge and a component are slightly different, which is the reason for struct tda998x_bridge. Signed-off-by: Peter Rosin <peda@axentia.se> --- drivers/gpu/drm/i2c/tda998x_drv.c | 157 +++++++++++++++++++++++++++++++++----- 1 file changed, 137 insertions(+), 20 deletions(-)