From: Dave Airlie <airlied@redhat.com>
Date: Fri, 29 Sep 2017 13:16:00 +1000
Subject: amdgpu/dc: make dce80 timing generator construct return void.
Git-commit: 99913a171d00b2d4c94127a9e38e5457bc45635d
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 8 ++------
drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.c | 7 +------
drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.h | 2 +-
3 files changed, 4 insertions(+), 13 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
@@ -404,12 +404,8 @@ static struct timing_generator *dce80_ti
if (!tg110)
return NULL;
- if (dce80_timing_generator_construct(tg110, ctx, instance, offsets))
- return &tg110->base;
-
- BREAK_TO_DEBUGGER();
- kfree(tg110);
- return NULL;
+ dce80_timing_generator_construct(tg110, ctx, instance, offsets);
+ return &tg110->base;
}
static struct output_pixel_processor *dce80_opp_create(
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.c
@@ -152,15 +152,12 @@ static const struct timing_generator_fun
dce80_timing_generator_enable_advanced_request,
};
-bool dce80_timing_generator_construct(
+void dce80_timing_generator_construct(
struct dce110_timing_generator *tg110,
struct dc_context *ctx,
uint32_t instance,
const struct dce110_timing_generator_offsets *offsets)
{
- if (!tg110)
- return false;
-
tg110->controller_id = CONTROLLER_ID_D0 + instance;
tg110->base.inst = instance;
tg110->offsets = *offsets;
@@ -177,8 +174,6 @@ bool dce80_timing_generator_construct(
tg110->min_h_blank = 56;
tg110->min_h_front_porch = 4;
tg110->min_h_back_porch = 4;
-
- return true;
}
void dce80_timing_generator_enable_advanced_request(
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.h
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.h
@@ -30,7 +30,7 @@
#include "../include/grph_object_id.h"
/* DCE8.0 implementation inherits from DCE11.0 */
-bool dce80_timing_generator_construct(
+void dce80_timing_generator_construct(
struct dce110_timing_generator *tg,
struct dc_context *ctx,
uint32_t instance,