From patchwork Fri Jun 3 23:01:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9154255 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 C3D786082E for ; Fri, 3 Jun 2016 23:01:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC91C282EE for ; Fri, 3 Jun 2016 23:01:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F89028342; Fri, 3 Jun 2016 23:01:40 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A6B9282EE for ; Fri, 3 Jun 2016 23:01:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C4886E5AE; Fri, 3 Jun 2016 23:01:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DD1C6E5AB for ; Fri, 3 Jun 2016 23:01:35 +0000 (UTC) Received: by mail-io0-x242.google.com with SMTP id f128so1450042iof.3 for ; Fri, 03 Jun 2016 16:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=i+3M8k3QiFpTV9L2Sv7TfKaIZJxlocQNUoQ0fzb+Ji8=; b=uMnp2QGqPmwUw+7t7tBDvw6JDB+izvPB2Frk+u2W/ZcrXRJU9uhpxtHwuBunovpuLJ r+h8RQWAMVoF/Rhg7ub4+KJGn3YfGDv5Rb4Nwxh1AGkeekAHcH8z160lpOyDYqt7qOfM RwHMZu9zfrtxt3Prw0abei33tLxQay9qzI2cFLQlrU1S9DEX9A72WHa4gyG01qYtq/+2 opEAFDdVw3loLtB1gB0Yl5UM69OM9joye/aaHxuxun1qar6KyQDRJGqO17NLZQVtkOiT fDOfgXqR1jiIWxEhXMXQvD0MxAHkaCKCPjSBHyrtk2SjWifoLzJ7O0giJOwQo0RW91sR y0wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=i+3M8k3QiFpTV9L2Sv7TfKaIZJxlocQNUoQ0fzb+Ji8=; b=SPhrLTk4VNAcuAm1AikyCYLf20i5JWPyRIdZwrgR/xo40jfbKUBzzEXMLzJq2jV2dr PUpGNumfL3EuAp7wBFu/SilK1fyDDygCbS5WKP/s52I6Nt6VGnRfJmImA7mdSd8ocauF ZmvUDA6+99iKwthnMTHdBfolFy1iFYNOyjiViX7ecVW5VbcrsSV0kRSktAv7ndDmYWLV LjA8+XBeTrPDijTa+Rctur/0F2SDsTCvm/hy6oYo3B4jKlznMhmi8IKs1Y4xIzRTXW/R 8S4X00jY8vDEklXBo1nNhlBdGUhIFdl4IqhjDq/J5C3yAjiK1ZyJJseLLIDo+7TsvS2K 9Dmw== X-Gm-Message-State: ALyK8tKTVdybaNz0cwwBIC0VnlebqMZ3mERmi1ZQKAEopiXgkf9IxtqppZ6ENFQxKFUJyQ== X-Received: by 10.36.111.76 with SMTP id x73mr2804706itb.65.1464994894542; Fri, 03 Jun 2016 16:01:34 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id a186sm792161ith.14.2016.06.03.16.01.33 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Jun 2016 16:01:34 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/amd/powerplay: fix bug visit array out of bounds Date: Fri, 3 Jun 2016 19:01:27 -0400 Message-Id: <1464994888-15774-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Cc: Alex Deucher , Rex Zhu 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Rex Zhu Signed-off-by: Rex Zhu Acked-by: Christian König Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c index 24a16e4..586f732 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c @@ -1830,7 +1830,7 @@ static uint16_t fiji_find_closest_vddci(struct pp_hwmgr *hwmgr, uint16_t vddci) PP_ASSERT_WITH_CODE(false, "VDDCI is larger than max VDDCI in VDDCI Voltage Table!", - return vddci_table->entries[i].value); + return vddci_table->entries[i-1].value); } static int fiji_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 910d56d..20f20e0 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c @@ -469,7 +469,7 @@ uint16_t phm_find_closest_vddci(struct pp_atomctrl_voltage_table *vddci_table, u PP_ASSERT_WITH_CODE(false, "VDDCI is larger than max VDDCI in VDDCI Voltage Table!", - return vddci_table->entries[i].value); + return vddci_table->entries[i-1].value); } int phm_find_boot_level(void *table,