UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

amdgpu/dc: make link encoder construct void. 

This only ever returned true.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dave Airlie 2017-09-29 13:15:57 +10:00 committed by Alex Deucher
parent f29f918f28
commit c60ae11201
8 changed files with 44 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
View File

@ -914,7 +914,7 @@ bool dce110_link_encoder_validate_dp_output(
return false;
}
bool dce110_link_encoder_construct(
void dce110_link_encoder_construct(
struct dce110_link_encoder *enc110,
const struct encoder_init_data *init_data,
const struct encoder_feature_support *enc_features,
@ -1013,8 +1013,6 @@ bool dce110_link_encoder_construct(
bp_cap_info.DP_HBR3_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(

2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
View File

@ -168,7 +168,7 @@ struct dce110_link_encoder {
};
bool dce110_link_encoder_construct(
void dce110_link_encoder_construct(
struct dce110_link_encoder *enc110,
const struct encoder_init_data *init_data,
const struct encoder_feature_support *enc_features,

21
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
View File

@ -528,20 +528,13 @@ struct link_encoder *dce100_link_encoder_create(
if (!enc110)
return NULL;
if (dce110_link_encoder_construct(
enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source]);
return &enc110->base;
}
struct output_pixel_processor *dce100_opp_create(

21
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
View File

@ -567,20 +567,13 @@ static struct link_encoder *dce110_link_encoder_create(
if (!enc110)
return NULL;
if (dce110_link_encoder_construct(
enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source]);
return &enc110->base;
}
static struct output_pixel_processor *dce110_opp_create(

21
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
View File

@ -552,20 +552,13 @@ struct link_encoder *dce112_link_encoder_create(
if (!enc110)
return NULL;
if (dce110_link_encoder_construct(
enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source]);
return &enc110->base;
}
static struct input_pixel_processor *dce112_ipp_create(

20
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
View File

@ -544,20 +544,14 @@ static struct link_encoder *dce120_link_encoder_create(
if (!enc110)
return NULL;
if (dce110_link_encoder_construct(
enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source]);
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
return &enc110->base;
}
static struct input_pixel_processor *dce120_ipp_create(

21
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
View File

@ -567,20 +567,13 @@ struct link_encoder *dce80_link_encoder_create(
if (!enc110)
return NULL;
if (dce110_link_encoder_construct(
enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source]);
return &enc110->base;
}
struct clock_source *dce80_clock_source_create(

20
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
View File

@ -563,20 +563,14 @@ struct link_encoder *dcn10_link_encoder_create(
if (!enc110)
return NULL;
if (dce110_link_encoder_construct(
enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source])) {
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[enc_init_data->transmitter],
&link_enc_aux_regs[enc_init_data->channel - 1],
&link_enc_hpd_regs[enc_init_data->hpd_source]);
return &enc110->base;
}
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
return &enc110->base;
}
struct clock_source *dcn10_clock_source_create(