Commit 79e03f29 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

drm/amd/display: remove redundant CONFIG_DRM_AMD_DC_DCN in gpio 



[Why & How]
CONFIG_DRM_AMD_DC_DCN is used by pass the compilation failures, but DC
code should be OS-agnostic.

This patch fixes it by removing unnecessasry CONFIG_DRM_AMD_DC_DCN
in gpio directory.

Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarStylon Wang <stylon.wang@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a58cda03

drivers/gpu/drm/amd/display/dc/gpio/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCE120) 
###############################################################################

# DCN 1x

###############################################################################

ifdef CONFIG_DRM_AMD_DC_DCN

GPIO_DCN10 = hw_translate_dcn10.o hw_factory_dcn10.o



AMD_DAL_GPIO_DCN10 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn10/,$(GPIO_DCN10))
@@ -114,7 +113,7 @@ GPIO_DCN315 = hw_translate_dcn315.o hw_factory_dcn315.o 
AMD_DAL_GPIO_DCN315 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn315/,$(GPIO_DCN315))



AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCN315)

endif



###############################################################################

# Diagnostics on FPGA

###############################################################################

drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 * Authors: AMD

 *

 */

#if defined(CONFIG_DRM_AMD_DC_DCN)

#include "dm_services.h"

#include "include/gpio_types.h"

#include "../hw_factory.h"
@@ -266,4 +265,3 @@ void dal_hw_factory_dcn30_init(struct hw_factory *factory) 
	factory->funcs = &funcs;

}

#endif

drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 * Authors: AMD

 *

 */

#if defined(CONFIG_DRM_AMD_DC_DCN)

#ifndef __DAL_HW_FACTORY_DCN30_H__

#define __DAL_HW_FACTORY_DCN30_H__
@@ -30,4 +29,3 @@ 
void dal_hw_factory_dcn30_init(struct hw_factory *factory);



#endif /* __DAL_HW_FACTORY_DCN30_H__ */
 
#endif

drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
/*

 * Pre-requisites: headers required by header of this unit

 */

#if defined(CONFIG_DRM_AMD_DC_DCN)

#include "hw_translate_dcn30.h"



#include "dm_services.h"
@@ -384,4 +383,3 @@ void dal_hw_translate_dcn30_init(struct hw_translate *tr) 
	tr->funcs = &funcs;

}

#endif

drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 * Authors: AMD

 *

 */

#if defined(CONFIG_DRM_AMD_DC_DCN)

#ifndef __DAL_HW_TRANSLATE_DCN30_H__

#define __DAL_HW_TRANSLATE_DCN30_H__
@@ -32,4 +31,3 @@ struct hw_translate; 
void dal_hw_translate_dcn30_init(struct hw_translate *tr);



#endif /* __DAL_HW_TRANSLATE_DCN30_H__ */
 
#endif