diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-23 18:43:35 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-24 10:55:53 -0400 |
commit | eef4eacb6ed3940b4a15daf3fbd060243e54056c (patch) | |
tree | daf7a93bfe8307fd5672ed72ae3f28fa4074c5d7 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 7eea1ddf6168cbe4507f429da53752229e9ff5b7 (diff) |
drm/i915/sdov: switch IS_SDVOB to a flag
With valleyview we'll have these at yet another address, so keeping
track of this with an ever-growing list of registers will get ugly.
This way intel_sdvo.c is fully independent of the base address of the
output ports display register blocks.
While at it, do 2 closely related cleanups:
- use SDVO_NAME some more
- change the sdvo_reg variables to uint32_t like other registers.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 9cec6c3937fa..219efe3b9ad5 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -293,7 +293,8 @@ extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector) | |||
293 | extern void intel_crt_init(struct drm_device *dev); | 293 | extern void intel_crt_init(struct drm_device *dev); |
294 | extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg); | 294 | extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg); |
295 | void intel_dip_infoframe_csum(struct dip_infoframe *avi_if); | 295 | void intel_dip_infoframe_csum(struct dip_infoframe *avi_if); |
296 | extern bool intel_sdvo_init(struct drm_device *dev, int output_device); | 296 | extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, |
297 | bool is_sdvob); | ||
297 | extern void intel_dvo_init(struct drm_device *dev); | 298 | extern void intel_dvo_init(struct drm_device *dev); |
298 | extern void intel_tv_init(struct drm_device *dev); | 299 | extern void intel_tv_init(struct drm_device *dev); |
299 | extern void intel_mark_busy(struct drm_device *dev, | 300 | extern void intel_mark_busy(struct drm_device *dev, |