diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-12 14:19:59 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-25 12:23:47 -0400 |
commit | 08d644add0e5f799a47dbe7849401606c522e59e (patch) | |
tree | fb16c7a3902748552285836d1bae82601f3bcacb /drivers/gpu/drm/i915/intel_drv.h | |
parent | 66a9278eecbef1c746e7fac8f4bcb0485d7aa4d0 (diff) |
drm/i915: add port parameter to intel_hdmi_init
Instead of having a giant if cascade to figure this out according to
the passed-in register. We could do quite a bit more cleaning up and
all by using the port at more places, but I think this should be part
of a bigger rework to introduce a struct intel_digital_port which
would keep track of all these things. I guess this will be part of
some haswell-DP-induced refactoring.
For now this rips out the big cascade, which is what annoyed me so
much.
v2: Add port variable name back for the func decl (I've tried to trick
myself below the 80 char limit).
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
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 76ba554f6592..d234f1af5db5 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -364,7 +364,8 @@ extern void intel_attach_force_audio_property(struct drm_connector *connector); | |||
364 | extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector); | 364 | extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector); |
365 | 365 | ||
366 | extern void intel_crt_init(struct drm_device *dev); | 366 | extern void intel_crt_init(struct drm_device *dev); |
367 | extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg); | 367 | extern void intel_hdmi_init(struct drm_device *dev, |
368 | int sdvox_reg, enum port port); | ||
368 | extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); | 369 | extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); |
369 | extern void intel_dip_infoframe_csum(struct dip_infoframe *avi_if); | 370 | extern void intel_dip_infoframe_csum(struct dip_infoframe *avi_if); |
370 | extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, | 371 | extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, |