From 8b78feac09edefc81a9305fb0aa573c8c64e13d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= <liangpenghui2@huawei.com>
Date: Fri, 18 Jul 2025 11:42:11 +0800
Subject: [PATCH] 1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 梁鹏辉 <liangpenghui2@huawei.com>
---
 .../v1_0/display_command/display_cmd_requester.h     |  7 ++++---
 .../v1_0/display_command/display_cmd_responser.h     | 12 ++++++------
 .../v1_2/display_command/display_cmd_responser.h     | 11 +++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/display/composer/v1_0/display_command/display_cmd_requester.h b/display/composer/v1_0/display_command/display_cmd_requester.h
index 5137c0a4..ba3e6954 100755
--- a/display/composer/v1_0/display_command/display_cmd_requester.h
+++ b/display/composer/v1_0/display_command/display_cmd_requester.h
@@ -877,17 +877,18 @@ protected:
         int32_t ret = request_->Write(
             reinterpret_cast<int32_t *>(requestPacker_.GetDataPtr()), eleCnt, CmdUtils::TRANSFER_WAIT_TIME);
         DISPLAY_CHK_RETURN(ret != HDF_SUCCESS, ret,
-            HDF_LOGE("%{public}s: CmdRequest write failed", __func__));
+            HDF_LOGE("%{public}s: CmdRequest write failed, ret = %{public}d, eleCnt = %{public}d", __func__, ret,
+                eleCnt));
 
         ret = hdi_->CmdRequest(eleCnt, requestHdiFds_, replyEleCnt, outFds);
         DISPLAY_CHK_RETURN(ret != HDF_SUCCESS, ret,
-            HDF_LOGE("%{public}s: CmdRequest failed", __func__));
+            HDF_LOGE("%{public}s: CmdRequest failed, ret = %{public}d", __func__, ret));
 
         if (replyEleCnt != 0) {
             ret = reply_->Read(reinterpret_cast<int32_t *>(replyData_.get()),
                                replyEleCnt, CmdUtils::TRANSFER_WAIT_TIME);
             if (ret != HDF_SUCCESS) {
-                HDF_LOGE("reply read data failure, ret=%{public}d", ret);
+                HDF_LOGE("reply read data failure, ret=%{public}d, replyEleCnt=%{public}d", ret, replyEleCnt);
             }
         }
 
diff --git a/display/composer/v1_0/display_command/display_cmd_responser.h b/display/composer/v1_0/display_command/display_cmd_responser.h
index 628d8b11..9d353087 100755
--- a/display/composer/v1_0/display_command/display_cmd_responser.h
+++ b/display/composer/v1_0/display_command/display_cmd_responser.h
@@ -166,12 +166,12 @@ public:
         }
         std::shared_ptr<char> requestData(new char[inEleCnt * CmdUtils::ELEMENT_SIZE], std::default_delete<char[]>());
 
-        int32_t ret = HDF_SUCCESS;
-        {
-            std::lock_guard<std::mutex> lock(requestMutex_);
-            ret = request_->Read(reinterpret_cast<int32_t *>(requestData.get()), inEleCnt,
-                CmdUtils::TRANSFER_WAIT_TIME);
+        int32_t ret = CmdRequestDataRead(requestData, inEleCnt);
+        if (ret != HDF_SUCCESS) {
+            HDF_LOGE("%{public}s: CmdRequest read failed, ret=%{public}d, isEleCnt=%{public}d", __func__, ret,
+                inEleCnt);
         }
+
         CommandDataUnpacker unpacker;
         unpacker.Init(requestData.get(), inEleCnt << CmdUtils::MOVE_SIZE);
 #ifdef DEBUG_DISPLAY_CMD_RAW_DATA
@@ -209,7 +209,7 @@ public:
         outEleCnt = replyPacker_.ValidSize() >> CmdUtils::MOVE_SIZE;
         ret = CmdRequestDataWrite(outEleCnt);
         if (ret != HDF_SUCCESS) {
-            HDF_LOGE("Reply write failure, ret=%{public}d", ret);
+            HDF_LOGE("Reply write failure, ret=%{public}d, outEleCnt=%{public}d", ret, outEleCnt);
             outEleCnt = 0;
         }
         int32_t ec = PeriodDataReset();
diff --git a/display/composer/v1_2/display_command/display_cmd_responser.h b/display/composer/v1_2/display_command/display_cmd_responser.h
index 8a328edf..3495e36d 100644
--- a/display/composer/v1_2/display_command/display_cmd_responser.h
+++ b/display/composer/v1_2/display_command/display_cmd_responser.h
@@ -228,11 +228,10 @@ REPLY:
         uint32_t& outEleCnt, std::vector<HdifdInfo>& outFds)
     {
         std::shared_ptr<char> requestData(new char[inEleCnt * CmdUtils::ELEMENT_SIZE], std::default_delete<char[]>());
-        int32_t ret = HDF_SUCCESS;
-        {
-            std::lock_guard<std::mutex> lock(requestMutex_);
-            ret = request_->Read(reinterpret_cast<int32_t*>(requestData.get()), inEleCnt,
-                CmdUtils::TRANSFER_WAIT_TIME);
+        int32_t ret = CmdRequestDataRead(requestData, inEleCnt);
+        if (ret != HDF_SUCCESS) {
+            HDF_LOGE("%{public}s: CmdRequest read failed, ret=%{public}d, inEleCnt=%{public}d", __func__, ret,
+                inEleCnt);
         }
         CommandDataUnpacker unpacker;
         unpacker.Init(requestData.get(), inEleCnt << CmdUtils::MOVE_SIZE);
@@ -272,7 +271,7 @@ REPLY:
         outEleCnt = replyPacker_.ValidSize() >> CmdUtils::MOVE_SIZE;
         ret = CmdRequestDataWrite(outEleCnt);
         if (ret != HDF_SUCCESS) {
-            HDF_LOGE("Reply write failure, ret=%{public}d", ret);
+            HDF_LOGE("Reply write failure, ret=%{public}d, outEleCnt=%{public}d", ret, outEleCnt);
             outEleCnt = 0;
         }
         return ret;
-- 
Gitee