From patchwork Mon Jul 17 08:56:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 9844301 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 9F91560392 for ; Mon, 17 Jul 2017 08:59:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9014123E64 for ; Mon, 17 Jul 2017 08:59:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8132F251F4; Mon, 17 Jul 2017 08:59:59 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable 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 10B4223E64 for ; Mon, 17 Jul 2017 08:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465AbdGQI7q (ORCPT ); Mon, 17 Jul 2017 04:59:46 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:32949 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340AbdGQI6q (ORCPT ); Mon, 17 Jul 2017 04:58:46 -0400 Received: by mail-wr0-f173.google.com with SMTP id a10so8115212wrd.0 for ; Mon, 17 Jul 2017 01:58:46 -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=YcM+BnKMPVyRBe1YTuZaMK13ZVTufTUYCGc+dKBUFcQ=; b=Ba/xBHyxVKwLhoT2D0k3KCXbEJEv3V3apJB/4TJezNvdz9SulYxGxCvFNW4SFCj3Fm VmR2nghDw8+qVTdAhAPHjfncEJYD0ecicSi0qreVU7Jjv33SYPpD6HIGRWzE3yq3AFI3 unNiqLluA4VLzAWaPsg0WjU5nVlyE5vAk6Id0= 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=YcM+BnKMPVyRBe1YTuZaMK13ZVTufTUYCGc+dKBUFcQ=; b=IOXKPC7SC8BJ+YnlZLrrppXqki911enCsaQs2Se2/JMoYoO50A1R2XSod+voLjiwkQ +LGYYyxa91RQEXDMzNVev6xy71kp0EZylpp0qmoUl/lKfCtOu4Hqne+dJ1w+IVAbv5pR YHysH1Nk77JMQiqIio6o6NZ2j1CD4aghJGLX7/yvURA6ltXKCHjFUSF7tqmrgevQffhy zygHqKOCm+hcn3MxsHMgLNuQ8S/C/SNl05ciP+nbuhYiuViaOT/faG5dxAViv/Q76xM6 qlJmukRPzOtaXVNNy8RGoYhXU4CSpe+C8iEc9jf0J/CMergKjThAsQ0MebyR/7uESk0K 2reg== X-Gm-Message-State: AIVw110kQB5k+rBfeUjUkMTRB0IzEon5nq+EZg190ZxIXA+8nI0/xFaW OS/CormgJ6ubwTRT X-Received: by 10.223.151.82 with SMTP id r76mr10124416wrb.6.1500281925557; Mon, 17 Jul 2017 01:58:45 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id q17sm11558700wmd.4.2017.07.17.01.58.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 01:58:45 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab Cc: Hans Verkuil , Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 3/4] venus: fix compile-test build on non-qcom ARM platform Date: Mon, 17 Jul 2017 11:56:49 +0300 Message-Id: <20170717085650.12185-4-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170717085650.12185-1-stanimir.varbanov@linaro.org> References: <20170717085650.12185-1-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 From: Arnd Bergmann If QCOM_MDT_LOADER is enabled, but ARCH_QCOM is not, we run into a build error: ERROR: "qcom_mdt_load" [drivers/media/platform/qcom/venus/venus-core.ko] undefined! ERROR: "qcom_mdt_get_size" [drivers/media/platform/qcom/venus/venus-core.ko] undefined! This changes the 'select' statement again, so we only try to enable those symbols when the drivers will actually get built, and explicitly test for QCOM_MDT_LOADER to be enabled before calling into it. Fixes: 76724b30f222 ("[media] media: venus: enable building with COMPILE_TEST") Signed-off-by: Arnd Bergmann Reviewed-by: Stanimir Varbanov --- drivers/media/platform/Kconfig | 4 ++-- drivers/media/platform/qcom/venus/firmware.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1313cd533436..fb1fa0b82077 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -475,8 +475,8 @@ config VIDEO_QCOM_VENUS tristate "Qualcomm Venus V4L2 encoder/decoder driver" depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST - select QCOM_MDT_LOADER if (ARM || ARM64) - select QCOM_SCM if (ARM || ARM64) + select QCOM_MDT_LOADER if ARCH_QCOM + select QCOM_SCM if ARCH_QCOM select VIDEOBUF2_DMA_SG select V4L2_MEM2MEM_DEV ---help--- diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index d6d9560c1c19..521d4b36c090 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -38,7 +38,7 @@ int venus_boot(struct device *dev, const char *fwname) void *mem_va; int ret; - if (!qcom_scm_is_available()) + if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || !qcom_scm_is_available()) return -EPROBE_DEFER; node = of_parse_phandle(dev->of_node, "memory-region", 0);