From patchwork Thu Dec 1 09:03:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 9455609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF1DD60585 for ; Thu, 1 Dec 2016 09:05:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4EE328454 for ; Thu, 1 Dec 2016 09:05:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B74CE28489; Thu, 1 Dec 2016 09:05:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3395428454 for ; Thu, 1 Dec 2016 09:05:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932764AbcLAJF2 (ORCPT ); Thu, 1 Dec 2016 04:05:28 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:33041 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758243AbcLAJEo (ORCPT ); Thu, 1 Dec 2016 04:04:44 -0500 Received: by mail-wm0-f54.google.com with SMTP id c184so58682241wmd.0 for ; Thu, 01 Dec 2016 01:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OyErWHPxHIf7EXUeDUq3ymXz5Cq82iQlhZEJ9ME4qQE=; b=VTvZhztS0VBrk9VYWGCSjY4Z4hQOa1VNO14nEvQknntNfPJ/IZsC3z9BBdMCCgNWwx urs1nUmKzY10GYs5RD1rcfs9+NMjL9SVxkeLnNMKENuIceVas8YkAJNRRWBrsJyYLxqv 0KQlkEuXOzk7RBF1BBZDioOcDmR0hbE3AvhTs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OyErWHPxHIf7EXUeDUq3ymXz5Cq82iQlhZEJ9ME4qQE=; b=h+iirNCw9buQSCCJPMFhxX64SiMzv/Gfxs65R6/z0evgJGwJOI+6sAXpaZclKTR9nM 3p4uqrIuDJXVDfWEH+Hbffn5Y/lZLVCnVuSU7LcTCI8w3H1AFWFXCQxU5IFezHkcllMM uVv2fL8O2O0bIpkvVLzS/xeN5VtduaS/LBBfzpOH98IS/HJRLsb2XOmV57SSWWy4fhr6 +2ooFybA57fATCejQ8BP2UPwWugdgGTrQq5alx+IXCftNaocX95IGTNCbVdfjdcCHQ5w DFp4Ffx/Y1mKp9k54opATZVs1Of/FWc1YJ9iv8EmcMeE6VBPnZyddMUUG4J45/DMQ9la wR2g== X-Gm-Message-State: AKaTC00ReW4wqDCPKsZwCwNcxmL7y2/QvYMEN0oQohLrTpz9FouwJRlTI6u3l3XUKzcqfTlp X-Received: by 10.28.25.134 with SMTP id 128mr30227930wmz.37.1480583070329; Thu, 01 Dec 2016 01:04:30 -0800 (PST) Received: from mms-0440.wifi.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id w8sm12001881wmw.4.2016.12.01.01.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 01:04:29 -0800 (PST) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: Andy Gross , Bjorn Andersson , Stephen Boyd , Srinivas Kandagatla , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov Subject: [PATCH v4 9/9] media: venus: enable building of Venus video driver Date: Thu, 1 Dec 2016 11:03:21 +0200 Message-Id: <1480583001-32236-10-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480583001-32236-1-git-send-email-stanimir.varbanov@linaro.org> References: <1480583001-32236-1-git-send-email-stanimir.varbanov@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds Venus driver Makefile and changes v4l2 platform Makefile/Kconfig in order to enable building of the driver. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/Kconfig | 13 +++++++++++++ drivers/media/platform/Makefile | 2 ++ drivers/media/platform/qcom/venus/Makefile | 14 ++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 drivers/media/platform/qcom/venus/Makefile diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d944421e392d..2fc81dcbdb1f 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -379,6 +379,19 @@ config VIDEO_TI_VPE_DEBUG ---help--- Enable debug messages on VPE driver. +config VIDEO_QCOM_VENUS + tristate "Qualcomm Venus V4L2 encoder/decoder driver" + depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA + depends on (ARCH_QCOM && OF) || COMPILE_TEST + depends on (IOMMU_DMA && QCOM_VENUS_PIL) || COMPILE_TEST + select VIDEOBUF2_DMA_SG + select V4L2_MEM2MEM_DEV + ---help--- + This is a V4L2 driver for Qualcomm Venus video accelerator + hardware. It accelerates encoding and decoding operations + on various Qualcomm SoCs. + To compile this driver as a module choose m here. + endif # V4L_MEM2MEM_DRIVERS # TI VIDEO PORT Helper Modules diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 5b3cb271d2b8..d88a4e1eb850 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -69,3 +69,5 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec/ obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp/ + +obj-$(CONFIG_VIDEO_QCOM_VENUS) += qcom/venus/ diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile new file mode 100644 index 000000000000..8c4ef27e30fe --- /dev/null +++ b/drivers/media/platform/qcom/venus/Makefile @@ -0,0 +1,14 @@ +# Makefile for Qualcomm Venus driver + +venus-objs += core.o \ + helpers.o \ + vdec.o \ + vdec_ctrls.o \ + venc.o \ + venc_ctrls.o \ + hfi_venus.o \ + hfi_msgs.o \ + hfi_cmds.o \ + hfi.o \ + +obj-$(CONFIG_VIDEO_QCOM_VENUS) += venus.o