All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andreas Boll <andreas.boll.dev@gmail.com>
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	[thread overview]
Message-ID: <1406916332-4195-4-git-send-email-andreas.boll.dev@gmail.com> (raw)
In-Reply-To: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com>

Adjust the previous tweak for hawaii to return 3 if the new firmware is used.

Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
---
 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

  parent reply	other threads:[~2014-08-01 18:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-01 18:05 [PATCH 1/4] drm/radeon: use packet2 for nop on hawaii with old firmware Andreas Boll
2014-08-01 18:05 ` [PATCH 2/4] drm/radeon: tweak ACCEL_WORKING2 query for hawaii Andreas Boll
2014-08-01 18:05 ` [PATCH 3/4] drm/radeon: use packet3 for nop on hawaii with new firmware Andreas Boll
2014-08-01 18:05 ` Andreas Boll [this message]
2014-08-04 18:42 ` [PATCH 1/4] drm/radeon: use packet2 for nop on hawaii with old firmware Alex Deucher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1406916332-4195-4-git-send-email-andreas.boll.dev@gmail.com \
    --to=andreas.boll.dev@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.