From patchwork Sun Dec 15 18:07:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11293117 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D66413B6 for ; Sun, 15 Dec 2019 18:09:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEC102467E for ; Sun, 15 Dec 2019 18:09:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U8eKiJD7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726512AbfLOSJb (ORCPT ); Sun, 15 Dec 2019 13:09:31 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:42784 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726219AbfLOSJa (ORCPT ); Sun, 15 Dec 2019 13:09:30 -0500 Received: by mail-lj1-f196.google.com with SMTP id e28so4207303ljo.9; Sun, 15 Dec 2019 10:09:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hl/e7Xx4KZbxmi+G3Avli8jOk/vDtWO+9+LzOqRAwkA=; b=U8eKiJD7GI8YkXj0LqPLUKSt5Si2KlyhD1RnPwQIPw26jzGodMon42i/9cVB9Ae6oY 8f7KQSB3I6wzl667PP32vTf6COJXl1q20fBUo/CZaypaKUzktB82cJlkIxRTTkk2BuOS G2ATID9TVIlrT3vshUwnJ3nD9JeJbxaeR+9JHM1UYcBw+y/hBlWjE/bjCjzFIA9m3HPa xp/h8YkocVgo0pRyYzjylHyATjru2FU/62RthGFKvWHeBoIV+bNV+pvesBFfNFD3qSHd vmVgGhfHpr4RLpOewcYabliKHdhoDs8NfmxsZ7Vich9W5g24mfNSs6hWFRvtUZiTFIni 6c7A== 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:mime-version:content-transfer-encoding; bh=hl/e7Xx4KZbxmi+G3Avli8jOk/vDtWO+9+LzOqRAwkA=; b=QcJTfLyXcDBXdqmlJa54K/Os3SYJDWC8lcWthaFtF7+nE1DhuKB6B0IGIDHbVGKWbD AsVpYkCAkPpAKuuKfT6Y2SnbnBco9zf2wX2ljQd6xU7bNMna1HHfYIisEF6b3AUrA8FF LxhOwidkxvRH4spmpvioKLgGXQy7Atx2iVmTp3jmMUimAPhv1rkCPHUv2TK9Vg/1Sfp4 sIaVsu8H3u1B/HFHWQRXF9/ai80ybJLN0u7uzAeU0nrdKj3462F+VFP5YZa5joTUKxjN kdPmGOs834dF0XCRr/8G8cvc355A3IFdnUNoSPaK50oJES3NcxeGZMGqGX69FwTHwF12 G0EQ== X-Gm-Message-State: APjAAAUXQ9oDN10syGI57mdsoqV/dWrRz/sdN/ZmnJd/BdARf+JrwFJn 1SXf0mLWD+z+IQk/xfnSIF0= X-Google-Smtp-Source: APXvYqwCaChD81jN2RDNw/uKHzTKvFtTZTfMnsqbR67SuVkrf2vyYHzwu7cfXxnYeD4RFfiHxKWDCg== X-Received: by 2002:a2e:824a:: with SMTP id j10mr17279552ljh.209.1576433368435; Sun, 15 Dec 2019 10:09:28 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id t27sm8871875ljd.26.2019.12.15.10.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 10:09:27 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/3] media: staging: tegra-vde: Select IOVA unconditionally in Kconfig Date: Sun, 15 Dec 2019 21:07:50 +0300 Message-Id: <20191215180752.5408-2-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191215180752.5408-1-digetx@gmail.com> References: <20191215180752.5408-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There were several reports of building failures due to IOVA being selected inconsistently by different drivers. All drivers that are using IOVA API should select it unconditionally in order to avoid the compilation problems, tegra-vde is one of those drivers. Link: https://patchwork.kernel.org/patch/11057831/ Signed-off-by: Dmitry Osipenko --- drivers/staging/media/tegra-vde/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/tegra-vde/Kconfig b/drivers/staging/media/tegra-vde/Kconfig index ba49ea50b8c0..0dc78afd09e0 100644 --- a/drivers/staging/media/tegra-vde/Kconfig +++ b/drivers/staging/media/tegra-vde/Kconfig @@ -3,7 +3,7 @@ config TEGRA_VDE tristate "NVIDIA Tegra Video Decoder Engine driver" depends on ARCH_TEGRA || COMPILE_TEST select DMA_SHARED_BUFFER - select IOMMU_IOVA if (IOMMU_SUPPORT || COMPILE_TEST) + select IOMMU_IOVA select SRAM help Say Y here to enable support for the NVIDIA Tegra video decoder From patchwork Sun Dec 15 18:07:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11293119 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A59A6C1 for ; Sun, 15 Dec 2019 18:09:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1851E24681 for ; Sun, 15 Dec 2019 18:09:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HFvqKztJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726676AbfLOSJk (ORCPT ); Sun, 15 Dec 2019 13:09:40 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:34560 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbfLOSJb (ORCPT ); Sun, 15 Dec 2019 13:09:31 -0500 Received: by mail-lj1-f194.google.com with SMTP id m6so4251861ljc.1; Sun, 15 Dec 2019 10:09:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VmZvyuWnyMjyosw1/AewOLN2QYH7RAhMY4SlplBdnDg=; b=HFvqKztJi0rfRz/czGQzT3+JIaAebM6DOwS2JXt1X1H4Q2cn5kVkkMylVSd3gB2BUP nqFOSB/7qgNP5EDrQSb+Da99cxuh/WgBbgKPz9aF0d5RVQU3LrAQ9ZX5aZzkngxaR/g8 MA1AlbC55gEFVk4zQye7K+QFCmT528fAsO3jDf1LxmSzQPys2NHsxt6f1J2sQEZSpv8A ypPgr6jYlFVPvnVorGLcln0EoOEUPGv60xRg+TidEwWyfGwdZW+MBwAQWJOqhjcdSsAq 3lqlGy0JvZKqpchTurnZhYhXHzXOfEG6Yh1+9KGPLTb3NaGikdhefaaxFmv84X29Mffl ycXw== 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:mime-version:content-transfer-encoding; bh=VmZvyuWnyMjyosw1/AewOLN2QYH7RAhMY4SlplBdnDg=; b=NU5uYguz4uESeCjs2inXCf5/TXTrjXTBqc1hdy9521kEWf+ROVcsNitxtpPG79rMPE ViFE9zcUnhKqKRfQuU4nfBWO8ozKuiEtqOdyP4EVr6UrUD7g6Wp9h4GOdA84D7u/rQ66 PTw5F+IzcgCxa2wJWnsyphRaU6uvSP1WLPjmreoRNJt9S1G8OhLreiVV6WZKwlxDaUq+ 9Xw7RALs77/zYl79/Nd5R0A40Xmg7dWUNCT5XC1MrTNWpBi1gLfLGxrI+9zkQ+3rKD83 TjPqlLYiuwfZ2ct0Q5EAVluwSDZA5Bj98LJjGbY9kVohdRmV0t+sMQc2L74mWbl1yLKf fdAA== X-Gm-Message-State: APjAAAVp2bKAXfUdjAUMnaacbyBp0G3DXU8ydLmcwGsDpBolEMSNaVPt LktWh4ocMK1ipdD3aO1yO/w= X-Google-Smtp-Source: APXvYqysxGsK6/xpWY5BjP3RIq3vp7cdqPyr4DSYQnG/nA7yMy23kX+zxHuLmwh9De5Qpjc4z7HDHQ== X-Received: by 2002:a2e:3e08:: with SMTP id l8mr17187483lja.236.1576433369351; Sun, 15 Dec 2019 10:09:29 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id t27sm8871875ljd.26.2019.12.15.10.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 10:09:28 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/3] media: staging: tegra-vde: Sort headers alphabetically Date: Sun, 15 Dec 2019 21:07:51 +0300 Message-Id: <20191215180752.5408-3-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191215180752.5408-1-digetx@gmail.com> References: <20191215180752.5408-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Keep the alphabetical order for consistency. Signed-off-by: Dmitry Osipenko --- drivers/staging/media/tegra-vde/vde.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/tegra-vde/vde.h b/drivers/staging/media/tegra-vde/vde.h index d369f1466bc7..5561291b0c88 100644 --- a/drivers/staging/media/tegra-vde/vde.h +++ b/drivers/staging/media/tegra-vde/vde.h @@ -10,11 +10,11 @@ #include #include +#include #include #include #include #include -#include struct clk; struct dma_buf; From patchwork Sun Dec 15 18:07:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11293115 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60ACE13B6 for ; Sun, 15 Dec 2019 18:09:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3469F2467E for ; Sun, 15 Dec 2019 18:09:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NvU27+/6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726560AbfLOSJe (ORCPT ); Sun, 15 Dec 2019 13:09:34 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:37514 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726232AbfLOSJc (ORCPT ); Sun, 15 Dec 2019 13:09:32 -0500 Received: by mail-lj1-f196.google.com with SMTP id u17so4239720lja.4; Sun, 15 Dec 2019 10:09:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9WCN+aSziwo6IVDHqcjdnKmAeOBt5CXMdSt189Rd6D8=; b=NvU27+/6GH5ISbMewOWteUW7hrpRQQAtdsOXkYGPdRcJMzfVUfEw5Qvv4pSR8Nfens pcYlNC6VHGDqlKTHper6l7cssY+stCu7cP+6HXIKzX3K3AyWjX1ru/O7D/eI0AhqMkcw Fsv60r6PHl8eMZ3opyM5/N5tJmPT43FM8PrwaaX0gMLmY6g4beVJ/3OKzw3LUSQlwg+S N0s01A4KYBa+ePvLpnxALuQgXXPY7EPo9aOEcGGU0EL0n9ip9loTzK2rin6bwyPJqBkB gVYqHltoi4Y8yEQCiWfe2Wt0gMc1g9VYGVVmXCreKSvrsnW9E7Aq3kCqi6bwr1Uo5+ro UdeA== 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:mime-version:content-transfer-encoding; bh=9WCN+aSziwo6IVDHqcjdnKmAeOBt5CXMdSt189Rd6D8=; b=fgt44hlZMQbAaweiesuO8yEZXONKHLKkLruzE1YHFz8y/EUVSp30wFvphFB0IYYqnY ISx2YC1g6XgYloNHVlInOCWeHl565SZ+u1vGCLtqCdg6Gj+fec87T851UfVtrwoFb2d1 mTptP9HaYJg290BMw30zwJaR9Yhe5wtofLjMWDj4V3KdoyIZtu1jslR8Ltk1BSPygVxH HWVJaYukZjgWXq+7Mq51XajonK3imx7ID5pGCe1x0Flzunkcet0HCZTY1bUsDYhcj7hN 2PkndZFZ9o7GPNdXDJltrQx8Mc66LW7azCtRpaM0SQdtxjTBgkW3b31XwEVtmczOjoOF IpKQ== X-Gm-Message-State: APjAAAVUexFEVSZ7vTMy5qlNYADUoBwxuJtS8nqzDDRKeU62gX8uSVrv qxUd2dQekueF93gLqfOF4Nw= X-Google-Smtp-Source: APXvYqwu7LBPUs+T1isRG4okSZnxU/3EOajXzKbM3dRn/PXp35FxayqGrK4SC7zwbFLNd/fYA2W4Og== X-Received: by 2002:a2e:3c1a:: with SMTP id j26mr16715116lja.79.1576433370285; Sun, 15 Dec 2019 10:09:30 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id t27sm8871875ljd.26.2019.12.15.10.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 10:09:29 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 3/3] media: staging: tegra-vde: Use __maybe_unused attribute instead of ifdef Date: Sun, 15 Dec 2019 21:07:52 +0300 Message-Id: <20191215180752.5408-4-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191215180752.5408-1-digetx@gmail.com> References: <20191215180752.5408-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Replace #ifdef with __maybe_unused attribute just to keep code cleaner a tad. Signed-off-by: Dmitry Osipenko --- drivers/staging/media/tegra-vde/vde.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c index 3466daddf663..e18fd48981da 100644 --- a/drivers/staging/media/tegra-vde/vde.c +++ b/drivers/staging/media/tegra-vde/vde.c @@ -1150,8 +1150,7 @@ static int tegra_vde_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int tegra_vde_pm_suspend(struct device *dev) +static __maybe_unused int tegra_vde_pm_suspend(struct device *dev) { struct tegra_vde *vde = dev_get_drvdata(dev); int err; @@ -1165,7 +1164,7 @@ static int tegra_vde_pm_suspend(struct device *dev) return 0; } -static int tegra_vde_pm_resume(struct device *dev) +static __maybe_unused int tegra_vde_pm_resume(struct device *dev) { struct tegra_vde *vde = dev_get_drvdata(dev); int err; @@ -1178,7 +1177,6 @@ static int tegra_vde_pm_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops tegra_vde_pm_ops = { SET_RUNTIME_PM_OPS(tegra_vde_runtime_suspend,