diff options
| author | Paulo Zanoni | 2013-02-18 23:00:26 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-02-20 01:33:46 +0100 |
| commit | b242b7f745650832f445dca3e19efc3dd2d65a66 (patch) | |
| tree | f929f7e5db5ba190a1f986f047dc41509195bf1d /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915: add aux_ch_ctl_reg to struct intel_dp (diff) | |
| download | kernel-qcow2-linux-b242b7f745650832f445dca3e19efc3dd2d65a66.tar.gz kernel-qcow2-linux-b242b7f745650832f445dca3e19efc3dd2d65a66.tar.xz kernel-qcow2-linux-b242b7f745650832f445dca3e19efc3dd2d65a66.zip | |
drm/i915: rename sdvox_reg to hdmi_reg on HDMI context
Some (but not all) of the HDMI registers can be used to control sDVO,
so those registers have two names. IMHO, when we're talking about
HDMI, we really should call the HDMI control register "hdmi_reg"
instead of "sdvox_reg", otherwise we'll just confuse people reading
our code (we now have platforms with HDMI but without SDVO). So now
"struct intel_hdmi" has a member called "hdmi_reg" instead of
"sdvox_reg".
Also, don't worry: "struct intel_sdvo" still has a member called
"sdvo_reg".
v2: Rebase (v1 was sent in May 2012).
Signed-off-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_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 816c45c71b72..56bb7cb78263 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1538,9 +1538,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->port_reversal = I915_READ(DDI_BUF_CTL(port)) & DDI_BUF_PORT_REVERSAL; if (hdmi_connector) - intel_dig_port->hdmi.sdvox_reg = DDI_BUF_CTL(port); - else - intel_dig_port->hdmi.sdvox_reg = 0; + intel_dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port); intel_dig_port->dp.output_reg = DDI_BUF_CTL(port); intel_encoder->type = INTEL_OUTPUT_UNKNOWN; |