From patchwork Wed Apr 14 11:50:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 12202467 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D207BC43460 for ; Wed, 14 Apr 2021 11:50:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FEC0613C0 for ; Wed, 14 Apr 2021 11:50:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FEC0613C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 050316E87D; Wed, 14 Apr 2021 11:50:48 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A24F6E42C for ; Wed, 14 Apr 2021 11:50:46 +0000 (UTC) IronPort-SDR: lHj7buHb9XAotwui8PV3n3V/y63wMwtZYK1gkq+KC5cRE+qlZ3wMzcn+YVgmZfq/s5QWt8iRk9 H3F8rKH+OhyQ== X-IronPort-AV: E=McAfee;i="6200,9189,9953"; a="194732248" X-IronPort-AV: E=Sophos;i="5.82,222,1613462400"; d="scan'208";a="194732248" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2021 04:50:46 -0700 IronPort-SDR: f5z6mq80c1ioPOAIVi5CtuIvLfoVVEgQMxHFELOwMBDY262qHcC2EzX76lLPYbzWGzrKBrXf2/ epLDFIZyQ+5w== X-IronPort-AV: E=Sophos;i="5.82,222,1613462400"; d="scan'208";a="521965149" Received: from bdebhal-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.213.205.119]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2021 04:50:45 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 14 Apr 2021 12:50:05 +0100 Message-Id: <20210414115028.168504-6-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210414115028.168504-1-tvrtko.ursulin@linux.intel.com> References: <20210414115028.168504-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RFC 05/28] drm/i915: Make GEN2 support optional X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Tvrtko Ursulin By adding a hidden Kconfig option selected by all Gen2 platforms, we can eliminate more code when none of those is selected. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/Kconfig.platforms | 7 +++++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/Kconfig.platforms b/drivers/gpu/drm/i915/Kconfig.platforms index 46b78425e6da..23a44c8eb07b 100644 --- a/drivers/gpu/drm/i915/Kconfig.platforms +++ b/drivers/gpu/drm/i915/Kconfig.platforms @@ -1,7 +1,11 @@ +config DRM_I915_GEN2 + bool + config DRM_I915_PLATFORM_INTEL_I830 bool "Intel i830 platform support" default y depends on DRM_I915 + select DRM_I915_GEN2 help Include support for Intel i830 platform. @@ -9,6 +13,7 @@ config DRM_I915_PLATFORM_INTEL_I845G bool "Intel i845G platform support" default y depends on DRM_I915 + select DRM_I915_GEN2 help Include support for Intel i845G platform. @@ -16,6 +21,7 @@ config DRM_I915_PLATFORM_INTEL_I85X bool "Intel i85X platform support" default y depends on DRM_I915 + select DRM_I915_GEN2 help Include support for Intel i85X platforms. @@ -23,5 +29,6 @@ config DRM_I915_PLATFORM_INTEL_I865G bool "Intel i865G platform support" default y depends on DRM_I915 + select DRM_I915_GEN2 help Include support for Intel i865G platform. diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 4a350a6b1800..f718655294ea 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2714,7 +2714,9 @@ intel_info(const struct drm_i915_private *dev_priv) * have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular * chips, etc.). */ -#define IS_GEN2(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(1))) +#define IS_GEN2(dev_priv) \ + (IS_ENABLED(CONFIG_DRM_I915_GEN2) && \ + ((dev_priv)->info.gen_mask & BIT(1))) #define IS_GEN3(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(2))) #define IS_GEN4(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(3))) #define IS_GEN5(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(4)))