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

At the moment, the preparation of GUC_CTL_LOG_PARAMS is disordered.
Additionally, in struct intel_guc_log we have an unnecessary field
'flags' which we use only to assign value to GuC parameter.
Lets move all GUC_CTL_LOG_PARAMS related operations to one place,
and lets remove field 'flags' from struct intel_guc_log.

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-4-piotr.piorkowski@intel.com

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index dfc5ef8be9f0ae2973e4c3a5b3701d9a00adb971..d2d2cc1d6d46ad4753f8faa06737ae5e99e7671d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -240,6 +240,22 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)
 
        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;
+       u32 flags;
+
+       /* each allocated unit is a page */
+       flags = GUC_LOG_VALID | GUC_LOG_NOTIFY_ON_HALF_FULL |
+               (GUC_LOG_CRASH_PAGES << GUC_LOG_CRASH_SHIFT) |
+               (GUC_LOG_DPC_PAGES << GUC_LOG_DPC_SHIFT) |
+               (GUC_LOG_ISR_PAGES << GUC_LOG_ISR_SHIFT) |
+               (offset << GUC_LOG_BUF_ADDR_SHIFT);
+
+       return flags;
+}
+
 /*
  * Initialise the GuC parameter block before starting the firmware
  * transfer. These parameters are read by the firmware on startup
@@ -264,8 +280,7 @@ 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_feature_flags(guc);
-       params[GUC_CTL_LOG_PARAMS] = guc->log.flags;
-
+       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 */

diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index d35d883d48e19a160156cb4da56d70ae8231a80a..b921c948c7f5c048e89ce79fea92b97c8eb2d0c4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -452,8 +452,6 @@ int intel_guc_log_create(struct intel_guc_log *log)
 {
        struct intel_guc *guc = log_to_guc(log);
        struct i915_vma *vma;
-       unsigned long offset;
-       u32 flags;
        int ret;
 
        GEM_BUG_ON(log->vma);
@@ -466,15 +464,6 @@ int intel_guc_log_create(struct intel_guc_log *log)
 
        log->vma = vma;
 
-       /* each allocated unit is a page */
-       flags = GUC_LOG_VALID | GUC_LOG_NOTIFY_ON_HALF_FULL |
-               (GUC_LOG_DPC_PAGES << GUC_LOG_DPC_SHIFT) |
-               (GUC_LOG_ISR_PAGES << GUC_LOG_ISR_SHIFT) |
-               (GUC_LOG_CRASH_PAGES << GUC_LOG_CRASH_SHIFT);
-
-       offset = intel_guc_ggtt_offset(guc, vma) >> PAGE_SHIFT;
-       log->flags = (offset << GUC_LOG_BUF_ADDR_SHIFT) | flags;
-
        log->level = i915_modparams.guc_log_level;
 
        return 0;

diff --git a/drivers/gpu/drm/i915/intel_guc_log.h b/drivers/gpu/drm/i915/intel_guc_log.h
index f38c48950ed4b78edc14ac3d8418ee3a22d150ed..196e2199a3e29688c879ed970b1a51b4a9deffd7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_log.h
+++ b/drivers/gpu/drm/i915/intel_guc_log.h
@@ -60,7 +60,6 @@ struct intel_guc;
 
 struct intel_guc_log {
        u32 level;
-       u32 flags;
        struct i915_vma *vma;
        struct {
                void *buf_addr;