浏览代码

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>
Dave Airlie 7 年之前
父节点
当前提交
ca19d1a68b

+ 2 - 7
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c

@@ -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,
-			offsets))
-		return &tg110->base;
-
-	BREAK_TO_DEBUGGER();
-	kfree(tg110);
-	return NULL;
+	dce110_timing_generator_construct(tg110, ctx, instance, offsets);
+	return &tg110->base;
 }
 }
 
 
 static struct stream_encoder *dce100_stream_encoder_create(
 static struct stream_encoder *dce100_stream_encoder_create(

+ 2 - 6
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c

@@ -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))
-		return &tg110->base;
-
-	BREAK_TO_DEBUGGER();
-	kfree(tg110);
-	return NULL;
+	dce110_timing_generator_construct(tg110, ctx, instance, offsets);
+	return &tg110->base;
 }
 }
 
 
 static struct stream_encoder *dce110_stream_encoder_create(
 static struct stream_encoder *dce110_stream_encoder_create(

+ 1 - 6
drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c

@@ -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;
 }
 }

+ 1 - 1
drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h

@@ -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,

+ 2 - 6
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

@@ -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))
-		return &tg110->base;
-
-	BREAK_TO_DEBUGGER();
-	kfree(tg110);
-	return NULL;
+	dce110_timing_generator_construct(tg110, ctx, instance, offsets);
+	return &tg110->base;
 }
 }
 
 
 static struct stream_encoder *dce112_stream_encoder_create(
 static struct stream_encoder *dce112_stream_encoder_create(