drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
Subsystems (2)
PATCH 1/1 drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC EXIT_S_STATE action results in lose of ability to enter RC6. We can remove the GuC suspend/resume entirely as we do not need to save the GuC submission status.
Add intel_guc_submission_is_enabled() function to determine if GuC submission is active.
v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.
v3: Fix typo, move suspend logic to remove goto.
v4: Use intel_guc_submission_is_enabled() to check GuC submission
status.
v5: No need to look at engine to determine if submission is enabled.
Squash fix + intel_guc_submission_is_enabled() patch into one.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111594
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111623
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 6 ++++++ 3 files changed, 21 insertions(+)
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7 -0
@@ -553,6 +553,13 @@ int intel_guc_suspend(struct intel_guc *guc) GUC_POWER_D1, /* any value greater than GUC_POWER_D0 */ }; +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to suspend the GuC. +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +/* * The ENTER_S_STATE action queues the save/restore operation in GuC FW * and then returns, so waiting on the H2G is not enough to guarantee
drivers/gpu/drm/i915/gt/uc/intel_uc.c +8 -0
@@ -605,6 +605,14 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)if (enable_communication)guc_enable_communication (guc); +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; + err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);
drivers/gpu/drm/i915/i915_drv.h +6 -0
@@ -2044,4 +2044,10 @@ i915_coherent_map_type(struct drm_i915_private *i915) return HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC; } +static inline bool intel_guc_submission_is_enabled (struct intel_guc *guc) +{ +return intel_guc_is_submission_supported (guc) && +intel_guc_is_running (guc); +} +#endif
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 19 lines · On 11/15/19 10:20 AM, [email protected] wrote:
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC
EXIT_S_STATEaction results in lose of ability to enter RC6. We can remove the GuC suspend/resume entirely as we do not need to save the GuC submission status.Add
intel_guc_submission_is_enabled()function to determine if GuC submission is active.v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.
v3: Fix typo, move suspend logic to remove goto.
v4: Useintel_guc_submission_is_enabled()to check GuC submission
status.
v5: No need to look at engine to determine if submission is enabled.
Squash fix +intel_guc_submission_is_enabled()patch into one.
Quoted 5 lines
Reported-by KiteStramuort <[email protected]>Reported-by S. Zharkoff <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111594
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111623Fixes f774f0964919 ("drm/i915/guc: Turn on GuC/HuC auto mode")
I don't think this Fixes tag is appropriate since we already reverted that patch.
Quoted 36 lines
Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceralo Spurio <[email protected]>Cc Stuart Summers <[email protected]>Cc Chris Wilson <[email protected]>Tested-by Tomas Janousek <[email protected]>Signed-off-by Don Hiatt <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 6 ++++++ 3 files changed, 21 insertions(+)drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -553,6 +553,13 @@ int intel_guc_suspend(struct intel_guc *guc) GUC_POWER_D1, /* any value greater than GUC_POWER_D0 */ }; +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to suspend the GuC. +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +/* * The ENTER_S_STATE action queues the save/restore operation in GuC FW * and then returns, so waiting on the H2G is not enough to guarantee drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0@@ -605,6 +605,14 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)if (enable_communication)
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 615
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +8
-0guc_enable_communication (guc); +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +
I would put this check inside intel_guc_resume(), for symmetry with the one you put inside intel_guc_suspend().
Daniele
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct drm_i915_private *i915) · line 2053
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +6
-0@@ -2044,4 +2044,10 @@ i915_coherent_map_type(struct drm_i915_private *i915) return HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC; } +static inline bool intel_guc_submission_is_enabled (struct intel_guc *guc) +{ +return intel_guc_is_submission_supported (guc) && +intel_guc_is_running (guc); +} +#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 35 lines
From: Ceraolo Spurio, Daniele <[email protected]>
Sent: Friday, November 15, 2019 2:02 PM
To: Hiatt, Don <[email protected]>; [email protected]
Cc: Ewins, Jon <[email protected]>; KiteStramuort <[email protected]>; S . Zharkoff <[email protected]>; Wajdeczko, Michal <[email protected]>; Summers, Stuart <[email protected]>; Chris Wilson <[email protected]>; Tomas Janousek <[email protected]>
Subject: Re: [PATCH] drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submissionQuoted 19 lines · On 11/15/19 10:20 AM, [email protected] wrote:
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC
EXIT_S_STATEaction results in lose of ability to enter RC6. We can remove the GuC suspend/resume entirely as we do not need to save the GuC submission status.Add
intel_guc_submission_is_enabled()function to determine if GuC submission is active.v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.
v3: Fix typo, move suspend logic to remove goto.
v4: Useintel_guc_submission_is_enabled()to check GuC submission
status.
v5: No need to look at engine to determine if submission is enabled.
Squash fix +intel_guc_submission_is_enabled()patch into one.
Quoted 9 lines
Quoted 5 lines
Reported-by KiteStramuort <[email protected]>Reported-by S. Zharkoff <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111594
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111623Fixes f774f0964919 ("drm/i915/guc: Turn on GuC/HuC auto mode")I don't think this Fixes tag is appropriate since we already reverted that patch.
Can you suggest an appropriate tag? Chris suggest "guc/huc enabling by default" patch but I couldn't find it and this one seemed similar.
Quoted 43 lines
Quoted 6 lines
Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceralo Spurio <[email protected]>Cc Stuart Summers <[email protected]>Cc Chris Wilson <[email protected]>Tested-by Tomas Janousek <[email protected]>Signed-off-by Don Hiatt <[email protected]>Review
Quoted 7 lines
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 6 ++++++ 3 files changed, 21 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/uc/intel_guc.cdrivers/gpu/drm/i915/gt/uc/intel_guc.c int intel_guc_suspend(struct intel_guc *guc) · line 553
Quoted 5 lines
index
019ae6486e8d..92d9305c0d73100644drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0@@ -553,6 +553,13 @@ int intel_guc_suspend(struct intel_guc *guc) GUC_POWER_D1, /* any value greater than GUC_POWER_D0*/
drivers/gpu/drm/i915/gt/uc/intel_guc.c int intel_guc_suspend(struct intel_guc *guc)
Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0}; +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to suspend the GuC. +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +/* * The ENTER_S_STATE action queues the save/restore operation in GuC FW
Review
Quoted 2 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0* and then returns, so waiting on the H2G is not enough to guarantee (quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/uc/intel_uc.cdrivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool
Quoted 4 lines
index
629b19377a29..4dd43b99a334100644drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0@@ -605,6 +605,14 @@ static int __uc_resume(struct intel_uc *uc, bool
enable_communication)Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0if (enable_communication)guc_enable_communication (guc);
Quoted 12 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 615
Quoted 8 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +8
-0+/* +* If GuC communication is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +I would put this check inside
intel_guc_resume(), for symmetry with the one you put insideintel_guc_suspend().
Will do.
Quoted 15 lines
Daniele
Review
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hdrivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct drm_i915_private
Quoted 4 lines
index
7bc1d8c102b2..2b879472e760100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2044,4 +2044,10 @@ i915_coherent_map_type(struct drm_i915_private*i915)
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0return HAS_LLC (i915) ?I915_MAP_WB :I915_MAP_WC ; }
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct drm_i915_private *i915) · line 2053
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +6
-0+static inline bool intel_guc_submission_is_enabled (struct intel_guc *guc) +{ +return intel_guc_is_submission_supported (guc) && +intel_guc_is_running (guc); +} +#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 39 lines · Don
Quoted 39 lines
From: Ceraolo Spurio, Daniele <[email protected]>
Sent: Friday, November 15, 2019 2:02 PM
To: Hiatt, Don <[email protected]>; [email protected]
Cc: Ewins, Jon <[email protected]>; KiteStramuort <[email protected]>; S . Zharkoff <[email protected]>; Wajdeczko, Michal <[email protected]>; Summers, Stuart <[email protected]>; Chris Wilson <[email protected]>; Tomas Janousek <[email protected]>
Subject: Re: [PATCH] drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submissionQuoted 24 lines · On 11/15/19 10:20 AM, [email protected] wrote:
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC
EXIT_S_STATEaction results in lose of ability to enter RC6. We can remove the GuC suspend/resume entirely as we do not need to save the GuC submission status.Add
intel_guc_submission_is_enabled()function to determine if GuC submission is active.v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.
v3: Fix typo, move suspend logic to remove goto.
v4: Useintel_guc_submission_is_enabled()to check GuC submission
status.
v5: No need to look at engine to determine if submission is enabled.
Squash fix +intel_guc_submission_is_enabled()patch into one.Reported-by KiteStramuort <[email protected]>Reported-by S. Zharkoff <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111594
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111623Fixes f774f0964919 ("drm/i915/guc: Turn on GuC/HuC auto mode")
Quoted 5 lines
Quoted 3 lines
I don't think this Fixes tag is appropriate since we already reverted that patch.
Can you suggest an appropriate tag? Chris suggest "guc/huc enabling by default" patch but I couldn't find it and this one seemed similar.
Do we want to backport this even if guc is off by default and taints on enabling? if we do, then we probably need to go all the way back to when we introduced the new binaries that show the problem ("drm/i915/guc: Updates for GuC 32.0.3 firmware").
Daniele
Quoted 72 lines
Quoted 44 lines
Quoted 7 lines
Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceralo Spurio <[email protected]>Cc Stuart Summers <[email protected]>Cc Chris Wilson <[email protected]>Tested-by Tomas Janousek <[email protected]>Signed-off-by Don Hiatt <[email protected]>Review
Quoted 7 lines
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 6 ++++++ 3 files changed, 21 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/uc/intel_guc.cdrivers/gpu/drm/i915/gt/uc/intel_guc.c int intel_guc_suspend(struct intel_guc *guc) · line 553
Quoted 5 lines
index
019ae6486e8d..92d9305c0d73100644drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0@@ -553,6 +553,13 @@ int intel_guc_suspend(struct intel_guc *guc) GUC_POWER_D1, /* any value greater than GUC_POWER_D0*/
drivers/gpu/drm/i915/gt/uc/intel_guc.c int intel_guc_suspend(struct intel_guc *guc)
Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0}; +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to suspend the GuC. +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +/* * The ENTER_S_STATE action queues the save/restore operation in GuC FW
Review
Quoted 2 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0* and then returns, so waiting on the H2G is not enough to guarantee (quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/uc/intel_uc.cdrivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool
Quoted 4 lines
index
629b19377a29..4dd43b99a334100644drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0@@ -605,6 +605,14 @@ static int __uc_resume(struct intel_uc *uc, bool
enable_communication)Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0if (enable_communication)guc_enable_communication (guc);Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 615
Quoted 8 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +8
-0+/* +* If GuC communication is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +I would put this check inside
intel_guc_resume(), for symmetry with the one you put insideintel_guc_suspend().Will do.
Quoted 15 lines
Daniele
Review
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hdrivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct drm_i915_private
Quoted 4 lines
index
7bc1d8c102b2..2b879472e760100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2044,4 +2044,10 @@ i915_coherent_map_type(struct drm_i915_private*i915)
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0return HAS_LLC (i915) ?I915_MAP_WB :I915_MAP_WC ; }
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct drm_i915_private *i915) · line 2053
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +6
-0+static inline bool intel_guc_submission_is_enabled (struct intel_guc *guc) +{ +return intel_guc_is_submission_supported (guc) && +intel_guc_is_running (guc); +} +#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 57 lines
From: Ceraolo Spurio, Daniele <[email protected]>
Sent: Friday, November 15, 2019 3:10 PM
To: Hiatt, Don <[email protected]>; [email protected]
Cc: Ewins, Jon <[email protected]>; KiteStramuort <[email protected]>; S . Zharkoff <[email protected]>; Wajdeczko, Michal <[email protected]>; Summers, Stuart <[email protected]>; Chris Wilson <[email protected]>; Tomas Janousek <[email protected]>
Subject: Re: [PATCH] drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submissionQuoted 8 lines · Don
Quoted 8 lines
From: Ceraolo Spurio, Daniele <[email protected]>
Sent: Friday, November 15, 2019 2:02 PM
To: Hiatt, Don <[email protected]>; [email protected]
Cc: Ewins, Jon <[email protected]>; KiteStramuort <[email protected]>; S . Zharkoff <[email protected]>; Wajdeczko, Michal <[email protected]>; Summers, Stuart <[email protected]>; Chris Wilson <[email protected]>;Tomas
Quoted 34 lines
Quoted 34 lines
Janousek <[email protected]>
Subject: Re: [PATCH] drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submissionQuoted 19 lines · On 11/15/19 10:20 AM, [email protected] wrote:
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC
EXIT_S_STATEaction results in lose of ability to enter RC6. We can remove the GuC suspend/resume entirely as we do not need to save the GuC submission status.Add
intel_guc_submission_is_enabled()function to determine if GuC submission is active.v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.
v3: Fix typo, move suspend logic to remove goto.
v4: Useintel_guc_submission_is_enabled()to check GuC submission
status.
v5: No need to look at engine to determine if submission is enabled.
Squash fix +intel_guc_submission_is_enabled()patch into one.Quoted 5 lines
Reported-by KiteStramuort <[email protected]>Reported-by S. Zharkoff <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111594
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111623Fixes f774f0964919 ("drm/i915/guc: Turn on GuC/HuC auto mode")I don't think this Fixes tag is appropriate since we already reverted that patch.
Quoted 9 lines
Quoted 1 line
Can you suggest an appropriate tag? Chris suggest "guc/huc enabling by
default" patch
Quoted 1 line
but I couldn't find it and this one seemed similar.
Do we want to backport this even if guc is off by default and taints on enabling? if we do, then we probably need to go all the way back to when we introduced the new binaries that show the problem ("drm/i915/guc:
Updates for GuC 32.0.3 firmware").
Yes, we do as the original reports was with the user specifically enabling with the driver parameters.
Thanks a lot! The update patch will be posted in a second.
Quoted 75 lines
Daniele
Quoted 64 lines
Quoted 44 lines
Quoted 7 lines
Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceralo Spurio <[email protected]>Cc Stuart Summers <[email protected]>Cc Chris Wilson <[email protected]>Tested-by Tomas Janousek <[email protected]>Signed-off-by Don Hiatt <[email protected]>Review
Quoted 7 lines
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 6 ++++++ 3 files changed, 21 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/uc/intel_guc.cdrivers/gpu/drm/i915/gt/uc/intel_guc.c int intel_guc_suspend(struct intel_guc *guc) · line 553
Quoted 5 lines
index
019ae6486e8d..92d9305c0d73100644drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0@@ -553,6 +553,13 @@ int intel_guc_suspend(struct intel_guc *guc) GUC_POWER_D1, /* any value greater than GUC_POWER_D0*/
drivers/gpu/drm/i915/gt/uc/intel_guc.c int intel_guc_suspend(struct intel_guc *guc)
Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0}; +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to suspend the GuC. +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +/* * The ENTER_S_STATE action queues the save/restore operation in GuC FW
Review
Quoted 2 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0* and then returns, so waiting on the H2G is not enough to guarantee (quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/uc/intel_uc.cdrivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool
Quoted 4 lines
index
629b19377a29..4dd43b99a334100644drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0@@ -605,6 +605,14 @@ static int __uc_resume(struct intel_uc *uc, bool
enable_communication)Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0if (enable_communication)guc_enable_communication (guc);Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 615
Quoted 8 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +8
-0+/* +* If GuC communication is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!intel_guc_submission_is_enabled (guc)) +return 0 ; +I would put this check inside
intel_guc_resume(), for symmetry with the one you put insideintel_guc_suspend().Will do.
Quoted 7 lines
Daniele
Review
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hQuoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct
Quoted 4 lines
index
7bc1d8c102b2..2b879472e760100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2044,4 +2044,10 @@ i915_coherent_map_type(struct
drm_i915_privateQuoted 4 lines
Quoted 4 lines
*i915)
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0return HAS_LLC (i915) ?I915_MAP_WB :I915_MAP_WC ; }
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h i915_coherent_map_type(struct drm_i915_private *i915) · line 2053
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +6
-0+static inline bool intel_guc_submission_is_enabled (struct intel_guc *guc) +{ +return intel_guc_is_submission_supported (guc) && +intel_guc_is_running (guc); +} +#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev4)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev4)
URL : https://patchwork.freedesktop.org/series/68685/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7356 -> Patchwork_15295
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/index.html
Known issues
------------
Here are the changes found in Patchwork_15295 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_gem_contexts:
- fi-bsw-n3050: [PASS][1] -> [INCOMPLETE][2] ([fdo# 111542])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7356/fi-bsw-n3050/igt@i915_selftest@live_gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/fi-bsw-n3050/igt@i915_selftest@live_gem_contexts.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-skl-6770hq: [PASS][3] -> [WARN][4] ([fdo#112252])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7356/fi-skl-6770hq/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/fi-skl-6770hq/igt@[email protected]
#### Possible fixes ####
* igt@gem_mmap_gtt@basic-small-copy:
- fi-icl-dsi: [DMESG-WARN][5] ([fdo#106107]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7356/fi-icl-dsi/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/fi-icl-dsi/igt@[email protected]
* igt@i915_selftest@live_hangcheck:
- fi-hsw-4770r: [DMESG-FAIL][7] ([fdo#111991]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7356/fi-hsw-4770r/igt@i915_selftest@live_hangcheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/fi-hsw-4770r/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@dp-crc-fast:
- fi-icl-u2: [FAIL][9] ([fdo#109635 ] / [fdo#110387]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7356/fi-icl-u2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/fi-icl-u2/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u3: [FAIL][11] ([fdo#103167]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7356/fi-icl-u3/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/fi-icl-u3/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo# 111542]: https://bugs.freedesktop.org/show_bug.cgi?id= 111542 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#110387]: https://bugs.freedesktop.org/show_bug.cgi?id=110387
[fdo#111991]: https://bugs.freedesktop.org/show_bug.cgi?id=111991
[fdo#112252]: https://bugs.freedesktop.org/show_bug.cgi?id=112252
[fdo#112298]: https://bugs.freedesktop.org/show_bug.cgi?id=112298
Participating hosts (52 -> 45)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7356 -> Patchwork_15295
CI-20190529: 20190529
CI_DRM_7356: 967093f255d4e9c64856f381722c80cf56c96d3d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5288: ff4551e36cd8e573ceb1e450d17a12e3298dc04c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15295: d2e7f3f4071362b20ea1cc6023a355b50ad1795d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d2e7f3f40713 drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15295/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx