| From f6e9751f27fe8a40cc5d3e6df1edb37ff8ab851e Mon Sep 17 00:00:00 2001 |
| From: John Stultz <john.stultz@linaro.org> |
| Date: Mon, 16 Jan 2017 16:52:51 -0800 |
| Subject: [PATCH 006/255] drm/bridge: adv7511: Reuse __adv7511_power_on/off() |
| when probing EDID |
| |
| Thus this patch changes the EDID probing logic so that we |
| re-use the __adv7511_power_on/off() calls instead of duplciating |
| logic. |
| |
| This does change behavior slightly as it adds the HPD signal |
| pulse to the EDID probe path, but Archit has had a patch to |
| add HPD signal pulse to the EDID probe path before, so this |
| should address the cases where that helped. Another difference |
| is that regcache_mark_dirty() is also called in the power off |
| path once EDID is probed. |
| |
| Cc: David Airlie <airlied@linux.ie> |
| Cc: Archit Taneja <architt@codeaurora.org> |
| Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Cc: Lars-Peter Clausen <lars@metafoo.de> |
| Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Cc: dri-devel@lists.freedesktop.org |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: John Stultz <john.stultz@linaro.org> |
| Signed-off-by: Archit Taneja <architt@codeaurora.org> |
| Link: http://patchwork.freedesktop.org/patch/msgid/1484614372-15342-6-git-send-email-john.stultz@linaro.org |
| (cherry picked from commit 4226d9b127cf4758ba0e07931b3f0d59f1b1a50c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +++-------------- |
| 1 file changed, 3 insertions(+), 14 deletions(-) |
| |
| --- 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 adv7 |
| unsigned int count; |
| |
| /* Reading the EDID only works if the device is powered */ |
| - if (!adv7511->powered) { |
| - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, |
| - ADV7511_POWER_POWER_DOWN, 0); |
| - if (adv7511->i2c_main->irq) { |
| - regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(0), |
| - ADV7511_INT0_EDID_READY); |
| - regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(1), |
| - ADV7511_INT1_DDC_ERROR); |
| - } |
| - adv7511->current_edid_segment = -1; |
| - } |
| + if (!adv7511->powered) |
| + __adv7511_power_on(adv7511); |
| |
| edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); |
| |
| if (!adv7511->powered) |
| - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, |
| - ADV7511_POWER_POWER_DOWN, |
| - ADV7511_POWER_POWER_DOWN); |
| + __adv7511_power_off(adv7511); |
| |
| kfree(adv7511->edid); |
| adv7511->edid = edid; |