From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07DB51DDA14; Mon, 18 Aug 2025 13:34:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524080; cv=none; b=YObGe9WDrAM5RiFFUEn6LwTuxKWsCCDLi7C6k+aPAfs3c/bQ1H6+jvgxOSVuXEGgwNfaUYFDdyrFPu1KWDSU4rxsMRmU061k1hAgKmouhwElmOljv8I7uH/GMyI07EVUVSyoQOyGDpAgZe4DZh3g3lhoJ9EKEcifOxz7vqRkh+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524080; c=relaxed/simple; bh=o8vobFpedfrovBSPz4ZrnhtB1/q5NFhJauq0EXcnC00=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RlQru/pp51pEaCR0hCGtmkBnVhmI/+/wScG6tStp9P8h2wr05N6ulQZpn21cz7x8K2sD21oLtz3LiFNXDXZe7ZrpPSlSrts6Jqgm5StxfljJPdo8Bjwm9y12AERz6Rhe18QEM194qsXbg4r6eeQuIZ5FokwTDyUGOGeMxN6hBV0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hJ3FAOO/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hJ3FAOO/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C23FAC4CEEB; Mon, 18 Aug 2025 13:34:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755524079; bh=o8vobFpedfrovBSPz4ZrnhtB1/q5NFhJauq0EXcnC00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hJ3FAOO/l293y7UtTleNnW3htVMkK5m46k4wxaA7N9IJV3aKG79Y9tDdb0/gY+768 7fEphJUbOTeTJp27yZp3ItOaOAHr84GOFN7tHIttrnMiB5R4F9rgWIt5FuAAQYNFBg WmoJAwmcRFE6jujVeFJH9Q/CS7uAdbvstXQMuTec= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Sun peng (Leo) Li" , Mario Limonciello , Ivan Lipski , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 6.15 329/515] drm/amd/display: Avoid configuring PSR granularity if PSR-SU not supported Date: Mon, 18 Aug 2025 14:45:15 +0200 Message-ID: <20250818124511.099083590@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mario Limonciello [ Upstream commit a5ce8695d6d1b40d6960d2d298b579042c158f25 ] [Why] If PSR-SU is disabled on the link, then configuring su_y granularity in mod_power_calc_psr_configs() can lead to assertions in psr_su_set_dsc_slice_height(). [How] Check the PSR version in amdgpu_dm_link_setup_psr() to determine whether or not to configure granularity. Reviewed-by: Sun peng (Leo) Li Signed-off-by: Mario Limonciello Signed-off-by: Ivan Lipski Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c index e140b7a04d72..d63038ec4ec7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c @@ -127,8 +127,10 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream) psr_config.allow_multi_disp_optimizations = (amdgpu_dc_feature_mask & DC_PSR_ALLOW_MULTI_DISP_OPT); - if (!psr_su_set_dsc_slice_height(dc, link, stream, &psr_config)) - return false; + if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1) { + if (!psr_su_set_dsc_slice_height(dc, link, stream, &psr_config)) + return false; + } ret = dc_link_setup_psr(link, stream, &psr_config, &psr_context); -- 2.39.5