diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3754-drm-amd-display-Move-DTRACE-and-dml_print-defines.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3754-drm-amd-display-Move-DTRACE-and-dml_print-defines.patch | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3754-drm-amd-display-Move-DTRACE-and-dml_print-defines.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3754-drm-amd-display-Move-DTRACE-and-dml_print-defines.patch new file mode 100644 index 00000000..1a939383 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3754-drm-amd-display-Move-DTRACE-and-dml_print-defines.patch @@ -0,0 +1,102 @@ +From cc64f19efe7f6508dbd37ee1f2807a018265b0ee Mon Sep 17 00:00:00 2001 +From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Date: Fri, 23 Feb 2018 14:21:46 -0500 +Subject: [PATCH 3754/4131] drm/amd/display: Move DTRACE and dml_print defines + +These MACROS are only being used by a few files but +gets pulled in by dc.h + +Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> +--- + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 1 + + .../gpu/drm/amd/display/dc/dml/dml_common_defs.h | 3 -- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/dml_logger.h | 35 ++++++++++++++++++++++ + 4 files changed, 37 insertions(+), 3 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_logger.h + +diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c b/drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c +index 189052e..48400d6 100644 +--- a/drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c ++++ b/drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c +@@ -24,6 +24,7 @@ + */ + + #include "display_rq_dlg_helpers.h" ++#include "dml_logger.h" + + void print__rq_params_st(struct display_mode_lib *mode_lib, display_rq_params_st rq_param) + { +diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h +index a0439c9..7589c4b 100644 +--- a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h ++++ b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h +@@ -31,9 +31,6 @@ + #include "display_mode_structs.h" + #include "display_mode_enums.h" + +-#define dml_print(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); } +-#define DTRACE(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); } +- + bool dml_util_is_420(enum source_format_class sorce_format); + double dml_round(double a); + unsigned int dml_round_to_multiple( +diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h +index 105c672..30aa184 100644 +--- a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h ++++ b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h +@@ -28,6 +28,7 @@ + + #include "dml_common_defs.h" + #include "../calcs/dcn_calc_math.h" ++#include "dml_logger.h" + + static inline double dml_min(double a, double b) + { +diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_logger.h b/drivers/gpu/drm/amd/display/dc/dml/dml_logger.h +new file mode 100644 +index 0000000..7c22f3d +--- /dev/null ++++ b/drivers/gpu/drm/amd/display/dc/dml/dml_logger.h +@@ -0,0 +1,35 @@ ++/* ++ * Copyright 2018 Advanced Micro Devices, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ * ++ * Authors: AMD ++ * ++ */ ++ ++ ++#ifndef __DML_LOGGER_H_ ++#define __DML_LOGGER_H_ ++ ++#define dml_print(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); } ++#define DTRACE(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); } ++ ++#endif ++ ++ +-- +2.7.4 + |