Commit beda921d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alex Deucher
Browse files

drm/amdgpu: display_mode_vba_21: remove uint typedef 



The type definition for 'uint' clashes with the generic kernel
headers:

drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn21/display_mode_vba_21.c:43:22: error: redefinition of typedef 'uint' is a C11 feature [-Werror,-Wtypedef-redefinition]
include/linux/types.h:92:23: note: previous definition is here

Just remove this type and use plain 'unsigned int' consistently,
as it is already use almost everywhere in this file.

Fixes: b04641a3 ("drm/amd/display: Add Renoir DML")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 29174a43

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c

+5 −8
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ 
 * ways. Unless there is something clearly wrong with it the code should

 * remain as-is as it provides us with a guarantee from HW that it is correct.

 */



typedef unsigned int uint;



typedef struct {

	double DPPCLK;

	double DISPCLK;
@@ -4774,7 +4771,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l 
				mode_lib->vba.MaximumReadBandwidthWithoutPrefetch = 0.0;

				mode_lib->vba.MaximumReadBandwidthWithPrefetch = 0.0;

				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

					uint m;

					unsigned int m;



					locals->cursor_bw[k] = 0;

					locals->cursor_bw_pre[k] = 0;
@@ -5285,7 +5282,7 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport( 
	double SecondMinActiveDRAMClockChangeMarginOneDisplayInVBLank;

	double FullDETBufferingTimeYStutterCriticalPlane = 0;

	double TimeToFinishSwathTransferStutterCriticalPlane = 0;

	uint k, j;

	unsigned int k, j;



	mode_lib->vba.TotalActiveDPP = 0;

	mode_lib->vba.TotalDCCActiveDPP = 0;
@@ -5507,7 +5504,7 @@ static void CalculateDCFCLKDeepSleep( 
		double DPPCLK[],

		double *DCFCLKDeepSleep)

{

	uint k;

	unsigned int k;

	double DisplayPipeLineDeliveryTimeLuma;

	double DisplayPipeLineDeliveryTimeChroma;

	//double   DCFCLKDeepSleepPerPlane[DC__NUM_DPP__MAX];
@@ -5727,7 +5724,7 @@ static void CalculatePixelDeliveryTimes( 
		double DisplayPipeRequestDeliveryTimeChromaPrefetch[])

{

	double req_per_swath_ub;

	uint k;

	unsigned int k;



	for (k = 0; k < NumberOfActivePlanes; ++k) {

		if (VRatio[k] <= 1) {
@@ -5869,7 +5866,7 @@ static void CalculateMetaAndPTETimes( 
	unsigned int dpte_groups_per_row_chroma_ub;

	unsigned int num_group_per_lower_vm_stage;

	unsigned int num_req_per_lower_vm_stage;

	uint k;

	unsigned int k;



	for (k = 0; k < NumberOfActivePlanes; ++k) {

		if (GPUVMEnable == true) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE