From patchwork Wed Aug 27 08:10:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 4786731 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5A9789F375 for ; Wed, 27 Aug 2014 08:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E7EF3200E0 for ; Wed, 27 Aug 2014 08:11:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5DE97201C7 for ; Wed, 27 Aug 2014 08:11:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 719916E1C0; Wed, 27 Aug 2014 01:11:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id AF04E6E1C0 for ; Wed, 27 Aug 2014 01:11:24 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix2 Daemon) with ESMTP id C69DA7690F9 for ; Wed, 27 Aug 2014 10:11:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at vodafone.de X-Spam-Score: 0.165 X-Spam-Level: X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Authentication-Results: rohrpostix2.prod.vfnet.de (amavisd-new); dkim=softfail (invalid, public key: DNS query timeout for mail._domainkey.vodafone.de) header.i=@vodafone.de Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix2.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3GI5lYiEL96Q for ; Wed, 27 Aug 2014 10:10:58 +0200 (CEST) Received: from smtp-04.vodafone.de (smtp-04.vodafone.de [10.215.254.39]) by pegasos-out.vodafone.de (Rohrpostix2 Daemon) with ESMTP id 091307690EE; Wed, 27 Aug 2014 10:10:58 +0200 (CEST) X-DKIM: OpenDKIM Filter v2.6.8 pegasos-out.vodafone.de 091307690EE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafone.de; s=mail; t=1409127058; bh=EGY5EcxMkqutP6T28Dw+dfIIEqKyBTWLBR3VfZPC7+U=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=YZMXLv+PvA5tJ93pJwh4LHNXPWRoZy1M7K/XNYpRKw4zxkAN5GpD4RxZOAJQDVayn nusPnVF8s6dFXNHoqqta4sZS/gruB0/P95QQn4FYWBFckNa19FtohG+hl7Ets4hEq7 pcnZlc1gWUJoPM/DnAeAg/AYL9DWvzx2IwT84u8k= X-DKIM: OpenDKIM Filter v2.0.2 smtp-04.vodafone.de 557FFE6A66 X-Virus-Scanned: amavisd-new at vodafone.de Received: from smtp-04.vodafone.de ([127.0.0.1]) by localhost (xsmail-dmz8.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BNbQbkDrJOwH; Wed, 27 Aug 2014 10:10:45 +0200 (CEST) Received: from [192.168.137.21] (ip-37-201-241-71.hsi13.unitymediagroup.de [37.201.241.71]) by smtp-04.vodafone.de (Postfix) with ESMTPSA id 1ADBEE6ABC; Wed, 27 Aug 2014 10:10:45 +0200 (CEST) Message-ID: <53FD9284.7020603@vodafone.de> Date: Wed, 27 Aug 2014 10:10:44 +0200 From: =?windows-1252?Q?Christian_K=F6nig?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Alex Deucher , dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm/radeon: soft reset uvd on RV770 uvd init References: <1409108650-2130-1-git-send-email-alexander.deucher@amd.com> In-Reply-To: <1409108650-2130-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Am 27.08.2014 um 05:04 schrieb Alex Deucher: > Fixes avoids and error message on boot which is harmless, > but confusing to users. > > Signed-off-by: Alex Deucher The attached patch fixes the underlying issue for me on RS780. Does it also work on RV770? If yes than it's probably the better approach. Christian. > --- > drivers/gpu/drm/radeon/uvd_v1_0.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c > index e251624..82e4fa6 100644 > --- a/drivers/gpu/drm/radeon/uvd_v1_0.c > +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c > @@ -325,6 +325,13 @@ int uvd_v1_0_start(struct radeon_device *rdev) > > WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); > > + if (rdev->family == CHIP_RV770) { > + WREG32_P(UVD_SOFT_RESET, VCPU_SOFT_RESET, ~VCPU_SOFT_RESET); > + mdelay(10); > + WREG32_P(UVD_SOFT_RESET, 0, ~VCPU_SOFT_RESET); > + mdelay(10); > + } > + > for (i = 0; i < 10; ++i) { > uint32_t status; > for (j = 0; j < 100; ++j) { From 499b07135129211d633820cb57bc39cf14bda86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 27 Aug 2014 09:59:45 +0200 Subject: [PATCH] drm/radeon: enable RB_ARB before resetting the VCPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes "UVD not responding, trying to reset the VCPU" messages on earlier ASICs. Signed-off-by: Christian König --- drivers/gpu/drm/radeon/uvd_v1_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c index e251624..339817a 100644 --- a/drivers/gpu/drm/radeon/uvd_v1_0.c +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c @@ -319,12 +319,12 @@ int uvd_v1_0_start(struct radeon_device *rdev) /* enable UMC */ WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8)); + WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); + /* boot up the VCPU */ WREG32(UVD_SOFT_RESET, 0); mdelay(10); - WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); - for (i = 0; i < 10; ++i) { uint32_t status; for (j = 0; j < 100; ++j) { -- 1.9.1