package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 09:36:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix[osal]: rv1109/rv1126 vcodec_type mismatch problem

Browse Source 
RV1126/RV1109 JPEG decoder has no PP. This will be conflict with
vcodec_type queried from kernel. Also VPU_CLIENT_VEPU2_JPEG is defined
and used only for multi-core JPEG encoder at kernel. So the following
changes is made to fix this problem:

1. This reverts commit 9b860cd250.
2. Define a new MppDecHwCap to distinguish normal VPU with only JPEG
   supported from multi-core JPEG encoder.
3. Correct vcodec_type queried from kernel when there is no PP for
   VDPU2.

Change-Id: I58a1abe708721f725a9cf487e8f870dd5820844f
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
This commit is contained in:
Johnson Ding
2024-05-16 09:12:11 +08:00
parent 56449b26f1
commit 45f2fcbcf0
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
osal/mpp_platform.cpp
View File

@@ -133,10 +133,37 @@ MppPlatformService::MppPlatformService()
if (mpp_get_mpp_service_name()) {
ioctl_version = IOCTL_MPP_SERVICE_V1;
check_mpp_service_cap(&vcodec_type, hw_ids, cap);
mpp_dbg_platform("vcodec_type from kernel 0x%08x, vs from soc info 0x%08x\n",
vcodec_type, soc_info->vcodec_type);
}
kernel_version = check_kernel_version();
if (!vcodec_type)
if (!vcodec_type) {
vcodec_type = soc_info->vcodec_type;
} else {
// Compare kernel result with soc infomation.
RK_U32 diff_type = vcodec_type ^ soc_info->vcodec_type;
RK_U32 i;
for (i = 0; i <= VPU_CLIENT_VEPU22; i++) {
RK_U32 mask = 1 << i;
if (diff_type & mask) {
MppClientType client_type = (MppClientType) i;
mpp_dbg_platform("confliction found at client_type %d\n", client_type);
if (soc_info->vcodec_type & mask) {
mpp_err("client %d driver is not ready!\n", client_type);
} else {
mpp_dbg_platform("client %d driver is ready but not declared!\n", client_type);
if (client_type == VPU_CLIENT_VDPU2_PP)
vcodec_type &= ~mask;
}
}
}
mpp_dbg_platform("vcode_type 0x%08x\n", vcodec_type);
}
}
RK_U32 MppPlatformService::get_hw_id(RK_S32 client_type)