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.8 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 2DF06C433B4 for ; Wed, 21 Apr 2021 08:20:31 +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 B4D656142C for ; Wed, 21 Apr 2021 08:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4D656142C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 373436E95D; Wed, 21 Apr 2021 08:20:30 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A7826E95D for ; Wed, 21 Apr 2021 08:20:28 +0000 (UTC) IronPort-SDR: bYeRmd90VfH1WMsRciEYCJ0MjD2OIbIkbv5UBLR1KQ4VrHsA6EPAtnwl4JkTSWs0PJfPTq58PR 0aZ4ysEN4PbA== X-IronPort-AV: E=McAfee;i="6200,9189,9960"; a="195686442" X-IronPort-AV: E=Sophos;i="5.82,238,1613462400"; d="scan'208";a="195686442" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2021 01:20:27 -0700 IronPort-SDR: ml3QHFEKy3nNa6oVB5SSowt267VzwI9GlqCeuhSUB/UyvGDKf/BR3QneNS2xsAFqY1SrQdGfNG +qXFX2Za7zHw== X-IronPort-AV: E=Sophos;i="5.82,238,1613462400"; d="scan'208";a="427429237" Received: from uchalilx-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.36.64]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2021 01:20:25 -0700 From: Jani Nikula To: Rodrigo Vivi In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210420130853.10573-1-jani.nikula@intel.com> <87k0ox9fx0.fsf@intel.com> Date: Wed, 21 Apr 2021 11:20:22 +0300 Message-ID: <87h7k09hh5.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: Rename pm_ prefixed functions names 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: , Cc: intel-gfx@lists.freedesktop.org, Hsin-Yi Wang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 20 Apr 2021, Rodrigo Vivi wrote: > On Tue, Apr 20, 2021 at 05:41:47PM +0300, Jani Nikula wrote: >> On Tue, 20 Apr 2021, Rodrigo Vivi wrote: >> > On Tue, Apr 20, 2021 at 04:08:53PM +0300, Jani Nikula wrote: >> >> From: Hsin-Yi Wang >> >> >> >> pm_resume and pm_suspend might be conflict with the ones defined in >> >> include/linux/suspend.h. Rename all pm_* to igt_pm_* in selftests since >> >> they are only used here. >> >> >> >> v2 by Jani: >> >> - Use igt_ prefix instead of i915_ to avoid colliding with existing >> >> i915_pm_* functions >> > >> > what about i915_st_pm?! >> >> Honestly I don't really care, as long as they don't conflict with what's >> in suspend.h or i915_drv.c. >> >> They are called from functions named igt_gem_suspend() and >> igt_gem_hibernate(), so I went with igt_. *shrug* > > oh... there was the precedence indeed... > let's go with this for now at least... maybe an overal sed later.. > > > Reviewed-by: Rodrigo Vivi Thanks, pushed. BR, Jani. > > >> >> >> BR, >> Jani. >> >> >> > >> >> - Rename all pm_ prefixed functions in the file >> >> >> >> Signed-off-by: Hsin-Yi Wang >> >> Reported-by: kernel test robot >> >> Signed-off-by: Jani Nikula >> >> --- >> >> drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++---------- >> >> 1 file changed, 10 insertions(+), 10 deletions(-) >> >> >> >> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c >> >> index dc394fb7ccfa..152d9ab135b1 100644 >> >> --- a/drivers/gpu/drm/i915/selftests/i915_gem.c >> >> +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c >> >> @@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915) >> >> intel_runtime_pm_put(&i915->runtime_pm, wakeref); >> >> } >> >> >> >> -static int pm_prepare(struct drm_i915_private *i915) >> >> +static int igt_pm_prepare(struct drm_i915_private *i915) >> >> { >> >> i915_gem_suspend(i915); >> >> >> >> return 0; >> >> } >> >> >> >> -static void pm_suspend(struct drm_i915_private *i915) >> >> +static void igt_pm_suspend(struct drm_i915_private *i915) >> >> { >> >> intel_wakeref_t wakeref; >> >> >> >> @@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915) >> >> } >> >> } >> >> >> >> -static void pm_hibernate(struct drm_i915_private *i915) >> >> +static void igt_pm_hibernate(struct drm_i915_private *i915) >> >> { >> >> intel_wakeref_t wakeref; >> >> >> >> @@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915) >> >> } >> >> } >> >> >> >> -static void pm_resume(struct drm_i915_private *i915) >> >> +static void igt_pm_resume(struct drm_i915_private *i915) >> >> { >> >> intel_wakeref_t wakeref; >> >> >> >> @@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg) >> >> if (err) >> >> goto out; >> >> >> >> - err = pm_prepare(i915); >> >> + err = igt_pm_prepare(i915); >> >> if (err) >> >> goto out; >> >> >> >> - pm_suspend(i915); >> >> + igt_pm_suspend(i915); >> >> >> >> /* Here be dragons! Note that with S3RST any S3 may become S4! */ >> >> simulate_hibernate(i915); >> >> >> >> - pm_resume(i915); >> >> + igt_pm_resume(i915); >> >> >> >> err = switch_to_context(ctx); >> >> out: >> >> @@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg) >> >> if (err) >> >> goto out; >> >> >> >> - err = pm_prepare(i915); >> >> + err = igt_pm_prepare(i915); >> >> if (err) >> >> goto out; >> >> >> >> - pm_hibernate(i915); >> >> + igt_pm_hibernate(i915); >> >> >> >> /* Here be dragons! */ >> >> simulate_hibernate(i915); >> >> >> >> - pm_resume(i915); >> >> + igt_pm_resume(i915); >> >> >> >> err = switch_to_context(ctx); >> >> out: >> >> -- >> >> 2.20.1 >> >> >> >> _______________________________________________ >> >> Intel-gfx mailing list >> >> Intel-gfx@lists.freedesktop.org >> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> >> -- >> Jani Nikula, Intel Open Source Graphics Center >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx