From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v5 06/12] drm/i915/perf: Fail modprobe if i915_perf_init fails on OOM
Date: Wed, 15 Mar 2023 17:09:26 -0700 [thread overview]
Message-ID: <20230316000932.2525744-7-umesh.nerlige.ramappa@intel.com> (raw)
In-Reply-To: <20230316000932.2525744-1-umesh.nerlige.ramappa@intel.com>
i915_perf_init can fail due to OOM. Fail driver init if i915_perf_init
fails.
v2: (Jani)
- Reorder patch in the series
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
drivers/gpu/drm/i915/i915_driver.c | 4 +++-
drivers/gpu/drm/i915/i915_perf.c | 8 ++++++--
drivers/gpu/drm/i915/i915_perf.h | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index a53fd339e2cc..19d355bee1d9 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -469,7 +469,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 26ee8377cece..536de16b83b3 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -4902,7 +4902,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;
@@ -5018,12 +5018,16 @@ void i915_perf_init(struct drm_i915_private *i915)
perf->i915 = i915;
ret = oa_init_engine_groups(perf);
- if (ret)
+ if (ret) {
drm_err(&i915->drm,
"OA initialization failed %d\n", ret);
+ return ret;
+ }
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-03-16 0:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 0:09 [Intel-gfx] [PATCH v5 00/12] Add OAM support for MTL Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 01/12] drm/i915/perf: Drop wakeref on GuC RC error Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 02/12] drm/i915/mtl: Synchronize i915/BIOS on C6 enabling Umesh Nerlige Ramappa
2023-03-16 16:06 ` Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 03/12] drm/i915/perf: Add helper to check supported OA engines Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 04/12] drm/i915/perf: Validate OA sseu config outside switch Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 05/12] drm/i915/perf: Group engines into respective OA groups Umesh Nerlige Ramappa
2023-03-16 0:09 ` Umesh Nerlige Ramappa [this message]
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 07/12] drm/i915/perf: Parse 64bit report header formats correctly Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 08/12] drm/i915/perf: Handle non-power-of-2 reports Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 09/12] drm/i915/perf: Add engine class instance parameters to perf Umesh Nerlige Ramappa
2023-03-16 5:31 ` Dixit, Ashutosh
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 10/12] drm/i915/perf: Add support for OA media units Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 11/12] drm/i915/perf: Pass i915 object to perf revision helper Umesh Nerlige Ramappa
2023-03-16 0:09 ` [Intel-gfx] [PATCH v5 12/12] drm/i915/perf: Wa_14017512683: Disable OAM if media C6 is enabled in BIOS Umesh Nerlige Ramappa
2023-03-16 0:13 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Add OAM support for MTL Patchwork
2023-03-16 0:14 ` [Intel-gfx] [PATCH v5 00/12] " Umesh Nerlige Ramappa
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=20230316000932.2525744-7-umesh.nerlige.ramappa@intel.com \
--to=umesh.nerlige.ramappa@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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