From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 4/4] drm/i915: only call intel_prepare_ddi if HAS_DDI Date: Fri, 23 Nov 2012 15:30:40 -0200 Message-ID: <1353691840-9913-4-git-send-email-przanoni@gmail.com> References: <1353691840-9913-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-gg0-f177.google.com (mail-gg0-f177.google.com [209.85.161.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 2ED33E5F70 for ; Fri, 23 Nov 2012 09:31:06 -0800 (PST) Received: by mail-gg0-f177.google.com with SMTP id y3so1240969ggc.36 for ; Fri, 23 Nov 2012 09:31:05 -0800 (PST) In-Reply-To: <1353691840-9913-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni In other words, move the check from inside the function to outside it. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 16 +++++++--------- drivers/gpu/drm/i915/intel_display.c | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 197dede..e53e6fb 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -115,16 +115,14 @@ void intel_prepare_ddi(struct drm_device *dev) { int port; - if (HAS_DDI(dev)) { - for (port = PORT_A; port < PORT_E; port++) - intel_prepare_ddi_buffers(dev, port, false); + 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); - } + /* 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); } static const long hsw_ddi_buf_ctl_values[] = { diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d887cbc..2c3932e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8742,7 +8742,8 @@ void intel_modeset_init_hw(struct drm_device *dev) */ intel_init_power_wells(dev); - intel_prepare_ddi(dev); + if (HAS_DDI(dev)) + intel_prepare_ddi(dev); intel_init_clock_gating(dev); -- 1.7.11.7