diff options
author | Francisco Jerez <currojerez@riseup.net> | 2009-12-17 12:52:44 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-01-10 18:06:34 -0500 |
commit | 11d6eb2af53395b25e1d6b8b79bb9a999c3e4c4d (patch) | |
tree | c5ca92b33080ada6f643e054807f84f78a885df6 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
parent | 3033f14d6538e0e7c3c53d3ed1ff6cec28260b98 (diff) |
drm/nouveau: Clean up the nv17-nv4x load detection code a bit.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 9c9815bf505a..7da88a92c83f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -1074,8 +1074,7 @@ extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd, | |||
1074 | 1074 | ||
1075 | /* nv04_dac.c */ | 1075 | /* nv04_dac.c */ |
1076 | extern int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry); | 1076 | extern int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry); |
1077 | extern enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder, | 1077 | extern uint32_t nv17_dac_sample_load(struct drm_encoder *encoder); |
1078 | struct drm_connector *connector); | ||
1079 | extern int nv04_dac_output_offset(struct drm_encoder *encoder); | 1078 | extern int nv04_dac_output_offset(struct drm_encoder *encoder); |
1080 | extern void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable); | 1079 | extern void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable); |
1081 | 1080 | ||
@@ -1093,9 +1092,6 @@ extern int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry); | |||
1093 | 1092 | ||
1094 | /* nv17_tv.c */ | 1093 | /* nv17_tv.c */ |
1095 | extern int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry); | 1094 | extern int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry); |
1096 | extern enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder, | ||
1097 | struct drm_connector *connector, | ||
1098 | uint32_t pin_mask); | ||
1099 | 1095 | ||
1100 | /* nv04_display.c */ | 1096 | /* nv04_display.c */ |
1101 | extern int nv04_display_create(struct drm_device *); | 1097 | extern int nv04_display_create(struct drm_device *); |