proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-08 07:15:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

amdgpu/dc: make stream encoder constructor return void.

Browse Source 
The checks weren't useful here really.

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:56 +10:00 committed by Alex Deucher
parent ca19d1a68b
commit f29f918f28
8 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
View File

@ -1605,7 +1605,7 @@ static const struct stream_encoder_funcs dce110_str_enc_funcs = {
}; };
bool dce110_stream_encoder_construct( void dce110_stream_encoder_construct(
struct dce110_stream_encoder *enc110, struct dce110_stream_encoder *enc110,
struct dc_context *ctx, struct dc_context *ctx,
struct dc_bios *bp, struct dc_bios *bp,
@ -1614,11 +1614,6 @@ bool dce110_stream_encoder_construct(
const struct dce_stream_encoder_shift *se_shift, const struct dce_stream_encoder_shift *se_shift,
const struct dce_stream_encoder_mask *se_mask) const struct dce_stream_encoder_mask *se_mask)
{ {
if (!enc110)
return false;
if (!bp)
return false;
enc110->base.funcs = &dce110_str_enc_funcs; enc110->base.funcs = &dce110_str_enc_funcs;
enc110->base.ctx = ctx; enc110->base.ctx = ctx;
enc110->base.id = eng_id; enc110->base.id = eng_id;
@ -1626,6 +1621,4 @@ bool dce110_stream_encoder_construct(
enc110->regs = regs; enc110->regs = regs;
enc110->se_shift = se_shift; enc110->se_shift = se_shift;
enc110->se_mask = se_mask; enc110->se_mask = se_mask;
return true;
} }

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

@ -697,7 +697,7 @@ struct dce110_stream_encoder {
const struct dce_stream_encoder_mask *se_mask; const struct dce_stream_encoder_mask *se_mask;
}; };
bool dce110_stream_encoder_construct( void dce110_stream_encoder_construct(
struct dce110_stream_encoder *enc110, struct dce110_stream_encoder *enc110,
struct dc_context *ctx, struct dc_context *ctx,
struct dc_bios *bp, struct dc_bios *bp,

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

@ -389,14 +389,9 @@ static struct stream_encoder *dce100_stream_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_stream_encoder_construct( dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id], &se_shift, &se_mask);
&stream_enc_regs[eng_id], &se_shift, &se_mask)) return &enc110->base;
return &enc110->base;
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
#define SRII(reg_name, block, id)\ #define SRII(reg_name, block, id)\

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

@ -424,14 +424,10 @@ static struct stream_encoder *dce110_stream_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_stream_encoder_construct( dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id],
&stream_enc_regs[eng_id], &se_shift, &se_mask)) &se_shift, &se_mask);
return &enc110->base; return &enc110->base;
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
#define SRII(reg_name, block, id)\ #define SRII(reg_name, block, id)\

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

@ -428,15 +428,11 @@ static struct stream_encoder *dce112_stream_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_stream_encoder_construct( dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id],
&stream_enc_regs[eng_id], &se_shift, &se_mask)) &se_shift, &se_mask);
return &enc110->base; return &enc110->base;
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
#define SRII(reg_name, block, id)\ #define SRII(reg_name, block, id)\

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

@ -585,14 +585,10 @@ static struct stream_encoder *dce120_stream_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_stream_encoder_construct( dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id],
&stream_enc_regs[eng_id], &se_shift, &se_mask)) &se_shift, &se_mask);
return &enc110->base; return &enc110->base;
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
#define SRII(reg_name, block, id)\ #define SRII(reg_name, block, id)\

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

@ -441,14 +441,10 @@ static struct stream_encoder *dce80_stream_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_stream_encoder_construct( dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id],
&stream_enc_regs[eng_id], &se_shift, &se_mask)) &se_shift, &se_mask);
return &enc110->base; return &enc110->base;
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
#define SRII(reg_name, block, id)\ #define SRII(reg_name, block, id)\

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

@ -627,14 +627,10 @@ static struct stream_encoder *dcn10_stream_encoder_create(
if (!enc110) if (!enc110)
return NULL; return NULL;
if (dce110_stream_encoder_construct( dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id],
&stream_enc_regs[eng_id], &se_shift, &se_mask)) &se_shift, &se_mask);
return &enc110->base; return &enc110->base;
BREAK_TO_DEBUGGER();
kfree(enc110);
return NULL;
} }
static const struct dce_hwseq_registers hwseq_reg = { static const struct dce_hwseq_registers hwseq_reg = {