Commit c60ae112 authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher

amdgpu/dc: make link encoder construct void.

This only ever returned true.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f29f918f
...@@ -914,7 +914,7 @@ bool dce110_link_encoder_validate_dp_output( ...@@ -914,7 +914,7 @@ bool dce110_link_encoder_validate_dp_output(
return false; return false;
} }
bool dce110_link_encoder_construct( void dce110_link_encoder_construct(
struct dce110_link_encoder *enc110, struct dce110_link_encoder *enc110,
const struct encoder_init_data *init_data, const struct encoder_init_data *init_data,
const struct encoder_feature_support *enc_features, const struct encoder_feature_support *enc_features,
...@@ -1013,8 +1013,6 @@ bool dce110_link_encoder_construct( ...@@ -1013,8 +1013,6 @@ bool dce110_link_encoder_construct(
bp_cap_info.DP_HBR3_EN; bp_cap_info.DP_HBR3_EN;
enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN; enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
} }
return true;
} }
bool dce110_link_encoder_validate_output_with_stream( bool dce110_link_encoder_validate_output_with_stream(
......
...@@ -168,7 +168,7 @@ struct dce110_link_encoder { ...@@ -168,7 +168,7 @@ struct dce110_link_encoder {
}; };
bool dce110_link_encoder_construct( void dce110_link_encoder_construct(
struct dce110_link_encoder *enc110, struct dce110_link_encoder *enc110,
const struct encoder_init_data *init_data, const struct encoder_init_data *init_data,
const struct encoder_feature_support *enc_features, const struct encoder_feature_support *enc_features,
......
...@@ -528,20 +528,13 @@ struct link_encoder *dce100_link_encoder_create( ...@@ -528,20 +528,13 @@ struct link_encoder *dce100_link_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_link_encoder_construct( dce110_link_encoder_construct(enc110,
enc110, enc_init_data,
enc_init_data, &link_enc_feature,
&link_enc_feature, &link_enc_regs[enc_init_data->transmitter],
&link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_aux_regs[enc_init_data->channel - 1], &link_enc_hpd_regs[enc_init_data->hpd_source]);
&link_enc_hpd_regs[enc_init_data->hpd_source])) { return &enc110->base;
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
struct output_pixel_processor *dce100_opp_create( struct output_pixel_processor *dce100_opp_create(
......
...@@ -567,20 +567,13 @@ static struct link_encoder *dce110_link_encoder_create( ...@@ -567,20 +567,13 @@ static struct link_encoder *dce110_link_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_link_encoder_construct( dce110_link_encoder_construct(enc110,
enc110, enc_init_data,
enc_init_data, &link_enc_feature,
&link_enc_feature, &link_enc_regs[enc_init_data->transmitter],
&link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_aux_regs[enc_init_data->channel - 1], &link_enc_hpd_regs[enc_init_data->hpd_source]);
&link_enc_hpd_regs[enc_init_data->hpd_source])) { return &enc110->base;
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
static struct output_pixel_processor *dce110_opp_create( static struct output_pixel_processor *dce110_opp_create(
......
...@@ -552,20 +552,13 @@ struct link_encoder *dce112_link_encoder_create( ...@@ -552,20 +552,13 @@ struct link_encoder *dce112_link_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_link_encoder_construct( dce110_link_encoder_construct(enc110,
enc110, enc_init_data,
enc_init_data, &link_enc_feature,
&link_enc_feature, &link_enc_regs[enc_init_data->transmitter],
&link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_aux_regs[enc_init_data->channel - 1], &link_enc_hpd_regs[enc_init_data->hpd_source]);
&link_enc_hpd_regs[enc_init_data->hpd_source])) { return &enc110->base;
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
static struct input_pixel_processor *dce112_ipp_create( static struct input_pixel_processor *dce112_ipp_create(
......
...@@ -544,20 +544,14 @@ static struct link_encoder *dce120_link_encoder_create( ...@@ -544,20 +544,14 @@ static struct link_encoder *dce120_link_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_link_encoder_construct( dce110_link_encoder_construct(enc110,
enc110, enc_init_data,
enc_init_data, &link_enc_feature,
&link_enc_feature, &link_enc_regs[enc_init_data->transmitter],
&link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_aux_regs[enc_init_data->channel - 1], &link_enc_hpd_regs[enc_init_data->hpd_source]);
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
return &enc110->base;
}
BREAK_TO_DEBUGGER(); return &enc110->base;
kfree(enc110);
return NULL;
} }
static struct input_pixel_processor *dce120_ipp_create( static struct input_pixel_processor *dce120_ipp_create(
......
...@@ -567,20 +567,13 @@ struct link_encoder *dce80_link_encoder_create( ...@@ -567,20 +567,13 @@ struct link_encoder *dce80_link_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_link_encoder_construct( dce110_link_encoder_construct(enc110,
enc110, enc_init_data,
enc_init_data, &link_enc_feature,
&link_enc_feature, &link_enc_regs[enc_init_data->transmitter],
&link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_aux_regs[enc_init_data->channel - 1], &link_enc_hpd_regs[enc_init_data->hpd_source]);
&link_enc_hpd_regs[enc_init_data->hpd_source])) { return &enc110->base;
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
struct clock_source *dce80_clock_source_create( struct clock_source *dce80_clock_source_create(
......
...@@ -563,20 +563,14 @@ struct link_encoder *dcn10_link_encoder_create( ...@@ -563,20 +563,14 @@ struct link_encoder *dcn10_link_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_link_encoder_construct( dce110_link_encoder_construct(enc110,
enc110, enc_init_data,
enc_init_data, &link_enc_feature,
&link_enc_feature, &link_enc_regs[enc_init_data->transmitter],
&link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_aux_regs[enc_init_data->channel - 1], &link_enc_hpd_regs[enc_init_data->hpd_source]);
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
return &enc110->base;
}
BREAK_TO_DEBUGGER(); return &enc110->base;
kfree(enc110);
return NULL;
} }
struct clock_source *dcn10_clock_source_create( struct clock_source *dcn10_clock_source_create(
......
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