Merge tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_connector.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
index 264a778f473b90a76c1cc3909c778dde9a736cd3..8861b6c579adecc26f2195ca7132dd32e060338e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
@@ -28,12 +28,12 @@
 #define __NOUVEAU_CONNECTOR_H__
 
 #include <drm/drm_edid.h>
+#include <drm/drm_dp_helper.h>
 #include "nouveau_crtc.h"
 
 #include <core/event.h>
 
 #include <subdev/bios.h>
-#include <subdev/bios/gpio.h>
 
 struct nouveau_i2c_port;
 
@@ -67,9 +67,11 @@ struct nouveau_connector {
        u8 index;
        u8 *dcb;
 
-       struct dcb_gpio_func hpd;
-       struct work_struct hpd_work;
-       struct nouveau_eventh *hpd_func;
+       struct nouveau_eventh *hpd;
+       u32 status;
+       struct work_struct work;
+
+       struct drm_dp_aux aux;
 
        int dithering_mode;
        int dithering_depth;