Commit 47f7d807 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher

drm/amd/display: remove redundant CONFIG_DRM_AMD_DC_DCN in irq

[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 irq 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 b63ac5d3
...@@ -71,7 +71,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCE12) ...@@ -71,7 +71,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCE12)
############################################################################### ###############################################################################
# DCN 1x # DCN 1x
############################################################################### ###############################################################################
ifdef CONFIG_DRM_AMD_DC_DCN
IRQ_DCN1 = irq_service_dcn10.o IRQ_DCN1 = irq_service_dcn10.o
AMD_DAL_IRQ_DCN1 = $(addprefix $(AMDDALPATH)/dc/irq/dcn10/,$(IRQ_DCN1)) AMD_DAL_IRQ_DCN1 = $(addprefix $(AMDDALPATH)/dc/irq/dcn10/,$(IRQ_DCN1))
...@@ -136,7 +135,7 @@ IRQ_DCN31 = irq_service_dcn31.o ...@@ -136,7 +135,7 @@ IRQ_DCN31 = irq_service_dcn31.o
AMD_DAL_IRQ_DCN31= $(addprefix $(AMDDALPATH)/dc/irq/dcn31/,$(IRQ_DCN31)) AMD_DAL_IRQ_DCN31= $(addprefix $(AMDDALPATH)/dc/irq/dcn31/,$(IRQ_DCN31))
AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN31) AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN31)
endif
############################################################################### ###############################################################################
# DCN 315 # DCN 315
############################################################################### ###############################################################################
......
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
* *
*/ */
#if defined(CONFIG_DRM_AMD_DC_DCN)
#include "dm_services.h" #include "dm_services.h"
#include "include/logger_interface.h" #include "include/logger_interface.h"
...@@ -450,4 +448,3 @@ struct irq_service *dal_irq_service_dcn30_create( ...@@ -450,4 +448,3 @@ struct irq_service *dal_irq_service_dcn30_create(
return irq_service; return irq_service;
} }
#endif
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
* *
*/ */
#if defined(CONFIG_DRM_AMD_DC_DCN)
#ifndef __DAL_IRQ_SERVICE_DCN30_H__ #ifndef __DAL_IRQ_SERVICE_DCN30_H__
#define __DAL_IRQ_SERVICE_DCN30_H__ #define __DAL_IRQ_SERVICE_DCN30_H__
...@@ -34,4 +32,3 @@ struct irq_service *dal_irq_service_dcn30_create( ...@@ -34,4 +32,3 @@ struct irq_service *dal_irq_service_dcn30_create(
struct irq_service_init_data *init_data); struct irq_service_init_data *init_data);
#endif /* __DAL_IRQ_SERVICE_DCN30_H__ */ #endif /* __DAL_IRQ_SERVICE_DCN30_H__ */
#endif
...@@ -37,13 +37,8 @@ ...@@ -37,13 +37,8 @@
#endif #endif
#include "dce80/irq_service_dce80.h" #include "dce80/irq_service_dce80.h"
#include "dce120/irq_service_dce120.h" #include "dce120/irq_service_dce120.h"
#if defined(CONFIG_DRM_AMD_DC_DCN)
#include "dcn10/irq_service_dcn10.h" #include "dcn10/irq_service_dcn10.h"
#endif
#include "reg_helper.h" #include "reg_helper.h"
#include "irq_service.h" #include "irq_service.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment