From patchwork Wed Jun 26 13:23:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2786621 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 7EE059F245 for ; Wed, 26 Jun 2013 15:28:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B71020588 for ; Wed, 26 Jun 2013 15:27:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 29A4D2057D for ; Wed, 26 Jun 2013 15:27:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B43CE5C33 for ; Wed, 26 Jun 2013 08:27:58 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f47.google.com (mail-qa0-f47.google.com [209.85.216.47]) by gabe.freedesktop.org (Postfix) with ESMTP id D4D74E636A for ; Wed, 26 Jun 2013 06:25:30 -0700 (PDT) Received: by mail-qa0-f47.google.com with SMTP id i13so1567171qae.13 for ; Wed, 26 Jun 2013 06:25:30 -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:x-mailer:in-reply-to:references; bh=GdLKgdSlfgjrB496arMhdviHr2bFdg36MJ3OL/RYJ4s=; b=Q2MBBCECArGq3CbDBo/OIoOx0/ycHDpUxbiGYXuiY5sPbpdPjzVXCsXwR098ZVCEel khPcYt6XxmrKNQl3Zu2/KXs3qg0SS1YUVAhd9wVO8+KJnHBbxC9NIcIf//hpjXSSSMVC DzjCTKI8nunI1m58Nej9BbXyiWq3mtYbsHtJTxsVm026/Q0nOedAcKxPzjUojmBDAtCn jezWbrpriK0mhTa0qew22HFfe7XRv0W0SC5SAwC6r6ECZzkS/wf312hwtRysG5gAhJGi 88UCb0PUTvMTXKt3fJOUfxQb8S+ZBHA7gwE2eP+8nDrfm9XHYtsU7YmpLemI43pVcCUp czpw== X-Received: by 10.224.63.70 with SMTP id a6mr5425884qai.34.1372253130438; Wed, 26 Jun 2013 06:25:30 -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 r10sm32665096qeu.4.2013.06.26.06.25.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Jun 2013 06:25:30 -0700 (PDT) From: alexdeucher@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 110/165] drm/radeon: add missing UVD clock set in cayman dpm code Date: Wed, 26 Jun 2013 09:23:10 -0400 Message-Id: <1372253045-17042-111-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1372253045-17042-1-git-send-email-alexdeucher@gmail.com> References: <1372253045-17042-1-git-send-email-alexdeucher@gmail.com> Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.4 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 From: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/ni_dpm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 01ecb80..a88f0cb 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -3667,9 +3667,11 @@ int ni_dpm_set_power_state(struct radeon_device *rdev) { struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev); struct radeon_ps *new_ps = &eg_pi->requested_rps; + struct radeon_ps *old_ps = &eg_pi->current_rps; int ret; ni_restrict_performance_levels_before_switch(rdev); + rv770_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps); ni_enable_power_containment(rdev, new_ps, false); ni_enable_smc_cac(rdev, new_ps, false); rv770_halt_smc(rdev); @@ -3684,6 +3686,7 @@ int ni_dpm_set_power_state(struct radeon_device *rdev) ni_populate_smc_tdp_limits(rdev, new_ps); rv770_resume_smc(rdev); rv770_set_sw_state(rdev); + rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps); ni_enable_smc_cac(rdev, new_ps, true); ni_enable_power_containment(rdev, new_ps, true);