diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2332-drm-amd-display-Rename-dc-resource_validate_ctx-meth.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2332-drm-amd-display-Rename-dc-resource_validate_ctx-meth.patch | 125 |
1 files changed, 125 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2332-drm-amd-display-Rename-dc-resource_validate_ctx-meth.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2332-drm-amd-display-Rename-dc-resource_validate_ctx-meth.patch new file mode 100644 index 00000000..a98f5fbf --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2332-drm-amd-display-Rename-dc-resource_validate_ctx-meth.patch @@ -0,0 +1,125 @@ +From 8c21b6481bf3bda43c14ac9760bd84bfe5f3150f Mon Sep 17 00:00:00 2001 +From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Date: Mon, 28 Aug 2017 12:04:23 -0400 +Subject: [PATCH 2332/4131] drm/amd/display: Rename dc resource_validate_ctx + methods + +Rename dc_resource methods from validate_ctx to state + +Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +++--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 ++++---- + drivers/gpu/drm/amd/display/dc/dc.h | 6 +++--- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 1256232..ec68b33 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -709,7 +709,7 @@ dm_atomic_state_alloc(struct drm_device *dev) + + atomic_inc(&new_ctx->ref_count); + +- dc_resource_validate_ctx_copy_construct_current(dc, new_ctx); ++ dc_resource_state_copy_construct_current(dc, new_ctx); + + state->context = new_ctx; + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index f5b7a6f..483ef48 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -1013,7 +1013,7 @@ void dc_release_state(struct dc_state *context) + atomic_dec(&context->ref_count); + + if (atomic_read(&context->ref_count) == 0) { +- dc_resource_validate_ctx_destruct(context); ++ dc_resource_state_destruct(context); + dm_free(context); + } + } +@@ -1285,7 +1285,7 @@ void dc_update_planes_and_stream(struct dc *dc, + + atomic_inc(&context->ref_count); + +- dc_resource_validate_ctx_copy_construct( ++ dc_resource_state_copy_construct( + dc->current_state, context); + + /*remove old surfaces from context */ +@@ -1654,7 +1654,7 @@ void dc_set_power_state( + + /* Preserve refcount */ + ref_count = dc->current_state->ref_count; +- dc_resource_validate_ctx_destruct(dc->current_state); ++ dc_resource_state_destruct(dc->current_state); + memset(dc->current_state, 0, + sizeof(*dc->current_state)); + dc->current_state->ref_count = ref_count; +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 b5ccbdb..c80650e 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -1707,11 +1707,11 @@ void validate_guaranteed_copy_streams( + } + } + +-void dc_resource_validate_ctx_copy_construct_current( ++void dc_resource_state_copy_construct_current( + const struct dc *dc, + struct dc_state *dst_ctx) + { +- dc_resource_validate_ctx_copy_construct(dc->current_state, dst_ctx); ++ dc_resource_state_copy_construct(dc->current_state, dst_ctx); + } + + bool dc_validate_global_state( +@@ -2413,7 +2413,7 @@ static void set_vsc_info_packet( + /*TODO: stereo 3D support and extend pixel encoding colorimetry*/ + } + +-void dc_resource_validate_ctx_destruct(struct dc_state *context) ++void dc_resource_state_destruct(struct dc_state *context) + { + int i, j; + +@@ -2432,7 +2432,7 @@ void dc_resource_validate_ctx_destruct(struct dc_state *context) + * Copy src_ctx into dst_ctx and retain all surfaces and streams referenced + * by the src_ctx + */ +-void dc_resource_validate_ctx_copy_construct( ++void dc_resource_state_copy_construct( + const struct dc_state *src_ctx, + struct dc_state *dst_ctx) + { +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 67e9dba..80ff71b 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -691,15 +691,15 @@ bool dc_validate_global_state( + * No hardware is programmed for call. Only validation is done. + */ + +-void dc_resource_validate_ctx_copy_construct( ++void dc_resource_state_copy_construct( + const struct dc_state *src_ctx, + struct dc_state *dst_ctx); + +-void dc_resource_validate_ctx_copy_construct_current( ++void dc_resource_state_copy_construct_current( + const struct dc *dc, + struct dc_state *dst_ctx); + +-void dc_resource_validate_ctx_destruct(struct dc_state *context); ++void dc_resource_state_destruct(struct dc_state *context); + + /* + * TODO update to make it about validation sets +-- +2.7.4 + |