Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915/guc: Revert "drm/i915/guc: enable GuC loading &" failed to apply to 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 28, 2016

Subsystems (3)
Stable branch DRM drivers Intel i915
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.8-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From fe993bc9582ff23c9a81414acdfed8e55478e456 Mon Sep 17 00:00:00 2001

From: Rodrigo Vivi <[email protected]>
Date: Mon, 18 Jul 2016 16:27:57 -0700
Subject: [PATCH] drm/i915/guc: Revert "drm/i915/guc: enable GuC loading &
submission by default"

This reverts commit 041824ee25cfc535ba2d9a22c217df735ea2471e.

We have latency issues that might impact the performance: #96606. and hangs and loading issues on resume after S4: #96526.

This is also blocking a platform milestone so let's disable this for now while we make sure we don't have any more loading issue, or related basic hangs and it pass BAT for real in all platofmrs.

In case BAT is wrong let's first fix BAT before re-enable it here.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96606
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96526

Cc Chris Wilson <[email protected]>
Cc Dave Gordon <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Stable <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Christophe Prigent <[email protected]>
Signed-off-by Rodrigo Vivi <[email protected]>
Reviewed-by Daniel Vetter <[email protected]>
Link http://patchwork.freedesktop.org/patch/msgid/[email protected]
drivers/gpu/drm/i915/i915_params.c +4 -4
index 8b13bfa47fba..b6e404c91eed 100644
@@ -54,8 +54,8 @@ struct i915_params i915 __read_mostly = {
 	.verbose_state_checks = 1,
 	.nuclear_pageflip = 0,
 	.edp_vswing = 0,
-	.enable_guc_loading = -1,
-	.enable_guc_submission = -1,
+	.enable_guc_loading = 0,
+	.enable_guc_submission = 0,
 	.guc_log_level = -1,
 	.enable_dp_mst = true,
 	.inject_load_failure = 0,

@@ -203,12 +203,12 @@ MODULE_PARM_DESC(edp_vswing,
 module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading, int, 0400);
 MODULE_PARM_DESC(enable_guc_loading,
 		"Enable GuC firmware loading "
-		"(-1=auto [default], 0=never, 1=if available, 2=required)");
+		"(-1=auto, 0=never [default], 1=if available, 2=required)");
 
 module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, int, 0400);
 MODULE_PARM_DESC(enable_guc_submission,
 		"Enable GuC submission "
-		"(-1=auto [default], 0=never, 1=if available, 2=required)");
+		"(-1=auto, 0=never [default], 1=if available, 2=required)");
 
 module_param_named(guc_log_level, i915.guc_log_level, int, 0400);
 MODULE_PARM_DESC(guc_log_level,