Attachment 145969 Details for Bug 111623 – v5.3.7-resume-without-guc-submission-v2.patch

[patch] v5.3.7-resume-without-guc-submission-v2.patch

i915-guc-suspend-resume-v2-backport-5.3.patch (text/plain), 1.16 KB, created by Tomas Janousek on 2019-11-15 15:03:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Janousek

Created: 2019-11-15 15:03:53 UTC

Size: 1.16 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
>index ae45651ac73c..acda38a9fec5 100644
>--- a/drivers/gpu/drm/i915/intel_uc.c
>+++ b/drivers/gpu/drm/i915/intel_uc.c
>@@ -522,10 +522,19 @@ void intel_uc_runtime_suspend(struct drm_i915_private *i915)
> 	if (!intel_guc_is_loaded(guc))
> 		return;
> 
>+	/*
>+	 * If GuC communication is enabled but submission is not supported,
>+	 * we do not need to suspend the GuC but we do need to disable the
>+	 * GuC communication on suspend.
>+	 */
>+	if (!USES_GUC_SUBMISSION(i915))
>+		goto guc_disable_comm;
>+
> 	err = intel_guc_suspend(guc);
> 	if (err)
> 		DRM_DEBUG_DRIVER("Failed to suspend GuC, err=%d", err);
> 
>+guc_disable_comm:
> 	guc_disable_communication(guc);
> }
> 
>@@ -551,6 +560,14 @@ int intel_uc_resume(struct drm_i915_private *i915)
> 
> 	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 (!USES_GUC_SUBMISSION(i915))
>+		return 0;
>+
> 	err = intel_guc_resume(guc);
> 	if (err) {
> 		DRM_DEBUG_DRIVER("Failed to resume GuC, err=%d", err);

Actions: View | Splinter Review

Attachments on bug 111623: 145312 | 145313 | 145808 | 145969

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.