| From 9237256b4dc9207b37b52a0ee0b9b5770a5e5c92 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= <marcheu@chromium.org> |
| Date: Fri, 12 Jul 2013 13:54:41 -0700 |
| Subject: drm/i915: Preserve the DDI_A_4_LANES bit from the bios |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Otherwise the DDI_A_4_LANES bit gets lost and we can't use > 2 lanes |
| on eDP. This fixes eDP on hsw with > 2 lanes. |
| |
| Also s/port_reversal/saved_port_bits/ since the current name is |
| confusing. |
| |
| Signed-off-by: Stéphane Marchesin <marcheu@chromium.org> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit bcf53de4e60d9000b82f541d654529e2902a4c2c) |
| [dbasehore: removed if statement on a NULL pointer value in conflict] |
| Signed-off-by: Derek Basehore <dbasehore@chromium.org> |
| |
| Conflicts: |
| drivers/gpu/drm/i915/intel_ddi.c |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_ddi.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_ddi.c |
| +++ b/drivers/gpu/drm/i915/intel_ddi.c |
| @@ -1357,8 +1357,6 @@ void intel_ddi_init(struct drm_device *d |
| intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) & |
| (DDI_BUF_PORT_REVERSAL | |
| DDI_A_4_LANES); |
| - if (hdmi_connector) |
| - 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; |
