diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2422-amdgpu-dc-make-stream-encoder-constructor-return-voi.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2422-amdgpu-dc-make-stream-encoder-constructor-return-voi.patch | 208 |
1 files changed, 208 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2422-amdgpu-dc-make-stream-encoder-constructor-return-voi.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2422-amdgpu-dc-make-stream-encoder-constructor-return-voi.patch new file mode 100644 index 00000000..ae0e4d48 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2422-amdgpu-dc-make-stream-encoder-constructor-return-voi.patch @@ -0,0 +1,208 @@ +From ea2626b541e88d3ba8e380258bde5e7961aeddfb Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Fri, 29 Sep 2017 13:15:56 +1000 +Subject: [PATCH 2422/4131] amdgpu/dc: make stream encoder constructor return + void. + +The checks weren't useful here really. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 9 +-------- + drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 11 +++-------- + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 12 ++++-------- + drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 14 +++++--------- + drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 12 ++++-------- + drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 12 ++++-------- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 12 ++++-------- + 8 files changed, 26 insertions(+), 58 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +index 532c6e6..b2add58 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +@@ -1605,7 +1605,7 @@ static const struct stream_encoder_funcs dce110_str_enc_funcs = { + + }; + +-bool dce110_stream_encoder_construct( ++void dce110_stream_encoder_construct( + struct dce110_stream_encoder *enc110, + struct dc_context *ctx, + struct dc_bios *bp, +@@ -1614,11 +1614,6 @@ bool dce110_stream_encoder_construct( + const struct dce_stream_encoder_shift *se_shift, + const struct dce_stream_encoder_mask *se_mask) + { +- if (!enc110) +- return false; +- if (!bp) +- return false; +- + enc110->base.funcs = &dce110_str_enc_funcs; + enc110->base.ctx = ctx; + enc110->base.id = eng_id; +@@ -1626,6 +1621,4 @@ bool dce110_stream_encoder_construct( + enc110->regs = regs; + enc110->se_shift = se_shift; + enc110->se_mask = se_mask; +- +- return true; + } +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h +index ff8ca12..6c28229 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h +@@ -697,7 +697,7 @@ struct dce110_stream_encoder { + const struct dce_stream_encoder_mask *se_mask; + }; + +-bool dce110_stream_encoder_construct( ++void dce110_stream_encoder_construct( + struct dce110_stream_encoder *enc110, + struct dc_context *ctx, + struct dc_bios *bp, +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 6765162..7596133 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +@@ -389,14 +389,9 @@ static struct stream_encoder *dce100_stream_encoder_create( + if (!enc110) + return NULL; + +- if (dce110_stream_encoder_construct( +- enc110, ctx, ctx->dc_bios, eng_id, +- &stream_enc_regs[eng_id], &se_shift, &se_mask)) +- return &enc110->base; +- +- BREAK_TO_DEBUGGER(); +- kfree(enc110); +- return NULL; ++ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id, ++ &stream_enc_regs[eng_id], &se_shift, &se_mask); ++ return &enc110->base; + } + + #define SRII(reg_name, block, id)\ +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 3d91f2a..9faf2fe 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +@@ -424,14 +424,10 @@ static struct stream_encoder *dce110_stream_encoder_create( + if (!enc110) + return NULL; + +- if (dce110_stream_encoder_construct( +- enc110, ctx, ctx->dc_bios, eng_id, +- &stream_enc_regs[eng_id], &se_shift, &se_mask)) +- return &enc110->base; +- +- BREAK_TO_DEBUGGER(); +- kfree(enc110); +- return NULL; ++ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id, ++ &stream_enc_regs[eng_id], ++ &se_shift, &se_mask); ++ return &enc110->base; + } + + #define SRII(reg_name, block, id)\ +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 a06a685..0011dd7 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +@@ -428,15 +428,11 @@ static struct stream_encoder *dce112_stream_encoder_create( + + if (!enc110) + return NULL; +- +- if (dce110_stream_encoder_construct( +- enc110, ctx, ctx->dc_bios, eng_id, +- &stream_enc_regs[eng_id], &se_shift, &se_mask)) +- return &enc110->base; +- +- BREAK_TO_DEBUGGER(); +- kfree(enc110); +- return NULL; ++ ++ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id, ++ &stream_enc_regs[eng_id], ++ &se_shift, &se_mask); ++ return &enc110->base; + } + + #define SRII(reg_name, block, id)\ +diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +index e51d8ba..b02b0db 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +@@ -585,14 +585,10 @@ static struct stream_encoder *dce120_stream_encoder_create( + if (!enc110) + return NULL; + +- if (dce110_stream_encoder_construct( +- enc110, ctx, ctx->dc_bios, eng_id, +- &stream_enc_regs[eng_id], &se_shift, &se_mask)) +- return &enc110->base; +- +- BREAK_TO_DEBUGGER(); +- kfree(enc110); +- return NULL; ++ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id, ++ &stream_enc_regs[eng_id], ++ &se_shift, &se_mask); ++ return &enc110->base; + } + + #define SRII(reg_name, block, id)\ +diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +index 170509a..0b309ac 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +@@ -441,14 +441,10 @@ static struct stream_encoder *dce80_stream_encoder_create( + if (!enc110) + return NULL; + +- if (dce110_stream_encoder_construct( +- enc110, ctx, ctx->dc_bios, eng_id, +- &stream_enc_regs[eng_id], &se_shift, &se_mask)) +- return &enc110->base; +- +- BREAK_TO_DEBUGGER(); +- kfree(enc110); +- return NULL; ++ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id, ++ &stream_enc_regs[eng_id], ++ &se_shift, &se_mask); ++ return &enc110->base; + } + + #define SRII(reg_name, block, id)\ +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +index d2ba37e..a76044c 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +@@ -627,14 +627,10 @@ static struct stream_encoder *dcn10_stream_encoder_create( + if (!enc110) + return NULL; + +- if (dce110_stream_encoder_construct( +- enc110, ctx, ctx->dc_bios, eng_id, +- &stream_enc_regs[eng_id], &se_shift, &se_mask)) +- return &enc110->base; +- +- BREAK_TO_DEBUGGER(); +- kfree(enc110); +- return NULL; ++ dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id, ++ &stream_enc_regs[eng_id], ++ &se_shift, &se_mask); ++ return &enc110->base; + } + + static const struct dce_hwseq_registers hwseq_reg = { +-- +2.7.4 + |