From patchwork Thu Jul 24 20:34:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 4619871 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 733E79F39B for ; Thu, 24 Jul 2014 20:34:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5C33201EC for ; Thu, 24 Jul 2014 20:34:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BA677201DD for ; Thu, 24 Jul 2014 20:34:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 354F26E74B; Thu, 24 Jul 2014 13:34:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f51.google.com (mail-qg0-f51.google.com [209.85.192.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BB056E74B for ; Thu, 24 Jul 2014 13:34:24 -0700 (PDT) Received: by mail-qg0-f51.google.com with SMTP id a108so3891443qge.24 for ; Thu, 24 Jul 2014 13:34:24 -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-type :content-transfer-encoding; bh=uyM4UToTCBOF5EAO6L/JkjvuYfaUDKEEtbO4ccxgW7Y=; b=zyXcT/xE0nSgzM/mnHcuctzccioAbFLMX0mAwRyi6qx6ib89xGrLoQM3WE/tnOujwV QV59xpggqAGca/dlhzZJvI3yrnX8VmiWw71rO5zubt+AS5zzlzdWeF5qL/mt+qcNG3De SdRGvD7GvMfuiYDcTP7+GBeP1nuqBd/CkQbfpmWwac6VH6UAn7WhVkCWGD6gPKfI+Gut yM35ca3NmWarYJq9MwpwIxTbQoE6sd6QCQfyCSGsPfxJrnfnMtOFNPGyPExCNcz8zm1V EWcpqtl+O5T/Vf6SU0sa1hLr2FdjN3lpFdjRV3ysbDLEPNnExV7BrojlcfjQiYNJEfwj SyeA== X-Received: by 10.140.107.131 with SMTP id h3mr18435307qgf.83.1406234064059; Thu, 24 Jul 2014 13:34:24 -0700 (PDT) Received: from localhost.boston.devel.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by mx.google.com with ESMTPSA id n20sm10383318qar.38.2014.07.24.13.34.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2014 13:34:23 -0700 (PDT) From: j.glisse@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: fix cut and paste issue for hawaii. Date: Thu, 24 Jul 2014 16:34:17 -0400 Message-Id: <1406234057-7071-1-git-send-email-j.glisse@gmail.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Cc: Jerome Glisse , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jerome Glisse This is a halfway fix for hawaii acceleration. More fixes to come but hopefully isolated to userspace. Signed-off-by: Jérôme Glisse Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/cik.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index fc560b0..2b87edb 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -2521,6 +2521,7 @@ static void cik_tiling_mode_table_init(struct radeon_device *rdev) gb_tile_moden = 0; break; } + rdev->config.cik.macrotile_mode_array[reg_offset] = gb_tile_moden; WREG32(GB_MACROTILE_MODE0 + (reg_offset * 4), gb_tile_moden); } } else if (num_pipe_configs == 8) {