aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/basics/logger.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/basics/logger.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/basics/logger.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/basics/logger.c b/drivers/gpu/drm/amd/display/dc/basics/logger.c
index 5895dd3903a3..afb6d2d80e0c 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/logger.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/logger.c
@@ -70,8 +70,8 @@ static bool construct(struct dc_context *ctx, struct dal_logger *logger,
70{ 70{
71 /* malloc buffer and init offsets */ 71 /* malloc buffer and init offsets */
72 logger->log_buffer_size = DAL_LOGGER_BUFFER_MAX_SIZE; 72 logger->log_buffer_size = DAL_LOGGER_BUFFER_MAX_SIZE;
73 logger->log_buffer = (char *)dm_alloc(logger->log_buffer_size * 73 logger->log_buffer = (char *)kzalloc(logger->log_buffer_size * sizeof(char),
74 sizeof(char)); 74 GFP_KERNEL);
75 75
76 if (!logger->log_buffer) 76 if (!logger->log_buffer)
77 return false; 77 return false;
@@ -97,7 +97,7 @@ static bool construct(struct dc_context *ctx, struct dal_logger *logger,
97static void destruct(struct dal_logger *logger) 97static void destruct(struct dal_logger *logger)
98{ 98{
99 if (logger->log_buffer) { 99 if (logger->log_buffer) {
100 dm_free(logger->log_buffer); 100 kfree(logger->log_buffer);
101 logger->log_buffer = NULL; 101 logger->log_buffer = NULL;
102 } 102 }
103} 103}
@@ -105,12 +105,13 @@ static void destruct(struct dal_logger *logger)
105struct dal_logger *dal_logger_create(struct dc_context *ctx, uint32_t log_mask) 105struct dal_logger *dal_logger_create(struct dc_context *ctx, uint32_t log_mask)
106{ 106{
107 /* malloc struct */ 107 /* malloc struct */
108 struct dal_logger *logger = dm_alloc(sizeof(struct dal_logger)); 108 struct dal_logger *logger = kzalloc(sizeof(struct dal_logger),
109 GFP_KERNEL);
109 110
110 if (!logger) 111 if (!logger)
111 return NULL; 112 return NULL;
112 if (!construct(ctx, logger, log_mask)) { 113 if (!construct(ctx, logger, log_mask)) {
113 dm_free(logger); 114 kfree(logger);
114 return NULL; 115 return NULL;
115 } 116 }
116 117
@@ -122,7 +123,7 @@ uint32_t dal_logger_destroy(struct dal_logger **logger)
122 if (logger == NULL || *logger == NULL) 123 if (logger == NULL || *logger == NULL)
123 return 1; 124 return 1;
124 destruct(*logger); 125 destruct(*logger);
125 dm_free(*logger); 126 kfree(*logger);
126 *logger = NULL; 127 *logger = NULL;
127 128
128 return 0; 129 return 0;
@@ -390,7 +391,8 @@ void dm_logger_open(
390 entry->type = log_type; 391 entry->type = log_type;
391 entry->logger = logger; 392 entry->logger = logger;
392 393
393 entry->buf = dm_alloc(DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char)); 394 entry->buf = kzalloc(DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char),
395 GFP_KERNEL);
394 396
395 entry->buf_offset = 0; 397 entry->buf_offset = 0;
396 entry->max_buf_bytes = DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char); 398 entry->max_buf_bytes = DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char);
@@ -421,7 +423,7 @@ void dm_logger_close(struct log_entry *entry)
421 423
422cleanup: 424cleanup:
423 if (entry->buf) { 425 if (entry->buf) {
424 dm_free(entry->buf); 426 kfree(entry->buf);
425 entry->buf = NULL; 427 entry->buf = NULL;
426 entry->buf_offset = 0; 428 entry->buf_offset = 0;
427 entry->max_buf_bytes = 0; 429 entry->max_buf_bytes = 0;