diff --git a/osal/CMakeLists.txt b/osal/CMakeLists.txt index e66031f6..5d19e47c 100644 --- a/osal/CMakeLists.txt +++ b/osal/CMakeLists.txt @@ -29,7 +29,7 @@ set(MPP_DRIVER add_library(osal OBJECT mpp_singleton.c mpp_soc.cpp - mpp_platform.cpp + mpp_platform.c mpp_runtime.cpp mpp_allocator.cpp mpp_mem_pool.c diff --git a/osal/inc/mpp_platform.h b/osal/inc/mpp_platform.h index f0c74c52..535cfdc1 100644 --- a/osal/inc/mpp_platform.h +++ b/osal/inc/mpp_platform.h @@ -1,17 +1,6 @@ +/* SPDX-License-Identifier: Apache-2.0 OR MIT */ /* - * Copyright 2015 Rockchip Electronics Co. LTD - * - * 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. + * Copyright (c) 2015 Rockchip Electronics Co., Ltd. */ #ifndef __MPP_PLATFORM__ @@ -35,6 +24,7 @@ typedef enum MppKernelVersion_e { KERNEL_4_4, KERNEL_4_19, KERNEL_5_10, + KERNEL_6_1, KERNEL_VERSION_BUTT, } MppKernelVersion; @@ -44,9 +34,9 @@ extern "C" { MppIoctlVersion mpp_get_ioctl_version(void); MppKernelVersion mpp_get_kernel_version(void); -RK_U32 mpp_get_2d_hw_flag(void); -RK_U32 mpp_get_client_hw_id(RK_S32 client_type); -RK_U32 mpp_get_vcodec_type(void); +rk_u32 mpp_get_2d_hw_flag(void); +rk_u32 mpp_get_client_hw_id(RK_S32 client_type); +rk_u32 mpp_get_vcodec_type(void); #ifdef __cplusplus } diff --git a/osal/mpp_platform.c b/osal/mpp_platform.c new file mode 100644 index 00000000..8d26a64f --- /dev/null +++ b/osal/mpp_platform.c @@ -0,0 +1,245 @@ +/* SPDX-License-Identifier: Apache-2.0 OR MIT */ +/* + * Copyright (c) 2015 Rockchip Electronics Co., Ltd. + */ + +#define MODULE_TAG "mpp_platform" + +#include + +#include "mpp_env.h" +#include "mpp_mem.h" +#include "mpp_debug.h" +#include "mpp_common.h" +#include "mpp_platform.h" +#include "mpp_service.h" +#include "mpp_singleton.h" + +#define get_srv_platform() \ + ({ \ + MppPlatformService *__tmp; \ + if (!srv_platform) { \ + mpp_plat_srv_init(); \ + } \ + if (srv_platform) { \ + __tmp = srv_platform; \ + } else { \ + mpp_err("mpp platform srv not init at %s\n", __FUNCTION__); \ + __tmp = NULL; \ + } \ + __tmp; \ + }) + +typedef struct MppPlatformService_t { + MppIoctlVersion ioctl_version; + MppKernelVersion kernel_version; + rk_u32 vcodec_type; + rk_u32 hw_ids[32]; + MppServiceCmdCap mpp_service_cmd_cap; + const MppSocInfo *soc_info; + const char *soc_name; +} MppPlatformService; + +static MppPlatformService *srv_platform = NULL; + +static MppKernelVersion check_kernel_version(void) +{ + static const char *kernel_version_path = "/proc/version"; + MppKernelVersion version = KERNEL_UNKNOWN; + FILE *fp = NULL; + char buf[32]; + + if (access(kernel_version_path, F_OK | R_OK)) + return version; + + fp = fopen(kernel_version_path, "rb"); + if (fp) { + size_t len = fread(buf, 1, sizeof(buf) - 1, fp); + char *pos = NULL; + + buf[len] = '\0'; + pos = strstr(buf, "Linux version "); + if (pos) { + rk_s32 major = 0; + rk_s32 minor = 0; + rk_s32 last = 0; + rk_s32 count = 0; + + pos += 14; + count = sscanf(pos, "%d.%d.%d ", &major, &minor, &last); + if (count >= 2 && major > 0 && minor > 0) { + switch (major) { + case 3: { + version = KERNEL_3_10; + } break; + case 4: { + version = KERNEL_4_4; + if (minor >= 19) + version = KERNEL_4_19; + } break; + case 5: { + version = KERNEL_5_10; + } break; + case 6: { + version = KERNEL_6_1; + } break; + default: break; + } + } + } + fclose(fp); + } + return version; +} + +static void mpp_plat_srv_init() +{ + /* judge vdpu support version */ + MppPlatformService *srv = srv_platform; + MppServiceCmdCap *cap; + + if (srv) + return; + + srv = mpp_calloc(MppPlatformService, 1); + if (!srv) { + mpp_err_f("failed to allocate platform service\n"); + return; + } + + srv_platform = srv; + + /* default value */ + cap = &srv->mpp_service_cmd_cap; + cap->support_cmd = 0; + cap->query_cmd = MPP_CMD_QUERY_BASE + 1; + cap->init_cmd = MPP_CMD_INIT_BASE + 1; + cap->send_cmd = MPP_CMD_SEND_BASE + 1; + cap->poll_cmd = MPP_CMD_POLL_BASE + 1; + cap->ctrl_cmd = MPP_CMD_CONTROL_BASE + 0; + + mpp_env_get_u32("mpp_debug", &mpp_debug, 0); + + /* read soc name */ + srv->soc_name = mpp_get_soc_name(); + srv->soc_info = mpp_get_soc_info(); + + if (srv->soc_info->soc_type == ROCKCHIP_SOC_AUTO) + mpp_log("can not found match soc name: %s\n", srv->soc_name); + + srv->ioctl_version = IOCTL_VCODEC_SERVICE; + if (mpp_get_mpp_service_name()) { + srv->ioctl_version = IOCTL_MPP_SERVICE_V1; + check_mpp_service_cap(&srv->vcodec_type, srv->hw_ids, cap); + mpp_dbg_platform("vcodec_type from kernel 0x%08x, vs from soc info 0x%08x\n", + srv->vcodec_type, srv->soc_info->vcodec_type); + } + srv->kernel_version = check_kernel_version(); + if (!srv->vcodec_type) { + srv->vcodec_type = srv->soc_info->vcodec_type; + } else { + // Compare kernel result with soc infomation. + rk_u32 diff_type = srv->vcodec_type ^ srv->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 (srv->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) + srv->vcodec_type &= ~mask; + } + } + } + + mpp_dbg_platform("vcode_type 0x%08x\n", srv->vcodec_type); + } + + return; +} + +static void mpp_plat_srv_deinit() +{ + MPP_FREE(srv_platform); +} + +MppIoctlVersion mpp_get_ioctl_version(void) +{ + MppPlatformService *srv = get_srv_platform(); + MppIoctlVersion ver = IOCTL_MPP_SERVICE_V1; + + if (srv) + ver = srv->ioctl_version; + + return ver; +} + +MppKernelVersion mpp_get_kernel_version(void) +{ + MppPlatformService *srv = get_srv_platform(); + MppKernelVersion ver = KERNEL_UNKNOWN; + + if (srv) + ver = srv->kernel_version; + + return ver; +} + +rk_u32 mpp_get_2d_hw_flag(void) +{ + rk_u32 flag = 0; + + if (!access("/dev/rga", F_OK)) + flag |= HAVE_RGA; + + if (!access("/dev/iep", F_OK)) + flag |= HAVE_IEP; + + return flag; +} + +const MppServiceCmdCap *mpp_get_mpp_service_cmd_cap(void) +{ + MppPlatformService *srv = get_srv_platform(); + const MppServiceCmdCap *cap = NULL; + + if (srv) + cap = &srv->mpp_service_cmd_cap; + + return cap; +} + +rk_u32 mpp_get_client_hw_id(rk_s32 client_type) +{ + MppPlatformService *srv = get_srv_platform(); + rk_u32 hw_id = 0; + + if (srv && srv->vcodec_type & (1 << client_type)) + hw_id = srv->hw_ids[client_type]; + + return hw_id; +} + +rk_u32 mpp_get_vcodec_type(void) +{ + MppPlatformService *srv = get_srv_platform(); + static rk_u32 vcodec_type = 0; + + if (vcodec_type) + return vcodec_type; + + if (srv) + vcodec_type = srv->vcodec_type; + + return vcodec_type; +} + +MPP_SINGLETON(MPP_SGLN_PLATFORM, mpp_platform, mpp_plat_srv_init, mpp_plat_srv_deinit); diff --git a/osal/mpp_platform.cpp b/osal/mpp_platform.cpp deleted file mode 100644 index 050bc2c6..00000000 --- a/osal/mpp_platform.cpp +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright 2015 Rockchip Electronics Co. LTD - * - * 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 MODULE_TAG "mpp_platform" - -#include - -#include "mpp_env.h" -#include "mpp_debug.h" -#include "mpp_common.h" -#include "mpp_platform.h" -#include "mpp_service.h" - -static MppKernelVersion check_kernel_version(void) -{ - static const char *kernel_version_path = "/proc/version"; - MppKernelVersion version = KERNEL_UNKNOWN; - FILE *fp = NULL; - char buf[32]; - - if (access(kernel_version_path, F_OK | R_OK)) - return version; - - fp = fopen(kernel_version_path, "rb"); - if (fp) { - size_t len = fread(buf, 1, sizeof(buf) - 1, fp); - char *pos = NULL; - - buf[len] = '\0'; - pos = strstr(buf, "Linux version "); - if (pos) { - RK_S32 major = 0; - RK_S32 minor = 0; - RK_S32 last = 0; - RK_S32 count = 0; - - pos += 14; - count = sscanf(pos, "%d.%d.%d ", &major, &minor, &last); - if (count >= 2 && major > 0 && minor > 0) { - switch (major) { - case 3: { - version = KERNEL_3_10; - } break; - case 4: { - version = KERNEL_4_4; - if (minor >= 19) - version = KERNEL_4_19; - } break; - case 5: { - version = KERNEL_5_10; - } break; - default: break; - } - } - } - fclose(fp); - } - return version; -} - -class MppPlatformService -{ -private: - // avoid any unwanted function - MppPlatformService(); - ~MppPlatformService() {}; - MppPlatformService(const MppPlatformService &); - MppPlatformService &operator=(const MppPlatformService &); - - MppIoctlVersion ioctl_version; - MppKernelVersion kernel_version; - RK_U32 vcodec_type; - RK_U32 hw_ids[32]; - MppServiceCmdCap mpp_service_cmd_cap; - const MppSocInfo *soc_info; - const char *soc_name; - -public: - static MppPlatformService *get_instance() { - static MppPlatformService instance; - return &instance; - } - - MppIoctlVersion get_ioctl_version(void) { return ioctl_version; }; - MppKernelVersion get_kernel_version(void) { return kernel_version; }; - const char *get_soc_name() { return soc_name; }; - MppServiceCmdCap *get_mpp_service_cmd_cap() { return &mpp_service_cmd_cap; }; - RK_U32 get_hw_id(RK_S32 client_type); - RK_U32 get_vcodec_type(void) { return vcodec_type; }; -}; - -MppPlatformService::MppPlatformService() - : ioctl_version(IOCTL_MPP_SERVICE_V1), - kernel_version(KERNEL_UNKNOWN), - vcodec_type(0), - soc_info(NULL), - soc_name(NULL) -{ - /* judge vdpu support version */ - MppServiceCmdCap *cap = &mpp_service_cmd_cap; - - /* default value */ - cap->support_cmd = 0; - cap->query_cmd = MPP_CMD_QUERY_BASE + 1; - cap->init_cmd = MPP_CMD_INIT_BASE + 1; - cap->send_cmd = MPP_CMD_SEND_BASE + 1; - cap->poll_cmd = MPP_CMD_POLL_BASE + 1; - cap->ctrl_cmd = MPP_CMD_CONTROL_BASE + 0; - - mpp_env_get_u32("mpp_debug", &mpp_debug, 0); - - /* read soc name */ - soc_name = mpp_get_soc_name(); - soc_info = mpp_get_soc_info(); - - if (soc_info->soc_type == ROCKCHIP_SOC_AUTO) - mpp_log("can not found match soc name: %s\n", soc_name); - - ioctl_version = IOCTL_VCODEC_SERVICE; - 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) { - 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) -{ - RK_U32 hw_id = 0; - - if (vcodec_type & (1 << client_type)) - hw_id = hw_ids[client_type]; - - return hw_id; -} - -MppIoctlVersion mpp_get_ioctl_version(void) -{ - return MppPlatformService::get_instance()->get_ioctl_version(); -} - -MppKernelVersion mpp_get_kernel_version(void) -{ - return MppPlatformService::get_instance()->get_kernel_version(); -} - -RK_U32 mpp_get_2d_hw_flag(void) -{ - RK_U32 flag = 0; - - if (!access("/dev/rga", F_OK)) - flag |= HAVE_RGA; - - if (!access("/dev/iep", F_OK)) - flag |= HAVE_IEP; - - return flag; -} - -const MppServiceCmdCap *mpp_get_mpp_service_cmd_cap(void) -{ - return MppPlatformService::get_instance()->get_mpp_service_cmd_cap(); -} - -RK_U32 mpp_get_client_hw_id(RK_S32 client_type) -{ - return MppPlatformService::get_instance()->get_hw_id(client_type); -} - -RK_U32 mpp_get_vcodec_type(void) -{ - static RK_U32 vcodec_type = 0; - - if (!vcodec_type) - vcodec_type = MppPlatformService::get_instance()->get_vcodec_type(); - - return vcodec_type; -} diff --git a/osal/test/mpp_platform_test.c b/osal/test/mpp_platform_test.c index e3c9f19d..9c1d95a8 100644 --- a/osal/test/mpp_platform_test.c +++ b/osal/test/mpp_platform_test.c @@ -1,17 +1,6 @@ +/* SPDX-License-Identifier: Apache-2.0 OR MIT */ /* - * Copyright 2015 Rockchip Electronics Co. LTD - * - * 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. + * Copyright (c) 2015 Rockchip Electronics Co., Ltd. */ #define MODULE_TAG "mpp_plat_test" @@ -33,6 +22,7 @@ int main() kernel_version == KERNEL_4_4 ? "4.4" : kernel_version == KERNEL_4_19 ? "4.19" : kernel_version == KERNEL_5_10 ? "5.10" : + kernel_version == KERNEL_6_1 ? "6.1" : NULL); mpp_log("ioctl version: %s\n", ioctl_version == IOCTL_VCODEC_SERVICE ? "vcodec_service" :