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

[Michał Winiarski]

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>
Cc: Piotr Piórkowski <piotr.piorkowski 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 1aff30b0870c..d9151f722f58 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -229,11 +229,13 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc)
 
 static u32 guc_ctl_feature_flags(struct intel_guc *guc)
 {
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 	u32 flags = 0;
 
-	flags |=  GUC_CTL_VCS2_ENABLED;
+	if (HAS_BSD2(i915))
+		flags |=  GUC_CTL_VCS2_ENABLED;
 
-	if (USES_GUC_SUBMISSION(guc_to_i915(guc)))
+	if (USES_GUC_SUBMISSION(i915))
 		flags |= GUC_CTL_KERNEL_SUBMISSIONS;
 	else
 		flags |= GUC_CTL_DISABLE_SCHEDULER;
-- 
2.17.1