Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_uc_fw.c

diff --git a/drivers/gpu/drm/i915/intel_uc_fw.c b/drivers/gpu/drm/i915/intel_uc_fw.c
index fd496416087c491bfaeffd94caa131707cd28f07..becf05ebae4d3597fe021e0a7b706ba3fc2cd10e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/intel_uc_fw.c
@@ -46,12 +46,17 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
        size_t size;
        int err;
 
+       if (!uc_fw->path) {
+               dev_info(dev_priv->drm.dev,
+                        "%s: No firmware was defined for %s!\n",
+                        intel_uc_fw_type_repr(uc_fw->type),
+                        intel_platform_name(INTEL_INFO(dev_priv)->platform));
+               return;
+       }
+
        DRM_DEBUG_DRIVER("%s fw fetch %s\n",
                         intel_uc_fw_type_repr(uc_fw->type), uc_fw->path);
 
-       if (!uc_fw->path)
-               return;
-
        uc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;
        DRM_DEBUG_DRIVER("%s fw fetch %s\n",
                         intel_uc_fw_type_repr(uc_fw->type),