From patchwork Fri Nov 23 17:30:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1796611 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id CF5273FC54 for ; Fri, 23 Nov 2012 17:32:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C52EEE6638 for ; Fri, 23 Nov 2012 09:32:40 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=js6/X2MUOfxMDW+hqVCwKI9Mh1LqNScd0BRV4NRsEF8=; b=CtfAlWUParGbuv1Vd+ldiRzzWX+RcEg7HmniE2Ek5tfQC3y/Zi6AULPSs0ehq9wqAE r3NoR0zQMcLYmERCSkKW1NwRDJuj66KkbguCJrH3AsVaIXWjjdGFu/KCK9AA8bA5q3WY wcNtov5J2qgxUdigSnDmz4Oa36vD5GivuPLn7H8qk7nHLgJlOBo236CT5/SAOBzT5wlQ djeJmGHhaOp1Lv7EOxf7Sv7KDU95A6NMcxIadEoKUWUtKeIilFqS4EafADBDruNsHwuT OGq7H3fIzVH/NLXRe/wMzJZix3+ka2ueDnapBVtXQgjUeH1rXykRoHxGXnHPiIDGih2Q BpWw== Received: by 10.236.123.136 with SMTP id v8mr4569903yhh.75.1353691865712; Fri, 23 Nov 2012 09:31:05 -0800 (PST) Received: from vicky.domain.invalid ([187.112.188.105]) by mx.google.com with ESMTPS id h16sm6430977ani.0.2012.11.23.09.31.04 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 09:31:05 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 23 Nov 2012 15:30:40 -0200 Message-Id: <1353691840-9913-4-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353691840-9913-1-git-send-email-przanoni@gmail.com> References: <1353691840-9913-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 4/4] drm/i915: only call intel_prepare_ddi if HAS_DDI X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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);