diff options
author | Dave Airlie <airlied@redhat.com> | 2010-04-09 14:27:51 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-09 14:27:51 +1000 |
commit | 930b9d94579fa1ea9604cbf7ba56cedf99ba9b5c (patch) | |
tree | 8a84b396a667ebc4ce824d6b4346b187fa66b0f8 /drivers/gpu/drm/nouveau/nouveau_bios.h | |
parent | 3a89b4a9ca7ce11e3b7d5119aea917b9fc29a302 (diff) | |
parent | 8e024f13142fbbca5fbe14a6926516a45bd70c3a (diff) | |
download | kernel_samsung_crespo-930b9d94579fa1ea9604cbf7ba56cedf99ba9b5c.zip kernel_samsung_crespo-930b9d94579fa1ea9604cbf7ba56cedf99ba9b5c.tar.gz kernel_samsung_crespo-930b9d94579fa1ea9604cbf7ba56cedf99ba9b5c.tar.bz2 |
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
* 'nouveau/for-airlied' of ../drm-nouveau-next: (21 commits)
drm/nouveau: bail out of auxch transaction if we repeatedly recieve defers
drm/nv50: implement gpio set/get routines
drm/nv50: parse/use some more de-magiced parts of gpio table entries
drm/nouveau: store raw gpio table entry in bios gpio structs
drm/nv40: Init some tiling-related PGRAPH state.
drm/nv50: Add NVA3 support in ctxprog/ctxvals generator.
drm/nv50: another dodgy DP hack
drm/nv50: punt hotplug irq handling out to workqueue
drm/nv50: preserve an unknown SOR_MODECTRL value for DP encoders
drm/nv50: Allow using the NVA3 new compute class.
drm/nv50: cleanup properly if PDISPLAY init fails
drm/nouveau: fixup the init failure paths some more
drm/nv50: fix instmem init on IGPs if stolen mem crosses 4GiB mark
drm/nv40: add LVDS table quirk for Dell Latitude D620
drm/nv40: rework lvds table parsing
drm/nouveau: detect vram amount once, and save the value
drm/nouveau: remove some unused members from drm_nouveau_private
drm/nouveau: Make use of TTM busy_placements.
drm/nv50: add more 0x100c80 flushy magic
drm/nv50: fix fbcon when framebuffer above 4GiB mark
...
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 4f88e69..c0d7b0a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h @@ -49,6 +49,9 @@ struct dcb_gpio_entry { enum dcb_gpio_tag tag; int line; bool invert; + uint32_t entry; + uint8_t state_default; + uint8_t state[2]; }; struct dcb_gpio_table { @@ -267,7 +270,6 @@ struct nvbios { bool reset_after_pclk_change; bool dual_link; bool link_c_increment; - bool BITbit1; bool if_is_24bit; int duallink_transition_clk; uint8_t strapless_is_24bit; |