[PATCH] drm/i915: Introduce struct class_instance for engines across the uAPI

[PATCH] drm/i915: Introduce struct class_instance for engines across the uAPI

[Chris Wilson]

SSEU reprogramming of the context introduced the notion of engine class
and instance for a forwards compatible method of describing any engine
beyond the old execbuf interface. We wish to adopt this class:instance
description for more interfaces, so pull it out into a separate type for
userspace convenience.

References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Cc: Andi Shyti <andi@etezian.org>
---
Commit e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to
userspace (Gen11 only)") is for v5.1, so we still do have a tiny bit of
time to enact this change.
---
 drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
 include/uapi/drm/i915_drm.h             | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 7fc34ab6df87..dd728b26b5aa 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
 		return -EINVAL;
 
 	engine = intel_engine_lookup_user(i915,
-					  user_sseu.engine_class,
-					  user_sseu.engine_instance);
+					  user_sseu.engine.engine_class,
+					  user_sseu.engine.engine_instance);
 	if (!engine)
 		return -EINVAL;
 
@@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context *ctx,
 		return -EINVAL;
 
 	engine = intel_engine_lookup_user(ctx->i915,
-					  user_sseu.engine_class,
-					  user_sseu.engine_instance);
+					  user_sseu.engine.engine_class,
+					  user_sseu.engine.engine_instance);
 	if (!engine)
 		return -EINVAL;
 
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 52051d24d89d..f6369c462458 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1500,6 +1500,14 @@ struct drm_i915_gem_context_param {
 	__u64 value;
 };
 
+union drm_i915_engine_class_instance {
+	struct i915_engine_class_instance {
+		__u16 engine_class;
+		__u16 engine_instance;
+	} class_instance;
+	__u32 ci;
+};
+
 /**
  * Context SSEU programming
  *
@@ -1525,8 +1533,7 @@ struct drm_i915_gem_context_param_sseu {
 	/*
 	 * Engine class & instance to be configured or queried.
 	 */
-	__u16 engine_class;
-	__u16 engine_instance;
+	struct i915_engine_class_instance engine;
 
 	/*
 	 * Unused for now. Must be cleared to zero.
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Introduce struct class_instance for engines across the uAPI

[Tvrtko Ursulin]

+Tony to comment on the media-driver views on this.

+Manually re-adding original Cc which did not appear for me from the ML.

On 12/04/2019 07:51, Chris Wilson wrote:
> SSEU reprogramming of the context introduced the notion of engine class
> and instance for a forwards compatible method of describing any engine
> beyond the old execbuf interface. We wish to adopt this class:instance
> description for more interfaces, so pull it out into a separate type for
> userspace convenience.
> 
> References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
> Cc: Andi Shyti <andi@etezian.org>
> ---
> Commit e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to
> userspace (Gen11 only)") is for v5.1, so we still do have a tiny bit of
> time to enact this change.
> ---
>   drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
>   include/uapi/drm/i915_drm.h             | 11 +++++++++--
>   2 files changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 7fc34ab6df87..dd728b26b5aa 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
>   		return -EINVAL;
>   
>   	engine = intel_engine_lookup_user(i915,
> -					  user_sseu.engine_class,
> -					  user_sseu.engine_instance);
> +					  user_sseu.engine.engine_class,
> +					  user_sseu.engine.engine_instance);
>   	if (!engine)
>   		return -EINVAL;
>   
> @@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context *ctx,
>   		return -EINVAL;
>   
>   	engine = intel_engine_lookup_user(ctx->i915,
> -					  user_sseu.engine_class,
> -					  user_sseu.engine_instance);
> +					  user_sseu.engine.engine_class,
> +					  user_sseu.engine.engine_instance);
>   	if (!engine)
>   		return -EINVAL;
>   
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 52051d24d89d..f6369c462458 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -1500,6 +1500,14 @@ struct drm_i915_gem_context_param {
>   	__u64 value;
>   };
>   
> +union drm_i915_engine_class_instance {
> +	struct i915_engine_class_instance {
> +		__u16 engine_class;
> +		__u16 engine_instance;
> +	} class_instance;
> +	__u32 ci;

Is "ci" class instance or something to satisfy the test farm and what is 
the purpose for the union?

> +};
> +
>   /**
>    * Context SSEU programming
>    *
> @@ -1525,8 +1533,7 @@ struct drm_i915_gem_context_param_sseu {
>   	/*
>   	 * Engine class & instance to be configured or queried.
>   	 */
> -	__u16 engine_class;
> -	__u16 engine_instance;
> +	struct i915_engine_class_instance engine;
>   
>   	/*
>   	 * Unused for now. Must be cleared to zero.
> 

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Introduce struct class_instance for engines across the uAPI

[Chris Wilson]

Quoting Tvrtko Ursulin (2019-04-12 08:02:04)
> 
> +Tony to comment on the media-driver views on this.
> 
> +Manually re-adding original Cc which did not appear for me from the ML.
> 
> On 12/04/2019 07:51, Chris Wilson wrote:
> > SSEU reprogramming of the context introduced the notion of engine class
> > and instance for a forwards compatible method of describing any engine
> > beyond the old execbuf interface. We wish to adopt this class:instance
> > description for more interfaces, so pull it out into a separate type for
> > userspace convenience.
> > 
> > References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> > Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
> > Cc: Andi Shyti <andi@etezian.org>
> > ---
> > Commit e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to
> > userspace (Gen11 only)") is for v5.1, so we still do have a tiny bit of
> > time to enact this change.
> > ---
> >   drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
> >   include/uapi/drm/i915_drm.h             | 11 +++++++++--
> >   2 files changed, 13 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> > index 7fc34ab6df87..dd728b26b5aa 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_context.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> > @@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
> >               return -EINVAL;
> >   
> >       engine = intel_engine_lookup_user(i915,
> > -                                       user_sseu.engine_class,
> > -                                       user_sseu.engine_instance);
> > +                                       user_sseu.engine.engine_class,
> > +                                       user_sseu.engine.engine_instance);
> >       if (!engine)
> >               return -EINVAL;
> >   
> > @@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context *ctx,
> >               return -EINVAL;
> >   
> >       engine = intel_engine_lookup_user(ctx->i915,
> > -                                       user_sseu.engine_class,
> > -                                       user_sseu.engine_instance);
> > +                                       user_sseu.engine.engine_class,
> > +                                       user_sseu.engine.engine_instance);
> >       if (!engine)
> >               return -EINVAL;
> >   
> > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> > index 52051d24d89d..f6369c462458 100644
> > --- a/include/uapi/drm/i915_drm.h
> > +++ b/include/uapi/drm/i915_drm.h
> > @@ -1500,6 +1500,14 @@ struct drm_i915_gem_context_param {
> >       __u64 value;
> >   };
> >   
> > +union drm_i915_engine_class_instance {
> > +     struct i915_engine_class_instance {
> > +             __u16 engine_class;
> > +             __u16 engine_instance;
> > +     } class_instance;
> > +     __u32 ci;
> 
> Is "ci" class instance or something to satisfy the test farm and what is 
> the purpose for the union?

No real purpose, it's just how I tend to play around with
class_instance. More a topic for discussion to see if anyone else would
find it useful enough to be a part of uapi.h (i.e. if it's common
practice).

This definition should be pulled next to the enum and cross-references
to the enum added. It will also be a good anchor for the various "not an
engine" flags to be described.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Introduce struct class_instance for engines across the uAPI

[Patchwork]

== Series Details ==

Series: drm/i915: Introduce struct class_instance for engines across the uAPI
URL   : https://patchwork.freedesktop.org/series/59373/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
f58592495957 drm/i915: Introduce struct class_instance for engines across the uAPI
-:13: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#13: 
References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")

-:13: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")'
#13: 
References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")

total: 1 errors, 1 warnings, 0 checks, 43 lines checked

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2] drm/i915: Introduce struct class_instance for engines across the uAPI

[Chris Wilson]

SSEU reprogramming of the context introduced the notion of engine class
and instance for a forwards compatible method of describing any engine
beyond the old execbuf interface. We wish to adopt this class:instance
description for more interfaces, so pull it out into a separate type for
userspace convenience.

References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Cc: Tony Ye <tony.ye@intel.com>
Cc: Andi Shyti <andi@etezian.org>
---
Drop the union foible. It's only going to hinder a decision ;)
-Chris
---
 drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
 include/uapi/drm/i915_drm.h             | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 7fc34ab6df87..dd728b26b5aa 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
 		return -EINVAL;
 
 	engine = intel_engine_lookup_user(i915,
-					  user_sseu.engine_class,
-					  user_sseu.engine_instance);
+					  user_sseu.engine.engine_class,
+					  user_sseu.engine.engine_instance);
 	if (!engine)
 		return -EINVAL;
 
@@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context *ctx,
 		return -EINVAL;
 
 	engine = intel_engine_lookup_user(ctx->i915,
-					  user_sseu.engine_class,
-					  user_sseu.engine_instance);
+					  user_sseu.engine.engine_class,
+					  user_sseu.engine.engine_instance);
 	if (!engine)
 		return -EINVAL;
 
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 52051d24d89d..bbc453b1e50f 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -126,6 +126,19 @@ enum drm_i915_gem_engine_class {
 	I915_ENGINE_CLASS_INVALID	= -1
 };
 
+
+/*
+ * There may be more than one engine fulfilling any role within the system.
+ * Each engine of a class is given a unique instance number and therefore
+ * any engine can be specified by its class:instance tuplet. APIs that allow
+ * access to any engine in the system will use struct i915_engine_class_instance
+ * for this identification.
+ */
+struct i915_engine_class_instance {
+	__u16 engine_class; /* see enum drm_i915_gem_engine_class */
+	__u16 engine_instance;
+};
+
 /**
  * DOC: perf_events exposed by i915 through /sys/bus/event_sources/drivers/i915
  *
@@ -1525,8 +1538,7 @@ struct drm_i915_gem_context_param_sseu {
 	/*
 	 * Engine class & instance to be configured or queried.
 	 */
