aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dce112
diff options
context:
space:
mode:
authorHarry Wentland <harry.wentland@amd.com>2017-09-27 10:53:50 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-28 16:46:15 -0400
commit2004f45ef83f07f43f5da6ede780b08068c7583d (patch)
tree011ac2087c8a8c9272a4c4c5eaacd69d44c2319a /drivers/gpu/drm/amd/display/dc/dce112
parentdrm/amd: DC pull request review (diff)
downloadlinux-dev-2004f45ef83f07f43f5da6ede780b08068c7583d.tar.xz
linux-dev-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/dce112')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c43
2 files changed, 25 insertions, 24 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
index 75af2125344b..e75895baa132 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
@@ -839,7 +839,7 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor,
struct compressor *dce112_compressor_create(struct dc_context *ctx)
{
struct dce112_compressor *cp110 =
- dm_alloc(sizeof(struct dce112_compressor));
+ kzalloc(sizeof(struct dce112_compressor), GFP_KERNEL);
if (!cp110)
return NULL;
@@ -848,12 +848,12 @@ struct compressor *dce112_compressor_create(struct dc_context *ctx)
return &cp110->base;
BREAK_TO_DEBUGGER();
- dm_free(cp110);
+ kfree(cp110);
return NULL;
}
void dce112_compressor_destroy(struct compressor **compressor)
{
- dm_free(TO_DCE112_COMPRESSOR(*compressor));
+ kfree(TO_DCE112_COMPRESSOR(*compressor));
*compressor = NULL;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index de6f71d8a89b..4e2ed3429a90 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -410,7 +410,7 @@ static struct timing_generator *dce112_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- dm_alloc(sizeof(struct dce110_timing_generator));
+ kzalloc(sizeof(struct dce110_timing_generator), GFP_KERNEL);
if (!tg110)
return NULL;
@@ -419,7 +419,7 @@ static struct timing_generator *dce112_timing_generator_create(
return &tg110->base;
BREAK_TO_DEBUGGER();
- dm_free(tg110);
+ kfree(tg110);
return NULL;
}
@@ -428,7 +428,7 @@ static struct stream_encoder *dce112_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- dm_alloc(sizeof(struct dce110_stream_encoder));
+ kzalloc(sizeof(struct dce110_stream_encoder), GFP_KERNEL);
if (!enc110)
return NULL;
@@ -439,7 +439,7 @@ static struct stream_encoder *dce112_stream_encoder_create(
return &enc110->base;
BREAK_TO_DEBUGGER();
- dm_free(enc110);
+ kfree(enc110);
return NULL;
}
@@ -461,7 +461,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dce112_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = dm_alloc(sizeof(struct dce_hwseq));
+ struct dce_hwseq *hws = kzalloc(sizeof(struct dce_hwseq), GFP_KERNEL);
if (hws) {
hws->ctx = ctx;
@@ -501,7 +501,8 @@ static struct mem_input *dce112_mem_input_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dce_mem_input *dce_mi = dm_alloc(sizeof(struct dce_mem_input));
+ struct dce_mem_input *dce_mi = kzalloc(sizeof(struct dce_mem_input),
+ GFP_KERNEL);
if (!dce_mi) {
BREAK_TO_DEBUGGER();
@@ -514,7 +515,7 @@ static struct mem_input *dce112_mem_input_create(
static void dce112_transform_destroy(struct transform **xfm)
{
- dm_free(TO_DCE_TRANSFORM(*xfm));
+ kfree(TO_DCE_TRANSFORM(*xfm));
*xfm = NULL;
}
@@ -523,7 +524,7 @@ static struct transform *dce112_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- dm_alloc(sizeof(struct dce_transform));
+ kzalloc(sizeof(struct dce_transform), GFP_KERNEL);
if (!transform)
return NULL;
@@ -535,7 +536,7 @@ static struct transform *dce112_transform_create(
}
BREAK_TO_DEBUGGER();
- dm_free(transform);
+ kfree(transform);
return NULL;
}
@@ -554,7 +555,7 @@ struct link_encoder *dce112_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- dm_alloc(sizeof(struct dce110_link_encoder));
+ kzalloc(sizeof(struct dce110_link_encoder), GFP_KERNEL);
if (!enc110)
return NULL;
@@ -571,14 +572,14 @@ struct link_encoder *dce112_link_encoder_create(
}
BREAK_TO_DEBUGGER();
- dm_free(enc110);
+ kfree(enc110);
return NULL;
}
static struct input_pixel_processor *dce112_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = dm_alloc(sizeof(struct dce_ipp));
+ struct dce_ipp *ipp = kzalloc(sizeof(struct dce_ipp), GFP_KERNEL);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -595,7 +596,7 @@ struct output_pixel_processor *dce112_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- dm_alloc(sizeof(struct dce110_opp));
+ kzalloc(sizeof(struct dce110_opp), GFP_KERNEL);
if (!opp)
return NULL;
@@ -605,7 +606,7 @@ struct output_pixel_processor *dce112_opp_create(
return &opp->base;
BREAK_TO_DEBUGGER();
- dm_free(opp);
+ kfree(opp);
return NULL;
}
@@ -617,7 +618,7 @@ struct clock_source *dce112_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- dm_alloc(sizeof(struct dce110_clk_src));
+ kzalloc(sizeof(struct dce110_clk_src), GFP_KERNEL);
if (!clk_src)
return NULL;
@@ -634,7 +635,7 @@ struct clock_source *dce112_clock_source_create(
void dce112_clock_source_destroy(struct clock_source **clk_src)
{
- dm_free(TO_DCE110_CLK_SRC(*clk_src));
+ kfree(TO_DCE110_CLK_SRC(*clk_src));
*clk_src = NULL;
}
@@ -653,19 +654,19 @@ static void destruct(struct dce110_resource_pool *pool)
dce_ipp_destroy(&pool->base.ipps[i]);
if (pool->base.mis[i] != NULL) {
- dm_free(TO_DCE_MEM_INPUT(pool->base.mis[i]));
+ kfree(TO_DCE_MEM_INPUT(pool->base.mis[i]));
pool->base.mis[i] = NULL;
}
if (pool->base.timing_generators[i] != NULL) {
- dm_free(DCE110TG_FROM_TG(pool->base.timing_generators[i]));
+ kfree(DCE110TG_FROM_TG(pool->base.timing_generators[i]));
pool->base.timing_generators[i] = NULL;
}
}
for (i = 0; i < pool->base.stream_enc_count; i++) {
if (pool->base.stream_enc[i] != NULL)
- dm_free(DCE110STRENC_FROM_STRENC(pool->base.stream_enc[i]));
+ kfree(DCE110STRENC_FROM_STRENC(pool->base.stream_enc[i]));
}
for (i = 0; i < pool->base.clk_src_count; i++) {
@@ -940,7 +941,7 @@ static void dce112_destroy_resource_pool(struct resource_pool **pool)
struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool);
destruct(dce110_pool);
- dm_free(dce110_pool);
+ kfree(dce110_pool);
*pool = NULL;
}
@@ -1298,7 +1299,7 @@ struct resource_pool *dce112_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- dm_alloc(sizeof(struct dce110_resource_pool));
+ kzalloc(sizeof(struct dce110_resource_pool), GFP_KERNEL);
if (!pool)
return NULL;