From patchwork Fri Oct 12 10:53:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10638455 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 1366C5CAF for ; Fri, 12 Oct 2018 10:53:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02A9A2BB49 for ; Fri, 12 Oct 2018 10:53:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB1162BB50; Fri, 12 Oct 2018 10:53:55 +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 8D8FA2BB49 for ; Fri, 12 Oct 2018 10:53:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728009AbeJLSZp (ORCPT ); Fri, 12 Oct 2018 14:25:45 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:52642 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728086AbeJLSZp (ORCPT ); Fri, 12 Oct 2018 14:25:45 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181012105353euoutp02ad6a33ac1de7db438b8bfe3141ff94e2~c1w9TNtB60655906559euoutp02j; Fri, 12 Oct 2018 10:53:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181012105353euoutp02ad6a33ac1de7db438b8bfe3141ff94e2~c1w9TNtB60655906559euoutp02j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1539341633; bh=6FfLQVYPA7FgllgLKoufUe1LMqBEHtwuy0WfGpkiDRA=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=uainuw0SBm/p/ezfPFpJoMdT8O1VDzZddca48VSIr/rUi/G49Zex2cJVpCvBW/w8e v+4KX3oNpUfxj9kzSlEtiv3Amn8REAt7XHCXUx7eyJNqOzhfEJxVtPx4AyR9r+2HBw LroF07iDnOi2g7H336yMDZZZS0NtsLbpjRJrknso= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181012105352eucas1p2b4e8abef5e540030a92319d896f6fcbb~c1w8fHYEa0376803768eucas1p2_; Fri, 12 Oct 2018 10:53:52 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 24.A0.04294.04D70CB5; Fri, 12 Oct 2018 11:53:52 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181012105351eucas1p17eae01902839c7687260080feb21ef60~c1w7qb4LL1269412694eucas1p1Q; Fri, 12 Oct 2018 10:53:51 +0000 (GMT) X-AuditID: cbfec7f4-835ff700000010c6-49-5bc07d40f1b2 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 23.DA.04284.F3D70CB5; Fri, 12 Oct 2018 11:53:51 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PGH00F8SFLQDI70@eusync3.samsung.com>; Fri, 12 Oct 2018 11:53:51 +0100 (BST) 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: Fri, 12 Oct 2018 12:53:42 +0200 Message-id: <20181012105346.3754-3-a.hajda@samsung.com> X-Mailer: git-send-email 2.18.0 In-reply-to: <20181012105346.3754-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87oOtQeiDT584LS4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg yjj4/xpzQQt/RcvckywNjB28XYycHBICJhKdL14xdzFycQgJrGCU2N7wkBHC+cwoMfHVbCaY qh+LLrBBJJYxSqxb2gPV8p9RYsfsnYwgVWwCmhJ/N99kA7FFBJQlVu1rZwcpYha4xCjx+mQ3 UBEHh7CAv8SaA7ogNSwCqhKT1n9nBbF5Bcwlnl2czgyxTV7i4fF2sJmcAhYSy+4dZAGZIyHw kVVicecpRogiF4lZBxpZIWxhiVfHt7BD2DISnR0Hoc6ul2iaeYUZormDUeLE4uVsEAlricPH L4I1MwvwSUzaBrKZAyjOK9HRJgRhekj0PHWEeLKbUWLNqfksExglFzAyrGIUTy0tzk1PLTbK Sy3XK07MLS7NS9dLzs/dxAiMsdP/jn/ZwbjrT9IhRgEORiUe3gX9+6OFWBPLiitzDzFKcDAr ifAuyDoQLcSbklhZlVqUH19UmpNafIhRmoNFSZx32byN0UIC6YklqdmpqQWpRTBZJg5OqQbG FRWtf2Y7lqqpi869e+DE+oncWh9OhsdkZv5z223L4DPDozMvd4dl8MStIl+6a7Y/PrL9tsrG gNmnHoTt3HFzytVJLHvfL1+ypFVrY1Vy1jLZv5tP76lfV9zw5XrdzJj3NwrjL/5qesfOYd55 OnLqWc79bQYznFb5zj204lRdwJTeRZqmP2VXuCqxFGckGmoxFxUnAgAPe5QtrQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7r2tQeiDX4/1bC4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg yjj4/xpzQQt/RcvckywNjB28XYycHBICJhI/Fl1gA7GFBJYwSix+KNfFyAVkNzJJTLzziAkk wSagKfF3802wIhEBZYlV+9rZQYqYBa4wSrR/6wJyODiEBXwllj63BqlhEVCVmLT+OyuIzStg LvHs4nRmiGXyEg+PtzOC2JwCFhLL7h1kgVhsLnFw3mWWCYw8CxgZVjGKpJYW56bnFhvqFSfm Fpfmpesl5+duYgQGx7ZjPzfvYLy0MfgQowAHoxIP74+J+6OFWBPLiitzDzFKcDArifAuyDoQ LcSbklhZlVqUH19UmpNafIhRmoNFSZz3vEFllJBAemJJanZqakFqEUyWiYNTqoGRQ0Yif/fZ R+x7S+5pb73yMt16z1Q//zVpQfcWJWmuNAhhq5zOHad5UMfp0ae1p6yf+S23ul318l6sHd+z 3fUHdrsF/2CctyY+aoXulWlnONZ8Y3gz2WvyTY8pwuvTPzRLZ2z0bP/arME2zbRAXiVN+37M Sv6w2XFRncttJy+N1TThuXLYcTavEktxRqKhFnNRcSIAw72tNgoCAAA= X-CMS-MailID: 20181012105351eucas1p17eae01902839c7687260080feb21ef60 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181012105351eucas1p17eae01902839c7687260080feb21ef60 References: <20181012105346.3754-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 797d9ee5f15a..c9e9c6647903 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