drm/i915/guc: Remove USES_GUC_SUBMISSION for ads programming

In the guc_ctl_debug_flags, the ads struct is programmed only
when USES_GUC_SUBMISSION is satisfied. But, this has to be
programmed for all suspend/resume cases.
Remove the condition and program the ads struct for
both huc loading and guc submission.

This issue was noticed when CI threw errors for enable_guc=2
(load huc; disable submission)

v2:
- Change commit title.
- Correct the shifts. (Daniele)

Credits to: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Cc: Oscar Mateo <oscar.mateo@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/1529691543-28606-1-git-send-email-anusha.srivatsa@intel.com

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 1aff30b0870c2791b9c011c580b4aadd3d18d8c3..f651e57b4c61955b92c0e91d854ae728aa73410f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -206,7 +206,11 @@ void intel_guc_fini(struct intel_guc *guc)
 static u32 guc_ctl_debug_flags(struct intel_guc *guc)
 {
        u32 level = intel_guc_log_get_level(&guc->log);
-       u32 flags = 0;
+       u32 flags;
+       u32 ads;
+
+       ads = intel_guc_ggtt_offset(guc, guc->ads_vma) >> PAGE_SHIFT;
+       flags = ads << GUC_ADS_ADDR_SHIFT | GUC_ADS_ENABLED;
 
        if (!GUC_LOG_LEVEL_IS_ENABLED(level))
                flags |= GUC_LOG_DEFAULT_DISABLED;
@@ -217,13 +221,6 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc)
                flags |= GUC_LOG_LEVEL_TO_VERBOSITY(level) <<
                         GUC_LOG_VERBOSITY_SHIFT;
 
-       if (USES_GUC_SUBMISSION(guc_to_i915(guc))) {
-               u32 ads = intel_guc_ggtt_offset(guc, guc->ads_vma)
-                       >> PAGE_SHIFT;
-
-               flags |= ads << GUC_ADS_ADDR_SHIFT | GUC_ADS_ENABLED;
-       }
-
        return flags;
 }