Since the android container already initializes and syncs the aosp repo,
also build the vkms hotplug binaries so that they can be used later in the
CI pipeline.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
This change modifies cursor behavior during atomic commit
so that the scaling factor is preserved. Previously, the
src rect was being overwritten to match the dimensions of
the dst rect, because it was assumed that scaling is not
permitted with the cursor plane. The new behavior will
preserve any existing scaling factor while resizing the
src rect. For hardware that cannot use scaling on the
cursor plane, this behavior should now be caught during
test commit, and trigger the appropriate fallback. For
hardware that can use scaling on the cursor plane, the
behavior is fixed such that the cursor will now appear
with the correct sizing.
Change-Id: I1d3e01441bdc5d7076b15d66b1a7a1a498ea64a9
This CL strengthens the cursor plane usage check with a test
commit. A test commit is a cheap and definitive means of
determining whether the cursor plane can be used. Under the
previous scheme, if a validation test commit would fail, it
was unclear whether the failure was due to the cursor plane
or due to other factors, and sometimes the cursor would be
demoted when it was not at fault. The new flow relies on the
result of the cursor test commit, and applies updated fallback
behavior to preserve the cursor as much as possible.
Change-Id: If3b86a4cbfb5220532a58b14797d6840c3a93af6
This CL resolves some logical errors in Backend::ValidateDisplay.
Previously, it was possible for the ValidatedComposition's
composition_plan to improperly hold plane bindings when the
TestCompostion was skipped. Additionally, metric values were
not being counted properly, due to the client_start, client_size,
and use_cursor_plane variables not being updated when the
composition is flattened due to failed validation. Finally, the
client_start and client_size variables are moved out of the
validate_and_test helper, which makes their state simpler
to reason about.
Change-Id: I229d8aa38993c3e26ef61d9f6127ce17bac5336f
This change moves the pixops calculation into HwcLayer. This
simplifies the logic to determine the total pixops over the
client range performed within Backend. This change also moves
the display size calculation into HwcDisplay.
Change-Id: Id7e12657a512db3aaea98d88833c818c10efef66
This change refactors the IRect and FRect types into a single
templated type Rect<T>, which allows the implementation to be
shared across both variants. This change also adds convenience
getters for the rect widths and heights, and updates callsites
accordingly.
Change-Id: I38509631d57706266186a7b7fa21bd43c0860890
Make AtomicCommitArgs const in the different helper functions to build
the AtomicRequest. Additionally, reorder the parameters to reflect the
convention that input parameters are listed first, and out parameters
are listed after.
Change-Id: I0277ec4129fbcd6312e6df9ae3f15600e9755520
Add AtomicRequest struct to wrap the pending DrmModeAtomicReq and
related kms objects and state for the pending atomic commit.
After the AtomicRequest's property set has been committed, update the
internal DrmAtomicStateManager state to reflect what has been committed.
Change-Id: I49d39649eb957d69f724b53b91577a347a75527e
Rather than initializing the state associated with a new frame by
copying committed_frame_state_, check committed_frame_state_ directly
when needed.
Change-Id: I62043e15e70669ce6a8ac4635101d13d8efd7f15
In some cases, the position of the cursor is controlled by the src rect.
For example, this is done when the cursor extends beyond the top or left
edges of the screen. This is not compatible with the hw cursor plane
however, because scaling and panning are both disallowed. As a workaround,
the position of the dst rect needs to be adjusted in the opposite
direction (in some cases taking a negative-valued position,) which
will correctly position the cursor while also assigning an acceptible
value to the src rect.
Change-Id: Ide7f75e01481bcd602a33d222d1ae6862703a1cd
drm_hwc currently does not support tone mapping. This causes a visual
color flickers when switching between CLIENT and DEVICE composition.
Temporarily disable non-native color modes until tone mapping work is
completed.
Change-Id: I114a12c474990a5a81181c52307469c7b139a2b0
Signed-off-by: Sasha McIntosh <sashamcintosh@google.com>
Add some const correctness to HwcDisplay. Narrow the public
interface of HwcDisplay to avoid exposing non-const members
unnecessarily.
Change-Id: I691c9e0025065085ca1e2045bb1d6614535fdbdc
Since CreateComposition is only being used in the present path, rename
it to CommitComposition to indicate that it's going to commit the
composition that was previously created during Validate.
Change-Id: Ia4627ff1e32b655273421510f8e1b844c6dd5e06
Making TestComposition const ensures that the Backend can't modify any
HwcDisplay state while creating and validating a composition.
Also make a bunch of other stuff const-correct since there is a const
version of GetPipe()
Change-Id: Ib7769d290148ce496b0165b64806dbd0a601b213
The client layer may be updated as part of Present, since the Client
doesn't know if the client layer is used or not until after Validate is
complete.
Move PopulateLayerData call out of CreateFrameUpdateCommit so that
CreateFrameUpdateCommit doesn't modify HwcDisplay state.
Change-Id: I0a78075f9476e0d27111b860b6a39fb46814b235
DrmKmsPlan lifetime is used to manage ownership of drm planes that have
affinity for multiple crtcs. As such, the DrmKmsPlan lifetime needs to
persist from a Validate call to when the composition is Presented to
ensure that such planes aren't stolen by another display.
Rather than stashing the DrmKmsPlan as part of TestComposition, return
the DrmKmsPlan as part of the Backend's Validate. HwcDisplay::Validate
then becomes responsible for lifetime management of the resulting
DrmKmsPlan as before.
Change-Id: I14ae115b2eed5c9b27e70f0b695fbbc4f3a4faa6
Extract the functionality to create the AtomicCommitArgs for a frame
update and call this from the TestComposition and CreateComposition
paths.
Change-Id: Ibb0695fd37e9f43eb8f97b3fd901109839d0f9ea
Rather than using next_config to determine if there was a config change
during the frame update, check the a_args.
Change-Id: Ib71dd3d542d7915e1fbfba0045c1d604382b1aab
QueueConfig allows for a seamless refresh rate change to be queued at
some arbitrary point in the future.
Previous behavior was to report `desired_time` as the time to request
a new frame from the client to apply the refresh rate change. Since
`desired_time` could be any arbitrary point in time, this may not align
with the current refresh rate.
This change addresses a failure in
SetActiveConfigWithConstraints_Delayed exposed by the previous change to
avoid setting the active_config_id until a full commit.
Change-Id: I92888cd1a6a330455f9e7e496d6900d494605248
HwcDisplay internal tracking state should only be modified for the
commit, not for the test commit
Change-Id: Idd63e300e724ff1b6986362d2b47e7b024346e05
This change cleans up some typing within Backend around data which
was inconsistently being handled as int, uint32_t, or size_t. This
change resolves an instance of integer underflow.
Change-Id: I4a2aa352b6cb4d1ff74929eb67c7edfc907cdb0c
In Android 16, some CtsGraphicsTestCases test names have changed which
causes the module to fail. Update the test names.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Android 16 added a new test, GetSupportedRefreshRatesIsDivisorRate,
which will fail when CI is updated to Android 16.
Add the ability to skip a CTS test and skip this test for now.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Update the commands for launching cuttlefish, since they changed slightly
between Android 15 and Android 16.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Update the android container to include all of the packages, tools, and
tests that are up-to-date with Android 16.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Update the aospless container to work with the Android 16 repositories.
This ensures that aospless can still be used to build drm-hwcomposer
binaries for Android 16.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Build the cuttlefish device for Android 16. This keeps CI coverage
as complete and up-to-date as possible.
Since Android 16 deprecates builds with make, temporarily stop using mesa
libraries with the intention of adding a Soong build of mesa in the
future.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
In preparation for rebuilding all CI containers to use Android 16,
update CI/build variables to use Android 16 and Android SDK 36.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
When $FDO_CI_BASH_HELPERS was added, it included an ERR trap that is
triggered when a cts failure is found in the invocation summary. This
prevents the full cts logs from being saved in the job results.
Revise the cts failure check to avoid triggering the trap on error and
allow the full cts logs to be saved.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Since libbase is now part of hwcomposer.drm_defaults, meson builds also
need the `base` dependency to avoid linking errors.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Currently the clang-tidy CI job is ignoring code guarded by
`__ANDROID_API__ >= 36` so some readability warnings slipped through.
In preparation for updating the ANDROID_SDK_VERSION to 36, silence these
warnings:
* error: invalid case style for parameter 'maxProfiles'
* error: all parameters should be named in a function
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Call this from the Backend when testing a composition. Future commit
will make this a const function to indicate that it doesn't change
HwcDisplay internal state.
Change-Id: I9bd6962e213acd76d13afbdc620418bd1ff95557
Backend shouldn't directly mutate HwcLayer state, so make HwcLayer
const. Make a few other related functions const correct as well.
Change-Id: Id7f8e255e9e72b756399b1a4dabc3db779d64bc9
Rename to GetCompositionTypes to reflect that the function is no longer
setting HwcLayer state (marking). Also make the input |layers| const
since it's no longer being modified.
Change-Id: I53702a6df680b9a138bb16191a3cac0b17e4b632
Rather than setting the ValidatedType on the layers directly from the
Backend, return the per-layer composition type decisions from the
Backend and let the HwcDisplay set it.
This is a step towards the goal of not setting HwcLayer state directly
from the Backend.
Change-Id: I8e2d1e7c6fb0d9071d5dca101ddb455b95535bd0
Explicitly set DerivePointerAlignment: true to avoid spurious
clang-format corrections and keep the project consistent with itself.
Change-Id: I2928adebf8c56743ffe910f5026d501beda8941f
GetDisplayConfigurations_hasHdrType fails for headless displays since
the hdrOutputType is not initialized for fake modes. Set fake modes to
kSystem instead of kInvalid.
Change-Id: I051dc742b4786bbb0bf8a9384a6d3cde536eebce
IsWriteBackSupported is called on a display as part of
getReadbackBufferAttributes. If this is called on a headless display,
then it will result in a null ptr dereference.
Check for headless display and return 'false' in this case.
Change-Id: Ia492dec338ab65457670e3b22c2e8582031aa129
A test commit or failed modesets, particularly when with modes of a
different resolution, would cause all subsequent pafe-flip commits to
fail.
The root cause was a premature state update within
SetDisplayModeIfNeeded. The `whole_display_rect_` member was being
modified during the commit preparation phase. This polluted the state
manager's internal view of the active display size, causing subsequent
frame compositions to be built with incorrect dimensions, which were
then rejected by the kernel on certain drivers that cannot handle
scaling on the fly.
This change fixes the issue by deferring the state update until after a
commit is successfully applied:
1. `whole_display_rect_` is now only updated inside `CommitFrame` after
a modesetting commit has been successfully applied to hardware.
2. `SetCompositionIfNeeded` is updated to use the dimensions from the
incoming `args.display_mode`, if available, when preparing a modeset.
Otherwise it will use the existing size in `whole_display_rect_`.
This ensures the plane is correctly configured for either the
requested mode, or the currently active one (for page-flips).
This prevents test-only operations from having side effects and ensures
the state manager's internal state remains consistent. It also prevents
state pollution on failed modesets.
Change-Id: Icf08b32c13879d394f883f34e6fed3d96a748a4f
Co-authored-by: Lucas Berthou <berlu@google.com>
Signed-off-by: Gil Dekel <gildekel@google.com>
