Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / gpu / drm / nouveau / nouveau_encoder.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index ae69b61..e5d6e3f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
@@ -49,17 +49,17 @@ struct nouveau_encoder {
 
        union {
                struct {
-                       int mc_unknown;
-                       uint32_t unk0;
-                       uint32_t unk1;
-                       int dpcd_version;
+                       u8  dpcd[8];
                        int link_nr;
                        int link_bw;
-                       bool enhanced_frame;
+                       u32 datarate;
                } dp;
        };
 };
 
+struct nouveau_encoder *
+find_encoder(struct drm_connector *connector, int type);
+
 static inline struct nouveau_encoder *nouveau_encoder(struct drm_encoder *enc)
 {
        struct drm_encoder_slave *slave = to_encoder_slave(enc);
@@ -83,21 +83,4 @@ nouveau_encoder_connector_get(struct nouveau_encoder *encoder);
 int nv50_sor_create(struct drm_connector *, struct dcb_entry *);
 int nv50_dac_create(struct drm_connector *, struct dcb_entry *);
 
-struct bit_displayport_encoder_table {
-       uint32_t match;
-       uint8_t  record_nr;
-       uint8_t  unknown;
-       uint16_t script0;
-       uint16_t script1;
-       uint16_t unknown_table;
-} __attribute__ ((packed));
-
-struct bit_displayport_encoder_table_entry {
-       uint8_t vs_level;
-       uint8_t pre_level;
-       uint8_t reg0;
-       uint8_t reg1;
-       uint8_t reg2;
-} __attribute__ ((packed));
-
 #endif /* __NOUVEAU_ENCODER_H__ */