aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/bridge/adv7511/adv7511_drv.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 545ceff5890f..17b9e98b151b 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -573,24 +573,13 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
573 unsigned int count; 573 unsigned int count;
574 574
575 /* Reading the EDID only works if the device is powered */ 575 /* Reading the EDID only works if the device is powered */
576 if (!adv7511->powered) { 576 if (!adv7511->powered)
577 regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, 577 __adv7511_power_on(adv7511);
578 ADV7511_POWER_POWER_DOWN, 0);
579 if (adv7511->i2c_main->irq) {
580 regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(0),
581 ADV7511_INT0_EDID_READY);
582 regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(1),
583 ADV7511_INT1_DDC_ERROR);
584 }
585 adv7511->current_edid_segment = -1;
586 }
587 578
588 edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); 579 edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511);
589 580
590 if (!adv7511->powered) 581 if (!adv7511->powered)
591 regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, 582 __adv7511_power_off(adv7511);
592 ADV7511_POWER_POWER_DOWN,
593 ADV7511_POWER_POWER_DOWN);
594 583
595 kfree(adv7511->edid); 584 kfree(adv7511->edid);
596 adv7511->edid = edid; 585 adv7511->edid = edid;