diff options
author | Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> | 2017-07-28 12:07:38 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:16:01 -0400 |
commit | d54d29db47cdbe1f26776f2d03320ca56c5271fa (patch) | |
tree | f3dd7582883ad98c5a7818dde910760ad75040fb /drivers/gpu/drm/amd | |
parent | b701542d29d61c3514f51496168831c8476a8e2a (diff) |
drm/amd/display: Move and Rename "is_stream_changed()"
-Move "is_stream_changed()" to DC interface
-Rename "is_stream_changed()" to "dc_is_stream_changed()"
Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index ba8093317aa9..5acf4c697ae8 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c | |||
@@ -641,7 +641,7 @@ static bool is_validation_required( | |||
641 | 641 | ||
642 | if (set[i].surface_count != context->stream_status[i].surface_count) | 642 | if (set[i].surface_count != context->stream_status[i].surface_count) |
643 | return true; | 643 | return true; |
644 | if (!is_stream_unchanged(set[i].stream, context->streams[i])) | 644 | if (!dc_is_stream_unchanged(set[i].stream, context->streams[i])) |
645 | return true; | 645 | return true; |
646 | 646 | ||
647 | for (j = 0; j < set[i].surface_count; j++) { | 647 | for (j = 0; j < set[i].surface_count; j++) { |
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 566a1bed9828..005eac5fae80 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c | |||
@@ -1155,7 +1155,7 @@ static bool are_stream_backends_same( | |||
1155 | return true; | 1155 | return true; |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | bool is_stream_unchanged( | 1158 | bool dc_is_stream_unchanged( |
1159 | struct dc_stream *old_stream, struct dc_stream *stream) | 1159 | struct dc_stream *old_stream, struct dc_stream *stream) |
1160 | { | 1160 | { |
1161 | 1161 | ||
@@ -1176,7 +1176,7 @@ bool resource_validate_attach_surfaces( | |||
1176 | 1176 | ||
1177 | for (i = 0; i < set_count; i++) { | 1177 | for (i = 0; i < set_count; i++) { |
1178 | for (j = 0; old_context && j < old_context->stream_count; j++) | 1178 | for (j = 0; old_context && j < old_context->stream_count; j++) |
1179 | if (is_stream_unchanged( | 1179 | if (dc_is_stream_unchanged( |
1180 | old_context->streams[j], | 1180 | old_context->streams[j], |
1181 | context->streams[i])) { | 1181 | context->streams[i])) { |
1182 | if (!resource_attach_surfaces_to_context( | 1182 | if (!resource_attach_surfaces_to_context( |
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 63fd5b3de738..0918569eefa8 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h | |||
@@ -534,6 +534,8 @@ struct dc_stream_update { | |||
534 | struct dc_transfer_func *out_transfer_func; | 534 | struct dc_transfer_func *out_transfer_func; |
535 | }; | 535 | }; |
536 | 536 | ||
537 | bool dc_is_stream_unchanged( | ||
538 | struct dc_stream *old_stream, struct dc_stream *stream); | ||
537 | 539 | ||
538 | /* | 540 | /* |
539 | * Setup stream attributes if no stream updates are provided | 541 | * Setup stream attributes if no stream updates are provided |
diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h index 571bfae62a3c..ca3f49379bea 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h | |||
@@ -132,8 +132,6 @@ struct pipe_ctx *find_idle_secondary_pipe( | |||
132 | bool resource_is_stream_unchanged( | 132 | bool resource_is_stream_unchanged( |
133 | struct validate_context *old_context, struct dc_stream *stream); | 133 | struct validate_context *old_context, struct dc_stream *stream); |
134 | 134 | ||
135 | bool is_stream_unchanged( | ||
136 | struct dc_stream *old_stream, struct dc_stream *stream); | ||
137 | 135 | ||
138 | bool resource_validate_attach_surfaces( | 136 | bool resource_validate_attach_surfaces( |
139 | const struct dc_validation_set set[], | 137 | const struct dc_validation_set set[], |