> -----Original Message----- > From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Alex > Deucher > Sent: 2020/February/11, Tuesday 11:33 PM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx> > Subject: [PATCH 2/3] drm/amdgpu/display: extend DCN guards > > to cover dcn2.x related headers. > > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> This patch is: Reviewed-by: Zhan Liu <zhan.liu@xxxxxxx> > --- > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++-- > drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +- > drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c > b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c > index a65a1e7820d6..c02e5994d32b 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c > @@ -46,12 +46,12 @@ > #include "dce100/dce100_resource.h" > #include "dce110/dce110_resource.h" > #include "dce112/dce112_resource.h" > +#include "dce120/dce120_resource.h" > #if defined(CONFIG_DRM_AMD_DC_DCN) > #include "dcn10/dcn10_resource.h" > -#endif > #include "dcn20/dcn20_resource.h" > #include "dcn21/dcn21_resource.h" > -#include "dce120/dce120_resource.h" > +#endif > > #define DC_LOGGER_INIT(logger) > > diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c > b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c > index d2d36d48caaa..f252af1947c3 100644 > --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c > +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c > @@ -47,9 +47,9 @@ > #include "dce120/hw_factory_dce120.h" > #if defined(CONFIG_DRM_AMD_DC_DCN) > #include "dcn10/hw_factory_dcn10.h" > -#endif > #include "dcn20/hw_factory_dcn20.h" > #include "dcn21/hw_factory_dcn21.h" > +#endif > > #include "diagnostics/hw_factory_diag.h" > > diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c > b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c > index 5d396657a1ee..04e2c0f74cb0 100644 > --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c > +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c > @@ -45,9 +45,9 @@ > #include "dce120/hw_translate_dce120.h" > #if defined(CONFIG_DRM_AMD_DC_DCN) > #include "dcn10/hw_translate_dcn10.h" > -#endif > #include "dcn20/hw_translate_dcn20.h" > #include "dcn21/hw_translate_dcn21.h" > +#endif > > #include "diagnostics/hw_translate_diag.h" > > -- > 2.24.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
