From patchwork Wed Oct 5 10:50:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonas Lahtinen X-Patchwork-Id: 9362723 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14A1F607D6 for ; Wed, 5 Oct 2016 10:50:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0685C2823D for ; Wed, 5 Oct 2016 10:50:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDA4B284D3; Wed, 5 Oct 2016 10:50:34 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF7F62823D for ; Wed, 5 Oct 2016 10:50:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 109F56E80D; Wed, 5 Oct 2016 10:50:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F1B16E80D for ; Wed, 5 Oct 2016 10:50:32 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 05 Oct 2016 03:50:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,448,1473145200"; d="scan'208";a="886926178" Received: from jlahtine-desk.ger.corp.intel.com ([10.252.6.38]) by orsmga003.jf.intel.com with ESMTP; 05 Oct 2016 03:50:30 -0700 From: Joonas Lahtinen To: Intel graphics driver community testing & development Date: Wed, 5 Oct 2016 13:50:17 +0300 Message-Id: <1475664617-24541-2-git-send-email-joonas.lahtinen@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475664617-24541-1-git-send-email-joonas.lahtinen@linux.intel.com> References: <1475664617-24541-1-git-send-email-joonas.lahtinen@linux.intel.com> Subject: [Intel-gfx] [PATCH v2 2/2] drm/i915: Sort DEV_INFO_FOR_EACH_FLAG 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-Virus-Scanned: ClamAV using ClamSMTP Sort DEV_INFO_FOR_EACH_FLAG to alphabetical order (except is_*). v2: - Add comments in the hope of maintaining order (Chris) Cc: Chris Wilson Reviewed-by: Chris Wilson Signed-off-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_drv.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8b0500f..414568a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -635,12 +635,12 @@ struct intel_csr { }; #define DEV_INFO_FOR_EACH_FLAG(func) \ + /* Keep is_* in chronological order */ \ func(is_mobile); \ func(is_i85x); \ func(is_i915g); \ func(is_i945gm); \ func(is_g33); \ - func(hws_needs_physical); \ func(is_g4x); \ func(is_pineview); \ func(is_broadwater); \ @@ -654,31 +654,33 @@ struct intel_csr { func(is_broxton); \ func(is_kabylake); \ func(is_preliminary); \ - func(has_fbc); \ - func(has_psr); \ - func(has_runtime_pm); \ + /* Keep has_* in alphabetical order */ \ func(has_csr); \ - func(has_resource_streamer); \ - func(has_rc6); \ - func(has_rc6p); \ + func(has_ddi); \ func(has_dp_mst); \ + func(has_fbc); \ + func(has_fpga_dbg); \ func(has_gmbus_irq); \ - func(has_hw_contexts); \ - func(has_logical_ring_contexts); \ - func(has_l3_dpf); \ func(has_gmch_display); \ func(has_guc); \ - func(has_pipe_cxsr); \ func(has_hotplug); \ - func(cursor_needs_physical); \ - func(has_overlay); \ - func(overlay_needs_physical); \ - func(supports_tv); \ + func(has_hw_contexts); \ + func(has_l3_dpf); \ func(has_llc); \ + func(has_logical_ring_contexts); \ + func(has_overlay); \ + func(has_pipe_cxsr); \ + func(has_pooled_eu); \ + func(has_psr); \ + func(has_rc6); \ + func(has_rc6p); \ + func(has_resource_streamer); \ + func(has_runtime_pm); \ func(has_snoop); \ - func(has_ddi); \ - func(has_fpga_dbg); \ - func(has_pooled_eu) + func(cursor_needs_physical); \ + func(hws_needs_physical); \ + func(overlay_needs_physical); \ + func(supports_tv) struct sseu_dev_info { u8 slice_mask;