Commit 66dda49e authored by Alvin Lee's avatar Alvin Lee Committed by openeuler-sync-bot
Browse files

drm/amd/display: Assign linear_pitch_alignment even for VM 

stable inclusion
from stable-v6.1.109
commit d219f902b16d42f0cb8c499ea8f31cf3c0f36349
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARVIX
CVE: CVE-2024-46732

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d219f902b16d42f0cb8c499ea8f31cf3c0f36349



--------------------------------

[ Upstream commit 984debc133efa05e62f5aa1a7a1dd8ca0ef041f4 ]

[Description]
Assign linear_pitch_alignment so we don't cause a divide by 0
error in VM environments

Reviewed-by: default avatarSohaib Nadeem <sohaib.nadeem@amd.com>
Acked-by: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Conflicts:
    drivers/gpu/drm/amd/display/dc/core/dc.c
[Context conflicts with dc_create().]
Signed-off-by: default avatarGu Bowen <gubowen5@huawei.com>
(cherry picked from commit 136bfc59)
parent 2baf7c07

drivers/gpu/drm/amd/display/dc/core/dc.c

+1 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ struct dc *dc_create(const struct dc_init_data *init_params) 
		goto alloc_fail;



	if (init_params->dce_environment == DCE_ENV_VIRTUAL_HW) {

		dc->caps.linear_pitch_alignment = 64;

		if (false == dc_construct_ctx(dc, init_params)) {

			dc_destruct(dc);

			goto construct_fail;