CHROMIUM: [media] rk3288-vpu: Require kernel mapping only for encoder output

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / rk3288-vpu / rk3288_vpu_common.h

diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h b/drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h
index a074e2c63d60a650e706d08bac712c9e379adfce..0082e2f57bfdada95e8fe95da3b25c646cc9e658 100644 (file)
--- a/drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h
+++ b/drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h
@@ -137,7 +137,10 @@ enum rk3288_vpu_state {
  * @pdev:              Pointer to VPU platform device.
  * @dev:               Pointer to device for convenient logging using
  *                     dev_ macros.
- * @alloc_ctx:         VB2 allocator context.
+ * @alloc_ctx:         VB2 allocator context
+ *                     (for allocations without kernel mapping).
+ * @alloc_ctx_vm:      VB2 allocator context
+ *                     (for allocations with kernel mapping).
  * @aclk_vcodec:       Handle of ACLK clock.
  * @hclk_vcodec:       Handle of HCLK clock.
  * @base:              Mapped address of VPU registers.
@@ -161,6 +164,7 @@ struct rk3288_vpu_dev {
        struct platform_device *pdev;
        struct device *dev;
        void *alloc_ctx;
+       void *alloc_ctx_vm;
        struct clk *aclk_vcodec;
        struct clk *hclk_vcodec;
        void __iomem *base;