From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Boll 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> References: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: 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) In-Reply-To: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org 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; } -- 2.0.1