diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-24 09:56:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-25 15:09:19 +1000 |
| commit | 7f245b20e30515264b94f6373ef7d721155990a4 (patch) | |
| tree | 51c730665e69d92e64eb7dbbbb00ed3cc2480603 /drivers/gpu/drm/nouveau/nouveau_bios.h | |
| parent | a6678b2ace023912000119a14eeb39a56050bc7c (diff) | |
drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 73e6499e79d..449a5f3d47d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h @@ -77,12 +77,6 @@ struct dcb_i2c_entry { struct nouveau_i2c_chan *chan; }; -struct parsed_dcb { - int entries; - struct dcb_entry entry[DCB_MAX_NUM_ENTRIES]; - struct dcb_i2c_entry i2c[DCB_MAX_NUM_I2C_ENTRIES]; -}; - enum dcb_gpio_tag { DCB_GPIO_TVDAC0 = 0xc, DCB_GPIO_TVDAC1 = 0x2d, @@ -111,13 +105,15 @@ struct dcb_connector_table { struct dcb_connector_table_entry entry[DCB_MAX_NUM_CONNECTOR_ENTRIES]; }; -struct bios_parsed_dcb { +struct dcb_table { uint8_t version; - struct parsed_dcb dcb; + int entries; + struct dcb_entry entry[DCB_MAX_NUM_ENTRIES]; uint8_t *i2c_table; uint8_t i2c_default_indices; + struct dcb_i2c_entry i2c[DCB_MAX_NUM_I2C_ENTRIES]; uint16_t gpio_table_ptr; struct dcb_gpio_table gpio; @@ -191,8 +187,6 @@ struct pll_lims { }; struct nouveau_bios_info { - struct parsed_dcb *dcb; - uint8_t chip_version; uint32_t dactestval; @@ -234,7 +228,7 @@ struct nvbios { uint16_t some_script_ptr; /* BIT I + 14 */ uint16_t init96_tbl_ptr; /* BIT I + 16 */ - struct bios_parsed_dcb bdcb; + struct dcb_table dcb; struct { int crtchead; |