diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2421-amdgpu-dc-make-timing-generator-constructor-return-v.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2421-amdgpu-dc-make-timing-generator-constructor-return-v.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2421-amdgpu-dc-make-timing-generator-constructor-return-v.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2421-amdgpu-dc-make-timing-generator-constructor-return-v.patch new file mode 100644 index 00000000..cf366c5d --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2421-amdgpu-dc-make-timing-generator-constructor-return-v.patch @@ -0,0 +1,120 @@ +From 0b67b60f9ea0b2866d43350e1644dde6e64ce7d2 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Fri, 29 Sep 2017 13:15:55 +1000 +Subject: [PATCH 2421/4131] 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> +--- + drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 9 ++------- + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 8 ++------ + drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c | 7 +------ + drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 8 ++------ + 5 files changed, 8 insertions(+), 26 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +index 9a75bde..6765162 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +@@ -375,13 +375,8 @@ static struct timing_generator *dce100_timing_generator_create( + if (!tg110) + 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( +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +index 787e20e..3d91f2a 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +@@ -410,12 +410,8 @@ static struct timing_generator *dce110_timing_generator_create( + if (!tg110) + 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( +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c +index 7f93d6d..bcd544d 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c ++++ b/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, + }; + +-bool dce110_timing_generator_construct( ++void dce110_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; + +@@ -1966,6 +1963,4 @@ bool dce110_timing_generator_construct( + tg110->min_h_blank = 56; + tg110->min_h_front_porch = 4; + tg110->min_h_back_porch = 4; +- +- return true; + } +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h +index a5d63c6..bd8d0ab 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h +@@ -118,7 +118,7 @@ struct dce110_timing_generator { + #define DCE110TG_FROM_TG(tg)\ + container_of(tg, struct dce110_timing_generator, base) + +-bool dce110_timing_generator_construct( ++void dce110_timing_generator_construct( + struct dce110_timing_generator *tg, + struct dc_context *ctx, + uint32_t instance, +diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +index 4e2ed34..a06a685 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +@@ -415,12 +415,8 @@ static struct timing_generator *dce112_timing_generator_create( + if (!tg110) + 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( +-- +2.7.4 + |