All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Unify GT* and GT3 definitions
@ 2017-06-05 17:47 Rodrigo Vivi
  2017-06-05 18:05 ` ✗ Fi.CI.BAT: warning for " Patchwork
  2017-06-06  7:47 ` [PATCH] " Jani Nikula
  0 siblings, 2 replies; 10+ messages in thread
From: Rodrigo Vivi @ 2017-06-05 17:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

This patch clean up a bit the platform definition block in
a way to avoid duplications and to let clear that GT3 for
the current platform only have the extra Media engine.

Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index cf43dc1..e5a730f 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -312,17 +312,21 @@
 	.has_full_48bit_ppgtt = 1, \
 	.has_64bit_reloc = 1
 
+#define BDW_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 8, \
+	.platform = INTEL_BROADWELL
+
+#define EXTRA_MEDIA_ENGINE \
+	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
+
 static const struct intel_device_info intel_broadwell_info = {
-	BDW_FEATURES,
-	.gen = 8,
-	.platform = INTEL_BROADWELL,
+	BDW_PLATFORM,
 };
 
 static const struct intel_device_info intel_broadwell_gt3_info = {
-	BDW_FEATURES,
-	.gen = 8,
-	.platform = INTEL_BROADWELL,
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	BDW_PLATFORM,
+	EXTRA_MEDIA_ENGINE,
 };
 
 static const struct intel_device_info intel_cherryview_info = {
@@ -347,23 +351,21 @@
 	CHV_COLORS,
 };
 
+#define SKL_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 9, \
+	.platform = INTEL_SKYLAKE, \
+	.has_csr = 1, \
+	.has_guc = 1, \
+	.ddb_size = 896
+
 static const struct intel_device_info intel_skylake_info = {
-	BDW_FEATURES,
-	.platform = INTEL_SKYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	SKL_PLATFORM,
 };
 
 static const struct intel_device_info intel_skylake_gt3_info = {
-	BDW_FEATURES,
-	.platform = INTEL_SKYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	SKL_PLATFORM,
+	EXTRA_MEDIA_ENGINE,
 };
 
 #define GEN9_LP_FEATURES \
@@ -406,23 +408,21 @@
 	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
 };
 
