drm/i915/guc: Removed unused GuC parameters.
Subsystems (2)
PATCH 1/1 drm/i915/guc: Removed unused GuC parameters.
In the i915 driver, there is a function, intel_guc_init_params(), which initializes the GuC parameter block which is passed into the GuC. There is parameter GUC_CTL_DEVICE_INFO with values GfxGtType and GfxCoreFamily unused by GuC.
This patch remove GUC_CTL_DEVICE_INFO with GfxGtType and GfxCoreFamily parameters and also unnecessary functions get_gt_type() and get_core_family().
--- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ---- drivers/gpu/drm/i915/intel_uc.c | 2 ++ 4 files changed, 3 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -47,7 +47,7 @@ struct drm_printer; param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \ param(int, guc_log_level, 0) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
drivers/gpu/drm/i915/intel_guc.c +0 -24
@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {
@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by:
drivers/gpu/drm/i915/intel_guc_fwif.h +0 -4
@@ -81,10 +81,6 @@#define GUC_CTL_ARAT_HIGH 1#define GUC_CTL_ARAT_LOW 2 -#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 -#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)
drivers/gpu/drm/i915/intel_uc.c +2 -0
@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) enable_guc |=ENABLE_GUC_LOAD_HUC ;/* Any platform specific fine-tuning can be done here */ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) + enable_guc =0 ;return enable_guc; }
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/guc: Removed unused GuC parameters.
== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters.
URL : https://patchwork.freedesktop.org/series/39154/
State : success
== Summary ==
Series 39154v1 drm/i915/guc: Removed unused GuC parameters.
https://patchwork.freedesktop.org/api/1.0/series/39154/revisions/1/mbox/
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:422s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:374s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:493s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:288s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:480s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:484s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:470s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:459s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:396s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:566s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:578s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:415s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:285s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:507s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:393s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:454s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:417s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:457s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:490s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:448s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:491s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:586s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:424s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:502s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:519s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:481s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:478s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:408s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:432s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:525s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:394s
573e919160e546baa4268a213400f9f42f72ae97 drm-tip: 2018y-02m-28d-16h-17m-37s UTC integration manifest 413edd39a3f2 drm/i915/guc: Removed unused GuC parameters.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8189/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Piotr Piórkowski
In the i915 driver, there is a function,
intel_guc_init_params(), which initializes the GuC parameter block which is passed into the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values GfxGtType and GfxCoreFamily unused by GuC.This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().
Hi,
Looking at the fw code, you're partially right, GfxGtType is ignored... but GfxCoreFamily isn't.
If you don't pass a known GfxCoreFamily, SLPC will be disabled (enabling SLPC is in some manager's wish list). Also it seems nobody remembered to add GUC_CORE_FAMILY_GEN10 for CNL.
Quoted 13 lines
Signed-off-by Piotr Piórkowski <[email protected]>--- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ---- drivers/gpu/drm/i915/intel_uc.c | 2 ++ 4 files changed, 3 insertions(+), 29 deletions(-)drivers/gpu/drm/i915/i915_params.h +0
-0
drivers/gpu/drm/i915/i915_params.h struct drm_printer; · line 50
Quoted 5 lines
drivers/gpu/drm/i915/i915_params.h +1
-1@@ -47,7 +47,7 @@ struct drm_printer; param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ -param (int, enable_guc,0 ) \ +param (int, enable_guc,-1 ) \
This shouldn't be part of your patch, enable guc submission in a 2nd patch, for example: [PATCH 2/2] HAX: Enable GuC submission for CI
Quoted 65 lines
drivers/gpu/drm/i915/i915_params.h +0
-0param(int, guc_log_level, 0) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \drivers/gpu/drm/i915/intel_guc.c +0
-24@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by: drivers/gpu/drm/i915/intel_guc_fwif.h +0
-4@@ -81,10 +81,6 @@#define GUC_CTL_ARAT_HIGH 1#define GUC_CTL_ARAT_LOW 2 -#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 -#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)drivers/gpu/drm/i915/intel_uc.c +0
-0
drivers/gpu/drm/i915/intel_uc.c static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) · line 67
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +2
-0@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) enable_guc |=ENABLE_GUC_LOAD_HUC ;/* Any platform specific fine-tuning can be done here */ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) + enable_guc =0 ;
This is also part of [PATCH 2/2] HAX: Enable GuC submission for CI
drivers/gpu/drm/i915/intel_uc.c static int __get_platform_enable_guc(struct drm_i915_private *dev_priv)
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0return enable_guc; }
-Michel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Michel Thierry
Quoted 5 lines · Piotr Piórkowski
In the i915 driver, there is a function,
intel_guc_init_params(), which initializes the GuC parameter block which is passed into the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values GfxGtType and GfxCoreFamily unused by GuC.
Quoted 9 lines
Quoted 4 lines
This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().Hi,
Looking at the fw code, you're partially right, GfxGtType is ignored... but GfxCoreFamily isn't.
Unless whoever wrote the fw was smart enough to forget to call the function that is reading GfxCoreFamily... I didn't count on that.
So yes, guc couldn't care less about what value we put in GfxCoreFamily.
Then I would also remove the defines from intel_guc_fwif.h:
--#define GUC_CORE_FAMILY_GEN9 12
--#define GUC_CORE_FAMILY_UNKNOWN 0x7fffffff
-Michel
Quoted 92 lines
If you don't pass a known GfxCoreFamily, SLPC will be disabled (enabling SLPC is in some manager's wish list). Also it seems nobody remembered to add
GUC_CORE_FAMILY_GEN10for CNL.Quoted 13 lines
Signed-off-by Piotr Piórkowski <[email protected]>---
drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------drivers/gpu/drm/i915/intel_guc_fwif.h| 4 ---- drivers/gpu/drm/i915/intel_uc.c | 2 ++4 files changed, 3 insertions(+), 29 deletions(-)drivers/gpu/drm/i915/i915_params.h +0
-0drivers/gpu/drm/i915/i915_params.h struct drm_printer; · line 50
Quoted 5 lines
drivers/gpu/drm/i915/i915_params.h +1
-1@@ -47,7 +47,7 @@ struct drm_printer; param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \This shouldn't be part of your patch, enable guc submission in a 2nd patch, for example: [PATCH 2/2] HAX: Enable GuC submission for CI
Quoted 61 lines
drivers/gpu/drm/i915/i915_params.h +0
-0param(int, guc_log_level, 0) \ param(char *, guc_firmware_path, NULL) \ param(char *, huc_firmware_path, NULL) \drivers/gpu/drm/i915/intel_guc.c +0
-24@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc) guc_shared_data_destroy(guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ - /* XXX: GT type based on PCI device ID? field seems unused by fw */ - return 0; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ - u32 gen = INTEL_GEN(dev_priv); - - switch (gen) { - case 9: - return GUC_CORE_FAMILY_GEN9; - - default: - MISSING_CASE(gen); - return GUC_CORE_FAMILY_UNKNOWN; - } -} - static u32 get_log_verbosity_flags(void) { if (i915_modparams.guc_log_level > 0) {@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc) memset(params, 0, sizeof(params)); - params[GUC_CTL_DEVICE_INFO] |= - (get_gt_type(dev_priv) << GUC_CTL_GT_TYPE_SHIFT) | - (get_core_family(dev_priv) << GUC_CTL_CORE_FAMILY_SHIFT); - /** GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by: drivers/gpu/drm/i915/intel_guc_fwif.h +0
-4@@ -81,10 +81,6 @@ #define GUC_CTL_ARAT_HIGH 1 #define GUC_CTL_ARAT_LOW 2 -#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 - #define GUC_CTL_LOG_PARAMS 4 #define GUC_LOG_VALID (1 << 0) #define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)drivers/gpu/drm/i915/intel_uc.c +0
-0drivers/gpu/drm/i915/intel_uc.c static int __get_platform_enable_guc(struct · line 67
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +2
-0@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) enable_guc |= ENABLE_GUC_LOAD_HUC; /* Any platform specific fine-tuning can be done here */ + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) + enable_guc = 0;This is also part of [PATCH 2/2] HAX: Enable GuC submission for CI
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c static int __get_platform_enable_guc(struct drm_i915_private *dev_priv)
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0return enable_guc; }-Michel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michel Thierry (2018-02-28 22:07:51)
Quoted 12 lines · Michel Thierry
Quoted 11 lines · Piotr Piórkowski
Quoted 9 lines
In the i915 driver, there is a function,
intel_guc_init_params(), which initializes the GuC parameter block which is passed into the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values GfxGtType and GfxCoreFamily unused by GuC.This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().
Quoted 8 lines
Quoted 5 lines
Hi,
Looking at the fw code, you're partially right, GfxGtType is ignored... but GfxCoreFamily isn't.
Unless whoever wrote the fw was smart enough to forget to call the function that is reading GfxCoreFamily... I didn't count on that.
Is the intention to use GfxCoreFamily documented, i.e. are they expecting it part of the interface and may re-instantiate the check "because it was always supposed to exist" in some future version? -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Chris Wilson
Quoting Michel Thierry (2018-02-28 22:07:51)
Quoted 13 lines · Michel Thierry
Quoted 12 lines · Piotr Piórkowski
Quoted 9 lines
In the i915 driver, there is a function,
intel_guc_init_params(), which initializes the GuC parameter block which is passed into the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values GfxGtType and GfxCoreFamily unused by GuC.This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().Hi,
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Looking at the fw code, you're partially right, GfxGtType is ignored... but GfxCoreFamily isn't.
Unless whoever wrote the fw was smart enough to forget to call the function that is reading GfxCoreFamily... I didn't count on that.
Is the intention to use GfxCoreFamily documented, i.e. are they expecting it part of the interface and may re-instantiate the check "because it was always supposed to exist" in some future version?
Usage of GfxCoreFamily is only in SLPC and for platform specific initialization and might be removed in future interfaces. If needed, we can add as part of SLPC patches.
Quoted 5 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Thanks, Sagar _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 29 lines · Sagar Arun Kamble
Quoted 27 lines · Chris Wilson
Quoting Michel Thierry (2018-02-28 22:07:51)
Quoted 25 lines · Michel Thierry
Quoted 14 lines · Piotr Piórkowski
Quoted 8 lines
In the i915 driver, there is a function,
intel_guc_init_params(),
which initializes the GuC parameter block which is passed into
the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values GfxGtType and GfxCoreFamily unused by GuC.Quoted 4 lines
This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().Quoted 6 lines
Hi,
Looking at the fw code, you're partially right, GfxGtType is ignored...
but GfxCoreFamily isn't.Unless whoever wrote the fw was smart enough to forget to call the
function that is reading GfxCoreFamily... I didn't count on that.
Quoted 6 lines
Quoted 3 lines
Is the intention to use GfxCoreFamily documented, i.e. are they expecting it part of the interface and may re-instantiate the check "because it was always supposed to exist" in some future version?
Usage of GfxCoreFamily is only in SLPC and for platform specific initialization and might be removed in future interfaces. If needed, we can add as part of SLPC patches.
Michel and I have traced through the FW code, and both parameters are unused. GfxCoreFamily does appear to be set in the FW, and it gets passed into SLPC, but then it never gets used. I have confirmed with FW developers that these parameters have been removed for future gens.
Quoted 6 lines
Quoted 6 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · John Spotswood
Quoted 27 lines · Sagar Arun Kamble
Quoted 26 lines · Chris Wilson
Quoting Michel Thierry (2018-02-28 22:07:51)
Quoted 15 lines · Michel Thierry
Quoted 14 lines · Piotr Piórkowski
Quoted 11 lines
In the i915 driver, there is a function,
intel_guc_init_params(),
which initializes the GuC parameter block which is passed into
the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values GfxGtType and GfxCoreFamily unused by GuC.This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().Hi,
Quoted 7 lines
Quoted 4 lines
Looking at the fw code, you're partially right, GfxGtType is ignored...
but GfxCoreFamily isn't.Unless whoever wrote the fw was smart enough to forget to call the
function that is reading GfxCoreFamily... I didn't count on that.Is the intention to use GfxCoreFamily documented, i.e. are they expecting it part of the interface and may re-instantiate the check "because it was always supposed to exist" in some future version?
Quoted 6 lines
Quoted 3 lines
Usage of GfxCoreFamily is only in SLPC and for platform specific initialization and might be removed in future interfaces. If needed, we can add as part of SLPC patches.
Michel and I have traced through the FW code, and both parameters are unused. GfxCoreFamily does appear to be set in the FW, and it gets passed into SLPC, but then it never gets used.
Hi John,
It is needed for SLPC initialization. Verified on v9 GuC firmware that SLPC GTPERF gets disabled if i915 does not send this param. We can add this param as part of SLPC patches for GuC versions which need them.
Thanks
Sagar
Quoted 7 lines
I have confirmed with
FW developers that these parameters have been removed for future gens.Quoted 5 lines
Quoted 5 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Thanks, Sagar _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Sagar Arun Kamble
Quoted 38 lines · John Spotswood
Quoted 37 lines · Sagar Arun Kamble
Quoted 35 lines · Chris Wilson
Quoting Michel Thierry (2018-02-28 22:07:51)
Quoted 23 lines · Michel Thierry
Quoted 14 lines · Piotr Piórkowski
Quoted 8 lines
In the i915 driver, there is a function,
intel_guc_init_params(),
which initializes the GuC parameter block which is passed into
the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values
GfxGtType and GfxCoreFamily unused by GuC.Quoted 4 lines
This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().Quoted 7 lines
Hi,
Looking at the fw code, you're partially right, GfxGtType is
ignored...
but GfxCoreFamily isn't.Quoted 5 lines
Unless whoever wrote the fw was smart enough to forget to call
the
function that is reading GfxCoreFamily... I didn't count on that.Is the intention to use GfxCoreFamily documented, i.e. are they expecting it part of the interface and may re-instantiate the check
"because it was always supposed to exist" in some future version?Quoted 8 lines
Quoted 3 lines
Usage of GfxCoreFamily is only in SLPC and for platform specific initialization and might be removed in future interfaces. If needed, we can add as part of SLPC patches.
Michel and I have traced through the FW code, and both parameters are
unused. GfxCoreFamily does appear to be set in the FW, and it gets passed into SLPC, but then it never gets used.
Quoted 7 lines
Hi John,
It is needed for SLPC initialization. Verified on v9 GuC firmware that
SLPC GTPERF gets disabled if i915 does not send this param. We can add this param as part of SLPC patches for GuC versions which need them.
Ok, so I think that we should remove this param from i915, and than if it is needed, we can add this param as part of SLPC patches, as Sagar said.
-Piotr
Quoted 13 lines
Thanks
SagarQuoted 8 lines
I have confirmed with
FW developers that these parameters have been removed for future gens.Quoted 5 lines
Quoted 5 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 64 lines · Piotr
Quoted 55 lines · Sagar Arun Kamble
Quoted 47 lines · John Spotswood
Quoted 41 lines · Sagar Arun Kamble
Quoted 33 lines · Chris Wilson
Quoting Michel Thierry (2018-02-28 22:07:51)
Quoted 26 lines · Michel Thierry
Quoted 17 lines · Piotr Piórkowski
Quoted 10 lines
In the i915 driver, there is a function,
intel_guc_init_params(),
which initializes the GuC parameter block which is passed
into
the GuC. There is parameterGUC_CTL_DEVICE_INFOwith values
GfxGtType and GfxCoreFamily unused by GuC.Quoted 5 lines
This patch remove
GUC_CTL_DEVICE_INFOwith GfxGtType and
GfxCoreFamily parameters and also unnecessary functionsget_gt_type()andget_core_family().Quoted 7 lines
Hi,
Looking at the fw code, you're partially right, GfxGtType is
ignored...
but GfxCoreFamily isn't.Quoted 5 lines
Unless whoever wrote the fw was smart enough to forget to call
the
function that is reading GfxCoreFamily... I didn't count on that.Quoted 6 lines
Is the intention to use GfxCoreFamily documented, i.e. are they
expecting it part of the interface and may re-instantiate the check
"because it was always supposed to exist" in some future version?Quoted 4 lines
Usage of GfxCoreFamily is only in SLPC and for platform specific
initialization and might be removed in future interfaces. If needed, we can add as part of SLPC patches.Quoted 5 lines
Michel and I have traced through the FW code, and both parameters are
unused. GfxCoreFamily does appear to be set in the FW, and it gets
passed into SLPC, but then it never gets used.Quoted 8 lines
Hi John,
It is needed for SLPC initialization. Verified on v9 GuC firmware that
SLPC GTPERF gets disabled if i915 does not send this param. We can add this param as part of SLPC patches for GuC versions which
need them.
Quoted 4 lines
Ok, so I think that we should remove this param from i915, and than if
it is needed, we can add this param as part of SLPC patches, as Sagar said.
I have gone back and taken another look at the FW code, and Sagar is correct. There is a link there. Apologies for the mistake. With that in mind, I'm not clear why we would remove the parameter only to add it back with the SLPC patches.
Quoted 17 lines
-Piotr
Quoted 15 lines
Thanks
SagarQuoted 11 lines
I have confirmed with
FW developers that these parameters have been removed for future gens.Quoted 7 lines
Quoted 7 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm/i915/guc: Removed unused GuC parameters.
In reply to Piotr Piórkowski== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters.
URL : https://patchwork.freedesktop.org/series/39154/
State : failure
== Summary ==
---- Possible new issues:
Test drv_missed_irq:
pass -> SKIP (shard-apl)
Test drv_selftest:
Subgroup live_guc:
pass -> DMESG-WARN (shard-apl)
Test kms_chv_cursor_fail:
Subgroup pipe-b-64x64-right-edge:
pass -> DMESG-WARN (shard-snb)
Test kms_draw_crc:
Subgroup draw-method-xrgb8888-mmap-cpu-xtiled:
skip -> PASS (shard-snb)
Test perf:
Subgroup gen8-unprivileged-single-ctx-counters:
pass -> FAIL (shard-apl)---- Known issues:
Test gem_eio:
Subgroup in-flight:
pass -> INCOMPLETE (shard-apl) fdo#104945
Test kms_flip:
Subgroup dpms-vs-vblank-race-interruptible:
fail -> PASS (shard-hsw) fdo#103060
Subgroup plain-flip-ts-check:
fail -> PASS (shard-hsw) fdo#100368 +1
Test kms_frontbuffer_tracking:
Subgroup fbc-badstride:
pass -> FAIL (shard-apl) fdo#101623fdo#104945 https://bugs.freedesktop.org/show_bug.cgi?id=104945
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-apl total:3434 pass:1794 dwarn:2 dfail:0 fail:14 skip:1622 time:11971s shard-hsw total:3460 pass:1767 dwarn:1 dfail:0 fail:1 skip:1690 time:11804s shard-snb total:3460 pass:1358 dwarn:2 dfail:0 fail:1 skip:2099 time:6621s
Blacklisted hosts:
shard-kbl total:3265 pass:1744 dwarn:29 dfail:1 fail:14 skip:1474 time:8753s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8189/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
In reply to Piotr PiórkowskiIt looks that GuC does not actively use GUC_CTL_DEVICE_INFO parameter where we are passing GT type and Core family values.
Lets stop setup this parameter and remove related definitions.
v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)
--- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 7 ------- 2 files changed, 31 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +0 -24
@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {
@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by:
drivers/gpu/drm/i915/intel_guc_fwif.h +0 -7
@@ -23,9 +23,6 @@#ifndef _INTEL_GUC_FWIF_H#define _INTEL_GUC_FWIF_H -#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#define GUC_CLIENT_PRIORITY_KMD_NORMAL 2
@@ -81,10 +78,6 @@#define GUC_CTL_ARAT_HIGH 1#define GUC_CTL_ARAT_LOW 2 -#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 -#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
Quoted 77 lines · Piotr Piórkowski
It looks that GuC does not actively use
GUC_CTL_DEVICE_INFOparameter where we are passing GT type and Core family values.
Lets stop setup this parameter and remove related definitions.v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)Signed-off-by Piotr Piórkowski <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Michał Winiarski <[email protected]>Cc John A Spotswood <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 7 ------- 2 files changed, 31 deletions(-)drivers/gpu/drm/i915/intel_guc.c +0
-24@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by: drivers/gpu/drm/i915/intel_guc_fwif.h +0
-3@@ -23,9 +23,6 @@#ifndef _INTEL_GUC_FWIF_H#define _INTEL_GUC_FWIF_H -#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#define GUC_CLIENT_PRIORITY_KMD_NORMAL 2
drivers/gpu/drm/i915/intel_guc_fwif.h line 84
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_fwif.h +0
-1@@ -81,10 +78,6 @@#define GUC_CTL_ARAT_HIGH 1#define GUC_CTL_ARAT_LOW 2 -#define GUC_CTL_DEVICE_INFO 3
I would keep GUC_CTL_DEVICE_INFO (still removing _GT_TYPE_SHIFT and _CORE_FAMILY_SHIFT). The reason is that these constants kindof also document what the guc_control is. Other people may even suggest to rename it GUC_CTL_RSRVD0.
That's why we have GUC_CTL_PAGE_FAULT_CONTROL and GUC_CTL_RSRVD defined but not used.
drivers/gpu/drm/i915/intel_guc_fwif.h line 83
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_fwif.h +0
-3-#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 -#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)
I think the consensus was that gt_type and core_family are not needed now, and if someone needs them at some point in the very very distant future, then the same person can re-add them, so
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
In reply to Piotr PiórkowskiQuoted 3 lines · Piotr Piórkowski
It looks that GuC does not actively use
GUC_CTL_DEVICE_INFOparameter where we are passing GT type and Core family values.
Lets stop setup this parameter and remove related definitions.
Minor change to sentence above: Let's stop/remove setup of this parameter ...
Quoted 5 lines
v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)
Quoted 7 lines
Signed-off-by Piotr Piórkowski <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Michał Winiarski <[email protected]>Cc John A Spotswood <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Michel Thierry <[email protected]>
With Michel's suggestion and then corresponding subject update patch looks good to me.
Quoted 72 lines
--- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 7 ------- 2 files changed, 31 deletions(-)drivers/gpu/drm/i915/intel_guc.c +0
-24@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by: drivers/gpu/drm/i915/intel_guc_fwif.h +0
-7@@ -23,9 +23,6 @@#ifndef _INTEL_GUC_FWIF_H#define _INTEL_GUC_FWIF_H -#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#define GUC_CLIENT_PRIORITY_KMD_NORMAL 2@@ -81,10 +78,6 @@#define GUC_CTL_ARAT_HIGH 1#define GUC_CTL_ARAT_LOW 2 -#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 -#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)
Signature · 7 lines
Thanks, Sagar _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
Quoted 97 lines · Sagar Arun Kamble
Quoted 4 lines · Piotr Piórkowski
It looks that GuC does not actively use
GUC_CTL_DEVICE_INFOparameter
where we are passing GT type and Core family values. Lets stop setup this parameter and remove related definitions.Minor change to sentence above: Let's stop/remove setup of this parameter ...
Quoted 5 lines
v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)Quoted 7 lines
Signed-off-by Piotr Piórkowski <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Michał Winiarski <[email protected]>Cc John A Spotswood <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Michel Thierry <[email protected]>With Michel's suggestion and then corresponding subject update patch looks good to me.
Reviewed-by Sagar Arun Kamble <[email protected]>Quoted 72 lines
--- drivers/gpu/drm/i915/intel_guc.c | 24 ---------------------- -- drivers/gpu/drm/i915/intel_guc_fwif.h | 7 ------- 2 files changed, 31 deletions(-)drivers/gpu/drm/i915/intel_guc.c +0
-3@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */
drivers/gpu/drm/i915/intel_guc.c +0
-21-return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) << GUC_CTL_CORE_FAMILY_SHIFT); -/* * GuC ARAT increment is 10 ns. GuC default scheduler
quantum is one
* second. This ARAR is calculated by:drivers/gpu/drm/i915/intel_guc_fwif.h +0
-3@@ -23,9 +23,6 @@#ifndef _INTEL_GUC_FWIF_H#define _INTEL_GUC_FWIF_H -#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#define GUC_CLIENT_PRIORITY_KMD_NORMAL 2@@ -81,10 +78,6 @@#define GUC_CTL_ARAT_HIGH 1#define GUC_CTL_ARAT_LOW 2
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_fwif.h line 83
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_fwif.h +0
-4-#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7 -#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)
What's next with this patch? Can we merge it ?
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
In reply to Piotr PiórkowskiIt looks that GuC does not actively use GUC_CTL_DEVICE_INFO parameter where we are passing GT type and Core family values.
Let's stop/remove setup of this parameter and remove related definitions.
v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)
v3:
- The removed define GUC_CTL_DEVICE_INFO has been restored (Michel)
- Updated description (Sagar)
--- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 5 ----- 2 files changed, 29 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +0 -24
@@ -200,26 +200,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_verbosity_flags (void ) {if (i915_modparams.guc_log_level >0 ) {
@@ -246,10 +226,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by:
drivers/gpu/drm/i915/intel_guc_fwif.h +0 -5
@@ -23,9 +23,6 @@#ifndef _INTEL_GUC_FWIF_H#define _INTEL_GUC_FWIF_H -#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#define GUC_CLIENT_PRIORITY_KMD_NORMAL 2
@@ -82,8 +79,6 @@#define GUC_CTL_ARAT_LOW 2#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/1 drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
It looks that GuC does not actively use GUC_CTL_DEVICE_INFO parameter where we are passing GT type and Core family values.
Let's stop/remove setup of this parameter and remove related definitions.
v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)
v3:
- The removed define GUC_CTL_DEVICE_INFO has been restored (Michel)
- Updated description (Sagar)
v4: rebase
--- drivers/gpu/drm/i915/intel_guc.c | 24 ------------------------ drivers/gpu/drm/i915/intel_guc_fwif.h | 5 ----- 2 files changed, 29 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +0 -24
@@ -203,26 +203,6 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_gt_type (struct drm_i915_private *dev_priv) -{ -/* XXX: GT type based on PCI device ID? field seems unused by fw */ -return 0 ; -} - -static u32 get_core_family (struct drm_i915_private *dev_priv) -{ -u32 gen =INTEL_GEN (dev_priv); - -switch (gen) { -case 9 : -return GUC_CORE_FAMILY_GEN9 ; - -default : -MISSING_CASE (gen); -return GUC_CORE_FAMILY_UNKNOWN ; - } -} -static u32 get_log_control_flags (void ) {u32 level = i915_modparams.guc_log_level;
@@ -255,10 +235,6 @@ void intel_guc_init_params(struct intel_guc *guc)memset (params,0 ,sizeof (params)); - params[GUC_CTL_DEVICE_INFO ] |= - (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT ); -/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one * second. This ARAR is calculated by:
drivers/gpu/drm/i915/intel_guc_fwif.h +0 -5
@@ -23,9 +23,6 @@#ifndef _INTEL_GUC_FWIF_H#define _INTEL_GUC_FWIF_H -#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#define GUC_CLIENT_PRIORITY_KMD_NORMAL 2
@@ -82,8 +79,6 @@#define GUC_CTL_ARAT_LOW 2#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GT_TYPE_SHIFT 0 -#define GUC_CTL_CORE_FAMILY_SHIFT 7#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4] drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
Quoting Piotr Piórkowski (2018-04-13 09:52:45)
Quoted 13 lines
It looks that GuC does not actively use
GUC_CTL_DEVICE_INFOparameter where we are passing GT type and Core family values.
Let's stop/remove setup of this parameter and remove related definitions.v2: (this time without squashed HAX)
- New title and description
- Remove also GUC_CORE_FAMILY_* definitions (Michel)
v3:
- The removed defineGUC_CTL_DEVICE_INFOhas been restored (Michel)
- Updated description (Sagar)
v4: rebase
Quoted 9 lines
Signed-off-by Piotr Piórkowski <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Michał Winiarski <[email protected]>Cc John A Spotswood <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Michel Thierry <[email protected]>Acked-by Michel Thierry <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]>
And pushed, thanks for the patch and review.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/guc: Removed unused GuC parameters. (rev2)
In reply to Piotr Piórkowski== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters. (rev2)
URL : https://patchwork.freedesktop.org/series/39154/
State : failure
== Summary ==
Series 39154v2 drm/i915/guc: Removed unused GuC parameters.
https://patchwork.freedesktop.org/api/1.0/series/39154/revisions/2/mbox/
---- Possible new issues:
Test drv_module_reload:
Subgroup basic-reload:
pass -> INCOMPLETE (fi-cfl-s2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (fi-cfl-s2)
Subgroup basic-rte:
pass -> DMESG-WARN (fi-cfl-s2)
Test prime_vgem:
Subgroup basic-fence-flip:
pass -> DMESG-WARN (fi-cfl-s2)---- Known issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-cnl-y3) fdo#104951
incomplete -> PASS (fi-snb-2520m) fdo#103713fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:421s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:371s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:486s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:280s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:478s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:480s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:465s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:453s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:394s fi-cfl-s2 total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:25 fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:570s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:408s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:287s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:506s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:384s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:412s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:453s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:410s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:450s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:492s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:452s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:491s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:581s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:428s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:500s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:517s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:489s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:479s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:405s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:432s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:523s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:390s
276a88800a08604e3f617f084f59aeef75d5a01a drm-tip: 2018y-03m-05d-12h-15m-50s UTC integration manifest 341888d6349a drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8230/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/guc: Removed unused GuC parameters. (rev3)
In reply to Piotr Piórkowski== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters. (rev3)
URL : https://patchwork.freedesktop.org/series/39154/
State : success
== Summary ==
Series 39154v3 drm/i915/guc: Removed unused GuC parameters.
https://patchwork.freedesktop.org/api/1.0/series/39154/revisions/3/mbox/
---- Known issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:425s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:420s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:374s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:503s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:278s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:486s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:493s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:477s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:467s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:405s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:565s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:594s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:416s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:286s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:519s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:400s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:412s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:478s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:418s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:470s fi-kbl-7560u total:108 pass:104 dwarn:0 dfail:0 fail:0 skip:3 fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:458s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:507s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:588s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:434s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:514s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:529s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:501s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:491s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:423s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:427s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:390s
3d35bb0a8966cf81f0e7b13a9ba796d0b65f98c5 drm-tip: 2018y-03m-06d-12h-23m-04s UTC integration manifest c304971be9c3 drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8242/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915/guc: Removed unused GuC parameters. (rev3)
In reply to Piotr Piórkowski== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters. (rev3)
URL : https://patchwork.freedesktop.org/series/39154/
State : warning
== Summary ==
---- Possible new issues:
Test kms_cursor_crc:
Subgroup cursor-128x128-suspend:
pass -> DMESG-WARN (shard-snb)
Test kms_flip:
Subgroup busy-flip:
pass -> DMESG-WARN (shard-hsw)---- Known issues:
Test gem_eio:
Subgroup in-flight:
incomplete -> PASS (shard-apl) fdo#105341
Test kms_chv_cursor_fail:
Subgroup pipe-b-128x128-right-edge:
dmesg-warn -> PASS (shard-snb) fdo#105185 +1
Test kms_flip:
Subgroup flip-vs-expired-vblank:
fail -> PASS (shard-hsw) fdo#102887
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt:
pass -> DMESG-WARN (shard-hsw) fdo#101623 +2
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-b-planes:
incomplete -> PASS (shard-hsw) fdo#103540
Test kms_rotation_crc:
Subgroup sprite-rotation-90-pos-100-0:
dmesg-warn -> PASS (shard-apl) fdo#103356fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103356 https://bugs.freedesktop.org/show_bug.cgi?id=103356
shard-apl total:3381 pass:1780 dwarn:1 dfail:0 fail:7 skip:1591 time:11977s shard-hsw total:3467 pass:1771 dwarn:3 dfail:0 fail:1 skip:1691 time:11938s shard-snb total:3467 pass:1361 dwarn:3 dfail:0 fail:2 skip:2101 time:6955s
Blacklisted hosts:
shard-kbl total:3381 pass:1899 dwarn:2 dfail:0 fail:8 skip:1471 time:9044s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8242/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/guc: Removed unused GuC parameters. (rev4)
In reply to Piotr Piórkowski== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters. (rev4)
URL : https://patchwork.freedesktop.org/series/39154/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4052 -> Patchwork_8685 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/39154/revisions/4/mbox/
== Changes ==
No changes found
== Participating hosts (35 -> 32) ==
Missing (3): fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4052 -> Patchwork_8685
CI_DRM_4052: ff6d5cf7b19871af5657774f4e8f5f91f6285e12 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4429: 80e4910581c7310258375a003a5de9a57ed24546 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8685: 3084d8f9b609dc6fa9808a730db5d3d639274378 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4429: 93b35926a150e318439d2505901288594b3548f5 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
3084d8f9b609 drm/i915/guc: Remove GUC_CTL_DEVICE_INFO parameter
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8685/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/guc: Removed unused GuC parameters. (rev4)
In reply to Piotr Piórkowski== Series Details ==
== Series Details ==
Series: drm/i915/guc: Removed unused GuC parameters. (rev4)
URL : https://patchwork.freedesktop.org/series/39154/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4052_full -> Patchwork_8685_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8685_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_8685_full, 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/39154/revisions/4/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8685_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-render:
shard-kbl: SKIP -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu:
shard-snb: SKIP -> PASS +2== Known issues ==
Here are the changes found in Patchwork_8685_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_rotation_crc@sprite-rotation-180:
shard-hsw: PASS -> FAIL (fdo#103925)
==== Possible fixes ====
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: FAIL (fdo#100368) -> PASS +1
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-hsw: FAIL (fdo#105189) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
== Participating hosts (6 -> 4) ==
Missing (2): shard-glk shard-glkb
== Build changes ==
* Linux: CI_DRM_4052 -> Patchwork_8685
CI_DRM_4052: ff6d5cf7b19871af5657774f4e8f5f91f6285e12 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4429: 80e4910581c7310258375a003a5de9a57ed24546 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8685: 3084d8f9b609dc6fa9808a730db5d3d639274378 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4429: 93b35926a150e318439d2505901288594b3548f5 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8685/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx