diff options
author | Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> | 2017-05-17 16:05:40 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:17 -0400 |
commit | 430ef426bc43b59a7444c08d664e24a7cf89710e (patch) | |
tree | 1e820da524f9e5fc49906c79e46ed72eb80324e6 /drivers/gpu/drm/amd/display/dc/inc/resource.h | |
parent | ccaf31ec714b596d1edb92b1ed4ccc4abf1f645c (diff) |
drm/amd/display: make dc_get_validate_context re-entrant
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/inc/resource.h')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h index 4e07b9fea669..7cac24d4ae86 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h | |||
@@ -80,7 +80,8 @@ void dc_destroy_resource_pool(struct core_dc *dc); | |||
80 | 80 | ||
81 | enum dc_status resource_map_pool_resources( | 81 | enum dc_status resource_map_pool_resources( |
82 | const struct core_dc *dc, | 82 | const struct core_dc *dc, |
83 | struct validate_context *context); | 83 | struct validate_context *context, |
84 | struct validate_context *old_context); | ||
84 | 85 | ||
85 | bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx); | 86 | bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx); |
86 | 87 | ||
@@ -150,11 +151,13 @@ void resource_validate_ctx_update_pointer_after_copy( | |||
150 | 151 | ||
151 | enum dc_status resource_map_clock_resources( | 152 | enum dc_status resource_map_clock_resources( |
152 | const struct core_dc *dc, | 153 | const struct core_dc *dc, |
153 | struct validate_context *context); | 154 | struct validate_context *context, |
155 | struct validate_context *old_context); | ||
154 | 156 | ||
155 | enum dc_status resource_map_phy_clock_resources( | 157 | enum dc_status resource_map_phy_clock_resources( |
156 | const struct core_dc *dc, | 158 | const struct core_dc *dc, |
157 | struct validate_context *context); | 159 | struct validate_context *context, |
160 | struct validate_context *old_context); | ||
158 | 161 | ||
159 | bool pipe_need_reprogram( | 162 | bool pipe_need_reprogram( |
160 | struct pipe_ctx *pipe_ctx_old, | 163 | struct pipe_ctx *pipe_ctx_old, |