From patchwork Fri Aug 1 18:05:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Boll X-Patchwork-Id: 4664071 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 354EEC033A for ; Fri, 1 Aug 2014 18:06:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6028E2021F for ; Fri, 1 Aug 2014 18:06:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8828D201F7 for ; Fri, 1 Aug 2014 18:06:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AD9589DD5; Fri, 1 Aug 2014 11:06:07 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 8657F89DD5 for ; Fri, 1 Aug 2014 11:06:05 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id w62so4723750wes.36 for ; Fri, 01 Aug 2014 11:06:04 -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=HmnvRmgJcFhPhYbD/hk9ouJv0x325Al1BXlGNcq0kmk=; b=a+m7tc4IzkU8+o2N/CEBdL0NCXXqzxIfwDUuHCqRpQT0VwNJ2T5fzq53rpJZUL0lwz +JmzxRJS7pxxnzaVOzESPatwvFLcjnr4SVrRHcg3bCm7Mf65ERIjhbBMAVJ0MoIR0GDC xmg1FDT88zXuaGHIOGJF1GNJwvhlRRXDZyhHfleXvbqsG3m22nd1YQOJR/tjMHfRVdMA mYFhxcxvbHfChjVrj+syGj1EeUlkrKBTy02pyadvcI48HxAdzk3iD2kvfdILmf9FT+FD tEyPUpANuDbIROBZ/0BS3V3BF9WXX6gAycqtUfBaVG+fV5Svpx82xW7bPh+qOE/jNKRs PGYw== X-Received: by 10.180.81.234 with SMTP id d10mr9190336wiy.79.1406916364678; Fri, 01 Aug 2014 11:06:04 -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.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Aug 2014 11:06:03 -0700 (PDT) From: Andreas Boll To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/4] drm/radeon: tweak ACCEL_WORKING2 query for hawaii Date: Fri, 1 Aug 2014 20:05:30 +0200 Message-Id: <1406916332-4195-2-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 , 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: , 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 Return 2 so we can be sure the kernel has the necessary changes for acceleration to work. Note: This patch depends on these two commits: - drm/radeon: fix cut and paste issue for hawaii. - drm/radeon: use packet2 for nop on hawaii with old firmware Signed-off-by: Alex Deucher Signed-off-by: Andreas Boll Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_kms.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index d25ae6a..c1a206d 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -254,7 +254,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file } break; case RADEON_INFO_ACCEL_WORKING2: - *value = rdev->accel_working; + if (rdev->family == CHIP_HAWAII) { + if (rdev->accel_working) + *value = 2; + else + *value = 0; + } else { + *value = rdev->accel_working; + } break; case RADEON_INFO_TILING_CONFIG: if (rdev->family >= CHIP_BONAIRE)