diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-05-28 15:42:56 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-30 17:04:10 -0400 |
| commit | b659c3dbe17714485a1756b74e92c27301571a80 (patch) | |
| tree | 156dad4876924870d516c15d10fd331b34490ffb /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | 9d32d1653db10eaba3140dd1a2f8dad51122f0b5 (diff) | |
drm/i915: don't set SDVO_BORDER_ENABLE when we're HDMI
The register that controls the HDMI port can be used to control the
sDVO port. Some bits are defined only for sDVO, and SDVO_BORDER_ENABLE
is one of those: HDMI ports that can't be used in sDVO mode don't even
have this bit defined in their specifications.
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_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 65af12ee98b1..194b453b052c 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
| @@ -515,7 +515,7 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder, | |||
| 515 | struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); | 515 | struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); |
| 516 | u32 sdvox; | 516 | u32 sdvox; |
| 517 | 517 | ||
| 518 | sdvox = SDVO_ENCODING_HDMI | SDVO_BORDER_ENABLE; | 518 | sdvox = SDVO_ENCODING_HDMI; |
| 519 | if (!HAS_PCH_SPLIT(dev)) | 519 | if (!HAS_PCH_SPLIT(dev)) |
| 520 | sdvox |= intel_hdmi->color_range; | 520 | sdvox |= intel_hdmi->color_range; |
| 521 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) | 521 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) |