| From 9c2921cb2b4222577217ddc2175a8ff80d3b7c54 Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Mon, 5 Aug 2013 17:25:56 -0300 |
| Subject: drm/i915: remove use_fdi_mode argument from intel_prepare_ddi_buffers |
| |
| We set the mode based on the port, and we already pass the port as an |
| argument. |
| |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit ad8d270c21aa2f57f0cd578b1737f65c44c34b80) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_ddi.c | 17 +++++------------ |
| 1 file changed, 5 insertions(+), 12 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c |
| index b6281d9e4d62..b8c096b4a1de 100644 |
| --- a/drivers/gpu/drm/i915/intel_ddi.c |
| +++ b/drivers/gpu/drm/i915/intel_ddi.c |
| @@ -84,15 +84,14 @@ static enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder) |
| * in either FDI or DP modes only, as HDMI connections will work with both |
| * of those |
| */ |
| -static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port, |
| - bool use_fdi_mode) |
| +static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) |
| { |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| u32 reg; |
| int i; |
| - const u32 *ddi_translations = ((use_fdi_mode) ? |
| + const u32 *ddi_translations = (port == PORT_E) ? |
| hsw_ddi_translations_fdi : |
| - hsw_ddi_translations_dp); |
| + hsw_ddi_translations_dp; |
| |
| for (i = 0, reg = DDI_BUF_TRANS(port); |
| i < ARRAY_SIZE(hsw_ddi_translations_fdi); i++) { |
| @@ -111,14 +110,8 @@ void intel_prepare_ddi(struct drm_device *dev) |
| if (!HAS_DDI(dev)) |
| return; |
| |
| - for (port = PORT_A; port < PORT_E; port++) |
| - intel_prepare_ddi_buffers(dev, port, false); |
| - |
| - /* DDI E is the suggested one to work in FDI mode, so program is as such |
| - * by default. It will have to be re-programmed in case a digital DP |
| - * output will be detected on it |
| - */ |
| - intel_prepare_ddi_buffers(dev, PORT_E, true); |
| + for (port = PORT_A; port <= PORT_E; port++) |
| + intel_prepare_ddi_buffers(dev, port); |
| } |
| |
| static const long hsw_ddi_buf_ctl_values[] = { |
| -- |
| 1.8.5.rc3 |
| |
