]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/vc4: Let gpiolib know that we're OK with sleeping for HPD.
authorEric Anholt <eric@anholt.net>
Tue, 1 Mar 2016 01:53:00 +0000 (17:53 -0800)
committerEric Anholt <eric@anholt.net>
Mon, 14 Mar 2016 00:06:36 +0000 (17:06 -0700)
Fixes an error thrown every few seconds when we poll HPD when it's on
a I2C to GPIO expander.

Signed-off-by: Eric Anholt <eric@anholt.net>
Tested-by: Daniel Stone <daniels@collabora.com>
drivers/gpu/drm/vc4/vc4_hdmi.c

index 56272ca98ab7b4528769437317b54f6cc65251a5..6bcf51d16a1d7eb18a9826140c743c296863a598 100644 (file)
@@ -166,7 +166,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
        if (vc4->hdmi->hpd_gpio) {
-               if (gpio_get_value(vc4->hdmi->hpd_gpio))
+               if (gpio_get_value_cansleep(vc4->hdmi->hpd_gpio))
                        return connector_status_connected;
                else
                        return connector_status_disconnected;