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: 3497341 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 507189F169 for ; Thu, 16 Jan 2014 06:32:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43E8620127 for ; Thu, 16 Jan 2014 06:32:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EB572011B for ; Thu, 16 Jan 2014 06:32:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbaAPGcM (ORCPT ); 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=10Wpo26RpN1ldhbKsN/pw2QdeZP5G4UyyUF9StRLMp0=; b=bvNQrcEZONE74CTUpvI8Gk2DRK0dgGoLy8U729AhCGmEro64LQ8r+kW90azp4oLPou xH/xsBCB5tz5vRggklt6VQJ+6a9ToCWADBf2uH1+IdyPV6tVuQCyiVWbwaAhIxYe0SMn 7fFXrmxWcwnX50IW5gYo3MRHNkKqm2RAKqzK+p2/V6B7+5LG4zzB5fvLh4iWlp5a5WqU prI9khW0SjOvxD1iaiK97kdQM68vDwVvKlQTSbKCKvBLeb1CICSbSih7s5CE/kUOJQNe 9rMgCWFMn0DK3a/01wmIZlf+1vjwPQzFv8c3e+KOvQQe8XqX4SUTbFBF+l8/loTk0dh3 3FvA== X-Gm-Message-State: ALoCoQmmKuk/6H902KkZo3/pZWsJJPExZiKVrIPMXzxrnk7I+bSbOyfZ2aZQrEEiWG21sg9aFI7k 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: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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