Remove composer3 hal diff patches frome utils repo.

Putting it to drm-hwcomposer master repo.

Tracked-On: OAM-118438
Signed-off-by: manxiaoliang <xiaoliangx.man@intel.com>

Author: manxiaoliang

hwc3-server/default/Android.bp

@@ -0,0 +1,78 @@
+//  Copyright (C) 2022 The Android Open Source Project
+// 
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+// 
+//       http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "hardware_interfaces_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    // default_applicable_licenses: ["hardware_interfaces_license"],    
+}
+
+cc_binary {
+    name: "android.hardware.graphics.composer3-service.intel",
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.graphics.composer3-service.intel.rc"],
+    vendor: true,
+    cflags:[
+        "-Wall",
+        "-Werror",
+        "-DLOG_TAG=\"hwc3\"",
+    ],
+    cppflags: [
+        "-Wextra",
+        "-Wunused",
+        "-Wunreachable-code",
+        "-Wno-sign-compare",
+        "-Wno-unused-parameter",
+    ],
+    local_include_dirs:[
+        "include",
+        "impl",
+    ],
+    include_dirs: [ 
+    ],
+    header_libs: [
+        "android.hardware.graphics.composer3-command-buffer",
+    ],
+    static_libs:[
+        "libaidlcommonsupport",
+    ],
+    shared_libs: [
+        "android.hardware.graphics.composer@2.1-resources",
+        "android.hardware.graphics.composer@2.2-resources",
+        "android.hardware.graphics.composer3-V2-ndk",
+        "libbase",
+        "libbinder_ndk",
+        "libcutils",
+        "libhardware",
+        "libhwc2on1adapter",
+        "libhwc2onfbadapter",
+        "libhardware_legacy",
+        "liblog",
+        "libsync",
+        "libutils",
+    ],
+    srcs: [
+        "Composer.cpp",
+        "ComposerClient.cpp",
+        "ComposerCommandEngine.cpp",
+        "impl/HalImpl.cpp",
+        "impl/HwcLoader.cpp",
+        "impl/ResourceManager.cpp",
+        "service.cpp",
+    ],
+}
+

hwc3-server/default/Composer.cpp

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
+
+#include "Composer.h"
+
+#include <android-base/logging.h>
+#include <android/binder_ibinder_platform.h>
+
+#include "Util.h"
+
+namespace aidl::android::hardware::graphics::composer3::impl {
+
+ndk::ScopedAStatus Composer::createClient(std::shared_ptr<IComposerClient>* outClient) {
+    DEBUG_FUNC();
+    std::unique_lock<std::mutex> lock(mClientMutex);
+    if (!waitForClientDestroyedLocked(lock)) {
+        *outClient = nullptr;
+        return TO_BINDER_STATUS(EX_NO_RESOURCES);
+    }
+
+    auto client = ndk::SharedRefBase::make<ComposerClient>(mHal.get());
+    if (!client || !client->init()) {
+        *outClient = nullptr;
+        return TO_BINDER_STATUS(EX_NO_RESOURCES);
+    }
+
+    auto clientDestroyed = [this]() { onClientDestroyed(); };
+    client->setOnClientDestroyed(clientDestroyed);
+
+    mClientAlive = true;
+    *outClient = client;
+
+    return ndk::ScopedAStatus::ok();
+}
+
+binder_status_t Composer::dump(int fd, const char** /*args*/, uint32_t /*numArgs*/) {
+    std::string output;
+    mHal->dumpDebugInfo(&output);
+    write(fd, output.c_str(), output.size());
+    return STATUS_OK;
+}
+
+ndk::ScopedAStatus Composer::getCapabilities(std::vector<Capability>* caps) {
+    DEBUG_FUNC();
+    mHal->getCapabilities(caps);
+    return ndk::ScopedAStatus::ok();
+}
+
+bool Composer::waitForClientDestroyedLocked(std::unique_lock<std::mutex>& lock) {
+    if (mClientAlive) {
+        using namespace std::chrono_literals;
+
+        // In surface flinger we delete a composer client on one thread and
+        // then create a new client on another thread. Although surface
+        // flinger ensures the calls are made in that sequence (destroy and
+        // then create), sometimes the calls land in the composer service
+        // inverted (create and then destroy). Wait for a brief period to
+        // see if the existing client is destroyed.
+        LOG(DEBUG) << "waiting for previous client to be destroyed";
+        mClientDestroyedCondition.wait_for(lock, 1s,
+                                           [this]() -> bool { return !mClientAlive; });
+        if (mClientAlive) {
+            LOG(DEBUG) << "previous client was not destroyed";
+        }
+    }
+
+    return !mClientAlive;
+}
+
+void Composer::onClientDestroyed() {
+    std::lock_guard<std::mutex> lock(mClientMutex);
+    mClientAlive = false;
+    mClientDestroyedCondition.notify_all();
+}
+
+::ndk::SpAIBinder Composer::createBinder() {
+    auto binder = BnComposer::createBinder();
+    AIBinder_setInheritRt(binder.get(), true);
+    return binder;
+}
+
+} // namespace aidl::android::hardware::graphics::composer3::impl
+

hwc3-server/default/Composer.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_HWC_COMPOSER_H
+#define ANDROID_HWC_COMPOSER_H
+
+#include <aidl/android/hardware/graphics/composer3/BnComposer.h>
+#include <utils/Mutex.h>
+
+#include "include/IComposerHal.h"
+#include "ComposerClient.h"
+
+namespace aidl::android::hardware::graphics::composer3::impl {
+
+class Composer : public BnComposer {
+public:
+    Composer(std::unique_ptr<IComposerHal> hal) : mHal(std::move(hal)) {}
+
+    binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;
+
+    // compser3 api
+    ndk::ScopedAStatus createClient(std::shared_ptr<IComposerClient>* client) override;
+    ndk::ScopedAStatus getCapabilities(std::vector<Capability>* caps) override;
+
+protected:
+    ndk::SpAIBinder createBinder() override;
+
+private:
+    bool waitForClientDestroyedLocked(std::unique_lock<std::mutex>& lock);
+    void onClientDestroyed();
+
+    const std::unique_ptr<IComposerHal> mHal;
+    std::mutex mClientMutex;
+    bool mClientAlive GUARDED_BY(mClientMutex) = false;
+    std::condition_variable mClientDestroyedCondition;
+};
+
+}  // namespace aidl::android::hardware::graphics::composer3::impl
+#endif