From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 3/9] drm/i915/perf: Validate OA sseu config outside switch
Date: Thu, 16 Feb 2023 17:10:08 -0800 [thread overview]
Message-ID: <87h6vlf66n.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <20230217005850.2511422-4-umesh.nerlige.ramappa@intel.com>
On Thu, 16 Feb 2023 16:58:44 -0800, Umesh Nerlige Ramappa wrote:
>
> Once OA supports media engine class:instance, the engine can only be
> validated outside the switch since class and instance parameters are
> separate entities. Since OA sseu config depends on engine
> class:instance, validate OA sseu config outside the switch.
>
> v2: (Ashutosh)
> - Clarify commit message
> - Use drm_dbg instead of DRM_DEBUG
> - Reorder stack variables
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
>
> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> ---
> drivers/gpu/drm/i915/i915_perf.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index b0e1acbe90fc..1229f65534e2 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -3950,7 +3950,9 @@ static int read_properties_unlocked(struct i915_perf *perf,
> u32 n_props,
> struct perf_open_properties *props)
> {
> + struct drm_i915_gem_context_param_sseu user_sseu;
> u64 __user *uprop = uprops;
> + bool config_sseu = false;
> u32 i;
> int ret;
>
> @@ -4079,8 +4081,6 @@ static int read_properties_unlocked(struct i915_perf *perf,
> props->hold_preemption = !!value;
> break;
> case DRM_I915_PERF_PROP_GLOBAL_SSEU: {
> - struct drm_i915_gem_context_param_sseu user_sseu;
> -
> if (GRAPHICS_VER_FULL(perf->i915) >= IP_VER(12, 50)) {
> drm_dbg(&perf->i915->drm,
> "SSEU config not supported on gfx %x\n",
> @@ -4095,14 +4095,7 @@ static int read_properties_unlocked(struct i915_perf *perf,
> "Unable to copy global sseu parameter\n");
> return -EFAULT;
> }
> -
> - ret = get_sseu_config(&props->sseu, props->engine, &user_sseu);
> - if (ret) {
> - drm_dbg(&perf->i915->drm,
> - "Invalid SSEU configuration\n");
> - return ret;
> - }
> - props->has_sseu = true;
> + config_sseu = true;
> break;
> }
> case DRM_I915_PERF_PROP_POLL_OA_PERIOD:
> @@ -4122,6 +4115,16 @@ static int read_properties_unlocked(struct i915_perf *perf,
> uprop += 2;
> }
>
> + if (config_sseu) {
> + ret = get_sseu_config(&props->sseu, props->engine, &user_sseu);
> + if (ret) {
> + drm_dbg(&perf->i915->drm,
> + "Invalid SSEU configuration\n");
> + return ret;
> + }
> + props->has_sseu = true;
> + }
> +
> return 0;
> }
>
> --
> 2.36.1
>
next prev parent reply other threads:[~2023-02-17 1:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 0:58 [Intel-gfx] [PATCH v2 0/9] Add OAM support for MTL Umesh Nerlige Ramappa
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 1/9] drm/i915/perf: Drop wakeref on GuC RC error Umesh Nerlige Ramappa
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 2/9] drm/i915/perf: Add helper to check supported OA engines Umesh Nerlige Ramappa
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 3/9] drm/i915/perf: Validate OA sseu config outside switch Umesh Nerlige Ramappa
2023-02-17 1:10 ` Dixit, Ashutosh [this message]
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 4/9] drm/i915/perf: Group engines into respective OA groups Umesh Nerlige Ramappa
2023-02-22 21:52 ` Dixit, Ashutosh
2023-02-24 17:30 ` Umesh Nerlige Ramappa
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 5/9] drm/i915/perf: Fail modprobe if i915_perf_init fails on OOM Umesh Nerlige Ramappa
2023-02-17 2:04 ` Dixit, Ashutosh
2023-02-17 9:55 ` Jani Nikula
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 6/9] drm/i915/perf: Parse 64bit report header formats correctly Umesh Nerlige Ramappa
2023-02-21 22:14 ` Dixit, Ashutosh
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 7/9] drm/i915/perf: Handle non-power-of-2 reports Umesh Nerlige Ramappa
2023-02-17 20:58 ` Dixit, Ashutosh
2023-02-18 0:05 ` Umesh Nerlige Ramappa
2023-02-18 1:57 ` Dixit, Ashutosh
2023-02-21 18:51 ` Dixit, Ashutosh
2023-02-24 19:12 ` Umesh Nerlige Ramappa
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 8/9] drm/i915/perf: Add engine class instance parameters to perf Umesh Nerlige Ramappa
2023-02-17 23:37 ` Umesh Nerlige Ramappa
2023-02-21 23:53 ` Dixit, Ashutosh
2023-02-22 0:10 ` Dixit, Ashutosh
2023-02-24 19:37 ` Umesh Nerlige Ramappa
2023-02-24 20:48 ` Dixit, Ashutosh
2023-02-17 0:58 ` [Intel-gfx] [PATCH v2 9/9] drm/i915/perf: Add support for OA media units Umesh Nerlige Ramappa
2023-02-17 23:37 ` Umesh Nerlige Ramappa
2023-02-23 20:05 ` Dixit, Ashutosh
2023-02-25 0:58 ` Umesh Nerlige Ramappa
2023-02-25 3:58 ` Dixit, Ashutosh
2023-02-17 1:35 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add OAM support for MTL (rev2) Patchwork
2023-02-17 1:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-02-17 16:09 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=87h6vlf66n.wl-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--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