From patchwork Fri Jun 10 14:13:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9169897 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 EA7D060573 for ; Fri, 10 Jun 2016 14:13:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFB3A28325 for ; Fri, 10 Jun 2016 14:13:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D410928342; Fri, 10 Jun 2016 14:13:35 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 8385328369 for ; Fri, 10 Jun 2016 14:13:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 278F96ED6C; Fri, 10 Jun 2016 14:13:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7DB68915F for ; Fri, 10 Jun 2016 14:13:20 +0000 (UTC) Received: by mail-qk0-x244.google.com with SMTP id l185so5418234qkc.2 for ; Fri, 10 Jun 2016 07:13:20 -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:in-reply-to:references; bh=ZMm02OS3yMxJo41iiDE4lYCpWVJY2alCEDMzAGSCmDk=; b=kYqFlWWXteMAM9OawA4htvcYpF80a/LTBowdARo5eGPmBeK5DU2SVn2+M+Ya6w5q/o F43JTS4E41hvYoBsu7JQ6mIvVQg2wsuHEi5iDNDwBl2U5HxMwWuUzSouY+iq1E/Ev5AT FxA3MlmibHbxhE4jtXETynNyWDQO8buTpEgx/hylYxR6FIxgoBzEl2f83KGrLkUtuLU+ W9VcmyiFm7Dzy+OjblCe1Gu6eQmWlh8cHZitKHnJ/OKWDm0xRCLMBHVFlc953L8PcCtv EjR38TmgqkulB53Z5+ykwr66iDTqWxOQjn3fg/ugC/tfzhIK4x5PYwNRy8MPcSm/aeL6 ABHg== 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:in-reply-to :references; bh=ZMm02OS3yMxJo41iiDE4lYCpWVJY2alCEDMzAGSCmDk=; b=boybNOwVFW9BAGvR9BnVU30VP5lKt6epq8i4JKhpg7OhFb3kWZATlndZxJ4hvsDDe8 naxFxz3d2yPnpWDbuvlhQfjagNmVkNpqGVujsjMabGXwnzWSXq+og0CuVsC/OL/Fsi1m q7LGs5uXKYbB+c4LInNpZ5tfdqylifin5So4B9Rhuuo/yHSigW3dRWA6mYJA62Xxfgz6 ua7HyG+HDpsUFk9GmTClgBu8pjv9zLu+2o+MeLOIhdEx8nNB+sIGfrC1x8FThnDvWvdI 3JC2DkGpBnx2+kvl2pOZvsetFdfw64774q4reE6jSTAjgLdH0EbDfmOWsrAXqPyjwlrs NLug== X-Gm-Message-State: ALyK8tIFZbH3XvksU8d9UYa16gB3OpQFxrx2NGBFkqE2J9xEWlnqeP6B6TzoZuuk4vDEpg== X-Received: by 10.233.237.129 with SMTP id c123mr2059222qkg.136.1465567999161; Fri, 10 Jun 2016 07:13:19 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id g10sm3139677qgg.13.2016.06.10.07.13.18 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Jun 2016 07:13:18 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/amdgpu/gfx7: fix CP jump table size Date: Fri, 10 Jun 2016 10:13:11 -0400 Message-Id: <1465567992-1353-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465567992-1353-1-git-send-email-alexander.deucher@amd.com> References: <1465567992-1353-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher 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 Align to the jump table offset. May fix hangs on some asics with GFX PG enabled. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index 0f8149d..34227e2 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c @@ -3221,7 +3221,7 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device *adev) } } adev->gfx.rlc.cs_data = ci_cs_data; - adev->gfx.rlc.cp_table_size = CP_ME_TABLE_SIZE * 5 * 4; /* CP JT */ + adev->gfx.rlc.cp_table_size = ALIGN(CP_ME_TABLE_SIZE * 5 * 4, 2048); /* CP JT */ adev->gfx.rlc.cp_table_size += 64 * 1024; /* GDS */ src_ptr = adev->gfx.rlc.reg_list;