summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-06-15 16:21:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:19:36 -0400
commit8fa9ca2ec6919656db87391a1633692ee8d57c22 (patch)
treecd25e156343f2da06963e46e7944aead77c60823 /drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
parent7fc6ff772b22cad6fc5fe06b0dfa3f730559faf4 (diff)
downloadlinux-8fa9ca2ec6919656db87391a1633692ee8d57c22.tar.bz2
drm/amd/display: Remove DCE12 guards
Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com> Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
index 7fe2a791ef42..0079a1e26efd 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
@@ -29,9 +29,7 @@
#include "bios_parser_interface.h"
#include "bios_parser.h"
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
#include "bios_parser2.h"
-#endif
struct dc_bios *dal_bios_parser_create(
@@ -40,17 +38,11 @@ struct dc_bios *dal_bios_parser_create(
{
struct dc_bios *bios = NULL;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
bios = firmware_parser_create(init, dce_version);
+ /* Fall back to old bios parser for older asics */
if (bios == NULL)
- /* TODO: remove dce_version from bios_parser.
- * cannot remove today because dal enum to bp enum translation is dce specific
- */
bios = bios_parser_create(init, dce_version);
-#else
- bios = bios_parser_create(init, dce_version);
-#endif
return bios;
}