[PATCH] Revert "drm/i2c: tda998x: don't register the connector"
Sean Paul
seanpaul at chromium.org
Fri Sep 23 11:05:10 UTC 2016
On Fri, Sep 23, 2016 at 2:32 AM, <liviu.dudau at arm.com> wrote:
> On Fri, Sep 23, 2016 at 12:18:12AM -0700, Sean Paul wrote:
>> This reverts commit 6a2925ea12006911c8180a89feda6d040873ed18.
>>
>> commit 6a2925ea12006911c8180a89feda6d040873ed18
>> Author: Brian Starkey <brian.starkey at arm.com>
>> Date: Mon Jul 25 11:55:48 2016 +0100
>>
>> drm/i2c: tda998x: don't register the connector
>>
>> [seanpaul]
>> Patch isn't fully baked, and apparently causing issues in hdlcd. Revert
>> until this is sorted.
>
> I would argue that the comment is not correct, patch is fine, it is
> just the dependent code is not ready to work with the patch.
>
> Otherwise, thanks for doing this and sorry for the noise.
>
Applied to drm-misc
Sean
> Best regards,
> Liviu
>
>>
>> Signed-off-by: Sean Paul <seanpaul at chromium.org>
>> ---
>> drivers/gpu/drm/i2c/tda998x_drv.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
>> index 088900d..9798d40 100644
>> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
>> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
>> @@ -1584,6 +1584,7 @@ const struct drm_connector_helper_funcs tda998x_connector_helper_funcs = {
>>
>> static void tda998x_connector_destroy(struct drm_connector *connector)
>> {
>> + drm_connector_unregister(connector);
>> drm_connector_cleanup(connector);
>> }
>>
>> @@ -1655,10 +1656,16 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data)
>> if (ret)
>> goto err_connector;
>>
>> + ret = drm_connector_register(&priv->connector);
>> + if (ret)
>> + goto err_sysfs;
>> +
>> drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
>>
>> return 0;
>>
>> +err_sysfs:
>> + drm_connector_cleanup(&priv->connector);
>> err_connector:
>> drm_encoder_cleanup(&priv->encoder);
>> err_encoder:
>> @@ -1671,6 +1678,7 @@ static void tda998x_unbind(struct device *dev, struct device *master,
>> {
>> struct tda998x_priv *priv = dev_get_drvdata(dev);
>>
>> + drm_connector_unregister(&priv->connector);
>> drm_connector_cleanup(&priv->connector);
>> drm_encoder_cleanup(&priv->encoder);
>> tda998x_destroy(priv);
>> --
>> 2.8.0.rc3.226.g39d4020
>>
>
> --
> ====================
> | I would like to |
> | fix the world, |
> | but they're not |
> | giving me the |
> \ source code! /
> ---------------
> ¯\_(ツ)_/¯
More information about the dri-devel
mailing list