summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/core
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c42
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c18
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_resource.c2
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_sink.c11
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_stream.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_surface.c15
7 files changed, 53 insertions, 47 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 58c5083bef2a..d86d9796e4cc 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -113,7 +113,7 @@ static bool create_links(
}
for (i = 0; i < num_virtual_links; i++) {
- struct dc_link *link = dm_alloc(sizeof(*link));
+ struct dc_link *link = kzalloc(sizeof(*link), GFP_KERNEL);
struct encoder_init_data enc_init = {0};
if (link == NULL) {
@@ -127,7 +127,7 @@ static bool create_links(
link->link_id.type = OBJECT_TYPE_CONNECTOR;
link->link_id.id = CONNECTOR_ID_VIRTUAL;
link->link_id.enum_id = ENUM_ID_1;
- link->link_enc = dm_alloc(sizeof(*link->link_enc));
+ link->link_enc = kzalloc(sizeof(*link->link_enc), GFP_KERNEL);
enc_init.ctx = dc->ctx;
enc_init.channel = CHANNEL_ID_UNKNOWN;
@@ -413,20 +413,20 @@ static void destruct(struct dc *dc)
if (dc->ctx->logger)
dal_logger_destroy(&dc->ctx->logger);
- dm_free(dc->ctx);
+ kfree(dc->ctx);
dc->ctx = NULL;
- dm_free(dc->bw_vbios);
+ kfree(dc->bw_vbios);
dc->bw_vbios = NULL;
- dm_free(dc->bw_dceip);
+ kfree(dc->bw_dceip);
dc->bw_dceip = NULL;
#ifdef CONFIG_DRM_AMD_DC_DCN1_0
- dm_free(dc->dcn_soc);
+ kfree(dc->dcn_soc);
dc->dcn_soc = NULL;
- dm_free(dc->dcn_ip);
+ kfree(dc->dcn_ip);
dc->dcn_ip = NULL;
#endif
@@ -436,12 +436,15 @@ static bool construct(struct dc *dc,
const struct dc_init_data *init_params)
{
struct dal_logger *logger;
- struct dc_context *dc_ctx = dm_alloc(sizeof(*dc_ctx));
- struct bw_calcs_dceip *dc_dceip = dm_alloc(sizeof(*dc_dceip));
- struct bw_calcs_vbios *dc_vbios = dm_alloc(sizeof(*dc_vbios));
+ struct dc_context *dc_ctx = kzalloc(sizeof(*dc_ctx), GFP_KERNEL);
+ struct bw_calcs_dceip *dc_dceip = kzalloc(sizeof(*dc_dceip),
+ GFP_KERNEL);
+ struct bw_calcs_vbios *dc_vbios = kzalloc(sizeof(*dc_vbios),
+ GFP_KERNEL);
#ifdef CONFIG_DRM_AMD_DC_DCN1_0
- struct dcn_soc_bounding_box *dcn_soc = dm_alloc(sizeof(*dcn_soc));
- struct dcn_ip_params *dcn_ip = dm_alloc(sizeof(*dcn_ip));
+ struct dcn_soc_bounding_box *dcn_soc = kzalloc(sizeof(*dcn_soc),
+ GFP_KERNEL);
+ struct dcn_ip_params *dcn_ip = kzalloc(sizeof(*dcn_ip), GFP_KERNEL);
#endif
enum dce_version dc_version = DCE_VERSION_UNKNOWN;
@@ -604,7 +607,7 @@ void ProgramPixelDurationV(unsigned int pixelClockInKHz )
struct dc *dc_create(const struct dc_init_data *init_params)
{
- struct dc *dc = dm_alloc(sizeof(*dc));
+ struct dc *dc = kzalloc(sizeof(*dc), GFP_KERNEL);
unsigned int full_pipe_count;
if (NULL == dc)
@@ -638,7 +641,7 @@ struct dc *dc_create(const struct dc_init_data *init_params)
return dc;
construct_fail:
- dm_free(dc);
+ kfree(dc);
alloc_fail:
return NULL;
@@ -647,7 +650,7 @@ alloc_fail:
void dc_destroy(struct dc **dc)
{
destruct(*dc);
- dm_free(*dc);
+ kfree(*dc);
*dc = NULL;
}
@@ -900,7 +903,7 @@ bool dc_commit_planes_to_stream(
struct dc_scaling_info scaling_info[MAX_SURFACES];
int i;
struct dc_stream_update *stream_update =
- dm_alloc(sizeof(struct dc_stream_update));
+ kzalloc(sizeof(struct dc_stream_update), GFP_KERNEL);
if (!stream_update) {
BREAK_TO_DEBUGGER();
@@ -951,13 +954,14 @@ bool dc_commit_planes_to_stream(
dc_post_update_surfaces_to_stream(dc);
- dm_free(stream_update);
+ kfree(stream_update);
return true;
}
struct dc_state *dc_create_state(void)
{
- struct dc_state *context = dm_alloc(sizeof(struct dc_state));
+ struct dc_state *context = kzalloc(sizeof(struct dc_state),
+ GFP_KERNEL);
if (!context)
return NULL;
@@ -979,7 +983,7 @@ void dc_release_state(struct dc_state *context)
if (atomic_read(&context->ref_count) == 0) {
dc_resource_state_destruct(context);
- dm_free(context);
+ kfree(context);
}
}
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 845ec421d861..43ebd8941b77 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1100,7 +1100,7 @@ create_fail:
struct dc_link *link_create(const struct link_init_data *init_params)
{
struct dc_link *link =
- dm_alloc(sizeof(*link));
+ kzalloc(sizeof(*link), GFP_KERNEL);
if (NULL == link)
goto alloc_fail;
@@ -1111,7 +1111,7 @@ struct dc_link *link_create(const struct link_init_data *init_params)
return link;
construct_fail:
- dm_free(link);
+ kfree(link);
alloc_fail:
return NULL;
@@ -1120,7 +1120,7 @@ alloc_fail:
void link_destroy(struct dc_link **link)
{
destruct(*link);
- dm_free(*link);
+ kfree(*link);
*link = NULL;
}
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
index d09e539397ea..226512c11ab7 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
@@ -130,7 +130,7 @@ struct i2c_payloads *dal_ddc_i2c_payloads_create(struct dc_context *ctx, uint32_
{
struct i2c_payloads *payloads;
- payloads = dm_alloc(sizeof(struct i2c_payloads));
+ payloads = kzalloc(sizeof(struct i2c_payloads), GFP_KERNEL);
if (!payloads)
return NULL;
@@ -139,7 +139,7 @@ struct i2c_payloads *dal_ddc_i2c_payloads_create(struct dc_context *ctx, uint32_
&payloads->payloads, ctx, count, sizeof(struct i2c_payload)))
return payloads;
- dm_free(payloads);
+ kfree(payloads);
return NULL;
}
@@ -159,7 +159,7 @@ void dal_ddc_i2c_payloads_destroy(struct i2c_payloads **p)
if (!p || !*p)
return;
dal_vector_destruct(&(*p)->payloads);
- dm_free(*p);
+ kfree(*p);
*p = NULL;
}
@@ -168,7 +168,7 @@ struct aux_payloads *dal_ddc_aux_payloads_create(struct dc_context *ctx, uint32_
{
struct aux_payloads *payloads;
- payloads = dm_alloc(sizeof(struct aux_payloads));
+ payloads = kzalloc(sizeof(struct aux_payloads), GFP_KERNEL);
if (!payloads)
return NULL;
@@ -177,7 +177,7 @@ struct aux_payloads *dal_ddc_aux_payloads_create(struct dc_context *ctx, uint32_
&payloads->payloads, ctx, count, sizeof(struct aux_payload)))
return payloads;
- dm_free(payloads);
+ kfree(payloads);
return NULL;
}
@@ -197,7 +197,7 @@ void dal_ddc_aux_payloads_destroy(struct aux_payloads **p)
return;
dal_vector_destruct(&(*p)->payloads);
- dm_free(*p);
+ kfree(*p);
*p = NULL;
}
@@ -290,7 +290,7 @@ struct ddc_service *dal_ddc_service_create(
{
struct ddc_service *ddc_service;
- ddc_service = dm_alloc(sizeof(struct ddc_service));
+ ddc_service = kzalloc(sizeof(struct ddc_service), GFP_KERNEL);
if (!ddc_service)
return NULL;
@@ -298,7 +298,7 @@ struct ddc_service *dal_ddc_service_create(
if (construct(ddc_service, init_data))
return ddc_service;
- dm_free(ddc_service);
+ kfree(ddc_service);
return NULL;
}
@@ -315,7 +315,7 @@ void dal_ddc_service_destroy(struct ddc_service **ddc)
return;
}
destruct(*ddc);
- dm_free(*ddc);
+ kfree(*ddc);
*ddc = NULL;
}
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index dcfdfebd5c62..1832f252edab 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -160,7 +160,7 @@ void dc_destroy_resource_pool(struct dc *dc)
dc->res_pool->funcs->destroy(&dc->res_pool);
if (dc->hwseq)
- dm_free(dc->hwseq);
+ kfree(dc->hwseq);
}
}
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
index 7717350297a5..b3bbafc8fd6a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
@@ -34,7 +34,7 @@
static void destruct(struct dc_sink *sink)
{
if (sink->dc_container_id) {
- dm_free(sink->dc_container_id);
+ kfree(sink->dc_container_id);
sink->dc_container_id = NULL;
}
}
@@ -74,13 +74,13 @@ void dc_sink_release(struct dc_sink *sink)
if (atomic_read(&sink->ref_count) == 0) {
destruct(sink);
- dm_free(sink);
+ kfree(sink);
}
}
struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params)
{
- struct dc_sink *sink = dm_alloc(sizeof(*sink));
+ struct dc_sink *sink = kzalloc(sizeof(*sink), GFP_KERNEL);
if (NULL == sink)
goto alloc_fail;
@@ -93,7 +93,7 @@ struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params)
return sink;
construct_fail:
- dm_free(sink);
+ kfree(sink);
alloc_fail:
return NULL;
@@ -117,7 +117,8 @@ bool dc_sink_set_container_id(struct dc_sink *dc_sink, const struct dc_container
{
if (dc_sink && container_id) {
if (!dc_sink->dc_container_id)
- dc_sink->dc_container_id = dm_alloc(sizeof(*dc_sink->dc_container_id));
+ dc_sink->dc_container_id = kzalloc(sizeof(*dc_sink->dc_container_id),
+ GFP_KERNEL);
if (dc_sink->dc_container_id) {
memmove(&dc_sink->dc_container_id->guid, &container_id->guid,
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index a421779093d9..d5da847ffad6 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -131,7 +131,7 @@ void dc_stream_release(struct dc_stream_state *stream)
if (atomic_read(&stream->ref_count) == 0) {
destruct(stream);
- dm_free(stream);
+ kfree(stream);
}
}
}
@@ -144,7 +144,7 @@ struct dc_stream_state *dc_create_stream_for_sink(
if (sink == NULL)
goto alloc_fail;
- stream = dm_alloc(sizeof(struct dc_stream_state));
+ stream = kzalloc(sizeof(struct dc_stream_state), GFP_KERNEL);
if (NULL == stream)
goto alloc_fail;
@@ -157,7 +157,7 @@ struct dc_stream_state *dc_create_stream_for_sink(
return stream;
construct_fail:
- dm_free(stream);
+ kfree(stream);
alloc_fail:
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
index e96f63eed070..511ada94530e 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
@@ -68,7 +68,8 @@ struct dc_plane_state *dc_create_plane_state(struct dc *dc)
{
struct dc *core_dc = dc;
- struct dc_plane_state *plane_state = dm_alloc(sizeof(*plane_state));
+ struct dc_plane_state *plane_state = kzalloc(sizeof(*plane_state),
+ GFP_KERNEL);
if (NULL == plane_state)
goto alloc_fail;
@@ -81,7 +82,7 @@ struct dc_plane_state *dc_create_plane_state(struct dc *dc)
return plane_state;
construct_fail:
- dm_free(plane_state);
+ kfree(plane_state);
alloc_fail:
return NULL;
@@ -133,7 +134,7 @@ void dc_plane_state_release(struct dc_plane_state *plane_state)
if (atomic_read(&plane_state->ref_count) == 0) {
destruct(plane_state);
- dm_free(plane_state);
+ kfree(plane_state);
}
}
@@ -149,14 +150,14 @@ void dc_gamma_release(struct dc_gamma **gamma)
atomic_dec(&(*gamma)->ref_count);
if (atomic_read(&(*gamma)->ref_count) == 0)
- dm_free((*gamma));
+ kfree((*gamma));
*gamma = NULL;
}
struct dc_gamma *dc_create_gamma()
{
- struct dc_gamma *gamma = dm_alloc(sizeof(*gamma));
+ struct dc_gamma *gamma = kzalloc(sizeof(*gamma), GFP_KERNEL);
if (gamma == NULL)
goto alloc_fail;
@@ -181,12 +182,12 @@ void dc_transfer_func_release(struct dc_transfer_func *tf)
atomic_dec(&tf->ref_count);
if (atomic_read(&tf->ref_count) == 0)
- dm_free(tf);
+ kfree(tf);
}
struct dc_transfer_func *dc_create_transfer_func()
{
- struct dc_transfer_func *tf = dm_alloc(sizeof(*tf));
+ struct dc_transfer_func *tf = kzalloc(sizeof(*tf), GFP_KERNEL);
if (tf == NULL)
goto alloc_fail;
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-12 01:31:41 +0200