Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[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 9f28b94..a1a0d48 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
@@ -38,16 +38,20 @@ struct nouveau_encoder {
        struct dcb_entry *dcb;
        int or;
 
+       /* different to drm_encoder.crtc, this reflects what's
+        * actually programmed on the hw, not the proposed crtc */
+       struct drm_crtc *crtc;
+
        struct drm_display_mode mode;
        int last_dpms;
 
        struct nv04_output_reg restore;
 
-       void (*disconnect)(struct nouveau_encoder *encoder);
-
        union {
                struct {
                        int mc_unknown;
+                       uint32_t unk0;
+                       uint32_t unk1;
                        int dpcd_version;
                        int link_nr;
                        int link_bw;
@@ -69,8 +73,8 @@ static inline struct drm_encoder *to_drm_encoder(struct nouveau_encoder *enc)
 
 struct nouveau_connector *
 nouveau_encoder_connector_get(struct nouveau_encoder *encoder);
-int nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry);
-int nv50_dac_create(struct drm_device *dev, struct dcb_entry *entry);
+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;