From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 30 Oct 2013 13:41:35 +0000 (+0100)
Subject: drm/radeon: don't use PACKET2 on CIK
X-Git-Tag: upstream/snapshot3+hdmi~3696^2~151^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dac28eb726109e7ac256051b157baf60b21a5f7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

drm/radeon: don't use PACKET2 on CIK

It is said to cause hangs.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 2ddb01d..afee68a 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -7188,7 +7188,7 @@ static int cik_startup(struct radeon_device *rdev)
 	ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
 	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
 			     CP_RB0_RPTR, CP_RB0_WPTR,
-			     RADEON_CP_PACKET2);
+			     PACKET3(PACKET3_NOP, 0x3FFF));
 	if (r)
 		return r;