| From 8969b2b8ca45f3a05ceb3dd76cf57afac4f4856d Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Tue, 25 Jun 2013 14:16:34 +0300 |
| Subject: Revert "drm/i915: Don't use the HDMI port color range bit on |
| Valleyview" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| The PIPECONF color range bit doesn't appear to be effective, on HDMI |
| outputs at least. The color range bit in the port register works though, |
| so let's use it. |
| |
| I have not yet verified whether the PIPECONF bit works on DP outputs. |
| |
| This reverts commit 83a2af88f80ebf8104c9e083b786668b00f5b9ce. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 2af2c4909b7c8bc76beef25941b2218b3bd8e4fc) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_hdmi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c |
| index bc12518a21b4..98df2a0c85bd 100644 |
| --- a/drivers/gpu/drm/i915/intel_hdmi.c |
| +++ b/drivers/gpu/drm/i915/intel_hdmi.c |
| @@ -602,7 +602,7 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder, |
| u32 hdmi_val; |
| |
| hdmi_val = SDVO_ENCODING_HDMI; |
| - if (!HAS_PCH_SPLIT(dev) && !IS_VALLEYVIEW(dev)) |
| + if (!HAS_PCH_SPLIT(dev)) |
| hdmi_val |= intel_hdmi->color_range; |
| if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) |
| hdmi_val |= SDVO_VSYNC_ACTIVE_HIGH; |
| -- |
| 1.8.5.rc3 |
| |
