Commit 5fb005c4 authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher

amdgpu/dc: make dce transform constructor void

This never returns anything but 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 9cf29399
...@@ -1437,7 +1437,7 @@ static const struct transform_funcs dce_transform_funcs = { ...@@ -1437,7 +1437,7 @@ static const struct transform_funcs dce_transform_funcs = {
/* Constructor, Destructor */ /* Constructor, Destructor */
/*****************************************/ /*****************************************/
bool dce_transform_construct( void dce_transform_construct(
struct dce_transform *xfm_dce, struct dce_transform *xfm_dce,
struct dc_context *ctx, struct dc_context *ctx,
uint32_t inst, uint32_t inst,
...@@ -1462,6 +1462,4 @@ bool dce_transform_construct( ...@@ -1462,6 +1462,4 @@ bool dce_transform_construct(
xfm_dce->lb_bits_per_entry = LB_BITS_PER_ENTRY; xfm_dce->lb_bits_per_entry = LB_BITS_PER_ENTRY;
xfm_dce->lb_memory_size = LB_TOTAL_NUMBER_OF_ENTRIES; /*0x6B0*/ xfm_dce->lb_memory_size = LB_TOTAL_NUMBER_OF_ENTRIES; /*0x6B0*/
return true;
} }
...@@ -481,7 +481,7 @@ struct dce_transform { ...@@ -481,7 +481,7 @@ struct dce_transform {
bool prescaler_on; bool prescaler_on;
}; };
bool dce_transform_construct(struct dce_transform *xfm_dce, void dce_transform_construct(struct dce_transform *xfm_dce,
struct dc_context *ctx, struct dc_context *ctx,
uint32_t inst, uint32_t inst,
const struct dce_transform_registers *regs, const struct dce_transform_registers *regs,
......
...@@ -486,14 +486,9 @@ static struct transform *dce100_transform_create( ...@@ -486,14 +486,9 @@ static struct transform *dce100_transform_create(
if (!transform) if (!transform)
return NULL; return NULL;
if (dce_transform_construct(transform, ctx, inst, dce_transform_construct(transform, ctx, inst,
&xfm_regs[inst], &xfm_shift, &xfm_mask)) { &xfm_regs[inst], &xfm_shift, &xfm_mask);
return &transform->base; return &transform->base;
}
BREAK_TO_DEBUGGER();
kfree(transform);
return NULL;
} }
static struct input_pixel_processor *dce100_ipp_create( static struct input_pixel_processor *dce100_ipp_create(
......
...@@ -526,13 +526,9 @@ static struct transform *dce110_transform_create( ...@@ -526,13 +526,9 @@ static struct transform *dce110_transform_create(
if (!transform) if (!transform)
return NULL; return NULL;
if (dce_transform_construct(transform, ctx, inst, dce_transform_construct(transform, ctx, inst,
&xfm_regs[inst], &xfm_shift, &xfm_mask)) &xfm_regs[inst], &xfm_shift, &xfm_mask);
return &transform->base; return &transform->base;
BREAK_TO_DEBUGGER();
kfree(transform);
return NULL;
} }
static struct input_pixel_processor *dce110_ipp_create( static struct input_pixel_processor *dce110_ipp_create(
......
...@@ -521,15 +521,10 @@ static struct transform *dce112_transform_create( ...@@ -521,15 +521,10 @@ static struct transform *dce112_transform_create(
if (!transform) if (!transform)
return NULL; return NULL;
if (dce_transform_construct(transform, ctx, inst, dce_transform_construct(transform, ctx, inst,
&xfm_regs[inst], &xfm_shift, &xfm_mask)) { &xfm_regs[inst], &xfm_shift, &xfm_mask);
transform->lb_memory_size = 0x1404; /*5124*/ transform->lb_memory_size = 0x1404; /*5124*/
return &transform->base; return &transform->base;
}
BREAK_TO_DEBUGGER();
kfree(transform);
return NULL;
} }
static const struct encoder_feature_support link_enc_feature = { static const struct encoder_feature_support link_enc_feature = {
......
...@@ -662,15 +662,10 @@ static struct transform *dce120_transform_create( ...@@ -662,15 +662,10 @@ static struct transform *dce120_transform_create(
if (!transform) if (!transform)
return NULL; return NULL;
if (dce_transform_construct(transform, ctx, inst, dce_transform_construct(transform, ctx, inst,
&xfm_regs[inst], &xfm_shift, &xfm_mask)) { &xfm_regs[inst], &xfm_shift, &xfm_mask);
transform->lb_memory_size = 0x1404; /*5124*/ transform->lb_memory_size = 0x1404; /*5124*/
return &transform->base; return &transform->base;
}
BREAK_TO_DEBUGGER();
kfree(transform);
return NULL;
} }
static void dce120_destroy_resource_pool(struct resource_pool **pool) static void dce120_destroy_resource_pool(struct resource_pool **pool)
......
...@@ -535,15 +535,10 @@ static struct transform *dce80_transform_create( ...@@ -535,15 +535,10 @@ static struct transform *dce80_transform_create(
if (!transform) if (!transform)
return NULL; return NULL;
if (dce_transform_construct(transform, ctx, inst, dce_transform_construct(transform, ctx, inst,
&xfm_regs[inst], &xfm_shift, &xfm_mask)) { &xfm_regs[inst], &xfm_shift, &xfm_mask);
transform->prescaler_on = false; transform->prescaler_on = false;
return &transform->base; return &transform->base;
}
BREAK_TO_DEBUGGER();
kfree(transform);
return NULL;
} }
static const struct encoder_feature_support link_enc_feature = { static const struct encoder_feature_support link_enc_feature = {
......
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