From patchwork Wed Oct 30 13:41:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWFyZWsgT2zFocOhaw==?= X-Patchwork-Id: 3114641 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3C998BF924 for ; Wed, 30 Oct 2013 13:41:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E68B2037D for ; Wed, 30 Oct 2013 13:41:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 92472201B4 for ; Wed, 30 Oct 2013 13:41:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD104EE2C4; Wed, 30 Oct 2013 06:41:45 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E5A4EE2C4 for ; Wed, 30 Oct 2013 06:41:43 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id f15so658554eak.36 for ; Wed, 30 Oct 2013 06:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=l2Q3CN3okPPO0CDabImC2Q5mZIPIHhk3Y82CE7tkdUM=; b=mj3/FBFC4wfCo0e5sgR1Q0K+HcOGpX9tdVjNDHs3vCae50hhVb2k2rokhkSzRP+XwR yRjtgjzn4W50jg7NMMVmCfx3E9CJWsgaq78KQiiGZYni/aptI7p5ZRfukK9SBQN5R/+V FjvNe9unSYel8/Ca6k71Vwimkq4iEufS0Ybjrb9JFoVN9Q9xnZtuZRSe9xWFPfYGNAiQ A3kAe9t8tRdS0sAINunViH2B7ZAJmCBEom5Xm3VeeBqU7Y0ZUQrvm7qHBiGfH8fU8+BY A5guNgqtuk5KjghuE6R8LmF2WcrB6oVpG1/ophaizTwL04ePxG3RsF0Eojn/UYOyEqe9 0D3Q== X-Received: by 10.14.122.8 with SMTP id s8mr375343eeh.106.1383140502635; Wed, 30 Oct 2013 06:41:42 -0700 (PDT) Received: from localhost.localdomain (static-84-242-70-218.net.upcbroadband.cz. [84.242.70.218]) by mx.google.com with ESMTPSA id z12sm83668807eev.6.2013.10.30.06.41.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Oct 2013 06:41:42 -0700 (PDT) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: don't use PACKET2 on CIK Date: Wed, 30 Oct 2013 14:41:35 +0100 Message-Id: <1383140495-24678-1-git-send-email-maraeo@gmail.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 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: Marek Olšák It is said to cause hangs. Signed-off-by: Marek Olšák --- 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 2cd2ac0..44507a4 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev) ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET, CP_RB0_RPTR, CP_RB0_WPTR, - RADEON_CP_PACKET2); + PACKET3(PACKET3_NOP, 0x3FFF)); if (r) return r;