From 8d6df58fc9fb544d6c184f2b8f9d7911265cc62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Sat, 26 Oct 2024 18:47:00 +0800 Subject: [PATCH 1/4] change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁鹏辉 --- .../display_command/display_cmd_responser.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 7ee4cd77..e257c68a 100755 --- a/display/composer/v1_0/display_command/display_cmd_responser.h +++ b/display/composer/v1_0/display_command/display_cmd_responser.h @@ -25,6 +25,7 @@ #include #include #include +#include #include "base/hdi_smq.h" #include "buffer_handle_utils.h" @@ -41,6 +42,7 @@ #include "v1_0/mapper_stub.h" #define DISPLAY_TRACE HdfTrace trace(__func__, "HDI:DISP:") +#define BAD_FD_CODE -1 namespace OHOS { namespace HDI { @@ -403,6 +405,14 @@ EXIT: if (data.fence > ERROR_FENCE_COUNT) { HDF_LOGI("SetDisplayClientBuffer: %{public}s", traceMsg.c_str()); } + + if (fcntl(handle.fd, F_GETFD) == BAD_FD_CODE) { + HHDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + } + if (fcntl(fd, F_GETFD) == BAD_FD_CODE) { + HHDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + } + HdfTrace traceVdi("SetDisplayClientBuffer", traceMsg); needMoveFd = true; int rc = impl_->SetDisplayClientBuffer(data.devId, handle, fd); @@ -858,6 +868,14 @@ EXIT: } HdfTrace traceVdi("SetLayerBuffer", traceMsg); needMoveFd = true; + + if (fcntl(handle.fd, F_GETFD) == BAD_FD_CODE) { + HHDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + } + if (fcntl(fd, F_GETFD) == BAD_FD_CODE) { + HHDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + } + int rc = impl_->SetLayerBuffer(data.devId, data.layerId, handle, fd); DISPLAY_CHK_RETURN(rc != HDF_SUCCESS, HDF_FAILURE, HDF_LOGE(" fail")); return HDF_SUCCESS; -- Gitee From 1b8a1a0e6a98d84f72a19be3204a50eca9e27748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Sat, 26 Oct 2024 18:48:59 +0800 Subject: [PATCH 2/4] change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁鹏辉 --- .../v1_0/display_command/display_cmd_responser.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 e257c68a..f52fa511 100755 --- a/display/composer/v1_0/display_command/display_cmd_responser.h +++ b/display/composer/v1_0/display_command/display_cmd_responser.h @@ -407,10 +407,12 @@ EXIT: } if (fcntl(handle.fd, F_GETFD) == BAD_FD_CODE) { - HHDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + HDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + return HDF_FAILURE; } if (fcntl(fd, F_GETFD) == BAD_FD_CODE) { - HHDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + HDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + return HDF_FAILURE; } HdfTrace traceVdi("SetDisplayClientBuffer", traceMsg); @@ -870,10 +872,12 @@ EXIT: needMoveFd = true; if (fcntl(handle.fd, F_GETFD) == BAD_FD_CODE) { - HHDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + HDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + return HDF_FAILURE; } if (fcntl(fd, F_GETFD) == BAD_FD_CODE) { - HHDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + HDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + return HDF_FAILURE; } int rc = impl_->SetLayerBuffer(data.devId, data.layerId, handle, fd); -- Gitee From d8cb949771017415f988041b90cf41367a004631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Sat, 26 Oct 2024 18:55:54 +0800 Subject: [PATCH 3/4] change 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_responser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f52fa511..eb22ed7f 100755 --- a/display/composer/v1_0/display_command/display_cmd_responser.h +++ b/display/composer/v1_0/display_command/display_cmd_responser.h @@ -42,7 +42,7 @@ #include "v1_0/mapper_stub.h" #define DISPLAY_TRACE HdfTrace trace(__func__, "HDI:DISP:") -#define BAD_FD_CODE -1 +#define BAD_FD_CODE (-1) namespace OHOS { namespace HDI { -- Gitee From 403b0343971f63a6d37eb4ea45cfd03293c366f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Sat, 26 Oct 2024 19:26:05 +0800 Subject: [PATCH 4/4] change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁鹏辉 --- .../composer/v1_0/display_command/display_cmd_responser.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 eb22ed7f..91a85e7d 100755 --- a/display/composer/v1_0/display_command/display_cmd_responser.h +++ b/display/composer/v1_0/display_command/display_cmd_responser.h @@ -407,11 +407,11 @@ EXIT: } if (fcntl(handle.fd, F_GETFD) == BAD_FD_CODE) { - HDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + HDF_LOGE("%{public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); return HDF_FAILURE; } if (fcntl(fd, F_GETFD) == BAD_FD_CODE) { - HDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + HDF_LOGE("%{public}s: fd %{public}d is bad fd", __func__, fd); return HDF_FAILURE; } @@ -872,11 +872,11 @@ EXIT: needMoveFd = true; if (fcntl(handle.fd, F_GETFD) == BAD_FD_CODE) { - HDF_LOGE("${public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); + HDF_LOGE("%{public}s: handle.fd %{public}d is bad fd", __func__, handle.fd); return HDF_FAILURE; } if (fcntl(fd, F_GETFD) == BAD_FD_CODE) { - HDF_LOGE("${public}s: fd %{public}d is bad fd", __func__, fd); + HDF_LOGE("%{public}s: fd %{public}d is bad fd", __func__, fd); return HDF_FAILURE; } -- Gitee