Commit c7dbdf15 authored by Corbin McElhanney's avatar Corbin McElhanney Committed by Alex Deucher

drm/amd/display: Allow update stream without surface

Passing NULL as surfaceUpdates to dc_update_surfaces_and_stream now
updates just the stream. Code that is dependent on srf_updates was moved
below the NULL check.
Signed-off-by: default avatarCorbin McElhanney <corbin.mcelhanney@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 29eba8e8
...@@ -1223,33 +1223,7 @@ void dc_update_surfaces_and_stream(struct dc *dc, ...@@ -1223,33 +1223,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
if (!stream_status) if (!stream_status)
return; /* Cannot commit surface to stream that is not committed */ return; /* Cannot commit surface to stream that is not committed */
update_type = dc_check_update_surfaces_for_stream( context = core_dc->current_context;
dc, srf_updates, surface_count, stream_update, stream_status);
if (update_type >= update_surface_trace_level)
update_surface_trace(dc, srf_updates, surface_count);
if (update_type >= UPDATE_TYPE_FULL) {
const struct dc_surface *new_surfaces[MAX_SURFACES] = { 0 };
for (i = 0; i < surface_count; i++)
new_surfaces[i] = srf_updates[i].surface;
/* initialize scratch memory for building context */
context = dm_alloc(sizeof(*context));
dc_resource_validate_ctx_copy_construct(
core_dc->current_context, context);
/* add surface to context */
if (!resource_attach_surfaces_to_context(
new_surfaces, surface_count, dc_stream,
context, core_dc->res_pool)) {
BREAK_TO_DEBUGGER();
goto fail;
}
} else {
context = core_dc->current_context;
}
/* update current stream with the new updates */ /* update current stream with the new updates */
if (stream_update) { if (stream_update) {
...@@ -1277,6 +1251,36 @@ void dc_update_surfaces_and_stream(struct dc *dc, ...@@ -1277,6 +1251,36 @@ void dc_update_surfaces_and_stream(struct dc *dc,
} }
} }
/* only proceed if we need to make a surface update */
if (!srf_updates)
return;
update_type = dc_check_update_surfaces_for_stream(
dc, srf_updates, surface_count, stream_update, stream_status);
if (update_type >= update_surface_trace_level)
update_surface_trace(dc, srf_updates, surface_count);
if (update_type >= UPDATE_TYPE_FULL) {
const struct dc_surface *new_surfaces[MAX_SURFACES] = { 0 };
for (i = 0; i < surface_count; i++)
new_surfaces[i] = srf_updates[i].surface;
/* initialize scratch memory for building context */
context = dm_alloc(sizeof(*context));
dc_resource_validate_ctx_copy_construct(
core_dc->current_context, context);
/* add surface to context */
if (!resource_attach_surfaces_to_context(
new_surfaces, surface_count, dc_stream,
context, core_dc->res_pool)) {
BREAK_TO_DEBUGGER();
goto fail;
}
}
/* save update parameters into surface */ /* save update parameters into surface */
for (i = 0; i < surface_count; i++) { for (i = 0; i < surface_count; i++) {
struct core_surface *surface = struct core_surface *surface =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment