From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 AAF28C4338F for ; Thu, 12 Aug 2021 09:59:27 +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 55A8D60FC4 for ; Thu, 12 Aug 2021 09:59:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 55A8D60FC4 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=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8E446E30D; Thu, 12 Aug 2021 09:59:26 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id E89306E30D for ; Thu, 12 Aug 2021 09:59:25 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10073"; a="194902887" X-IronPort-AV: E=Sophos;i="5.84,315,1620716400"; d="scan'208";a="194902887" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2021 02:59:25 -0700 X-IronPort-AV: E=Sophos;i="5.84,315,1620716400"; d="scan'208";a="517373789" Received: from cfetzer-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.209.235]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2021 02:59:22 -0700 From: Jani Nikula To: Anusha Srivatsa , intel-gfx@lists.freedesktop.org Cc: Matt Roper , Lucas De Marchi In-Reply-To: <20210719213828.5738-1-anusha.srivatsa@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210719213828.5738-1-anusha.srivatsa@intel.com> Date: Thu, 12 Aug 2021 12:59:19 +0300 Message-ID: <87a6lnm1ag.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [CI 1/2] drm/i915/step: Add macro magic for handling steps 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" On Mon, 19 Jul 2021, Anusha Srivatsa wrote: > With the addition of stepping info for > all platforms, lets use macros for handling them > and autogenerating code for all steps at a time. > > Suggested-by: Matt Roper > Cc: Lucas De Marchi > Signed-off-by: Anusha Srivatsa > Reviewed-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/intel_step.c | 14 ++++++++++++ > drivers/gpu/drm/i915/intel_step.h | 37 +++++++++++++++++++------------ > 2 files changed, 37 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c > index 9fcf17708cc8..d150d138e889 100644 > --- a/drivers/gpu/drm/i915/intel_step.c > +++ b/drivers/gpu/drm/i915/intel_step.c > @@ -182,3 +182,17 @@ void intel_step_init(struct drm_i915_private *i915) > > RUNTIME_INFO(i915)->step = step; > } > + > +#define STEP_NAME_CASE(name) \ > + (case STEP_##name: \ > + return #name) > + > +const char *intel_step_name(enum intel_step step) > +{ > + switch (step) { > + STEP_NAME_LIST(STEP_NAME_CASE); > + > + default: > + return "**"; > + } > +} > diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h > index 88a77159703e..f6641e2a3c77 100644 > --- a/drivers/gpu/drm/i915/intel_step.h > +++ b/drivers/gpu/drm/i915/intel_step.h > @@ -15,30 +15,39 @@ struct intel_step_info { > u8 display_step; > }; > > +#define STEP_ENUM_VAL(name) STEP_##name, > + > +#define STEP_NAME_LIST(func) \ > + func(A0) \ > + func(A1) \ > + func(A2) \ > + func(B0) \ > + func(B1) \ > + func(B2) \ > + func(C0) \ > + func(C1) \ > + func(D0) \ > + func(D1) \ > + func(E0) \ > + func(F0) \ > + func(G0) \ > + func(H0) \ > + func(I0) \ > + func(I1) \ > + func(J0) > + > /* > * Symbolic steppings that do not match the hardware. These are valid both as gt > * and display steppings as symbolic names. > */ > enum intel_step { > STEP_NONE = 0, > - STEP_A0, > - STEP_A2, > - STEP_B0, > - STEP_B1, > - STEP_C0, > - STEP_D0, > - STEP_D1, > - STEP_E0, > - STEP_F0, > - STEP_G0, > - STEP_H0, > - STEP_I0, > - STEP_I1, > - STEP_J0, > + STEP_NAME_LIST(STEP_ENUM_VAL) > STEP_FUTURE, > STEP_FOREVER, > }; It's been merged already, and so be it. I'll just note that the main reason I don't like adding this kind of macro abstractions is that it throws off source code tagging tools like ctags and gnu global. I can no longer navigate the definition and all the references of STEP_* using the tools, and it degenerates to git grep which is much worse as it doesn't know about C syntax or semantics. It's not always about how the code looks, it's also about how people can navigate the code base. BR, Jani. > > void intel_step_init(struct drm_i915_private *i915); > +const char *intel_step_name(enum intel_step step); > > #endif /* __INTEL_STEP_H__ */ -- Jani Nikula, Intel Open Source Graphics Center