drm/i915/guc: Refactoring preparation of the GUC_CTL_CTXINFO parameter

At the moment, the preparation of GUC_CTL_CTXINFO is disordered.
Lets move all  GUC_CTL_CTXINFO related operations to one place.

v2:
- move 'ctxnum' and 'base' declarations to USES_GUC_SUBMISSION case
(Michał Wajdeczko)

Signed-off-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180604141947.8299-5-piotr.piorkowski@intel.com

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index d2d2cc1d6d46ad4753f8faa06737ae5e99e7671d..dce475eaa39b6744e964b6f835a8ae36c0b183a0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -241,6 +241,23 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)
        return flags;
 }
 
+static u32 guc_ctl_ctxinfo_flags(struct intel_guc *guc)
+{
+       u32 flags = 0;
+
+       if (USES_GUC_SUBMISSION(guc_to_i915(guc))) {
+               u32 ctxnum, base;
+
+               base = intel_guc_ggtt_offset(guc, guc->stage_desc_pool);
+               ctxnum = GUC_MAX_STAGE_DESCRIPTORS / 16;
+
+               base >>= PAGE_SHIFT;
+               flags |= (base << GUC_CTL_BASE_ADDR_SHIFT) |
+                       (ctxnum << GUC_CTL_CTXNUM_IN16_SHIFT);
+       }
+       return flags;
+}
+
 static u32 guc_ctl_log_params_flags(struct intel_guc *guc)
 {
        u32 offset = intel_guc_ggtt_offset(guc, guc->log.vma) >> PAGE_SHIFT;
@@ -282,16 +299,7 @@ void intel_guc_init_params(struct intel_guc *guc)
        params[GUC_CTL_FEATURE] = guc_ctl_feature_flags(guc);
        params[GUC_CTL_LOG_PARAMS]  = guc_ctl_log_params_flags(guc);
        params[GUC_CTL_DEBUG] = guc_ctl_debug_flags(guc);
-
-       /* If GuC submission is enabled, set up additional parameters here */
-       if (USES_GUC_SUBMISSION(dev_priv)) {
-               u32 pgs = intel_guc_ggtt_offset(guc, guc->stage_desc_pool);
-               u32 ctx_in_16 = GUC_MAX_STAGE_DESCRIPTORS / 16;
-
-               pgs >>= PAGE_SHIFT;
-               params[GUC_CTL_CTXINFO] = (pgs << GUC_CTL_BASE_ADDR_SHIFT) |
-                       (ctx_in_16 << GUC_CTL_CTXNUM_IN16_SHIFT);
-       }
+       params[GUC_CTL_CTXINFO] = guc_ctl_ctxinfo_flags(guc);
 
        /*
         * All SOFT_SCRATCH registers are in FORCEWAKE_BLITTER domain and