diff options
Diffstat (limited to 'drivers/gpu/drm/amd/display')
8 files changed, 23 insertions, 19 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index bd449351803f..ec304b1a5973 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | |||
@@ -435,7 +435,7 @@ bool dm_helpers_submit_i2c( | |||
435 | return false; | 435 | return false; |
436 | } | 436 | } |
437 | 437 | ||
438 | msgs = kzalloc(num * sizeof(struct i2c_msg), GFP_KERNEL); | 438 | msgs = kcalloc(num, sizeof(struct i2c_msg), GFP_KERNEL); |
439 | 439 | ||
440 | if (!msgs) | 440 | if (!msgs) |
441 | return false; | 441 | return false; |
diff --git a/drivers/gpu/drm/amd/display/dc/basics/logger.c b/drivers/gpu/drm/amd/display/dc/basics/logger.c index 738a818d58d1..0866874ae8c6 100644 --- a/drivers/gpu/drm/amd/display/dc/basics/logger.c +++ b/drivers/gpu/drm/amd/display/dc/basics/logger.c | |||
@@ -364,7 +364,7 @@ void dm_logger_open( | |||
364 | entry->type = log_type; | 364 | entry->type = log_type; |
365 | entry->logger = logger; | 365 | entry->logger = logger; |
366 | 366 | ||
367 | entry->buf = kzalloc(DAL_LOGGER_BUFFER_MAX_SIZE * sizeof(char), | 367 | entry->buf = kzalloc(DAL_LOGGER_BUFFER_MAX_SIZE, |
368 | GFP_KERNEL); | 368 | GFP_KERNEL); |
369 | 369 | ||
370 | entry->buf_offset = 0; | 370 | entry->buf_offset = 0; |
diff --git a/drivers/gpu/drm/amd/display/dc/basics/vector.c b/drivers/gpu/drm/amd/display/dc/basics/vector.c index 217b8f1f7bf6..d28e9cf0e961 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( | |||
40 | return false; | 40 | return false; |
41 | } | 41 | } |
42 | 42 | ||
43 | vector->container = kzalloc(struct_size * capacity, GFP_KERNEL); | 43 | vector->container = kcalloc(capacity, struct_size, GFP_KERNEL); |
44 | if (vector->container == NULL) | 44 | if (vector->container == NULL) |
45 | return false; | 45 | return false; |
46 | vector->capacity = capacity; | 46 | vector->capacity = capacity; |
@@ -67,7 +67,7 @@ bool dal_vector_presized_costruct( | |||
67 | return false; | 67 | return false; |
68 | } | 68 | } |
69 | 69 | ||
70 | vector->container = kzalloc(struct_size * count, GFP_KERNEL); | 70 | vector->container = kcalloc(count, struct_size, GFP_KERNEL); |
71 | 71 | ||
72 | if (vector->container == NULL) | 72 | if (vector->container == NULL) |
73 | return false; | 73 | return false; |
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c index 599c7ab6befe..88b09dd758ba 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | |||
@@ -1079,13 +1079,15 @@ static void get_ss_info_from_atombios( | |||
1079 | if (*ss_entries_num == 0) | 1079 | if (*ss_entries_num == 0) |
1080 | return; | 1080 | return; |
1081 | 1081 | ||
1082 | ss_info = kzalloc(sizeof(struct spread_spectrum_info) * (*ss_entries_num), | 1082 | ss_info = kcalloc(*ss_entries_num, |
1083 | sizeof(struct spread_spectrum_info), | ||
1083 | GFP_KERNEL); | 1084 | GFP_KERNEL); |
1084 | ss_info_cur = ss_info; | 1085 | ss_info_cur = ss_info; |
1085 | if (ss_info == NULL) | 1086 | if (ss_info == NULL) |
1086 | return; | 1087 | return; |
1087 | 1088 | ||
1088 | ss_data = kzalloc(sizeof(struct spread_spectrum_data) * (*ss_entries_num), | 1089 | ss_data = kcalloc(*ss_entries_num, |
1090 | sizeof(struct spread_spectrum_data), | ||
1089 | GFP_KERNEL); | 1091 | GFP_KERNEL); |
1090 | if (ss_data == NULL) | 1092 | if (ss_data == NULL) |
1091 | goto out_free_info; | 1093 | goto out_free_info; |
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c index 80038e0e610f..ab5483c0c502 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | |||
@@ -98,7 +98,8 @@ struct gpio_service *dal_gpio_service_create( | |||
98 | if (number_of_bits) { | 98 | if (number_of_bits) { |
99 | uint32_t index_of_uint = 0; | 99 | uint32_t index_of_uint = 0; |
100 | 100 | ||
101 | slot = kzalloc(number_of_uints * sizeof(uint32_t), | 101 | slot = kcalloc(number_of_uints, |
102 | sizeof(uint32_t), | ||
102 | GFP_KERNEL); | 103 | GFP_KERNEL); |
103 | 104 | ||
104 | if (!slot) { | 105 | if (!slot) { |
diff --git a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c index 0cd111d59018..2533274e9cef 100644 --- a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c +++ b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c | |||
@@ -1413,13 +1413,15 @@ bool calculate_user_regamma_ramp(struct dc_transfer_func *output_tf, | |||
1413 | 1413 | ||
1414 | output_tf->type = TF_TYPE_DISTRIBUTED_POINTS; | 1414 | output_tf->type = TF_TYPE_DISTRIBUTED_POINTS; |
1415 | 1415 | ||
1416 | rgb_user = kzalloc(sizeof(*rgb_user) * (GAMMA_RGB_256_ENTRIES + _EXTRA_POINTS), | 1416 | rgb_user = kcalloc(GAMMA_RGB_256_ENTRIES + _EXTRA_POINTS, |
1417 | GFP_KERNEL); | 1417 | sizeof(*rgb_user), |
1418 | GFP_KERNEL); | ||
1418 | if (!rgb_user) | 1419 | if (!rgb_user) |
1419 | goto rgb_user_alloc_fail; | 1420 | goto rgb_user_alloc_fail; |
1420 | 1421 | ||
1421 | rgb_regamma = kzalloc(sizeof(*rgb_regamma) * (MAX_HW_POINTS + _EXTRA_POINTS), | 1422 | rgb_regamma = kcalloc(MAX_HW_POINTS + _EXTRA_POINTS, |
1422 | GFP_KERNEL); | 1423 | sizeof(*rgb_regamma), |
1424 | GFP_KERNEL); | ||
1423 | if (!rgb_regamma) | 1425 | if (!rgb_regamma) |
1424 | goto rgb_regamma_alloc_fail; | 1426 | goto rgb_regamma_alloc_fail; |
1425 | 1427 | ||
diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index 27d4003aa2c7..fa344ceafc17 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c | |||
@@ -155,7 +155,8 @@ struct mod_freesync *mod_freesync_create(struct dc *dc) | |||
155 | if (core_freesync == NULL) | 155 | if (core_freesync == NULL) |
156 | goto fail_alloc_context; | 156 | goto fail_alloc_context; |
157 | 157 | ||
158 | core_freesync->map = kzalloc(sizeof(struct freesync_entity) * MOD_FREESYNC_MAX_CONCURRENT_STREAMS, | 158 | core_freesync->map = kcalloc(MOD_FREESYNC_MAX_CONCURRENT_STREAMS, |
159 | sizeof(struct freesync_entity), | ||
159 | GFP_KERNEL); | 160 | GFP_KERNEL); |
160 | 161 | ||
161 | if (core_freesync->map == NULL) | 162 | if (core_freesync->map == NULL) |
diff --git a/drivers/gpu/drm/amd/display/modules/stats/stats.c b/drivers/gpu/drm/amd/display/modules/stats/stats.c index 3f7d47fdc367..710852ad03f3 100644 --- a/drivers/gpu/drm/amd/display/modules/stats/stats.c +++ b/drivers/gpu/drm/amd/display/modules/stats/stats.c | |||
@@ -141,19 +141,17 @@ struct mod_stats *mod_stats_create(struct dc *dc) | |||
141 | else | 141 | else |
142 | core_stats->entries = reg_data; | 142 | core_stats->entries = reg_data; |
143 | } | 143 | } |
144 | core_stats->time = kzalloc( | 144 | core_stats->time = kcalloc(core_stats->entries, |
145 | sizeof(struct stats_time_cache) * | 145 | sizeof(struct stats_time_cache), |
146 | core_stats->entries, | ||
147 | GFP_KERNEL); | 146 | GFP_KERNEL); |
148 | 147 | ||
149 | if (core_stats->time == NULL) | 148 | if (core_stats->time == NULL) |
150 | goto fail_construct_time; | 149 | goto fail_construct_time; |
151 | 150 | ||
152 | core_stats->event_entries = DAL_STATS_EVENT_ENTRIES_DEFAULT; | 151 | core_stats->event_entries = DAL_STATS_EVENT_ENTRIES_DEFAULT; |
153 | core_stats->events = kzalloc( | 152 | core_stats->events = kcalloc(core_stats->event_entries, |
154 | sizeof(struct stats_event_cache) * | 153 | sizeof(struct stats_event_cache), |
155 | core_stats->event_entries, | 154 | GFP_KERNEL); |
156 | GFP_KERNEL); | ||
157 | 155 | ||
158 | if (core_stats->events == NULL) | 156 | if (core_stats->events == NULL) |
159 | goto fail_construct_events; | 157 | goto fail_construct_events; |