diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-08-17 00:34:00 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-08-26 01:11:02 -0400 |
commit | 44a1246f320312b84134a962caf3bf6af989e193 (patch) | |
tree | b5c877b45857ca0ce545c78dc5245f93c3fd67e4 /drivers | |
parent | 625db6b7e34580b750a13fd36a211a4366f6c3e2 (diff) |
drm/nv50: add dcb type 14 to enum to prevent compiler complaint
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index e4f33a4edea1..e10d851a7240 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -6153,7 +6153,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, | |||
6153 | entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4; | 6153 | entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4; |
6154 | 6154 | ||
6155 | break; | 6155 | break; |
6156 | case 0xe: | 6156 | case OUTPUT_EOL: |
6157 | /* weird g80 mobile type that "nv" treats as a terminator */ | 6157 | /* weird g80 mobile type that "nv" treats as a terminator */ |
6158 | dcb->entries--; | 6158 | dcb->entries--; |
6159 | return false; | 6159 | return false; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index fd14dfd3d780..c1de2f3fcb0e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h | |||
@@ -95,6 +95,7 @@ enum dcb_type { | |||
95 | OUTPUT_TMDS = 2, | 95 | OUTPUT_TMDS = 2, |
96 | OUTPUT_LVDS = 3, | 96 | OUTPUT_LVDS = 3, |
97 | OUTPUT_DP = 6, | 97 | OUTPUT_DP = 6, |
98 | OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */ | ||
98 | OUTPUT_ANY = -1 | 99 | OUTPUT_ANY = -1 |
99 | }; | 100 | }; |
100 | 101 | ||