OSDN Git Service

drm/bridge: megachips-stdpxxxx-ge-b850v3-fw: Fix bridge initialization
authorPeter Senna Tschudin <peter.senna@collabora.com>
Thu, 30 Mar 2017 08:19:28 +0000 (10:19 +0200)
committerArchit Taneja <architt@codeaurora.org>
Mon, 3 Apr 2017 04:28:05 +0000 (09:58 +0530)
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>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330081928.8537-1-peter.senna@collabora.com
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c

index cfc606a..11f1108 100644 (file)
@@ -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,