Commit fd62aa13 authored by Ray Wu's avatar Ray Wu Committed by Alex Deucher
Browse files

drm/amd/display: Fix scratch registers offsets for DCN351 

[Why]
Different platforms use different NBIO header files,
causing display code to use differnt offset and read
wrong accelerated status.

[How]
- Unified NBIO offset header file across platform.
- Correct scratch registers offsets to proper locations.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4667


Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarRay Wu <ray.wu@amd.com>
Signed-off-by: default avatarChenyu Chen <chen-yu.chen@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 576e032e)
Cc: stable@vger.kernel.org
parent 69741d9c

drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c

+4 −4
Original line number Diff line number Diff line
@@ -183,12 +183,12 @@ enum dcn351_clk_src_array_id { 
	NBIO_BASE_INNER(seg)



#define NBIO_SR(reg_name)\

	REG_STRUCT.reg_name = NBIO_BASE(regBIF_BX2_ ## reg_name ## _BASE_IDX) + \

				regBIF_BX2_ ## reg_name

	REG_STRUCT.reg_name = NBIO_BASE(regBIF_BX1_ ## reg_name ## _BASE_IDX) + \

				regBIF_BX1_ ## reg_name



#define NBIO_SR_ARR(reg_name, id)\

	REG_STRUCT[id].reg_name = NBIO_BASE(regBIF_BX2_ ## reg_name ## _BASE_IDX) + \

		regBIF_BX2_ ## reg_name

	REG_STRUCT[id].reg_name = NBIO_BASE(regBIF_BX1_ ## reg_name ## _BASE_IDX) + \

		regBIF_BX1_ ## reg_name



#define bios_regs_init() \

		( \