drm/i915/guc: Move firmware selection to init_early

Doing GuC firmware path selection from sanitize_options function
is not perfect, while there is no problem with doing so during
early init stage as we already have all needed data.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171206135316.32556-2-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index d08e760..df86907 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -61,6 +61,7 @@ void intel_guc_init_send_regs(struct intel_guc *guc)
 
 void intel_guc_init_early(struct intel_guc *guc)
 {
+       intel_guc_fw_init_early(guc);
        intel_guc_ct_init_early(&guc->ct);
 
        mutex_init(&guc->send_mutex);

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index 89862fa..cbc51c9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -56,45 +56,54 @@ MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
 #define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
 
-/**
- * intel_guc_fw_select() - selects GuC firmware for uploading
- *
- * @guc:       intel_guc struct
- *
- * Return: zero when we know firmware, non-zero in other case
- */
-int intel_guc_fw_select(struct intel_guc *guc)
+static void guc_fw_select(struct intel_uc_fw *guc_fw)
 {
+       struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
        struct drm_i915_private *dev_priv = guc_to_i915(guc);
 
-       intel_uc_fw_init(&guc->fw, INTEL_UC_FW_TYPE_GUC);
+       GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);
+
+       if (!HAS_GUC(dev_priv))
+               return;
 
        if (i915_modparams.guc_firmware_path) {
-               guc->fw.path = i915_modparams.guc_firmware_path;
-               guc->fw.major_ver_wanted = 0;
-               guc->fw.minor_ver_wanted = 0;
+               guc_fw->path = i915_modparams.guc_firmware_path;
+               guc_fw->major_ver_wanted = 0;
+               guc_fw->minor_ver_wanted = 0;
        } else if (IS_SKYLAKE(dev_priv)) {
-               guc->fw.path = I915_SKL_GUC_UCODE;
-               guc->fw.major_ver_wanted = SKL_FW_MAJOR;
-               guc->fw.minor_ver_wanted = SKL_FW_MINOR;
+               guc_fw->path = I915_SKL_GUC_UCODE;
+               guc_fw->major_ver_wanted = SKL_FW_MAJOR;
+               guc_fw->minor_ver_wanted = SKL_FW_MINOR;
        } else if (IS_BROXTON(dev_priv)) {
-               guc->fw.path = I915_BXT_GUC_UCODE;
-               guc->fw.major_ver_wanted = BXT_FW_MAJOR;
-               guc->fw.minor_ver_wanted = BXT_FW_MINOR;
+               guc_fw->path = I915_BXT_GUC_UCODE;
+               guc_fw->major_ver_wanted = BXT_FW_MAJOR;
+               guc_fw->minor_ver_wanted = BXT_FW_MINOR;
        } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
-               guc->fw.path = I915_KBL_GUC_UCODE;
-               guc->fw.major_ver_wanted = KBL_FW_MAJOR;
-               guc->fw.minor_ver_wanted = KBL_FW_MINOR;
+               guc_fw->path = I915_KBL_GUC_UCODE;
+               guc_fw->major_ver_wanted = KBL_FW_MAJOR;
+               guc_fw->minor_ver_wanted = KBL_FW_MINOR;
        } else if (IS_GEMINILAKE(dev_priv)) {
-               guc->fw.path = I915_GLK_GUC_UCODE;
-               guc->fw.major_ver_wanted = GLK_FW_MAJOR;
-               guc->fw.minor_ver_wanted = GLK_FW_MINOR;
+               guc_fw->path = I915_GLK_GUC_UCODE;
+               guc_fw->major_ver_wanted = GLK_FW_MAJOR;
+               guc_fw->minor_ver_wanted = GLK_FW_MINOR;
        } else {
-               DRM_ERROR("No GuC firmware known for platform with GuC!\n");
-               return -ENOENT;
+               DRM_WARN("%s: No firmware known for this platform!\n",
+                        intel_uc_fw_type_repr(guc_fw->type));
        }
+}
 
-       return 0;
+/**
+ * intel_guc_fw_init_early() - initializes GuC firmware struct
+ * @guc: intel_guc struct
+ *
+ * On platforms with GuC selects firmware for uploading
+ */
+void intel_guc_fw_init_early(struct intel_guc *guc)
+{
+       struct intel_uc_fw *guc_fw = &guc->fw;
+
+       intel_uc_fw_init(guc_fw, INTEL_UC_FW_TYPE_GUC);
+       guc_fw_select(guc_fw);
 }
 
 static void guc_prepare_xfer(struct intel_guc *guc)

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.h b/drivers/gpu/drm/i915/intel_guc_fw.h
index 023f5ba..4ec5d3d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_fw.h
+++ b/drivers/gpu/drm/i915/intel_guc_fw.h
@@ -27,7 +27,7 @@
 
 struct intel_guc;
 
-int intel_guc_fw_select(struct intel_guc *guc);
+void intel_guc_fw_init_early(struct intel_guc *guc);
 int intel_guc_fw_upload(struct intel_guc *guc);
 
 #endif

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 95b524c..4b7f2a7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -65,7 +65,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
 
        /* Verify firmware version */
        if (i915_modparams.enable_guc_loading) {
-               if (intel_guc_fw_select(&dev_priv->guc))
+               if (!intel_uc_fw_is_selected(&dev_priv->guc.fw))
                        i915_modparams.enable_guc_loading = 0;
        }
 

diff --git a/drivers/gpu/drm/i915/intel_uc_fw.h b/drivers/gpu/drm/i915/intel_uc_fw.h
index 5394d9d..d5fd460 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/intel_uc_fw.h
@@ -110,6 +110,11 @@ void intel_uc_fw_init(struct intel_uc_fw *uc_fw, enum intel_uc_fw_type type)
        uc_fw->type = type;
 }
 
+static inline bool intel_uc_fw_is_selected(struct intel_uc_fw *uc_fw)
+{
+       return uc_fw->path != NULL;
+}
+
 void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
                       struct intel_uc_fw *uc_fw);
 int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,