From patchwork Fri Feb 19 23:17:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8364971 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6AE78C0553 for ; Fri, 19 Feb 2016 23:17:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98B1320527 for ; Fri, 19 Feb 2016 23:17:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AFF9420531 for ; Fri, 19 Feb 2016 23:17:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F30DF6F07D; Fri, 19 Feb 2016 23:17:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x22d.google.com (mail-qg0-x22d.google.com [IPv6:2607:f8b0:400d:c04::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 261986F077 for ; Fri, 19 Feb 2016 23:17:17 +0000 (UTC) Received: by mail-qg0-x22d.google.com with SMTP id b67so73923231qgb.1 for ; Fri, 19 Feb 2016 15:17:17 -0800 (PST) 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=N8GyaQLfqZbgmwvUzDiOmKHRpvP7on7y4wxmoZ0X4d8=; b=F1UYfyd1xG+zCiskiNuYs/WyTR9omTTLn88XLFZb9GfXaBooAJMjSx1cpMRm1GdKn2 QZlUbd5I4SjDj2Jr6z2ZW/dVG9Xv3FwCyiuRd1Hfy97Acw1Hm/MZT5UeMXxjmlYqJe2k 5a2T/xITjrp6YySffe4cA154ju16/BFUQ9zMwkdszpu5WEkxjmQawtk64K/18iG9KZbT NuzXT5cr/sisX0hEPdnyOQlQbQKZA0pYpUa1lIwFNV+poio7ENmw9bU073X7tSYC3isW p/VGmdw0bf9Kv47+dlCMSTUl240HmusrIMtLr1rGsOJZFwH4drxJiw/ZlHAxZDx3wayL mlKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N8GyaQLfqZbgmwvUzDiOmKHRpvP7on7y4wxmoZ0X4d8=; b=QE+QbbRkZTnIxOLLEbC7AEmAW+Sks3z9K+AK9gplTPUidJL3whzXA8vwiN6p54/IMK JYlO2K197YOn4pYdSDmRvF0KDfZcHzbe6l7FpVhfH3A1IDnulVKRzWA8CJjn1DhCsh+o rj8gR6km3K4C1Nsvyh+7pw9OefKeAVYpByasixU8gj0BixzK6g9nDLo+404AkGpizuZ0 R6nXdwnMHjhYHWwntNEPDid6b6lyUTGToR+x8lh3sxTv5ynS7GkP87iCdmqPc+iMBKLs Qprrs337t3lRG1FNJpNk7Ljn9dStZ4KmqovtGmckG5xPVwXG125ZdRVMsFwgZBsbkv4c huqg== X-Gm-Message-State: AG10YOTy1V2JSPxvwoU6PVr/iheJpeSw+Q2NCuK/rKu87q/o36oVcPpowYGgeI1l6YuUGA== X-Received: by 10.140.178.195 with SMTP id y186mr20660623qhy.100.1455923836402; Fri, 19 Feb 2016 15:17:16 -0800 (PST) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id r21sm5623539qkl.21.2016.02.19.15.17.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Feb 2016 15:17:15 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/5] drm/radeon/pm: adjust display configuration after powerstate Date: Fri, 19 Feb 2016 18:17:05 -0500 Message-Id: <1455923825-28464-5-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455923825-28464-1-git-send-email-alexander.deucher@amd.com> References: <1455923825-28464-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.18 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 set_power_state defaults to no displays, so we need to update the display configuration after setting up the powerstate on the first call. In most cases this is not an issue since ends up getting called multiple times at any given modeset and the proper order is achieved in the display changed handling at the top of the function. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_pm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 248c5a9..ca3be90 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -1079,8 +1079,6 @@ force: /* update display watermarks based on new power state */ radeon_bandwidth_update(rdev); - /* update displays */ - radeon_dpm_display_configuration_changed(rdev); rdev->pm.dpm.current_active_crtcs = rdev->pm.dpm.new_active_crtcs; rdev->pm.dpm.current_active_crtc_count = rdev->pm.dpm.new_active_crtc_count; @@ -1101,6 +1099,9 @@ force: radeon_dpm_post_set_power_state(rdev); + /* update displays */ + radeon_dpm_display_configuration_changed(rdev); + if (rdev->asic->dpm.force_performance_level) { if (rdev->pm.dpm.thermal_active) { enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level;