From: Tony Cheng <tony.cheng@xxxxxxx>
- include clock constraint logic in validate
- in dc_commit_streams, include surfaces of unaffected streams
Change-Id: I43488ffa9002bd00740a4edb39c362b0257bdb11
Signed-off-by: Yongqiang Sun <yongqiang.sun at amd.com>
Acked-by: Harry Wentland <Harry.Wentland at amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin at amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +++++++++--
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 ++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 948f82a56472..9deddc8ee2d1 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1007,7 +1007,7 @@ bool dc_commit_streams(
struct dc_bios *dcb = core_dc->ctx->dc_bios;
enum dc_status result = DC_ERROR_UNEXPECTED;
struct validate_context *context;
- struct dc_validation_set set[MAX_STREAMS];
+ struct dc_validation_set set[MAX_STREAMS] = { 0 };
int i, j, k;
if (false == streams_changed(core_dc, streams, stream_count))
@@ -1018,13 +1018,20 @@ bool dc_commit_streams(
for (i = 0; i < stream_count; i++) {
const struct dc_stream *stream = streams[i];
+ const struct dc_stream_status *status = dc_stream_get_status(stream);
+ int j;
dc_stream_log(stream,
core_dc->ctx->logger,
LOG_DC);
set[i].stream = stream;
- set[i].surface_count = 0;
+
+ if (status) {
+ set[i].surface_count = status->surface_count;
+ for (j = 0; j < status->surface_count; j++)
+ set[i].surfaces[j] = status->surfaces[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 1f87b948678b..6037ee25598c 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -585,7 +585,7 @@ enum dc_status resource_build_scaling_params_for_context(
if (!resource_build_scaling_params(
&context->res_ctx.pipe_ctx[i].surface->public,
&context->res_ctx.pipe_ctx[i]))
- return DC_FAIL_BANDWIDTH_VALIDATE;
+ return DC_FAIL_SCALING;
}
return DC_OK;
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_status.h b/drivers/gpu/drm/amd/display/dc/inc/core_status.h
index 32a2cc712000..147eb7cac701 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_status.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_status.h
@@ -40,6 +40,8 @@ enum dc_status {
DC_EXCEED_DONGLE_MAX_CLK,
DC_SURFACE_PIXEL_FORMAT_UNSUPPORTED,
DC_FAIL_BANDWIDTH_VALIDATE, /* BW and Watermark validation */
+ DC_FAIL_SCALING,
+ DC_FAIL_CLK_CONSTRAINT,
DC_ERROR_UNEXPECTED = -1
};
--
2.9.3
