Commit 26818260 authored by Cruise Hung's avatar Cruise Hung Committed by Alex Deucher
Browse files

drm/amd/display: Update correct DCN314 register header 



[Why]
The register header for DCN314 is not correct.

[How]
Update correct DCN314 register header.

Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarCruise Hung <cruise.hung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 25879d7b

drivers/gpu/drm/amd/display/dmub/src/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


DMUB = dmub_srv.o dmub_srv_stat.o dmub_reg.o dmub_dcn20.o dmub_dcn21.o

DMUB += dmub_dcn30.o dmub_dcn301.o dmub_dcn302.o dmub_dcn303.o

DMUB += dmub_dcn31.o dmub_dcn315.o dmub_dcn316.o

DMUB += dmub_dcn31.o dmub_dcn314.o dmub_dcn315.o dmub_dcn316.o

DMUB += dmub_dcn32.o



AMD_DAL_DMUB = $(addprefix $(AMDDALPATH)/dmub/src/,$(DMUB))

drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: AMD

 *

 */



#include "../dmub_srv.h"

#include "dmub_reg.h"

#include "dmub_dcn314.h"



#include "dcn/dcn_3_1_4_offset.h"

#include "dcn/dcn_3_1_4_sh_mask.h"



#define DCN_BASE__INST0_SEG0                       0x00000012

#define DCN_BASE__INST0_SEG1                       0x000000C0

#define DCN_BASE__INST0_SEG2                       0x000034C0

#define DCN_BASE__INST0_SEG3                       0x00009000

#define DCN_BASE__INST0_SEG4                       0x02403C00

#define DCN_BASE__INST0_SEG5                       0



#define BASE_INNER(seg) DCN_BASE__INST0_SEG##seg

#define CTX dmub

#define REGS dmub->regs_dcn31

#define REG_OFFSET_EXP(reg_name) (BASE(reg##reg_name##_BASE_IDX) + reg##reg_name)



/* Registers. */



const struct dmub_srv_dcn31_regs dmub_srv_dcn314_regs = {

#define DMUB_SR(reg) REG_OFFSET_EXP(reg),

	{

		DMUB_DCN31_REGS()

		DMCUB_INTERNAL_REGS()

	},

#undef DMUB_SR



#define DMUB_SF(reg, field) FD_MASK(reg, field),

	{ DMUB_DCN31_FIELDS() },

#undef DMUB_SF



#define DMUB_SF(reg, field) FD_SHIFT(reg, field),

	{ DMUB_DCN31_FIELDS() },

#undef DMUB_SF

};

drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: AMD

 *

 */



#ifndef _DMUB_DCN314_H_

#define _DMUB_DCN314_H_



#include "dmub_dcn31.h"



extern const struct dmub_srv_dcn31_regs dmub_srv_dcn314_regs;



#endif /* _DMUB_DCN314_H_ */

drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c

+4 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "dmub_dcn302.h"

#include "dmub_dcn303.h"

#include "dmub_dcn31.h"

#include "dmub_dcn314.h"

#include "dmub_dcn315.h"

#include "dmub_dcn316.h"

#include "dmub_dcn32.h"
@@ -225,7 +226,9 @@ static bool dmub_srv_hw_setup(struct dmub_srv *dmub, enum dmub_asic asic) 
	case DMUB_ASIC_DCN314:

	case DMUB_ASIC_DCN315:

	case DMUB_ASIC_DCN316:

		if (asic == DMUB_ASIC_DCN315)

		if (asic == DMUB_ASIC_DCN314)

			dmub->regs_dcn31 = &dmub_srv_dcn314_regs;

		else if (asic == DMUB_ASIC_DCN315)

			dmub->regs_dcn31 = &dmub_srv_dcn315_regs;

		else if (asic == DMUB_ASIC_DCN316)

			dmub->regs_dcn31 = &dmub_srv_dcn316_regs;