From patchwork Tue Sep 25 08:23:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10613617 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D1781803 for ; Tue, 25 Sep 2018 08:23:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2193129A1C for ; Tue, 25 Sep 2018 08:23:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1628D29A43; Tue, 25 Sep 2018 08:23:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 9889E29A3E for ; Tue, 25 Sep 2018 08:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726031AbeIYO3m (ORCPT ); Tue, 25 Sep 2018 10:29:42 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:55654 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726392AbeIYO3m (ORCPT ); Tue, 25 Sep 2018 10:29:42 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180925082315euoutp0218420d650cc36ec212df34bef223d893~XlvlRgilQ0788707887euoutp02R for ; Tue, 25 Sep 2018 08:23:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180925082315euoutp0218420d650cc36ec212df34bef223d893~XlvlRgilQ0788707887euoutp02R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1537863795; bh=b2WUxzsnADL5pctIj4OAP4oSvq7AafV5FXZUxdvbIec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tTgH6x0M69HP++asxGs2H5m42vmPqLHptovpfU5NP7q7/VIir5CqKEV+0NfFzkt3y U+GAfsyL6pl6JWgPOW98wTqZHHvSCNhwVST0XxanfmvSS0RrMnVXwwGLptxU6Wnc62 1O7Fo8crI6vz3GJ0CUfUpPFX/DBFUwGh4AS+wK7k= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180925082314eucas1p232ccd6c033d38f92fb49638e2a9aaa34~Xlvkt91yC0497704977eucas1p2B; Tue, 25 Sep 2018 08:23:14 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id CC.C7.04294.270F9AB5; Tue, 25 Sep 2018 09:23:14 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20180925082313eucas1p1083f693e9e1bca5b921c9d3b26ffcac2~XlvjzWDNh0543005430eucas1p19; Tue, 25 Sep 2018 08:23:13 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20180925082313eusmtrp15ce120c1dc732475f57582cb91b6bb19~XlvjyMQC12406924069eusmtrp1V; Tue, 25 Sep 2018 08:23:13 +0000 (GMT) X-AuditID: cbfec7f4-84fff700000010c6-df-5ba9f0726670 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 31.D8.04284.170F9AB5; Tue, 25 Sep 2018 09:23:13 +0100 (BST) Received: from AMDC2768.DIGITAL.local (unknown [106.120.43.17]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20180925082313eusmtip14897eb573630b306bc57650bfd9b674b~XlvjaEdZ31347313473eusmtip1X; Tue, 25 Sep 2018 08:23:13 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 2/6] drm/exynos/iommu: remove DRM_EXYNOS_IOMMU Kconfig symbol Date: Tue, 25 Sep 2018 10:23:04 +0200 X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180925082308.1388-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87pFH1ZGG5w8Jm5xa905VouNM9az Wlz5+p7NYtL9CSwWM87vY7JYe+QuuwObx/3u40wefVtWMXp83iQXwBzFZZOSmpNZllqkb5fA lbFo0yOmghb+ii8vRBsYO3i7GDk5JARMJF7teMDSxcjFISSwglHi8oQTzBDOF0aJnd1noZzP jBJz771kg2nZuesxG0RiOaPEq82rEVqO7D/KCFLFJqAp8XfzTbAOEQFliVX72tlBipgFLjFK vD7ZDVTEwSEs4C+x5oAuSA2LgKrE77YrUBvkJR4ebwebwylgIXG54SojSK+EwG02iVfff7CC 9PIKlEls6a6CqHeR+L1iHyuELSzx6vgWdghbRuL05B4WCLteomnmFWaIOR2MEicWL4daZi1x +PhFsJnMQEev36UPEXaUuPynhxkkLCHAJ3HjrSBImBnInLRtOlSYV6KjTQiiWlHi/tmtzBC2 uMTSC1+hhntILP+9lgkSPN2MEvsnTGafwCg/C2HZAkbGVYziqaXFuempxUZ5qeV6xYm5xaV5 6XrJ+bmbGIFJ4PS/4192MO76k3SIUYCDUYmH1+Dlimgh1sSy4srcQ4wSHMxKIrxNuiujhXhT EiurUovy44tKc1KLDzFKc7AoifPyaaVFCwmkJ5akZqemFqQWwWSZODilGhj9vhso3M9avaL7 /pfvMXezyk/MOafnruZ+Kkmb7VREUIDP31xOlUh918O1oddaj4XklIXGaj+9p90kcv/7fEfh 9j4dHj+WH7yMfW9u37V1rlxaO/Hu3vj589WuPiqV+3Dj2Y11uvwT/93aIN//xfhS4K4GC/Y1 k6U/2vb31j78dp7xl/nVwDQlluKMREMt5qLiRABbh2mr/gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLLMWRmVeSWpSXmKPExsVy+t/xu7qFH1ZGG3T2qVncWneO1WLjjPWs Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEfp2RTll5akKmTkF5fY KkUbWhjpGVpa6BmZWOoZGpvHWhmZKunb2aSk5mSWpRbp2yXoZSza9IipoIW/4ssL0QbGDt4u Rk4OCQETiZ27HrN1MXJxCAksZZTY/3UGK0RCXGL3/LfMELawxJ9rXVBFnxgl+jbuBStiE9CU +Lv5JhuILSKgLLFqXzs7SBGzwDWgSes+sXQxcnAIC/hKLH1uDVLDIqAq8bvtClg9r4C5xL2e xVDL5CUeHm9nBLE5BSwkLjdcBbOFgGqO9F5gnsDIt4CRYRWjSGppcW56brGhXnFibnFpXrpe cn7uJkZgUG479nPzDsZLG4MPMQpwMCrx8N54tiJaiDWxrLgy9xCjBAezkghvk+7KaCHelMTK qtSi/Pii0pzU4kOMpkBHTWSWEk3OB0ZMXkm8oamhuYWlobmxubGZhZI473mDyighgfTEktTs 1NSC1CKYPiYOTqkGRoGv+hoCnudmCF5OOPUz7qreXqY/qssEBa2Wi58q6Nt/lCV5WbR41MSL +pMzzVb2nrd5Lrr+aPedP1ZXzhSH/A3jmCAZ9fLaq0yXcHE+c7PH51+li865rvL/+KzD7Wsn z1Z+dzqopDf8mOizL+4vJvn+fbxNmP1IwLW4jVGxNxPz3tx3nLnESEiJpTgj0VCLuag4EQCP ohdiYAIAAA== Message-Id: <20180925082313eucas1p1083f693e9e1bca5b921c9d3b26ffcac2~XlvjzWDNh0543005430eucas1p19@eucas1p1.samsung.com> X-CMS-MailID: 20180925082313eucas1p1083f693e9e1bca5b921c9d3b26ffcac2 X-Msg-Generator: CA X-RootMTR: 20180925082313eucas1p1083f693e9e1bca5b921c9d3b26ffcac2 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180925082313eucas1p1083f693e9e1bca5b921c9d3b26ffcac2 References: <20180925082308.1388-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP DRM_EXYNOS_IOMMU symbol is not configurable, it is always equal to EXYNOS_IOMMU. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/Kconfig | 5 ----- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_drm_iommu.h | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 208bc27be3cc..3691a140c950 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -10,11 +10,6 @@ config DRM_EXYNOS if DRM_EXYNOS -config DRM_EXYNOS_IOMMU - bool - depends on EXYNOS_IOMMU - default y - comment "CRTCs" config DRM_EXYNOS_FIMD diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile index 2ad146bbf4f5..ab763977ab28 100644 --- a/drivers/gpu/drm/exynos/Makefile +++ b/drivers/gpu/drm/exynos/Makefile @@ -7,7 +7,7 @@ exynosdrm-y := exynos_drm_drv.o exynos_drm_crtc.o exynos_drm_fb.o \ exynos_drm_gem.o exynos_drm_plane.o exynosdrm-$(CONFIG_DRM_FBDEV_EMULATION) += exynos_drm_fbdev.o -exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o +exynosdrm-$(CONFIG_EXYNOS_IOMMU) += exynos_drm_iommu.o exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD) += exynos_drm_fimd.o exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON) += exynos5433_drm_decon.o exynosdrm-$(CONFIG_DRM_EXYNOS7_DECON) += exynos7_drm_decon.o diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.h b/drivers/gpu/drm/exynos/exynos_drm_iommu.h index 87f6b5672e11..84f4e6d23bc4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.h +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.h @@ -15,7 +15,7 @@ #define EXYNOS_DEV_ADDR_START 0x20000000 #define EXYNOS_DEV_ADDR_SIZE 0x40000000 -#ifdef CONFIG_DRM_EXYNOS_IOMMU +#ifdef CONFIG_EXYNOS_IOMMU #if defined(CONFIG_ARM_DMA_USE_IOMMU) #include