Merge tag 'gcc-plugins-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / display / dc / dcn10 / dcn10_hubp.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
index db5615a..41679ad 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
@@ -326,7 +326,6 @@ void hubp1_program_pixel_format(
                REG_UPDATE(DCSURF_SURFACE_CONFIG,
                                SURFACE_PIXEL_FORMAT, 119);
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE:
                REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
                                SURFACE_PIXEL_FORMAT, 116,
@@ -337,7 +336,6 @@ void hubp1_program_pixel_format(
                                SURFACE_PIXEL_FORMAT, 116,
                                ALPHA_PLANE_EN, 1);
                break;
-#endif
        default:
                BREAK_TO_DEBUGGER();
                break;