[PATCH 6/6] drm/i915/guc: Do not tell GuC to use non-existent BSD2

Michał Winiarski michal.winiarski at intel.com
Mon Jun 4 13:30:58 UTC 2018


There exists a GUC_CTL_VCS2_ENABLED feature flag for GuC, which we're
setting unconditionally on FW load. Even when the HW on which we're
running doesn't have this engine. Let's not do that.

Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/i915/intel_guc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index e28a996b9604..b6f41dab7087 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -245,8 +245,10 @@ void intel_guc_init_params(struct intel_guc *guc)
 
 	params[GUC_CTL_WA] |= GUC_CTL_WA_UK_BY_DRIVER;
 
-	params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER |
-			GUC_CTL_VCS2_ENABLED;
+	params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER;
+
+	if (HAS_BSD2(dev_priv))
+		params[GUC_CTL_FEATURE] |= GUC_CTL_VCS2_ENABLED;
 
 	params[GUC_CTL_LOG_PARAMS] = guc->log.flags;
 
-- 
2.17.0



More information about the Intel-gfx-trybot mailing list