From patchwork Fri Aug 1 18:05:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Boll X-Patchwork-Id: 4664091 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 9DE9E9F36A for ; Fri, 1 Aug 2014 18:06:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EED522021B for ; Fri, 1 Aug 2014 18:06:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 365F7201C8 for ; Fri, 1 Aug 2014 18:06:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C2D089DFF; Fri, 1 Aug 2014 11:06:10 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 01D636E7C9 for ; Fri, 1 Aug 2014 11:06:07 -0700 (PDT) Received: by mail-we0-f175.google.com with SMTP id t60so4728748wes.20 for ; Fri, 01 Aug 2014 11:06:07 -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=Mk+c9ptlsrckSTOKqaEeuaR52YNvSq0OjIWPse9aurY=; b=eFWRUsED8mQ+lKObshLzF4fdwPQDXgJy64s1H7atBiBG7qHM0yL8wV0kPpZg2Xr9Mg EZIfRm4wQBohKXV9m2SrZYGIBSKn34vAbKMTQVIK94wDuyos8RGaTwLk6/BL4tlgs7MC 91VmKMKyqIKxpknEFlGRjBCx7gmniufwPFbNZJExYB67gf0dR11XsWI9gsmVUHZoH7z9 D7qDfFfPwY6b7JCMSmEZUVbZnqvLDm7CFBlMnz1WPpxkoNiqC0aDcYKYHZ1iSNf44NpA UtvaPJJHpNR++C/jLWxv917zu+k++AbnutDIelFlnUHapz0UgY6T64cbuQAqOG0relIj y2Zw== X-Received: by 10.180.221.134 with SMTP id qe6mr9333116wic.66.1406916366324; Fri, 01 Aug 2014 11:06:06 -0700 (PDT) Received: from debian.tuwien.ac.at (p237-175.vps.tuwien.ac.at. [128.131.237.175]) by mx.google.com with ESMTPSA id gq4sm10894574wib.8.2014.08.01.11.06.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Aug 2014 11:06:05 -0700 (PDT) From: Andreas Boll To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/4] drm/radeon: use packet3 for nop on hawaii with new firmware Date: Fri, 1 Aug 2014 20:05:31 +0200 Message-Id: <1406916332-4195-3-git-send-email-andreas.boll.dev@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com> References: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com> Cc: Alex Deucher 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 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: Alex Deucher Older firmware didn't support the new nop packet. Signed-off-by: Alex Deucher Signed-off-by: Andreas Boll --- drivers/gpu/drm/radeon/cik.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index e5985d5..8b580dc 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -8035,7 +8035,10 @@ static int cik_startup(struct radeon_device *rdev) cik_irq_set(rdev); if (rdev->family == CHIP_HAWAII) { - nop = RADEON_CP_PACKET2; + if (rdev->new_fw) + nop = PACKET3(PACKET3_NOP, 0x3FFF); + else + nop = RADEON_CP_PACKET2; } else { nop = PACKET3(PACKET3_NOP, 0x3FFF); }