From patchwork Fri Aug 1 18:05:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Boll X-Patchwork-Id: 4664081 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 729C9C033A 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 B2988201F7 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 5750620219 for ; Fri, 1 Aug 2014 18:06:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B1B589DEC; Fri, 1 Aug 2014 11:06:09 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by gabe.freedesktop.org (Postfix) with ESMTP id E5F6689DEC for ; Fri, 1 Aug 2014 11:06:08 -0700 (PDT) Received: by mail-we0-f179.google.com with SMTP id u57so4671248wes.24 for ; Fri, 01 Aug 2014 11:06:08 -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=8bEnERzAPxzAtQZB2/dhKJizns5BrXk8vQQqX7qbZwE=; b=mdx8DzlG4IInZ4sduyjFw/Jdppz62RfA5RWv1hgfx0Pk6ev77XWiq16N0QjZ2SEjBc sYYjcM0vhzsjr31tNuySP1kAGW4LntGdvJBADFfKBmnr7mghtTv1ieETp8dzsRtnTNvJ fo1W1RFw8dAHo3swLU3RRBuGgqqnRLpAg/lGp2WaT0QoOYIqwg8oskrLeSH0ywgS1KbK ot20G7pJVA5n0ZXrit2EFhOCkNyrvUBOT/5hA5qTv5GQwuYYI0mFQAC+YhLTi/au1aBc Cq98t+0k2Uf8hrfQBWNdGFqm9zvkYyhXuIBOrtqQ1a8i8DoumFy45UanmWB9KGEJssuT Wzkg== X-Received: by 10.180.102.100 with SMTP id fn4mr9458232wib.22.1406916367955; Fri, 01 Aug 2014 11:06:07 -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.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Aug 2014 11:06:07 -0700 (PDT) From: Andreas Boll To: dri-devel@lists.freedesktop.org Subject: [PATCH 4/4] drm/radeon: tweak ACCEL_WORKING2 query for the new firmware for hawaii Date: Fri, 1 Aug 2014 20:05:32 +0200 Message-Id: <1406916332-4195-4-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> 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 Adjust the previous tweak for hawaii to return 3 if the new firmware is used. Signed-off-by: Andreas Boll --- drivers/gpu/drm/radeon/radeon_kms.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index c1a206d..eb7164d 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -255,10 +255,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file break; case RADEON_INFO_ACCEL_WORKING2: if (rdev->family == CHIP_HAWAII) { - if (rdev->accel_working) - *value = 2; - else + if (rdev->accel_working) { + if (rdev->new_fw) + *value = 3; + else + *value = 2; + } else { *value = 0; + } } else { *value = rdev->accel_working; }