p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

amdgpu/dc: make timing generator constructor return void. 

This can't fail as is.

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

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

@ -375,13 +375,8 @@ static struct timing_generator *dce100_timing_generator_create(
if (!tg110) if (!tg110)
return NULL; return NULL;
if (dce110_timing_generator_construct(tg110, ctx, instance, dce110_timing_generator_construct(tg110, ctx, instance, offsets);
offsets)) return &tg110->base;
return &tg110->base;
BREAK_TO_DEBUGGER();
kfree(tg110);
return NULL;
} }
static struct stream_encoder *dce100_stream_encoder_create( static struct stream_encoder *dce100_stream_encoder_create(

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

@ -410,12 +410,8 @@ static struct timing_generator *dce110_timing_generator_create(
if (!tg110) if (!tg110)
return NULL; return NULL;
if (dce110_timing_generator_construct(tg110, ctx, instance, offsets)) dce110_timing_generator_construct(tg110, ctx, instance, offsets);
return &tg110->base; return &tg110->base;
BREAK_TO_DEBUGGER();
kfree(tg110);
return NULL;
} }
static struct stream_encoder *dce110_stream_encoder_create( static struct stream_encoder *dce110_stream_encoder_create(

7
drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c
View File

@ -1941,15 +1941,12 @@ static const struct timing_generator_funcs dce110_tg_funcs = {
.arm_vert_intr = dce110_arm_vert_intr, .arm_vert_intr = dce110_arm_vert_intr,
}; };
bool dce110_timing_generator_construct( void dce110_timing_generator_construct(
struct dce110_timing_generator *tg110, struct dce110_timing_generator *tg110,
struct dc_context *ctx, struct dc_context *ctx,
uint32_t instance, uint32_t instance,
const struct dce110_timing_generator_offsets *offsets) const struct dce110_timing_generator_offsets *offsets)
{ {
if (!tg110)
return false;
tg110->controller_id = CONTROLLER_ID_D0 + instance; tg110->controller_id = CONTROLLER_ID_D0 + instance;
tg110->base.inst = instance; tg110->base.inst = instance;
@ -1966,6 +1963,4 @@ bool dce110_timing_generator_construct(
tg110->min_h_blank = 56; tg110->min_h_blank = 56;
tg110->min_h_front_porch = 4; tg110->min_h_front_porch = 4;
tg110->min_h_back_porch = 4; tg110->min_h_back_porch = 4;
return true;
} }

2
drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
View File

@ -118,7 +118,7 @@ struct dce110_timing_generator {
#define DCE110TG_FROM_TG(tg)\ #define DCE110TG_FROM_TG(tg)\
container_of(tg, struct dce110_timing_generator, base) container_of(tg, struct dce110_timing_generator, base)
bool dce110_timing_generator_construct( void dce110_timing_generator_construct(
struct dce110_timing_generator *tg, struct dce110_timing_generator *tg,
struct dc_context *ctx, struct dc_context *ctx,
uint32_t instance, uint32_t instance,

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

@ -415,12 +415,8 @@ static struct timing_generator *dce112_timing_generator_create(
if (!tg110) if (!tg110)
return NULL; return NULL;
if (dce110_timing_generator_construct(tg110, ctx, instance, offsets)) dce110_timing_generator_construct(tg110, ctx, instance, offsets);
return &tg110->base; return &tg110->base;
BREAK_TO_DEBUGGER();
kfree(tg110);
return NULL;
} }
static struct stream_encoder *dce112_stream_encoder_create( static struct stream_encoder *dce112_stream_encoder_create(