[PATCH] megachips-stdpxxxx-ge-b850v3-fw: Fix drm bridge initialization

[PATCH] megachips-stdpxxxx-ge-b850v3-fw: Fix drm bridge initialization

[Peter Senna Tschudin]

Reordering of the device nodes based on unit address resulted in
ge_b850v3_lvds_attach() being called before
ge_b850v3_lvds_ptr->stdp4028_i2c was populated.

This patch moves the drm bridge initialization from
ge_b850v3_lvds_init() to stdp4028_ge_b850v3_fw_probe() ensuring that
ge_b850v3_lvds_ptr->stdp4028_i2c is properly populated.

Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
 drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index e53c243..b9f32e8 100644
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -279,10 +279,6 @@ static int ge_b850v3_lvds_init(struct device *dev)
 		return -ENOMEM;
 	}
 
-	ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;
-	ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;
-	drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);
-
 success:
 	mutex_unlock(&ge_b850v3_lvds_dev_mutex);
 	return 0;
@@ -317,6 +313,11 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c,
 	ge_b850v3_lvds_ptr->stdp4028_i2c = stdp4028_i2c;
 	i2c_set_clientdata(stdp4028_i2c, ge_b850v3_lvds_ptr);
 
+	/* drm bridge initialization */
+	ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;
+	ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;
+	drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);
+
 	/* Clear pending interrupts since power up. */
 	i2c_smbus_write_word_data(stdp4028_i2c,
 				  STDP4028_DPTX_IRQ_STS_REG,
-- 
2.9.3

Re: [PATCH] megachips-stdpxxxx-ge-b850v3-fw: Fix drm bridge initialization

[Archit Taneja]

On 03/30/2017 01:49 PM, Peter Senna Tschudin wrote:
> Reordering of the device nodes based on unit address resulted in
> ge_b850v3_lvds_attach() being called before
> ge_b850v3_lvds_ptr->stdp4028_i2c was populated.
>
> This patch moves the drm bridge initialization from
> ge_b850v3_lvds_init() to stdp4028_ge_b850v3_fw_probe() ensuring that
> ge_b850v3_lvds_ptr->stdp4028_i2c is properly populated.

queued to drm-misc-next

Archit

>
> Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
> ---
>  drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index e53c243..b9f32e8 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -279,10 +279,6 @@ static int ge_b850v3_lvds_init(struct device *dev)
>  		return -ENOMEM;
>  	}
>
> -	ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;
> -	ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;
> -	drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);
> -
>  success:
>  	mutex_unlock(&ge_b850v3_lvds_dev_mutex);
>  	return 0;
> @@ -317,6 +313,11 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c,
>  	ge_b850v3_lvds_ptr->stdp4028_i2c = stdp4028_i2c;
>  	i2c_set_clientdata(stdp4028_i2c, ge_b850v3_lvds_ptr);
>
> +	/* drm bridge initialization */
> +	ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;
> +	ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;
> +	drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);
> +
>  	/* Clear pending interrupts since power up. */
>  	i2c_smbus_write_word_data(stdp4028_i2c,
>  				  STDP4028_DPTX_IRQ_STS_REG,
>

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project