* [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2
@ 2020-02-12 4:32 Alex Deucher
2020-02-12 4:32 ` [PATCH 2/3] drm/amdgpu/display: extend DCN guards Alex Deucher
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Alex Deucher @ 2020-02-12 4:32 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
To cover DCN 2.x.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
.../drm/amd/display/dc/bios/command_table_helper2.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
index 7388c987c595..204d7942a6e5 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
@@ -53,25 +53,18 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
case DCE_VERSION_11_2:
case DCE_VERSION_11_22:
+ case DCE_VERSION_12_0:
+ case DCE_VERSION_12_1:
*h = dal_cmd_tbl_helper_dce112_get_table2();
return true;
#if defined(CONFIG_DRM_AMD_DC_DCN)
case DCN_VERSION_1_0:
case DCN_VERSION_1_01:
- *h = dal_cmd_tbl_helper_dce112_get_table2();
- return true;
-#endif
-
case DCN_VERSION_2_0:
- *h = dal_cmd_tbl_helper_dce112_get_table2();
- return true;
case DCN_VERSION_2_1:
*h = dal_cmd_tbl_helper_dce112_get_table2();
return true;
- case DCE_VERSION_12_0:
- case DCE_VERSION_12_1:
- *h = dal_cmd_tbl_helper_dce112_get_table2();
- return true;
+#endif
default:
/* Unsupported DCE */
--
2.24.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] drm/amdgpu/display: extend DCN guards
2020-02-12 4:32 [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Alex Deucher
@ 2020-02-12 4:32 ` Alex Deucher
2020-02-12 15:40 ` Liu, Zhan
2020-02-12 17:10 ` Rodrigo Siqueira
2020-02-12 4:32 ` [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c Alex Deucher
` (2 subsequent siblings)
3 siblings, 2 replies; 11+ messages in thread
From: Alex Deucher @ 2020-02-12 4:32 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
to cover dcn2.x related headers.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++--
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +-
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index a65a1e7820d6..c02e5994d32b 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -46,12 +46,12 @@
#include "dce100/dce100_resource.h"
#include "dce110/dce110_resource.h"
#include "dce112/dce112_resource.h"
+#include "dce120/dce120_resource.h"
#if defined(CONFIG_DRM_AMD_DC_DCN)
#include "dcn10/dcn10_resource.h"
-#endif
#include "dcn20/dcn20_resource.h"
#include "dcn21/dcn21_resource.h"
-#include "dce120/dce120_resource.h"
+#endif
#define DC_LOGGER_INIT(logger)
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
index d2d36d48caaa..f252af1947c3 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
@@ -47,9 +47,9 @@
#include "dce120/hw_factory_dce120.h"
#if defined(CONFIG_DRM_AMD_DC_DCN)
#include "dcn10/hw_factory_dcn10.h"
-#endif
#include "dcn20/hw_factory_dcn20.h"
#include "dcn21/hw_factory_dcn21.h"
+#endif
#include "diagnostics/hw_factory_diag.h"
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
index 5d396657a1ee..04e2c0f74cb0 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
@@ -45,9 +45,9 @@
#include "dce120/hw_translate_dce120.h"
#if defined(CONFIG_DRM_AMD_DC_DCN)
#include "dcn10/hw_translate_dcn10.h"
-#endif
#include "dcn20/hw_translate_dcn20.h"
#include "dcn21/hw_translate_dcn21.h"
+#endif
#include "diagnostics/hw_translate_diag.h"
--
2.24.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c
2020-02-12 4:32 [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Alex Deucher
2020-02-12 4:32 ` [PATCH 2/3] drm/amdgpu/display: extend DCN guards Alex Deucher
@ 2020-02-12 4:32 ` Alex Deucher
2020-02-12 15:58 ` Liu, Zhan
2020-02-12 17:09 ` Rodrigo Siqueira
2020-02-12 15:19 ` [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Liu, Zhan
2020-02-12 17:09 ` Rodrigo Siqueira
3 siblings, 2 replies; 11+ messages in thread
From: Alex Deucher @ 2020-02-12 4:32 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
It's used by more than just DCN2.0. Fixes missing symbol when
amdgpu is built without DCN support.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
.../gpu/drm/amd/display/dc/core/dc_resource.c | 16 ++++++++++++++++
.../drm/amd/display/dc/dcn20/dcn20_resource.c | 16 ----------------
.../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 -
drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 +++
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index c02e5994d32b..572ce3842535 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -532,6 +532,22 @@ static inline void get_vp_scan_direction(
*flip_horz_scan_dir = !*flip_horz_scan_dir;
}
+int get_num_odm_splits(struct pipe_ctx *pipe)
+{
+ int odm_split_count = 0;
+ struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
+ while (next_pipe) {
+ odm_split_count++;
+ next_pipe = next_pipe->next_odm_pipe;
+ }
+ pipe = pipe->prev_odm_pipe;
+ while (pipe) {
+ odm_split_count++;
+ pipe = pipe->prev_odm_pipe;
+ }
+ return odm_split_count;
+}
+
static void calculate_split_count_and_index(struct pipe_ctx *pipe_ctx, int *split_count, int *split_idx)
{
*split_count = get_num_odm_splits(pipe_ctx);
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 39026df56fa6..1061faccec9c 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1861,22 +1861,6 @@ void dcn20_populate_dml_writeback_from_context(
}
-int get_num_odm_splits(struct pipe_ctx *pipe)
-{
- int odm_split_count = 0;
- struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
- while (next_pipe) {
- odm_split_count++;
- next_pipe = next_pipe->next_odm_pipe;
- }
- pipe = pipe->prev_odm_pipe;
- while (pipe) {
- odm_split_count++;
- pipe = pipe->prev_odm_pipe;
- }
- return odm_split_count;
-}
-
int dcn20_populate_dml_pipes_from_context(
struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes)
{
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
index 5180088ab6bc..f5893840b79b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
@@ -49,7 +49,6 @@ unsigned int dcn20_calc_max_scaled_time(
unsigned int time_per_pixel,
enum mmhubbub_wbif_mode mode,
unsigned int urgent_watermark);
-int get_num_odm_splits(struct pipe_ctx *pipe);
int dcn20_populate_dml_pipes_from_context(
struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes);
struct pipe_ctx *dcn20_acquire_idle_pipe_for_layer(
diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
index 5ae8ada154ef..ca4c36c0c9bc 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
@@ -179,4 +179,7 @@ unsigned int resource_pixel_format_to_bpp(enum surface_pixel_format format);
void get_audio_check(struct audio_info *aud_modes,
struct audio_check *aud_chk);
+
+int get_num_odm_splits(struct pipe_ctx *pipe);
+
#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */
--
2.24.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* RE: [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2
2020-02-12 4:32 [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Alex Deucher
2020-02-12 4:32 ` [PATCH 2/3] drm/amdgpu/display: extend DCN guards Alex Deucher
2020-02-12 4:32 ` [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c Alex Deucher
@ 2020-02-12 15:19 ` Liu, Zhan
2020-02-12 17:09 ` Rodrigo Siqueira
3 siblings, 0 replies; 11+ messages in thread
From: Liu, Zhan @ 2020-02-12 15:19 UTC (permalink / raw)
To: Alex Deucher, amd-gfx; +Cc: Deucher, Alexander
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: 2020/February/11, Tuesday 11:33 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
> Subject: [PATCH 1/3] drm/amdgpu/display: extend DCN guard in
> dal_bios_parser_init_cmd_tbl_helper2
>
> To cover DCN 2.x.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This patch is:
Reviewed-by: Zhan Liu <zhan.liu@amd.com>
> ---
> .../drm/amd/display/dc/bios/command_table_helper2.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> index 7388c987c595..204d7942a6e5 100644
> --- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> @@ -53,25 +53,18 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
>
> case DCE_VERSION_11_2:
> case DCE_VERSION_11_22:
> + case DCE_VERSION_12_0:
> + case DCE_VERSION_12_1:
> *h = dal_cmd_tbl_helper_dce112_get_table2();
> return true;
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> case DCN_VERSION_1_0:
> case DCN_VERSION_1_01:
> - *h = dal_cmd_tbl_helper_dce112_get_table2();
> - return true;
> -#endif
> -
> case DCN_VERSION_2_0:
> - *h = dal_cmd_tbl_helper_dce112_get_table2();
> - return true;
> case DCN_VERSION_2_1:
> *h = dal_cmd_tbl_helper_dce112_get_table2();
> return true;
> - case DCE_VERSION_12_0:
> - case DCE_VERSION_12_1:
> - *h = dal_cmd_tbl_helper_dce112_get_table2();
> - return true;
> +#endif
>
> default:
> /* Unsupported DCE */
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH 2/3] drm/amdgpu/display: extend DCN guards
2020-02-12 4:32 ` [PATCH 2/3] drm/amdgpu/display: extend DCN guards Alex Deucher
@ 2020-02-12 15:40 ` Liu, Zhan
2020-02-12 17:10 ` Rodrigo Siqueira
1 sibling, 0 replies; 11+ messages in thread
From: Liu, Zhan @ 2020-02-12 15:40 UTC (permalink / raw)
To: Alex Deucher, amd-gfx; +Cc: Deucher, Alexander
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: 2020/February/11, Tuesday 11:33 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
> Subject: [PATCH 2/3] drm/amdgpu/display: extend DCN guards
>
> to cover dcn2.x related headers.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This patch is:
Reviewed-by: Zhan Liu <zhan.liu@amd.com>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++--
> drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +-
> drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index a65a1e7820d6..c02e5994d32b 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -46,12 +46,12 @@
> #include "dce100/dce100_resource.h"
> #include "dce110/dce110_resource.h"
> #include "dce112/dce112_resource.h"
> +#include "dce120/dce120_resource.h"
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> #include "dcn10/dcn10_resource.h"
> -#endif
> #include "dcn20/dcn20_resource.h"
> #include "dcn21/dcn21_resource.h"
> -#include "dce120/dce120_resource.h"
> +#endif
>
> #define DC_LOGGER_INIT(logger)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> index d2d36d48caaa..f252af1947c3 100644
> --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> @@ -47,9 +47,9 @@
> #include "dce120/hw_factory_dce120.h"
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> #include "dcn10/hw_factory_dcn10.h"
> -#endif
> #include "dcn20/hw_factory_dcn20.h"
> #include "dcn21/hw_factory_dcn21.h"
> +#endif
>
> #include "diagnostics/hw_factory_diag.h"
>
> diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> index 5d396657a1ee..04e2c0f74cb0 100644
> --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> @@ -45,9 +45,9 @@
> #include "dce120/hw_translate_dce120.h"
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> #include "dcn10/hw_translate_dcn10.h"
> -#endif
> #include "dcn20/hw_translate_dcn20.h"
> #include "dcn21/hw_translate_dcn21.h"
> +#endif
>
> #include "diagnostics/hw_translate_diag.h"
>
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c
2020-02-12 4:32 ` [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c Alex Deucher
@ 2020-02-12 15:58 ` Liu, Zhan
2020-02-12 16:04 ` Alex Deucher
2020-02-12 17:09 ` Rodrigo Siqueira
1 sibling, 1 reply; 11+ messages in thread
From: Liu, Zhan @ 2020-02-12 15:58 UTC (permalink / raw)
To: Alex Deucher, amd-gfx; +Cc: Deucher, Alexander
Please find my reply inline.
Thanks,
Zhan
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: 2020/February/11, Tuesday 11:33 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
> Subject: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into
> dc_resource.c
>
> It's used by more than just DCN2.0. Fixes missing symbol when amdgpu is
> built without DCN support.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> .../gpu/drm/amd/display/dc/core/dc_resource.c | 16 ++++++++++++++++
> .../drm/amd/display/dc/dcn20/dcn20_resource.c | 16 ----------------
> .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 -
> drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 +++
> 4 files changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index c02e5994d32b..572ce3842535 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -532,6 +532,22 @@ static inline void get_vp_scan_direction(
> *flip_horz_scan_dir = !*flip_horz_scan_dir; }
>
> +int get_num_odm_splits(struct pipe_ctx *pipe) {
> + int odm_split_count = 0;
> + struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> + while (next_pipe) {
> + odm_split_count++;
> + next_pipe = next_pipe->next_odm_pipe;
> + }
> + pipe = pipe->prev_odm_pipe;
> + while (pipe) {
> + odm_split_count++;
> + pipe = pipe->prev_odm_pipe;
> + }
> + return odm_split_count;
> +}
> +
> static void calculate_split_count_and_index(struct pipe_ctx *pipe_ctx, int
> *split_count, int *split_idx) {
> *split_count = get_num_odm_splits(pipe_ctx); diff --git
> a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 39026df56fa6..1061faccec9c 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -1861,22 +1861,6 @@ void
> dcn20_populate_dml_writeback_from_context(
>
> }
>
> -int get_num_odm_splits(struct pipe_ctx *pipe) -{
> - int odm_split_count = 0;
> - struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> - while (next_pipe) {
> - odm_split_count++;
> - next_pipe = next_pipe->next_odm_pipe;
> - }
> - pipe = pipe->prev_odm_pipe;
> - while (pipe) {
> - odm_split_count++;
> - pipe = pipe->prev_odm_pipe;
> - }
> - return odm_split_count;
> -}
> -
> int dcn20_populate_dml_pipes_from_context(
> struct dc *dc, struct dc_state *context,
> display_e2e_pipe_params_st *pipes) { diff --git
> a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> index 5180088ab6bc..f5893840b79b 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> @@ -49,7 +49,6 @@ unsigned int dcn20_calc_max_scaled_time(
> unsigned int time_per_pixel,
> enum mmhubbub_wbif_mode mode,
> unsigned int urgent_watermark);
> -int get_num_odm_splits(struct pipe_ctx *pipe); int
Seems like the "int" at the end of this line actually belongs to the next line.
I am wondering is it a typo or a format-patch glitch?
> dcn20_populate_dml_pipes_from_context(
> struct dc *dc, struct dc_state *context,
> display_e2e_pipe_params_st *pipes); struct pipe_ctx
> *dcn20_acquire_idle_pipe_for_layer(
> diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> index 5ae8ada154ef..ca4c36c0c9bc 100644
> --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> @@ -179,4 +179,7 @@ unsigned int resource_pixel_format_to_bpp(enum
> surface_pixel_format format);
>
> void get_audio_check(struct audio_info *aud_modes,
> struct audio_check *aud_chk);
> +
> +int get_num_odm_splits(struct pipe_ctx *pipe);
> +
> #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c
2020-02-12 15:58 ` Liu, Zhan
@ 2020-02-12 16:04 ` Alex Deucher
2020-02-12 16:12 ` Liu, Zhan
0 siblings, 1 reply; 11+ messages in thread
From: Alex Deucher @ 2020-02-12 16:04 UTC (permalink / raw)
To: Liu, Zhan; +Cc: Deucher, Alexander, amd-gfx
On Wed, Feb 12, 2020 at 10:58 AM Liu, Zhan <Zhan.Liu@amd.com> wrote:
>
> Please find my reply inline.
>
> Thanks,
> Zhan
>
> > -----Original Message-----
> > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex
> > Deucher
> > Sent: 2020/February/11, Tuesday 11:33 PM
> > To: amd-gfx@lists.freedesktop.org
> > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
> > Subject: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into
> > dc_resource.c
> >
> > It's used by more than just DCN2.0. Fixes missing symbol when amdgpu is
> > built without DCN support.
> >
> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > ---
> > .../gpu/drm/amd/display/dc/core/dc_resource.c | 16 ++++++++++++++++
> > .../drm/amd/display/dc/dcn20/dcn20_resource.c | 16 ----------------
> > .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 -
> > drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 +++
> > 4 files changed, 19 insertions(+), 17 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > index c02e5994d32b..572ce3842535 100644
> > --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > @@ -532,6 +532,22 @@ static inline void get_vp_scan_direction(
> > *flip_horz_scan_dir = !*flip_horz_scan_dir; }
> >
> > +int get_num_odm_splits(struct pipe_ctx *pipe) {
> > + int odm_split_count = 0;
> > + struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> > + while (next_pipe) {
> > + odm_split_count++;
> > + next_pipe = next_pipe->next_odm_pipe;
> > + }
> > + pipe = pipe->prev_odm_pipe;
> > + while (pipe) {
> > + odm_split_count++;
> > + pipe = pipe->prev_odm_pipe;
> > + }
> > + return odm_split_count;
> > +}
> > +
> > static void calculate_split_count_and_index(struct pipe_ctx *pipe_ctx, int
> > *split_count, int *split_idx) {
> > *split_count = get_num_odm_splits(pipe_ctx); diff --git
> > a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > index 39026df56fa6..1061faccec9c 100644
> > --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > @@ -1861,22 +1861,6 @@ void
> > dcn20_populate_dml_writeback_from_context(
> >
> > }
> >
> > -int get_num_odm_splits(struct pipe_ctx *pipe) -{
> > - int odm_split_count = 0;
> > - struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> > - while (next_pipe) {
> > - odm_split_count++;
> > - next_pipe = next_pipe->next_odm_pipe;
> > - }
> > - pipe = pipe->prev_odm_pipe;
> > - while (pipe) {
> > - odm_split_count++;
> > - pipe = pipe->prev_odm_pipe;
> > - }
> > - return odm_split_count;
> > -}
> > -
> > int dcn20_populate_dml_pipes_from_context(
> > struct dc *dc, struct dc_state *context,
> > display_e2e_pipe_params_st *pipes) { diff --git
> > a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > index 5180088ab6bc..f5893840b79b 100644
> > --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > @@ -49,7 +49,6 @@ unsigned int dcn20_calc_max_scaled_time(
> > unsigned int time_per_pixel,
> > enum mmhubbub_wbif_mode mode,
> > unsigned int urgent_watermark);
> > -int get_num_odm_splits(struct pipe_ctx *pipe); int
>
> Seems like the "int" at the end of this line actually belongs to the next line.
> I am wondering is it a typo or a format-patch glitch?
Actual patch is correct:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next&id=c8d2c8eaa3bbcaf8e2bc20f3e3203ed444f90bcc
>
> > dcn20_populate_dml_pipes_from_context(
> > struct dc *dc, struct dc_state *context,
> > display_e2e_pipe_params_st *pipes); struct pipe_ctx
> > *dcn20_acquire_idle_pipe_for_layer(
> > diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > index 5ae8ada154ef..ca4c36c0c9bc 100644
> > --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > @@ -179,4 +179,7 @@ unsigned int resource_pixel_format_to_bpp(enum
> > surface_pixel_format format);
> >
> > void get_audio_check(struct audio_info *aud_modes,
> > struct audio_check *aud_chk);
> > +
> > +int get_num_odm_splits(struct pipe_ctx *pipe);
> > +
> > #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */
> > --
> > 2.24.1
> >
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx@lists.freedesktop.org
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c
2020-02-12 16:04 ` Alex Deucher
@ 2020-02-12 16:12 ` Liu, Zhan
0 siblings, 0 replies; 11+ messages in thread
From: Liu, Zhan @ 2020-02-12 16:12 UTC (permalink / raw)
To: Alex Deucher; +Cc: Deucher, Alexander, amd-gfx
> -----Original Message-----
> From: Alex Deucher <alexdeucher@gmail.com>
> Sent: 2020/February/12, Wednesday 11:05 AM
> To: Liu, Zhan <Zhan.Liu@amd.com>
> Cc: amd-gfx@lists.freedesktop.org; Deucher, Alexander
> <Alexander.Deucher@amd.com>
> Subject: Re: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits()
> into dc_resource.c
>
> On Wed, Feb 12, 2020 at 10:58 AM Liu, Zhan <Zhan.Liu@amd.com> wrote:
> >
> > Please find my reply inline.
> >
> > Thanks,
> > Zhan
> >
> > > -----Original Message-----
> > > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
> > > Alex Deucher
> > > Sent: 2020/February/11, Tuesday 11:33 PM
> > > To: amd-gfx@lists.freedesktop.org
> > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
> > > Subject: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits()
> > > into dc_resource.c
> > >
> > > It's used by more than just DCN2.0. Fixes missing symbol when
> > > amdgpu is built without DCN support.
> > >
> > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > > ---
> > > .../gpu/drm/amd/display/dc/core/dc_resource.c | 16
> ++++++++++++++++
> > > .../drm/amd/display/dc/dcn20/dcn20_resource.c | 16 ----------------
> > > .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 -
> > > drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 +++
> > > 4 files changed, 19 insertions(+), 17 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > > b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > > index c02e5994d32b..572ce3842535 100644
> > > --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> > > @@ -532,6 +532,22 @@ static inline void get_vp_scan_direction(
> > > *flip_horz_scan_dir = !*flip_horz_scan_dir; }
> > >
> > > +int get_num_odm_splits(struct pipe_ctx *pipe) {
> > > + int odm_split_count = 0;
> > > + struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> > > + while (next_pipe) {
> > > + odm_split_count++;
> > > + next_pipe = next_pipe->next_odm_pipe;
> > > + }
> > > + pipe = pipe->prev_odm_pipe;
> > > + while (pipe) {
> > > + odm_split_count++;
> > > + pipe = pipe->prev_odm_pipe;
> > > + }
> > > + return odm_split_count;
> > > +}
> > > +
> > > static void calculate_split_count_and_index(struct pipe_ctx
> > > *pipe_ctx, int *split_count, int *split_idx) {
> > > *split_count = get_num_odm_splits(pipe_ctx); diff --git
> > > a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > > b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > > index 39026df56fa6..1061faccec9c 100644
> > > --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > > +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> > > @@ -1861,22 +1861,6 @@ void
> > > dcn20_populate_dml_writeback_from_context(
> > >
> > > }
> > >
> > > -int get_num_odm_splits(struct pipe_ctx *pipe) -{
> > > - int odm_split_count = 0;
> > > - struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> > > - while (next_pipe) {
> > > - odm_split_count++;
> > > - next_pipe = next_pipe->next_odm_pipe;
> > > - }
> > > - pipe = pipe->prev_odm_pipe;
> > > - while (pipe) {
> > > - odm_split_count++;
> > > - pipe = pipe->prev_odm_pipe;
> > > - }
> > > - return odm_split_count;
> > > -}
> > > -
> > > int dcn20_populate_dml_pipes_from_context(
> > > struct dc *dc, struct dc_state *context,
> > > display_e2e_pipe_params_st *pipes) { diff --git
> > > a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > > b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > > index 5180088ab6bc..f5893840b79b 100644
> > > --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > > +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> > > @@ -49,7 +49,6 @@ unsigned int dcn20_calc_max_scaled_time(
> > > unsigned int time_per_pixel,
> > > enum mmhubbub_wbif_mode mode,
> > > unsigned int urgent_watermark); -int
> > > get_num_odm_splits(struct pipe_ctx *pipe); int
> >
> > Seems like the "int" at the end of this line actually belongs to the next line.
> > I am wondering is it a typo or a format-patch glitch?
>
> Actual patch is correct:
> https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next&id=c8d2c8eaa3bbcaf8e2bc20f3e3203ed444f90bcc
I see. Thx!
This patch (and this patch series) is reviewed by:
Zhan Liu <zhan.liu@amd.com>
>
> >
> > > dcn20_populate_dml_pipes_from_context(
> > > struct dc *dc, struct dc_state *context,
> > > display_e2e_pipe_params_st *pipes); struct pipe_ctx
> > > *dcn20_acquire_idle_pipe_for_layer(
> > > diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > > b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > > index 5ae8ada154ef..ca4c36c0c9bc 100644
> > > --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > > +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> > > @@ -179,4 +179,7 @@ unsigned int
> resource_pixel_format_to_bpp(enum
> > > surface_pixel_format format);
> > >
> > > void get_audio_check(struct audio_info *aud_modes,
> > > struct audio_check *aud_chk);
> > > +
> > > +int get_num_odm_splits(struct pipe_ctx *pipe);
> > > +
> > > #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_
> */
> > > --
> > > 2.24.1
> > >
> > > _______________________________________________
> > > amd-gfx mailing list
> > > amd-gfx@lists.freedesktop.org
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2
2020-02-12 4:32 [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Alex Deucher
` (2 preceding siblings ...)
2020-02-12 15:19 ` [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Liu, Zhan
@ 2020-02-12 17:09 ` Rodrigo Siqueira
3 siblings, 0 replies; 11+ messages in thread
From: Rodrigo Siqueira @ 2020-02-12 17:09 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, amd-gfx
[-- Attachment #1.1: Type: text/plain, Size: 2012 bytes --]
Tested-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
On 02/11, Alex Deucher wrote:
> To cover DCN 2.x.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> .../drm/amd/display/dc/bios/command_table_helper2.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> index 7388c987c595..204d7942a6e5 100644
> --- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> @@ -53,25 +53,18 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
>
> case DCE_VERSION_11_2:
> case DCE_VERSION_11_22:
> + case DCE_VERSION_12_0:
> + case DCE_VERSION_12_1:
> *h = dal_cmd_tbl_helper_dce112_get_table2();
> return true;
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> case DCN_VERSION_1_0:
> case DCN_VERSION_1_01:
> - *h = dal_cmd_tbl_helper_dce112_get_table2();
> - return true;
> -#endif
> -
> case DCN_VERSION_2_0:
> - *h = dal_cmd_tbl_helper_dce112_get_table2();
> - return true;
> case DCN_VERSION_2_1:
> *h = dal_cmd_tbl_helper_dce112_get_table2();
> return true;
> - case DCE_VERSION_12_0:
> - case DCE_VERSION_12_1:
> - *h = dal_cmd_tbl_helper_dce112_get_table2();
> - return true;
> +#endif
>
> default:
> /* Unsupported DCE */
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CRodrigo.Siqueira%40amd.com%7Cab3f299a5c754444f05c08d7af74afbd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637170788041384449&sdata=jsO5pK4dLty0gy%2BNBQxRzJrR%2B9htMcinVWz7oR0fjS8%3D&reserved=0
--
Rodrigo Siqueira
Software Engineer, Advanced Micro Devices (AMD)
https://siqueira.tech
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c
2020-02-12 4:32 ` [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c Alex Deucher
2020-02-12 15:58 ` Liu, Zhan
@ 2020-02-12 17:09 ` Rodrigo Siqueira
1 sibling, 0 replies; 11+ messages in thread
From: Rodrigo Siqueira @ 2020-02-12 17:09 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, amd-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4341 bytes --]
Tested-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
On 02/11, Alex Deucher wrote:
> It's used by more than just DCN2.0. Fixes missing symbol when
> amdgpu is built without DCN support.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> .../gpu/drm/amd/display/dc/core/dc_resource.c | 16 ++++++++++++++++
> .../drm/amd/display/dc/dcn20/dcn20_resource.c | 16 ----------------
> .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 -
> drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 +++
> 4 files changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index c02e5994d32b..572ce3842535 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -532,6 +532,22 @@ static inline void get_vp_scan_direction(
> *flip_horz_scan_dir = !*flip_horz_scan_dir;
> }
>
> +int get_num_odm_splits(struct pipe_ctx *pipe)
> +{
> + int odm_split_count = 0;
> + struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> + while (next_pipe) {
> + odm_split_count++;
> + next_pipe = next_pipe->next_odm_pipe;
> + }
> + pipe = pipe->prev_odm_pipe;
> + while (pipe) {
> + odm_split_count++;
> + pipe = pipe->prev_odm_pipe;
> + }
> + return odm_split_count;
> +}
> +
> static void calculate_split_count_and_index(struct pipe_ctx *pipe_ctx, int *split_count, int *split_idx)
> {
> *split_count = get_num_odm_splits(pipe_ctx);
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 39026df56fa6..1061faccec9c 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -1861,22 +1861,6 @@ void dcn20_populate_dml_writeback_from_context(
>
> }
>
> -int get_num_odm_splits(struct pipe_ctx *pipe)
> -{
> - int odm_split_count = 0;
> - struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> - while (next_pipe) {
> - odm_split_count++;
> - next_pipe = next_pipe->next_odm_pipe;
> - }
> - pipe = pipe->prev_odm_pipe;
> - while (pipe) {
> - odm_split_count++;
> - pipe = pipe->prev_odm_pipe;
> - }
> - return odm_split_count;
> -}
> -
> int dcn20_populate_dml_pipes_from_context(
> struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes)
> {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> index 5180088ab6bc..f5893840b79b 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> @@ -49,7 +49,6 @@ unsigned int dcn20_calc_max_scaled_time(
> unsigned int time_per_pixel,
> enum mmhubbub_wbif_mode mode,
> unsigned int urgent_watermark);
> -int get_num_odm_splits(struct pipe_ctx *pipe);
> int dcn20_populate_dml_pipes_from_context(
> struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes);
> struct pipe_ctx *dcn20_acquire_idle_pipe_for_layer(
> diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> index 5ae8ada154ef..ca4c36c0c9bc 100644
> --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> @@ -179,4 +179,7 @@ unsigned int resource_pixel_format_to_bpp(enum surface_pixel_format format);
>
> void get_audio_check(struct audio_info *aud_modes,
> struct audio_check *aud_chk);
> +
> +int get_num_odm_splits(struct pipe_ctx *pipe);
> +
> #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CRodrigo.Siqueira%40amd.com%7Ce2697beeff3847ea057408d7af74b286%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637170788143697503&sdata=XUELq7%2FDPfX%2FifA635o5DUd09JSwzPIXZkYjB107Jk8%3D&reserved=0
--
Rodrigo Siqueira
Software Engineer, Advanced Micro Devices (AMD)
https://siqueira.tech
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] drm/amdgpu/display: extend DCN guards
2020-02-12 4:32 ` [PATCH 2/3] drm/amdgpu/display: extend DCN guards Alex Deucher
2020-02-12 15:40 ` Liu, Zhan
@ 2020-02-12 17:10 ` Rodrigo Siqueira
1 sibling, 0 replies; 11+ messages in thread
From: Rodrigo Siqueira @ 2020-02-12 17:10 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, amd-gfx
[-- Attachment #1.1: Type: text/plain, Size: 2893 bytes --]
Tested-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
On 02/11, Alex Deucher wrote:
> to cover dcn2.x related headers.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++--
> drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +-
> drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index a65a1e7820d6..c02e5994d32b 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -46,12 +46,12 @@
> #include "dce100/dce100_resource.h"
> #include "dce110/dce110_resource.h"
> #include "dce112/dce112_resource.h"
> +#include "dce120/dce120_resource.h"
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> #include "dcn10/dcn10_resource.h"
> -#endif
> #include "dcn20/dcn20_resource.h"
> #include "dcn21/dcn21_resource.h"
> -#include "dce120/dce120_resource.h"
> +#endif
>
> #define DC_LOGGER_INIT(logger)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> index d2d36d48caaa..f252af1947c3 100644
> --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
> @@ -47,9 +47,9 @@
> #include "dce120/hw_factory_dce120.h"
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> #include "dcn10/hw_factory_dcn10.h"
> -#endif
> #include "dcn20/hw_factory_dcn20.h"
> #include "dcn21/hw_factory_dcn21.h"
> +#endif
>
> #include "diagnostics/hw_factory_diag.h"
>
> diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> index 5d396657a1ee..04e2c0f74cb0 100644
> --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
> @@ -45,9 +45,9 @@
> #include "dce120/hw_translate_dce120.h"
> #if defined(CONFIG_DRM_AMD_DC_DCN)
> #include "dcn10/hw_translate_dcn10.h"
> -#endif
> #include "dcn20/hw_translate_dcn20.h"
> #include "dcn21/hw_translate_dcn21.h"
> +#endif
>
> #include "diagnostics/hw_translate_diag.h"
>
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CRodrigo.Siqueira%40amd.com%7C912d22aa09094b1fb87a08d7af74b20a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637170788079229843&sdata=45YxJwNoUm5ViV3ouldnO2eCqeD4C3S%2FLyfLY4VRvs0%3D&reserved=0
--
Rodrigo Siqueira
Software Engineer, Advanced Micro Devices (AMD)
https://siqueira.tech
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-02-12 17:10 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-12 4:32 [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Alex Deucher
2020-02-12 4:32 ` [PATCH 2/3] drm/amdgpu/display: extend DCN guards Alex Deucher
2020-02-12 15:40 ` Liu, Zhan
2020-02-12 17:10 ` Rodrigo Siqueira
2020-02-12 4:32 ` [PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c Alex Deucher
2020-02-12 15:58 ` Liu, Zhan
2020-02-12 16:04 ` Alex Deucher
2020-02-12 16:12 ` Liu, Zhan
2020-02-12 17:09 ` Rodrigo Siqueira
2020-02-12 15:19 ` [PATCH 1/3] drm/amdgpu/display: extend DCN guard in dal_bios_parser_init_cmd_tbl_helper2 Liu, Zhan
2020-02-12 17:09 ` Rodrigo Siqueira
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).