From patchwork Mon Jul 17 18:21:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 9846067 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E392960386 for ; Mon, 17 Jul 2017 20:26:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 149CC28503 for ; Mon, 17 Jul 2017 20:26:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0997628509; Mon, 17 Jul 2017 20:26:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7883628503 for ; Mon, 17 Jul 2017 20:26:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F7E26E291; Mon, 17 Jul 2017 20:26:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-f45.google.com (mail-pg0-f45.google.com [74.125.83.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id E66976E26E for ; Mon, 17 Jul 2017 18:21:41 +0000 (UTC) Received: by mail-pg0-f45.google.com with SMTP id v190so25834007pgv.2 for ; Mon, 17 Jul 2017 11:21:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ssouk2SZleAI8bEv3vz0S+5hEEWBLhFUcybhgVYlD5M=; b=tr5M6ZE6tLG6FQWSPFbrrsHZQAf0QdFoaUedQQ2CznvWEcS/vQvK8Kqq3nERlEKvi8 CN4K02YbcT0GJ8Uk0wVHg6+iKTQpnkBiPeOEGV+dOVuZjmwbKxNOOY25KUutrIHlcgo8 CMuYzoG2Ut06WqsWeAQPK3HsIvX6ZIauPT0UNJlYs0ctJjdUaxzh6Ou2u0zdG/57i4vL 0C6kdYs7CIgZ7EvyvdJvV+9BF4qnad+7O7sHNsC/hr0kh4tRZJA8QhoIP0CKMac8ZDmu 77b/M3L5bGkQX7LEmddbawGPPXkjbSIHilM7SgLgCYPfm8wnAoGday1Pu4Sjk49lQARa 0oiA== X-Gm-Message-State: AIVw113OVtNfKee0EvF5a2GAxZllIbs7xJ9RBO0yD8+2SoOpVN2HlSyf FwFgafSFproOftJi X-Received: by 10.98.137.81 with SMTP id v78mr20643043pfd.9.1500315701365; Mon, 17 Jul 2017 11:21:41 -0700 (PDT) Received: from mka.mtv.corp.google.com ([172.22.64.162]) by smtp.gmail.com with ESMTPSA id t78sm42597749pfa.48.2017.07.17.11.21.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 11:21:40 -0700 (PDT) From: Matthias Kaehlcke To: Daniel Vetter , Jani Nikula , David Airlie , Daniel Vetter Subject: [PATCH] drm/i915: Return correct EDP voltage swing table for 0.85V Date: Mon, 17 Jul 2017 11:21:27 -0700 Message-Id: <20170717182127.59072-1-mka@chromium.org> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog X-Mailman-Approved-At: Mon, 17 Jul 2017 20:26:09 +0000 Cc: Grant Grundler , intel-gfx , Linux Kernel Mailing List , dri-devel@lists.freedesktop.org, Matthias Kaehlcke X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP For 0.85V cnl_get_buf_trans_edp() returns the DP table, instead of EDP. Use the correct table. The error was pointed out by this clang warning: drivers/gpu/drm/i915/intel_ddi.c:392:39: warning: variable 'cnl_ddi_translations_edp_0_85V' is not needed and will not be emitted [-Wunneeded-internal-declaration] static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = { Signed-off-by: Matthias Kaehlcke --- drivers/gpu/drm/i915/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index efb13582dc73..6fa02e6a7a9b 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1873,7 +1873,7 @@ cnl_get_buf_trans_edp(struct drm_i915_private *dev_priv, if (dev_priv->vbt.edp.low_vswing) { if (voltage == VOLTAGE_INFO_0_85V) { *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); - return cnl_ddi_translations_dp_0_85V; + return cnl_ddi_translations_edp_0_85V; } else if (voltage == VOLTAGE_INFO_0_95V) { *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); return cnl_ddi_translations_edp_0_95V;