From patchwork Tue May 12 15:13:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 6389001 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E1ACDBEEE5 for ; Tue, 12 May 2015 15:13:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 274B12041B for ; Tue, 12 May 2015 15:13:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2B47A203EB for ; Tue, 12 May 2015 15:13:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5F3A6E657; Tue, 12 May 2015 08:13:29 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C4468892C8 for ; Tue, 12 May 2015 08:13:28 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 12 May 2015 08:13:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,415,1427785200"; d="scan'208";a="709026653" Received: from gluu-mobl1.amr.corp.intel.com (HELO strange.amr.corp.intel.com) ([10.254.49.23]) by fmsmga001.fm.intel.com with ESMTP; 12 May 2015 08:13:27 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Tue, 12 May 2015 16:13:18 +0100 Message-Id: <1431443602-22886-7-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431443602-22886-1-git-send-email-damien.lespiau@intel.com> References: <1431443602-22886-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 06/10] drm/i915: Don't use the intel_ prefix for gen-specific data X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 We now prefix our functions/enums/data with the first platform it has been introduced. Do that for the primary plane formats. Signed-off-by: Damien Lespiau --- drivers/gpu/drm/i915/intel_display.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dadb52a..8adf3bf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -53,14 +53,14 @@ DRM_FORMAT_ARGB8888 /* Primary plane formats for gen <= 3 */ -static const uint32_t intel_primary_formats_gen2[] = { +static const uint32_t gen2_primary_formats[] = { COMMON_PRIMARY_FORMATS, DRM_FORMAT_XRGB1555, DRM_FORMAT_ARGB1555, }; /* Primary plane formats for gen >= 4 */ -static const uint32_t intel_primary_formats_gen4[] = { +static const uint32_t gen4_primary_formats[] = { COMMON_PRIMARY_FORMATS, \ DRM_FORMAT_XBGR8888, DRM_FORMAT_ABGR8888, @@ -13288,11 +13288,11 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->plane = !pipe; if (INTEL_INFO(dev)->gen <= 3) { - intel_primary_formats = intel_primary_formats_gen2; - num_formats = ARRAY_SIZE(intel_primary_formats_gen2); + intel_primary_formats = gen2_primary_formats; + num_formats = ARRAY_SIZE(gen2_primary_formats); } else { - intel_primary_formats = intel_primary_formats_gen4; - num_formats = ARRAY_SIZE(intel_primary_formats_gen4); + intel_primary_formats = gen4_primary_formats; + num_formats = ARRAY_SIZE(gen4_primary_formats); } drm_universal_plane_init(dev, &primary->base, 0,