-	__u16 engine_class;
-	__u16 engine_instance;
+	struct i915_engine_class_instance engine;
 
 	/*
 	 * Unused for now. Must be cleared to zero.
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Introduce struct class_instance for engines across the uAPI (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Introduce struct class_instance for engines across the uAPI (rev2)
URL   : https://patchwork.freedesktop.org/series/59373/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
5c670eff87cf drm/i915: Introduce struct class_instance for engines across the uAPI
-:13: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#13: 
References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")

-:13: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")'
#13: 
References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")

-:56: CHECK:LINE_SPACING: Please don't use multiple blank lines
#56: FILE: include/uapi/drm/i915_drm.h:129:
 
+

total: 1 errors, 1 warnings, 1 checks, 48 lines checked

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: Introduce struct class_instance for engines across the uAPI (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Introduce struct class_instance for engines across the uAPI (rev2)
URL   : https://patchwork.freedesktop.org/series/59373/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5922 -> Patchwork_12773
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_12773 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_12773, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/59373/revisions/2/mbox/

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_12773:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live_hangcheck:
    - fi-icl-u3:          PASS -> DMESG-WARN

  
Known issues
------------

  Here are the changes found in Patchwork_12773 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live_execlists:
    - fi-apl-guc:         PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]

  * igt@kms_frontbuffer_tracking@basic:
    - fi-byt-clapper:     PASS -> FAIL [fdo#103167]

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
    - fi-byt-clapper:     PASS -> FAIL [fdo#103191] +1

  * igt@runner@aborted:
    - fi-apl-guc:         NOTRUN -> FAIL [fdo#108622] / [fdo#109720]

  
#### Possible fixes ####

  * igt@i915_pm_rpm@module-reload:
    - fi-skl-6770hq:      FAIL [fdo#108511] -> PASS

  * igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
    - fi-glk-dsi:         FAIL [fdo#103191] -> PASS

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
  [fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
  [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720


Participating hosts (49 -> 43)
------------------------------

  Missing    (6): fi-kbl-soraka fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-y 


Build changes
-------------

    * Linux: CI_DRM_5922 -> Patchwork_12773

  CI_DRM_5922: 849ac6dbff7f5073c3181c5eba07936fe3f576ec @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4944: 9b74b8226e8c108db091bd3b1d105a71dc0fb861 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12773: 5c670eff87cf4245dc44d52fbcdc4b8ae46909b6 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

5c670eff87cf drm/i915: Introduce struct class_instance for engines across the uAPI

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12773/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915: Introduce struct class_instance for engines across the uAPI

[Tvrtko Ursulin]

On 12/04/2019 08:14, Chris Wilson wrote:
> SSEU reprogramming of the context introduced the notion of engine class
> and instance for a forwards compatible method of describing any engine
> beyond the old execbuf interface. We wish to adopt this class:instance
> description for more interfaces, so pull it out into a separate type for
> userspace convenience.
> 
> References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
> Cc: Tony Ye <tony.ye@intel.com>
> Cc: Andi Shyti <andi@etezian.org>
> ---
> Drop the union foible. It's only going to hinder a decision ;)
> -Chris
> ---
>   drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
>   include/uapi/drm/i915_drm.h             | 16 ++++++++++++++--
>   2 files changed, 18 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 7fc34ab6df87..dd728b26b5aa 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
>   		return -EINVAL;
>   
>   	engine = intel_engine_lookup_user(i915,
> -					  user_sseu.engine_class,
> -					  user_sseu.engine_instance);
> +					  user_sseu.engine.engine_class,
> +					  user_sseu.engine.engine_instance);
>   	if (!engine)
>   		return -EINVAL;
>   
> @@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context *ctx,
>   		return -EINVAL;
>   
>   	engine = intel_engine_lookup_user(ctx->i915,
> -					  user_sseu.engine_class,
> -					  user_sseu.engine_instance);
> +					  user_sseu.engine.engine_class,
> +					  user_sseu.engine.engine_instance);
>   	if (!engine)
>   		return -EINVAL;
>   
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 52051d24d89d..bbc453b1e50f 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -126,6 +126,19 @@ enum drm_i915_gem_engine_class {
>   	I915_ENGINE_CLASS_INVALID	= -1
>   };
>   
> +
> +/*
> + * There may be more than one engine fulfilling any role within the system.
> + * Each engine of a class is given a unique instance number and therefore
> + * any engine can be specified by its class:instance tuplet. APIs that allow
> + * access to any engine in the system will use struct i915_engine_class_instance
> + * for this identification.
> + */
> +struct i915_engine_class_instance {
> +	__u16 engine_class; /* see enum drm_i915_gem_engine_class */
> +	__u16 engine_instance;
> +};
> +
>   /**
>    * DOC: perf_events exposed by i915 through /sys/bus/event_sources/drivers/i915
>    *
> @@ -1525,8 +1538,7 @@ struct drm_i915_gem_context_param_sseu {
>   	/*
>   	 * Engine class & instance to be configured or queried.
>   	 */
> -	__u16 engine_class;
> -	__u16 engine_instance;
> +	struct i915_engine_class_instance engine;
>   
>   	/*
>   	 * Unused for now. Must be cleared to zero.
> 

This will definitely be tidier in the near future (despite a bit of 
ugliness in engine.engine_*). I have also checked that this indeed is 
part of 5.1 which hasn't been shipped yet.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

If we can get an ack from Joonas and Tony, to whom it probably falls to 
do the media-driver change I think we are good to do.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915: Introduce struct class_instance for engines across the uAPI

[Ye, Tony]

On 4/12/2019 8:10 PM, Tvrtko Ursulin wrote:
>
> On 12/04/2019 08:14, Chris Wilson wrote:
>> SSEU reprogramming of the context introduced the notion of engine class
>> and instance for a forwards compatible method of describing any engine
>> beyond the old execbuf interface. We wish to adopt this class:instance
>> description for more interfaces, so pull it out into a separate type for
>> userspace convenience.
>>
>> References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration 
>> to userspace (Gen11 only)")
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>> Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
>> Cc: Tony Ye <tony.ye@intel.com>
>> Cc: Andi Shyti <andi@etezian.org>
>> ---
>> Drop the union foible. It's only going to hinder a decision ;)
>> -Chris
>> ---
>>   drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
>>   include/uapi/drm/i915_drm.h             | 16 ++++++++++++++--
>>   2 files changed, 18 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c 
>> b/drivers/gpu/drm/i915/i915_gem_context.c
>> index 7fc34ab6df87..dd728b26b5aa 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_context.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
>> @@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
>>           return -EINVAL;
>>         engine = intel_engine_lookup_user(i915,
>> -                      user_sseu.engine_class,
>> -                      user_sseu.engine_instance);
>> +                      user_sseu.engine.engine_class,
>> +                      user_sseu.engine.engine_instance);
>>       if (!engine)
>>           return -EINVAL;
>>   @@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context 
>> *ctx,
>>           return -EINVAL;
>>         engine = intel_engine_lookup_user(ctx->i915,
>> -                      user_sseu.engine_class,
>> -                      user_sseu.engine_instance);
>> +                      user_sseu.engine.engine_class,
>> +                      user_sseu.engine.engine_instance);
>>       if (!engine)
>>           return -EINVAL;
>>   diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
>> index 52051d24d89d..bbc453b1e50f 100644
>> --- a/include/uapi/drm/i915_drm.h
>> +++ b/include/uapi/drm/i915_drm.h
>> @@ -126,6 +126,19 @@ enum drm_i915_gem_engine_class {
>>       I915_ENGINE_CLASS_INVALID    = -1
>>   };
>>   +
>> +/*
>> + * There may be more than one engine fulfilling any role within the 
>> system.
>> + * Each engine of a class is given a unique instance number and 
>> therefore
>> + * any engine can be specified by its class:instance tuplet. APIs 
>> that allow
>> + * access to any engine in the system will use struct 
>> i915_engine_class_instance
>> + * for this identification.
>> + */
>> +struct i915_engine_class_instance {
>> +    __u16 engine_class; /* see enum drm_i915_gem_engine_class */
>> +    __u16 engine_instance;
>> +};
>> +
>>   /**
>>    * DOC: perf_events exposed by i915 through 
>> /sys/bus/event_sources/drivers/i915
>>    *
>> @@ -1525,8 +1538,7 @@ struct drm_i915_gem_context_param_sseu {
>>       /*
>>        * Engine class & instance to be configured or queried.
>>        */
>> -    __u16 engine_class;
>> -    __u16 engine_instance;
>> +    struct i915_engine_class_instance engine;
>>         /*
>>        * Unused for now. Must be cleared to zero.
>>
>
> This will definitely be tidier in the near future (despite a bit of 
> ugliness in engine.engine_*). I have also checked that this indeed is 
> part of 5.1 which hasn't been shipped yet.
>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> If we can get an ack from Joonas and Tony, to whom it probably falls 
> to do the media-driver change I think we are good to do.
>
> Regards,
>
> Tvrtko

Acked-by: Tony Ye <tony.ye@intel.com>

Regards, --Tony


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Introduce struct class_instance for engines across the uAPI

[Rodrigo Vivi]

On Fri, Apr 12, 2019 at 07:51:47AM +0100, Chris Wilson wrote:
> SSEU reprogramming of the context introduced the notion of engine class
> and instance for a forwards compatible method of describing any engine
> beyond the old execbuf interface. We wish to adopt this class:instance
> description for more interfaces, so pull it out into a separate type for
> userspace convenience.
> 
> References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")

I'm a bit confused here how/why this References become a Fixes.

Anyway, it didn't applied cleaned on drm-intel-fixes and it seems
to me this is not needed there, but if I'm wrong, please let me know.

Thanks,
Rodrigo.

> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
> Cc: Andi Shyti <andi@etezian.org>
> ---
> Commit e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to
> userspace (Gen11 only)") is for v5.1, so we still do have a tiny bit of
> time to enact this change.
> ---
>  drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++----
>  include/uapi/drm/i915_drm.h             | 11 +++++++++--
>  2 files changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 7fc34ab6df87..dd728b26b5aa 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -1386,8 +1386,8 @@ static int set_sseu(struct i915_gem_context *ctx,
>  		return -EINVAL;
>  
>  	engine = intel_engine_lookup_user(i915,
> -					  user_sseu.engine_class,
> -					  user_sseu.engine_instance);
> +					  user_sseu.engine.engine_class,
> +					  user_sseu.engine.engine_instance);
>  	if (!engine)
>  		return -EINVAL;
>  
> @@ -1626,8 +1626,8 @@ static int get_sseu(struct i915_gem_context *ctx,
>  		return -EINVAL;
>  
>  	engine = intel_engine_lookup_user(ctx->i915,
> -					  user_sseu.engine_class,
> -					  user_sseu.engine_instance);
> +					  user_sseu.engine.engine_class,
> +					  user_sseu.engine.engine_instance);
>  	if (!engine)
>  		return -EINVAL;
>  
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 52051d24d89d..f6369c462458 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -1500,6 +1500,14 @@ struct drm_i915_gem_context_param {
>  	__u64 value;
>  };
>  
> +union drm_i915_engine_class_instance {
> +	struct i915_engine_class_instance {
> +		__u16 engine_class;
> +		__u16 engine_instance;
> +	} class_instance;
> +	__u32 ci;
> +};
> +
>  /**
>   * Context SSEU programming
>   *
> @@ -1525,8 +1533,7 @@ struct drm_i915_gem_context_param_sseu {
>  	/*
>  	 * Engine class & instance to be configured or queried.
>  	 */
> -	__u16 engine_class;
> -	__u16 engine_instance;
> +	struct i915_engine_class_instance engine;
>  
>  	/*
>  	 * Unused for now. Must be cleared to zero.
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Introduce struct class_instance for engines across the uAPI

[Chris Wilson]

Quoting Rodrigo Vivi (2019-04-29 18:08:24)
> On Fri, Apr 12, 2019 at 07:51:47AM +0100, Chris Wilson wrote:
> > SSEU reprogramming of the context introduced the notion of engine class
> > and instance for a forwards compatible method of describing any engine
> > beyond the old execbuf interface. We wish to adopt this class:instance
> > description for more interfaces, so pull it out into a separate type for
> > userspace convenience.
> > 
> > References: e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
> 
> I'm a bit confused here how/why this References become a Fixes.

It's required to make sure that the kernel was not released with
incompatible ABI.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx