summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/basics
diff options
context:
space:
mode:
authorHarry Wentland2017-09-27 16:53:50 +0200
committerAlex Deucher2017-09-28 22:46:15 +0200
commit2004f45ef83f07f43f5da6ede780b08068c7583d (patch)
tree011ac2087c8a8c9272a4c4c5eaacd69d44c2319a /drivers/gpu/drm/amd/display/dc/basics
parentdrm/amd: DC pull request review (diff)
downloadkernel-qcow2-linux-2004f45ef83f07f43f5da6ede780b08068c7583d.tar.gz
kernel-qcow2-linux-2004f45ef83f07f43f5da6ede780b08068c7583d.tar.xz
kernel-qcow2-linux-2004f45ef83f07f43f5da6ede780b08068c7583d.zip
drm/amd/display: Use kernel alloc/free
Abstractions are frowned upon. cocci script: virtual context virtual patch virtual org virtual report @@ expression ptr; @@ - dm_alloc(ptr) + kzalloc(ptr, GFP_KERNEL) @@ expression ptr, size; @@ - dm_realloc(ptr, size) + krealloc(ptr, size, GFP_KERNEL) @@ expression ptr; @@ - dm_free(ptr) + kfree(ptr) v2: use GFP_KERNEL, not GFP_ATOMIC. add cocci script Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/basics')
-rw-r--r--drivers/gpu/drm/amd/display/dc/basics/logger.c18
-rw-r--r--drivers/gpu/drm/amd/display/dc/basics/vector.c19
2 files changed, 20 insertions, 17 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,
{
/* malloc buffer and init offsets */
logger->log_buffer_size = DAL_LOGGER_BUFFER_MAX_SIZE;
- logger->log_buffer = (char *)dm_alloc(logger->log_buffer_size *
- sizeof(char));
+ logger->log_buffer = (char *)kzalloc(logger->log_buffer_size * sizeof(char),
+ GFP_KERNEL);
if (!logger->log_buffer)
return false;
@@ -97,7 +97,7 @@ static bool construct(struct dc_context *ctx, struct dal_logger *logger,
static void destruct(struct dal_logger *logger)
{
if (logger->log_buffer) {
- dm_free(logger->log_buffer);
+ kfree(logger->log_buffer);
logger->log_buffer = NULL;
}
}
@@ -105,12 +105,13 @@ static void destruct(struct dal_logger *logger)
struct dal_logger *dal_logger_create(struct dc_context *ctx, uint32_t log_mask)
{
/* malloc struct */
- struct dal_logger *logger = dm_alloc(sizeof(struct dal_logger));
+ struct dal_logger *logger = kzalloc(sizeof(struct dal_logger),
+ GFP_KERNEL);
if (!logger)
return NULL;
if (!construct(ctx, logger, log_mask)) {
- dm_free(logger);
+ kfree(logger);
return NULL;
}
@@ -122,7 +123,7 @@ uint32_t dal_logger_destroy(struct dal_logger **logger)
if (logger == NULL || *logger == NULL)
return 1;
destruct(*logger);
- dm_free(*logger);
+ kfree(*logger);
*logger = NULL;
return 0;
@@ -390,7 +391,8 @@ void dm_logger_open(
entry->type = log_type;
entry->logger = logger;
- entry->buf = dm_alloc(DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char));
+ entry->buf = kzalloc(DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char),
+ GFP_KERNEL);
entry->buf_offset = 0;
entry->max_buf_bytes = DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char);
@@ -421,7 +423,7 @@ void dm_logger_close(struct log_entry *entry)
cleanup:
if (entry->buf) {
- dm_free(entry->buf);
+ kfree(entry->buf);
entry->buf = NULL;
entry->buf_offset = 0;
entry->max_buf_bytes = 0;
diff --git a/drivers/gpu/drm/amd/display/dc/basics/vector.c b/drivers/gpu/drm/amd/display/dc/basics/vector.c
index bb72a1857160..e00fc4db3ac4 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/vector.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/vector.c
@@ -40,7 +40,7 @@ bool dal_vector_construct(
return false;
}
- vector->container = dm_alloc(struct_size * capacity);
+ vector->container = kzalloc(struct_size * capacity, GFP_KERNEL);
if (vector->container == NULL)
return false;
vector->capacity = capacity;
@@ -67,7 +67,7 @@ bool dal_vector_presized_costruct(
return false;
}
- vector->container = dm_alloc(struct_size * count);
+ vector->container = kzalloc(struct_size * count, GFP_KERNEL);
if (vector->container == NULL)
return false;
@@ -95,7 +95,7 @@ struct vector *dal_vector_presized_create(
void *initial_value,
uint32_t struct_size)
{
- struct vector *vector = dm_alloc(sizeof(struct vector));
+ struct vector *vector = kzalloc(sizeof(struct vector), GFP_KERNEL);
if (vector == NULL)
return NULL;
@@ -105,7 +105,7 @@ struct vector *dal_vector_presized_create(
return vector;
BREAK_TO_DEBUGGER();
- dm_free(vector);
+ kfree(vector);
return NULL;
}
@@ -114,7 +114,7 @@ struct vector *dal_vector_create(
uint32_t capacity,
uint32_t struct_size)
{
- struct vector *vector = dm_alloc(sizeof(struct vector));
+ struct vector *vector = kzalloc(sizeof(struct vector), GFP_KERNEL);
if (vector == NULL)
return NULL;
@@ -123,7 +123,7 @@ struct vector *dal_vector_create(
return vector;
BREAK_TO_DEBUGGER();
- dm_free(vector);
+ kfree(vector);
return NULL;
}
@@ -131,7 +131,7 @@ void dal_vector_destruct(
struct vector *vector)
{
if (vector->container != NULL)
- dm_free(vector->container);
+ kfree(vector->container);
vector->count = 0;
vector->capacity = 0;
}
@@ -142,7 +142,7 @@ void dal_vector_destroy(
if (vector == NULL || *vector == NULL)
return;
dal_vector_destruct(*vector);
- dm_free(*vector);
+ kfree(*vector);
*vector = NULL;
}
@@ -290,7 +290,8 @@ bool dal_vector_reserve(struct vector *vector, uint32_t capacity)
if (capacity <= vector->capacity)
return true;
- new_container = dm_realloc(vector->container, capacity * vector->struct_size);
+ new_container = krealloc(vector->container,
+ capacity * vector->struct_size, GFP_KERNEL);
if (new_container) {
vector->container = new_container;