commit 8479b56f1fda6407b3d59822ee1cde69a500ce07
author Sasha McIntosh <sashamcintosh@google.com> Wed Dec 18 15:56:35 2024 -0500
committer Sasha McIntosh <sashamcintosh@google.com> Wed Dec 18 15:58:45 2024 -0500
tree 98d73728fc9b208f762a2ee92e5b94bec3a21baf
parent b22ede5600cfa408d13e584043fd6d9e51b6de4c

ANDROID: Provide default value for hdrOutputType

Set hdrOutputType to SYSTEM for all configs provided by drm_hwcomposer.

Bug: 374183675
Bug: 382300539
Test: Presubmit
Change-Id: I219d70731be058b85117b63eeed769ecc31e614d
Signed-off-by: Sasha McIntosh <sashamcintosh@google.com>

hwc3/ComposerClient.cpp

diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index b8128f0..f5ee905 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -31,6 +31,7 @@
 #include <aidl/android/hardware/graphics/composer3/DisplayRequest.h>
 #include <aidl/android/hardware/graphics/composer3/IComposerClient.h>
 #include <aidl/android/hardware/graphics/composer3/Luts.h>
+#include <aidl/android/hardware/graphics/composer3/OutputType.h>
 #include <aidl/android/hardware/graphics/composer3/PowerMode.h>
 #include <aidl/android/hardware/graphics/composer3/PresentOrValidate.h>
 #include <aidl/android/hardware/graphics/composer3/RenderIntent.h>
@@ -229,7 +230,8 @@
        .width = config.mode.GetRawMode().hdisplay,
        .height = config.mode.GetRawMode().vdisplay,
        .configGroup = static_cast<int32_t>(config.group_id),
-       .vsyncPeriod = config.mode.GetVSyncPeriodNs()};
+       .vsyncPeriod = config.mode.GetVSyncPeriodNs(),
+       .hdrOutputType = static_cast<OutputType>(OutputType::SYSTEM)};
 
   if (configs.mm_width != 0) {
     // ideally this should be vdisplay/mm_heigth, however mm_height