These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / tegra / output.c

diff --git a/kernel/drivers/gpu/drm/tegra/output.c b/kernel/drivers/gpu/drm/tegra/output.c
index 37db479..46664b6 100644 (file)
--- a/kernel/drivers/gpu/drm/tegra/output.c
+++ b/kernel/drivers/gpu/drm/tegra/output.c
@@ -7,8 +7,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/of_gpio.h>
-
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_panel.h>
 #include "drm.h"
@@ -59,10 +57,17 @@ tegra_output_connector_detect(struct drm_connector *connector, bool force)
        enum drm_connector_status status = connector_status_unknown;
 
        if (gpio_is_valid(output->hpd_gpio)) {
-               if (gpio_get_value(output->hpd_gpio) == 0)
-                       status = connector_status_disconnected;
-               else
-                       status = connector_status_connected;
+               if (output->hpd_gpio_flags & OF_GPIO_ACTIVE_LOW) {
+                       if (gpio_get_value(output->hpd_gpio) != 0)
+                               status = connector_status_disconnected;
+                       else
+                               status = connector_status_connected;
+               } else {
+                       if (gpio_get_value(output->hpd_gpio) == 0)
+                               status = connector_status_disconnected;
+                       else
+                               status = connector_status_connected;
+               }
        } else {
                if (!output->panel)
                        status = connector_status_disconnected;
@@ -97,7 +102,6 @@ static irqreturn_t hpd_irq(int irq, void *data)
 int tegra_output_probe(struct tegra_output *output)
 {
        struct device_node *ddc, *panel;
-       enum of_gpio_flags flags;
        int err, size;
 
        if (!output->of_node)
@@ -128,7 +132,7 @@ int tegra_output_probe(struct tegra_output *output)
 
        output->hpd_gpio = of_get_named_gpio_flags(output->of_node,
                                                   "nvidia,hpd-gpio", 0,
-                                                  &flags);
+                                                  &output->hpd_gpio_flags);
        if (gpio_is_valid(output->hpd_gpio)) {
                unsigned long flags;