From patchwork Mon Mar 13 16:37:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 95271 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1250228qgd; Mon, 13 Mar 2017 09:41:00 -0700 (PDT) X-Received: by 10.99.101.197 with SMTP id z188mr38380635pgb.164.1489423259961; Mon, 13 Mar 2017 09:40:59 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b35si924964plh.80.2017.03.13.09.40.59; Mon, 13 Mar 2017 09:40:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754241AbdCMQkw (ORCPT + 4 others); Mon, 13 Mar 2017 12:40:52 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36015 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754176AbdCMQia (ORCPT ); Mon, 13 Mar 2017 12:38:30 -0400 Received: by mail-wm0-f49.google.com with SMTP id n11so44891255wma.1 for ; Mon, 13 Mar 2017 09:38:29 -0700 (PDT) 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=zAhoDGGKBZr+KU63KYNozHVssz4apJ86AodvDUJi8Bw=; b=P/i9Co+yngfljw/2PHr++8vmluDjzJsGt+Q1Vpi9oa1+3KU7+/lD2J9S4NyKlSJb0J lL3sy+X5IVL58NZiPpSVZZLnU3A/LHrtL4gREobFsk/5CLpSXCpQc8cMnK8r76fqob/N VAjwkh9fMJ+JsW9x34FKmu7nCHVMrer0vPDgg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zAhoDGGKBZr+KU63KYNozHVssz4apJ86AodvDUJi8Bw=; b=hwYkVcHSHoZ4reovy9Lab/Qk1kiklryLjksYXa5JP1omVeAJTqfdA6F5zJJq2mbINS rBIHUfLDbXQYfHdg0BTwqW/QmjCcOXDqUshFEEI1IjBHEo08k5EjXSarz/CYCHA8i1NI wkBpiW3VAVgO+LC3u+ZhollwIdBHrh2Mf02x4l1LWAtS5S1vwHLpLe1qUHWmA8QS8Gsb GKwQy3E8yxY1RT+LzCE8lr2ZyHgo/y5pqMDs77m0H/HhWRfRbz0COgCozQjHpEFjzubs Y9Aqkk4eNaE63acHPCk0by5F6+QxTAILi3CA8FiM9d8LlqEQdOkKwYR9VfaHrUYShpmi 9mBQ== X-Gm-Message-State: AFeK/H1Y7QVxwk7f0G7567t0UMS1CmBjfKr7oed3LaBoFKvNZcJAwhl7JUCTSrcnAgyXZiyk X-Received: by 10.28.178.142 with SMTP id b136mr10485175wmf.57.1489423108334; Mon, 13 Mar 2017 09:38:28 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id f48sm25509075wrf.17.2017.03.13.09.38.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Mar 2017 09:38:27 -0700 (PDT) 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 v7 9/9] media: venus: enable building of Venus video driver Date: Mon, 13 Mar 2017 18:37:38 +0200 Message-Id: <1489423058-12492-10-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489423058-12492-1-git-send-email-stanimir.varbanov@linaro.org> References: <1489423058-12492-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 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 | 14 ++++++++++++++ drivers/media/platform/Makefile | 2 ++ drivers/media/platform/qcom/venus/Makefile | 11 +++++++++++ 3 files changed, 27 insertions(+) create mode 100644 drivers/media/platform/qcom/venus/Makefile -- 2.7.4 diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 53f6f12bff0d..8a6c3d664307 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -447,6 +447,20 @@ 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 + depends on IOMMU_DMA + select QCOM_MDT_LOADER + 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 8959f6e6692a..bd5cae68db8a 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -73,3 +73,5 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec/ obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp/ obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk-jpeg/ + +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..0fe9afb83697 --- /dev/null +++ b/drivers/media/platform/qcom/venus/Makefile @@ -0,0 +1,11 @@ +# Makefile for Qualcomm Venus driver + +venus-core-objs += core.o helpers.o firmware.o \ + hfi_venus.o hfi_msgs.o hfi_cmds.o hfi.o + +venus-dec-objs += vdec.o vdec_ctrls.o +venus-enc-objs += venc.o venc_ctrls.o + +obj-$(CONFIG_VIDEO_QCOM_VENUS) += venus-core.o +obj-$(CONFIG_VIDEO_QCOM_VENUS) += venus-dec.o +obj-$(CONFIG_VIDEO_QCOM_VENUS) += venus-enc.o