+#define KBL_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 9, \
+	.platform = INTEL_SKYLAKE, \
+	.has_csr = 1, \
+	.has_guc = 1, \
+	.ddb_size = 896
+
 static const struct intel_device_info intel_kabylake_info = {
-	BDW_FEATURES,
-	.platform = INTEL_KABYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	KBL_PLATFORM,
 };
 
 static const struct intel_device_info intel_kabylake_gt3_info = {
-	BDW_FEATURES,
-	.platform = INTEL_KABYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	KBL_PLATFORM,
+	EXTRA_MEDIA_ENGINE,
 };
 
 /*
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: Unify GT* and GT3 definitions
  2017-06-05 17:47 [PATCH] drm/i915: Unify GT* and GT3 definitions Rodrigo Vivi
@ 2017-06-05 18:05 ` Patchwork
  2017-06-06  7:47 ` [PATCH] " Jani Nikula
  1 sibling, 0 replies; 10+ messages in thread
From: Patchwork @ 2017-06-05 18:05 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Unify GT* and GT3 definitions
URL   : https://patchwork.freedesktop.org/series/25299/
State : warning

== Summary ==

Series 25299v1 drm/i915: Unify GT* and GT3 definitions
https://patchwork.freedesktop.org/api/1.0/series/25299/revisions/1/mbox/

Test kms_busy:
        Subgroup basic-flip-default-a:
                pass       -> DMESG-WARN (fi-skl-6700hq) fdo#101144 +1
Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (fi-kbl-7500u)
        Subgroup basic-no-display:
                pass       -> DMESG-WARN (fi-kbl-7500u)
        Subgroup basic-reload-inject:
                pass       -> DMESG-WARN (fi-kbl-7500u)
        Subgroup basic-reload-final:
                pass       -> DMESG-WARN (fi-kbl-7500u)

fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:442s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:430s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:589s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:513s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:494s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:496s
fi-glk-2a        total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:595s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:437s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:414s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:417s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:491s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:459s
fi-kbl-7500u     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:467s
fi-kbl-7560u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:572s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:460s
fi-skl-6700hq    total:278  pass:228  dwarn:1   dfail:0   fail:27  skip:22  time:398s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:466s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:503s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:442s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:533s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:398s

30d3326ecb407cad6c03ef6a6d3805c70ba9f0a9 drm-tip: 2017y-06m-05d-15h-21m-50s UTC integration manifest
bf71b02 drm/i915: Unify GT* and GT3 definitions

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4879/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] drm/i915: Unify GT* and GT3 definitions
       [not found] <83F5C7385F545743AD4FB2A62F75B0732C3CC5AC@ORSMSX107.amr.corp.intel.com>
@ 2017-06-05 20:21 ` Rodrigo Vivi
  2017-06-05 21:07   ` Chris Wilson
  0 siblings, 1 reply; 10+ messages in thread
From: Rodrigo Vivi @ 2017-06-05 20:21 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

This patch clean up a bit the platform definition block in
a way to avoid duplications and to let clear that GT3 for
the current platform only have the extra Media engine.

v2: Kabylake IS_KABYLAKE as Anusha noticed.

Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index cf43dc1..0e0606d 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -312,17 +312,21 @@
 	.has_full_48bit_ppgtt = 1, \
 	.has_64bit_reloc = 1
 
+#define BDW_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 8, \
+	.platform = INTEL_BROADWELL
+
+#define EXTRA_MEDIA_ENGINE \
+	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
+
 static const struct intel_device_info intel_broadwell_info = {
-	BDW_FEATURES,
-	.gen = 8,
-	.platform = INTEL_BROADWELL,
+	BDW_PLATFORM,
 };
 
 static const struct intel_device_info intel_broadwell_gt3_info = {
-	BDW_FEATURES,
-	.gen = 8,
-	.platform = INTEL_BROADWELL,
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	BDW_PLATFORM,
+	EXTRA_MEDIA_ENGINE,
 };
 
 static const struct intel_device_info intel_cherryview_info = {
@@ -347,23 +351,21 @@
 	CHV_COLORS,
 };
 
+#define SKL_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 9, \
+	.platform = INTEL_SKYLAKE, \
+	.has_csr = 1, \
+	.has_guc = 1, \
+	.ddb_size = 896
+
 static const struct intel_device_info intel_skylake_info = {
-	BDW_FEATURES,
-	.platform = INTEL_SKYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	SKL_PLATFORM,
 };
 
 static const struct intel_device_info intel_skylake_gt3_info = {
-	BDW_FEATURES,
-	.platform = INTEL_SKYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	SKL_PLATFORM,
+	EXTRA_MEDIA_ENGINE,
 };
 
 #define GEN9_LP_FEATURES \
@@ -406,23 +408,21 @@
 	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
 };
 
+#define KBL_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 9, \
+	.platform = INTEL_KABYLAKE, \
+	.has_csr = 1, \
+	.has_guc = 1, \
+	.ddb_size = 896
+
 static const struct intel_device_info intel_kabylake_info = {
-	BDW_FEATURES,
-	.platform = INTEL_KABYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	KBL_PLATFORM,
 };
 
 static const struct intel_device_info intel_kabylake_gt3_info = {
-	BDW_FEATURES,
-	.platform = INTEL_KABYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	KBL_PLATFORM,
+	EXTRA_MEDIA_ENGINE,
 };
 
 /*
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-05 20:21 ` Rodrigo Vivi
@ 2017-06-05 21:07   ` Chris Wilson
  2017-06-05 22:03     ` Vivi, Rodrigo
  0 siblings, 1 reply; 10+ messages in thread
From: Chris Wilson @ 2017-06-05 21:07 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

Quoting Rodrigo Vivi (2017-06-05 21:21:49)
> This patch clean up a bit the platform definition block in
> a way to avoid duplications and to let clear that GT3 for
> the current platform only have the extra Media engine.
> 
> v2: Kabylake IS_KABYLAKE as Anusha noticed.
> 
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
>  1 file changed, 33 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index cf43dc1..0e0606d 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -312,17 +312,21 @@
>         .has_full_48bit_ppgtt = 1, \
>         .has_64bit_reloc = 1
>  
> +#define BDW_PLATFORM \
> +       BDW_FEATURES, \
> +       .gen = 8, \
> +       .platform = INTEL_BROADWELL
> +
> +#define EXTRA_MEDIA_ENGINE \
> +       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING

Are you planning to call the next one EXTRA_EXTRA_ENGINES?

The mask is much more understandable and reviewable than a misleading
name like EXTRA_MEDIA_ENGINE.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-05 21:07   ` Chris Wilson
@ 2017-06-05 22:03     ` Vivi, Rodrigo
  2017-06-06 16:06       ` Rodrigo Vivi
  0 siblings, 1 reply; 10+ messages in thread
From: Vivi, Rodrigo @ 2017-06-05 22:03 UTC (permalink / raw)
  To: chris@chris-wilson.co.uk; +Cc: intel-gfx@lists.freedesktop.org

On Mon, 2017-06-05 at 22:07 +0100, Chris Wilson wrote:
> Quoting Rodrigo Vivi (2017-06-05 21:21:49)
> > This patch clean up a bit the platform definition block in
> > a way to avoid duplications and to let clear that GT3 for
> > the current platform only have the extra Media engine.
> > 
> > v2: Kabylake IS_KABYLAKE as Anusha noticed.
> > 
> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
> >  1 file changed, 33 insertions(+), 33 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index cf43dc1..0e0606d 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -312,17 +312,21 @@
> >         .has_full_48bit_ppgtt = 1, \
> >         .has_64bit_reloc = 1
> >  
> > +#define BDW_PLATFORM \
> > +       BDW_FEATURES, \
> > +       .gen = 8, \
> > +       .platform = INTEL_BROADWELL
> > +
> > +#define EXTRA_MEDIA_ENGINE \
> > +       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
> 
> Are you planning to call the next one EXTRA_EXTRA_ENGINES?

I wondered to add as plural but since we currently add only one extra I
figured that singular was better and if we end up adding more we change
the mask name later. 

> 
> The mask is much more understandable and reviewable than a misleading
> name like EXTRA_MEDIA_ENGINE.

Yeap, indeed a bad name... Just couldn't figure a better name.
I'm open for suggestions.

My goal with this change is to respond quickly to the question:

What is different on GT3 so anyone looking to this block would quickly
respond: Oh, ah extra engine for media...

But maybe be a bit more specific 
#define BSD2_RING \
> +       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
BSD2_RING
> 

Thanks,
Rodrigo.


> -Chris

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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-05 17:47 [PATCH] drm/i915: Unify GT* and GT3 definitions Rodrigo Vivi
  2017-06-05 18:05 ` ✗ Fi.CI.BAT: warning for " Patchwork
@ 2017-06-06  7:47 ` Jani Nikula
  2017-06-06 15:16   ` Vivi, Rodrigo
  1 sibling, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2017-06-06  7:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

On Mon, 05 Jun 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> This patch clean up a bit the platform definition block in
> a way to avoid duplications and to let clear that GT3 for
> the current platform only have the extra Media engine.
>
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
>  1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index cf43dc1..e5a730f 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -312,17 +312,21 @@
>  	.has_full_48bit_ppgtt = 1, \
>  	.has_64bit_reloc = 1
>  
> +#define BDW_PLATFORM \
> +	BDW_FEATURES, \
> +	.gen = 8, \
> +	.platform = INTEL_BROADWELL
> +
> +#define EXTRA_MEDIA_ENGINE \
> +	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
> +
>  static const struct intel_device_info intel_broadwell_info = {
> -	BDW_FEATURES,
> -	.gen = 8,
> -	.platform = INTEL_BROADWELL,
> +	BDW_PLATFORM,
>  };
>  
>  static const struct intel_device_info intel_broadwell_gt3_info = {
> -	BDW_FEATURES,
> -	.gen = 8,
> -	.platform = INTEL_BROADWELL,
> -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> +	BDW_PLATFORM,
> +	EXTRA_MEDIA_ENGINE,
>  };
>  
>  static const struct intel_device_info intel_cherryview_info = {
> @@ -347,23 +351,21 @@
>  	CHV_COLORS,
>  };
>  
> +#define SKL_PLATFORM \
> +	BDW_FEATURES, \
> +	.gen = 9, \
> +	.platform = INTEL_SKYLAKE, \
> +	.has_csr = 1, \
> +	.has_guc = 1, \
> +	.ddb_size = 896
> +
>  static const struct intel_device_info intel_skylake_info = {
> -	BDW_FEATURES,
> -	.platform = INTEL_SKYLAKE,
> -	.gen = 9,
> -	.has_csr = 1,
> -	.has_guc = 1,
> -	.ddb_size = 896,
> +	SKL_PLATFORM,
>  };
>  
>  static const struct intel_device_info intel_skylake_gt3_info = {
> -	BDW_FEATURES,
> -	.platform = INTEL_SKYLAKE,
> -	.gen = 9,
> -	.has_csr = 1,
> -	.has_guc = 1,
> -	.ddb_size = 896,
> -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> +	SKL_PLATFORM,
> +	EXTRA_MEDIA_ENGINE,
>  };
>  
>  #define GEN9_LP_FEATURES \
> @@ -406,23 +408,21 @@
>  	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
>  };
>  
> +#define KBL_PLATFORM \
> +	BDW_FEATURES, \
> +	.gen = 9, \
> +	.platform = INTEL_SKYLAKE, \

Copy-paste fail that caught my eye. Didn't look at the patch closer.

BR,
Jani.

> +	.has_csr = 1, \
> +	.has_guc = 1, \
> +	.ddb_size = 896
> +
>  static const struct intel_device_info intel_kabylake_info = {
> -	BDW_FEATURES,
> -	.platform = INTEL_KABYLAKE,
> -	.gen = 9,
> -	.has_csr = 1,
> -	.has_guc = 1,
> -	.ddb_size = 896,
> +	KBL_PLATFORM,
>  };
>  
>  static const struct intel_device_info intel_kabylake_gt3_info = {
> -	BDW_FEATURES,
> -	.platform = INTEL_KABYLAKE,
> -	.gen = 9,
> -	.has_csr = 1,
> -	.has_guc = 1,
> -	.ddb_size = 896,
> -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> +	KBL_PLATFORM,
> +	EXTRA_MEDIA_ENGINE,
>  };
>  
>  /*

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-06  7:47 ` [PATCH] " Jani Nikula
@ 2017-06-06 15:16   ` Vivi, Rodrigo
  0 siblings, 0 replies; 10+ messages in thread
From: Vivi, Rodrigo @ 2017-06-06 15:16 UTC (permalink / raw)
  To: jani.nikula@linux.intel.com; +Cc: intel-gfx@lists.freedesktop.org

On Tue, 2017-06-06 at 10:47 +0300, Jani Nikula wrote:
> On Mon, 05 Jun 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > This patch clean up a bit the platform definition block in
> > a way to avoid duplications and to let clear that GT3 for
> > the current platform only have the extra Media engine.
> >
> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
> >  1 file changed, 33 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index cf43dc1..e5a730f 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -312,17 +312,21 @@
> >  	.has_full_48bit_ppgtt = 1, \
> >  	.has_64bit_reloc = 1
> >  
> > +#define BDW_PLATFORM \
> > +	BDW_FEATURES, \
> > +	.gen = 8, \
> > +	.platform = INTEL_BROADWELL
> > +
> > +#define EXTRA_MEDIA_ENGINE \
> > +	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
> > +
> >  static const struct intel_device_info intel_broadwell_info = {
> > -	BDW_FEATURES,
> > -	.gen = 8,
> > -	.platform = INTEL_BROADWELL,
> > +	BDW_PLATFORM,
> >  };
> >  
> >  static const struct intel_device_info intel_broadwell_gt3_info = {
> > -	BDW_FEATURES,
> > -	.gen = 8,
> > -	.platform = INTEL_BROADWELL,
> > -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +	BDW_PLATFORM,
> > +	EXTRA_MEDIA_ENGINE,
> >  };
> >  
> >  static const struct intel_device_info intel_cherryview_info = {
> > @@ -347,23 +351,21 @@
> >  	CHV_COLORS,
> >  };
> >  
> > +#define SKL_PLATFORM \
> > +	BDW_FEATURES, \
> > +	.gen = 9, \
> > +	.platform = INTEL_SKYLAKE, \
> > +	.has_csr = 1, \
> > +	.has_guc = 1, \
> > +	.ddb_size = 896
> > +
> >  static const struct intel_device_info intel_skylake_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_SKYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > +	SKL_PLATFORM,
> >  };
> >  
> >  static const struct intel_device_info intel_skylake_gt3_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_SKYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +	SKL_PLATFORM,
> > +	EXTRA_MEDIA_ENGINE,
> >  };
> >  
> >  #define GEN9_LP_FEATURES \
> > @@ -406,23 +408,21 @@
> >  	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
> >  };
> >  
> > +#define KBL_PLATFORM \
> > +	BDW_FEATURES, \
> > +	.gen = 9, \
> > +	.platform = INTEL_SKYLAKE, \
> 
> Copy-paste fail that caught my eye. Didn't look at the patch closer.

yeap :(
Anusha also spotted that out so v2 was sent with the fix...
sorry about that...

> 
> BR,
> Jani.
> 
> > +	.has_csr = 1, \
> > +	.has_guc = 1, \
> > +	.ddb_size = 896
> > +
> >  static const struct intel_device_info intel_kabylake_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_KABYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > +	KBL_PLATFORM,
> >  };
> >  
> >  static const struct intel_device_info intel_kabylake_gt3_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_KABYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +	KBL_PLATFORM,
> > +	EXTRA_MEDIA_ENGINE,
> >  };
> >  
> >  /*
> 

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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-05 22:03     ` Vivi, Rodrigo
@ 2017-06-06 16:06       ` Rodrigo Vivi
  2017-06-06 21:58         ` Srivatsa, Anusha
  0 siblings, 1 reply; 10+ messages in thread
From: Rodrigo Vivi @ 2017-06-06 16:06 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

This patch clean up a bit the platform definition block in
a way to avoid duplications and to let clear that GT3 for
the current platform only have the extra Media engine (BSD2).

v2: Kabylake IS_KABYLAKE as Anusha noticed.

v3: Avoid EXTRA_ENGINE_MASK and list rings out on GT3 to
    make it more clear.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 57 +++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index cf43dc1..b283224 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -312,16 +312,17 @@
 	.has_full_48bit_ppgtt = 1, \
 	.has_64bit_reloc = 1
 
+#define BDW_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 8, \
+	.platform = INTEL_BROADWELL
+
 static const struct intel_device_info intel_broadwell_info = {
-	BDW_FEATURES,
-	.gen = 8,
-	.platform = INTEL_BROADWELL,
+	BDW_PLATFORM,
 };
 
 static const struct intel_device_info intel_broadwell_gt3_info = {
-	BDW_FEATURES,
-	.gen = 8,
-	.platform = INTEL_BROADWELL,
+	BDW_PLATFORM,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
 
@@ -347,22 +348,20 @@
 	CHV_COLORS,
 };
 
+#define SKL_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 9, \
+	.platform = INTEL_SKYLAKE, \
+	.has_csr = 1, \
+	.has_guc = 1, \
+	.ddb_size = 896
+
 static const struct intel_device_info intel_skylake_info = {
-	BDW_FEATURES,
-	.platform = INTEL_SKYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	SKL_PLATFORM,
 };
 
 static const struct intel_device_info intel_skylake_gt3_info = {
-	BDW_FEATURES,
-	.platform = INTEL_SKYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	SKL_PLATFORM,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
 
@@ -406,22 +405,20 @@
 	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
 };
 
+#define KBL_PLATFORM \
+	BDW_FEATURES, \
+	.gen = 9, \
+	.platform = INTEL_KABYLAKE, \
+	.has_csr = 1, \
+	.has_guc = 1, \
+	.ddb_size = 896
+
 static const struct intel_device_info intel_kabylake_info = {
-	BDW_FEATURES,
-	.platform = INTEL_KABYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	KBL_PLATFORM,
 };
 
 static const struct intel_device_info intel_kabylake_gt3_info = {
-	BDW_FEATURES,
-	.platform = INTEL_KABYLAKE,
-	.gen = 9,
-	.has_csr = 1,
-	.has_guc = 1,
-	.ddb_size = 896,
+	KBL_PLATFORM,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
 
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-06 16:06       ` Rodrigo Vivi
@ 2017-06-06 21:58         ` Srivatsa, Anusha
  2017-06-07 14:54           ` Rodrigo Vivi
  0 siblings, 1 reply; 10+ messages in thread
From: Srivatsa, Anusha @ 2017-06-06 21:58 UTC (permalink / raw)
  To: Vivi, Rodrigo, intel-gfx@lists.freedesktop.org



>-----Original Message-----
>From: Vivi, Rodrigo
>Sent: Tuesday, June 6, 2017 9:06 AM
>To: intel-gfx@lists.freedesktop.org
>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Chris Wilson <chris@chris-
>wilson.co.uk>; Srivatsa, Anusha <anusha.srivatsa@intel.com>
>Subject: [PATCH] drm/i915: Unify GT* and GT3 definitions
>
>This patch clean up a bit the platform definition block in a way to avoid
>duplications and to let clear that GT3 for the current platform only have the extra
>Media engine (BSD2).
>
>v2: Kabylake IS_KABYLAKE as Anusha noticed.
>
>v3: Avoid EXTRA_ENGINE_MASK and list rings out on GT3 to
>    make it more clear.
>
>Cc: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

> drivers/gpu/drm/i915/i915_pci.c | 57 +++++++++++++++++++----------------------
> 1 file changed, 27 insertions(+), 30 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>index cf43dc1..b283224 100644
>--- a/drivers/gpu/drm/i915/i915_pci.c
>+++ b/drivers/gpu/drm/i915/i915_pci.c
>@@ -312,16 +312,17 @@
> 	.has_full_48bit_ppgtt = 1, \
> 	.has_64bit_reloc = 1
>
>+#define BDW_PLATFORM \
>+	BDW_FEATURES, \
>+	.gen = 8, \
>+	.platform = INTEL_BROADWELL
>+
> static const struct intel_device_info intel_broadwell_info = {
>-	BDW_FEATURES,
>-	.gen = 8,
>-	.platform = INTEL_BROADWELL,
>+	BDW_PLATFORM,
> };
>
> static const struct intel_device_info intel_broadwell_gt3_info = {
>-	BDW_FEATURES,
>-	.gen = 8,
>-	.platform = INTEL_BROADWELL,
>+	BDW_PLATFORM,
> 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
>BSD2_RING,  };
>
>@@ -347,22 +348,20 @@
> 	CHV_COLORS,
> };
>
>+#define SKL_PLATFORM \
>+	BDW_FEATURES, \
>+	.gen = 9, \
>+	.platform = INTEL_SKYLAKE, \
>+	.has_csr = 1, \
>+	.has_guc = 1, \
>+	.ddb_size = 896
>+
> static const struct intel_device_info intel_skylake_info = {
>-	BDW_FEATURES,
>-	.platform = INTEL_SKYLAKE,
>-	.gen = 9,
>-	.has_csr = 1,
>-	.has_guc = 1,
>-	.ddb_size = 896,
>+	SKL_PLATFORM,
> };
>
> static const struct intel_device_info intel_skylake_gt3_info = {
>-	BDW_FEATURES,
>-	.platform = INTEL_SKYLAKE,
>-	.gen = 9,
>-	.has_csr = 1,
>-	.has_guc = 1,
>-	.ddb_size = 896,
>+	SKL_PLATFORM,
> 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
>BSD2_RING,  };
>
>@@ -406,22 +405,20 @@
> 	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }  };
>
>+#define KBL_PLATFORM \
>+	BDW_FEATURES, \
>+	.gen = 9, \
>+	.platform = INTEL_KABYLAKE, \
>+	.has_csr = 1, \
>+	.has_guc = 1, \
>+	.ddb_size = 896
>+
> static const struct intel_device_info intel_kabylake_info = {
>-	BDW_FEATURES,
>-	.platform = INTEL_KABYLAKE,
>-	.gen = 9,
>-	.has_csr = 1,
>-	.has_guc = 1,
>-	.ddb_size = 896,
>+	KBL_PLATFORM,
> };
>
> static const struct intel_device_info intel_kabylake_gt3_info = {
>-	BDW_FEATURES,
>-	.platform = INTEL_KABYLAKE,
>-	.gen = 9,
>-	.has_csr = 1,
>-	.has_guc = 1,
>-	.ddb_size = 896,
>+	KBL_PLATFORM,
> 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
>BSD2_RING,  };
>
>--
>1.9.1

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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Unify GT* and GT3 definitions
  2017-06-06 21:58         ` Srivatsa, Anusha
@ 2017-06-07 14:54           ` Rodrigo Vivi
  0 siblings, 0 replies; 10+ messages in thread
From: Rodrigo Vivi @ 2017-06-07 14:54 UTC (permalink / raw)
  To: Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org, Vivi, Rodrigo

patch merged to dinq
thanks for all comments and reviews

On Tue, Jun 6, 2017 at 2:58 PM, Srivatsa, Anusha
<anusha.srivatsa@intel.com> wrote:
>
>
>>-----Original Message-----
>>From: Vivi, Rodrigo
>>Sent: Tuesday, June 6, 2017 9:06 AM
>>To: intel-gfx@lists.freedesktop.org
>>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Chris Wilson <chris@chris-
>>wilson.co.uk>; Srivatsa, Anusha <anusha.srivatsa@intel.com>
>>Subject: [PATCH] drm/i915: Unify GT* and GT3 definitions
>>
>>This patch clean up a bit the platform definition block in a way to avoid
>>duplications and to let clear that GT3 for the current platform only have the extra
>>Media engine (BSD2).
>>
>>v2: Kabylake IS_KABYLAKE as Anusha noticed.
>>
>>v3: Avoid EXTRA_ENGINE_MASK and list rings out on GT3 to
>>    make it more clear.
>>
>>Cc: Chris Wilson <chris@chris-wilson.co.uk>
>>Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
>> drivers/gpu/drm/i915/i915_pci.c | 57 +++++++++++++++++++----------------------
>> 1 file changed, 27 insertions(+), 30 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>>index cf43dc1..b283224 100644
>>--- a/drivers/gpu/drm/i915/i915_pci.c
>>+++ b/drivers/gpu/drm/i915/i915_pci.c
>>@@ -312,16 +312,17 @@
>>       .has_full_48bit_ppgtt = 1, \
>>       .has_64bit_reloc = 1
>>
>>+#define BDW_PLATFORM \
>>+      BDW_FEATURES, \
>>+      .gen = 8, \
>>+      .platform = INTEL_BROADWELL
>>+
>> static const struct intel_device_info intel_broadwell_info = {
>>-      BDW_FEATURES,
>>-      .gen = 8,
>>-      .platform = INTEL_BROADWELL,
>>+      BDW_PLATFORM,
>> };
>>
>> static const struct intel_device_info intel_broadwell_gt3_info = {
>>-      BDW_FEATURES,
>>-      .gen = 8,
>>-      .platform = INTEL_BROADWELL,
>>+      BDW_PLATFORM,
>>       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
>>BSD2_RING,  };
>>
>>@@ -347,22 +348,20 @@
>>       CHV_COLORS,
>> };
>>
>>+#define SKL_PLATFORM \
>>+      BDW_FEATURES, \
>>+      .gen = 9, \
>>+      .platform = INTEL_SKYLAKE, \
>>+      .has_csr = 1, \
>>+      .has_guc = 1, \
>>+      .ddb_size = 896
>>+
>> static const struct intel_device_info intel_skylake_info = {
>>-      BDW_FEATURES,
>>-      .platform = INTEL_SKYLAKE,
>>-      .gen = 9,
>>-      .has_csr = 1,
>>-      .has_guc = 1,
>>-      .ddb_size = 896,
>>+      SKL_PLATFORM,
>> };
>>
>> static const struct intel_device_info intel_skylake_gt3_info = {
>>-      BDW_FEATURES,
>>-      .platform = INTEL_SKYLAKE,
>>-      .gen = 9,
>>-      .has_csr = 1,
>>-      .has_guc = 1,
>>-      .ddb_size = 896,
>>+      SKL_PLATFORM,
>>       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
>>BSD2_RING,  };
>>
>>@@ -406,22 +405,20 @@
>>       .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }  };
>>
>>+#define KBL_PLATFORM \
>>+      BDW_FEATURES, \
>>+      .gen = 9, \
>>+      .platform = INTEL_KABYLAKE, \
>>+      .has_csr = 1, \
>>+      .has_guc = 1, \
>>+      .ddb_size = 896
>>+
>> static const struct intel_device_info intel_kabylake_info = {
>>-      BDW_FEATURES,
>>-      .platform = INTEL_KABYLAKE,
>>-      .gen = 9,
>>-      .has_csr = 1,
>>-      .has_guc = 1,
>>-      .ddb_size = 896,
>>+      KBL_PLATFORM,
>> };
>>
>> static const struct intel_device_info intel_kabylake_gt3_info = {
>>-      BDW_FEATURES,
>>-      .platform = INTEL_KABYLAKE,
>>-      .gen = 9,
>>-      .has_csr = 1,
>>-      .has_guc = 1,
>>-      .ddb_size = 896,
>>+      KBL_PLATFORM,
>>       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |
>>BSD2_RING,  };
>>
>>--
>>1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-06-07 14:54 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-05 17:47 [PATCH] drm/i915: Unify GT* and GT3 definitions Rodrigo Vivi
2017-06-05 18:05 ` ✗ Fi.CI.BAT: warning for " Patchwork
2017-06-06  7:47 ` [PATCH] " Jani Nikula
2017-06-06 15:16   ` Vivi, Rodrigo
     [not found] <83F5C7385F545743AD4FB2A62F75B0732C3CC5AC@ORSMSX107.amr.corp.intel.com>
2017-06-05 20:21 ` Rodrigo Vivi
2017-06-05 21:07   ` Chris Wilson
2017-06-05 22:03     ` Vivi, Rodrigo
2017-06-06 16:06       ` Rodrigo Vivi
2017-06-06 21:58         ` Srivatsa, Anusha
2017-06-07 14:54           ` Rodrigo Vivi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.