Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp436003imu; Wed, 12 Dec 2018 20:51:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/VWMDEzksVbuykedRr7CoUjQdn1jDhnnlDQe5g31YDyPFpPO0JYKkYW6MTF2djc5pjX/ZRu X-Received: by 2002:a63:b94c:: with SMTP id v12mr20556425pgo.221.1544676687038; Wed, 12 Dec 2018 20:51:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676687; cv=none; d=google.com; s=arc-20160816; b=X4fvOmB7BXfppfdfTnoj9/BiH3TPIBn9qN1kB7ZGqdrnUf45QVv3gaf1ADoifW+/pR u6k+yyFYi82ERGm2ZodZpjaBCkShQM+jkJDl+A9jg3eLkzHYZ7bU70+me4nrtwBgPG6W BI0FroDYQEKFbsgRHsNspfGkpBAcchUMyCroKvU27aG5ZoCw2osvzkzHm+VkBNIZCgNi 2FI/TA7c4w8lrRV+pIOAHC7YH8Mo4G48BmqOxQPPqK8TEc3RAPiPNYYq+1iW2XyUEsOc PetiRwh5iEBdCO23wnXPfV7CEZ9LpyeqF1MXZkwofzg1eysLdFar7dIWmeLofvVdvazt +ytw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CDJftVLtencVN6vIx9vAlSiTnEeOU7DB+POt42FNVdc=; b=DDpwVWHg7mXpd7C1k1A3jJ9XPvNMnG4k1VFsfalrO2Smx49bIf+MN51F/PmCasWriY vBCiZ61l9I1wWDh3nY1fXFAQ4l0nvaiFxgpwRtTW/SjmxWrMw7ttfmcqZyhTDD9ixT/9 mvw2CyDqgIxg5rCA9/2ogGSQuVyApwX57bZB0ibypauwNrTPtMzzSUgr3LHJNcWyymNH syN5S7uxejQE+6icdlSj3BwMKy2cBuRojp34U5G/hE1pGTtkxdeNFoKjnfCvcstAoIt3 ieYX00i2BKPczAznpNeWfUPYzfW8nuWjcCdQxWihaR4EPZx7vCTQ90Bu+j+6zqPA5ech 4aTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="r/dVO8K5"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si654102pgo.483.2018.12.12.20.51.12; Wed, 12 Dec 2018 20:51:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="r/dVO8K5"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbeLME3x (ORCPT + 99 others); Wed, 12 Dec 2018 23:29:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:42800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727859AbeLME3u (ORCPT ); Wed, 12 Dec 2018 23:29:50 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AD8E820879; Thu, 13 Dec 2018 04:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675389; bh=91zXGUhQY1tdEY7BDh2cg7C+Us+933/M93z/lmPwKqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r/dVO8K52V8D8QJwqoYvZtV8kLUXy/JnvvJr/du0J/4yBM93HIzo0TqaiIcRunP8D A8jpeq3VWhnaLGykWIjXHf5fmu3//6rYVoA4eqQQ0xkkzwuB+WXEVnj8VlIVErWe7u nhbVd2qgVLspRQzm9+OLA/GQf8ptToVIv9fV4tu4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Evan Quan , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 36/73] drm/amd/powerplay: issue pre-display settings for display change event Date: Wed, 12 Dec 2018 23:28:01 -0500 Message-Id: <20181213042838.75160-36-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Evan Quan [ Upstream commit 10cb3e6b63bf4266a5198813526fdd7259ffb8be ] For display config change event only, pre-display config settings are needed. Signed-off-by: Evan Quan Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 +++ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 8994aa5c8cf8..64596029b696 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c @@ -365,6 +365,9 @@ int hwmgr_handle_task(struct pp_hwmgr *hwmgr, enum amd_pp_task task_id, switch (task_id) { case AMD_PP_TASK_DISPLAY_CONFIG_CHANGE: + ret = phm_pre_display_configuration_changed(hwmgr); + if (ret) + return ret; ret = phm_set_cpu_power_state(hwmgr); if (ret) return ret; diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c index 91ffb7bc4ee7..56437866d120 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c @@ -265,8 +265,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip, if (skip) return 0; - phm_pre_display_configuration_changed(hwmgr); - phm_display_configuration_changed(hwmgr); if (hwmgr->ps) -- 2.19.1