Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp447355pxb; Thu, 9 Sep 2021 04:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaa1cUUkGsRuaOXD73DYHIFwAW+czky1hBdFs69u/b4sbNUBL7MJkXCyv6NfRfOmM8hAxS X-Received: by 2002:a05:6602:3284:: with SMTP id d4mr2240937ioz.100.1631188146102; Thu, 09 Sep 2021 04:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188146; cv=none; d=google.com; s=arc-20160816; b=GOFE8HsfY7RhulmYSu1bQecnWoN2mHwPzerG/VrtHfApw3nhKl+SQn0EgP1BdPnuFm CpeJi7mkkZPnqQoYbQtGtPxONQh8Bx+IUK72UXuLIR1ibFXCBF9wqw3+q8ElXHo5api0 tVY+v5dy/yciuggyZs6HCBenhzV5dSCz1NDhLG6Hk0qYCqln+YOcuytlV+VavCPVlf7l IZREzKGs/DAGcoWGcw2kKc8eqNBOBYXUhq0TFT2spcQTJrpphNRTDEVYQQC7Oqlm4WAf yHb1pfji6LdWr1NL0Lr0z+9GMFBl9QlL8OMc8KkfFvHauVP5zbgE5Jd6gpHSf/l9Ix0x 92EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nnNKKxiR4UsA59bxi4Qu0Sj0I0WBxKaXC/t5eKZRoOs=; b=PXnOXHme8TyuCbyFdUs/JzczWYfnlvfXc8FJuudmd8hzO4VriMpKZXrEa2g4AJYptX WC8sL1VQ/G98IIVzdJDtIjIAu6zMU5GF/A5dTmgJXeWIZEKR4CUPRJjAdF8MCSgecW2N GuuT9uQpn/nsKmQbSbRM8hbX8AoyNwReUr5qPWYY2D+sTS5gz3PDyZIxS7PNy3x0nSkl poA1ySSC0sS/dxtd/q4hCQKt9ZXGOwuPWDBxf7iagdbfG6ATz/TCCyIDnpR6AYtVt2IC gLIMUlavrQE/2vxJs9sPrMpR2/7QkAWR2LAXSLpFOtPGlgJC2G+HRlo9oLI9eJfOX7KR RXgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LiN7Iloc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id t42si1795509jal.13.2021.09.09.04.48.54; Thu, 09 Sep 2021 04:49:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LiN7Iloc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S238114AbhIILsQ (ORCPT + 99 others); Thu, 9 Sep 2021 07:48:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:47266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240426AbhIILpw (ORCPT ); Thu, 9 Sep 2021 07:45:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B4421611CE; Thu, 9 Sep 2021 11:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187773; bh=WNI+MCurftRnG04/cAAncVCu0T2V7AVRB41i1UNH/r4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LiN7IlocnQMfOvg2xZoKcjwmX/n1QzGGRVzgr0Q/rBq3YIIoGhkZQatchfCnAC0Rv T71orvtkezfW/SeARaBzL88EfwBX4MOyJDhAHCKkKOtI//uWtETFD5TxEIUVs+TmcT N/+BmPZfZlfNM2W/D9kSvaXc+ySWi0Hs+2zckfLBWbM+KrDIcxiDDj5Dqhs4/1+gAq pGyfa17uQJhx6F6OzRe6Ho5Gf3iy37a7v77TK7REIKW80ZCFwxiMCvNLocHR6oB8CE 0VA9Pd7rIlCMSkEqp7r5PStpAh7GB2+sLXIO7dAm3GBxI86UN3wc9ZErnrkRQrHTdM kp5E+WV0DShuw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikita Lipski , Wood Wyatt , Solomon Chiu , Daniel Wheeler , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.14 084/252] drm/amd/display: Fix PSR command version Date: Thu, 9 Sep 2021 07:38:18 -0400 Message-Id: <20210909114106.141462-84-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mikita Lipski [ Upstream commit af1f2b19fd7d404d299355cc95930efee5b3ed8b ] [why] For dual eDP when setting the new settings we need to set command version to DMUB_CMD_PSR_CONTROL_VERSION_1, otherwise DMUB will not read panel_inst parameter. [how] Instead of PSR_VERSION_1 pass DMUB_CMD_PSR_CONTROL_VERSION_1 Reviewed-by: Wood Wyatt Acked-by: Solomon Chiu Signed-off-by: Mikita Lipski Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c index 10d42ae0cffe..3428334c6c57 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c @@ -207,7 +207,7 @@ static void dmub_psr_set_level(struct dmub_psr *dmub, uint16_t psr_level, uint8_ cmd.psr_set_level.header.sub_type = DMUB_CMD__PSR_SET_LEVEL; cmd.psr_set_level.header.payload_bytes = sizeof(struct dmub_cmd_psr_set_level_data); cmd.psr_set_level.psr_set_level_data.psr_level = psr_level; - cmd.psr_set_level.psr_set_level_data.cmd_version = PSR_VERSION_1; + cmd.psr_set_level.psr_set_level_data.cmd_version = DMUB_CMD_PSR_CONTROL_VERSION_1; cmd.psr_set_level.psr_set_level_data.panel_inst = panel_inst; dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd); dc_dmub_srv_cmd_execute(dc->dmub_srv); @@ -293,7 +293,7 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, copy_settings_data->debug.bitfields.use_hw_lock_mgr = 1; copy_settings_data->fec_enable_status = (link->fec_state == dc_link_fec_enabled); copy_settings_data->fec_enable_delay_in100us = link->dc->debug.fec_enable_delay_in100us; - copy_settings_data->cmd_version = PSR_VERSION_1; + copy_settings_data->cmd_version = DMUB_CMD_PSR_CONTROL_VERSION_1; copy_settings_data->panel_inst = panel_inst; dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd); -- 2.30.2