From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Boll 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> References: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com> Return-path: In-Reply-To: <1406916332-4195-1-git-send-email-andreas.boll.dev@gmail.com> Sender: stable-owner@vger.kernel.org To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , Andreas Boll , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org 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) -- 2.0.1