From patchwork Fri Jun 10 14:13:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9169895 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 8BA8160573 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 7F43B28325 for ; Fri, 10 Jun 2016 14:13:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71DE028363; 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 99D8628325 for ; Fri, 10 Jun 2016 14:13:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D22C6ED6B; 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-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26432898BE for ; Fri, 10 Jun 2016 14:13:21 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id j2so940380qkf.1 for ; Fri, 10 Jun 2016 07:13:21 -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=u6SkF4nwtPquvEdZ+RbLBO5CCzFsxoYKGblVXn70xLI=; b=nVSzvZHy3hr3MgSOd79MqNspCX8IGci33RfD3e5Pq3BLItZDmQlYA1lby+QdTYUhzY HiUWEOlXlshj3hcSKPVTs/AxGfGV4sU8khj1BdWAtcSP3+EIWsj3Xwhndr+VD/1qrnJx /RWFnK2S1akc/JEn8Y5PTlRJrLkuUYrluvMcB84xI+RWX0jsqcU1fRDrphjQJ/rhIFRN rd1VJzupNrROeX6Z2F1rdrU9w3KUxxREVwh5347uFIP9QMKL3CSl6Ws2QuOGRWn728ju nuci6MiHKB6bKWEm1QN775+Ayy6/B9Sk8T83Gm8pVnJrytvsI8ns3iU+b4Yr3RQ0/IZI phZg== 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=u6SkF4nwtPquvEdZ+RbLBO5CCzFsxoYKGblVXn70xLI=; b=C7wnH1toHz1IDdBz15+iRYK2/AyITicsLHcCCisey2VtipxxzsFFatFWaNK7mscPrN zZLojLCCmvyRzP4Ks3It7xEeq5UKeUHd/e8kmwJh0Q4vmHttLhSm1pmEHps5rU4WzzEo Ufg634TJ+T3BP3Ya/UqeMl7waU8b/bDaCGD4vjN2ZVlgcgNntODAawsL/p63rAWgG6+i tdo48MSLcKFykfrDjG1B11yJskSqmMGaV41n4RCLN15Vtp9GVsKRa/iWIf7Delh/f2wH fJGlX36EJsjOoBODtSN4f/Z9bO6pPz4DXI+sJ0xPjQ0RmbbKmRkvcbLa2gM55hxdIrGu sAlw== X-Gm-Message-State: ALyK8tJ2fs1JnA5wFK2plJvGEXh/d0Uby02g2hZfFBSVok+ScDR8v0JnhyWtoGtzA/fHIw== X-Received: by 10.55.200.9 with SMTP id c9mr2126873qkj.158.1465567999765; 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.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Jun 2016 07:13:19 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/radeon/cik: fix CP jump table size Date: Fri, 10 Jun 2016 10:13:12 -0400 Message-Id: <1465567992-1353-3-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/radeon/cik.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 3beac4e..0c1b9ff 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -8366,7 +8366,7 @@ static int cik_startup(struct radeon_device *rdev) } } rdev->rlc.cs_data = ci_cs_data; - rdev->rlc.cp_table_size = CP_ME_TABLE_SIZE * 5 * 4; /* CP JT */ + rdev->rlc.cp_table_size = ALIGN(CP_ME_TABLE_SIZE * 5 * 4, 2048); /* CP JT */ rdev->rlc.cp_table_size += 64 * 1024; /* GDS */ r = sumo_rlc_init(rdev); if (r) {