Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8101b24c authored by Chia-I Wu's avatar Chia-I Wu
Browse files

graphics: require validateDisplay after onRefresh 

After initialization or onRefresh, we want to make sure
validateDisplay is called before presentDisplay.

Bug: 67505273
Test: manual
Change-Id: Id876d9251586aaaf552ca82c52f8f902af364251
parent bc67a6a8

graphics/composer/2.1/default/Hwc.cpp

+11 −3
Original line number Original line Diff line number Diff line
@@ -35,10 +35,8 @@ namespace composer { 
namespace V2_1 {

namespace V2_1 {

namespace implementation {

namespace implementation {







HwcHal::HwcHal(const hw_module_t* module)

HwcHal::HwcHal(const hw_module_t* module)

    : mDevice(nullptr), mDispatch(), mAdapter()

    : mDevice(nullptr), mDispatch(), mMustValidateDisplay(true), mAdapter() {

{

    // Determine what kind of module is available (HWC2 vs HWC1.X).

    // Determine what kind of module is available (HWC2 vs HWC1.X).

    hw_device_t* device = nullptr;

    hw_device_t* device = nullptr;

    int error = module->methods->open(module, HWC_HARDWARE_COMPOSER, &device);

    int error = module->methods->open(module, HWC_HARDWARE_COMPOSER, &device);
@@ -283,6 +281,8 @@ void HwcHal::refreshHook(hwc2_callback_data_t callbackData, 
        hwc2_display_t display)

        hwc2_display_t display)

{

{

    auto hal = reinterpret_cast<HwcHal*>(callbackData);

    auto hal = reinterpret_cast<HwcHal*>(callbackData);

    hal->mMustValidateDisplay = true;



    auto client = hal->getClient();

    auto client = hal->getClient();

    if (client != nullptr) {

    if (client != nullptr) {

        client->onRefresh(display);

        client->onRefresh(display);
@@ -302,6 +302,8 @@ void HwcHal::vsyncHook(hwc2_callback_data_t callbackData, 
void HwcHal::enableCallback(bool enable)

void HwcHal::enableCallback(bool enable)

{

{

    if (enable) {

    if (enable) {

        mMustValidateDisplay = true;



        mDispatch.registerCallback(mDevice, HWC2_CALLBACK_HOTPLUG, this,

        mDispatch.registerCallback(mDevice, HWC2_CALLBACK_HOTPLUG, this,

                reinterpret_cast<hwc2_function_pointer_t>(hotplugHook));

                reinterpret_cast<hwc2_function_pointer_t>(hotplugHook));

        mDispatch.registerCallback(mDevice, HWC2_CALLBACK_REFRESH, this,

        mDispatch.registerCallback(mDevice, HWC2_CALLBACK_REFRESH, this,
@@ -549,6 +551,8 @@ Error HwcHal::validateDisplay(Display display, 
    uint32_t reqs_count = 0;

    uint32_t reqs_count = 0;

    int32_t err = mDispatch.validateDisplay(mDevice, display,

    int32_t err = mDispatch.validateDisplay(mDevice, display,

            &types_count, &reqs_count);

            &types_count, &reqs_count);

    mMustValidateDisplay = false;



    if (err != HWC2_ERROR_NONE && err != HWC2_ERROR_HAS_CHANGES) {

    if (err != HWC2_ERROR_NONE && err != HWC2_ERROR_HAS_CHANGES) {

        return static_cast<Error>(err);

        return static_cast<Error>(err);

    }

    }
@@ -609,6 +613,10 @@ Error HwcHal::acceptDisplayChanges(Display display) 
Error HwcHal::presentDisplay(Display display, int32_t* outPresentFence,

Error HwcHal::presentDisplay(Display display, int32_t* outPresentFence,

        std::vector<Layer>* outLayers, std::vector<int32_t>* outReleaseFences)

        std::vector<Layer>* outLayers, std::vector<int32_t>* outReleaseFences)

{

{

    if (mMustValidateDisplay) {

        return Error::NOT_VALIDATED;

    }



    *outPresentFence = -1;

    *outPresentFence = -1;

    int32_t err = mDispatch.presentDisplay(mDevice, display, outPresentFence);

    int32_t err = mDispatch.presentDisplay(mDevice, display, outPresentFence);

    if (err != HWC2_ERROR_NONE) {

    if (err != HWC2_ERROR_NONE) {

graphics/composer/2.1/default/Hwc.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ANDROID_HARDWARE_GRAPHICS_COMPOSER_V2_1_HWC_H

#ifndef ANDROID_HARDWARE_GRAPHICS_COMPOSER_V2_1_HWC_H

#define ANDROID_HARDWARE_GRAPHICS_COMPOSER_V2_1_HWC_H

#define ANDROID_HARDWARE_GRAPHICS_COMPOSER_V2_1_HWC_H





#include <atomic>

#include <condition_variable>

#include <condition_variable>

#include <memory>

#include <memory>

#include <mutex>

#include <mutex>
@@ -215,6 +216,8 @@ private: 
    std::condition_variable mClientDestroyedWait;

    std::condition_variable mClientDestroyedWait;

    wp<ComposerClient> mClient;

    wp<ComposerClient> mClient;





    std::atomic<bool> mMustValidateDisplay;



    // If the HWC implementation version is < 2.0, use an adapter to interface

    // If the HWC implementation version is < 2.0, use an adapter to interface

    // between HWC 2.0 <-> HWC 1.X.

    // between HWC 2.0 <-> HWC 1.X.

    std::unique_ptr<HWC2On1Adapter> mAdapter;

    std::unique_ptr<HWC2On1Adapter> mAdapter;