From patchwork Wed Aug 27 03:04:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 4785411 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 C063D9F2E8 for ; Wed, 27 Aug 2014 03:04:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E713020176 for ; Wed, 27 Aug 2014 03:04:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AFCC42015A for ; Wed, 27 Aug 2014 03:04:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EF1E6E1C4; Tue, 26 Aug 2014 20:04:19 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f174.google.com (mail-qc0-f174.google.com [209.85.216.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 810D56E1C4 for ; Tue, 26 Aug 2014 20:04:18 -0700 (PDT) Received: by mail-qc0-f174.google.com with SMTP id l6so16355564qcy.5 for ; Tue, 26 Aug 2014 20:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3xPC/S3wSbi0bZPcc75rKa4XTaYhsWToMTqTGvixw4M=; b=lXk25SJOg697jK2ybIbfSlWvRepIr4AOcyJ7ILnhfDV2Bz3s4d0YbzZ6GuVahI2Cox c/KeRWLQOcFFPSGW9fisV9OMlT2cGPgh4qpx0k60mcC58cPcsbtlc0XGH88je7BC0Fny s8ZSL9yUzyz2kvVeFAyg0DSV5B+infhp6CDiOaFmG4zo3xDAz2a6Um5FKBbhDAuBZO/j 5JTz07lWo6KuOPYdk/4uz433OcmK8RUr9+wAYJHfH3P6JEez8V3yUyCVOQAFG6AqiCHR Wq4Jb/jcTpU0qW7tkg8FNe/+qw5yMnxHSCKESRV7yXoFdqeZ4gwjD6kBZyc5VVIozqj7 44oA== X-Received: by 10.140.84.138 with SMTP id l10mr48678892qgd.51.1409108657995; Tue, 26 Aug 2014 20:04:17 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id h9sm15398861qai.30.2014.08.26.20.04.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Aug 2014 20:04:17 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: soft reset uvd on RV770 uvd init Date: Tue, 26 Aug 2014 23:04:10 -0400 Message-Id: <1409108650-2130-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes avoids and error message on boot which is harmless, but confusing to users. Signed-off-by: Alex Deucher --- 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) {