From patchwork Thu Jan 16 06:27:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 23254 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7F78E202DA for ; Thu, 16 Jan 2014 06:32:16 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id gq1sf1068864obb.0 for ; Wed, 15 Jan 2014 22:32:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=i+R0IgUw1vq2Egb8+lJ+KhUZK2DJ2pnAE3uWFYKDRWU=; b=flAdU28CzGRZKbHBOxGcVZiswcd9OqAn3qV+Cs/YC8pVfFnU5dx8TEAswzL+/zC1L+ hpBU0aJf6wWsDEhXhHBngmkC2rHsif6imymjqhMW7oLK1H28n9h59MeZLO/O0PSc6XV4 zlNB/xQEbSI/tN9+LuXFsoqfgHZwIQR8x8tzJUK+OjiK9shzR8g1Xvf4UiWmsZxsWQkj ZY3aB1GCuNgb1c9ndXtjiAzCqkp9Hcl4ZkJ1ByuFEK4A6/Vn8b/9JlK+xTedRfmfZJcl xQQOnI5RRovIscC2knEFAl7By0Rr2hpS4Tp/ttX6Vrku1FDGj6SmutfHPKh0eiLslggL DYtA== X-Gm-Message-State: ALoCoQlDzrsNTtgkZf093JFRmb24KgdjnMiaYDnthLPNmDVhvmtQE8rApe31/FYr6nkSzjAolArb X-Received: by 10.182.230.168 with SMTP id sz8mr2570058obc.9.1389853935655; Wed, 15 Jan 2014 22:32:15 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.67 with SMTP id s3ls799908qeu.75.gmail; Wed, 15 Jan 2014 22:32:15 -0800 (PST) X-Received: by 10.52.165.210 with SMTP id za18mr4359817vdb.20.1389853935580; Wed, 15 Jan 2014 22:32:15 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id eh16si2855668vcb.18.2014.01.15.22.32.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 22:32:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id p5so793531vbn.2 for ; Wed, 15 Jan 2014 22:32:15 -0800 (PST) X-Received: by 10.52.245.42 with SMTP id xl10mr4857vdc.35.1389853935241; Wed, 15 Jan 2014 22:32:15 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp325293ved; Wed, 15 Jan 2014 22:32:14 -0800 (PST) X-Received: by 10.68.234.67 with SMTP id uc3mr7804285pbc.27.1389853933971; Wed, 15 Jan 2014 22:32:13 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j5si6067139pbs.1.2014.01.15.22.32.13; Wed, 15 Jan 2014 22:32:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbaAPGcM (ORCPT + 8 others); Thu, 16 Jan 2014 01:32:12 -0500 Received: from mail-pd0-f181.google.com ([209.85.192.181]:57373 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751046AbaAPGcM (ORCPT ); Thu, 16 Jan 2014 01:32:12 -0500 Received: by mail-pd0-f181.google.com with SMTP id p10so2176253pdj.12 for ; Wed, 15 Jan 2014 22:32:11 -0800 (PST) X-Received: by 10.68.240.36 with SMTP id vx4mr7951797pbc.140.1389853931651; Wed, 15 Jan 2014 22:32:11 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id gv10sm12560059pbd.0.2014.01.15.22.32.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 22:32:10 -0800 (PST) From: Tushar Behera To: linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: inki.dae@samsung.com, arnd@arndb.de, sachin.kamat@linaro.org Subject: [PATCH V2] drm/exynos: Fix multiplatform breakage for ipp/gsc Date: Thu, 16 Jan 2014 11:57:57 +0530 Message-Id: <1389853677-3485-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , There is no need to include "plat/map-base.h" in ipp driver. Remove this and enable this driver for multi-platform. However gsc driver is not multiplatform compliant yet, so make the compilation conditional upon !ARCH_MULTIPLATFORM. Signed-off-by: Tushar Behera --- Changes for V2: * Made compilation of exynos_drm_gsc.c conditional on !ARCH_MULTIPLATFORM. drivers/gpu/drm/exynos/Kconfig | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index f227f54..6e1a1a2 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -51,7 +51,7 @@ config DRM_EXYNOS_G2D config DRM_EXYNOS_IPP bool "Exynos DRM IPP" - depends on DRM_EXYNOS && !ARCH_MULTIPLATFORM + depends on DRM_EXYNOS help Choose this option if you want to use IPP feature for DRM. @@ -69,6 +69,6 @@ config DRM_EXYNOS_ROTATOR config DRM_EXYNOS_GSC bool "Exynos DRM GSC" - depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5 + depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5 && !ARCH_MULTIPLATFORM help Choose this option if you want to use Exynos GSC for DRM. diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index d519a4e..eefb429 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include