diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-02-01 09:36:24 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-02-01 09:36:24 +0000 |
| commit | ebd80b941c72f9da9ffd54de70cc094b0511f26f (patch) | |
| tree | 6e17ed7bc6158d103fbe558b5ec84c292021d9f9 /drivers/gpu/drm/nouveau/nouveau_bios.h | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| parent | a9d993882008a1ae2c953064f0c2ca7e604b1333 (diff) | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50/pm: signedness bug in nv50_pm_clocks_pre()
drm/nouveau/gem: fix fence_sync race / oops
drm/nouveau: fix typo on mxmdcb option
drm/nouveau/mxm: pretend to succeed, even if we can't shadow the MXM-SIS
drm/nouveau/disp: check that panel power gpio is enabled at init time
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 1e382ad5a2b..a37c31e358a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h @@ -54,9 +54,10 @@ struct bit_entry { int bit_table(struct drm_device *, u8 id, struct bit_entry *); enum dcb_gpio_tag { - DCB_GPIO_TVDAC0 = 0xc, + DCB_GPIO_PANEL_POWER = 0x01, + DCB_GPIO_TVDAC0 = 0x0c, DCB_GPIO_TVDAC1 = 0x2d, - DCB_GPIO_PWM_FAN = 0x9, + DCB_GPIO_PWM_FAN = 0x09, DCB_GPIO_FAN_SENSE = 0x3d, DCB_GPIO_UNUSED = 0xff }; |