Revert "UBUNTU: SAUCE: (snapdragon) drm/bridge/adv7511: Delay clearing of HPD interru...

BugLink: https://bugs.launchpad.net/bugs/1820868
This reverts commit bf4401ccee6c18eee5d2f176e2aa7298fa0c0cd8.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 9e522e407dc895bca3f85dd4334a9cb2984ece89..85c2d407a52e1a5476b3269d13655606d10478fd 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -462,16 +462,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)
        if (ret < 0)
                return ret;
 
-       /*
-        * Don't clear HPD flag right now, let it be cleared later in
-        * adv7511_detect(). If we don't do this, adv7511_detect
-        * (i.e. the connector's detect op) doesn't realize that we need to
-        * re-enable the display.
-        *
-        * Problem with this fix: Can not clearing this flag before returning
-        * IRQ_HANDLED cause spurious interrupts?
-        */
-       regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0 & ~ADV7511_INT0_HPD);
+       regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0);
        regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1);
 
        if (process_hpd && irq0 & ADV7511_INT0_HPD && adv7511->bridge.encoder)