summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi10
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts10
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts10
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi10
-rw-r--r--drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h4
5 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi
index 09618ac3678b..4f430db11414 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi
@@ -113,7 +113,7 @@
};
encoder_boot: encoder_boot@0x86000000 {
no-map;
- reg = <0 0x86000000 0 0x2000000>;
+ reg = <0 0x86000000 0 0x200000>;
};
rpmsg_reserved: rpmsg@0x90000000 {
no-map;
@@ -125,7 +125,7 @@
};
encoder_rpc: encoder_rpc@0x91400000 {
no-map;
- reg = <0 0x91400000 0 0x1000000>;
+ reg = <0 0x91400000 0 0x100000>;
};
dsp_reserved: dsp@0x92400000 {
no-map;
@@ -3347,9 +3347,9 @@
compatible = "nxp,imx8qm-b0-vpuenc", "nxp,imx8qxp-b0-vpuenc";
boot-region = <&encoder_boot>;
rpc-region = <&encoder_rpc>;
- fw-buf-size = <0x1000000>;
- rpc-buf-size = <0x500000>;
- print-buf-size = <0x300000>;
+ fw-buf-size = <0x200000>;
+ rpc-buf-size = <0x80000>;
+ print-buf-size = <0x80000>;
reg = <0x0 0x2d000000 0x0 0x1000000>;
reg-names = "vpu_regs";
power-domains = <&pd_vpu_enc>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts
index fe2a6499dc6f..dbf611be79f3 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts
@@ -99,7 +99,7 @@
};
encoder_boot: encoder_boot@0x86000000 {
no-map;
- reg = <0 0x86000000 0 0x2000000>;
+ reg = <0 0x86000000 0 0x400000>;
};
/*
* CM40 rpmsg memory is still for Dom0, the domu.cfg
@@ -116,7 +116,7 @@
};
encoder_rpc: encoder_rpc@0x91400000 {
no-map;
- reg = <0 0x91400000 0 0x1000000>;
+ reg = <0 0x91400000 0 0x200000>;
};
decoder_str: str@0x94400000 {
@@ -234,9 +234,9 @@
compatible = "nxp,imx8qm-b0-vpuenc", "nxp,imx8qxp-b0-vpuenc";
boot-region = <&encoder_boot>;
rpc-region = <&encoder_rpc>;
- fw-buf-size = <0x1000000 0x1000000>;
- rpc-buf-size = <0x500000 0x500000>;
- print-buf-size = <0x300000 0x300000>;
+ fw-buf-size = <0x200000 0x200000>;
+ rpc-buf-size = <0x80000 0x80000>;
+ print-buf-size = <0x80000 0x80000>;
reg = <0x0 0x2d000000 0x0 0x1000000>;
reg-names = "vpu_regs";
power-domains = <&pd_vpu_enc>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts
index b0dc5b3cef1a..b9aab18e9c5d 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts
@@ -99,7 +99,7 @@
};
encoder_boot: encoder_boot@0x86000000 {
no-map;
- reg = <0 0x86000000 0 0x2000000>;
+ reg = <0 0x86000000 0 0x400000>;
};
/*
* CM40 rpmsg memory is still for Dom0, the domu.cfg
@@ -116,7 +116,7 @@
};
encoder_rpc: encoder_rpc@0x91400000 {
no-map;
- reg = <0 0x91400000 0 0x1000000>;
+ reg = <0 0x91400000 0 0x200000>;
};
dsp_reserved: dsp@0x92400000 {
@@ -286,9 +286,9 @@
compatible = "nxp,imx8qm-b0-vpuenc", "nxp,imx8qxp-b0-vpuenc";
boot-region = <&encoder_boot>;
rpc-region = <&encoder_rpc>;
- fw-buf-size = <0x1000000 0x1000000>;
- rpc-buf-size = <0x500000 0x500000>;
- print-buf-size = <0x300000 0x300000>;
+ fw-buf-size = <0x200000 0x200000>;
+ rpc-buf-size = <0x80000 0x80000>;
+ print-buf-size = <0x80000 0x80000>;
reg = <0x0 0x2d000000 0x0 0x1000000>;
reg-names = "vpu_regs";
power-domains = <&pd_vpu_enc>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
index a61aecb1a77e..65f57f7c4b6f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
@@ -90,7 +90,7 @@
};
encoder_boot: encoder_boot@0x86000000 {
no-map;
- reg = <0 0x86000000 0 0x2000000>;
+ reg = <0 0x86000000 0 0x400000>;
};
rpmsg_reserved: rpmsg@0x90000000 {
no-map;
@@ -103,7 +103,7 @@
};
encoder_rpc: encoder_rpc@0x91400000 {
no-map;
- reg = <0 0x91400000 0 0x1000000>;
+ reg = <0 0x91400000 0 0x200000>;
};
dsp_reserved: dsp@0x92400000 {
no-map;
@@ -197,9 +197,9 @@
compatible = "nxp,imx8qm-b0-vpuenc", "nxp,imx8qxp-b0-vpuenc";
boot-region = <&encoder_boot>;
rpc-region = <&encoder_rpc>;
- fw-buf-size = <0x1000000 0x1000000>;
- rpc-buf-size = <0x500000 0x500000>;
- print-buf-size = <0x300000 0x300000>;
+ fw-buf-size = <0x200000 0x200000>;
+ rpc-buf-size = <0x80000 0x80000>;
+ print-buf-size = <0x80000 0x80000>;
reg = <0x0 0x2d000000 0x0 0x1000000>;
reg-names = "vpu_regs";
power-domains = <&pd_vpu_enc>;
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h b/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h
index 43b1c92330a5..66a0abe802e2 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h
+++ b/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h
@@ -52,9 +52,9 @@ extern unsigned int vpu_dbg_level_encoder;
#define M0_BOOT_SIZE_DEFAULT 0x1000000
#define M0_BOOT_SIZE_MIN 0x100000
#define RPC_SIZE_DEFAULT 0x100000
-#define RPC_SIZE_MIN 0x100000
+#define RPC_SIZE_MIN 0x20000
#define PRINT_SIZE_DEFAULT 0x200000
-#define PRINT_SIZE_MIN 0x200000
+#define PRINT_SIZE_MIN 0x20000
#define MEM_SIZE 0x2800000
#define YUV_SIZE 0x4000000
#define STREAM_SIZE 0x300000