From 5a65d42ba7c10825e42888a67d0ee76832c77870 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E6=81=92=E6=98=8E?= Date: Thu, 17 May 2012 15:17:34 +0800 Subject: [PATCH] rk30: vpu_service: extend encoder buffer size for rk30 --- arch/arm/plat-rk/include/plat/vpu_service.h | 7 ++++++- arch/arm/plat-rk/vpu_service.c | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm/plat-rk/include/plat/vpu_service.h b/arch/arm/plat-rk/include/plat/vpu_service.h index 9162196880b7..523c5dd72134 100644 --- a/arch/arm/plat-rk/include/plat/vpu_service.h +++ b/arch/arm/plat-rk/include/plat/vpu_service.h @@ -39,8 +39,13 @@ #define VPU_REG_NUM_PP (41) // client type: decoder plus post-process£º101 registers, size 404B #define VPU_REG_NUM_DEC_PP (VPU_REG_NUM_DEC+VPU_REG_NUM_PP) -// client type: encoder only£º96 registers, size 384B +#if defined(CONFIG_ARCH_RK29) +// client type: encoder only: 96 registers, size 384B for rk29 #define VPU_REG_NUM_ENC (96) +#elif defined(CONFIG_ARCH_RK30) +// client type: encoder only: 164 registers, size 384B for rk30 +#define VPU_REG_NUM_ENC (164) +#endif typedef enum VPU_CLIENT_TYPE { VPU_ENC = 0x0, diff --git a/arch/arm/plat-rk/vpu_service.c b/arch/arm/plat-rk/vpu_service.c index b65230062001..f4c333f3fe6e 100644 --- a/arch/arm/plat-rk/vpu_service.c +++ b/arch/arm/plat-rk/vpu_service.c @@ -57,12 +57,21 @@ #define REG_NUM_DEC (60) #define REG_NUM_PP (41) +#if defined(CONFIG_ARCH_RK29) #define REG_NUM_ENC (96) +#elif defined(CONFIG_ARCH_RK30) +#define REG_NUM_ENC (164) +#endif #define REG_NUM_DEC_PP (REG_NUM_DEC+REG_NUM_PP) #define SIZE_REG(reg) ((reg)*4) #define DEC_IO_SIZE ((100 + 1) * 4) /* bytes */ +#if defined(CONFIG_ARCH_RK29) #define ENC_IO_SIZE (96 * 4) /* bytes */ +#elif defined(CONFIG_ARCH_RK30) +#define ENC_IO_SIZE (164 * 4) /* bytes */ +#endif +#define REG_NUM_DEC_PP (REG_NUM_DEC+REG_NUM_PP) static const u16 dec_hw_ids[] = { 0x8190, 0x8170, 0x9170, 0x9190, 0x6731 }; #if defined(CONFIG_ARCH_RK29) static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270 }; -- 2.34.1