Merge "sdm:hwc2: Initialize color mode count for virtual display."

This commit is contained in:
Linux Build Service Account
2018-03-12 18:58:37 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 11 additions and 2 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met:
@@ -161,6 +161,14 @@ DisplayError DisplayVirtual::Prepare(LayerStack *layer_stack) {
return DisplayBase::Prepare(layer_stack);
}
DisplayError DisplayVirtual::GetColorModeCount(uint32_t *mode_count) {
lock_guard<recursive_mutex> obj(recursive_mutex_);
// Color Manager isn't supported for virtual displays.
*mode_count = 1;
return kErrorNone;
}
} // namespace sdm

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met:
@@ -63,6 +63,7 @@ class DisplayVirtual : public DisplayBase {
// on virtual display is functional.
return kErrorNone;
}
virtual DisplayError GetColorModeCount(uint32_t *mode_count);
};
} // namespace sdm