| Message ID | 20200331212228.139219-3-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu: Remove duplicated DPCD logging | expand |
On 2020-03-31 5:22 p.m., Lyude Paul wrote: > DRM already supports tracing DPCD transactions, there's no reason for > the existence of this function. Also, it prints one byte per-line which > is way too loud. So, just remove it. > > Signed-off-by: Lyude Paul <lyude@redhat.com> Thanks for helping clean this up! Series is: Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Regards, Nicholas Kazlauskas > --- > .../gpu/drm/amd/display/dc/basics/Makefile | 3 +- > .../drm/amd/display/dc/basics/log_helpers.c | 39 ------------------- > .../amd/display/include/logger_interface.h | 4 -- > 3 files changed, 1 insertion(+), 45 deletions(-) > delete mode 100644 drivers/gpu/drm/amd/display/dc/basics/log_helpers.c > > diff --git a/drivers/gpu/drm/amd/display/dc/basics/Makefile b/drivers/gpu/drm/amd/display/dc/basics/Makefile > index 7ad0cad0f4ef..01b99e0d788e 100644 > --- a/drivers/gpu/drm/amd/display/dc/basics/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/basics/Makefile > @@ -24,8 +24,7 @@ > # It provides the general basic services required by other DAL > # subcomponents. > > -BASICS = conversion.o fixpt31_32.o \ > - log_helpers.o vector.o dc_common.o > +BASICS = conversion.o fixpt31_32.o vector.o dc_common.o > > AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS)) > > diff --git a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c > deleted file mode 100644 > index 26583f346c39..000000000000 > --- a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c > +++ /dev/null > @@ -1,39 +0,0 @@ > -/* > - * Copyright 2012-16 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 > - * > - */ > - > -#include "core_types.h" > -#include "logger.h" > -#include "include/logger_interface.h" > -#include "dm_helpers.h" > - > -void dc_conn_log_hex_linux(const uint8_t *hex_data, int hex_data_count) > -{ > - int i; > - > - if (hex_data) > - for (i = 0; i < hex_data_count; i++) > - DC_LOG_DEBUG("%2.2X ", hex_data[i]); > -} > - > diff --git a/drivers/gpu/drm/amd/display/include/logger_interface.h b/drivers/gpu/drm/amd/display/include/logger_interface.h > index 6e008de25629..02c23b04d34b 100644 > --- a/drivers/gpu/drm/amd/display/include/logger_interface.h > +++ b/drivers/gpu/drm/amd/display/include/logger_interface.h > @@ -40,8 +40,6 @@ struct dc_state; > * > */ > > -void dc_conn_log_hex_linux(const uint8_t *hex_data, int hex_data_count); > - > void pre_surface_trace( > struct dc *dc, > const struct dc_plane_state *const *plane_states, > @@ -102,14 +100,12 @@ void context_clock_trace( > #define CONN_DATA_DETECT(link, hex_data, hex_len, ...) \ > do { \ > (void)(link); \ > - dc_conn_log_hex_linux(hex_data, hex_len); \ > DC_LOG_EVENT_DETECTION(__VA_ARGS__); \ > } while (0) > > #define CONN_DATA_LINK_LOSS(link, hex_data, hex_len, ...) \ > do { \ > (void)(link); \ > - dc_conn_log_hex_linux(hex_data, hex_len); \ > DC_LOG_EVENT_LINK_LOSS(__VA_ARGS__); \ > } while (0) > >
On Wed, Apr 1, 2020 at 9:00 AM Kazlauskas, Nicholas <nicholas.kazlauskas@amd.com> wrote: > > On 2020-03-31 5:22 p.m., Lyude Paul wrote: > > DRM already supports tracing DPCD transactions, there's no reason for > > the existence of this function. Also, it prints one byte per-line which > > is way too loud. So, just remove it. > > > > Signed-off-by: Lyude Paul <lyude@redhat.com> > > Thanks for helping clean this up! > > Series is: > > Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Applied the series. Thanks! Alex > > Regards, > Nicholas Kazlauskas > > > --- > > .../gpu/drm/amd/display/dc/basics/Makefile | 3 +- > > .../drm/amd/display/dc/basics/log_helpers.c | 39 ------------------- > > .../amd/display/include/logger_interface.h | 4 -- > > 3 files changed, 1 insertion(+), 45 deletions(-) > > delete mode 100644 drivers/gpu/drm/amd/display/dc/basics/log_helpers.c > > > > diff --git a/drivers/gpu/drm/amd/display/dc/basics/Makefile b/drivers/gpu/drm/amd/display/dc/basics/Makefile > > index 7ad0cad0f4ef..01b99e0d788e 100644 > > --- a/drivers/gpu/drm/amd/display/dc/basics/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/basics/Makefile > > @@ -24,8 +24,7 @@ > > # It provides the general basic services required by other DAL > > # subcomponents. > > > > -BASICS = conversion.o fixpt31_32.o \ > > - log_helpers.o vector.o dc_common.o > > +BASICS = conversion.o fixpt31_32.o vector.o dc_common.o > > > > AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS)) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c > > deleted file mode 100644 > > index 26583f346c39..000000000000 > > --- a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -/* > > - * Copyright 2012-16 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 > > - * > > - */ > > - > > -#include "core_types.h" > > -#include "logger.h" > > -#include "include/logger_interface.h" > > -#include "dm_helpers.h" > > - > > -void dc_conn_log_hex_linux(const uint8_t *hex_data, int hex_data_count) > > -{ > > - int i; > > - > > - if (hex_data) > > - for (i = 0; i < hex_data_count; i++) > > - DC_LOG_DEBUG("%2.2X ", hex_data[i]); > > -} > > - > > diff --git a/drivers/gpu/drm/amd/display/include/logger_interface.h b/drivers/gpu/drm/amd/display/include/logger_interface.h > > index 6e008de25629..02c23b04d34b 100644 > > --- a/drivers/gpu/drm/amd/display/include/logger_interface.h > > +++ b/drivers/gpu/drm/amd/display/include/logger_interface.h > > @@ -40,8 +40,6 @@ struct dc_state; > > * > > */ > > > > -void dc_conn_log_hex_linux(const uint8_t *hex_data, int hex_data_count); > > - > > void pre_surface_trace( > > struct dc *dc, > > const struct dc_plane_state *const *plane_states, > > @@ -102,14 +100,12 @@ void context_clock_trace( > > #define CONN_DATA_DETECT(link, hex_data, hex_len, ...) \ > > do { \ > > (void)(link); \ > > - dc_conn_log_hex_linux(hex_data, hex_len); \ > > DC_LOG_EVENT_DETECTION(__VA_ARGS__); \ > > } while (0) > > > > #define CONN_DATA_LINK_LOSS(link, hex_data, hex_len, ...) \ > > do { \ > > (void)(link); \ > > - dc_conn_log_hex_linux(hex_data, hex_len); \ > > DC_LOG_EVENT_LINK_LOSS(__VA_ARGS__); \ > > } while (0) > > > > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/display/dc/basics/Makefile b/drivers/gpu/drm/amd/display/dc/basics/Makefile index 7ad0cad0f4ef..01b99e0d788e 100644 --- a/drivers/gpu/drm/amd/display/dc/basics/Makefile +++ b/drivers/gpu/drm/amd/display/dc/basics/Makefile @@ -24,8 +24,7 @@ # It provides the general basic services required by other DAL # subcomponents. -BASICS = conversion.o fixpt31_32.o \ - log_helpers.o vector.o dc_common.o +BASICS = conversion.o fixpt31_32.o vector.o dc_common.o AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS)) diff --git a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c deleted file mode 100644 index 26583f346c39..000000000000 --- a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2012-16 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 - * - */ - -#include "core_types.h" -#include "logger.h" -#include "include/logger_interface.h" -#include "dm_helpers.h" - -void dc_conn_log_hex_linux(const uint8_t *hex_data, int hex_data_count) -{ - int i; - - if (hex_data) - for (i = 0; i < hex_data_count; i++) - DC_LOG_DEBUG("%2.2X ", hex_data[i]); -} - diff --git a/drivers/gpu/drm/amd/display/include/logger_interface.h b/drivers/gpu/drm/amd/display/include/logger_interface.h index 6e008de25629..02c23b04d34b 100644 --- a/drivers/gpu/drm/amd/display/include/logger_interface.h +++ b/drivers/gpu/drm/amd/display/include/logger_interface.h @@ -40,8 +40,6 @@ struct dc_state; * */ -void dc_conn_log_hex_linux(const uint8_t *hex_data, int hex_data_count); - void pre_surface_trace( struct dc *dc, const struct dc_plane_state *const *plane_states, @@ -102,14 +100,12 @@ void context_clock_trace( #define CONN_DATA_DETECT(link, hex_data, hex_len, ...) \ do { \ (void)(link); \ - dc_conn_log_hex_linux(hex_data, hex_len); \ DC_LOG_EVENT_DETECTION(__VA_ARGS__); \ } while (0) #define CONN_DATA_LINK_LOSS(link, hex_data, hex_len, ...) \ do { \ (void)(link); \ - dc_conn_log_hex_linux(hex_data, hex_len); \ DC_LOG_EVENT_LINK_LOSS(__VA_ARGS__); \ } while (0)
DRM already supports tracing DPCD transactions, there's no reason for the existence of this function. Also, it prints one byte per-line which is way too loud. So, just remove it. Signed-off-by: Lyude Paul <lyude@redhat.com> --- .../gpu/drm/amd/display/dc/basics/Makefile | 3 +- .../drm/amd/display/dc/basics/log_helpers.c | 39 ------------------- .../amd/display/include/logger_interface.h | 4 -- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/basics/log_helpers.c