drm/nouveau: implement devinit subdev, and new init table parser

v2:
- make sure not to execute display scripts unless resuming

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 8 insertions, 56 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index e9bb14ec8c3b..13a7e1270801 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -72,66 +72,18 @@ enum dcb_connector_type {
         DCB_CONNECTOR_NONE = 0xff
 };
 
-enum dcb_type {
-        OUTPUT_ANALOG = 0,
-        OUTPUT_TV = 1,
-        OUTPUT_TMDS = 2,
-        OUTPUT_LVDS = 3,
-        OUTPUT_DP = 6,
-        OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */
-        OUTPUT_UNUSED = 15,
-        OUTPUT_ANY = -1
-};
-
-struct dcb_entry {
-        int index;      /* may not be raw dcb index if merging has happened */
-        enum dcb_type type;
-        uint8_t i2c_index;
-        uint8_t heads;
-        uint8_t connector;
-        uint8_t bus;
-        uint8_t location;
-        uint8_t or;
-        bool duallink_possible;
-        union {
-                struct sor_conf {
-                        int link;
-                } sorconf;
-                struct {
-                        int maxfreq;
-                } crtconf;
-                struct {
-                        struct sor_conf sor;
-                        bool use_straps_for_mode;
-                        bool use_acpi_for_edid;
-                        bool use_power_scripts;
-                } lvdsconf;
-                struct {
-                        bool has_component_output;
-                } tvconf;
-                struct {
-                        struct sor_conf sor;
-                        int link_nr;
-                        int link_bw;
-                } dpconf;
-                struct {
-                        struct sor_conf sor;
-                        int slave_addr;
-                } tmdsconf;
-        };
-        bool i2c_upper_default;
-};
+#include <subdev/bios/dcb.h>
 
 struct dcb_table {
         uint8_t version;
         int entries;
-        struct dcb_entry entry[DCB_MAX_NUM_ENTRIES];
+        struct dcb_output entry[DCB_MAX_NUM_ENTRIES];
 };
 
 enum nouveau_or {
-        OUTPUT_A = (1 << 0),
-        OUTPUT_B = (1 << 1),
-        OUTPUT_C = (1 << 2)
+        DCB_OUTPUT_A = (1 << 0),
+        DCB_OUTPUT_B = (1 << 1),
+        DCB_OUTPUT_C = (1 << 2)
 };
 
 enum LVDS_script {
@@ -195,7 +147,7 @@ struct nvbios {
         } state;
 
         struct {
-                struct dcb_entry *output;
+                struct dcb_output *output;
                 int crtc;
                 uint16_t script_table_ptr;
         } display;
@@ -244,7 +196,7 @@ void *olddcb_table(struct drm_device *);
 void *olddcb_outp(struct drm_device *, u8 idx);
 int olddcb_outp_foreach(struct drm_device *, void *data,
                      int (*)(struct drm_device *, void *, int idx, u8 *outp));
-u8 *dcb_conntab(struct drm_device *);
-u8 *dcb_conn(struct drm_device *, u8 idx);
+u8 *olddcb_conntab(struct drm_device *);
+u8 *olddcb_conn(struct drm_device *, u8 idx);
 
 #endif