lineage-rockchip/android_external_drm_hwcomposer
1
0
Fork 0
Code Activity Actions

Move stats accounting from validation to presentation

Browse source 
Some fields of the CompositionStats struct were only being updated
during validation, meaning that they would not be updated if the
validation step is skipped. This change moves the relevant updates
into presentation to correct some values which were not counted.

Change-Id: Ie537c0b5f6c18eaa71ca1fb2318fca3786d6e097
This commit is contained in:
Andrew Wolfers 2025-10-03 21:06:56 +00:00
parent 0c11f2e5db
commit ccbe364628
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
hwc/HwcDisplay.cpp
View file

@ -343,22 +343,6 @@ auto HwcDisplay::ValidateStagedComposition() -> std::vector<ChangedLayer> {
validated_composition_.emplace(backend_->ValidateDisplay(this));
if (validated_composition_->flatten_reason ==
FlattenReason::kValidateFailed) {
++total_stats_.failed_kms_validate;
} else if (validated_composition_->flatten_reason ==
FlattenReason::kStaticScene) {
++total_stats_.frames_flattened;
}
if (validated_composition_->cursor_plane_validated.has_value()) {
if (validated_composition_->cursor_plane_validated.value()) {
++total_stats_.cursor_plane_frames;
} else {
++total_stats_.failed_kms_cursor_validate;
}
}
// Iterate through the layers to find which layers actually changed.
std::vector<ChangedLayer> changed_layers;
for (auto &[id, layer] : layers_) {
@ -372,11 +356,6 @@ auto HwcDisplay::ValidateStagedComposition() -> std::vector<ChangedLayer> {
if (layer.IsTypeChanged()) {
changed_layers.emplace_back(id, layer.GetValidatedType());
}
total_stats_.total_pixops += layer.GetPixOps();
if (layer.GetValidatedType() == CompositionType::kClient) {
total_stats_.gpu_pixops += layer.GetPixOps();
}
}
return changed_layers;
@ -404,6 +383,7 @@ auto HwcDisplay::AcceptValidatedComposition() -> void {
}
}
// NOLINTNEXTLINE(readability-function-cognitive-complexity)
auto HwcDisplay::PresentStagedComposition(
std::optional<int64_t> desired_present_time, SharedFd &out_present_fence,
std::vector<ReleaseFence> &out_release_fences) -> bool {
@ -436,13 +416,35 @@ auto HwcDisplay::PresentStagedComposition(
WaitForPresentTime(desired_present_time.value(), vperiod_ns);
}
// Check if validation was skipped, and populate the composition types as
// needed. Otherwise, use the already-validated composition types.
if (!validated_composition_.has_value()) {
// Check if validation was performed and update related stats. Otherwise
// populate the composition types now.
if (validated_composition_.has_value()) {
if (validated_composition_->flatten_reason ==
FlattenReason::kValidateFailed) {
++total_stats_.failed_kms_validate;
} else if (validated_composition_->flatten_reason ==
FlattenReason::kStaticScene) {
++total_stats_.frames_flattened;
}
if (validated_composition_->cursor_plane_validated.has_value()) {
if (validated_composition_->cursor_plane_validated.value()) {
++total_stats_.cursor_plane_frames;
} else {
++total_stats_.failed_kms_cursor_validate;
}
}
} else {
validated_composition_ = Backend::ValidatedComposition{};
for (auto &l : layers_) {
for (const auto &[id, layer] : layers_) {
validated_composition_->composition_types
.emplace(&l.second, l.second.GetValidatedType());
.emplace(&layer, layer.GetValidatedType());
}
}
for (const auto &[id, layer] : layers_) {
total_stats_.total_pixops += layer.GetPixOps();
if (layer.GetValidatedType() == CompositionType::kClient) {
total_stats_.gpu_pixops += layer.GetPixOps();
}
}