From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Boll Subject: [PATCH 3/4] drm/radeon: use packet3 for nop on hawaii with new firmware Date: Fri, 1 Aug 2014 20:05:31 +0200 Message-ID: <1406916332-4195-3-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-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 01D636E7C9 for ; Fri, 1 Aug 2014 11:06:07 -0700 (PDT) Received: by mail-we0-f175.google.com with SMTP id t60so4728748wes.20 for ; Fri, 01 Aug 2014 11:06:07 -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 Cc: Alex Deucher List-Id: dri-devel@lists.freedesktop.org From: Alex Deucher Older firmware didn't support the new nop packet. Signed-off-by: Alex Deucher Signed-off-by: Andreas Boll --- drivers/gpu/drm/radeon/cik.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index e5985d5..8b580dc 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -8035,7 +8035,10 @@ static int cik_startup(struct radeon_device *rdev) cik_irq_set(rdev); if (rdev->family == CHIP_HAWAII) { - nop = RADEON_CP_PACKET2; + if (rdev->new_fw) + nop = PACKET3(PACKET3_NOP, 0x3FFF); + else + nop = RADEON_CP_PACKET2; } else { nop = PACKET3(PACKET3_NOP, 0x3FFF); } -- 2.0.1