From patchwork Tue Apr 15 16:44:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3994181 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 126D99F336 for ; Tue, 15 Apr 2014 16:45:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C2532026C for ; Tue, 15 Apr 2014 16:45:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 809E120200 for ; Tue, 15 Apr 2014 16:45:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A2F816E930; Tue, 15 Apr 2014 09:45:03 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f173.google.com (mail-qc0-f173.google.com [209.85.216.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FDFD6E930 for ; Tue, 15 Apr 2014 09:45:02 -0700 (PDT) Received: by mail-qc0-f173.google.com with SMTP id r5so10493476qcx.4 for ; Tue, 15 Apr 2014 09:45:01 -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:in-reply-to:references; bh=y0FIUpXgHHoHuRB6v5f0iHNWm10PZzi8kmk+LJMRUis=; b=VLqrAm5lOZEdkwWvgDKdD3n8Lw5KHqRFGTKPMvfAk17prr77+2kzGPTKeStTWvMDQB +DAfoG/JcHzlgnH7vdrfOA6Dn/Ovlb4KHueRwmTqxPK72W742yy7pgczeZX71AQqn/mb J09UN3Id39HX2HgzpjSYWDgMCWTHmKou+3wyKZjuxlTxZV/MGDrELhBwQ787IGLbUOpU SXLzWlDfHGXap92aPjeV2r2DEpkkbYYMQeti8Aw0IEs/L47+FoJwU4UBs0/YNL3xNP2d w9V8z/f7fkkyyrhDJsiVA7pIcDoSFcLpuUnIRWg0pHNJu2f6ufcH7Px++/fRlh9eTP7P eNsA== X-Received: by 10.140.50.231 with SMTP id s94mr3915670qga.33.1397580282528; Tue, 15 Apr 2014 09:44:42 -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 a10sm38314704qas.6.2014.04.15.09.44.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Apr 2014 09:44:42 -0700 (PDT) From: Alex Deucher To: dri-devel@lists.freedesktop.org, deathsimple@vodafone.de Subject: [PATCH 4/4] drm/radeon: don't allow runpm=1 on systems with out ATPX Date: Tue, 15 Apr 2014 12:44:35 -0400 Message-Id: <1397580275-11967-4-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1397580275-11967-1-git-send-email-alexander.deucher@amd.com> References: <1397580275-11967-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher , stable@vger.kernel.org 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.7 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 vgaswitcheroo and the ATPX ACPI methods are required to power down the dGPU. bug: https://bugzilla.kernel.org/show_bug.cgi?id=73901 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_kms.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 9337820..f4a9c5d 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -107,11 +107,9 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) flags |= RADEON_IS_PCI; } - if (radeon_runtime_pm == 1) - flags |= RADEON_IS_PX; - else if ((radeon_runtime_pm == -1) && - radeon_has_atpx() && - ((flags & RADEON_IS_IGP) == 0)) + if ((radeon_runtime_pm != 0) && + radeon_has_atpx() && + ((flags & RADEON_IS_IGP) == 0)) flags |= RADEON_IS_PX; /* radeon_device_init should report only fatal error