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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 302F7C61DA4 for ; Thu, 16 Feb 2023 06:23:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6552E10E06A; Thu, 16 Feb 2023 06:23:47 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1483E10E06A for ; Thu, 16 Feb 2023 06:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676528625; x=1708064625; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=aTx47uc8p1vcvIcBNar4A9sNJLDenXL+eokhuEDV0FY=; b=IyWV0kNI/uyiifS/oAdAbotQx3XiRAkN7iG9/WEZYxY4fuj6XMzBXqV0 5T3FoifPnIWMnhqwjNRcE3dLquZtqLXFaUYrtE2Q6KRJTMrFO4ePfk2Fx GPjwbsogkis0biqKM0YJenVQhBppEHISLv/Rfcbc15k5Ve3l0d3azvx8u iOYNT7MEgurnaz5nYKFfGranTqgd53R5JqpMI5vnrLJU9r32Y9LQvkL0u cvL459dZQ0+QfbqFdcEGA9/lVWNxs0G8vNotwWxHrS9xgiiofY+jdB4Q2 TDbviPnGEKd7kvKsBzyMnBE7lJKRcDmO7yU/Vc9mKHLT+FIVX9EQD3idV Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="329359527" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="329359527" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 22:23:44 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="663343449" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="663343449" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.251.28.186]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 22:23:44 -0800 Date: Wed, 15 Feb 2023 22:10:57 -0800 Message-ID: <87wn4im972.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Umesh Nerlige Ramappa In-Reply-To: <20230215005419.2100887-5-umesh.nerlige.ramappa@intel.com> References: <20230215005419.2100887-1-umesh.nerlige.ramappa@intel.com> <20230215005419.2100887-5-umesh.nerlige.ramappa@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [PATCH 4/9] drm/i915/perf: Fail modprobe if i915_perf_init fails 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: Lionel G Landwerlin , intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 14 Feb 2023 16:54:14 -0800, Umesh Nerlige Ramappa wrote: > > Check for return value from i915_perf_init and fail driver init if perf > init fails. Guess we'll start returning anything other than zero later: Reviewed-by: Ashutosh Dixit > > Signed-off-by: Umesh Nerlige Ramappa > --- > drivers/gpu/drm/i915/i915_driver.c | 4 +++- > drivers/gpu/drm/i915/i915_perf.c | 4 +++- > drivers/gpu/drm/i915/i915_perf.h | 2 +- > 3 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index 0c0ae3eabb4b..998ca41c9713 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -477,7 +477,9 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) > if (ret) > return ret; > > - i915_perf_init(dev_priv); > + ret = i915_perf_init(dev_priv); > + if (ret) > + return ret; > > ret = i915_ggtt_probe_hw(dev_priv); > if (ret) > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c > index 0b2097ad000e..e134523576f8 100644 > --- a/drivers/gpu/drm/i915/i915_perf.c > +++ b/drivers/gpu/drm/i915/i915_perf.c > @@ -4845,7 +4845,7 @@ static void i915_perf_init_info(struct drm_i915_private *i915) > * Note: i915-perf initialization is split into an 'init' and 'register' > * phase with the i915_perf_register() exposing state to userspace. > */ > -void i915_perf_init(struct drm_i915_private *i915) > +int i915_perf_init(struct drm_i915_private *i915) > { > struct i915_perf *perf = &i915->perf; > > @@ -4962,6 +4962,8 @@ void i915_perf_init(struct drm_i915_private *i915) > > oa_init_supported_formats(perf); > } > + > + return 0; > } > > static int destroy_config(int id, void *p, void *data) > diff --git a/drivers/gpu/drm/i915/i915_perf.h b/drivers/gpu/drm/i915/i915_perf.h > index f96e09a4af04..253637651d5e 100644 > --- a/drivers/gpu/drm/i915/i915_perf.h > +++ b/drivers/gpu/drm/i915/i915_perf.h > @@ -18,7 +18,7 @@ struct i915_oa_config; > struct intel_context; > struct intel_engine_cs; > > -void i915_perf_init(struct drm_i915_private *i915); > +int i915_perf_init(struct drm_i915_private *i915); > void i915_perf_fini(struct drm_i915_private *i915); > void i915_perf_register(struct drm_i915_private *i915); > void i915_perf_unregister(struct drm_i915_private *i915); > -- > 2.36.1 >