Skip to content

Commit 7d5df9d

Browse files
Ray6161gregkh
authored andcommitted
drm/amd/display: Fix scratch registers offsets for DCN35
commit 69741d9 upstream. [Why] Different platforms use differnet 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: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Ray Wu <ray.wu@amd.com> Signed-off-by: Chenyu Chen <chen-yu.chen@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 49a63bc) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ede98c3 commit 7d5df9d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ enum dcn35_clk_src_array_id {
203203
NBIO_BASE_INNER(seg)
204204

205205
#define NBIO_SR(reg_name)\
206-
REG_STRUCT.reg_name = NBIO_BASE(regBIF_BX2_ ## reg_name ## _BASE_IDX) + \
207-
regBIF_BX2_ ## reg_name
206+
REG_STRUCT.reg_name = NBIO_BASE(regBIF_BX1_ ## reg_name ## _BASE_IDX) + \
207+
regBIF_BX1_ ## reg_name
208208

209209
#define NBIO_SR_ARR(reg_name, id)\
210-
REG_STRUCT[id].reg_name = NBIO_BASE(regBIF_BX2_ ## reg_name ## _BASE_IDX) + \
211-
regBIF_BX2_ ## reg_name
210+
REG_STRUCT[id].reg_name = NBIO_BASE(regBIF_BX1_ ## reg_name ## _BASE_IDX) + \
211+
regBIF_BX1_ ## reg_name
212212

213213
#define bios_regs_init() \
214214
( \

0 commit comments

Comments
 (0)