summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/display/dc/dce120
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/dce120
parent7fc6ff772b22cad6fc5fe06b0dfa3f730559faf4 (diff)
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/dce120')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 9a1984b36592..efa58889058b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -909,6 +909,7 @@ static bool construct(
{
unsigned int i;
struct dc_context *ctx = dc->ctx;
+ struct irq_service_init_data irq_init_data;
ctx->dc_bios->regs = &bios_regs;
@@ -997,15 +998,10 @@ static bool construct(
goto res_create_fail;
}
- {
- #if defined(CONFIG_DRM_AMD_DC_DCE12_0)
- struct irq_service_init_data init_data;
- init_data.ctx = dc->ctx;
- pool->base.irqs = dal_irq_service_dce120_create(&init_data);
- if (!pool->base.irqs)
- goto irqs_create_fail;
- #endif
- }
+ irq_init_data.ctx = dc->ctx;
+ pool->base.irqs = dal_irq_service_dce120_create(&irq_init_data);
+ if (!pool->base.irqs)
+ goto irqs_create_fail;
for (i = 0; i < pool->base.pipe_count; i++) {
pool->base.timing_generators[i] =