aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2423-amdgpu-dc-make-link-encoder-construct-void.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2423-amdgpu-dc-make-link-encoder-construct-void.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2423-amdgpu-dc-make-link-encoder-construct-void.patch250
1 files changed, 250 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2423-amdgpu-dc-make-link-encoder-construct-void.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2423-amdgpu-dc-make-link-encoder-construct-void.patch
new file mode 100644
index 00000000..ff17833d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2423-amdgpu-dc-make-link-encoder-construct-void.patch
@@ -0,0 +1,250 @@
+From cfe94f90705bb6ed0dac24683e48bca6a882e395 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 29 Sep 2017 13:15:57 +1000
+Subject: [PATCH 2423/4131] amdgpu/dc: make link encoder construct void.
+
+This only ever returned true.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+---
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 4 +---
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 2 +-
+ .../gpu/drm/amd/display/dc/dce100/dce100_resource.c | 21 +++++++--------------
+ .../gpu/drm/amd/display/dc/dce110/dce110_resource.c | 21 +++++++--------------
+ .../gpu/drm/amd/display/dc/dce112/dce112_resource.c | 21 +++++++--------------
+ .../gpu/drm/amd/display/dc/dce120/dce120_resource.c | 20 +++++++-------------
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 21 +++++++--------------
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 20 +++++++-------------
+ 8 files changed, 44 insertions(+), 86 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+index 2ce730d..37aeddf 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+@@ -914,7 +914,7 @@ bool dce110_link_encoder_validate_dp_output(
+ return false;
+ }
+
+-bool dce110_link_encoder_construct(
++void dce110_link_encoder_construct(
+ struct dce110_link_encoder *enc110,
+ const struct encoder_init_data *init_data,
+ const struct encoder_feature_support *enc_features,
+@@ -1013,8 +1013,6 @@ bool dce110_link_encoder_construct(
+ bp_cap_info.DP_HBR3_EN;
+ enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
+ }
+-
+- return true;
+ }
+
+ bool dce110_link_encoder_validate_output_with_stream(
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+index 5960fb9..be0a45b 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+@@ -168,7 +168,7 @@ struct dce110_link_encoder {
+ };
+
+
+-bool dce110_link_encoder_construct(
++void dce110_link_encoder_construct(
+ struct dce110_link_encoder *enc110,
+ const struct encoder_init_data *init_data,
+ const struct encoder_feature_support *enc_features,
+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 7596133..0084645 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+@@ -528,20 +528,13 @@ struct link_encoder *dce100_link_encoder_create(
+ if (!enc110)
+ return NULL;
+
+- if (dce110_link_encoder_construct(
+- enc110,
+- enc_init_data,
+- &link_enc_feature,
+- &link_enc_regs[enc_init_data->transmitter],
+- &link_enc_aux_regs[enc_init_data->channel - 1],
+- &link_enc_hpd_regs[enc_init_data->hpd_source])) {
+-
+- return &enc110->base;
+- }
+-
+- BREAK_TO_DEBUGGER();
+- kfree(enc110);
+- return NULL;
++ dce110_link_encoder_construct(enc110,
++ enc_init_data,
++ &link_enc_feature,
++ &link_enc_regs[enc_init_data->transmitter],
++ &link_enc_aux_regs[enc_init_data->channel - 1],
++ &link_enc_hpd_regs[enc_init_data->hpd_source]);
++ return &enc110->base;
+ }
+
+ struct output_pixel_processor *dce100_opp_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 9faf2fe..2c24f2b 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+@@ -567,20 +567,13 @@ static struct link_encoder *dce110_link_encoder_create(
+ if (!enc110)
+ return NULL;
+
+- if (dce110_link_encoder_construct(
+- enc110,
+- enc_init_data,
+- &link_enc_feature,
+- &link_enc_regs[enc_init_data->transmitter],
+- &link_enc_aux_regs[enc_init_data->channel - 1],
+- &link_enc_hpd_regs[enc_init_data->hpd_source])) {
+-
+- return &enc110->base;
+- }
+-
+- BREAK_TO_DEBUGGER();
+- kfree(enc110);
+- return NULL;
++ dce110_link_encoder_construct(enc110,
++ enc_init_data,
++ &link_enc_feature,
++ &link_enc_regs[enc_init_data->transmitter],
++ &link_enc_aux_regs[enc_init_data->channel - 1],
++ &link_enc_hpd_regs[enc_init_data->hpd_source]);
++ return &enc110->base;
+ }
+
+ static struct output_pixel_processor *dce110_opp_create(
+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 0011dd7..7aac8fd 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+@@ -552,20 +552,13 @@ struct link_encoder *dce112_link_encoder_create(
+ if (!enc110)
+ return NULL;
+
+- if (dce110_link_encoder_construct(
+- enc110,
+- enc_init_data,
+- &link_enc_feature,
+- &link_enc_regs[enc_init_data->transmitter],
+- &link_enc_aux_regs[enc_init_data->channel - 1],
+- &link_enc_hpd_regs[enc_init_data->hpd_source])) {
+-
+- return &enc110->base;
+- }
+-
+- BREAK_TO_DEBUGGER();
+- kfree(enc110);
+- return NULL;
++ dce110_link_encoder_construct(enc110,
++ enc_init_data,
++ &link_enc_feature,
++ &link_enc_regs[enc_init_data->transmitter],
++ &link_enc_aux_regs[enc_init_data->channel - 1],
++ &link_enc_hpd_regs[enc_init_data->hpd_source]);
++ return &enc110->base;
+ }
+
+ static struct input_pixel_processor *dce112_ipp_create(
+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 b02b0db..9537f0a 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+@@ -544,20 +544,14 @@ static struct link_encoder *dce120_link_encoder_create(
+ if (!enc110)
+ return NULL;
+
+- if (dce110_link_encoder_construct(
+- enc110,
+- enc_init_data,
+- &link_enc_feature,
+- &link_enc_regs[enc_init_data->transmitter],
+- &link_enc_aux_regs[enc_init_data->channel - 1],
+- &link_enc_hpd_regs[enc_init_data->hpd_source])) {
+-
+- return &enc110->base;
+- }
++ dce110_link_encoder_construct(enc110,
++ enc_init_data,
++ &link_enc_feature,
++ &link_enc_regs[enc_init_data->transmitter],
++ &link_enc_aux_regs[enc_init_data->channel - 1],
++ &link_enc_hpd_regs[enc_init_data->hpd_source]);
+
+- BREAK_TO_DEBUGGER();
+- kfree(enc110);
+- return NULL;
++ return &enc110->base;
+ }
+
+ static struct input_pixel_processor *dce120_ipp_create(
+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 0b309ac..3603ae9 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+@@ -567,20 +567,13 @@ struct link_encoder *dce80_link_encoder_create(
+ if (!enc110)
+ return NULL;
+
+- if (dce110_link_encoder_construct(
+- enc110,
+- enc_init_data,
+- &link_enc_feature,
+- &link_enc_regs[enc_init_data->transmitter],
+- &link_enc_aux_regs[enc_init_data->channel - 1],
+- &link_enc_hpd_regs[enc_init_data->hpd_source])) {
+-
+- return &enc110->base;
+- }
+-
+- BREAK_TO_DEBUGGER();
+- kfree(enc110);
+- return NULL;
++ dce110_link_encoder_construct(enc110,
++ enc_init_data,
++ &link_enc_feature,
++ &link_enc_regs[enc_init_data->transmitter],
++ &link_enc_aux_regs[enc_init_data->channel - 1],
++ &link_enc_hpd_regs[enc_init_data->hpd_source]);
++ return &enc110->base;
+ }
+
+ struct clock_source *dce80_clock_source_create(
+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 a76044c..c941a22 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+@@ -563,20 +563,14 @@ struct link_encoder *dcn10_link_encoder_create(
+ if (!enc110)
+ return NULL;
+
+- if (dce110_link_encoder_construct(
+- enc110,
+- enc_init_data,
+- &link_enc_feature,
+- &link_enc_regs[enc_init_data->transmitter],
+- &link_enc_aux_regs[enc_init_data->channel - 1],
+- &link_enc_hpd_regs[enc_init_data->hpd_source])) {
+-
+- return &enc110->base;
+- }
++ dce110_link_encoder_construct(enc110,
++ enc_init_data,
++ &link_enc_feature,
++ &link_enc_regs[enc_init_data->transmitter],
++ &link_enc_aux_regs[enc_init_data->channel - 1],
++ &link_enc_hpd_regs[enc_init_data->hpd_source]);
+
+- BREAK_TO_DEBUGGER();
+- kfree(enc110);
+- return NULL;
++ return &enc110->base;
+ }
+
+ struct clock_source *dcn10_clock_source_create(
+--
+2.7.4
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 11:13:18 +0000