From 235caa9d6f3a8171381ec3bc9a321edb2ef183f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Sat, 13 Sep 2025 16:32:22 +0800 Subject: [PATCH 1/2] 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁鹏辉 --- .../v1_0/display_command/display_cmd_requester.h | 9 ++++----- .../composer/v1_0/display_command/display_cmd_utils.h | 6 +----- 2 files changed, 5 insertions(+), 10 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 fed5e7c5..20365f71 100755 --- a/display/composer/v1_0/display_command/display_cmd_requester.h +++ b/display/composer/v1_0/display_command/display_cmd_requester.h @@ -987,13 +987,12 @@ protected: void ReqCmdDump() { - HDF_LOGW("@ DevId | count | len | cmdId \n"); - HDF_LOGW("@ -------+-------+-------+--------------------------------------------------\n"); + HDF_LOGW("@ DevId | cmdId | count | len \n"); + HDF_LOGW("@ -------+--------+-------+-------\n"); for (auto iterDev = reqCmdMaps.begin(); iterDev != reqCmdMaps.end(); iterDev++) { for (auto iterCmdInfo = iterDev->second.begin(); iterCmdInfo != iterDev->second.end(); iterCmdInfo++) { - HDF_LOGW("@ %{public}u | %{public}u | %{public}u | %{public}s \n", - iterDev->first, iterCmdInfo->second.count, iterCmdInfo->second.len, - CmdUtils::CommandToString(iterCmdInfo->first)); + HDF_LOGW("@ %{public}u | %{public}d | %{public}u | %{public}u \n", + iterDev->first, iterCmdInfo->first, iterCmdInfo->second.count, iterCmdInfo->second.len); } } } diff --git a/display/composer/v1_0/display_command/display_cmd_utils.h b/display/composer/v1_0/display_command/display_cmd_utils.h index bca209ad..f9c1f763 100644 --- a/display/composer/v1_0/display_command/display_cmd_utils.h +++ b/display/composer/v1_0/display_command/display_cmd_utils.h @@ -20,7 +20,7 @@ #include "command_pack/command_data_packer.h" #include "command_pack/command_data_unpacker.h" #include "common/include/display_interface_utils.h" -#include "v1_2/display_composer_type.h" +#include "v1_0/display_composer_type.h" #undef LOG_TAG #define LOG_TAG "DISP_CMD" @@ -69,10 +69,6 @@ public: SWITCHCASE(REQUEST_CMD_SET_LAYER_VISIBLE); SWITCHCASE(REQUEST_CMD_SET_LAYER_MASK_INFO); SWITCHCASE(REQUEST_CMD_SET_LAYER_COLOR); - SWITCHCASE(V1_2::REQUEST_CMD_COMMIT_AND_GET_RELEASE_FENCE); - SWITCHCASE(V1_2::REQUEST_CMD_SET_DISPLAY_CONSTRAINT); - SWITCHCASE(V1_2::REQUEST_CMD_SET_LAYER_PERFRAME_PARAM); - SWITCHCASE(V1_2::REQUEST_CMD_SET_DISPLAY_PERFRAME_PARAM); /* reply cmd */ SWITCHCASE(REPLY_CMD_SET_ERROR); SWITCHCASE(REPLY_CMD_PREPARE_DISPLAY_LAYERS); -- Gitee From 74a3a5a0fd32b7b814b061dd7ace2efcf32f0845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Mon, 15 Sep 2025 14:10:28 +0800 Subject: [PATCH 2/2] 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁鹏辉 --- display/composer/v1_0/display_command/display_cmd_requester.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 20365f71..a70d0f25 100755 --- a/display/composer/v1_0/display_command/display_cmd_requester.h +++ b/display/composer/v1_0/display_command/display_cmd_requester.h @@ -992,7 +992,7 @@ protected: for (auto iterDev = reqCmdMaps.begin(); iterDev != reqCmdMaps.end(); iterDev++) { for (auto iterCmdInfo = iterDev->second.begin(); iterCmdInfo != iterDev->second.end(); iterCmdInfo++) { HDF_LOGW("@ %{public}u | %{public}d | %{public}u | %{public}u \n", - iterDev->first, iterCmdInfo->first, iterCmdInfo->second.count, iterCmdInfo->second.len); + iterDev->first, iterCmdInfo->first, iterCmdInfo->second.count, iterCmdInfo->second.len); } } } -- Gitee