From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Cc: Lionel G Landwerlin <lionel.g.landwerlin@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 4/9] drm/i915/perf: Fail modprobe if i915_perf_init fails
Date: Wed, 15 Feb 2023 22:10:57 -0800 [thread overview]
Message-ID: <87wn4im972.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <20230215005419.2100887-5-umesh.nerlige.ramappa@intel.com>
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 <ashutosh.dixit@intel.com>
>
> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> ---
> 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
>
next prev parent reply other threads:[~2023-02-16 6:23 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 0:54 [Intel-gfx] [PATCH 0/9] Add OAM support for MTL Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 1/9] drm/i915/perf: Drop wakeref on GuC RC error Umesh Nerlige Ramappa
2023-02-16 3:56 ` Dixit, Ashutosh
2023-02-15 0:54 ` [Intel-gfx] [PATCH 2/9] drm/i915/perf: Add helper to check supported OA engines Umesh Nerlige Ramappa
2023-02-16 3:58 ` Dixit, Ashutosh
2023-02-16 17:30 ` Umesh Nerlige Ramappa
2023-02-17 0:53 ` Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 3/9] drm/i915/perf: Validate OA sseu config outside switch Umesh Nerlige Ramappa
2023-02-16 5:08 ` Dixit, Ashutosh
2023-02-16 5:36 ` Dixit, Ashutosh
2023-02-16 16:31 ` Dixit, Ashutosh
2023-02-16 17:37 ` Umesh Nerlige Ramappa
2023-02-16 23:11 ` Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 4/9] drm/i915/perf: Fail modprobe if i915_perf_init fails Umesh Nerlige Ramappa
2023-02-16 6:10 ` Dixit, Ashutosh [this message]
2023-02-16 10:43 ` Jani Nikula
2023-02-15 0:54 ` [Intel-gfx] [PATCH 5/9] drm/i915/perf: Group engines into respective OA groups Umesh Nerlige Ramappa
2023-02-16 10:51 ` Jani Nikula
2023-02-16 17:55 ` Dixit, Ashutosh
2023-02-16 18:10 ` Jani Nikula
2023-02-16 20:55 ` Umesh Nerlige Ramappa
2023-02-16 23:58 ` Umesh Nerlige Ramappa
2023-02-16 23:44 ` Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 6/9] drm/i915/perf: Parse 64bit report header formats correctly Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 7/9] drm/i915/perf: Handle non-power-of-2 reports Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 8/9] drm/i915/perf: Add engine class instance parameters to perf Umesh Nerlige Ramappa
2023-02-15 0:54 ` [Intel-gfx] [PATCH 9/9] drm/i915/perf: Add support for OA media units Umesh Nerlige Ramappa
2023-02-16 17:27 ` Dixit, Ashutosh
2023-02-16 21:07 ` Umesh Nerlige Ramappa
2023-02-16 21:23 ` Dixit, Ashutosh
2023-02-15 1:38 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add OAM support for MTL Patchwork
2023-02-15 2:05 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wn4im972.wl-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lionel.g.landwerlin@linux.intel.com \
--cc=umesh.nerlige.ramappa@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox