drm/amdgpu: Use kmemdup rather than duplicating its implementation

kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memcpy, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memcpy.

Reviewed-by: Christian König <Christian.Koenig@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index a57b5abf96a029abef49ae53cccf1be916c6e4fa..032e76dbc51f9872dcd9a697e7404f376717cb26 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -3925,11 +3925,10 @@ static int gfx_v8_0_init_save_restore_list(struct amdgpu_device *adev)
 
        int list_size;
        unsigned int *register_list_format =
-               kmalloc(adev->gfx.rlc.reg_list_format_size_bytes, GFP_KERNEL);
+               kmemdup(adev->gfx.rlc.register_list_format,
+                       adev->gfx.rlc.reg_list_format_size_bytes, GFP_KERNEL);
        if (!register_list_format)
                return -ENOMEM;
-       memcpy(register_list_format, adev->gfx.rlc.register_list_format,
-                       adev->gfx.rlc.reg_list_format_size_bytes);
 
        gfx_v8_0_parse_ind_reg_list(register_list_format,
                                RLC_FormatDirectRegListLength,

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 5bdd7c42b00eda1f6086862d139cd690819e0281..5ba3323767108d1c8885267334af64c98c3b04b3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2074,11 +2074,10 @@ static int gfx_v9_1_init_rlc_save_restore_list(struct amdgpu_device *adev)
        u32 tmp = 0;
 
        u32 *register_list_format =
-               kmalloc(adev->gfx.rlc.reg_list_format_size_bytes, GFP_KERNEL);
+               kmemdup(adev->gfx.rlc.register_list_format,
+                       adev->gfx.rlc.reg_list_format_size_bytes, GFP_KERNEL);
        if (!register_list_format)
                return -ENOMEM;
-       memcpy(register_list_format, adev->gfx.rlc.register_list_format,
-               adev->gfx.rlc.reg_list_format_size_bytes);
 
        /* setup unique_indirect_regs array and indirect_start_offsets array */
        unique_indirect_reg_count = ARRAY_SIZE(unique_indirect_regs);

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 14c4c60c59dbbfcd9338a728fe8dbb2154a47b73..4ef4dc63e221e65c88a040ae799732fe2eddcc0d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1190,14 +1190,12 @@ struct dc_state *dc_create_state(struct dc *dc)
 struct dc_state *dc_copy_state(struct dc_state *src_ctx)
 {
        int i, j;
-       struct dc_state *new_ctx = kzalloc(sizeof(struct dc_state),
-                                          GFP_KERNEL);
+       struct dc_state *new_ctx = kmemdup(src_ctx,
+                       sizeof(struct dc_state), GFP_KERNEL);
 
        if (!new_ctx)
                return NULL;
 
-       memcpy(new_ctx, src_ctx, sizeof(struct dc_state));
-
        for (i = 0; i < MAX_PIPES; i++) {
                        struct pipe_ctx *cur_pipe = &new_ctx->res_ctx.pipe_ctx[i];
 

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 a7c769a1b40b4e544a0bc5c6e7ccb133632b52f2..af7f8be230f749513826ec4d951bb69548b77e5b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -181,12 +181,10 @@ struct dc_stream_state *dc_copy_stream(const struct dc_stream_state *stream)
 {
        struct dc_stream_state *new_stream;
 
-       new_stream = kzalloc(sizeof(struct dc_stream_state), GFP_KERNEL);
+       new_stream = kmemdup(stream, sizeof(struct dc_stream_state), GFP_KERNEL);
        if (!new_stream)
                return NULL;
 
-       memcpy(new_stream, stream, sizeof(struct dc_stream_state));
-
        if (new_stream->sink)
                dc_sink_retain(new_stream->sink);