* [PATCH] drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
@ 2017-04-04 13:38 Michal Wajdeczko
2017-04-04 13:52 ` Tvrtko Ursulin
2017-04-04 14:53 ` ✓ Fi.CI.BAT: success for " Patchwork
0 siblings, 2 replies; 4+ messages in thread
From: Michal Wajdeczko @ 2017-04-04 13:38 UTC (permalink / raw)
To: intel-gfx
Almost all other GuC fw definitions are using GUC|guc prefix.
While around, in get_core_family() change explicit WARN into MISSING_CASE
as it looks more appropriate, since GuC support capability we are controlling
by intel_device_info.has_guc flag.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ++--
drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
index cb36cbf..6156845 100644
--- a/drivers/gpu/drm/i915/intel_guc_fwif.h
+++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
@@ -23,8 +23,8 @@
#ifndef _INTEL_GUC_FWIF_H
#define _INTEL_GUC_FWIF_H
-#define GFXCORE_FAMILY_GEN9 12
-#define GFXCORE_FAMILY_UNKNOWN 0x7fffffff
+#define GUC_CORE_FAMILY_GEN9 12
+#define GUC_CORE_FAMILY_UNKNOWN 0x7fffffff
#define GUC_CLIENT_PRIORITY_KMD_HIGH 0
#define GUC_CLIENT_PRIORITY_HIGH 1
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 8a1a023..2793c01 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -86,11 +86,11 @@ static u32 get_core_family(struct drm_i915_private *dev_priv)
switch (gen) {
case 9:
- return GFXCORE_FAMILY_GEN9;
+ return GUC_CORE_FAMILY_GEN9;
default:
- WARN(1, "GEN%d does not support GuC operation!\n", gen);
- return GFXCORE_FAMILY_UNKNOWN;
+ MISSING_CASE(gen);
+ return GUC_CORE_FAMILY_UNKNOWN;
}
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
2017-04-04 13:38 [PATCH] drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions Michal Wajdeczko
@ 2017-04-04 13:52 ` Tvrtko Ursulin
2017-04-05 9:08 ` Chris Wilson
2017-04-04 14:53 ` ✓ Fi.CI.BAT: success for " Patchwork
1 sibling, 1 reply; 4+ messages in thread
From: Tvrtko Ursulin @ 2017-04-04 13:52 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx
On 04/04/2017 14:38, Michal Wajdeczko wrote:
> Almost all other GuC fw definitions are using GUC|guc prefix.
> While around, in get_core_family() change explicit WARN into MISSING_CASE
> as it looks more appropriate, since GuC support capability we are controlling
> by intel_device_info.has_guc flag.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ++--
> drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
> index cb36cbf..6156845 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fwif.h
> +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
> @@ -23,8 +23,8 @@
> #ifndef _INTEL_GUC_FWIF_H
> #define _INTEL_GUC_FWIF_H
>
> -#define GFXCORE_FAMILY_GEN9 12
> -#define GFXCORE_FAMILY_UNKNOWN 0x7fffffff
> +#define GUC_CORE_FAMILY_GEN9 12
> +#define GUC_CORE_FAMILY_UNKNOWN 0x7fffffff
>
> #define GUC_CLIENT_PRIORITY_KMD_HIGH 0
> #define GUC_CLIENT_PRIORITY_HIGH 1
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 8a1a023..2793c01 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -86,11 +86,11 @@ static u32 get_core_family(struct drm_i915_private *dev_priv)
>
> switch (gen) {
> case 9:
> - return GFXCORE_FAMILY_GEN9;
> + return GUC_CORE_FAMILY_GEN9;
>
> default:
> - WARN(1, "GEN%d does not support GuC operation!\n", gen);
> - return GFXCORE_FAMILY_UNKNOWN;
> + MISSING_CASE(gen);
> + return GUC_CORE_FAMILY_UNKNOWN;
> }
> }
>
>
I agree that this is much more appropriate error handling for this
layer. Prefix also makes sense.
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
2017-04-04 13:38 [PATCH] drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions Michal Wajdeczko
2017-04-04 13:52 ` Tvrtko Ursulin
@ 2017-04-04 14:53 ` Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-04-04 14:53 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
URL : https://patchwork.freedesktop.org/series/22436/
State : success
== Summary ==
Series 22436v1 drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
https://patchwork.freedesktop.org/api/1.0/series/22436/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
fail -> PASS (fi-skl-6700k) fdo#100367
Test prime_vgem:
Subgroup basic-fence-flip:
dmesg-warn -> PASS (fi-byt-n2820) fdo#100094
fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100367 https://bugs.freedesktop.org/show_bug.cgi?id=100367
fdo#100094 https://bugs.freedesktop.org/show_bug.cgi?id=100094
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 429s
fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 425s
fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 574s
fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 508s
fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 540s
fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 482s
fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 484s
fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 414s
fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 405s
fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 427s
fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 495s
fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 488s
fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 453s
fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 571s
fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 452s
fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 570s
fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 457s
fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 439s
fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 534s
fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 405s
fi-skl-6770hq failed to collect. IGT log at Patchwork_4396/fi-skl-6770hq/igt.log
38a5db0d3643f519d86f42029b7a93e624807a71 drm-tip: 2017y-04m-04d-13h-24m-06s UTC integration manifest
eb0b122 drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4396/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions
2017-04-04 13:52 ` Tvrtko Ursulin
@ 2017-04-05 9:08 ` Chris Wilson
0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2017-04-05 9:08 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
On Tue, Apr 04, 2017 at 02:52:06PM +0100, Tvrtko Ursulin wrote:
>
> On 04/04/2017 14:38, Michal Wajdeczko wrote:
> >Almost all other GuC fw definitions are using GUC|guc prefix.
> >While around, in get_core_family() change explicit WARN into MISSING_CASE
> >as it looks more appropriate, since GuC support capability we are controlling
> >by intel_device_info.has_guc flag.
> >
> >Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> >Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
And pushed, thanks for the patch and review.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-05 9:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-04 13:38 [PATCH] drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions Michal Wajdeczko
2017-04-04 13:52 ` Tvrtko Ursulin
2017-04-05 9:08 ` Chris Wilson
2017-04-04 14:53 ` ✓ Fi.CI.BAT: success for " Patchwork
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.